Merge pull request #9846 from archesproject/9845_spinner_on_preview_b…

…utton spinner on preview button, #9845
archesproject · Jul 28, 2023 · 2ec3ef4 · 2ec3ef4
2 parents 5b682c8 + f7ffb0c
commit 2ec3ef4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
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
@@ -33,6 +33,7 @@ define([
         this.alert = params.alert;
         this.moduleId = params.etlmoduleid;
         this.loading(true);
+        this.previewing = ko.observable();
         this.languages = ko.observable(arches.languages);
         this.selectedLanguage = ko.observable();
         this.graphs = ko.observable();
@@ -83,6 +84,7 @@ define([
         this.ready = ko.computed(() => {
             const ready = !!self.selectedGraph() &&
                 !!self.selectedNode() &&
+                !self.previewing() &&
                 ((self.operation() == 'replace' && !!self.oldText() && !!self.newText() || self.operation() != 'replace'));
             return ready;
         });
@@ -147,6 +149,11 @@ define([
             if (!self.ready()) {
                 return;
             }
+
+            self.previewing(true);
+            self.showPreview(false);
+            self.previewValue([]);
+
             if (self.operation() === 'replace' && (!self.oldText() || !self.newText())){
                 self.alert(
                     new AlertViewModel(
@@ -169,6 +176,7 @@ define([
             }).fail(function(err) {
                 console.log(err);
             }).always(function() {
+                self.previewing(false);
                 self.deleteAllFormData();
             });
         };
@@ -194,7 +202,6 @@ define([
             self.loading(true);
             self.submit('write').then(data => {
                 params.activeTab("import");
-                console.log(data.result);
             }).fail( function(err) {
                 self.alert(
                     new JsonErrorAlertViewModel(

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
@@ -128,6 +128,7 @@ <h3>
         </div>
         <button data-bind="click: preview, css: {disabled: !ready()}" class="btn btn-success">
             <span data-bind="text: $root.translations.preview"></span>
+            <i class="fa fa-spin fa-spinner" data-bind="visible: previewing()"></i>
         </button>
     </section>
     <!-- ko if: showPreview-->