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 416 additions and 357 deletions
dashboardv2/public/css/scss/main.scss
...@@ -261,7 +261,8 @@ ul { ...@@ -261,7 +261,8 @@ ul {
} }
.readOnlyLink { .readOnlyLink {
display: inline-block; text-overflow: ellipsis;
overflow: hidden;
.deleteBtn { .deleteBtn {
padding: 0px 5px; padding: 0px 5px;
} }
......
dashboardv2/public/css/scss/override.scss
...@@ -245,3 +245,7 @@ ...@@ -245,3 +245,7 @@
.tab-content > .tab-pane.active { .tab-content > .tab-pane.active {
overflow-x: hidden; overflow-x: hidden;
} }
.ui-pnotify-text {
word-break: break-all;
}
dashboardv2/public/index.html
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<link rel="stylesheet" type="text/css" href="js/external_lib/jquery-ui/jquery-ui.min.css"> <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="css/bootstrap-sidebar.css" rel="stylesheet">
<link href="js/libs/font-awesome/css/font-awesome.min.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"> <link href="css/style.css" rel="stylesheet">
</head> </head>
......
dashboardv2/public/js/collection/VSearchList.js
...@@ -32,30 +32,15 @@ define(['require', ...@@ -32,30 +32,15 @@ define(['require',
initialize: function() { initialize: function() {
this.modelName = 'VSearch'; this.modelName = 'VSearch';
this.modelAttrName = 'results'; this.modelAttrName = '';
}, },
parseRecords: function(resp, options) { parseRecords: function(resp, options) {
this.responseData = { this.queryType = resp.queryType;
dataType: resp.dataType, this.queryText = resp.queryText;
query: resp.query, if (resp.queryType && resp.queryType == "DSL") {
queryType: resp.queryType, return resp.entities ? resp.entities : [];
requestId: resp.requestId } else {
}; return resp.fullTextResult ? resp.fullTextResult : [];
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);
} }
}, },
}, },
......
dashboardv2/public/js/external_lib/pnotify.custom.min.js deleted 100644 → 0
/*
PNotify 3.0.0 sciactive.com/pnotify/
(C) 2015 Hunter Perrin; Google, Inc.
license Apache-2.0
*/
(function(b,k){"function"===typeof define&&define.amd?define("pnotify",["jquery"],function(q){return k(q,b)}):"object"===typeof exports&&"undefined"!==typeof module?module.exports=k(require("jquery"),global||b):b.PNotify=k(b.jQuery,b)})(this,function(b,k){var q=function(l){var k={dir1:"down",dir2:"left",push:"bottom",spacing1:36,spacing2:36,context:b("body"),modal:!1},g,h,n=b(l),r=function(){h=b("body");d.prototype.options.stack.context=h;n=b(l);n.bind("resize",function(){g&&clearTimeout(g);g=setTimeout(function(){d.positionAll(!0)},
10)})},s=function(c){var a=b("<div />",{"class":"ui-pnotify-modal-overlay"});a.prependTo(c.context);c.overlay_close&&a.click(function(){d.removeStack(c)});return a},d=function(c){this.parseOptions(c);this.init()};b.extend(d.prototype,{version:"3.0.0",options:{title:!1,title_escape:!1,text:!1,text_escape:!1,styling:"brighttheme",addclass:"",cornerclass:"",auto_display:!0,width:"300px",min_height:"16px",type:"notice",icon:!0,animation:"fade",animate_speed:"normal",shadow:!0,hide:!0,delay:8E3,mouse_reset:!0,
remove:!0,insert_brs:!0,destroy:!0,stack:k},modules:{},runModules:function(c,a){var p,b;for(b in this.modules)p="object"===typeof a&&b in a?a[b]:a,"function"===typeof this.modules[b][c]&&(this.modules[b].notice=this,this.modules[b].options="object"===typeof this.options[b]?this.options[b]:{},this.modules[b][c](this,"object"===typeof this.options[b]?this.options[b]:{},p))},state:"initializing",timer:null,animTimer:null,styles:null,elem:null,container:null,title_container:null,text_container:null,animating:!1,
timerHide:!1,init:function(){var c=this;this.modules={};b.extend(!0,this.modules,d.prototype.modules);this.styles="object"===typeof this.options.styling?this.options.styling:d.styling[this.options.styling];this.elem=b("<div />",{"class":"ui-pnotify "+this.options.addclass,css:{display:"none"},"aria-live":"assertive","aria-role":"alertdialog",mouseenter:function(a){if(c.options.mouse_reset&&"out"===c.animating){if(!c.timerHide)return;c.cancelRemove()}c.options.hide&&c.options.mouse_reset&&c.cancelRemove()},
mouseleave:function(a){c.options.hide&&c.options.mouse_reset&&"out"!==c.animating&&c.queueRemove();d.positionAll()}});"fade"===this.options.animation&&this.elem.addClass("ui-pnotify-fade-"+this.options.animate_speed);this.container=b("<div />",{"class":this.styles.container+" ui-pnotify-container "+("error"===this.options.type?this.styles.error:"info"===this.options.type?this.styles.info:"success"===this.options.type?this.styles.success:this.styles.notice),role:"alert"}).appendTo(this.elem);""!==
this.options.cornerclass&&this.container.removeClass("ui-corner-all").addClass(this.options.cornerclass);this.options.shadow&&this.container.addClass("ui-pnotify-shadow");!1!==this.options.icon&&b("<div />",{"class":"ui-pnotify-icon"}).append(b("<span />",{"class":!0===this.options.icon?"error"===this.options.type?this.styles.error_icon:"info"===this.options.type?this.styles.info_icon:"success"===this.options.type?this.styles.success_icon:this.styles.notice_icon:this.options.icon})).prependTo(this.container);
this.title_container=b("<h4 />",{"class":"ui-pnotify-title"}).appendTo(this.container);!1===this.options.title?this.title_container.hide():this.options.title_escape?this.title_container.text(this.options.title):this.title_container.html(this.options.title);this.text_container=b("<div />",{"class":"ui-pnotify-text","aria-role":"alert"}).appendTo(this.container);!1===this.options.text?this.text_container.hide():this.options.text_escape?this.text_container.text(this.options.text):this.text_container.html(this.options.insert_brs?
String(this.options.text).replace(/\n/g,"<br />"):this.options.text);"string"===typeof this.options.width&&this.elem.css("width",this.options.width);"string"===typeof this.options.min_height&&this.container.css("min-height",this.options.min_height);d.notices="top"===this.options.stack.push?b.merge([this],d.notices):b.merge(d.notices,[this]);"top"===this.options.stack.push&&this.queuePosition(!1,1);this.options.stack.animation=!1;this.runModules("init");this.options.auto_display&&this.open();return this},
update:function(c){var a=this.options;this.parseOptions(a,c);this.elem.removeClass("ui-pnotify-fade-slow ui-pnotify-fade-normal ui-pnotify-fade-fast");"fade"===this.options.animation&&this.elem.addClass("ui-pnotify-fade-"+this.options.animate_speed);this.options.cornerclass!==a.cornerclass&&this.container.removeClass("ui-corner-all "+a.cornerclass).addClass(this.options.cornerclass);this.options.shadow!==a.shadow&&(this.options.shadow?this.container.addClass("ui-pnotify-shadow"):this.container.removeClass("ui-pnotify-shadow"));
!1===this.options.addclass?this.elem.removeClass(a.addclass):this.options.addclass!==a.addclass&&this.elem.removeClass(a.addclass).addClass(this.options.addclass);!1===this.options.title?this.title_container.slideUp("fast"):this.options.title!==a.title&&(this.options.title_escape?this.title_container.text(this.options.title):this.title_container.html(this.options.title),!1===a.title&&this.title_container.slideDown(200));!1===this.options.text?this.text_container.slideUp("fast"):this.options.text!==
a.text&&(this.options.text_escape?this.text_container.text(this.options.text):this.text_container.html(this.options.insert_brs?String(this.options.text).replace(/\n/g,"<br />"):this.options.text),!1===a.text&&this.text_container.slideDown(200));this.options.type!==a.type&&this.container.removeClass(this.styles.error+" "+this.styles.notice+" "+this.styles.success+" "+this.styles.info).addClass("error"===this.options.type?this.styles.error:"info"===this.options.type?this.styles.info:"success"===this.options.type?
this.styles.success:this.styles.notice);if(this.options.icon!==a.icon||!0===this.options.icon&&this.options.type!==a.type)this.container.find("div.ui-pnotify-icon").remove(),!1!==this.options.icon&&b("<div />",{"class":"ui-pnotify-icon"}).append(b("<span />",{"class":!0===this.options.icon?"error"===this.options.type?this.styles.error_icon:"info"===this.options.type?this.styles.info_icon:"success"===this.options.type?this.styles.success_icon:this.styles.notice_icon:this.options.icon})).prependTo(this.container);
this.options.width!==a.width&&this.elem.animate({width:this.options.width});this.options.min_height!==a.min_height&&this.container.animate({minHeight:this.options.min_height});this.options.hide?a.hide||this.queueRemove():this.cancelRemove();this.queuePosition(!0);this.runModules("update",a);return this},open:function(){this.state="opening";this.runModules("beforeOpen");var c=this;this.elem.parent().length||this.elem.appendTo(this.options.stack.context?this.options.stack.context:h);"top"!==this.options.stack.push&&
this.position(!0);this.animateIn(function(){c.queuePosition(!0);c.options.hide&&c.queueRemove();c.state="open";c.runModules("afterOpen")});return this},remove:function(c){this.state="closing";this.timerHide=!!c;this.runModules("beforeClose");var a=this;this.timer&&(l.clearTimeout(this.timer),this.timer=null);this.animateOut(function(){a.state="closed";a.runModules("afterClose");a.queuePosition(!0);a.options.remove&&a.elem.detach();a.runModules("beforeDestroy");if(a.options.destroy&&null!==d.notices){var c=
b.inArray(a,d.notices);-1!==c&&d.notices.splice(c,1)}a.runModules("afterDestroy")});return this},get:function(){return this.elem},parseOptions:function(c,a){this.options=b.extend(!0,{},d.prototype.options);this.options.stack=d.prototype.options.stack;for(var p=[c,a],m,f=0;f<p.length;f++){m=p[f];if("undefined"===typeof m)break;if("object"!==typeof m)this.options.text=m;else for(var e in m)this.modules[e]?b.extend(!0,this.options[e],m[e]):this.options[e]=m[e]}},animateIn:function(c){this.animating=
"in";var a=this;c=function(){a.animTimer&&clearTimeout(a.animTimer);"in"===a.animating&&(a.elem.is(":visible")?(this&&this.call(),a.animating=!1):a.animTimer=setTimeout(c,40))}.bind(c);"fade"===this.options.animation?(this.elem.one("webkitTransitionEnd mozTransitionEnd MSTransitionEnd oTransitionEnd transitionend",c).addClass("ui-pnotify-in"),this.elem.css("opacity"),this.elem.addClass("ui-pnotify-fade-in"),this.animTimer=setTimeout(c,650)):(this.elem.addClass("ui-pnotify-in"),c())},animateOut:function(c){this.animating=
"out";var a=this;c=function(){a.animTimer&&clearTimeout(a.animTimer);"out"===a.animating&&("0"!=a.elem.css("opacity")&&a.elem.is(":visible")?a.animTimer=setTimeout(c,40):(a.elem.removeClass("ui-pnotify-in"),this&&this.call(),a.animating=!1))}.bind(c);"fade"===this.options.animation?(this.elem.one("webkitTransitionEnd mozTransitionEnd MSTransitionEnd oTransitionEnd transitionend",c).removeClass("ui-pnotify-fade-in"),this.animTimer=setTimeout(c,650)):(this.elem.removeClass("ui-pnotify-in"),c())},position:function(c){var a=
this.options.stack,b=this.elem;"undefined"===typeof a.context&&(a.context=h);if(a){"number"!==typeof a.nextpos1&&(a.nextpos1=a.firstpos1);"number"!==typeof a.nextpos2&&(a.nextpos2=a.firstpos2);"number"!==typeof a.addpos2&&(a.addpos2=0);var d=!b.hasClass("ui-pnotify-in");if(!d||c){a.modal&&(a.overlay?a.overlay.show():a.overlay=s(a));b.addClass("ui-pnotify-move");var f;switch(a.dir1){case "down":f="top";break;case "up":f="bottom";break;case "left":f="right";break;case "right":f="left"}c=parseInt(b.css(f).replace(/(?:\..*|[^0-9.])/g,
""));isNaN(c)&&(c=0);"undefined"!==typeof a.firstpos1||d||(a.firstpos1=c,a.nextpos1=a.firstpos1);var e;switch(a.dir2){case "down":e="top";break;case "up":e="bottom";break;case "left":e="right";break;case "right":e="left"}c=parseInt(b.css(e).replace(/(?:\..*|[^0-9.])/g,""));isNaN(c)&&(c=0);"undefined"!==typeof a.firstpos2||d||(a.firstpos2=c,a.nextpos2=a.firstpos2);if("down"===a.dir1&&a.nextpos1+b.height()>(a.context.is(h)?n.height():a.context.prop("scrollHeight"))||"up"===a.dir1&&a.nextpos1+b.height()>
(a.context.is(h)?n.height():a.context.prop("scrollHeight"))||"left"===a.dir1&&a.nextpos1+b.width()>(a.context.is(h)?n.width():a.context.prop("scrollWidth"))||"right"===a.dir1&&a.nextpos1+b.width()>(a.context.is(h)?n.width():a.context.prop("scrollWidth")))a.nextpos1=a.firstpos1,a.nextpos2+=a.addpos2+("undefined"===typeof a.spacing2?25:a.spacing2),a.addpos2=0;"number"===typeof a.nextpos2&&(a.animation?b.css(e,a.nextpos2+"px"):(b.removeClass("ui-pnotify-move"),b.css(e,a.nextpos2+"px"),b.css(e),b.addClass("ui-pnotify-move")));
switch(a.dir2){case "down":case "up":b.outerHeight(!0)>a.addpos2&&(a.addpos2=b.height());break;case "left":case "right":b.outerWidth(!0)>a.addpos2&&(a.addpos2=b.width())}"number"===typeof a.nextpos1&&(a.animation?b.css(f,a.nextpos1+"px"):(b.removeClass("ui-pnotify-move"),b.css(f,a.nextpos1+"px"),b.css(f),b.addClass("ui-pnotify-move")));switch(a.dir1){case "down":case "up":a.nextpos1+=b.height()+("undefined"===typeof a.spacing1?25:a.spacing1);break;case "left":case "right":a.nextpos1+=b.width()+("undefined"===
typeof a.spacing1?25:a.spacing1)}}return this}},queuePosition:function(b,a){g&&clearTimeout(g);a||(a=10);g=setTimeout(function(){d.positionAll(b)},a);return this},cancelRemove:function(){this.timer&&l.clearTimeout(this.timer);this.animTimer&&l.clearTimeout(this.animTimer);"closing"===this.state&&(this.state="open",this.animating=!1,this.elem.addClass("ui-pnotify-in"),"fade"===this.options.animation&&this.elem.addClass("ui-pnotify-fade-in"));return this},queueRemove:function(){var b=this;this.cancelRemove();
this.timer=l.setTimeout(function(){b.remove(!0)},isNaN(this.options.delay)?0:this.options.delay);return this}});b.extend(d,{notices:[],reload:q,removeAll:function(){b.each(d.notices,function(){this.remove&&this.remove(!1)})},removeStack:function(c){b.each(d.notices,function(){this.remove&&this.options.stack===c&&this.remove(!1)})},positionAll:function(c){g&&clearTimeout(g);g=null;if(d.notices&&d.notices.length)b.each(d.notices,function(){var a=this.options.stack;a&&(a.overlay&&a.overlay.hide(),a.nextpos1=
a.firstpos1,a.nextpos2=a.firstpos2,a.addpos2=0,a.animation=c)}),b.each(d.notices,function(){this.position()});else{var a=d.prototype.options.stack;a&&(delete a.nextpos1,delete a.nextpos2)}},styling:{brighttheme:{container:"brighttheme",notice:"brighttheme-notice",notice_icon:"brighttheme-icon-notice",info:"brighttheme-info",info_icon:"brighttheme-icon-info",success:"brighttheme-success",success_icon:"brighttheme-icon-success",error:"brighttheme-error",error_icon:"brighttheme-icon-error"},jqueryui:{container:"ui-widget ui-widget-content ui-corner-all",
notice:"ui-state-highlight",notice_icon:"ui-icon ui-icon-info",info:"",info_icon:"ui-icon ui-icon-info",success:"ui-state-default",success_icon:"ui-icon ui-icon-circle-check",error:"ui-state-error",error_icon:"ui-icon ui-icon-alert"},bootstrap3:{container:"alert",notice:"alert-warning",notice_icon:"glyphicon glyphicon-exclamation-sign",info:"alert-info",info_icon:"glyphicon glyphicon-info-sign",success:"alert-success",success_icon:"glyphicon glyphicon-ok-sign",error:"alert-danger",error_icon:"glyphicon glyphicon-warning-sign"}}});
d.styling.fontawesome=b.extend({},d.styling.bootstrap3);b.extend(d.styling.fontawesome,{notice_icon:"fa fa-exclamation-circle",info_icon:"fa fa-info",success_icon:"fa fa-check",error_icon:"fa fa-warning"});l.document.body?r():b(r);return d};return q(k)});
(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)})(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"})});
(function(b,a){"function"===typeof define&&define.amd?define("pnotify.callbacks",["jquery","pnotify"],a):"object"===typeof exports&&"undefined"!==typeof module?module.exports=a(require("jquery"),require("./pnotify")):a(b.jQuery,b.PNotify)})(this,function(b,a){var c=a.prototype.init,d=a.prototype.open,e=a.prototype.remove;a.prototype.init=function(){this.options.before_init&&this.options.before_init(this.options);c.apply(this,arguments);this.options.after_init&&this.options.after_init(this)};a.prototype.open=
function(){var a;this.options.before_open&&(a=this.options.before_open(this));!1!==a&&(d.apply(this,arguments),this.options.after_open&&this.options.after_open(this))};a.prototype.remove=function(a){var b;this.options.before_close&&(b=this.options.before_close(this,a));!1!==b&&(e.apply(this,arguments),this.options.after_close&&this.options.after_close(this,a))}});
(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)})(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/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/external_lib/pnotify/pnotify.js 0 → 100644
/*
PNotify 3.0.0 sciactive.com/pnotify/
(C) 2015 Hunter Perrin; Google, Inc.
license Apache-2.0
*/
(function(b,k){"function"===typeof define&&define.amd?define("pnotify",["jquery"],function(q){return k(q,b)}):"object"===typeof exports&&"undefined"!==typeof module?module.exports=k(require("jquery"),global||b):b.PNotify=k(b.jQuery,b)})("undefined"!==typeof window?window:this,function(b,k){var q=function(l){var k={dir1:"down",dir2:"left",push:"bottom",spacing1:36,spacing2:36,context:b("body"),modal:!1},g,h,n=b(l),r=function(){h=b("body");d.prototype.options.stack.context=h;n=b(l);n.bind("resize",
function(){g&&clearTimeout(g);g=setTimeout(function(){d.positionAll(!0)},10)})},s=function(c){var a=b("<div />",{"class":"ui-pnotify-modal-overlay"});a.prependTo(c.context);c.overlay_close&&a.click(function(){d.removeStack(c)});return a},d=function(c){this.parseOptions(c);this.init()};b.extend(d.prototype,{version:"3.0.0",options:{title:!1,title_escape:!1,text:!1,text_escape:!1,styling:"brighttheme",addclass:"",cornerclass:"",auto_display:!0,width:"300px",min_height:"16px",type:"notice",icon:!0,animation:"fade",
animate_speed:"normal",shadow:!0,hide:!0,delay:8E3,mouse_reset:!0,remove:!0,insert_brs:!0,destroy:!0,stack:k},modules:{},runModules:function(c,a){var p,b;for(b in this.modules)p="object"===typeof a&&b in a?a[b]:a,"function"===typeof this.modules[b][c]&&(this.modules[b].notice=this,this.modules[b].options="object"===typeof this.options[b]?this.options[b]:{},this.modules[b][c](this,"object"===typeof this.options[b]?this.options[b]:{},p))},state:"initializing",timer:null,animTimer:null,styles:null,elem:null,
container:null,title_container:null,text_container:null,animating:!1,timerHide:!1,init:function(){var c=this;this.modules={};b.extend(!0,this.modules,d.prototype.modules);this.styles="object"===typeof this.options.styling?this.options.styling:d.styling[this.options.styling];this.elem=b("<div />",{"class":"ui-pnotify "+this.options.addclass,css:{display:"none"},"aria-live":"assertive","aria-role":"alertdialog",mouseenter:function(a){if(c.options.mouse_reset&&"out"===c.animating){if(!c.timerHide)return;
c.cancelRemove()}c.options.hide&&c.options.mouse_reset&&c.cancelRemove()},mouseleave:function(a){c.options.hide&&c.options.mouse_reset&&"out"!==c.animating&&c.queueRemove();d.positionAll()}});"fade"===this.options.animation&&this.elem.addClass("ui-pnotify-fade-"+this.options.animate_speed);this.container=b("<div />",{"class":this.styles.container+" ui-pnotify-container "+("error"===this.options.type?this.styles.error:"info"===this.options.type?this.styles.info:"success"===this.options.type?this.styles.success:
this.styles.notice),role:"alert"}).appendTo(this.elem);""!==this.options.cornerclass&&this.container.removeClass("ui-corner-all").addClass(this.options.cornerclass);this.options.shadow&&this.container.addClass("ui-pnotify-shadow");!1!==this.options.icon&&b("<div />",{"class":"ui-pnotify-icon"}).append(b("<span />",{"class":!0===this.options.icon?"error"===this.options.type?this.styles.error_icon:"info"===this.options.type?this.styles.info_icon:"success"===this.options.type?this.styles.success_icon:
this.styles.notice_icon:this.options.icon})).prependTo(this.container);this.title_container=b("<h4 />",{"class":"ui-pnotify-title"}).appendTo(this.container);!1===this.options.title?this.title_container.hide():this.options.title_escape?this.title_container.text(this.options.title):this.title_container.html(this.options.title);this.text_container=b("<div />",{"class":"ui-pnotify-text","aria-role":"alert"}).appendTo(this.container);!1===this.options.text?this.text_container.hide():this.options.text_escape?
this.text_container.text(this.options.text):this.text_container.html(this.options.insert_brs?String(this.options.text).replace(/\n/g,"<br />"):this.options.text);"string"===typeof this.options.width&&this.elem.css("width",this.options.width);"string"===typeof this.options.min_height&&this.container.css("min-height",this.options.min_height);d.notices="top"===this.options.stack.push?b.merge([this],d.notices):b.merge(d.notices,[this]);"top"===this.options.stack.push&&this.queuePosition(!1,1);this.options.stack.animation=
!1;this.runModules("init");this.options.auto_display&&this.open();return this},update:function(c){var a=this.options;this.parseOptions(a,c);this.elem.removeClass("ui-pnotify-fade-slow ui-pnotify-fade-normal ui-pnotify-fade-fast");"fade"===this.options.animation&&this.elem.addClass("ui-pnotify-fade-"+this.options.animate_speed);this.options.cornerclass!==a.cornerclass&&this.container.removeClass("ui-corner-all "+a.cornerclass).addClass(this.options.cornerclass);this.options.shadow!==a.shadow&&(this.options.shadow?
this.container.addClass("ui-pnotify-shadow"):this.container.removeClass("ui-pnotify-shadow"));!1===this.options.addclass?this.elem.removeClass(a.addclass):this.options.addclass!==a.addclass&&this.elem.removeClass(a.addclass).addClass(this.options.addclass);!1===this.options.title?this.title_container.slideUp("fast"):this.options.title!==a.title&&(this.options.title_escape?this.title_container.text(this.options.title):this.title_container.html(this.options.title),!1===a.title&&this.title_container.slideDown(200));
!1===this.options.text?this.text_container.slideUp("fast"):this.options.text!==a.text&&(this.options.text_escape?this.text_container.text(this.options.text):this.text_container.html(this.options.insert_brs?String(this.options.text).replace(/\n/g,"<br />"):this.options.text),!1===a.text&&this.text_container.slideDown(200));this.options.type!==a.type&&this.container.removeClass(this.styles.error+" "+this.styles.notice+" "+this.styles.success+" "+this.styles.info).addClass("error"===this.options.type?
this.styles.error:"info"===this.options.type?this.styles.info:"success"===this.options.type?this.styles.success:this.styles.notice);if(this.options.icon!==a.icon||!0===this.options.icon&&this.options.type!==a.type)this.container.find("div.ui-pnotify-icon").remove(),!1!==this.options.icon&&b("<div />",{"class":"ui-pnotify-icon"}).append(b("<span />",{"class":!0===this.options.icon?"error"===this.options.type?this.styles.error_icon:"info"===this.options.type?this.styles.info_icon:"success"===this.options.type?
this.styles.success_icon:this.styles.notice_icon:this.options.icon})).prependTo(this.container);this.options.width!==a.width&&this.elem.animate({width:this.options.width});this.options.min_height!==a.min_height&&this.container.animate({minHeight:this.options.min_height});this.options.hide?a.hide||this.queueRemove():this.cancelRemove();this.queuePosition(!0);this.runModules("update",a);return this},open:function(){this.state="opening";this.runModules("beforeOpen");var c=this;this.elem.parent().length||
this.elem.appendTo(this.options.stack.context?this.options.stack.context:h);"top"!==this.options.stack.push&&this.position(!0);this.animateIn(function(){c.queuePosition(!0);c.options.hide&&c.queueRemove();c.state="open";c.runModules("afterOpen")});return this},remove:function(c){this.state="closing";this.timerHide=!!c;this.runModules("beforeClose");var a=this;this.timer&&(l.clearTimeout(this.timer),this.timer=null);this.animateOut(function(){a.state="closed";a.runModules("afterClose");a.queuePosition(!0);
a.options.remove&&a.elem.detach();a.runModules("beforeDestroy");if(a.options.destroy&&null!==d.notices){var c=b.inArray(a,d.notices);-1!==c&&d.notices.splice(c,1)}a.runModules("afterDestroy")});return this},get:function(){return this.elem},parseOptions:function(c,a){this.options=b.extend(!0,{},d.prototype.options);this.options.stack=d.prototype.options.stack;for(var p=[c,a],m,f=0;f<p.length;f++){m=p[f];if("undefined"===typeof m)break;if("object"!==typeof m)this.options.text=m;else for(var e in m)this.modules[e]?
b.extend(!0,this.options[e],m[e]):this.options[e]=m[e]}},animateIn:function(c){this.animating="in";var a=this;c=function(){a.animTimer&&clearTimeout(a.animTimer);"in"===a.animating&&(a.elem.is(":visible")?(this&&this.call(),a.animating=!1):a.animTimer=setTimeout(c,40))}.bind(c);"fade"===this.options.animation?(this.elem.one("webkitTransitionEnd mozTransitionEnd MSTransitionEnd oTransitionEnd transitionend",c).addClass("ui-pnotify-in"),this.elem.css("opacity"),this.elem.addClass("ui-pnotify-fade-in"),
this.animTimer=setTimeout(c,650)):(this.elem.addClass("ui-pnotify-in"),c())},animateOut:function(c){this.animating="out";var a=this;c=function(){a.animTimer&&clearTimeout(a.animTimer);"out"===a.animating&&("0"!=a.elem.css("opacity")&&a.elem.is(":visible")?a.animTimer=setTimeout(c,40):(a.elem.removeClass("ui-pnotify-in"),this&&this.call(),a.animating=!1))}.bind(c);"fade"===this.options.animation?(this.elem.one("webkitTransitionEnd mozTransitionEnd MSTransitionEnd oTransitionEnd transitionend",c).removeClass("ui-pnotify-fade-in"),
this.animTimer=setTimeout(c,650)):(this.elem.removeClass("ui-pnotify-in"),c())},position:function(c){var a=this.options.stack,b=this.elem;"undefined"===typeof a.context&&(a.context=h);if(a){"number"!==typeof a.nextpos1&&(a.nextpos1=a.firstpos1);"number"!==typeof a.nextpos2&&(a.nextpos2=a.firstpos2);"number"!==typeof a.addpos2&&(a.addpos2=0);var d=!b.hasClass("ui-pnotify-in");if(!d||c){a.modal&&(a.overlay?a.overlay.show():a.overlay=s(a));b.addClass("ui-pnotify-move");var f;switch(a.dir1){case "down":f=
"top";break;case "up":f="bottom";break;case "left":f="right";break;case "right":f="left"}c=parseInt(b.css(f).replace(/(?:\..*|[^0-9.])/g,""));isNaN(c)&&(c=0);"undefined"!==typeof a.firstpos1||d||(a.firstpos1=c,a.nextpos1=a.firstpos1);var e;switch(a.dir2){case "down":e="top";break;case "up":e="bottom";break;case "left":e="right";break;case "right":e="left"}c=parseInt(b.css(e).replace(/(?:\..*|[^0-9.])/g,""));isNaN(c)&&(c=0);"undefined"!==typeof a.firstpos2||d||(a.firstpos2=c,a.nextpos2=a.firstpos2);
if("down"===a.dir1&&a.nextpos1+b.height()>(a.context.is(h)?n.height():a.context.prop("scrollHeight"))||"up"===a.dir1&&a.nextpos1+b.height()>(a.context.is(h)?n.height():a.context.prop("scrollHeight"))||"left"===a.dir1&&a.nextpos1+b.width()>(a.context.is(h)?n.width():a.context.prop("scrollWidth"))||"right"===a.dir1&&a.nextpos1+b.width()>(a.context.is(h)?n.width():a.context.prop("scrollWidth")))a.nextpos1=a.firstpos1,a.nextpos2+=a.addpos2+("undefined"===typeof a.spacing2?25:a.spacing2),a.addpos2=0;"number"===
typeof a.nextpos2&&(a.animation?b.css(e,a.nextpos2+"px"):(b.removeClass("ui-pnotify-move"),b.css(e,a.nextpos2+"px"),b.css(e),b.addClass("ui-pnotify-move")));switch(a.dir2){case "down":case "up":b.outerHeight(!0)>a.addpos2&&(a.addpos2=b.height());break;case "left":case "right":b.outerWidth(!0)>a.addpos2&&(a.addpos2=b.width())}"number"===typeof a.nextpos1&&(a.animation?b.css(f,a.nextpos1+"px"):(b.removeClass("ui-pnotify-move"),b.css(f,a.nextpos1+"px"),b.css(f),b.addClass("ui-pnotify-move")));switch(a.dir1){case "down":case "up":a.nextpos1+=
b.height()+("undefined"===typeof a.spacing1?25:a.spacing1);break;case "left":case "right":a.nextpos1+=b.width()+("undefined"===typeof a.spacing1?25:a.spacing1)}}return this}},queuePosition:function(b,a){g&&clearTimeout(g);a||(a=10);g=setTimeout(function(){d.positionAll(b)},a);return this},cancelRemove:function(){this.timer&&l.clearTimeout(this.timer);this.animTimer&&l.clearTimeout(this.animTimer);"closing"===this.state&&(this.state="open",this.animating=!1,this.elem.addClass("ui-pnotify-in"),"fade"===
this.options.animation&&this.elem.addClass("ui-pnotify-fade-in"));return this},queueRemove:function(){var b=this;this.cancelRemove();this.timer=l.setTimeout(function(){b.remove(!0)},isNaN(this.options.delay)?0:this.options.delay);return this}});b.extend(d,{notices:[],reload:q,removeAll:function(){b.each(d.notices,function(){this.remove&&this.remove(!1)})},removeStack:function(c){b.each(d.notices,function(){this.remove&&this.options.stack===c&&this.remove(!1)})},positionAll:function(c){g&&clearTimeout(g);
g=null;if(d.notices&&d.notices.length)b.each(d.notices,function(){var a=this.options.stack;a&&(a.overlay&&a.overlay.hide(),a.nextpos1=a.firstpos1,a.nextpos2=a.firstpos2,a.addpos2=0,a.animation=c)}),b.each(d.notices,function(){this.position()});else{var a=d.prototype.options.stack;a&&(delete a.nextpos1,delete a.nextpos2)}},styling:{brighttheme:{container:"brighttheme",notice:"brighttheme-notice",notice_icon:"brighttheme-icon-notice",info:"brighttheme-info",info_icon:"brighttheme-icon-info",success:"brighttheme-success",
success_icon:"brighttheme-icon-success",error:"brighttheme-error",error_icon:"brighttheme-icon-error"},jqueryui:{container:"ui-widget ui-widget-content ui-corner-all",notice:"ui-state-highlight",notice_icon:"ui-icon ui-icon-info",info:"",info_icon:"ui-icon ui-icon-info",success:"ui-state-default",success_icon:"ui-icon ui-icon-circle-check",error:"ui-state-error",error_icon:"ui-icon ui-icon-alert"},bootstrap3:{container:"alert",notice:"alert-warning",notice_icon:"glyphicon glyphicon-exclamation-sign",
info:"alert-info",info_icon:"glyphicon glyphicon-info-sign",success:"alert-success",success_icon:"glyphicon glyphicon-ok-sign",error:"alert-danger",error_icon:"glyphicon glyphicon-warning-sign"}}});d.styling.fontawesome=b.extend({},d.styling.bootstrap3);b.extend(d.styling.fontawesome,{notice_icon:"fa fa-exclamation-circle",info_icon:"fa fa-info",success_icon:"fa fa-check",error_icon:"fa fa-warning"});l.document.body?r():b(r);return d};return q(k)});
dashboardv2/public/js/main.js
...@@ -139,7 +139,9 @@ require.config({ ...@@ -139,7 +139,9 @@ require.config({
'moment': 'libs/moment/js/moment.min', 'moment': 'libs/moment/js/moment.min',
'jquery-ui': 'external_lib/jquery-ui/jquery-ui.min', 'jquery-ui': 'external_lib/jquery-ui/jquery-ui.min',
'datetimepicker': 'external_lib/datetimepicker/bootstrap-datetimepicker', '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', 'jquery-placeholder': 'libs/jquery-placeholder/js/jquery.placeholder',
'platform': 'libs/platform/platform' 'platform': 'libs/platform/platform'
}, },
......
dashboardv2/public/js/models/VEntity.js
...@@ -52,8 +52,8 @@ define(['require', ...@@ -52,8 +52,8 @@ define(['require',
return this.constructor.nonCrudOperation.call(this, url, 'GET', options); return this.constructor.nonCrudOperation.call(this, url, 'GET', options);
}, },
saveEntity: function(token, options) { saveTraitsEntity: function(options) {
var url = UrlLinks.entitiesTraitsApiUrl(token); var url = UrlLinks.entitiesTraitsApiUrl();
options = _.extend({ options = _.extend({
contentType: 'application/json', contentType: 'application/json',
dataType: 'json' dataType: 'json'
......
dashboardv2/public/js/modules/atlasLogin.js
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
//Define indexOf for IE //Define indexOf for IE
if (!Array.indexOf) { if (!Array.indexOf) {
Array.prototype.indexOf = function(obj, start) { Array.prototype.indexOf = function(obj, start) {
for ( var i = (start || 0); i < this.length; i++) { for (var i = (start || 0); i < this.length; i++) {
if (this[i] == obj) { if (this[i] == obj) {
return i; return i;
} }
...@@ -54,57 +54,60 @@ function doLogin() { ...@@ -54,57 +54,60 @@ function doLogin() {
var url = baseUrl + 'j_spring_security_check'; var url = baseUrl + 'j_spring_security_check';
$.ajax({ $.ajax({
data : { data: {
j_username : userName, j_username: userName,
j_password : passwd j_password: passwd
}, },
url : url, url: url,
type : 'POST', type: 'POST',
headers : { headers: {
"cache-control" : "no-cache" "cache-control": "no-cache"
}, },
success : function() { success: function() {
if(location.hash.length > 2) if (location.hash.length > 2)
window.location.replace('index.html'+location.hash); window.location.replace('index.html' + location.hash);
else else
window.location.replace('index.html'); window.location.replace('index.html');
}, },
error : function(jqXHR, textStatus, err ) { error: function(jqXHR, textStatus, err) {
$('#signIn').removeAttr('disabled'); $('#signIn').removeAttr('disabled');
$('#signInLoading').css("visibility", "hidden"); $('#signInLoading').css("visibility", "hidden");
if(jqXHR.status && jqXHR.status == 412){ if (jqXHR.status && jqXHR.status == 412) {
$('#errorBox').hide(); $('#errorBox').hide();
$('#errorBoxUnsynced').show(); $('#errorBoxUnsynced').show();
} else { } else {
try {
var resp = JSON.parse(jqXHR.responseText); var resp = JSON.parse(jqXHR.responseText);
if(resp.msgDesc.startsWith("Username not found") || resp.msgDesc.startsWith("Wrong password")){ if (resp.msgDesc.startsWith("Username not found") || resp.msgDesc.startsWith("Wrong password")) {
$('#errorBox .errorMsg').text("Invalid User credentials. Please try again."); $('#errorBox .errorMsg').text("Invalid User credentials. Please try again.");
}else if(resp.msgDesc.startsWith("User role credentials is not set properly")){ } else if (resp.msgDesc.startsWith("User role credentials is not set properly")) {
$('#errorBox .errorMsg').text("User role or credentials is not set properly"); $('#errorBox .errorMsg').text("User role or credentials is not set properly");
}else{ } else {
$('#errorBox .errorMsg').text("Error while authentication"); $('#errorBox .errorMsg').text("Error while authentication");
} }
} catch (err) {
$('#errorBox .errorMsg').text("Something went wrong");
}
$('#errorBox').show(); $('#errorBox').show();
$('#errorBoxUnsynced').hide(); $('#errorBoxUnsynced').hide();
} }
} }
}); });
} }
function getBaseUrl(){
if(!window.location.origin){ function getBaseUrl() {
window.location.origin = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ':' + window.location.port: ''); if (!window.location.origin) {
window.location.origin = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ':' + window.location.port : '');
} }
return window.location.origin return window.location.origin + window.location.pathname.substring(window.location.pathname
+ window.location.pathname.substring(window.location.pathname
.indexOf('/', 2) + 1, 0); .indexOf('/', 2) + 1, 0);
} }
$(function() { $(function() {
// register handlers // register handlers
$('#signIn').on('click', function() { $('#signIn').on('click', function() {
$('#signIn').attr('disabled',true); $('#signIn').attr('disabled', true);
$('#signInLoading').css("visibility", "visible"); $('#signInLoading').css("visibility", "visible");
doLogin(); doLogin();
return false; return false;
...@@ -118,10 +121,10 @@ $(function() { ...@@ -118,10 +121,10 @@ $(function() {
}); });
}); });
$('#loginForm li[class^=control-group] > input').on('change',function(e){ $('#loginForm li[class^=control-group] > input').on('change', function(e) {
if(e.target.value === ''){ if (e.target.value === '') {
$(e.target).parent().addClass('error'); $(e.target).parent().addClass('error');
}else{ } else {
$(e.target).parent().removeClass('error'); $(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 ...@@ -285,28 +285,28 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
}); });
} }
} }
CommonViewFunction.termTableBreadcrumbMaker = function(model) { CommonViewFunction.termTableBreadcrumbMaker = function(obj) {
if (!model) { if (!obj) {
return ""; return "";
} }
var traits = model.get('$traits$'), var traits = obj.classificationNames,
url = "", url = "",
deleteHtml = "", deleteHtml = "",
html = "", html = "",
id = model.get('$id$').id || model.get('$id$'), id = obj.guid,
terms = []; terms = [],
_.keys(traits).map(function(key) { entityName = (_.escape(obj.attributes && obj.attributes.name ? obj.attributes.name : null) || _.escape(obj.displayText) || obj.guid);
if (traits[key]) { if (traits) {
var tagName = Utils.checkTagOrTerm(traits[key]); traits.map(function(term) {
} if (term.split(".").length > 1) {
if (tagName.term) {
terms.push({ 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>', 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(tagName.fullName).split(".").join("/"), url: _.unescape(term).split(".").join("/"),
name: tagName.fullName name: term
}); });
} }
}); });
}
_.each(terms, function(obj, i) { _.each(terms, function(obj, i) {
var className = ""; var className = "";
if (i >= 1) { if (i >= 1) {
...@@ -318,42 +318,46 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum ...@@ -318,42 +318,46 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
if (terms.length > 1) { 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>' 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$')) { if (!Enums.entityStateReadOnly[obj.status]) {
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>' 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 { } else {
html += '<div><a href="javascript:void(0)" class="inputAssignTag" data-id="addTerm"><i class="fa fa-folder-o"></i>' + " " + 'Assign Term</a></div>' html += '<div><a href="javascript:void(0)" class="inputAssignTag" data-id="addTerm"><i class="fa fa-folder-o"></i>' + " " + 'Assign Term</a></div>'
} }
}
return { return {
html: '<div class="termTableBreadcrumb" dataterm-id="' + id + '">' + html + '</div>', html: '<div class="termTableBreadcrumb" dataterm-id="' + id + '">' + html + '</div>',
object: { scopeId: id, value: terms } object: { scopeId: id, value: terms }
} }
} }
CommonViewFunction.tagForTable = function(model) { CommonViewFunction.tagForTable = function(obj) {
var traits = model.get('$traits$'), var traits = obj.classificationNames,
atags = "", atags = "",
addTag = "", addTag = "",
popTag = "", popTag = "",
count = 0; count = 0,
_.keys(model.get('$traits$')).map(function(key) { entityName = (_.escape(obj.attributes && obj.attributes.name ? obj.attributes.name : null) || _.escape(obj.displayText) || obj.guid);
if (traits[key]) { if (traits) {
var tagName = Utils.checkTagOrTerm(traits[key]); traits.map(function(tag) {
} if (tag.split(".").length === 1) {
var className = "inputTag"; var className = "inputTag";
if (tagName.tag) {
if (count >= 1) { 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>'; 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 { } 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>'; 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 (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>'; 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 { } else {
addTag += '<a href="javascript:void(0)" data-id="addTag" class="inputTagAdd assignTag"><i style="right:0" class="fa fa-plus"></i></a>'; 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) { if (count > 1) {
addTag += '<div data-id="showMoreLess" class="inputTagAdd assignTag tagDetailPopover"><i class="fa fa-ellipsis-h" aria-hidden="true"></i></div>' 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) { ...@@ -35,7 +35,7 @@ define(['require'], function(require) {
updateTagDescriptionMessage: "Tag description is updated successfully", updateTagDescriptionMessage: "Tag description is updated successfully",
updateTermDescriptionMessage: "Term description is updated successfully", updateTermDescriptionMessage: "Term description is updated successfully",
editSuccessMessage: " has been updated successfully", editSuccessMessage: " has been updated successfully",
assignDeletedEntity: " entity is deleted, tag cannot be assigned" assignDeletedEntity: " is deleted, tag cannot be assigned"
}; };
return Messages; return Messages;
}); });
dashboardv2/public/js/utils/UrlLinks.js
...@@ -47,7 +47,13 @@ define(['require', 'utils/Enums'], function(require, Enums) { ...@@ -47,7 +47,13 @@ define(['require', 'utils/Enums'], function(require, Enums) {
} }
}, },
entitiesTraitsApiUrl: function(token) { 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) { entityCollectionaudit: function(guid) {
return this.baseUrl + '/entities/' + guid + '/audit'; return this.baseUrl + '/entities/' + guid + '/audit';
...@@ -82,7 +88,7 @@ define(['require', 'utils/Enums'], function(require, Enums) { ...@@ -82,7 +88,7 @@ define(['require', 'utils/Enums'], function(require, Enums) {
} }
}, },
searchApiUrl: function(searchtype) { searchApiUrl: function(searchtype) {
var searchUrl = this.baseUrl + '/discovery/search'; var searchUrl = this.baseUrlV2 + '/search';
if (searchtype) { if (searchtype) {
return searchUrl + '/' + searchtype; return searchUrl + '/' + searchtype;
} else { } else {
......
dashboardv2/public/js/utils/Utils.js
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* limitations under the License. * 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'; 'use strict';
var Utils = {}; var Utils = {};
...@@ -49,35 +49,60 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages'], function(requi ...@@ -49,35 +49,60 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages'], function(requi
}; };
var notify = function(options) { 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) { Utils.notifyInfo = function(options) {
notify({ notify({
type: "info", type: "info",
text: _.escape(options.content) || "Info message." text: (options.html ? options.content : _.escape(options.content)) || "Info message."
}); });
}; };
Utils.notifyWarn = function(options) { Utils.notifyWarn = function(options) {
notify({ notify({
type: "notice", type: "notice",
text: _.escape(options.content) || "Info message." text: (options.html ? options.content : _.escape(options.content)) || "Info message."
}); });
}; };
Utils.notifyError = function(options) { Utils.notifyError = function(options) {
notify({ notify({
type: "error", type: "error",
text: _.escape(options.content) || "Error occurred." text: (options.html ? options.content : _.escape(options.content)) || "Error occurred."
}); });
}; };
Utils.notifySuccess = function(options) { Utils.notifySuccess = function(options) {
notify({ notify({
type: "success", 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) { Utils.defaultErrorHandler = function(model, error) {
if (error && error.status) { if (error && error.status) {
if (error.status == 401) { if (error.status == 401) {
...@@ -87,11 +112,13 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages'], function(requi ...@@ -87,11 +112,13 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages'], function(requi
} else if (error.status == 403) { } else if (error.status == 403) {
var message = "You are not authorized"; var message = "You are not authorized";
if (error.statusText) { if (error.statusText) {
try {
message = JSON.parse(error.statusText).AuthorizationError; message = JSON.parse(error.statusText).AuthorizationError;
} } catch (err) {}
Utils.notifyError({ Utils.notifyError({
content: message content: message
}); });
}
} else if (error.status == "0" && error.statusText != "abort") { } else if (error.status == "0" && error.statusText != "abort") {
var diffTime = (new Date().getTime() - prevNetworkErrorTime); var diffTime = (new Date().getTime() - prevNetworkErrorTime);
if (diffTime > 3000) { if (diffTime > 3000) {
......
dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
...@@ -129,6 +129,9 @@ define(['require', ...@@ -129,6 +129,9 @@ define(['require',
if (!this.name && collectionJSON.attributes.qualifiedName) { if (!this.name && collectionJSON.attributes.qualifiedName) {
this.name = collectionJSON.attributes.qualifiedName; this.name = collectionJSON.attributes.qualifiedName;
} }
if (!this.name && collectionJSON.displayText) {
this.name = collectionJSON.displayText;
}
if (this.name && collectionJSON.typeName) { if (this.name && collectionJSON.typeName) {
this.name = this.name + ' (' + collectionJSON.typeName + ')'; this.name = this.name + ' (' + collectionJSON.typeName + ')';
} }
...@@ -162,7 +165,7 @@ define(['require', ...@@ -162,7 +165,7 @@ define(['require',
this.addTagToTerms([]); this.addTagToTerms([]);
} }
} }
Utils.hideTitleLoader(this.$('.page-title .fontLoader'), this.$('.entityDetail')); this.hideLoader();
this.auditVent.trigger("reset:collection"); this.auditVent.trigger("reset:collection");
this.renderEntityDetailTableLayoutView(); this.renderEntityDetailTableLayoutView();
this.renderTagTableLayoutView(tagGuid); this.renderTagTableLayoutView(tagGuid);
...@@ -234,12 +237,12 @@ define(['require', ...@@ -234,12 +237,12 @@ define(['require',
termData = ""; termData = "";
_.each(tagObject, function(val) { _.each(tagObject, function(val) {
var isTerm = Utils.checkTagOrTerm(val); //var isTerm = Utils.checkTagOrTerm(val);
if (isTerm.tag) { if (val.typeName && val.typeName.split('.').length === 1) {
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>'; 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) { if (val.typeName && val.typeName.split('.').length > 1) {
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>'; 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(); this.ui.tagList.find("span.inputTag").remove();
...@@ -247,15 +250,26 @@ define(['require', ...@@ -247,15 +250,26 @@ define(['require',
this.ui.tagList.prepend(tagData); this.ui.tagList.prepend(tagData);
this.ui.termList.prepend(termData); 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) { onClickAddTagBtn: function(e) {
var that = this; var that = this;
require(['views/tag/addTagModalView'], function(AddTagModalView) { require(['views/tag/addTagModalView'], function(AddTagModalView) {
var view = new AddTagModalView({ var view = new AddTagModalView({
vent: that.vent, vent: that.vent,
guid: that.id, guid: that.id,
tagList: _.map(that.collection.first().toJSON().classifications, function(obj) {
return obj.typeName;
}),
callback: function() { callback: function() {
that.fetchCollection(); that.fetchCollection();
} },
showLoader: that.showLoader.bind(that),
hideLoader: that.hideLoader.bind(that)
}); });
view.modal.on('ok', function() { view.modal.on('ok', function() {
Utils.showTitleLoader(that.$('.page-title .fontLoader'), that.$('.entityDetail')); Utils.showTitleLoader(that.$('.page-title .fontLoader'), that.$('.entityDetail'));
...@@ -271,7 +285,9 @@ define(['require', ...@@ -271,7 +285,9 @@ define(['require',
guid: that.id, guid: that.id,
callback: function() { callback: function() {
that.fetchCollection(); that.fetchCollection();
} },
showLoader: that.showLoader.bind(that),
hideLoader: that.hideLoader.bind(that)
}); });
view.modal.on('ok', function() { view.modal.on('ok', function() {
Utils.showTitleLoader(that.$('.page-title .fontLoader'), that.$('.entityDetail')); Utils.showTitleLoader(that.$('.page-title .fontLoader'), that.$('.entityDetail'));
......
dashboardv2/public/js/views/graph/LineageLayoutView.js
...@@ -102,8 +102,7 @@ define(['require', ...@@ -102,8 +102,7 @@ define(['require',
}, },
cust_error: function(model, response) { cust_error: function(model, response) {
that.noLineage(); that.noLineage();
}, }
complete: function() {}
}) })
}, },
noLineage: function() { noLineage: function() {
......
dashboardv2/public/js/views/schema/SchemaLayoutView.js
...@@ -123,9 +123,14 @@ define(['require', ...@@ -123,9 +123,14 @@ define(['require',
this.schemaCollection.find(function(item) { this.schemaCollection.find(function(item) {
if (item.get('isEnable')) { if (item.get('isEnable')) {
var term = []; 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({ that.arr.push({
id: item.get("$id$"), id: item.get("$id$").id || item.get("$id$"),
model: item model: obj
}); });
} }
}); });
...@@ -164,6 +169,7 @@ define(['require', ...@@ -164,6 +169,7 @@ define(['require',
var that = this; var that = this;
this.$('.fontLoader').show(); this.$('.fontLoader').show();
this.schemaCollection.fetch({ this.schemaCollection.fetch({
skipDefaultError: true,
success: function() { success: function() {
that.schemaCollection.sortByKey('position'); that.schemaCollection.sortByKey('position');
that.renderTableLayoutView(); that.renderTableLayoutView();
...@@ -173,6 +179,9 @@ define(['require', ...@@ -173,6 +179,9 @@ define(['require',
silent: true silent: true
}); });
}, },
hideLoader: function(argument) {
this.$('.fontLoader').hide();
},
renderTableLayoutView: function() { renderTableLayoutView: function() {
var that = this, var that = this,
count = 5; count = 5;
...@@ -318,7 +327,12 @@ define(['require', ...@@ -318,7 +327,12 @@ define(['require',
className: 'searchTag', className: 'searchTag',
formatter: _.extend({}, Backgrid.CellFormatter.prototype, { formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) { 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', ...@@ -332,7 +346,12 @@ define(['require',
className: 'searchTerm', className: 'searchTerm',
formatter: _.extend({}, Backgrid.CellFormatter.prototype, { formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) { 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) { if (returnObject.object) {
that.bradCrumbList.push(returnObject.object); that.bradCrumbList.push(returnObject.object);
} }
...@@ -379,7 +398,8 @@ define(['require', ...@@ -379,7 +398,8 @@ define(['require',
showLoader: function() { showLoader: function() {
that.$('.fontLoader').show(); that.$('.fontLoader').show();
that.$('.searchTable').hide(); that.$('.searchTable').hide();
} },
hideLoader: that.hideLoader.bind(that)
}); });
// view.saveTagData = function() { // view.saveTagData = function() {
//override saveTagData function //override saveTagData function
......
dashboardv2/public/js/views/search/SearchResultLayoutView.js
...@@ -154,9 +154,14 @@ define(['require', ...@@ -154,9 +154,14 @@ define(['require',
this.searchCollection.find(function(item) { this.searchCollection.find(function(item) {
if (item.get('isEnable')) { if (item.get('isEnable')) {
var term = []; var term = [];
if (that.searchCollection.queryType == "DSL") {
var obj = item.toJSON();
} else {
var obj = item.get('entity');
}
that.arr.push({ that.arr.push({
id: item.get("$id$"), id: obj.guid,
model: item model: obj
}); });
} }
}); });
...@@ -170,16 +175,6 @@ define(['require', ...@@ -170,16 +175,6 @@ define(['require',
}); });
this.listenTo(this.searchCollection, "error", function(value, responseData) { this.listenTo(this.searchCollection, "error", function(value, responseData) {
this.$('.fontLoader').hide(); this.$('.fontLoader').hide();
var message = "Invalid expression";
if (this.value && this.value.query) {
message += " : " + this.value.query;
}
if (responseData.responseText) {
message = JSON.parse(responseData.responseText).error;
}
Utils.notifyError({
content: message
});
}, this); }, this);
}, },
onRender: function() { onRender: function() {
...@@ -254,7 +249,7 @@ define(['require', ...@@ -254,7 +249,7 @@ define(['require',
that.checkTableFetch(); that.checkTableFetch();
that.offset = that.offset - that.limit; that.offset = that.offset - that.limit;
if (that.firstFetch) { if (that.firstFetch) {
that.startRenderTableProcess(); that.renderTableLayoutView();
} }
} }
if (that.firstFetch) { if (that.firstFetch) {
...@@ -265,7 +260,7 @@ define(['require', ...@@ -265,7 +260,7 @@ define(['require',
} }
// checking length for not rendering the table // checking length for not rendering the table
if (that.searchCollection.models.length) { if (that.searchCollection.models.length) {
that.startRenderTableProcess(); that.renderTableLayoutView();
} }
var resultData = 'Results for <b>' + _.escape(that.searchCollection.queryParams.query) + '</b>'; var resultData = 'Results for <b>' + _.escape(that.searchCollection.queryParams.query) + '</b>';
var multiAssignDataTag = '<a href="javascript:void(0)" class="inputAssignTag multiSelectTag assignTag" style="display:none" data-id="addAssignTag"><i class="fa fa-plus"></i>' + " " + 'Assign Tag</a>'; var multiAssignDataTag = '<a href="javascript:void(0)" class="inputAssignTag multiSelectTag assignTag" style="display:none" data-id="addAssignTag"><i class="fa fa-plus"></i>' + " " + 'Assign Tag</a>';
...@@ -281,14 +276,11 @@ define(['require', ...@@ -281,14 +276,11 @@ define(['require',
reset: true reset: true
}); });
}, },
startRenderTableProcess: function() {
this.getEntityTableColumns();
},
renderTableLayoutView: function(col) { renderTableLayoutView: function(col) {
var that = this, var that = this,
count = 5; count = 5;
require(['utils/TableLayout'], function(TableLayout) { require(['utils/TableLayout'], function(TableLayout) {
var columns = new Backgrid.Columns(col); var columns = new Backgrid.Columns(that.getFixedDslColumn());
that.REntityTableLayoutView.show(new TableLayout(_.extend({}, that.commonTableOptions, { that.REntityTableLayoutView.show(new TableLayout(_.extend({}, that.commonTableOptions, {
globalVent: that.globalVent, globalVent: that.globalVent,
columns: columns columns: columns
...@@ -313,115 +305,18 @@ define(['require', ...@@ -313,115 +305,18 @@ define(['require',
this.hideLoader(); this.hideLoader();
} }
}, },
getEntityTableColumns: function() {
var that = this,
col = {};
var responseData = this.searchCollection.responseData;
if (this.searchCollection.responseData) {
if (responseData.dataType && responseData.dataType.typeName.indexOf('_temp') == -1) {
that.renderTableLayoutView(that.getFixedDslColumn());
} else {
var idFound = false,
fetchResultCount = 0;
_.each(this.searchCollection.models, function(model) {
var modelJSON = model.toJSON();
var guid = "";
_.each(modelJSON, function(val, key) {
if (_.isObject(val)) {
if (val.id) {
model.set('id', val.id);
guid = val.id;
} else if (val.guid) {
model.set('id', val.guid);
guid = val.guid;
}
} else if (key === "id") {
model.set('id', val);
guid = val;
} else if (key === "guid") {
model.set('id', val);
guid = val;
}
});
if (guid.length) {
idFound = true;
++that.asyncFetchCounter;
model.getEntity(guid, {
success: function(data) {
if (data.attributes) {
if (data.guid && data.attributes) {
var id = "";
id = data.guid;
if (that.searchCollection.get(id)) {
that.searchCollection.get(id).set(data.attributes);
that.searchCollection.get(id).set({
'$id$': data.guid,
'$traits$': data.classifications
});
}
}
}
},
complete: function() {
--that.asyncFetchCounter;
if (that.asyncFetchCounter === 0) {
that.renderTableLayoutView(that.getFixedDslColumn());
}
}
});
}
});
if (idFound === false) {
that.renderTableLayoutView(this.getDaynamicColumn());
}
}
}
},
getDaynamicColumn: function() {
var that = this,
modelJSON = "",
col = {};
modelJSON = this.searchCollection.toJSON()[0];
_.keys(modelJSON).map(function(key) {
if (key.indexOf("$") == -1) {
col[key] = {
cell: 'Html',
editable: false,
sortable: false,
orderable: true,
formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
return CommonViewFunction.propertyTable({ 'notUsedKey': rawValue }, that, true);
}
})
};
}
});
that.checkTableFetch();
return this.searchCollection.constructor.getTableCols(col, this.searchCollection);
},
getFixedDslColumn: function() { getFixedDslColumn: function() {
var that = this, var that = this,
nameCheck = 0, nameCheck = 0,
col = {}; col = {};
for (var i = 0; i < this.searchCollection.models.length; i++) {
var model = this.searchCollection.models[i];
if (model && (model.get('name') || model.get('qualifiedName'))) {
++nameCheck;
}
if (model && model.get('$id$') === undefined) {
i = i > 0 ? (i - 1) : i;
that.searchCollection.remove(model);
}
}
col['Check'] = { col['Check'] = {
name: "selected", name: "selected",
label: "", label: "",
cell: "select-row", cell: "select-row",
headerCell: "select-all" headerCell: "select-all"
}; };
if (nameCheck > 0) {
col['name'] = { col['displayText'] = {
label: "Name", label: "Name",
cell: "html", cell: "html",
editable: false, editable: false,
...@@ -429,82 +324,66 @@ define(['require', ...@@ -429,82 +324,66 @@ define(['require',
className: "searchTableName", className: "searchTableName",
formatter: _.extend({}, Backgrid.CellFormatter.prototype, { formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) { fromRaw: function(rawValue, model) {
var nameHtml = ""; if (that.searchCollection.queryType == "DSL") {
if (rawValue === undefined) { var obj = model.toJSON();
if (model.get('qualifiedName')) {
rawValue = model.get('qualifiedName');
} else if (model.get('$id$') && model.get('$id$').qualifiedName) {
rawValue = model.get('$id$').qualifiedName;
} else { } else {
return ""; var obj = model.get('entity');
} }
} var nameHtml = "";
if (model.get('$id$')) { var name = (_.escape(obj.attributes && obj.attributes.name ? obj.attributes.name : null) || _.escape(obj.displayText) || obj.guid)
nameHtml = '<a href="#!/detailPage/' + (model.get('$id$').id || model.get('$id$')) + '">' + _.escape(rawValue) + '</a>'; if (obj.guid) {
nameHtml = '<a title="' + name + '" href="#!/detailPage/' + obj.guid + '">' + name + '</a>';
} else { } else {
nameHtml = '<a>' + _.escape(rawValue) + '</a>'; nameHtml = '<a title="' + name + '">' + name + '</a>';
} }
if (model.get('$id$') && model.get('$id$').state && Enums.entityStateReadOnly[model.get('$id$').state]) { if (obj.status && Enums.entityStateReadOnly[obj.status]) {
nameHtml += '<button type="button" title="Deleted" class="btn btn-atlasAction btn-atlas deleteBtn"><i class="fa fa-trash"></i></button>'; nameHtml += '<button type="button" title="Deleted" class="btn btn-atlasAction btn-atlas deleteBtn"><i class="fa fa-trash"></i></button>';
return '<div class="readOnly readOnlyLink">' + nameHtml + '</div>'; return '<div class="readOnly readOnlyLink">' + nameHtml + '</div>';
} else { } else {
if (Globals.entityUpdate) { if (Globals.entityUpdate) {
nameHtml += '<button title="Edit" data-id="editEntityButton" data-giud= "' + (model.get('$id$').id || model.get('$id$')) + '" class="btn btn-atlasAction btn-atlas editBtn"><i class="fa fa-pencil"></i></button>' nameHtml += '<button title="Edit" data-id="editEntityButton" data-giud= "' + obj.guid + '" class="btn btn-atlasAction btn-atlas editBtn"><i class="fa fa-pencil"></i></button>'
} }
return nameHtml; return nameHtml;
} }
} }
}) })
}; };
}
if (nameCheck === 0) { col['description'] = {
col['typeName'] = { label: "Description",
label: "Type Name", cell: "String",
cell: "html",
editable: false, editable: false,
sortable: false, sortable: false,
formatter: _.extend({}, Backgrid.CellFormatter.prototype, { formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) { fromRaw: function(rawValue, model) {
var nameHtml = ""; if (that.searchCollection.queryType == "DSL") {
if (rawValue === undefined) { var obj = model.toJSON();
if (model.get('$id$') && model.get('$id$')['$typeName$']) {
rawValue = model.get('$id$')['$typeName$'];
} else if (model.get('$typeName$')) {
rawValue = model.get('$typeName$');
} else if (model.get('typeName')) {
rawValue = model.get('typeName');
} else {
return "";
}
}
if (model.get('$id$')) {
nameHtml = '<a href="#!/detailPage/' + (model.get('$id$').id || model.get('$id$')) + '">' + rawValue + '</a>';
} else { } else {
nameHtml = '<a>' + rawValue + '</a>'; var obj = model.get('entity');
} }
if (model.get('$id$') && model.get('$id$').state && Enums.entityStateReadOnly[model.get('$id$').state]) { if (obj && obj.attributes && obj.attributes.description) {
nameHtml += '<button type="button" title="Deleted" class="btn btn-atlasAction btn-atlas deleteBtn"><i class="fa fa-trash"></i></button>'; return obj.attributes.description;
return '<div class="readOnly readOnlyLink">' + nameHtml + '</div>';
} else {
nameHtml += '<button title="Edit" data-giud= "' + (model.get('$id$').id || model.get('$id$')) + '" class="btn btn-atlasAction btn-atlas editBtn"><i class="fa fa-pencil"></i></button>'
return nameHtml;
} }
} }
}) })
}; };
}
col['description'] = {
label: "Description",
cell: "String",
editable: false,
sortable: false
};
col['owner'] = { col['owner'] = {
label: "Owner", label: "Owner",
cell: "String", cell: "String",
editable: false, editable: false,
sortable: false sortable: false,
formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
if (that.searchCollection.queryType == "DSL") {
var obj = model.toJSON();
} else {
var obj = model.get('entity');
}
if (obj && obj.attributes && obj.attributes.owner) {
return obj.attributes.owner;
}
}
})
}; };
col['tag'] = { col['tag'] = {
label: "Tags", label: "Tags",
...@@ -515,10 +394,15 @@ define(['require', ...@@ -515,10 +394,15 @@ define(['require',
className: 'searchTag', className: 'searchTag',
formatter: _.extend({}, Backgrid.CellFormatter.prototype, { formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) { fromRaw: function(rawValue, model) {
if (model.get('$id$') && model.get('$id$').state && Enums.entityStateReadOnly[model.get('$id$').state]) { if (that.searchCollection.queryType == "DSL") {
return '<div class="readOnly">' + CommonViewFunction.tagForTable(model); + '</div>'; var obj = model.toJSON();
} else {
var obj = model.get('entity');
}
if (obj.status && Enums.entityStateReadOnly[obj.status]) {
return '<div class="readOnly">' + CommonViewFunction.tagForTable(obj); + '</div>';
} else { } else {
return CommonViewFunction.tagForTable(model); return CommonViewFunction.tagForTable(obj);
} }
} }
...@@ -534,11 +418,16 @@ define(['require', ...@@ -534,11 +418,16 @@ define(['require',
className: 'searchTerm', className: 'searchTerm',
formatter: _.extend({}, Backgrid.CellFormatter.prototype, { formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) { fromRaw: function(rawValue, model) {
var returnObject = CommonViewFunction.termTableBreadcrumbMaker(model); if (that.searchCollection.queryType == "DSL") {
var obj = model.toJSON();
} else {
var obj = model.get('entity');
}
var returnObject = CommonViewFunction.termTableBreadcrumbMaker(obj);
if (returnObject.object) { if (returnObject.object) {
that.bradCrumbList.push(returnObject.object); that.bradCrumbList.push(returnObject.object);
} }
if (model.get('$id$') && model.get('$id$').state && Enums.entityStateReadOnly[model.get('$id$').state]) { if (obj.status && Enums.entityStateReadOnly[obj.status]) {
return '<div class="readOnly">' + returnObject.html + '</div>'; return '<div class="readOnly">' + returnObject.html + '</div>';
} else { } else {
return returnObject.html; return returnObject.html;
...@@ -560,14 +449,40 @@ define(['require', ...@@ -560,14 +449,40 @@ define(['require',
that.fetchCollection(); that.fetchCollection();
that.arr = []; that.arr = [];
}, },
tagList: that.getTagList(guid, multiple),
showLoader: that.showLoader.bind(that), showLoader: that.showLoader.bind(that),
hideLoader: that.hideLoader.bind(that) hideLoader: that.hideLoader.bind(that)
}); });
// view.saveTagData = function() {
//override saveTagData function
// }
}); });
}, },
getTagList: function(guid, multiple) {
var that = this;
if (!multiple || multiple.length === 0) {
var modal = this.searchCollection.find(function(item) {
if (that.searchCollection.queryType == "DSL") {
var obj = item.toJSON();
} else {
var obj = item.get('entity');
}
if (obj.guid === guid) {
return true;
}
});
if (modal) {
if (that.searchCollection.queryType == "DSL") {
var obj = modal.toJSON();
} else {
var obj = modal.get('entity');
}
} else {
return [];
}
return obj.classificationNames;
} else {
return [];
}
},
showLoader: function() { showLoader: function() {
this.$('.fontLoader').show(); this.$('.fontLoader').show();
this.$('.searchTable').hide(); this.$('.searchTable').hide();
......
dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js
...@@ -174,12 +174,20 @@ define(['require', ...@@ -174,12 +174,20 @@ define(['require',
}); });
that.modal.on('ok', function() { that.modal.on('ok', function() {
var newAttributeList = view.collection.toJSON(); var newAttributeList = view.collection.toJSON();
try {
var saveJSON = JSON.parse(JSON.stringify(that.model.toJSON())); var saveJSON = JSON.parse(JSON.stringify(that.model.toJSON()));
} catch (err) {
Utils.serverErrorHandler();
}
if (saveJSON) {
var oldAttributeList = saveJSON.attributeDefs; var oldAttributeList = saveJSON.attributeDefs;
}
_.each(newAttributeList, function(obj) { _.each(newAttributeList, function(obj) {
oldAttributeList.push(obj); oldAttributeList.push(obj);
}); });
if (saveJSON) {
that.onSaveButton(saveJSON, Messages.addAttributeSuccessMessage); that.onSaveButton(saveJSON, Messages.addAttributeSuccessMessage);
}
}); });
that.modal.on('closeModal', function() { that.modal.on('closeModal', function() {
that.modal.trigger('cancel'); that.modal.trigger('cancel');
......
dashboardv2/public/js/views/tag/addTagModalView.js
...@@ -48,7 +48,7 @@ define(['require', ...@@ -48,7 +48,7 @@ define(['require',
*/ */
initialize: function(options) { initialize: function(options) {
var that = this; 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.collection = new VTagList();
this.commonCollection = new VTagList(); this.commonCollection = new VTagList();
this.asyncAttrFetchCounter = 0; this.asyncAttrFetchCounter = 0;
...@@ -68,38 +68,97 @@ define(['require', ...@@ -68,38 +68,97 @@ define(['require',
var selection = $(item).data("key"); var selection = $(item).data("key");
tagAttributes[selection] = $(item).val(); tagAttributes[selection] = $(item).val();
}); });
if (that.multiple) {
that.asyncFetchCounter = 0;
for (var i = 0; i < that.multiple.length; i++) {
if (i == 0) {
that.showLoader();
}
var obj = { var obj = {
tagName: tagName, tagName: tagName,
tagAttributes: tagAttributes, tagAttributes: tagAttributes,
guid: (_.isObject(that.multiple[i].id) ? that.multiple[i].id.id : that.multiple[i].id), guid: [],
deletedEntity: Enums.entityStateReadOnly[that.multiple[i].id.state], skipEntity: [],
entityName: that.multiple[i].model.get('name') deletedEntity: []
}
if (that.multiple) {
_.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);
}
} }
if (obj.deletedEntity) { });
if (obj.deletedEntity.length) {
Utils.notifyError({ Utils.notifyError({
content: obj.entityName + Messages.assignDeletedEntity html: true,
content: "<b>" + obj.deletedEntity.join(', ') +
"</b> " + (obj.deletedEntity.length === 1 ? "entity " : "entities ") +
Messages.assignDeletedEntity
}); });
if (that.multiple.length === 1 || (that.multiple.length == (i + 1) && that.asyncFetchCounter == 0)) { }
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;
}
var notifyObj = {
text: text,
ok: function(argument) {
if (obj.guid.length) {
that.saveTagData(obj);
} else {
that.hideLoader();
}
},
cancel: function(argument) {
that.hideLoader(); that.hideLoader();
obj = {
tagName: tagName,
tagAttributes: tagAttributes,
guid: [],
skipEntity: [],
deletedEntity: []
}
}
}
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 { } else {
if (obj.guid.length) {
that.saveTagData(obj); that.saveTagData(obj);
} else {
that.hideLoader();
} }
} }
} else { } else {
that.asyncFetchCounter = 0; obj.guid.push(that.guid);
that.saveTagData({ that.saveTagData(obj);
tagName: tagName,
tagAttributes: tagAttributes,
guid: that.guid
});
} }
}); });
this.on('closeModal', function() { this.on('closeModal', function() {
...@@ -126,13 +185,16 @@ define(['require', ...@@ -126,13 +185,16 @@ define(['require',
}, this); }, this);
}, },
tagsCollection: function() { tagsCollection: function() {
var that = this;
this.collection.fullCollection.comparator = function(model) { this.collection.fullCollection.comparator = function(model) {
return model.get('name').toLowerCase(); return model.get('name').toLowerCase();
} }
var str = '<option selected="selected" disabled="disabled">-- Select a tag from the dropdown list --</option>'; var str = '<option selected="selected" disabled="disabled">-- Select a tag from the dropdown list --</option>';
this.collection.fullCollection.sort().each(function(obj, key) { this.collection.fullCollection.sort().each(function(obj, key) {
if (_.indexOf(that.tagList, obj.get('name')) === -1) {
str += '<option>' + _.escape(obj.get('name')) + '</option>'; str += '<option>' + _.escape(obj.get('name')) + '</option>';
}
}); });
this.ui.addTagOptions.html(str); this.ui.addTagOptions.html(str);
this.ui.addTagOptions.select2({ this.ui.addTagOptions.select2({
...@@ -198,24 +260,33 @@ define(['require', ...@@ -198,24 +260,33 @@ define(['require',
}, },
saveTagData: function(options) { saveTagData: function(options) {
var that = this; var that = this;
++this.asyncFetchCounter;
this.entityModel = new VEntity(); this.entityModel = new VEntity();
var tagName = options.tagName, var tagName = options.tagName,
tagAttributes = options.tagAttributes, tagAttributes = options.tagAttributes,
json = [{ json = {
"classification": {
"typeName": tagName, "typeName": tagName,
"attributes": tagAttributes "attributes": tagAttributes
}]; },
this.entityModel.saveEntity(options.guid, { "entityGuids": options.guid
};
if (this.showLoader) {
this.showLoader();
}
this.entityModel.saveTraitsEntity({
skipDefaultError: true, skipDefaultError: true,
data: JSON.stringify(json), data: JSON.stringify(json),
success: function(data) { success: function(data) {
Utils.notifySuccess({ Utils.notifySuccess({
content: "Tag " + tagName + " has been added to entity" content: "Tag " + tagName + " has been added to " + (that.multiple ? "entities" : "entity")
}); });
if (options.modalCollection) { if (options.modalCollection) {
options.modalCollection.fetch({ reset: true }); 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"; var message = "Tag " + tagName + " could not be added";
...@@ -225,12 +296,10 @@ define(['require', ...@@ -225,12 +296,10 @@ define(['require',
Utils.notifyError({ Utils.notifyError({
content: message content: message
}); });
}, if (that.hideLoader) {
complete: function() { that.hideLoader();
--that.asyncFetchCounter;
if (that.callback && that.asyncFetchCounter === 0) {
that.callback();
} }
} }
}); });
}, },
......
release-log.txt
...@@ -9,6 +9,8 @@ ATLAS-1060 Add composite indexes for exact match performance improvements for al ...@@ -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) ATLAS-1127 Modify creation and modification timestamps to Date instead of Long(sumasai)
ALL CHANGES: 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-1486 UI updates to handle errors from V2 APIs (Kalyanikashikar via mneethiraj)
ATLAS-1436 Metrics collection using gremlin (apoorvnaik via mneethiraj) ATLAS-1436 Metrics collection using gremlin (apoorvnaik via mneethiraj)
ATLAS-1489 Show create/edit entity button based on role (Kalyanikashikar via kevalbhatt) 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