[atlas] branch master updated: ATLAS-3711 : UI: Classification/Term modal should close after create/update/delete response (#3 PropagationPropertyModal loader added)

[kbhatt]

This is an automated email from the ASF dual-hosted git repository.

kbhatt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/atlas.git


The following commit(s) were added to refs/heads/master by this push:
     new ad226dd  ATLAS-3711 : UI: Classification/Term modal should close after 
create/update/delete response (#3 PropagationPropertyModal loader added)
ad226dd is described below

commit ad226ddd9c4c13b0f9e5a3e3d8fe6de2299957aa
Author: kevalbhatt <kbh...@apache.org>
AuthorDate: Fri Apr 17 15:28:32 2020 +0530

    ATLAS-3711 : UI: Classification/Term modal should close after 
create/update/delete response (#3 PropagationPropertyModal loader added)
---
 dashboardv2/public/js/views/graph/PropagationPropertyModal.js | 6 ++----
 dashboardv3/public/js/views/graph/PropagationPropertyModal.js | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/dashboardv2/public/js/views/graph/PropagationPropertyModal.js 
b/dashboardv2/public/js/views/graph/PropagationPropertyModal.js
index 8bba109..a90115c 100644
--- a/dashboardv2/public/js/views/graph/PropagationPropertyModal.js
+++ b/dashboardv2/public/js/views/graph/PropagationPropertyModal.js
@@ -236,9 +236,6 @@ define(['require',
                 entityId = that.ui.propagationOptions.attr('entity-id'),
                 PropagationValue = 
this.$("input[name='propagateRelation']:checked").val(),
                 relationshipProp = {};
-            if (PropagationValue === 
this.ui.propagationOptions.attr("propagation")) {
-                return;
-            }
             this.ui.propagationOptions.attr("propagation", PropagationValue);
             if (this.viewType == "flow") {
                 relationshipProp = {
@@ -306,11 +303,12 @@ define(['require',
             
this.ui.PropagatedClassificationTable.append(_.isEmpty(propagationStringValue) 
? "No Records Found." : classificationTableValue);
         },
         showLoader: function() {
-            this.modal.$el.find('button.ok').attr("disabled", true);
+            this.modal.$el.find('button.ok').showButtonLoader();
             this.$('.overlay').removeClass('hide').addClass('show');
         },
         hideLoader: function(options) {
             var buttonDisabled = options && options.buttonDisabled;
+            this.modal.$el.find('button.ok').hideButtonLoader();
             this.modal.$el.find('button.ok').attr("disabled", buttonDisabled ? 
buttonDisabled : false);
             this.$('.overlay').removeClass('show').addClass('hide');
         },
diff --git a/dashboardv3/public/js/views/graph/PropagationPropertyModal.js 
b/dashboardv3/public/js/views/graph/PropagationPropertyModal.js
index 8bba109..a90115c 100644
--- a/dashboardv3/public/js/views/graph/PropagationPropertyModal.js
+++ b/dashboardv3/public/js/views/graph/PropagationPropertyModal.js
@@ -236,9 +236,6 @@ define(['require',
                 entityId = that.ui.propagationOptions.attr('entity-id'),
                 PropagationValue = 
this.$("input[name='propagateRelation']:checked").val(),
                 relationshipProp = {};
-            if (PropagationValue === 
this.ui.propagationOptions.attr("propagation")) {
-                return;
-            }
             this.ui.propagationOptions.attr("propagation", PropagationValue);
             if (this.viewType == "flow") {
                 relationshipProp = {
@@ -306,11 +303,12 @@ define(['require',
             
this.ui.PropagatedClassificationTable.append(_.isEmpty(propagationStringValue) 
? "No Records Found." : classificationTableValue);
         },
         showLoader: function() {
-            this.modal.$el.find('button.ok').attr("disabled", true);
+            this.modal.$el.find('button.ok').showButtonLoader();
             this.$('.overlay').removeClass('hide').addClass('show');
         },
         hideLoader: function(options) {
             var buttonDisabled = options && options.buttonDisabled;
+            this.modal.$el.find('button.ok').hideButtonLoader();
             this.modal.$el.find('button.ok').attr("disabled", buttonDisabled ? 
buttonDisabled : false);
             this.$('.overlay').removeClass('show').addClass('hide');
         },