You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ni...@apache.org on 2021/05/27 13:56:58 UTC
[atlas] branch branch-2.0 updated (4e0228a -> 57e7cf6)
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a change to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git.
from 4e0228a ATLAS-4310: Handled NPE for DELETE classification.
new 2d93c9f ATLAS-4304:UI:[Business Metadata Bulk Import] [Beta UI] Bulk Import Business Metadata/Glossary options overlap, fixed
new 590f491 ATLAS-4309:Atlas UI: After deleting the sub-classifications from Atlas UI, they still appear in UI, fixed
new a12f517 ATLAS-4314:Atlas UI: Make Tasks tab default as hidden on entity detail page, fixed
new 57e7cf6 ATLAS-4308:ATLAS UI Audit sorting : When consecutive Entity Audits are fired, sorting happens on the previous sorted results received from the server, fixed
The 4 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:
dashboardv2/public/css/scss/theme.scss | 5 +++++
dashboardv2/public/js/templates/site/Header.html | 10 +++++-----
dashboardv2/public/js/utils/Globals.js | 2 +-
dashboardv2/public/js/views/audit/AuditTableLayoutView.js | 9 +--------
dashboardv2/public/js/views/tag/TagLayoutView.js | 12 +++++++++++-
dashboardv3/public/js/utils/Globals.js | 2 +-
dashboardv3/public/js/views/audit/AuditTableLayoutView.js | 8 +-------
.../js/views/search/tree/ClassificationTreeLayoutView.js | 15 ++++++++++++---
8 files changed, 37 insertions(+), 26 deletions(-)
[atlas] 01/04: ATLAS-4304:UI:[Business Metadata Bulk Import] [Beta
UI] Bulk Import Business Metadata/Glossary options overlap, fixed
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 2d93c9f4f99ac21c39cb85f0488cce61b62e235e
Author: prasad pawar <pr...@freestoneinfotech.com>
AuthorDate: Wed May 26 01:17:31 2021 +0530
ATLAS-4304:UI:[Business Metadata Bulk Import] [Beta UI] Bulk Import Business Metadata/Glossary options overlap, fixed
Signed-off-by: nixonrodrigues <ni...@apache.org>
---
dashboardv2/public/css/scss/theme.scss | 5 +++++
dashboardv2/public/js/templates/site/Header.html | 10 +++++-----
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/dashboardv2/public/css/scss/theme.scss b/dashboardv2/public/css/scss/theme.scss
index 045a461..4838ca3 100644
--- a/dashboardv2/public/css/scss/theme.scss
+++ b/dashboardv2/public/css/scss/theme.scss
@@ -577,6 +577,11 @@ hr[size="10"] {
-webkit-border-radius: 0 6px 6px 6px;
-moz-border-radius: 0 6px 6px;
border-radius: 0 6px 6px 6px;
+
+ .submenu {
+ left: -125%;
+ top: -5px;
+ }
}
&:hover>.dropdown-menu {
diff --git a/dashboardv2/public/js/templates/site/Header.html b/dashboardv2/public/js/templates/site/Header.html
index 981f393..572e39e 100644
--- a/dashboardv2/public/js/templates/site/Header.html
+++ b/dashboardv2/public/js/templates/site/Header.html
@@ -45,14 +45,14 @@
<ul class="dropdown-menu multi-level">
<li class="dropdown-submenu">
<a tabindex="-1" href="javascript:void(0)">Business Metadata</span></a>
- <ul class="dropdown-menu">
+ <ul class="dropdown-menu submenu">
<li><a href="{{businessMetadataImportTempUrl}}">Download Import template</a></li>
<li data-id='businessMetadataImport'><a href="javascript:void(0)">Import Business Metadata</a></li>
</ul>
</li>
<li class="dropdown-submenu">
<a tabindex="-1" href="javascript:void(0)">Glossary</span></a>
- <ul class="dropdown-menu">
+ <ul class="dropdown-menu submenu">
<li><a href="{{glossaryImportTempUrl}}">Download Import template</a></li>
<li data-id='glossaryImport'><a href="javascript:void(0)">Import Glossary Term</a></li>
</ul>
@@ -66,8 +66,8 @@
<li><a target="_blank" href="{{apiDocUrl}}">API Documentation</a></li>
<li class="aboutAtlas"><a href="javascript:void(0)">About</a></li>
{{#if isDebugMetricsEnabled}}
- <li class="show-debug"><a href="javascript:void(0)" data-id="showDebug">Debug</a></li>
- {{/if}}
+ <li class="show-debug"><a href="javascript:void(0)" data-id="showDebug">Debug</a></li>
+ {{/if}}
</ul>
</li>
<li role="separator" class="divider"></li>
@@ -82,4 +82,4 @@
</td>
</tr>
</table>
-</header>
+</header>
\ No newline at end of file
[atlas] 03/04: ATLAS-4314:Atlas UI: Make Tasks tab default as
hidden on entity detail page, fixed
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit a12f51710a5c61a506db75b11384935b2961a9da
Author: prasad pawar <pr...@freestoneinfotech.com>
AuthorDate: Thu May 27 09:15:02 2021 +0530
ATLAS-4314:Atlas UI: Make Tasks tab default as hidden on entity detail page, fixed
Signed-off-by: nixonrodrigues <ni...@apache.org>
---
dashboardv2/public/js/utils/Globals.js | 2 +-
dashboardv3/public/js/utils/Globals.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dashboardv2/public/js/utils/Globals.js b/dashboardv2/public/js/utils/Globals.js
index 2e94e6b..b0dc5cd 100644
--- a/dashboardv2/public/js/utils/Globals.js
+++ b/dashboardv2/public/js/utils/Globals.js
@@ -48,7 +48,7 @@ define(["require"], function(require) {
Globals.isTimezoneFormatEnabled = true;
Globals.isDebugMetricsEnabled = false;
- Globals.isTasksEnabled = true;
+ Globals.isTasksEnabled = false;
return Globals;
});
\ No newline at end of file
diff --git a/dashboardv3/public/js/utils/Globals.js b/dashboardv3/public/js/utils/Globals.js
index 2e94e6b..b0dc5cd 100644
--- a/dashboardv3/public/js/utils/Globals.js
+++ b/dashboardv3/public/js/utils/Globals.js
@@ -48,7 +48,7 @@ define(["require"], function(require) {
Globals.isTimezoneFormatEnabled = true;
Globals.isDebugMetricsEnabled = false;
- Globals.isTasksEnabled = true;
+ Globals.isTasksEnabled = false;
return Globals;
});
\ No newline at end of file
[atlas] 04/04: ATLAS-4308:ATLAS UI Audit sorting : When consecutive
Entity Audits are fired,
sorting happens on the previous sorted results received from the server,
fixed
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 57e7cf61962d42aca5a1615d4c8e60709fd7d120
Author: prasad pawar <pr...@freestoneinfotech.com>
AuthorDate: Wed May 26 12:25:21 2021 +0530
ATLAS-4308:ATLAS UI Audit sorting : When consecutive Entity Audits are fired, sorting happens on the previous sorted results received from the server, fixed
Signed-off-by: nixonrodrigues <ni...@apache.org>
---
dashboardv2/public/js/views/audit/AuditTableLayoutView.js | 9 +--------
dashboardv3/public/js/views/audit/AuditTableLayoutView.js | 8 +-------
2 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/dashboardv2/public/js/views/audit/AuditTableLayoutView.js b/dashboardv2/public/js/views/audit/AuditTableLayoutView.js
index d5e453c..625ae87 100644
--- a/dashboardv2/public/js/views/audit/AuditTableLayoutView.js
+++ b/dashboardv2/public/js/views/audit/AuditTableLayoutView.js
@@ -93,9 +93,6 @@ define(['require',
fetchAuditCollection: function() {
this.commonTableOptions['atlasPaginationOpts'] = this.getPaginationOptions();
this.fetchCollection();
- this.entityCollection.comparator = function(model) {
- return -model.get('timestamp');
- }
},
bindEvents: function() {},
getPaginationOptions: function() {
@@ -118,9 +115,7 @@ define(['require',
this.entityCollection.fetch({
success: function(dataOrCollection, response) {
that.entityCollection.state.pageSize = that.getPageCount();
- if (!that.fromSort) {
- that.entityCollection.fullCollection.reset(response, $.extend(options));
- }
+ that.entityCollection.reset(response, $.extend(options));
},
complete: function() {
that.$('.fontLoader').hide();
@@ -128,7 +123,6 @@ define(['require',
that.$('.auditTable').show();
if (that.fromSort) {
that.fromSort = !that.fromSort;
- that.renderTableLayoutView();
}
},
silent: true
@@ -187,7 +181,6 @@ define(['require',
'views/audit/CreateAuditTableLayoutView',
], function(CreateAuditTableLayoutView) {
that.action = model.get('action');
- // $(el.target).attr('disabled', true);
var eventModel = that.entityCollection.fullCollection.findWhere({ 'eventKey': model.get('eventKey') }).toJSON(),
collectionModel = new that.entityCollection.model(eventModel),
view = new CreateAuditTableLayoutView({ guid: that.guid, entityModel: collectionModel, action: that.action, entity: that.entity, entityName: that.entityName, attributeDefs: that.attributeDefs });
diff --git a/dashboardv3/public/js/views/audit/AuditTableLayoutView.js b/dashboardv3/public/js/views/audit/AuditTableLayoutView.js
index 49b84dd..625ae87 100644
--- a/dashboardv3/public/js/views/audit/AuditTableLayoutView.js
+++ b/dashboardv3/public/js/views/audit/AuditTableLayoutView.js
@@ -93,9 +93,6 @@ define(['require',
fetchAuditCollection: function() {
this.commonTableOptions['atlasPaginationOpts'] = this.getPaginationOptions();
this.fetchCollection();
- this.entityCollection.comparator = function(model) {
- return -model.get('timestamp');
- }
},
bindEvents: function() {},
getPaginationOptions: function() {
@@ -118,9 +115,7 @@ define(['require',
this.entityCollection.fetch({
success: function(dataOrCollection, response) {
that.entityCollection.state.pageSize = that.getPageCount();
- if (!that.fromSort) {
- that.entityCollection.fullCollection.reset(response, $.extend(options));
- }
+ that.entityCollection.reset(response, $.extend(options));
},
complete: function() {
that.$('.fontLoader').hide();
@@ -128,7 +123,6 @@ define(['require',
that.$('.auditTable').show();
if (that.fromSort) {
that.fromSort = !that.fromSort;
- that.renderTableLayoutView();
}
},
silent: true
[atlas] 02/04: ATLAS-4309:Atlas UI: After deleting the
sub-classifications from Atlas UI, they still appear in UI, fixed
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 590f4914912a81d0ca4f0ba025013095a92e8f80
Author: prasad pawar <pr...@freestoneinfotech.com>
AuthorDate: Wed May 26 18:49:47 2021 +0530
ATLAS-4309:Atlas UI: After deleting the sub-classifications from Atlas UI, they still appear in UI, fixed
Signed-off-by: nixonrodrigues <ni...@apache.org>
---
dashboardv2/public/js/views/tag/TagLayoutView.js | 12 +++++++++++-
.../js/views/search/tree/ClassificationTreeLayoutView.js | 15 ++++++++++++---
2 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/dashboardv2/public/js/views/tag/TagLayoutView.js b/dashboardv2/public/js/views/tag/TagLayoutView.js
index bde61b8..f408469 100644
--- a/dashboardv2/public/js/views/tag/TagLayoutView.js
+++ b/dashboardv2/public/js/views/tag/TagLayoutView.js
@@ -616,13 +616,23 @@ define(['require',
},
onNotifyOk: function(data) {
var that = this,
- deleteTagData = this.collection.fullCollection.findWhere({ name: this.tag });
+ deleteTagData = this.collection.fullCollection.findWhere({ name: this.tag }),
+ superTypeOfDeleteTag = deleteTagData.get('superTypes'),
+ superTypeObj = superTypeOfDeleteTag ? this.collection.fullCollection.findWhere({ name: superTypeOfDeleteTag[0] }) : null;
+
deleteTagData.deleteTag({
typeName: that.tag,
success: function() {
Utils.notifySuccess({
content: "Classification " + that.tag + Messages.getAbbreviationMsg(false, 'deleteSuccessMessage')
});
+ //delete current classification from subTypes list of parent classification if any
+ if (superTypeObj) {
+ var parentSubTypeUpdate = _.reject(superTypeObj.get('subTypes'), function(subtype) {
+ return subtype === that.tag;
+ });
+ superTypeObj.set('subTypes', parentSubTypeUpdate);
+ }
// if deleted tag is prviously searched then remove that tag url from save state of tab.
var searchUrl = Globals.saveApplicationState.tabState.searchUrl;
var urlObj = Utils.getUrlState.getQueryParams(searchUrl);
diff --git a/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js b/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
index b64b101..75e53cd 100644
--- a/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
+++ b/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
@@ -865,16 +865,25 @@ define([
if (this.tagId) {
var deleteTagData = this.classificationDefCollection.fullCollection.findWhere({ guid: this.tagId });
if (deleteTagData) {
- var tagName = deleteTagData.get("name");
+ var tagName = deleteTagData.get("name"),
+ superTypeOfDeleteTag = deleteTagData.get('superTypes'),
+ superTypeObj = superTypeOfDeleteTag ? this.classificationDefCollection.fullCollection.findWhere({ name: superTypeOfDeleteTag[0] }) : null;
deleteTagData.deleteTag({
typeName: tagName,
success: function() {
Utils.notifySuccess({
content: "Classification " + tagName + Messages.getAbbreviationMsg(false, 'deleteSuccessMessage')
});
+ //delete current classification from subTypes list of parent classification if any
+ if (superTypeObj) {
+ var parentSubTypeUpdate = _.reject(superTypeObj.get('subTypes'), function(subtype) {
+ return subtype === tagName;
+ });
+ superTypeObj.set('subTypes', parentSubTypeUpdate);
+ }
// if deleted tag is prviously searched then remove that tag url from save state of tab.
- var searchUrl = Globals.saveApplicationState.tabState.searchUrl;
- var urlObj = Utils.getUrlState.getQueryParams(searchUrl);
+ var searchUrl = Globals.saveApplicationState.tabState.searchUrl,
+ urlObj = Utils.getUrlState.getQueryParams(searchUrl);
that.classificationDefCollection.fullCollection.remove(deleteTagData);
// to update tag list of search tab fetch typeHeaders.
//that.typeHeaders.fetch({ reset: true });