You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by pi...@apache.org on 2021/04/27 09:47:42 UTC
[atlas] branch branch-2.0 updated (9827509 -> 234950e)
This is an automated email from the ASF dual-hosted git repository.
pinal pushed a change to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git.
from 9827509 ATLAS-4255 : Atlas - Upgrade netty to 4.1.61
new 4643e4d ATLAS-4244: UI Lineage without displayText key, fixed
new 96cb2d6 ATLAS-4245: New UI: "Download import template" and "Import Glossary term" gets blocked on valid navigation,fixed
new 234950e ATLAS-4252: UI (New): Deleting subclassifications results in endless loading, fixed
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../js/external_lib/atlas-lineage/dist/index.js | 2 +-
.../public/js/views/graph/LineageLayoutView.js | 12 ++++----
.../js/views/tag/TagDetailTableLayoutView.js | 8 +++---
.../js/external_lib/atlas-lineage/dist/index.js | 2 +-
.../public/js/views/graph/LineageLayoutView.js | 12 ++++----
.../search/tree/ClassificationTreeLayoutView.js | 32 +++++++++++++++-------
.../js/views/search/tree/GlossaryTreeLayoutView.js | 23 +++++++++-------
.../js/views/tag/TagDetailTableLayoutView.js | 8 +++---
8 files changed, 57 insertions(+), 42 deletions(-)
[atlas] 02/03: ATLAS-4245: New UI: "Download import template" and
"Import Glossary term" gets blocked on valid navigation, fixed
Posted by pi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pinal pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 96cb2d60cbf03030b21d858b13565fdab411ac0e
Author: prasad pawar <pr...@freestoneinfotech.com>
AuthorDate: Wed Apr 21 11:50:13 2021 +0530
ATLAS-4245: New UI: "Download import template" and "Import Glossary term" gets blocked on valid navigation,fixed
Signed-off-by: Pinal <pinal-shah>
---
.../js/views/search/tree/GlossaryTreeLayoutView.js | 23 ++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/dashboardv3/public/js/views/search/tree/GlossaryTreeLayoutView.js b/dashboardv3/public/js/views/search/tree/GlossaryTreeLayoutView.js
index f61b1b1..e58b177 100644
--- a/dashboardv3/public/js/views/search/tree/GlossaryTreeLayoutView.js
+++ b/dashboardv3/public/js/views/search/tree/GlossaryTreeLayoutView.js
@@ -96,7 +96,7 @@ define([
this.glossaryCollection.fullCollection, "reset add change",
function(skip) {
if (this.ui.termSearchTree.jstree(true)) {
- that.glossaryTreeUpdate = true; //To Keep the selection of Term after any new Glossary is Created.
+ that.isGlossaryTree = true; //To Keep the selection of Term after any new Glossary is Created.
this.ui.termSearchTree.jstree(true).refresh();
} else {
this.renderGlossaryTree();
@@ -158,10 +158,12 @@ define([
this.getViewType();
this.bindEvents();
//To stop the trigger Search event, if the node is selected in Old UI and swicthed to New UI.
- if (Utils.getUrlState.getQueryParams()) {
- if(Utils.getUrlState.getQueryParams().gType === "term"){
- this.glossaryTreeUpdate = true;
- }
+ this.isGlossaryTree = this.isGlossryTreeview();
+ },
+ isGlossryTreeview: function() {
+ var queryParams = Utils.getUrlState.getQueryParams();
+ if (queryParams && (queryParams.gType === "term" || queryParams.gType === "category")) {
+ return true;
}
},
onRender: function() {
@@ -181,7 +183,7 @@ define([
this.options.categoryEvent.off("Success:TermRename")
},
getViewType: function() {
- if (this.options.value) {
+ if (Utils.getUrlState.isGlossaryTab()) {
this.isTermView = this.options.value.viewType ? this.options.value.viewType == "term" ? true : false : true;
} else {
this.isTermView = true;
@@ -234,9 +236,10 @@ define([
this.createTermAction();
},
onNodeSelect: function(options, showCategory) {
- if (this.glossaryTreeUpdate && options.node.original.type === "GlossaryTerm") {
+ var nodeType = options.node.original.type;
+ if (this.isGlossaryTree && (nodeType === "GlossaryTerm" || nodeType === "GlossaryCategory")) {
//To stop the trigger Search event,if the node is selected in Old UI and swicthed to New UI.
- this.glossaryTreeUpdate = false;
+ this.isGlossaryTree = false;
return;
}
var name, type, selectedNodeId, that = this,
@@ -773,7 +776,7 @@ define([
that.options.categoryEvent.trigger("Success:Category", true);
}
}
- //Below condition is for switching the the Show Term/Show Category toggle button on swicthing from Old to New UI.
+ //Below condition is for switching the the Show Term/Show Category toggle button on switching from Old to New UI.
if (that.isTermView === false) {
that.glossarySwitchBtnUpdate();
}
@@ -800,7 +803,7 @@ define([
refresh: function(options) {
this.glossaryTermId = null;
this.fetchGlossary();
- this.glossaryTreeUpdate = true;
+ this.isGlossaryTree = true;
},
onClickImportGlossary: function() {
var that = this;
[atlas] 01/03: ATLAS-4244: UI Lineage without displayText key, fixed
Posted by pi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pinal pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 4643e4ddf6b00d071b319df7ef097cd5be392f15
Author: prasad pawar <pr...@freestoneinfotech.com>
AuthorDate: Sat Apr 10 10:03:04 2021 +0530
ATLAS-4244: UI Lineage without displayText key, fixed
Signed-off-by: Pinal <pinal-shah>
---
.../public/js/external_lib/atlas-lineage/dist/index.js | 2 +-
dashboardv2/public/js/views/graph/LineageLayoutView.js | 12 ++++++------
dashboardv2/public/js/views/tag/TagDetailTableLayoutView.js | 8 ++++----
.../public/js/external_lib/atlas-lineage/dist/index.js | 2 +-
dashboardv3/public/js/views/graph/LineageLayoutView.js | 12 ++++++------
dashboardv3/public/js/views/tag/TagDetailTableLayoutView.js | 8 ++++----
6 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/dashboardv2/public/js/external_lib/atlas-lineage/dist/index.js b/dashboardv2/public/js/external_lib/atlas-lineage/dist/index.js
index 0b896fb..1ff2128 100644
--- a/dashboardv2/public/js/external_lib/atlas-lineage/dist/index.js
+++ b/dashboardv2/public/js/external_lib/atlas-lineage/dist/index.js
@@ -1 +1 @@
-!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e(require("platform"),require("dagreD3")):"function"==typeof define&&define.amd?define(["platform","dagreD3"],e):"object"==typeof exports?exports.LineageHelper=e(require("platform"),require("dagreD3")):t.LineageHelper=e(t.platform,t.dagreD3)}(window,(function(t,e){return function(t){var e={};function n(r){if(e[r])return e[r].exports;var i=e[r]={i:r,l:!1,exports:{}};return t[r].call(i.exports,i,i.exports,n),i. [...]
\ No newline at end of file
+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e(require("platform"),require("dagreD3")):"function"==typeof define&&define.amd?define(["platform","dagreD3"],e):"object"==typeof exports?exports.LineageHelper=e(require("platform"),require("dagreD3")):t.LineageHelper=e(t.platform,t.dagreD3)}(window,(function(t,e){return function(t){var e={};function n(r){if(e[r])return e[r].exports;var i=e[r]={i:r,l:!1,exports:{}};return t[r].call(i.exports,i,i.exports,n),i. [...]
\ No newline at end of file
diff --git a/dashboardv2/public/js/views/graph/LineageLayoutView.js b/dashboardv2/public/js/views/graph/LineageLayoutView.js
index d933241..bf80509 100644
--- a/dashboardv2/public/js/views/graph/LineageLayoutView.js
+++ b/dashboardv2/public/js/views/graph/LineageLayoutView.js
@@ -235,7 +235,7 @@ define(['require',
},
onClickLabelFullName: function() {
this.labelFullText = !this.labelFullText;
- this.LineageHelperRef.displayFullName({ bLabelFullText : this.labelFullText });
+ this.LineageHelperRef.displayFullName({ bLabelFullText: this.labelFullText });
},
fetchGraphData: function(options) {
var that = this,
@@ -416,7 +416,7 @@ define(['require',
var data = {};
_.each(config, function(valKey, key) {
var val = initialData[key];
- if (_.isUndefined(val) && initialData.attributes[key]) {
+ if (_.isUndefined(val) && initialData.attributes && initialData.attributes[key]) {
val = initialData.attributes[key];
}
if (val) {
@@ -430,16 +430,16 @@ define(['require',
"sortBy": false
}));
},
- calculateLineageDetailPanelHeight: function(){
+ calculateLineageDetailPanelHeight: function() {
var $parentContainer = $('#tab-lineage .resizeGraph'),
$panel = $parentContainer.find('.fix-box');
var $parentHeight = $parentContainer.find('.fix-box, tbody').removeAttr('style').height() - 48, // 48px is the Panels top from the parent container
$tBody = $panel.find('tbody'),
- panelHeight = $tBody.height() + 100;
- if($parentHeight < panelHeight){
+ panelHeight = $tBody.height() + 100;
+ if ($parentHeight < panelHeight) {
panelHeight = $parentHeight;
}
- $panel.css('height', panelHeight + 'px');
+ $panel.css('height', panelHeight + 'px');
$tBody.css('height', '100%');
}
});
diff --git a/dashboardv2/public/js/views/tag/TagDetailTableLayoutView.js b/dashboardv2/public/js/views/tag/TagDetailTableLayoutView.js
index 04a941b..c780deb 100644
--- a/dashboardv2/public/js/views/tag/TagDetailTableLayoutView.js
+++ b/dashboardv2/public/js/views/tag/TagDetailTableLayoutView.js
@@ -222,10 +222,10 @@ define(['require',
sortable: false,
formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
- var values = model.get('attributes');
- var data = that.classificationDefCollection.fullCollection.findWhere({ 'name': model.get('typeName') });
- var attributeDefs = Utils.getNestedSuperTypeObj({ data: data.toJSON(), collection: that.classificationDefCollection, attrMerge: true });
- var tagValue = 'NA',
+ var values = model.get('attributes'),
+ data = that.classificationDefCollection.fullCollection.findWhere({ 'name': model.get('typeName') }),
+ attributeDefs = data ? Utils.getNestedSuperTypeObj({ data: data.toJSON(), collection: that.classificationDefCollection, attrMerge: true }) : null,
+ tagValue = 'NA',
dataType;
if (!_.isEmpty(attributeDefs)) {
var stringValue = "";
diff --git a/dashboardv3/public/js/external_lib/atlas-lineage/dist/index.js b/dashboardv3/public/js/external_lib/atlas-lineage/dist/index.js
index d90d022..1ff2128 100644
--- a/dashboardv3/public/js/external_lib/atlas-lineage/dist/index.js
+++ b/dashboardv3/public/js/external_lib/atlas-lineage/dist/index.js
@@ -1 +1 @@
-!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e(require("platform"),require("dagreD3")):"function"==typeof define&&define.amd?define(["platform","dagreD3"],e):"object"==typeof exports?exports.LineageHelper=e(require("platform"),require("dagreD3")):t.LineageHelper=e(t.platform,t.dagreD3)}(window,(function(t,e){return function(t){var e={};function n(r){if(e[r])return e[r].exports;var i=e[r]={i:r,l:!1,exports:{}};return t[r].call(i.exports,i,i.exports,n),i. [...]
\ No newline at end of file
+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e(require("platform"),require("dagreD3")):"function"==typeof define&&define.amd?define(["platform","dagreD3"],e):"object"==typeof exports?exports.LineageHelper=e(require("platform"),require("dagreD3")):t.LineageHelper=e(t.platform,t.dagreD3)}(window,(function(t,e){return function(t){var e={};function n(r){if(e[r])return e[r].exports;var i=e[r]={i:r,l:!1,exports:{}};return t[r].call(i.exports,i,i.exports,n),i. [...]
\ No newline at end of file
diff --git a/dashboardv3/public/js/views/graph/LineageLayoutView.js b/dashboardv3/public/js/views/graph/LineageLayoutView.js
index d933241..bf80509 100644
--- a/dashboardv3/public/js/views/graph/LineageLayoutView.js
+++ b/dashboardv3/public/js/views/graph/LineageLayoutView.js
@@ -235,7 +235,7 @@ define(['require',
},
onClickLabelFullName: function() {
this.labelFullText = !this.labelFullText;
- this.LineageHelperRef.displayFullName({ bLabelFullText : this.labelFullText });
+ this.LineageHelperRef.displayFullName({ bLabelFullText: this.labelFullText });
},
fetchGraphData: function(options) {
var that = this,
@@ -416,7 +416,7 @@ define(['require',
var data = {};
_.each(config, function(valKey, key) {
var val = initialData[key];
- if (_.isUndefined(val) && initialData.attributes[key]) {
+ if (_.isUndefined(val) && initialData.attributes && initialData.attributes[key]) {
val = initialData.attributes[key];
}
if (val) {
@@ -430,16 +430,16 @@ define(['require',
"sortBy": false
}));
},
- calculateLineageDetailPanelHeight: function(){
+ calculateLineageDetailPanelHeight: function() {
var $parentContainer = $('#tab-lineage .resizeGraph'),
$panel = $parentContainer.find('.fix-box');
var $parentHeight = $parentContainer.find('.fix-box, tbody').removeAttr('style').height() - 48, // 48px is the Panels top from the parent container
$tBody = $panel.find('tbody'),
- panelHeight = $tBody.height() + 100;
- if($parentHeight < panelHeight){
+ panelHeight = $tBody.height() + 100;
+ if ($parentHeight < panelHeight) {
panelHeight = $parentHeight;
}
- $panel.css('height', panelHeight + 'px');
+ $panel.css('height', panelHeight + 'px');
$tBody.css('height', '100%');
}
});
diff --git a/dashboardv3/public/js/views/tag/TagDetailTableLayoutView.js b/dashboardv3/public/js/views/tag/TagDetailTableLayoutView.js
index 7a56206..809c143 100644
--- a/dashboardv3/public/js/views/tag/TagDetailTableLayoutView.js
+++ b/dashboardv3/public/js/views/tag/TagDetailTableLayoutView.js
@@ -222,10 +222,10 @@ define(['require',
sortable: false,
formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
- var values = model.get('attributes');
- var data = that.classificationDefCollection.fullCollection.findWhere({ 'name': model.get('typeName') });
- var attributeDefs = Utils.getNestedSuperTypeObj({ data: data.toJSON(), collection: that.classificationDefCollection, attrMerge: true });
- var tagValue = 'NA',
+ var values = model.get('attributes'),
+ data = that.classificationDefCollection.fullCollection.findWhere({ 'name': model.get('typeName') }),
+ attributeDefs = data ? Utils.getNestedSuperTypeObj({ data: data.toJSON(), collection: that.classificationDefCollection, attrMerge: true }) : null,
+ tagValue = 'NA',
dataType;
if (!_.isEmpty(attributeDefs)) {
var stringValue = "";
[atlas] 03/03: ATLAS-4252: UI (New): Deleting subclassifications
results in endless loading, fixed
Posted by pi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pinal pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 234950e06bb6e6ac1035f579283929f908ec300c
Author: prasad pawar <pr...@freestoneinfotech.com>
AuthorDate: Fri Apr 23 15:12:20 2021 +0530
ATLAS-4252: UI (New): Deleting subclassifications results in endless loading, fixed
Signed-off-by: Pinal <pinal-shah>
---
.../search/tree/ClassificationTreeLayoutView.js | 32 +++++++++++++++-------
1 file changed, 22 insertions(+), 10 deletions(-)
diff --git a/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js b/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
index d23ddea..b64b101 100644
--- a/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
+++ b/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
@@ -201,14 +201,19 @@ define([
var that = this;
this.listenTo(
this.classificationDefCollection.fullCollection,
- "reset add remove",
- function() {
- if (this.ui.classificationSearchTree.jstree(true)) {
- that.classificationTreeUpdate = true;
- that.ui.classificationSearchTree.jstree(true).refresh();
- } else {
- this.renderClassificationTree();
- }
+ "reset add",
+ function(model) {
+ that.classificationTreeUpdate = true;
+ that.classificationTreeRefresh();
+ },
+ this
+ );
+ this.listenTo(
+ this.classificationDefCollection.fullCollection,
+ "remove",
+ function(model) {
+ that.classificationTreeUpdate = false;
+ that.classificationTreeRefresh();
},
this
);
@@ -236,6 +241,13 @@ define([
});
},
+ classificationTreeRefresh: function() {
+ if (this.ui.classificationSearchTree.jstree(true)) {
+ this.ui.classificationSearchTree.jstree(true).refresh();
+ } else {
+ this.renderClassificationTree();
+ }
+ },
findSearchResult: function(tagValue) {
if (tagValue) {
var params = {
@@ -463,7 +475,7 @@ define([
var child = collection.find({
name: name
});
- var tagEntityCount = that.entityCountObj?that.entityCountObj.tag.tagEntities[name]:null;
+ var tagEntityCount = that.entityCountObj ? that.entityCountObj.tag.tagEntities[name] : null;
var tagname = tagEntityCount ? name + " (" + _.numberFormatWithComma(tagEntityCount) + ")" : name;
if (that.options.value) {
@@ -506,7 +518,7 @@ define([
collection.each(function(model) {
var modelJSON = model.toJSON(),
name = modelJSON.name,
- tagEntityCount = that.entityCountObj?that.entityCountObj.tag.tagEntities[name]:null,
+ tagEntityCount = that.entityCountObj ? that.entityCountObj.tag.tagEntities[name] : null,
tagname = tagEntityCount ? name + " (" + _.numberFormatWithComma(tagEntityCount) + ")" : name,
isSelectedChildted = false,
isSelected = false;