add the ability to search for files and geom that have or don't have …

…values, re #11179, re #11180
archesproject · Aug 1, 2024 · c7d4d02 · c7d4d02
1 parent 4141350
commit c7d4d02
Show file tree

Hide file tree

Showing 6 changed files with 360 additions and 241 deletions.
diff --git a/arches/app/datatypes/datatypes.py b/arches/app/datatypes/datatypes.py
@@ -1338,6 +1338,24 @@ def append_to_document(self, document, nodevalue, nodeid, tile, provisional=Fals
                 }
             )
 
+    def append_search_filters(self, value, node, query, request):
+        try:
+            if value["op"] == "null" or value["op"] == "not_null":
+                self.append_null_search_filters(value, node, query, request)
+            elif (
+                value["op"] == "Point"
+                or value["op"] == "LineString"
+                or value["op"] == "Polygon"
+            ):
+                match_query = Match(
+                    field="tiles.data.%s.features.geometry.type" % (str(node.pk)),
+                    query=value["op"],
+                    type="phrase",
+                )
+                query.must(match_query)
+        except KeyError as e:
+            pass
+
     def split_geom(self, feature, max_feature_in_bytes=32766):
         geom = feature["geometry"]
         coordinates = (
@@ -2049,6 +2067,13 @@ def append_to_document(self, document, nodevalue, nodeid, tile, provisional=Fals
                     }
                     document["strings"].append(val)
 
+    def append_search_filters(self, value, node, query, request):
+        try:
+            if value["op"] == "null" or value["op"] == "not_null":
+                self.append_null_search_filters(value, node, query, request)
+        except KeyError as e:
+            pass
+
     def get_search_terms(self, nodevalue, nodeid):
         terms = []
         for file_obj in nodevalue:

diff --git a/arches/app/media/js/views/components/datatypes/file-list.js b/arches/app/media/js/views/components/datatypes/file-list.js
@@ -9,16 +9,33 @@ define([
         this.config = params.config;
         this.search = params.search;
 
-        this.maxFiles = ko.observable(params.config.maxFiles());
-        this.maxFiles.subscribe(function(val) {
-            var int = parseInt(val);
-            if(int > 0) { params.config.maxFiles(int); }
-            else { self.maxFiles(1); }
-        });
+        if (this.search) {
+            var filter = params.filterValue();
+            this.op = ko.observable(filter.op || '~');
+            this.node = params.node;
+            this.searchValue = ko.observable(filter.val || '');
+            this.filterValue = ko.computed(function() {
+                return {
+                    op: self.op(),
+                    val: self.searchValue()
+                };
+            }).extend({ throttle: 750 });
+            params.filterValue(this.filterValue());
+            this.filterValue.subscribe(function(val) {
+                params.filterValue(val);
+            });
+        } else {
+            this.maxFiles = ko.observable(params.config.maxFiles());
+            this.maxFiles.subscribe(function(val) {
+                var int = parseInt(val);
+                if(int > 0) { params.config.maxFiles(int); }
+                else { self.maxFiles(1); }
+            });
 
-        this.imagesOnly = params.config.imagesOnly;
-        params.config.maxFiles.subscribe((val) => self.maxFiles(val));
-        this.activated = params.config.activateMax;
+            this.imagesOnly = params.config.imagesOnly;
+            params.config.maxFiles.subscribe((val) => self.maxFiles(val));
+            this.activated = params.config.activateMax;
+        }
     };
 
     ko.components.register(name, {