Skip to content

A
atlas
Commit d57f5d8a by kevalbhatt Committed by Sarath Subramanian
Options

ATLAS-3478: UI: Entity Icon loading improved

Signed-off-by: 's avatarSarath Subramanian <sarath@apache.org>
parent f9b48317
Showing with 47 additions and 30 deletions
dashboardv2/public/css/scss/graph.scss
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
font-family: $font_1; font-family: $font_1;
} }
transition: opacity 0.3s linear; //transition: opacity 0.3s linear;
rect { rect {
stroke: $color_mountain_mist_approx; stroke: $color_mountain_mist_approx;
...@@ -362,7 +362,7 @@ span#zoom_in { ...@@ -362,7 +362,7 @@ span#zoom_in {
width: 100%; width: 100%;
right: 0; right: 0;
padding: 0 !important; padding: 0 !important;
z-index: 999; z-index: 9999;
overflow: hidden !important; overflow: hidden !important;
.resizeGraph { .resizeGraph {
......
dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
...@@ -281,7 +281,7 @@ define(['require', ...@@ -281,7 +281,7 @@ define(['require',
categories = ""; categories = "";
_.each(data, function(val) { _.each(data, function(val) {
var name = _.escape(val.displayText); var name = _.escape(val.displayText);
categories += '<span data-guid="' + val.categoryGuid + '"" class="btn btn-action btn-sm btn-icon btn-blue" title=' + _.escape(name) + ' data-id="categoryClick"><span>' + name + '</span><i class="fa fa-close" data-id="removeCategory" data-type="category" title="Remove Category"></i></span>'; categories += '<span data-guid="' + val.categoryGuid + '"" class="btn btn-action btn-sm btn-icon btn-blue" data-id="categoryClick"><span title=' + name + '>' + name + '</span><i class="fa fa-close" data-id="removeCategory" data-type="category" title="Remove Category"></i></span>';
}); });
this.ui.categoryList.find("span.btn").remove(); this.ui.categoryList.find("span.btn").remove();
this.ui.categoryList.prepend(categories); this.ui.categoryList.prepend(categories);
...@@ -291,7 +291,7 @@ define(['require', ...@@ -291,7 +291,7 @@ define(['require',
terms = ""; terms = "";
_.each(data, function(val) { _.each(data, function(val) {
var name = _.escape(val.displayText); var name = _.escape(val.displayText);
terms += '<span data-guid="' + val.termGuid + '"" class="btn btn-action btn-sm btn-icon btn-blue" title=' + _.escape(name) + ' data-id="termClick"><span>' + name + '</span><i class="fa fa-close" data-id="removeTerm" data-type="term" title="Remove Term"></i></span>'; terms += '<span data-guid="' + val.termGuid + '"" class="btn btn-action btn-sm btn-icon btn-blue" data-id="termClick"><span title=' + name + '>' + name + '</span><i class="fa fa-close" data-id="removeTerm" data-type="term" title="Remove Term"></i></span>';
}); });
this.ui.termList.find("span.btn").remove(); this.ui.termList.find("span.btn").remove();
this.ui.termList.prepend(terms); this.ui.termList.prepend(terms);
...@@ -301,7 +301,7 @@ define(['require', ...@@ -301,7 +301,7 @@ define(['require',
var that = this, var that = this,
tagData = ""; tagData = "";
_.each(tagObject, function(val) { _.each(tagObject, function(val) {
tagData += '<span class="btn btn-action btn-sm btn-icon btn-blue" title=' + val.typeName + ' data-id="tagClickTerm"><span>' + val.typeName + '</span><i class="fa fa-close" data-id="removeTagTerm" data-type="tag" title="Remove Tag"></i></span>'; tagData += '<span class="btn btn-action btn-sm btn-icon btn-blue" data-id="tagClickTerm"><span title=' + val.typeName + '>' + val.typeName + '</span><i class="fa fa-close" data-id="removeTagTerm" data-type="tag" title="Remove Tag"></i></span>';
}); });
this.ui.tagList.find("span.btn").remove(); this.ui.tagList.find("span.btn").remove();
this.ui.tagList.prepend(tagData); this.ui.tagList.prepend(tagData);
...@@ -389,7 +389,7 @@ define(['require', ...@@ -389,7 +389,7 @@ define(['require',
tagName = $(e.currentTarget).text(), tagName = $(e.currentTarget).text(),
termName = this.data.name; termName = this.data.name;
CommonViewFunction.deleteTag(_.extend({}, { CommonViewFunction.deleteTag(_.extend({}, {
msg: "<div class='ellipsis-with-margin'>Remove: " + "<b>" + _.escape(tagName) + "</b> assignment from" + " " + "<b>" + termName + "?</b></div>", msg: "<div class='ellipsis-with-margin'>Remove: " + "<b>" + _.escape(tagName) + "</b> assignment from" + " " + "<b>" + _.escape(termName) + "?</b></div>",
titleMessage: Messages.removeTag, titleMessage: Messages.removeTag,
okText: "Remove", okText: "Remove",
showLoader: that.showLoader.bind(that), showLoader: that.showLoader.bind(that),
...@@ -410,7 +410,7 @@ define(['require', ...@@ -410,7 +410,7 @@ define(['require',
selectedGuid: guid, selectedGuid: guid,
model: that.data, model: that.data,
collection: that.glossaryCollection, collection: that.glossaryCollection,
msg: "<div class='ellipsis-with-margin'>Remove: " + "<b>" + _.escape(name) + "</b> assignment from" + " " + "<b>" + that.data.name + "?</b></div>", msg: "<div class='ellipsis-with-margin'>Remove: " + "<b>" + _.escape(name) + "</b> assignment from" + " " + "<b>" + _.escape(that.data.name) + "?</b></div>",
titleMessage: Messages.glossary[that.isTermView ? "removeCategoryfromTerm" : "removeTermfromCategory"], titleMessage: Messages.glossary[that.isTermView ? "removeCategoryfromTerm" : "removeTermfromCategory"],
isCategoryView: that.isCategoryView, isCategoryView: that.isCategoryView,
isTermView: that.isTermView, isTermView: that.isTermView,
......
dashboardv2/public/js/views/graph/LineageLayoutView.js
...@@ -495,9 +495,11 @@ define(['require', ...@@ -495,9 +495,11 @@ define(['require',
"translate(" + this.zoom.translate() + ")" + "translate(" + this.zoom.translate() + ")" +
"scale(" + this.zoom.scale() + ")" "scale(" + this.zoom.scale() + ")"
); );
LineageUtils.refreshGraphForIE({ if (platform.name === "IE") {
edgeEl: this.$('svg .edgePath') LineageUtils.refreshGraphForIE({
}); edgeEl: this.$('svg .edgePath')
});
}
}, },
interpolateZoom: function(translate, scale, that, zoom) { interpolateZoom: function(translate, scale, that, zoom) {
return d3.transition().duration(350).tween("zoom", function() { return d3.transition().duration(350).tween("zoom", function() {
...@@ -584,7 +586,8 @@ define(['require', ...@@ -584,7 +586,8 @@ define(['require',
var imagePath = options.imagePath, var imagePath = options.imagePath,
ajaxOptions = { ajaxOptions = {
"url": imagePath, "url": imagePath,
"method": "get" "method": "get",
"cache": true
} }
if (platform.name !== "IE") { if (platform.name !== "IE") {
......
dashboardv2/public/js/views/graph/LineageUtils.js
...@@ -231,7 +231,9 @@ define(['require'], function(require) { ...@@ -231,7 +231,9 @@ define(['require'], function(require) {
zoomListener.translate([xa, ya]); zoomListener.translate([xa, ya]);
zoom.scale(scale); zoom.scale(scale);
afterCenterZoomed({ newScale: scale, newTranslate: [xa, ya] }); afterCenterZoomed({ newScale: scale, newTranslate: [xa, ya] });
LinegaeUtils.refreshGraphForIE({ "edgeEl": edgePathEl }) if (platform.name === "IE") {
LinegaeUtils.refreshGraphForIE({ "edgeEl": edgePathEl })
}
} }
} }
} }
......
dashboardv2/public/js/views/search/SearchResultLayoutView.js
...@@ -683,7 +683,8 @@ define(['require', ...@@ -683,7 +683,8 @@ define(['require',
returnImgUrl = null; returnImgUrl = null;
$.ajax({ $.ajax({
"url": imagePath, "url": imagePath,
"method": "get" "method": "get",
"cache": true
}) })
.always(function(data, status, xhr) { .always(function(data, status, xhr) {
if (data.status == 404) { if (data.status == 404) {
......
dashboardv3/public/css/scss/graph.scss
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
font-family: $font_1; font-family: $font_1;
} }
transition: opacity 0.3s linear; //transition: opacity 0.3s linear;
rect { rect {
stroke: $color_mountain_mist_approx; stroke: $color_mountain_mist_approx;
...@@ -355,7 +355,7 @@ span#zoom_in { ...@@ -355,7 +355,7 @@ span#zoom_in {
width: 100%; width: 100%;
right: 0; right: 0;
padding: 0 !important; padding: 0 !important;
z-index: 999; z-index: 9999;
overflow: hidden !important; overflow: hidden !important;
.resizeGraph { .resizeGraph {
......
dashboardv3/public/js/views/glossary/GlossaryDetailLayoutView.js
...@@ -296,7 +296,7 @@ define(['require', ...@@ -296,7 +296,7 @@ define(['require',
categories = ""; categories = "";
_.each(data, function(val) { _.each(data, function(val) {
var name = _.escape(val.displayText); var name = _.escape(val.displayText);
categories += '<span data-guid="' + val.categoryGuid + '"" class="btn btn-action btn-sm btn-icon btn-blue" data-id="categoryClick"><span title=' + _.escape(name) + '>' + name + '</span><i class="fa fa-close" data-id="removeCategory" data-type="category" title="Remove Category"></i></span>'; categories += '<span data-guid="' + val.categoryGuid + '"" class="btn btn-action btn-sm btn-icon btn-blue" data-id="categoryClick"><span title=' + name + '>' + name + '</span><i class="fa fa-close" data-id="removeCategory" data-type="category" title="Remove Category"></i></span>';
}); });
this.ui.categoryList.find("span.btn").remove(); this.ui.categoryList.find("span.btn").remove();
this.ui.categoryList.prepend(categories); this.ui.categoryList.prepend(categories);
...@@ -306,7 +306,7 @@ define(['require', ...@@ -306,7 +306,7 @@ define(['require',
terms = ""; terms = "";
_.each(data, function(val) { _.each(data, function(val) {
var name = _.escape(val.displayText); var name = _.escape(val.displayText);
terms += '<span data-guid="' + val.termGuid + '"" class="btn btn-action btn-sm btn-icon btn-blue" data-id="termClick"><span title=' + _.escape(name) + '>' + name + '</span><i class="fa fa-close" data-id="removeTerm" data-type="term" title="Remove Term"></i></span>'; terms += '<span data-guid="' + val.termGuid + '"" class="btn btn-action btn-sm btn-icon btn-blue" data-id="termClick"><span title=' + name + '>' + name + '</span><i class="fa fa-close" data-id="removeTerm" data-type="term" title="Remove Term"></i></span>';
}); });
this.ui.termList.find("span.btn").remove(); this.ui.termList.find("span.btn").remove();
this.ui.termList.prepend(terms); this.ui.termList.prepend(terms);
...@@ -407,7 +407,7 @@ define(['require', ...@@ -407,7 +407,7 @@ define(['require',
tagName = $(e.currentTarget).text(), tagName = $(e.currentTarget).text(),
termName = this.data.name; termName = this.data.name;
CommonViewFunction.deleteTag(_.extend({}, { CommonViewFunction.deleteTag(_.extend({}, {
msg: "<div class='ellipsis-with-margin'>Remove: " + "<b>" + _.escape(tagName) + "</b> assignment from" + " " + "<b>" + termName + "?</b></div>", msg: "<div class='ellipsis-with-margin'>Remove: " + "<b>" + _.escape(tagName) + "</b> assignment from" + " " + "<b>" + _.escape(termName) + "?</b></div>",
titleMessage: Messages.removeTag, titleMessage: Messages.removeTag,
okText: "Remove", okText: "Remove",
showLoader: that.showLoader.bind(that), showLoader: that.showLoader.bind(that),
...@@ -431,7 +431,7 @@ define(['require', ...@@ -431,7 +431,7 @@ define(['require',
selectedGuid: guid, selectedGuid: guid,
model: that.data, model: that.data,
collection: that.glossaryCollection, collection: that.glossaryCollection,
msg: "<div class='ellipsis-with-margin'>Remove: " + "<b>" + _.escape(name) + "</b> assignment from" + " " + "<b>" + that.data.name + "?</b></div>", msg: "<div class='ellipsis-with-margin'>Remove: " + "<b>" + _.escape(name) + "</b> assignment from" + " " + "<b>" + _.escape(that.data.name) + "?</b></div>",
titleMessage: Messages.glossary[that.isTermView ? "removeCategoryfromTerm" : "removeTermfromCategory"], titleMessage: Messages.glossary[that.isTermView ? "removeCategoryfromTerm" : "removeTermfromCategory"],
isCategoryView: that.isCategoryView, isCategoryView: that.isCategoryView,
isTermView: that.isTermView, isTermView: that.isTermView,
......
dashboardv3/public/js/views/graph/LineageLayoutView.js
...@@ -510,9 +510,11 @@ define(['require', ...@@ -510,9 +510,11 @@ define(['require',
"translate(" + this.zoom.translate() + ")" + "translate(" + this.zoom.translate() + ")" +
"scale(" + this.zoom.scale() + ")" "scale(" + this.zoom.scale() + ")"
); );
LineageUtils.refreshGraphForIE({ if (platform.name === "IE") {
edgeEl: this.$('svg .edgePath') LineageUtils.refreshGraphForIE({
}); edgeEl: this.$('svg .edgePath')
});
}
}, },
interpolateZoom: function(translate, scale, that, zoom) { interpolateZoom: function(translate, scale, that, zoom) {
return d3.transition().duration(350).tween("zoom", function() { return d3.transition().duration(350).tween("zoom", function() {
...@@ -599,7 +601,8 @@ define(['require', ...@@ -599,7 +601,8 @@ define(['require',
var imagePath = options.imagePath, var imagePath = options.imagePath,
ajaxOptions = { ajaxOptions = {
"url": imagePath, "url": imagePath,
"method": "get" "method": "get",
"cache": true
} }
if (platform.name !== "IE") { if (platform.name !== "IE") {
......
dashboardv3/public/js/views/graph/LineageUtils.js
...@@ -231,7 +231,9 @@ define(['require'], function(require) { ...@@ -231,7 +231,9 @@ define(['require'], function(require) {
zoomListener.translate([xa, ya]); zoomListener.translate([xa, ya]);
zoom.scale(scale); zoom.scale(scale);
afterCenterZoomed({ newScale: scale, newTranslate: [xa, ya] }); afterCenterZoomed({ newScale: scale, newTranslate: [xa, ya] });
LinegaeUtils.refreshGraphForIE({ "edgeEl": edgePathEl }) if (platform.name === "IE") {
LinegaeUtils.refreshGraphForIE({ "edgeEl": edgePathEl })
}
} }
} }
} }
......
dashboardv3/public/js/views/search/SearchResultLayoutView.js
...@@ -695,7 +695,8 @@ define(['require', ...@@ -695,7 +695,8 @@ define(['require',
returnImgUrl = null; returnImgUrl = null;
$.ajax({ $.ajax({
"url": imagePath, "url": imagePath,
"method": "get" "method": "get",
"cache": true
}) })
.always(function(data, status, xhr) { .always(function(data, status, xhr) {
if (data.status == 404) { if (data.status == 404) {
......
dashboardv3/public/js/views/search/save/SaveModalLayoutView.js
...@@ -38,7 +38,7 @@ define(['require', ...@@ -38,7 +38,7 @@ define(['require',
}, },
templateHelpers: function() { templateHelpers: function() {
return { return {
selectedModel: this.selectedModel ? this.selectedModel.toJSON() : null selectedModel: this.selectedModel ? this.selectedModel : null
}; };
}, },
events: function() { events: function() {
...@@ -48,6 +48,11 @@ define(['require', ...@@ -48,6 +48,11 @@ define(['require',
initialize: function(options) { initialize: function(options) {
var that = this; var that = this;
_.extend(this, _.pick(options, 'selectedModel', 'collection', 'getValue', 'isBasic', 'saveObj')); _.extend(this, _.pick(options, 'selectedModel', 'collection', 'getValue', 'isBasic', 'saveObj'));
if (this.selectedModel) {
var modelDetail = this.selectedModel.toJSON();
modelDetail.name = _.unescape(modelDetail.name);
this.selectedModel = modelDetail;
}
this.model = new VSearch(); this.model = new VSearch();
if (this.saveObj) { if (this.saveObj) {
...@@ -82,10 +87,10 @@ define(['require', ...@@ -82,10 +87,10 @@ define(['require',
}, },
onCreateButton: function(modal) { onCreateButton: function(modal) {
var that = this, var that = this,
obj = { name: this.ui.saveAsName.val ? this.ui.saveAsName.val() : null }; obj = { name: this.ui.saveAsName.val ? _.escape(this.ui.saveAsName.val()) : null };
if (this.selectedModel) { if (this.selectedModel) {
// Update Name only. // Update Name only.
var saveObj = this.selectedModel.toJSON(); var saveObj = this.selectedModel;
saveObj.name = obj.name; saveObj.name = obj.name;
} else { } else {
obj.value = this.getValue(); obj.value = this.getValue();
...@@ -111,12 +116,12 @@ define(['require', ...@@ -111,12 +116,12 @@ define(['require',
collectionRef.set(data); collectionRef.set(data);
} }
Utils.notifySuccess({ Utils.notifySuccess({
content: obj.name + Messages.editSuccessMessage content: _.unescape(obj.name) + Messages.editSuccessMessage
}); });
} else { } else {
that.collection.add(data); that.collection.add(data);
Utils.notifySuccess({ Utils.notifySuccess({
content: obj.name + Messages.addSuccessMessage content: _.unescape(obj.name) + Messages.addSuccessMessage
}); });
} }
} }
......
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