Skip to content

A
atlas
Commit 72243644 by kevalbhatt Committed by nixonrodrigues
Options

ATLAS-3521 : UI: Use existing labels from other entities

Signed-off-by: 's avatarnixonrodrigues <nixon@apache.org>
parent 1b5ca4c5
Showing with 69 additions and 15 deletions
dashboardv2/public/js/views/entity/EntityLabelDefineView.js
...@@ -23,8 +23,9 @@ define(['require', ...@@ -23,8 +23,9 @@ define(['require',
'utils/Utils', 'utils/Utils',
'utils/Messages', 'utils/Messages',
'utils/Enums', 'utils/Enums',
'utils/UrlLinks',
'utils/CommonViewFunction', 'utils/CommonViewFunction',
], function(require, Backbone, EntityLabelDefineView_tmpl, VEntity, Utils, Messages, Enums, CommonViewFunction) { ], function(require, Backbone, EntityLabelDefineView_tmpl, VEntity, Utils, Messages, Enums, UrlLinks, CommonViewFunction) {
'use strict'; 'use strict';
return Backbone.Marionette.LayoutView.extend({ return Backbone.Marionette.LayoutView.extend({
...@@ -72,16 +73,42 @@ define(['require', ...@@ -72,16 +73,42 @@ define(['require',
return "<option selected > " + label + " </option>"; return "<option selected > " + label + " </option>";
}); });
this.ui.addLabelOptions.html(str); this.ui.addLabelOptions.html(str);
var getLabelData = function(data, selectedData) {
if (data.suggestions) {
return _.map(data.suggestions, function(name, index) {
var findValue = _.find(selectedData, { id: name })
if (findValue) {
return findValue;
} else {
return {
id: name,
text: name
}
}
});
} else {
return []
}
};
this.ui.addLabelOptions.select2({ this.ui.addLabelOptions.select2({
placeholder: "Select Label", placeholder: "Select Label",
allowClear: false, allowClear: false,
tags: true, tags: true,
multiple: true, multiple: true,
matcher: function(params, data) { ajax: {
if (params.term === data.text) { url: UrlLinks.searchApiUrl('suggestions'),
return data; dataType: 'json',
} delay: 250,
return null; data: function(params) {
return {
prefixString: _.escape(params.term), // search term
fieldName: '__labels'
};
},
processResults: function(data, params) {
return { results: getLabelData(data, this.$element.select2("data")) };
},
cache: true
}, },
templateResult: this.formatResultSearch templateResult: this.formatResultSearch
}); });
...@@ -91,7 +118,7 @@ define(['require', ...@@ -91,7 +118,7 @@ define(['require',
return state.text; return state.text;
} }
if (!state.element) { if (!state.element) {
return $("<span>Add<strong> '" + state.text + "'</strong></span>"); return $("<span>Add<strong> '" + _.escape(state.text) + "'</strong></span>");
} }
}, },
onChangeLabelChange: function() { onChangeLabelChange: function() {
...@@ -116,7 +143,7 @@ define(['require', ...@@ -116,7 +143,7 @@ define(['require',
type: 'POST', type: 'POST',
success: function() { success: function() {
var msg = entityJson.labels === undefined ? 'addSuccessMessage' : 'editSuccessMessage', var msg = entityJson.labels === undefined ? 'addSuccessMessage' : 'editSuccessMessage',
caption = "One or more label"; caption = "One or more label";
if (payload.length === 0) { if (payload.length === 0) {
msg = 'removeSuccessMessage'; msg = 'removeSuccessMessage';
caption = "One or more existing label"; caption = "One or more existing label";
......
dashboardv3/public/js/views/entity/EntityLabelDefineView.js
...@@ -23,8 +23,9 @@ define(['require', ...@@ -23,8 +23,9 @@ define(['require',
'utils/Utils', 'utils/Utils',
'utils/Messages', 'utils/Messages',
'utils/Enums', 'utils/Enums',
'utils/UrlLinks',
'utils/CommonViewFunction', 'utils/CommonViewFunction',
], function(require, Backbone, EntityLabelDefineView_tmpl, VEntity, Utils, Messages, Enums, CommonViewFunction) { ], function(require, Backbone, EntityLabelDefineView_tmpl, VEntity, Utils, Messages, Enums, UrlLinks, CommonViewFunction) {
'use strict'; 'use strict';
return Backbone.Marionette.LayoutView.extend({ return Backbone.Marionette.LayoutView.extend({
...@@ -72,16 +73,42 @@ define(['require', ...@@ -72,16 +73,42 @@ define(['require',
return "<option selected > " + label + " </option>"; return "<option selected > " + label + " </option>";
}); });
this.ui.addLabelOptions.html(str); this.ui.addLabelOptions.html(str);
var getLabelData = function(data, selectedData) {
if (data.suggestions) {
return _.map(data.suggestions, function(name, index) {
var findValue = _.find(selectedData, { id: name })
if (findValue) {
return findValue;
} else {
return {
id: name,
text: name
}
}
});
} else {
return []
}
};
this.ui.addLabelOptions.select2({ this.ui.addLabelOptions.select2({
placeholder: "Select Label", placeholder: "Select Label",
allowClear: false, allowClear: false,
tags: true, tags: true,
multiple: true, multiple: true,
matcher: function(params, data) { ajax: {
if (params.term === data.text) { url: UrlLinks.searchApiUrl('suggestions'),
return data; dataType: 'json',
} delay: 250,
return null; data: function(params) {
return {
prefixString: _.escape(params.term), // search term
fieldName: '__labels'
};
},
processResults: function(data, params) {
return { results: getLabelData(data, this.$element.select2("data")) };
},
cache: true
}, },
templateResult: this.formatResultSearch templateResult: this.formatResultSearch
}); });
...@@ -91,7 +118,7 @@ define(['require', ...@@ -91,7 +118,7 @@ define(['require',
return state.text; return state.text;
} }
if (!state.element) { if (!state.element) {
return $("<span>Add<strong> '" + state.text + "'</strong></span>"); return $("<span>Add<strong> '" + _.escape(state.text) + "'</strong></span>");
} }
}, },
onChangeLabelChange: function() { onChangeLabelChange: function() {
......
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