Update 74x with 62x

arches/app/datatypes/datatypes.py

@@ -1538,6 +1538,11 @@ def format_bytes(size):
             errors.append({"type": "ERROR", "message": message, "title": title})
         return errors
 
+    def clean(self, tile, nodeid):
+        super().clean(tile, nodeid)
+        if tile.data[nodeid] == []:
+            tile.data[nodeid] = None
+
     def append_to_document(self, document, nodevalue, nodeid, tile, provisional=False):
         try:
             for f in tile.data[str(nodeid)]:
@@ -2097,6 +2102,11 @@ def get_search_terms(self, nodevalue, nodeid=None):
 
         return terms
 
+    def clean(self, tile, nodeid):
+        super().clean(tile, nodeid)
+        if tile.data[nodeid] == []:
+            tile.data[nodeid] = None
+
     def append_to_document(self, document, nodevalue, nodeid, tile, provisional=False):
         domain_text_values = set([])
         node = models.Node.objects.get(nodeid=nodeid)
@@ -2232,6 +2242,11 @@ def validate(self, value, row_number=None, source="", node=None, nodeid=None, st
 
         return errors
 
+    def clean(self, tile, nodeid):
+        super().clean(tile, nodeid)
+        if tile.data[nodeid] == []:
+            tile.data[nodeid] = None
+
     def pre_tile_save(self, tile, nodeid):
         relationships = tile.data[nodeid]
         if relationships:

arches/install/arches-templates/project_name/settings.py-tpl

@@ -285,6 +285,31 @@ CANTALOUPE_HTTP_ENDPOINT = "http://localhost:8182/"
 
 ACCESSIBILITY_MODE = False
 
+RENDERERS = [
+    {
+        "name": "imagereader",
+        "title": "Image Reader",
+        "description": "Displays most image file types",
+        "id": "5e05aa2e-5db0-4922-8938-b4d2b7919733",
+        "iconclass": "fa fa-camera",
+        "component": "views/components/cards/file-renderers/imagereader",
+        "ext": "",
+        "type": "image/*",
+        "exclude": "tif,tiff,psd",
+    },
+    {
+        "name": "pdfreader",
+        "title": "PDF Reader",
+        "description": "Displays pdf files",
+        "id": "09dec059-1ee8-4fbd-85dd-c0ab0428aa94",
+        "iconclass": "fa fa-file",
+        "component": "views/components/cards/file-renderers/pdfreader",
+        "ext": "pdf",
+        "type": "application/pdf",
+        "exclude": "tif,tiff,psd",
+    },
+]
+
 # By setting RESTRICT_MEDIA_ACCESS to True, media file requests outside of Arches will checked against nodegroup permissions.
 RESTRICT_MEDIA_ACCESS = False
 

tests/models/tile_model_tests.py

@@ -31,9 +31,9 @@
 from django.contrib.auth.models import User
 from django.db.utils import ProgrammingError
 from django.http import HttpRequest
-from arches.app.models.tile import Tile
+from arches.app.models.tile import Tile, TileValidationError
 from arches.app.models.resource import Resource
-from arches.app.models.models import ResourceXResource
+from arches.app.models.models import Node, NodeGroup, ResourceXResource
 
 
 
@@ -62,6 +62,9 @@ def setUpClass(cls):
 
         INSERT INTO node_groups(nodegroupid, legacygroupid, cardinality)
             VALUES ('21111111-0000-0000-0000-000000000000', '', 'n');
+
+        INSERT INTO node_groups(nodegroupid, legacygroupid, cardinality)
+            VALUES ('41111111-0000-0000-0000-000000000000', '', 'n');
         """
 
         cursor = connection.cursor()
@@ -74,7 +77,8 @@ def tearDownClass(cls):
         WHERE nodegroupid = '99999999-0000-0000-0000-000000000001' OR
         nodegroupid = '32999999-0000-0000-0000-000000000000' OR
         nodegroupid = '19999999-0000-0000-0000-000000000000' OR
-        nodegroupid = '21111111-0000-0000-0000-000000000000';
+        nodegroupid = '21111111-0000-0000-0000-000000000000' OR
+        nodegroupid = '42999999-0000-0000-0000-000000000000';
 
         DELETE FROM public.resource_instances
         WHERE resourceinstanceid = '40000000-0000-0000-0000-000000000000';
@@ -582,3 +586,27 @@ def test_related_resources_managed(self):
 
         #     t2 = Tile(json)
         #     self.assertFalse(t2.validate()['is_valid'])
+
+    def test_check_for_missing_nodes(self):
+        # Required file list node.
+        node_group = NodeGroup.objects.get(pk=UUID("41111111-0000-0000-0000-000000000000"))
+        required_file_list_node = Node(
+            name="Required file list",
+            datatype="file-list",
+            nodegroup=node_group,
+            isrequired=True,
+            istopnode=False,
+        )
+        required_file_list_node.save()
+
+        json = {
+            "resourceinstance_id": "40000000-0000-0000-0000-000000000000",
+            "parenttile_id": "",
+            "nodegroup_id": str(node_group.pk),
+            "tileid": "",
+            "data": {required_file_list_node.nodeid: []},
+        }
+        tile = Tile(json)
+
+        with self.assertRaises(TileValidationError):
+            tile.check_for_missing_nodes()