Skip to content

A
atlas
Commit c9c26d74 by kevalbhatt Committed by Madhan Neethiraj
Options

ATLAS-1425: Integrate Discovery/Search API in Atlas UI

ATLAS-1482: UI update in assigning a tag to multiple entities using single API call Signed-off-by: 's avatarMadhan Neethiraj <madhan@apache.org>
parent 6679c8ee
Showing with 389 additions and 228 deletions
dashboardv2/public/css/scss/main.scss
......@@ -261,7 +261,8 @@ ul {
}
.readOnlyLink {
display: inline-block;
text-overflow: ellipsis;
overflow: hidden;
.deleteBtn {
padding: 0px 5px;
}
......
dashboardv2/public/css/scss/override.scss
......@@ -245,3 +245,7 @@
.tab-content > .tab-pane.active {
overflow-x: hidden;
}
.ui-pnotify-text {
word-break: break-all;
}
dashboardv2/public/index.html
......@@ -50,7 +50,7 @@
<link rel="stylesheet" type="text/css" href="js/external_lib/jquery-ui/jquery-ui.min.css">
<link href="css/bootstrap-sidebar.css" rel="stylesheet">
<link href="js/libs/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="js/external_lib/pnotify.custom.min.css" rel="stylesheet">
<link href="js/external_lib/pnotify/pnotify.custom.min.css" rel="stylesheet">
<link href="css/style.css" rel="stylesheet">
</head>
......
dashboardv2/public/js/collection/VSearchList.js
......@@ -32,30 +32,15 @@ define(['require',
initialize: function() {
this.modelName = 'VSearch';
this.modelAttrName = 'results';
this.modelAttrName = '';
},
parseRecords: function(resp, options) {
this.responseData = {
dataType: resp.dataType,
query: resp.query,
queryType: resp.queryType,
requestId: resp.requestId
};
try {
if (!this.modelAttrName) {
throw new Error("this.modelAttrName not defined for " + this);
}
var list = _.reject(resp[this.modelAttrName], _.isNull);
_.each(list, function(obj) {
if (!obj.id) {
if (obj['$id$'] && obj['$id$'].id) {
obj.id = obj['$id$'].id
}
}
})
return list;
} catch (e) {
console.log(e);
this.queryType = resp.queryType;
this.queryText = resp.queryText;
if (resp.queryType && resp.queryType == "DSL") {
return resp.entities ? resp.entities : [];
} else {
return resp.fullTextResult ? resp.fullTextResult : [];
}
},
},
......
dashboardv2/public/js/external_lib/pnotify/pnotify.buttons.js 0 → 100644
(function(d,e){"function"===typeof define&&define.amd?define("pnotify.buttons",["jquery","pnotify"],e):"object"===typeof exports&&"undefined"!==typeof module?module.exports=e(require("jquery"),require("./pnotify")):e(d.jQuery,d.PNotify)})("undefined"!==typeof window?window:this,function(d,e){e.prototype.options.buttons={closer:!0,closer_hover:!0,sticker:!0,sticker_hover:!0,show_on_nonblock:!1,labels:{close:"Close",stick:"Stick",unstick:"Unstick"},classes:{closer:null,pin_up:null,pin_down:null}};e.prototype.modules.buttons=
{closer:null,sticker:null,init:function(a,b){var c=this;a.elem.on({mouseenter:function(b){!c.options.sticker||a.options.nonblock&&a.options.nonblock.nonblock&&!c.options.show_on_nonblock||c.sticker.trigger("pnotify:buttons:toggleStick").css("visibility","visible");!c.options.closer||a.options.nonblock&&a.options.nonblock.nonblock&&!c.options.show_on_nonblock||c.closer.css("visibility","visible")},mouseleave:function(a){c.options.sticker_hover&&c.sticker.css("visibility","hidden");c.options.closer_hover&&
c.closer.css("visibility","hidden")}});this.sticker=d("<div />",{"class":"ui-pnotify-sticker","aria-role":"button","aria-pressed":a.options.hide?"false":"true",tabindex:"0",title:a.options.hide?b.labels.stick:b.labels.unstick,css:{cursor:"pointer",visibility:b.sticker_hover?"hidden":"visible"},click:function(){a.options.hide=!a.options.hide;a.options.hide?a.queueRemove():a.cancelRemove();d(this).trigger("pnotify:buttons:toggleStick")}}).bind("pnotify:buttons:toggleStick",function(){var b=null===c.options.classes.pin_up?
a.styles.pin_up:c.options.classes.pin_up,e=null===c.options.classes.pin_down?a.styles.pin_down:c.options.classes.pin_down;d(this).attr("title",a.options.hide?c.options.labels.stick:c.options.labels.unstick).children().attr("class","").addClass(a.options.hide?b:e).attr("aria-pressed",a.options.hide?"false":"true")}).append("<span />").trigger("pnotify:buttons:toggleStick").prependTo(a.container);(!b.sticker||a.options.nonblock&&a.options.nonblock.nonblock&&!b.show_on_nonblock)&&this.sticker.css("display",
"none");this.closer=d("<div />",{"class":"ui-pnotify-closer","aria-role":"button",tabindex:"0",title:b.labels.close,css:{cursor:"pointer",visibility:b.closer_hover?"hidden":"visible"},click:function(){a.remove(!1);c.sticker.css("visibility","hidden");c.closer.css("visibility","hidden")}}).append(d("<span />",{"class":null===b.classes.closer?a.styles.closer:b.classes.closer})).prependTo(a.container);(!b.closer||a.options.nonblock&&a.options.nonblock.nonblock&&!b.show_on_nonblock)&&this.closer.css("display",
"none")},update:function(a,b){!b.closer||a.options.nonblock&&a.options.nonblock.nonblock&&!b.show_on_nonblock?this.closer.css("display","none"):b.closer&&this.closer.css("display","block");!b.sticker||a.options.nonblock&&a.options.nonblock.nonblock&&!b.show_on_nonblock?this.sticker.css("display","none"):b.sticker&&this.sticker.css("display","block");this.sticker.trigger("pnotify:buttons:toggleStick");this.closer.find("span").attr("class","").addClass(null===b.classes.closer?a.styles.closer:b.classes.closer);
b.sticker_hover?this.sticker.css("visibility","hidden"):a.options.nonblock&&a.options.nonblock.nonblock&&!b.show_on_nonblock||this.sticker.css("visibility","visible");b.closer_hover?this.closer.css("visibility","hidden"):a.options.nonblock&&a.options.nonblock.nonblock&&!b.show_on_nonblock||this.closer.css("visibility","visible")}};d.extend(e.styling.brighttheme,{closer:"brighttheme-icon-closer",pin_up:"brighttheme-icon-sticker",pin_down:"brighttheme-icon-sticker brighttheme-icon-stuck"});d.extend(e.styling.jqueryui,
{closer:"ui-icon ui-icon-close",pin_up:"ui-icon ui-icon-pin-w",pin_down:"ui-icon ui-icon-pin-s"});d.extend(e.styling.bootstrap2,{closer:"icon-remove",pin_up:"icon-pause",pin_down:"icon-play"});d.extend(e.styling.bootstrap3,{closer:"glyphicon glyphicon-remove",pin_up:"glyphicon glyphicon-pause",pin_down:"glyphicon glyphicon-play"});d.extend(e.styling.fontawesome,{closer:"fa fa-times",pin_up:"fa fa-pause",pin_down:"fa fa-play"})});
dashboardv2/public/js/external_lib/pnotify/pnotify.confirm.js 0 → 100644
(function(e,c){"function"===typeof define&&define.amd?define("pnotify.confirm",["jquery","pnotify"],c):"object"===typeof exports&&"undefined"!==typeof module?module.exports=c(require("jquery"),require("./pnotify")):c(e.jQuery,e.PNotify)})("undefined"!==typeof window?window:this,function(e,c){c.prototype.options.confirm={confirm:!1,prompt:!1,prompt_class:"",prompt_default:"",prompt_multi_line:!1,align:"right",buttons:[{text:"Ok",addClass:"",promptTrigger:!0,click:function(b,a){b.remove();b.get().trigger("pnotify.confirm",
[b,a])}},{text:"Cancel",addClass:"",click:function(b){b.remove();b.get().trigger("pnotify.cancel",b)}}]};c.prototype.modules.confirm={container:null,prompt:null,init:function(b,a){this.container=e('<div class="ui-pnotify-action-bar" style="margin-top:5px;clear:both;" />').css("text-align",a.align).appendTo(b.container);a.confirm||a.prompt?this.makeDialog(b,a):this.container.hide()},update:function(b,a){a.confirm?(this.makeDialog(b,a),this.container.show()):this.container.hide().empty()},afterOpen:function(b,
a){a.prompt&&this.prompt.focus()},makeDialog:function(b,a){var h=!1,l=this,g,d;this.container.empty();a.prompt&&(this.prompt=e("<"+(a.prompt_multi_line?'textarea rows="5"':'input type="text"')+' style="margin-bottom:5px;clear:both;" />').addClass(("undefined"===typeof b.styles.input?"":b.styles.input)+" "+("undefined"===typeof a.prompt_class?"":a.prompt_class)).val(a.prompt_default).appendTo(this.container));for(var m=a.buttons[0]&&a.buttons[0]!==c.prototype.options.confirm.buttons[0],f=0;f<a.buttons.length;f++)if(!(null===
a.buttons[f]||m&&c.prototype.options.confirm.buttons[f]&&c.prototype.options.confirm.buttons[f]===a.buttons[f])){g=a.buttons[f];h?this.container.append(" "):h=!0;d=e('<button type="button" class="ui-pnotify-action-button" />').addClass(("undefined"===typeof b.styles.btn?"":b.styles.btn)+" "+("undefined"===typeof g.addClass?"":g.addClass)).text(g.text).appendTo(this.container).on("click",function(k){return function(){"function"==typeof k.click&&k.click(b,a.prompt?l.prompt.val():null)}}(g));a.prompt&&
!a.prompt_multi_line&&g.promptTrigger&&this.prompt.keypress(function(b){return function(a){13==a.keyCode&&b.click()}}(d));b.styles.text&&d.wrapInner('<span class="'+b.styles.text+'"></span>');b.styles.btnhover&&d.hover(function(a){return function(){a.addClass(b.styles.btnhover)}}(d),function(a){return function(){a.removeClass(b.styles.btnhover)}}(d));if(b.styles.btnactive)d.on("mousedown",function(a){return function(){a.addClass(b.styles.btnactive)}}(d)).on("mouseup",function(a){return function(){a.removeClass(b.styles.btnactive)}}(d));
if(b.styles.btnfocus)d.on("focus",function(a){return function(){a.addClass(b.styles.btnfocus)}}(d)).on("blur",function(a){return function(){a.removeClass(b.styles.btnfocus)}}(d))}}};e.extend(c.styling.jqueryui,{btn:"ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only",btnhover:"ui-state-hover",btnactive:"ui-state-active",btnfocus:"ui-state-focus",input:"",text:"ui-button-text"});e.extend(c.styling.bootstrap2,{btn:"btn",input:""});e.extend(c.styling.bootstrap3,{btn:"btn btn-default",
input:"form-control"});e.extend(c.styling.fontawesome,{btn:"btn btn-default",input:"form-control"})});
dashboardv2/public/js/main.js
......@@ -139,7 +139,9 @@ require.config({
'moment': 'libs/moment/js/moment.min',
'jquery-ui': 'external_lib/jquery-ui/jquery-ui.min',
'datetimepicker': 'external_lib/datetimepicker/bootstrap-datetimepicker',
'pnotify': 'external_lib/pnotify.custom.min',
'pnotify': 'external_lib/pnotify/pnotify',
'pnotify.buttons': 'external_lib/pnotify/pnotify.buttons',
'pnotify.confirm': 'external_lib/pnotify/pnotify.confirm',
'jquery-placeholder': 'libs/jquery-placeholder/js/jquery.placeholder',
'platform': 'libs/platform/platform'
},
......
dashboardv2/public/js/models/VEntity.js
......@@ -52,8 +52,8 @@ define(['require',
return this.constructor.nonCrudOperation.call(this, url, 'GET', options);
},
saveEntity: function(token, options) {
var url = UrlLinks.entitiesTraitsApiUrl(token);
saveTraitsEntity: function(options) {
var url = UrlLinks.entitiesTraitsApiUrl();
options = _.extend({
contentType: 'application/json',
dataType: 'json'
......
dashboardv2/public/js/modules/atlasLogin.js
......@@ -19,110 +19,113 @@
//Define indexOf for IE
if (!Array.indexOf) {
Array.prototype.indexOf = function(obj, start) {
for ( var i = (start || 0); i < this.length; i++) {
if (this[i] == obj) {
return i;
}
}
return -1;
};
Array.prototype.indexOf = function(obj, start) {
for (var i = (start || 0); i < this.length; i++) {
if (this[i] == obj) {
return i;
}
}
return -1;
};
}
function doLogin() {
var userName = $('#username').val().trim();
var passwd = $('#password').val().trim();
var userName = $('#username').val().trim();
var passwd = $('#password').val().trim();
if (userName === '' || passwd === '') {
$('#errorBox').show();
$('#signInLoading').hide();
$('#signIn').removeAttr('disabled');
$('#errorBox .errorMsg').text("The username or password you entered is blank..");
return false;
}
if (userName === '' || passwd === '') {
$('#errorBox').show();
$('#signInLoading').hide();
$('#signIn').removeAttr('disabled');
$('#errorBox .errorMsg').text("The username or password you entered is blank..");
return false;
}
var baseUrl = getBaseUrl();
if (baseUrl.lastIndexOf('/') != (baseUrl.length - 1)) {
if (baseUrl) {
baseUrl = baseUrl + '/';
} else {
baseUrl = '/';
}
}
var url = baseUrl + 'j_spring_security_check';
var baseUrl = getBaseUrl();
if (baseUrl.lastIndexOf('/') != (baseUrl.length - 1)) {
if (baseUrl) {
baseUrl = baseUrl + '/';
} else {
baseUrl = '/';
}
}
var url = baseUrl + 'j_spring_security_check';
$.ajax({
data : {
j_username : userName,
j_password : passwd
},
url : url,
type : 'POST',
headers : {
"cache-control" : "no-cache"
},
success : function() {
if(location.hash.length > 2)
window.location.replace('index.html'+location.hash);
else
window.location.replace('index.html');
},
error : function(jqXHR, textStatus, err ) {
$('#signIn').removeAttr('disabled');
$('#signInLoading').css("visibility", "hidden");
$.ajax({
data: {
j_username: userName,
j_password: passwd
},
url: url,
type: 'POST',
headers: {
"cache-control": "no-cache"
},
success: function() {
if (location.hash.length > 2)
window.location.replace('index.html' + location.hash);
else
window.location.replace('index.html');
},
error: function(jqXHR, textStatus, err) {
$('#signIn').removeAttr('disabled');
$('#signInLoading').css("visibility", "hidden");
if(jqXHR.status && jqXHR.status == 412){
$('#errorBox').hide();
$('#errorBoxUnsynced').show();
} else {
var resp = JSON.parse(jqXHR.responseText);
if (jqXHR.status && jqXHR.status == 412) {
$('#errorBox').hide();
$('#errorBoxUnsynced').show();
} else {
try {
var resp = JSON.parse(jqXHR.responseText);
if(resp.msgDesc.startsWith("Username not found") || resp.msgDesc.startsWith("Wrong password")){
$('#errorBox .errorMsg').text("Invalid User credentials. Please try again.");
}else if(resp.msgDesc.startsWith("User role credentials is not set properly")){
$('#errorBox .errorMsg').text("User role or credentials is not set properly");
}else{
$('#errorBox .errorMsg').text("Error while authentication");
if (resp.msgDesc.startsWith("Username not found") || resp.msgDesc.startsWith("Wrong password")) {
$('#errorBox .errorMsg').text("Invalid User credentials. Please try again.");
} else if (resp.msgDesc.startsWith("User role credentials is not set properly")) {
$('#errorBox .errorMsg').text("User role or credentials is not set properly");
} else {
$('#errorBox .errorMsg').text("Error while authentication");
}
} catch (err) {
$('#errorBox .errorMsg').text("Something went wrong");
}
$('#errorBox').show();
$('#errorBoxUnsynced').hide();
}
}
});
$('#errorBox').show();
$('#errorBoxUnsynced').hide();
}
}
});
}
function getBaseUrl(){
if(!window.location.origin){
window.location.origin = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ':' + window.location.port: '');
}
return window.location.origin
+ window.location.pathname.substring(window.location.pathname
.indexOf('/', 2) + 1, 0);
function getBaseUrl() {
if (!window.location.origin) {
window.location.origin = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ':' + window.location.port : '');
}
return window.location.origin + window.location.pathname.substring(window.location.pathname
.indexOf('/', 2) + 1, 0);
}
$(function() {
// register handlers
$('#signIn').on('click', function() {
$('#signIn').attr('disabled',true);
$('#signInLoading').css("visibility", "visible");
doLogin();
return false;
});
$('#loginForm').each(function() {
$('input').keypress(function(e) {
// Enter pressed?
if (e.which == 10 || e.which == 13) {
doLogin();
}
});
});
$('#loginForm li[class^=control-group] > input').on('change',function(e){
if(e.target.value === ''){
$(e.target).parent().addClass('error');
}else{
$(e.target).parent().removeClass('error');
}
});
// register handlers
$('#signIn').on('click', function() {
$('#signIn').attr('disabled', true);
$('#signInLoading').css("visibility", "visible");
doLogin();
return false;
});
$('#loginForm').each(function() {
$('input').keypress(function(e) {
// Enter pressed?
if (e.which == 10 || e.which == 13) {
doLogin();
}
});
});
$('#loginForm li[class^=control-group] > input').on('change', function(e) {
if (e.target.value === '') {
$(e.target).parent().addClass('error');
} else {
$(e.target).parent().removeClass('error');
}
});
});
dashboardv2/public/js/utils/CommonViewFunction.js
......@@ -285,28 +285,28 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
});
}
}
CommonViewFunction.termTableBreadcrumbMaker = function(model) {
if (!model) {
CommonViewFunction.termTableBreadcrumbMaker = function(obj) {
if (!obj) {
return "";
}
var traits = model.get('$traits$'),
var traits = obj.classificationNames,
url = "",
deleteHtml = "",
html = "",
id = model.get('$id$').id || model.get('$id$'),
terms = [];
_.keys(traits).map(function(key) {
if (traits[key]) {
var tagName = Utils.checkTagOrTerm(traits[key]);
}
if (tagName.term) {
terms.push({
deleteHtml: '<a class="pull-left" title="Remove Term"><i class="fa fa-trash" data-id="tagClick" data-type="term" data-assetname="' + _.escape(model.get("name")) + '" data-name="' + tagName.fullName + '" data-guid="' + (model.get('$id$').id || model.get('$id$')) + '" ></i></a>',
url: _.unescape(tagName.fullName).split(".").join("/"),
name: tagName.fullName
});
}
});
id = obj.guid,
terms = [],
entityName = (_.escape(obj.attributes && obj.attributes.name ? obj.attributes.name : null) || _.escape(obj.displayText) || obj.guid);
if (traits) {
traits.map(function(term) {
if (term.split(".").length > 1) {
terms.push({
deleteHtml: '<a class="pull-left" title="Remove Term"><i class="fa fa-trash" data-id="tagClick" data-type="term" data-assetname="' + entityName + '" data-name="' + term + '" data-guid="' + obj.guid + '" ></i></a>',
url: _.unescape(term).split(".").join("/"),
name: term
});
}
});
}
_.each(terms, function(obj, i) {
var className = "";
if (i >= 1) {
......@@ -318,10 +318,12 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
if (terms.length > 1) {
html += '<div><a href="javascript:void(0)" data-id="showMoreLessTerm" class="inputTag inputTagGreen"><span>Show More </span><i class="fa fa-angle-right"></i></a></div>'
}
if (model.get('$id$')) {
html += '<div><a href="javascript:void(0)" class="inputAssignTag" data-id="addTerm" data-guid="' + (model.get('$id$').id || model.get('$id$')) + '"><i class="fa fa-folder-o"></i>' + " " + 'Assign Term</a></div>'
} else {
html += '<div><a href="javascript:void(0)" class="inputAssignTag" data-id="addTerm"><i class="fa fa-folder-o"></i>' + " " + 'Assign Term</a></div>'
if (!Enums.entityStateReadOnly[obj.status]) {
if (obj.guid) {
html += '<div><a href="javascript:void(0)" class="inputAssignTag" data-id="addTerm" data-guid="' + (obj.guid) + '"><i class="fa fa-folder-o"></i>' + " " + 'Assign Term</a></div>'
} else {
html += '<div><a href="javascript:void(0)" class="inputAssignTag" data-id="addTerm"><i class="fa fa-folder-o"></i>' + " " + 'Assign Term</a></div>'
}
}
return {
html: '<div class="termTableBreadcrumb" dataterm-id="' + id + '">' + html + '</div>',
......@@ -329,30 +331,32 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
}
}
CommonViewFunction.tagForTable = function(model) {
var traits = model.get('$traits$'),
CommonViewFunction.tagForTable = function(obj) {
var traits = obj.classificationNames,
atags = "",
addTag = "",
popTag = "",
count = 0;
_.keys(model.get('$traits$')).map(function(key) {
if (traits[key]) {
var tagName = Utils.checkTagOrTerm(traits[key]);
}
var className = "inputTag";
if (tagName.tag) {
if (count >= 1) {
popTag += '<a class="' + className + '" data-id="tagClick"><span class="inputValue">' + tagName.fullName + '</span><i class="fa fa-times" data-id="delete" data-assetname="' + model.get("name") + '"data-name="' + tagName.fullName + '" data-type="tag" data-guid="' + (model.get('$id$').id || model.get('$id$')) + '" ></i></a>';
} else {
atags += '<a class="' + className + '" data-id="tagClick"><span class="inputValue">' + tagName.fullName + '</span><i class="fa fa-times" data-id="delete" data-assetname="' + model.get("name") + '" data-name="' + tagName.fullName + '" data-type="tag" data-guid="' + (model.get('$id$').id || model.get('$id$')) + '" ></i></a>';
count = 0,
entityName = (_.escape(obj.attributes && obj.attributes.name ? obj.attributes.name : null) || _.escape(obj.displayText) || obj.guid);
if (traits) {
traits.map(function(tag) {
if (tag.split(".").length === 1) {
var className = "inputTag";
if (count >= 1) {
popTag += '<a class="' + className + '" data-id="tagClick"><span class="inputValue">' + tag + '</span><i class="fa fa-times" data-id="delete" data-assetname="' + entityName + '"data-name="' + tag + '" data-type="tag" data-guid="' + obj.guid + '" ></i></a>';
} else {
atags += '<a class="' + className + '" data-id="tagClick"><span class="inputValue">' + tag + '</span><i class="fa fa-times" data-id="delete" data-assetname="' + entityName + '" data-name="' + tag + '" data-type="tag" data-guid="' + obj.guid + '" ></i></a>';
}
++count;
}
++count;
});
}
if (!Enums.entityStateReadOnly[obj.status]) {
if (obj.guid) {
addTag += '<a href="javascript:void(0)" data-id="addTag" class="inputTagAdd assignTag" data-guid="' + obj.guid + '" ><i class="fa fa-plus"></i></a>';
} else {
addTag += '<a href="javascript:void(0)" data-id="addTag" class="inputTagAdd assignTag"><i style="right:0" class="fa fa-plus"></i></a>';
}
});
if (model.get('$id$')) {
addTag += '<a href="javascript:void(0)" data-id="addTag" class="inputTagAdd assignTag" data-guid="' + (model.get('$id$').id || model.get('$id$')) + '" ><i class="fa fa-plus"></i></a>';
} else {
addTag += '<a href="javascript:void(0)" data-id="addTag" class="inputTagAdd assignTag"><i style="right:0" class="fa fa-plus"></i></a>';
}
if (count > 1) {
addTag += '<div data-id="showMoreLess" class="inputTagAdd assignTag tagDetailPopover"><i class="fa fa-ellipsis-h" aria-hidden="true"></i></div>'
......
dashboardv2/public/js/utils/Messages.js
......@@ -35,7 +35,7 @@ define(['require'], function(require) {
updateTagDescriptionMessage: "Tag description is updated successfully",
updateTermDescriptionMessage: "Term description is updated successfully",
editSuccessMessage: " has been updated successfully",
assignDeletedEntity: " entity is deleted, tag cannot be assigned"
assignDeletedEntity: " is deleted, tag cannot be assigned"
};
return Messages;
});
dashboardv2/public/js/utils/UrlLinks.js
......@@ -47,7 +47,13 @@ define(['require', 'utils/Enums'], function(require, Enums) {
}
},
entitiesTraitsApiUrl: function(token) {
return this.baseUrlV2 + '/entity/guid/' + token + "/classifications"; //this.entitiesApiUrl();
if (token) {
return this.baseUrlV2 + '/entity/guid/' + token + '/classifications';
} else {
// For Multiple Assignment
return this.baseUrlV2 + '/entities/classification';
}
},
entityCollectionaudit: function(guid) {
return this.baseUrl + '/entities/' + guid + '/audit';
......@@ -82,7 +88,7 @@ define(['require', 'utils/Enums'], function(require, Enums) {
}
},
searchApiUrl: function(searchtype) {
var searchUrl = this.baseUrl + '/discovery/search';
var searchUrl = this.baseUrlV2 + '/search';
if (searchtype) {
return searchUrl + '/' + searchtype;
} else {
......
dashboardv2/public/js/utils/Utils.js
......@@ -16,7 +16,7 @@
* limitations under the License.
*/
define(['require', 'utils/Globals', 'pnotify', 'utils/Messages'], function(require, Globals, pnotify, Messages) {
define(['require', 'utils/Globals', 'pnotify', 'utils/Messages', 'pnotify.buttons', 'pnotify.confirm'], function(require, Globals, pnotify, Messages) {
'use strict';
var Utils = {};
......@@ -49,35 +49,60 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages'], function(requi
};
var notify = function(options) {
new pnotify(_.extend({ icon: true, hide: true, delay: 3000, remove: true }, options));
return new pnotify(_.extend({ icon: true, hide: true, delay: 3000, remove: true }, options));
}
Utils.notifyInfo = function(options) {
notify({
type: "info",
text: _.escape(options.content) || "Info message."
text: (options.html ? options.content : _.escape(options.content)) || "Info message."
});
};
Utils.notifyWarn = function(options) {
notify({
type: "notice",
text: _.escape(options.content) || "Info message."
text: (options.html ? options.content : _.escape(options.content)) || "Info message."
});
};
Utils.notifyError = function(options) {
notify({
type: "error",
text: _.escape(options.content) || "Error occurred."
text: (options.html ? options.content : _.escape(options.content)) || "Error occurred."
});
};
Utils.notifySuccess = function(options) {
notify({
type: "success",
text: _.escape(options.content) || "Error occurred."
text: (options.html ? options.content : _.escape(options.content)) || "Error occurred."
});
};
Utils.notifyConfirm = function(options) {
notify(_.extend({
title: 'Confirmation',
hide: false,
confirm: {
confirm: true
},
buttons: {
closer: false,
sticker: false
},
history: {
history: false
}
}, options)).get().on('pnotify.confirm', function() {
if (options.ok) {
options.ok();
}
}).on('pnotify.cancel', function() {
if (options.cancel) {
options.cancel();
}
});
}
Utils.defaultErrorHandler = function(model, error) {
if (error && error.status) {
if (error.status == 401) {
......@@ -87,11 +112,13 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages'], function(requi
} else if (error.status == 403) {
var message = "You are not authorized";
if (error.statusText) {
message = JSON.parse(error.statusText).AuthorizationError;
try {
message = JSON.parse(error.statusText).AuthorizationError;
} catch (err) {}
Utils.notifyError({
content: message
});
}
Utils.notifyError({
content: message
});
} else if (error.status == "0" && error.statusText != "abort") {
var diffTime = (new Date().getTime() - prevNetworkErrorTime);
if (diffTime > 3000) {
......
dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
......@@ -129,6 +129,9 @@ define(['require',
if (!this.name && collectionJSON.attributes.qualifiedName) {
this.name = collectionJSON.attributes.qualifiedName;
}
if (!this.name && collectionJSON.displayText) {
this.name = collectionJSON.displayText;
}
if (this.name && collectionJSON.typeName) {
this.name = this.name + ' (' + collectionJSON.typeName + ')';
}
......@@ -162,7 +165,7 @@ define(['require',
this.addTagToTerms([]);
}
}
Utils.hideTitleLoader(this.$('.page-title .fontLoader'), this.$('.entityDetail'));
this.hideLoader();
this.auditVent.trigger("reset:collection");
this.renderEntityDetailTableLayoutView();
this.renderTagTableLayoutView(tagGuid);
......@@ -234,12 +237,12 @@ define(['require',
termData = "";
_.each(tagObject, function(val) {
var isTerm = Utils.checkTagOrTerm(val);
if (isTerm.tag) {
tagData += '<span class="inputTag" data-id="tagClick"><span class="inputValue">' + isTerm.fullName + '</span><i class="fa fa-close" data-id="deleteTag" data-type="tag"></i></span>';
//var isTerm = Utils.checkTagOrTerm(val);
if (val.typeName && val.typeName.split('.').length === 1) {
tagData += '<span class="inputTag" data-id="tagClick"><span class="inputValue">' + val.typeName + '</span><i class="fa fa-close" data-id="deleteTag" data-type="tag"></i></span>';
}
if (isTerm.term) {
termData += '<span class="inputTag term" data-id="tagClick" data-href="' + isTerm.fullName + '"><span class="inputValue">' + isTerm.fullName + '</span><i class="fa fa-close" data-id="deleteTag" data-type="term"></i></span>';
if (val.typeName && val.typeName.split('.').length > 1) {
termData += '<span class="inputTag term" data-id="tagClick" data-href="' + val.typeName + '"><span class="inputValue">' + val.typeName + '</span><i class="fa fa-close" data-id="deleteTag" data-type="term"></i></span>';
}
});
this.ui.tagList.find("span.inputTag").remove();
......@@ -247,15 +250,26 @@ define(['require',
this.ui.tagList.prepend(tagData);
this.ui.termList.prepend(termData);
},
hideLoader: function() {
Utils.hideTitleLoader(this.$('.page-title .fontLoader'), this.$('.entityDetail'));
},
showLoader: function() {
Utils.showTitleLoader(this.$('.page-title .fontLoader'), this.$('.entityDetail'));
},
onClickAddTagBtn: function(e) {
var that = this;
require(['views/tag/addTagModalView'], function(AddTagModalView) {
var view = new AddTagModalView({
vent: that.vent,
guid: that.id,
tagList: _.map(that.collection.first().toJSON().classifications, function(obj) {
return obj.typeName;
}),
callback: function() {
that.fetchCollection();
}
},
showLoader: that.showLoader.bind(that),
hideLoader: that.hideLoader.bind(that)
});
view.modal.on('ok', function() {
Utils.showTitleLoader(that.$('.page-title .fontLoader'), that.$('.entityDetail'));
......@@ -271,7 +285,9 @@ define(['require',
guid: that.id,
callback: function() {
that.fetchCollection();
}
},
showLoader: that.showLoader.bind(that),
hideLoader: that.hideLoader.bind(that)
});
view.modal.on('ok', function() {
Utils.showTitleLoader(that.$('.page-title .fontLoader'), that.$('.entityDetail'));
......
dashboardv2/public/js/views/graph/LineageLayoutView.js
......@@ -102,8 +102,7 @@ define(['require',
},
cust_error: function(model, response) {
that.noLineage();
},
complete: function() {}
}
})
},
noLineage: function() {
......
dashboardv2/public/js/views/schema/SchemaLayoutView.js
......@@ -123,9 +123,14 @@ define(['require',
this.schemaCollection.find(function(item) {
if (item.get('isEnable')) {
var term = [];
var obj = {}
obj['displayText'] = item.get("name") || item.get("qualifiedName")
obj['status'] = item.get("$id$").state;
obj['classificationNames'] = _.keys(item.get('$traits$'));
obj['guid'] = item.get("$id$").id || item.get("$id$");
that.arr.push({
id: item.get("$id$"),
model: item
id: item.get("$id$").id || item.get("$id$"),
model: obj
});
}
});
......@@ -164,6 +169,7 @@ define(['require',
var that = this;
this.$('.fontLoader').show();
this.schemaCollection.fetch({
skipDefaultError: true,
success: function() {
that.schemaCollection.sortByKey('position');
that.renderTableLayoutView();
......@@ -173,6 +179,9 @@ define(['require',
silent: true
});
},
hideLoader: function(argument) {
this.$('.fontLoader').hide();
},
renderTableLayoutView: function() {
var that = this,
count = 5;
......@@ -318,7 +327,12 @@ define(['require',
className: 'searchTag',
formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
return CommonViewFunction.tagForTable(model);
return CommonViewFunction.tagForTable({
classificationNames: _.keys(model.get('$traits$')),
guid: model.get('$id$').id || model.get('$id$') || model.get('guid'),
displayText: model.get('name'),
status: model.get('$id$').state
});
}
})
};
......@@ -332,7 +346,12 @@ define(['require',
className: 'searchTerm',
formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
var returnObject = CommonViewFunction.termTableBreadcrumbMaker(model, "schema");
var returnObject = CommonViewFunction.termTableBreadcrumbMaker({
classificationNames: _.keys(model.get('$traits$')),
guid: model.get('$id$').id || model.get('$id$') || model.get('guid'),
displayText: model.get('name'),
status: model.get('$id$').state
});
if (returnObject.object) {
that.bradCrumbList.push(returnObject.object);
}
......@@ -379,7 +398,8 @@ define(['require',
showLoader: function() {
that.$('.fontLoader').show();
that.$('.searchTable').hide();
}
},
hideLoader: that.hideLoader.bind(that)
});
// view.saveTagData = function() {
//override saveTagData function
......
dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js
......@@ -174,12 +174,20 @@ define(['require',
});
that.modal.on('ok', function() {
var newAttributeList = view.collection.toJSON();
var saveJSON = JSON.parse(JSON.stringify(that.model.toJSON()));
var oldAttributeList = saveJSON.attributeDefs;
try {
var saveJSON = JSON.parse(JSON.stringify(that.model.toJSON()));
} catch (err) {
Utils.serverErrorHandler();
}
if (saveJSON) {
var oldAttributeList = saveJSON.attributeDefs;
}
_.each(newAttributeList, function(obj) {
oldAttributeList.push(obj);
});
that.onSaveButton(saveJSON, Messages.addAttributeSuccessMessage);
if (saveJSON) {
that.onSaveButton(saveJSON, Messages.addAttributeSuccessMessage);
}
});
that.modal.on('closeModal', function() {
that.modal.trigger('cancel');
......
dashboardv2/public/js/views/tag/addTagModalView.js
......@@ -48,7 +48,7 @@ define(['require',
*/
initialize: function(options) {
var that = this;
_.extend(this, _.pick(options, 'vent', 'modalCollection', 'guid', 'callback', 'multiple', 'showLoader', 'hideLoader'));
_.extend(this, _.pick(options, 'vent', 'modalCollection', 'guid', 'callback', 'multiple', 'showLoader', 'hideLoader', 'tagList'));
this.collection = new VTagList();
this.commonCollection = new VTagList();
this.asyncAttrFetchCounter = 0;
......@@ -68,38 +68,97 @@ define(['require',
var selection = $(item).data("key");
tagAttributes[selection] = $(item).val();
});
var obj = {
tagName: tagName,
tagAttributes: tagAttributes,
guid: [],
skipEntity: [],
deletedEntity: []
}
if (that.multiple) {
that.asyncFetchCounter = 0;
for (var i = 0; i < that.multiple.length; i++) {
if (i == 0) {
that.showLoader();
_.each(that.multiple, function(entity, i) {
var name = (_.escape(entity.model.attributes && entity.model.attributes.name ? entity.model.attributes.name : null) || _.escape(entity.model.displayText) || entity.model.guid)
if (Enums.entityStateReadOnly[entity.model.status]) {
obj.deletedEntity.push(name);
} else {
if (_.indexOf(entity.model.classificationNames, tagName) === -1) {
obj.guid.push(entity.model.guid)
} else {
obj.skipEntity.push(name);
}
}
var obj = {
tagName: tagName,
tagAttributes: tagAttributes,
guid: (_.isObject(that.multiple[i].id) ? that.multiple[i].id.id : that.multiple[i].id),
deletedEntity: Enums.entityStateReadOnly[that.multiple[i].id.state],
entityName: that.multiple[i].model.get('name')
});
if (obj.deletedEntity.length) {
Utils.notifyError({
html: true,
content: "<b>" + obj.deletedEntity.join(', ') +
"</b> " + (obj.deletedEntity.length === 1 ? "entity " : "entities ") +
Messages.assignDeletedEntity
});
}
if (obj.skipEntity.length) {
var text = "<b>" + obj.skipEntity.join(', ') +
"</b> <br/> entities selected have already been associated with <b>" + tagName +
"</b> tag, Do you want to associate the tag with other entities ?",
removeCancelButton = false;
if ((obj.skipEntity.length + obj.deletedEntity.length) === that.multiple.length) {
text = (obj.skipEntity.length > 1 ? "All selected" : "Selected") + " entities have already been associated with <b>" + tagName + "</b> tag";
removeCancelButton = true;
}
if (obj.deletedEntity) {
Utils.notifyError({
content: obj.entityName + Messages.assignDeletedEntity
});
if (that.multiple.length === 1 || (that.multiple.length == (i + 1) && that.asyncFetchCounter == 0)) {
var notifyObj = {
text: text,
ok: function(argument) {
if (obj.guid.length) {
that.saveTagData(obj);
} else {
that.hideLoader();
}
},
cancel: function(argument) {
that.hideLoader();
obj = {
tagName: tagName,
tagAttributes: tagAttributes,
guid: [],
skipEntity: [],
deletedEntity: []
}
}
} else {
}
if (removeCancelButton) {
notifyObj['confirm'] = {
confirm: true,
buttons: [{
text: 'Ok',
addClass: 'btn-primary',
click: function(notice) {
notice.remove();
obj = {
tagName: tagName,
tagAttributes: tagAttributes,
guid: [],
skipEntity: [],
deletedEntity: []
}
}
},
null
]
}
}
Utils.notifyConfirm(notifyObj)
} else {
if (obj.guid.length) {
that.saveTagData(obj);
} else {
that.hideLoader();
}
}
} else {
that.asyncFetchCounter = 0;
that.saveTagData({
tagName: tagName,
tagAttributes: tagAttributes,
guid: that.guid
});
obj.guid.push(that.guid);
that.saveTagData(obj);
}
});
this.on('closeModal', function() {
......@@ -126,13 +185,16 @@ define(['require',
}, this);
},
tagsCollection: function() {
var that = this;
this.collection.fullCollection.comparator = function(model) {
return model.get('name').toLowerCase();
}
var str = '<option selected="selected" disabled="disabled">-- Select a tag from the dropdown list --</option>';
this.collection.fullCollection.sort().each(function(obj, key) {
str += '<option>' + _.escape(obj.get('name')) + '</option>';
if (_.indexOf(that.tagList, obj.get('name')) === -1) {
str += '<option>' + _.escape(obj.get('name')) + '</option>';
}
});
this.ui.addTagOptions.html(str);
this.ui.addTagOptions.select2({
......@@ -198,26 +260,35 @@ define(['require',
},
saveTagData: function(options) {
var that = this;
++this.asyncFetchCounter;
this.entityModel = new VEntity();
var tagName = options.tagName,
tagAttributes = options.tagAttributes,
json = [{
"typeName": tagName,
"attributes": tagAttributes
}];
this.entityModel.saveEntity(options.guid, {
json = {
"classification": {
"typeName": tagName,
"attributes": tagAttributes
},
"entityGuids": options.guid
};
if (this.showLoader) {
this.showLoader();
}
this.entityModel.saveTraitsEntity({
skipDefaultError: true,
data: JSON.stringify(json),
success: function(data) {
Utils.notifySuccess({
content: "Tag " + tagName + " has been added to entity"
content: "Tag " + tagName + " has been added to " + (that.multiple ? "entities" : "entity")
});
if (options.modalCollection) {
options.modalCollection.fetch({ reset: true });
}
if (that.callback) {
that.callback();
}
},
cust_error: function(model, response) {
cust_error: function(model, response) {
var message = "Tag " + tagName + " could not be added";
if (response && response.responseJSON) {
message = response.responseJSON.errorMessage;
......@@ -225,12 +296,10 @@ define(['require',
Utils.notifyError({
content: message
});
},
complete: function() {
--that.asyncFetchCounter;
if (that.callback && that.asyncFetchCounter === 0) {
that.callback();
if (that.hideLoader) {
that.hideLoader();
}
}
});
},
......
release-log.txt
......@@ -9,6 +9,8 @@ ATLAS-1060 Add composite indexes for exact match performance improvements for al
ATLAS-1127 Modify creation and modification timestamps to Date instead of Long(sumasai)
ALL CHANGES:
ATLAS-1425 Integrate Discovery/Search API in Atlas UI (kevalbhatt via mneethiraj)
ATLAS-1482 UI update in assigning a tag to multiple entities using single API call (kevalbhatt via mneethiraj)
ATLAS-1486 UI updates to handle errors from V2 APIs (Kalyanikashikar via mneethiraj)
ATLAS-1436 Metrics collection using gremlin (apoorvnaik via mneethiraj)
ATLAS-1489 Show create/edit entity button based on role (Kalyanikashikar via kevalbhatt)
......
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