adds the ability to change the preview limit for the bulk data editor…

…, re #10547
archesproject · Jan 20, 2024 · fc6bc6e · fc6bc6e
1 parent 4c5f237
commit fc6bc6e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/arches/app/etl_modules/base_data_editor.py b/arches/app/etl_modules/base_data_editor.py
@@ -231,7 +231,7 @@ def edit_staged_data(self, cursor, graph_id, node_id, operation, language_code,
             result["message"] = _("Unable to edit staged data: {}").format(str(e))
         return result
 
-    def get_preview_data(self, node_id, search_url, language_code, operation, old_text, case_insensitive, whole_word):
+    def get_preview_data(self, node_id, search_url, language_code, operation, old_text, case_insensitive, whole_word, preview_limit):
         request = HttpRequest()
         request.user = self.request.user
         request.method = "GET"
@@ -312,7 +312,7 @@ def get_preview_data(self, node_id, search_url, language_code, operation, old_te
         nested_agg.add_aggregation(search_filter_agg)
 
         se = SearchEngineFactory().create()
-        query = Query(se, limit=5)
+        query = Query(se, limit=preview_limit)
 
         query.add_query(search_url_query)
         query.add_aggregation(nested_agg)
@@ -326,7 +326,7 @@ def get_preview_data(self, node_id, search_url, language_code, operation, old_te
         number_of_resources = results['hits']['total']['value']
         number_of_tiles = results["aggregations"]["tile_agg"]["string_search"]["buckets"][0]["doc_count"]
 
-        return values[:5], number_of_tiles, number_of_resources
+        return values[:preview_limit], number_of_tiles, number_of_resources
 
     def preview(self, request):
         graph_id = request.POST.get("graph_id", None)
@@ -341,6 +341,8 @@ def preview(self, request):
         also_trim = request.POST.get("also_trim", "false")
         search_url = request.POST.get("search_url", None)
 
+        preview_limit = ETLModule.objects.get(pk=self.moduleid).config.get("previewLimit", 5)
+
         try:
             self.validate_inputs(request)
         except MissingRequiredInputError as e:
@@ -374,7 +376,7 @@ def preview(self, request):
 
         try:
             first_five_values, number_of_tiles, number_of_resources = self.get_preview_data(
-                node_id, search_url, language_code, operation, old_text, case_insensitive, whole_word
+                node_id, search_url, language_code, operation, old_text, case_insensitive, whole_word, preview_limit
             )
         except TypeError:
             return {
@@ -408,7 +410,7 @@ def preview(self, request):
 
         return {
             "success": True,
-            "data": {"value": return_list, "number_of_tiles": number_of_tiles, "number_of_resources": number_of_resources},
+            "data": {"value": return_list, "number_of_tiles": number_of_tiles, "number_of_resources": number_of_resources, "preview_limit": preview_limit},
         }
 
     def write(self, request):

diff --git a/arches/app/media/js/views/components/etl_modules/base-bulk-string-editor.js b/arches/app/media/js/views/components/etl_modules/base-bulk-string-editor.js
@@ -57,6 +57,7 @@ define([
         this.loadId = params.loadId || uuid.generate();
         this.resourceids = ko.observable();
         this.previewValue = ko.observable();
+        this.previewLimit = ko.observable();
         this.showPreview = ko.observable(false);
         this.searchUrl = ko.observable();
         this.caseInsensitive = ko.observable();
@@ -204,6 +205,7 @@ define([
                 self.showPreview(true);
                 self.numberOfResources(data.result.number_of_resources);
                 self.numberOfTiles(data.result.number_of_tiles);
+                self.previewLimit(data.result.preview_limit);
             }).fail(function(err) {
                 self.alert(
                     new JsonErrorAlertViewModel(

diff --git a/arches/app/models/migrations/9219_divide_individual_editors.py b/arches/app/models/migrations/9219_divide_individual_editors.py
@@ -26,7 +26,7 @@ class Migration(migrations.Migration):
                 'bulk-trim-editor',
                 'base_data_editor.py',
                 'BulkStringEditor',
-                '{"bgColor": "#2ecc71", "circleColor": "#51D88C", "show": true}',
+                '{"bgColor": "#2ecc71", "circleColor": "#51D88C", "show": true, "previewLimit": 5}',
                 'fa fa-edit',
                 'bulk-trim-editor'
             ),
@@ -39,7 +39,7 @@ class Migration(migrations.Migration):
                 'bulk-case-editor',
                 'base_data_editor.py',
                 'BulkStringEditor',
-                '{"bgColor": "#7EC8E3", "circleColor": "#AEC6CF", "show": true}',
+                '{"bgColor": "#7EC8E3", "circleColor": "#AEC6CF", "show": true, "previewLimit": 5}',
                 'fa fa-edit',
                 'bulk-case-editor'
             ),
@@ -52,7 +52,7 @@ class Migration(migrations.Migration):
                 'bulk-replace-editor',
                 'base_data_editor.py',
                 'BulkStringEditor',
-                '{"bgColor": "#27ae60", "circleColor": "#51D88C", "show": true}',
+                '{"bgColor": "#27ae60", "circleColor": "#51D88C", "show": true, "previewLimit": 5}',
                 'fa fa-edit',
                 'bulk-replace-editor'
             );

diff --git a/arches/app/templates/views/components/etl_modules/base-bulk-string-editor.htm b/arches/app/templates/views/components/etl_modules/base-bulk-string-editor.htm
@@ -146,7 +146,7 @@ <h3 style="margin-top: 0px;">
         <!-- /ko -->
         <!-- ko if: numberOfTiles() > 0 -->
         <h3 style="margin-top: 0px;">
-            <span data-bind="text: $root.translations.previewCountStats(numberOfTiles()>5?5:numberOfTiles(),numberOfTiles(),numberOfResources())"></span>
+            <span data-bind="text: $root.translations.previewCountStats(numberOfTiles()>previewLimit()?previewLimit():numberOfTiles(),numberOfTiles(),numberOfResources())"></span>
         </h3>
         <h3 style="margin-top: 0px;color:red;" data-bind="if: numberOfTiles() > config.updateLimit">
             <span style="margin: 2px;" class="fa fa-info-circle"></span><span data-bind="text: $root.translations.bulkEditLimitWarning(config.updateLimit.toLocaleString())"></span>