Skip to content

A
atlas
Commit 10a11053 by sameer79 Committed by kevalbhatt
Options

ATLAS-3505 : UI: Improve notification message format.

Signed-off-by: 's avatarkevalbhatt <kbhatt@apache.org>
parent d528d275
Showing with 90 additions and 81 deletions
dashboardv2/public/js/utils/CommonViewFunction.js
......@@ -37,7 +37,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
skipDefaultError: true,
success: function(data) {
Utils.notifySuccess({
content: "Classification " + options.tagName + Messages.removeSuccessMessage
content: "Classification " + options.tagName + Messages.getAbbreviationMsg(abbrev, 'removeSuccessMessage')
});
if (options.callback) {
options.callback();
......@@ -716,8 +716,9 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
var ajaxOptions = {
silent: true,
success: function(rModel, response) {
var msgType = model ? "editSuccessMessage" : "addSuccessMessage";
Utils.notifySuccess({
content: messageType + ref.ui.name.val() + Messages[model ? "editSuccessMessage" : "addSuccessMessage"]
content: messageType + ref.ui.name.val() + Messages.getAbbreviationMsg(false, msgType)
});
if (options.callback) {
options.callback(rModel);
......@@ -882,4 +883,4 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
}
}
return CommonViewFunction;
});
\ No newline at end of file
});
dashboardv2/public/js/utils/Messages.js
......@@ -21,14 +21,14 @@ define(['require'], function(require) {
var Messages = {
defaultErrorMessage: "Something went wrong",
addSuccessMessage: " has been created successfully",
addSuccessMessage: " created successfully",
addErrorMessage: " could not be Created",
removeTag: "Remove Classification Assignment",
deleteSuccessMessage: " has been deleted successfully",
deleteSuccessMessage: " deleted successfully",
deleteErrorMessage: " could not be deleted",
removeSuccessMessage: " has been removed successfully",
removeSuccessMessage: " removed successfully",
removeErrorMessage: " could not be removed",
editSuccessMessage: " has been updated successfully",
editSuccessMessage: " updated successfully",
assignDeletedEntity: " is deleted, Classification cannot be assigned",
assignTermDeletedEntity: " is deleted, Term cannot be assigned",
conformation: {
......@@ -52,8 +52,11 @@ define(['require'], function(require) {
removeTermfromCategory: "Remove Term Assignment",
removeTermfromEntity: "Remove Term Assignment",
removeCategoryfromTerm: "Remove Category Assignment"
},
getAbbreviationMsg: function(abbrev, type) {
var msg = abbrev ? "s were" : " was";
return msg + this[type];
}
};
return Messages;
});
\ No newline at end of file
});
dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
......@@ -462,7 +462,7 @@ define(['require',
},
initializeValidation: function() {
// IE9 allow input type number
var regex = /^[0-9]*((?=[^.]|$))?$/, // allow only numbers [0-9]
var regex = /^[0-9]*((?=[^.]|$))?$/, // allow only numbers [0-9]
removeText = function(e, value) {
if (!regex.test(value)) {
var txtfld = e.currentTarget;
......@@ -471,7 +471,7 @@ define(['require',
}
}
this.$('input[data-type="int"],input[data-type="long"]').on('keydown', function(e) {
// allow only numbers [0-9]
// allow only numbers [0-9]
if (!regex.test(e.currentTarget.value)) {
return false;
}
......@@ -764,8 +764,9 @@ define(['require',
type: "POST",
success: function(model, response) {
that.modal.close();
var msgType = that.guid ? 'editSuccessMessage' : 'addSuccessMessage';
Utils.notifySuccess({
content: "Entity " + Messages[that.guid ? 'editSuccessMessage' : 'addSuccessMessage']
content: "Entity " + Messages.getAbbreviationMsg(false, msgType)
});
if (that.guid && that.callback) {
that.callback();
......@@ -939,4 +940,4 @@ define(['require',
}
});
return CreateEntityLayoutView;
});
\ No newline at end of file
});
dashboardv2/public/js/views/entity/EntityLabelDefineView.js
......@@ -92,14 +92,17 @@ define(['require',
data: JSON.stringify(payload),
type: 'POST',
success: function() {
var msg = entityJson.labels === undefined ? 'addSuccessMessage' : 'editSuccessMessage';
var msg = entityJson.labels === undefined ? 'addSuccessMessage' : 'editSuccessMessage',
caption = "One or more label";
if (payload.length === 0) {
msg = 'removeSuccessMessage';
caption = "One or more existing label";
that.entityModel.unset('labels');
} else {
that.entityModel.set('labels', payload);
}
Utils.notifySuccess({
content: "Labels " + Messages[msg]
content: caption + Messages.getAbbreviationMsg(true, msg)
});
that.swapItem = false;
that.saveLabels = false;
......
dashboardv2/public/js/views/entity/EntityUserDefineView.js
......@@ -95,7 +95,7 @@ define(['require',
});
},
onEditAttrClick: function () {
this.initialCall = false;
this.initialCall = this.customAttibutes.length > 0 ? false : true;
this.setAttributeModal(this.itemView);
},
structureAttributes: function (list) {
......@@ -115,10 +115,15 @@ define(['require',
data: JSON.stringify(payload),
type: 'POST',
success: function() {
var msg = that.initialCall ? 'addSuccessMessage' : 'editSuccessMessage';
var msg = that.initialCall ? 'addSuccessMessage' : 'editSuccessMessage',
caption = "One or more user-defined propertie"; // 's' will be added in abbreviation function
that.customAttibutes = list;
if (list.length === 0) {
msg = 'removeSuccessMessage';
caption = "One or more existing user-defined propertie";
}
Utils.notifySuccess({
content: "User-defined properties " + Messages[msg]
content: caption + Messages.getAbbreviationMsg(true, msg)
});
that.swapItem = false;
that.saveAttrItems = false;
......
dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
......@@ -652,7 +652,7 @@ define(['require',
}
}
Utils.notifySuccess({
content: messageType + Messages.deleteSuccessMessage
content: messageType + Messages.getAbbreviationMsg(false, 'deleteSuccessMessage')
});
var url = gId ? '#!/glossary/' + gId : '#!/glossary';
if (gId == null) {
......@@ -743,4 +743,4 @@ define(['require',
}
});
return GlossaryLayoutView;
});
\ No newline at end of file
});
dashboardv2/public/js/views/search/save/SaveModalLayoutView.js
......@@ -110,12 +110,12 @@ define(['require',
collectionRef.set(data);
}
Utils.notifySuccess({
content: obj.name + Messages.editSuccessMessage
content: obj.name + Messages.getAbbreviationMsg(false, "editSuccessMessage")
});
} else {
that.collection.add(data);
Utils.notifySuccess({
content: obj.name + Messages.addSuccessMessage
content: obj.name + Messages.getAbbreviationMsg(false, "addSuccessMessage")
});
}
}
......@@ -128,4 +128,4 @@ define(['require',
}
});
return SaveModalLayoutView;
});
\ No newline at end of file
});
dashboardv2/public/js/views/search/save/SaveSearchView.js
......@@ -195,10 +195,10 @@ define(['require',
that.collection.remove(model);
}
Utils.notifySuccess({
content: options.model.get('name') + Messages.deleteSuccessMessage
content: options.model.get('name') + Messages.getAbbreviationMsg(false, 'deleteSuccessMessage')
});
}
});
}
});
});
\ No newline at end of file
});
dashboardv2/public/js/views/tag/TagLayoutView.js
......@@ -493,7 +493,7 @@ define(['require',
that.collection.fullCollection.add(classificationDefs);
that.setUrl('#!/tag/tagAttribute/' + ref.ui.tagName.val(), true);
Utils.notifySuccess({
content: "Classification " + that.name + Messages.addSuccessMessage
content: "Classification " + that.name + Messages.getAbbreviationMsg(false, 'addSuccessMessage')
});
modal.trigger('cancel');
that.typeHeaders.fetch({ reset: true });
......@@ -574,7 +574,7 @@ define(['require',
typeName: that.tag,
success: function() {
Utils.notifySuccess({
content: "Classification " + that.tag + Messages.deleteSuccessMessage
content: "Classification " + that.tag + Messages.getAbbreviationMsg(false, 'deleteSuccessMessage')
});
// if deleted tag is prviously searched then remove that tag url from save state of tab.
var searchUrl = Globals.saveApplicationState.tabState.searchUrl;
......@@ -590,4 +590,4 @@ define(['require',
}
});
return TagLayoutView;
});
\ No newline at end of file
});
dashboardv3/public/js/utils/CommonViewFunction.js
......@@ -37,7 +37,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
skipDefaultError: true,
success: function(data) {
Utils.notifySuccess({
content: "Classification " + options.tagName + Messages.removeSuccessMessage
content: "Classification " + options.tagName + Messages.getAbbreviationMsg(false, 'removeSuccessMessage')
});
if (options.callback) {
options.callback();
......@@ -736,8 +736,9 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
var ajaxOptions = {
silent: true,
success: function(rModel, response) {
var msgType = model ? "editSuccessMessage" : "addSuccessMessage";
Utils.notifySuccess({
content: messageType + ref.ui.name.val() + Messages[model ? "editSuccessMessage" : "addSuccessMessage"]
content: messageType + ref.ui.name.val() + Messages.getAbbreviationMsg(false, msgType)
});
if (options.callback) {
options.callback(rModel);
......@@ -902,4 +903,4 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
}
}
return CommonViewFunction;
});
\ No newline at end of file
});
dashboardv3/public/js/utils/Messages.js
......@@ -21,14 +21,14 @@ define(['require'], function(require) {
var Messages = {
defaultErrorMessage: "Something went wrong",
addSuccessMessage: " has been created successfully",
addSuccessMessage: " created successfully",
addErrorMessage: " could not be Created",
removeTag: "Remove Classification Assignment",
deleteSuccessMessage: " has been deleted successfully",
deleteSuccessMessage: " deleted successfully",
deleteErrorMessage: " could not be deleted",
removeSuccessMessage: " has been removed successfully",
removeSuccessMessage: " removed successfully",
removeErrorMessage: " could not be removed",
editSuccessMessage: " has been updated successfully",
editSuccessMessage: " updated successfully",
assignDeletedEntity: " is deleted, Classification cannot be assigned",
assignTermDeletedEntity: " is deleted, Term cannot be assigned",
conformation: {
......@@ -52,8 +52,11 @@ define(['require'], function(require) {
removeTermfromCategory: "Remove Term Assignment",
removeTermfromEntity: "Remove Term Assignment",
removeCategoryfromTerm: "Remove Category Assignment"
},
getAbbreviationMsg: function(abbrev, type) {
var msg = abbrev ? "s were" : " was";
return msg + this[type];
}
};
return Messages;
});
\ No newline at end of file
});
dashboardv3/public/js/views/entity/CreateEntityLayoutView.js
......@@ -464,7 +464,7 @@ define(['require',
},
initializeValidation: function() {
// IE9 allow input type number
var regex = /^[0-9]*((?=[^.]|$))?$/, // allow only numbers [0-9]
var regex = /^[0-9]*((?=[^.]|$))?$/, // allow only numbers [0-9]
removeText = function(e, value) {
if (!regex.test(value)) {
var txtfld = e.currentTarget;
......@@ -473,7 +473,7 @@ define(['require',
}
}
this.$('input[data-type="int"],input[data-type="long"]').on('keydown', function(e) {
// allow only numbers [0-9]
// allow only numbers [0-9]
if (!regex.test(e.currentTarget.value)) {
return false;
}
......@@ -766,8 +766,9 @@ define(['require',
type: "POST",
success: function(model, response) {
that.modal.close();
var msgType = that.guid ? "editSuccessMessage" : "addSuccessMessage";
Utils.notifySuccess({
content: "Entity " + Messages[that.guid ? 'editSuccessMessage' : 'addSuccessMessage']
content: "Entity" + Messages.getAbbreviationMsg(false, msgType)
});
if (that.guid && that.callback) {
that.callback();
......@@ -944,4 +945,4 @@ define(['require',
}
});
return CreateEntityLayoutView;
});
\ No newline at end of file
});
dashboardv3/public/js/views/entity/EntityLabelDefineView.js
......@@ -92,14 +92,17 @@ define(['require',
data: JSON.stringify(payload),
type: 'POST',
success: function() {
var msg = entityJson.labels === undefined ? 'addSuccessMessage' : 'editSuccessMessage';
var msg = entityJson.labels === undefined ? 'addSuccessMessage' : 'editSuccessMessage',
caption = "One or more label";
if (payload.length === 0) {
msg = 'removeSuccessMessage';
caption = "One or more existing label";
that.entityModel.unset('labels');
} else {
that.entityModel.set('labels', payload);
}
Utils.notifySuccess({
content: "Labels " + Messages[msg]
content: caption + Messages.getAbbreviationMsg(true, msg)
});
that.swapItem = false;
that.saveLabels = false;
......
dashboardv3/public/js/views/entity/EntityUserDefineView.js
......@@ -95,7 +95,7 @@ define(['require',
});
},
onEditAttrClick: function () {
this.initialCall = false;
this.initialCall = this.customAttibutes.length > 0 ? false : true;
this.setAttributeModal(this.itemView);
},
structureAttributes: function (list) {
......@@ -115,10 +115,15 @@ define(['require',
data: JSON.stringify(payload),
type: 'POST',
success: function() {
var msg = that.initialCall ? 'addSuccessMessage' : 'editSuccessMessage';
var msg = that.initialCall ? 'addSuccessMessage' : 'editSuccessMessage',
caption = "One or more user-defined propertie"; // 's' will be added in abbreviation function
that.customAttibutes = list;
if (list.length === 0) {
msg = 'removeSuccessMessage';
caption = "One or more existing user-defined propertie";
}
Utils.notifySuccess({
content: "User-defined properties " + Messages[msg]
content: caption + Messages.getAbbreviationMsg(true, msg)
});
that.swapItem = false;
that.saveAttrItems = false;
......
dashboardv3/public/js/views/glossary/GlossaryLayoutView.js
......@@ -653,7 +653,7 @@ define(['require',
}
}
Utils.notifySuccess({
content: messageType + Messages.deleteSuccessMessage
content: messageType + Messages.getAbbreviationMsg(false, 'deleteSuccessMessage')
});
var url = gId ? '#!/glossary/' + gId : '#!/glossary';
if (gId == null) {
......@@ -744,4 +744,4 @@ define(['require',
}
});
return GlossaryLayoutView;
});
\ No newline at end of file
});
dashboardv3/public/js/views/search/save/SaveModalLayoutView.js
......@@ -110,12 +110,12 @@ define(['require',
collectionRef.set(data);
}
Utils.notifySuccess({
content: obj.name + Messages.editSuccessMessage
content: obj.name + Messages.getAbbreviationMsg(false, 'editSuccessMessage')
});
} else {
that.collection.add(data);
Utils.notifySuccess({
content: obj.name + Messages.addSuccessMessage
content: obj.name + Messages.getAbbreviationMsg(false, 'addSuccessMessage')
});
}
}
......@@ -131,4 +131,4 @@ define(['require',
}
});
return SaveModalLayoutView;
});
\ No newline at end of file
});
dashboardv3/public/js/views/search/save/SaveSearchView.js
......@@ -195,10 +195,10 @@ define(['require',
that.collection.remove(model);
}
Utils.notifySuccess({
content: options.model.get('name') + Messages.deleteSuccessMessage
content: options.model.get('name') + Messages.getAbbreviationMsg(false, 'deleteSuccessMessage')
});
}
});
}
});
});
\ No newline at end of file
});
dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
......@@ -117,7 +117,7 @@ define([
if(tagValue.indexOf("*")!= -1 ){
that.findSearchResult(tagValue);
}
}
};
......@@ -708,7 +708,7 @@ define([
}
that.options.classificationDefCollection.fullCollection.add(classificationDefs);
Utils.notifySuccess({
content: "Classification " + name + Messages.addSuccessMessage
content: "Classification " + name + Messages.getAbbreviationMsg(false, 'addSuccessMessage')
});
modal.trigger("cancel");
that.typeHeaders.fetch({ reset: true });
......@@ -755,7 +755,7 @@ define([
typeName: tagName,
success: function() {
Utils.notifySuccess({
content: "Classification " + tagName + Messages.deleteSuccessMessage
content: "Classification " + tagName + Messages.getAbbreviationMsg(false, 'deleteSuccessMessage')
});
// if deleted tag is prviously searched then remove that tag url from save state of tab.
var searchUrl = Globals.saveApplicationState.tabState.searchUrl;
......@@ -779,4 +779,4 @@ define([
});
return ClassificationTreeLayoutView;
});
\ No newline at end of file
});
dashboardv3/public/js/views/search/tree/CustomFilterTreeLayoutView.js
......@@ -433,7 +433,7 @@ define([
success: function(model, data) {
that.showDefaultPage();
Utils.notifySuccess({
content: options.model.attributes.name + Messages.deleteSuccessMessage
content: options.model.attributes.name + Messages.getAbbreviationMsg(false, 'deleteSuccessMessage')
});
}
});
......@@ -467,4 +467,4 @@ define([
});
return CustomFilterTreeLayoutView;
});
\ No newline at end of file
});
dashboardv3/public/js/views/search/tree/GlossaryTreeLayoutView.js
......@@ -503,7 +503,7 @@ define([
}
Utils.notifySuccess({
content: messageType + Messages.deleteSuccessMessage
content: messageType + Messages.getAbbreviationMsg(false, 'deleteSuccessMessage')
});
that.ui.termSearchTree.jstree(true).refresh();
var params = {
......@@ -683,4 +683,4 @@ define([
}
});
return GlossaryTreeLayoutView;
});
\ No newline at end of file
});
dashboardv3/public/js/views/tag/TagLayoutView.js
......@@ -527,7 +527,7 @@ define([
that.collection.fullCollection.add(classificationDefs);
that.setUrl("#!/tag/tagAttribute/" + ref.ui.tagName.val(), true);
Utils.notifySuccess({
content: "Classification " + that.name + Messages.addSuccessMessage
content: "Classification " + that.name + Messages.getAbbreviationMsg(false, 'addSuccessMessage')
});
modal.trigger("cancel");
that.typeHeaders.fetch({ reset: true });
......@@ -616,7 +616,7 @@ define([
typeName: that.tag,
success: function() {
Utils.notifySuccess({
content: "Classification " + that.tag + Messages.deleteSuccessMessage
content: "Classification " + that.tag + Messages.getAbbreviationMsg(false, 'deleteSuccessMessage')
});
// if deleted tag is prviously searched then remove that tag url from save state of tab.
var searchUrl = Globals.saveApplicationState.tabState.searchUrl;
......@@ -633,4 +633,4 @@ define([
}
);
return TagLayoutView;
});
\ No newline at end of file
});
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