This is an automated email from the ASF dual-hosted git repository.
kbhatt pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit adff44e740cfc379f0e7e0a32c2f3e2c2ac42f6d
Author: kevalbhatt <kbh...@apache.org>
AuthorDate: Thu Jun 25 21:08:53 2020 +0530
ATLAS-3156:- UI:No loading animation while creating or deleting a
Classification, Term, SaveSearch loading #4
---
dashboardv2/public/js/views/glossary/GlossaryLayoutView.js | 11 ++++++++---
dashboardv2/public/js/views/search/save/SaveSearchView.js | 7 ++++++-
dashboardv2/public/js/views/tag/TagLayoutView.js | 12 ++++++++----
.../js/views/search/tree/ClassificationTreeLayoutView.js | 9 ++++++++-
.../js/views/search/tree/CustomFilterTreeLayoutView.js | 9 ++++++++-
.../public/js/views/search/tree/GlossaryTreeLayoutView.js | 13 ++++++++-----
6 files changed, 46 insertions(+), 15 deletions(-)
diff --git a/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
b/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
index ed01560..d0fcb31 100644
--- a/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
+++ b/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
@@ -707,12 +707,17 @@ define(['require',
}) : null,
updateTabState: true
});
+ },
+ complete: function() {
+ that.notificationModal.hideButtonLoader();
+ that.notificationModal.remove();
}
},
notifyObj = {
modal: true,
- ok: function(argument) {
- that.changeLoaderState(true);
+ ok: function(obj) {
+ that.notificationModal = obj;
+ obj.showButtonLoader();
if (type == "Glossary") {
that.glossaryCollection.fullCollection.get(guid).destroy(options, { silent:
true, reset: false });
} else if (type == "GlossaryCategory") {
@@ -720,8 +725,8 @@ define(['require',
} else if (type == "GlossaryTerm") {
new
that.glossaryCollection.model().deleteTerm(guid, options);
}
- that.changeLoaderState(false);
},
+ okCloses: false,
cancel: function(argument) {}
};
if (type == "Glossary") {
diff --git a/dashboardv2/public/js/views/search/save/SaveSearchView.js
b/dashboardv2/public/js/views/search/save/SaveSearchView.js
index f4690da..436d83d 100644
--- a/dashboardv2/public/js/views/search/save/SaveSearchView.js
+++ b/dashboardv2/public/js/views/search/save/SaveSearchView.js
@@ -177,9 +177,12 @@ define(['require',
modal: true,
html: true,
text: Messages.conformation.deleteMessage + "<b>" +
_.escape(options.model.get('name')) + "</b>" + " ?",
- ok: function(argument) {
+ ok: function(obj) {
+ that.notificationModal = obj;
+ obj.showButtonLoader();
that.onDeleteNotifyOk(options);
},
+ okCloses: false,
cancel: function(argument) {}
}
Utils.notifyConfirm(notifyObj);
@@ -194,6 +197,8 @@ define(['require',
if (that.collection) {
that.collection.remove(model);
}
+ that.notificationModal.hideButtonLoader();
+ that.notificationModal.remove();
Utils.notifySuccess({
content: options.model.get('name') +
Messages.getAbbreviationMsg(false, 'deleteSuccessMessage')
});
diff --git a/dashboardv2/public/js/views/tag/TagLayoutView.js
b/dashboardv2/public/js/views/tag/TagLayoutView.js
index a9af2e1..b23bd98 100644
--- a/dashboardv2/public/js/views/tag/TagLayoutView.js
+++ b/dashboardv2/public/js/views/tag/TagLayoutView.js
@@ -583,9 +583,12 @@ define(['require',
var that = this,
notifyObj = {
modal: true,
- ok: function(argument) {
+ ok: function(obj) {
+ that.notificationModal = obj;
+ obj.showButtonLoader();
that.onNotifyOk();
},
+ okCloses: false,
cancel: function(argument) {}
}
var text = "Are you sure you want to delete the classification"
@@ -595,7 +598,6 @@ define(['require',
onNotifyOk: function(data) {
var that = this,
deleteTagData = this.collection.fullCollection.findWhere({
name: this.tag });
- that.changeLoaderState(true);
deleteTagData.deleteTag({
typeName: that.tag,
success: function() {
@@ -612,8 +614,10 @@ define(['require',
// to update tag list of search tab fetch typeHeaders.
that.typeHeaders.fetch({ reset: true });
},
- cust_error: function() {
- that.changeLoaderState(false);
+ cust_error: function() {},
+ complete: function() {
+ that.notificationModal.hideButtonLoader();
+ that.notificationModal.remove();
}
});
}
diff --git
a/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
b/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
index 0b2227f..08c6538 100644
--- a/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
+++ b/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
@@ -814,9 +814,12 @@ define([
var that = this,
notifyObj = {
modal: true,
- ok: function(argument) {
+ ok: function(obj) {
+ that.notificationModal = obj;
+ obj.showButtonLoader();
that.onNotifyOk();
},
+ okCloses: false,
cancel: function(argument) {}
};
var text = "Are you sure you want to delete the classification";
@@ -853,6 +856,10 @@ define([
delete urlObj.tag;
var url = urlObj.type || urlObj.term ||
urlObj.query ? "#!/search/searchResult" : "#!/search"
that.triggerSearch(urlObj, url);
+ },
+ complete: function() {
+ that.notificationModal.hideButtonLoader();
+ that.notificationModal.remove();
}
});
} else {
diff --git
a/dashboardv3/public/js/views/search/tree/CustomFilterTreeLayoutView.js
b/dashboardv3/public/js/views/search/tree/CustomFilterTreeLayoutView.js
index 53e9da8..ac70024 100644
--- a/dashboardv3/public/js/views/search/tree/CustomFilterTreeLayoutView.js
+++ b/dashboardv3/public/js/views/search/tree/CustomFilterTreeLayoutView.js
@@ -430,9 +430,12 @@ define([
modal: true,
html: true,
text: Messages.conformation.deleteMessage + "<b>" +
_.escape(options.model.get('name')) + "</b>" + " ?",
- ok: function(argument) {
+ ok: function(obj) {
+ that.notificationModal = obj;
+ obj.showButtonLoader();
that.onDeleteNotifyOk(options);
},
+ okCloses: false,
cancel: function(argument) {}
}
Utils.notifyConfirm(notifyObj);
@@ -451,6 +454,10 @@ define([
Utils.notifySuccess({
content: options.model.attributes.name +
Messages.getAbbreviationMsg(false, 'deleteSuccessMessage')
});
+ },
+ complete: function() {
+ that.notificationModal.hideButtonLoader();
+ that.notificationModal.remove();
}
});
} else {
diff --git a/dashboardv3/public/js/views/search/tree/GlossaryTreeLayoutView.js
b/dashboardv3/public/js/views/search/tree/GlossaryTreeLayoutView.js
index 0f10607..c96b03b 100644
--- a/dashboardv3/public/js/views/search/tree/GlossaryTreeLayoutView.js
+++ b/dashboardv3/public/js/views/search/tree/GlossaryTreeLayoutView.js
@@ -525,7 +525,6 @@ define([
return obj.termGuid == guid;
}), { silent: true });
}
-
Utils.notifySuccess({
content: messageType +
Messages.getAbbreviationMsg(false, 'deleteSuccessMessage')
});
@@ -541,23 +540,27 @@ define([
searchParam = _.extend({}, that.options.value,
params);
that.triggerSearch(searchParam);
}
+ },
+ complete: function() {
+ that.notificationModal.hideButtonLoader();
+ that.notificationModal.remove();
}
},
notifyObj = {
modal: true,
- ok: function(argument) {
+ ok: function(obj) {
+ that.notificationModal = obj;
+ obj.showButtonLoader();
if (type == "Glossary" || type == "GLOSSARY") {
that.glossaryCollection.fullCollection.get(guid).destroy(options, { silent:
true, reset: false });
-
} else if (type == "GlossaryCategory") {
new
that.glossaryCollection.model().deleteCategory(guid, options);
} else if (type == "GlossaryTerm") {
new
that.glossaryCollection.model().deleteTerm(guid, options);
-
}
-
},
+ okCloses: false,
cancel: function(argument) {}
};
if (type == "Glossary" || type == "GLOSSARY") {
