Skip to content

A
atlas
Commit 177b01bc by kevalbhatt
Options

ATLAS-3156:- UI:No loading animation while creating or deleting a…

ATLAS-3156:- UI:No loading animation while creating or deleting a Classification, Term, SaveSearch loading #4
parent aa86d62c
Showing with 46 additions and 15 deletions
dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
...@@ -707,12 +707,17 @@ define(['require', ...@@ -707,12 +707,17 @@ define(['require',
}) : null, }) : null,
updateTabState: true updateTabState: true
}); });
},
complete: function() {
that.notificationModal.hideButtonLoader();
that.notificationModal.remove();
} }
}, },
notifyObj = { notifyObj = {
modal: true, modal: true,
ok: function(argument) { ok: function(obj) {
that.changeLoaderState(true); that.notificationModal = obj;
obj.showButtonLoader();
if (type == "Glossary") { if (type == "Glossary") {
that.glossaryCollection.fullCollection.get(guid).destroy(options, { silent: true, reset: false }); that.glossaryCollection.fullCollection.get(guid).destroy(options, { silent: true, reset: false });
} else if (type == "GlossaryCategory") { } else if (type == "GlossaryCategory") {
...@@ -720,8 +725,8 @@ define(['require', ...@@ -720,8 +725,8 @@ define(['require',
} else if (type == "GlossaryTerm") { } else if (type == "GlossaryTerm") {
new that.glossaryCollection.model().deleteTerm(guid, options); new that.glossaryCollection.model().deleteTerm(guid, options);
} }
that.changeLoaderState(false);
}, },
okCloses: false,
cancel: function(argument) {} cancel: function(argument) {}
}; };
if (type == "Glossary") { if (type == "Glossary") {
......
dashboardv2/public/js/views/search/save/SaveSearchView.js
...@@ -177,9 +177,12 @@ define(['require', ...@@ -177,9 +177,12 @@ define(['require',
modal: true, modal: true,
html: true, html: true,
text: Messages.conformation.deleteMessage + "<b>" + _.escape(options.model.get('name')) + "</b>" + " ?", 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); that.onDeleteNotifyOk(options);
}, },
okCloses: false,
cancel: function(argument) {} cancel: function(argument) {}
} }
Utils.notifyConfirm(notifyObj); Utils.notifyConfirm(notifyObj);
...@@ -194,6 +197,8 @@ define(['require', ...@@ -194,6 +197,8 @@ define(['require',
if (that.collection) { if (that.collection) {
that.collection.remove(model); that.collection.remove(model);
} }
that.notificationModal.hideButtonLoader();
that.notificationModal.remove();
Utils.notifySuccess({ Utils.notifySuccess({
content: options.model.get('name') + Messages.getAbbreviationMsg(false, 'deleteSuccessMessage') content: options.model.get('name') + Messages.getAbbreviationMsg(false, 'deleteSuccessMessage')
}); });
......
dashboardv2/public/js/views/tag/TagLayoutView.js
...@@ -583,9 +583,12 @@ define(['require', ...@@ -583,9 +583,12 @@ define(['require',
var that = this, var that = this,
notifyObj = { notifyObj = {
modal: true, modal: true,
ok: function(argument) { ok: function(obj) {
that.notificationModal = obj;
obj.showButtonLoader();
that.onNotifyOk(); that.onNotifyOk();
}, },
okCloses: false,
cancel: function(argument) {} cancel: function(argument) {}
} }
var text = "Are you sure you want to delete the classification" var text = "Are you sure you want to delete the classification"
...@@ -595,7 +598,6 @@ define(['require', ...@@ -595,7 +598,6 @@ define(['require',
onNotifyOk: function(data) { onNotifyOk: function(data) {
var that = this, var that = this,
deleteTagData = this.collection.fullCollection.findWhere({ name: this.tag }); deleteTagData = this.collection.fullCollection.findWhere({ name: this.tag });
that.changeLoaderState(true);
deleteTagData.deleteTag({ deleteTagData.deleteTag({
typeName: that.tag, typeName: that.tag,
success: function() { success: function() {
...@@ -612,8 +614,10 @@ define(['require', ...@@ -612,8 +614,10 @@ define(['require',
// to update tag list of search tab fetch typeHeaders. // to update tag list of search tab fetch typeHeaders.
that.typeHeaders.fetch({ reset: true }); that.typeHeaders.fetch({ reset: true });
}, },
cust_error: function() { cust_error: function() {},
that.changeLoaderState(false); complete: function() {
that.notificationModal.hideButtonLoader();
that.notificationModal.remove();
} }
}); });
} }
......
dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
...@@ -814,9 +814,12 @@ define([ ...@@ -814,9 +814,12 @@ define([
var that = this, var that = this,
notifyObj = { notifyObj = {
modal: true, modal: true,
ok: function(argument) { ok: function(obj) {
that.notificationModal = obj;
obj.showButtonLoader();
that.onNotifyOk(); that.onNotifyOk();
}, },
okCloses: false,
cancel: function(argument) {} cancel: function(argument) {}
}; };
var text = "Are you sure you want to delete the classification"; var text = "Are you sure you want to delete the classification";
...@@ -853,6 +856,10 @@ define([ ...@@ -853,6 +856,10 @@ define([
delete urlObj.tag; delete urlObj.tag;
var url = urlObj.type || urlObj.term || urlObj.query ? "#!/search/searchResult" : "#!/search" var url = urlObj.type || urlObj.term || urlObj.query ? "#!/search/searchResult" : "#!/search"
that.triggerSearch(urlObj, url); that.triggerSearch(urlObj, url);
},
complete: function() {
that.notificationModal.hideButtonLoader();
that.notificationModal.remove();
} }
}); });
} else { } else {
......
dashboardv3/public/js/views/search/tree/CustomFilterTreeLayoutView.js
...@@ -430,9 +430,12 @@ define([ ...@@ -430,9 +430,12 @@ define([
modal: true, modal: true,
html: true, html: true,
text: Messages.conformation.deleteMessage + "<b>" + _.escape(options.model.get('name')) + "</b>" + " ?", 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); that.onDeleteNotifyOk(options);
}, },
okCloses: false,
cancel: function(argument) {} cancel: function(argument) {}
} }
Utils.notifyConfirm(notifyObj); Utils.notifyConfirm(notifyObj);
...@@ -451,6 +454,10 @@ define([ ...@@ -451,6 +454,10 @@ define([
Utils.notifySuccess({ Utils.notifySuccess({
content: options.model.attributes.name + Messages.getAbbreviationMsg(false, 'deleteSuccessMessage') content: options.model.attributes.name + Messages.getAbbreviationMsg(false, 'deleteSuccessMessage')
}); });
},
complete: function() {
that.notificationModal.hideButtonLoader();
that.notificationModal.remove();
} }
}); });
} else { } else {
......
dashboardv3/public/js/views/search/tree/GlossaryTreeLayoutView.js
...@@ -525,7 +525,6 @@ define([ ...@@ -525,7 +525,6 @@ define([
return obj.termGuid == guid; return obj.termGuid == guid;
}), { silent: true }); }), { silent: true });
} }
Utils.notifySuccess({ Utils.notifySuccess({
content: messageType + Messages.getAbbreviationMsg(false, 'deleteSuccessMessage') content: messageType + Messages.getAbbreviationMsg(false, 'deleteSuccessMessage')
}); });
...@@ -541,23 +540,27 @@ define([ ...@@ -541,23 +540,27 @@ define([
searchParam = _.extend({}, that.options.value, params); searchParam = _.extend({}, that.options.value, params);
that.triggerSearch(searchParam); that.triggerSearch(searchParam);
} }
},
complete: function() {
that.notificationModal.hideButtonLoader();
that.notificationModal.remove();
} }
}, },
notifyObj = { notifyObj = {
modal: true, modal: true,
ok: function(argument) { ok: function(obj) {
that.notificationModal = obj;
obj.showButtonLoader();
if (type == "Glossary" || type == "GLOSSARY") { if (type == "Glossary" || type == "GLOSSARY") {
that.glossaryCollection.fullCollection.get(guid).destroy(options, { silent: true, reset: false }); that.glossaryCollection.fullCollection.get(guid).destroy(options, { silent: true, reset: false });
} else if (type == "GlossaryCategory") { } else if (type == "GlossaryCategory") {
new that.glossaryCollection.model().deleteCategory(guid, options); new that.glossaryCollection.model().deleteCategory(guid, options);
} else if (type == "GlossaryTerm") { } else if (type == "GlossaryTerm") {
new that.glossaryCollection.model().deleteTerm(guid, options); new that.glossaryCollection.model().deleteTerm(guid, options);
} }
}, },
okCloses: false,
cancel: function(argument) {} cancel: function(argument) {}
}; };
if (type == "Glossary" || type == "GLOSSARY") { if (type == "Glossary" || type == "GLOSSARY") {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment