You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by kb...@apache.org on 2020/07/20 06:58:52 UTC
[atlas] branch branch-2.0 updated: ATLAS-3894: UI: User is able to
add and remove business metadata from deleted entities
This is an automated email from the ASF dual-hosted git repository.
kbhatt pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 63c1263 ATLAS-3894: UI: User is able to add and remove business metadata from deleted entities
63c1263 is described below
commit 63c1263120e92c991723a1e6f7bf7ca8e45a95b4
Author: kevalbhatt <kb...@apache.org>
AuthorDate: Fri Jul 17 19:15:28 2020 +0530
ATLAS-3894: UI: User is able to add and remove business metadata from deleted entities
(cherry picked from commit 7e06f55fc952f7fbbd18eb717f70ae211085068d)
---
.../js/templates/entity/EntityBusinessMetaDataView_tmpl.html | 2 ++
.../js/templates/entity/EntityLabelDefineView_tmpl.html | 2 ++
.../public/js/templates/entity/EntityUserDefineView_tmpl.html | 2 ++
.../public/js/views/entity/EntityBusinessMetaDataView.js | 11 +++++++++--
.../js/templates/entity/EntityBusinessMetaDataView_tmpl.html | 2 ++
.../js/templates/entity/EntityLabelDefineView_tmpl.html | 2 ++
.../public/js/templates/entity/EntityUserDefineView_tmpl.html | 2 ++
.../public/js/views/entity/EntityBusinessMetaDataView.js | 11 +++++++++--
8 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/dashboardv2/public/js/templates/entity/EntityBusinessMetaDataView_tmpl.html b/dashboardv2/public/js/templates/entity/EntityBusinessMetaDataView_tmpl.html
index fd00abf..1d0ccb0 100644
--- a/dashboardv2/public/js/templates/entity/EntityBusinessMetaDataView_tmpl.html
+++ b/dashboardv2/public/js/templates/entity/EntityBusinessMetaDataView_tmpl.html
@@ -23,11 +23,13 @@
<button type="button" title="Collapse"><i class="ec-icon fa"></i></button>
</div>
</div>
+ {{#ifCond readOnlyEntity "===" false}}
<div class="panel-actions">
<button class="btn btn-action btn-sm" data-id="addBusinessMetadata">Add</button>
<button class="btn btn-action btn-sm" style="display: none;" data-id="saveBusinessMetadata">Save</button>
<button class="btn btn-action btn-sm" style="display: none;" data-id="cancel">Cancel</button>
</div>
+ {{/ifCond}}
<div id="businessMetadataCollapse" class="panel-collapse collapse">
<div class="panel-body">
<div data-id="businessMetadataTree"></div>
diff --git a/dashboardv2/public/js/templates/entity/EntityLabelDefineView_tmpl.html b/dashboardv2/public/js/templates/entity/EntityLabelDefineView_tmpl.html
index d3ca9ad..a6fe8e0 100644
--- a/dashboardv2/public/js/templates/entity/EntityLabelDefineView_tmpl.html
+++ b/dashboardv2/public/js/templates/entity/EntityLabelDefineView_tmpl.html
@@ -56,10 +56,12 @@
{{#ifCond swapItem "===" true}}
<select class="form-control" data-id="addLabelOptions" multiple="multiple"></select>
{{else}}
+ {{#ifCond readOnlyEntity "===" false}}
<div class="badge-container">
No labels have been created yet. To add a labels, click <a href="javascript:void(0)" data-id="addLabels">here</a>
</div>
{{/ifCond}}
+ {{/ifCond}}
</div>
</div>
</div>
diff --git a/dashboardv2/public/js/templates/entity/EntityUserDefineView_tmpl.html b/dashboardv2/public/js/templates/entity/EntityUserDefineView_tmpl.html
index 4434300..074d39b 100644
--- a/dashboardv2/public/js/templates/entity/EntityUserDefineView_tmpl.html
+++ b/dashboardv2/public/js/templates/entity/EntityUserDefineView_tmpl.html
@@ -56,7 +56,9 @@
{{#ifCond swapItem "===" true}}
<div id="r_entityUserDefinedItemView"></div>
{{else}}
+ {{#ifCond readOnlyEntity "===" false}}
No properties have been created yet. To add a property, click <a href="javascript:void(0)" data-id="addItem">here</a>
+ {{/ifCond}}
</div>
{{/ifCond}}
</div>
diff --git a/dashboardv2/public/js/views/entity/EntityBusinessMetaDataView.js b/dashboardv2/public/js/views/entity/EntityBusinessMetaDataView.js
index fe13f01..5e4643e 100644
--- a/dashboardv2/public/js/views/entity/EntityBusinessMetaDataView.js
+++ b/dashboardv2/public/js/views/entity/EntityBusinessMetaDataView.js
@@ -24,10 +24,11 @@ define([
"models/VEntity",
"utils/Utils",
"utils/Messages",
+ "utils/Enums",
"utils/CommonViewFunction",
"moment",
"utils/Globals"
-], function(require, Backbone, EntityBusinessMetaDataView_tmpl, EntityBusinessMetaDataItemView, VEntity, Utils, Messages, CommonViewFunction, moment, Globals) {
+], function(require, Backbone, EntityBusinessMetaDataView_tmpl, EntityBusinessMetaDataItemView, VEntity, Utils, Messages, Enums, CommonViewFunction, moment, Globals) {
"use strict";
return Backbone.Marionette.CompositeView.extend({
@@ -43,6 +44,11 @@ define([
enumDefCollection: this.enumDefCollection
};
},
+ templateHelpers: function() {
+ return {
+ readOnlyEntity: this.readOnlyEntity
+ }
+ },
/** ui selector cache */
ui: {
addItem: "[data-id='addItem']",
@@ -63,6 +69,7 @@ define([
var that = this;
_.extend(this, _.pick(options, "entity", "businessMetadataCollection", "enumDefCollection", "guid", "fetchCollection"));
this.editMode = false;
+ this.readOnlyEntity = Enums.entityStateReadOnly[this.entity.status];
this.$("editBox").hide();
this.actualCollection = new Backbone.Collection(
_.map(this.entity.businessAttributes, function(val, key) {
@@ -243,7 +250,7 @@ define([
li += that.associateAttributePanel(obj, attrLi);
});
var html = li;
- if (html === "") {
+ if (html === "" && this.readOnlyEntity === false) {
html = '<div class="col-md-12"> No business metadata have been created yet. To add a business metadata, click <a href="javascript:void(0)" data-id="addBusinessMetadata">here</a></div>';
}
this.ui.businessMetadataTree.html(html);
diff --git a/dashboardv3/public/js/templates/entity/EntityBusinessMetaDataView_tmpl.html b/dashboardv3/public/js/templates/entity/EntityBusinessMetaDataView_tmpl.html
index fd00abf..1d0ccb0 100644
--- a/dashboardv3/public/js/templates/entity/EntityBusinessMetaDataView_tmpl.html
+++ b/dashboardv3/public/js/templates/entity/EntityBusinessMetaDataView_tmpl.html
@@ -23,11 +23,13 @@
<button type="button" title="Collapse"><i class="ec-icon fa"></i></button>
</div>
</div>
+ {{#ifCond readOnlyEntity "===" false}}
<div class="panel-actions">
<button class="btn btn-action btn-sm" data-id="addBusinessMetadata">Add</button>
<button class="btn btn-action btn-sm" style="display: none;" data-id="saveBusinessMetadata">Save</button>
<button class="btn btn-action btn-sm" style="display: none;" data-id="cancel">Cancel</button>
</div>
+ {{/ifCond}}
<div id="businessMetadataCollapse" class="panel-collapse collapse">
<div class="panel-body">
<div data-id="businessMetadataTree"></div>
diff --git a/dashboardv3/public/js/templates/entity/EntityLabelDefineView_tmpl.html b/dashboardv3/public/js/templates/entity/EntityLabelDefineView_tmpl.html
index d3ca9ad..a6fe8e0 100644
--- a/dashboardv3/public/js/templates/entity/EntityLabelDefineView_tmpl.html
+++ b/dashboardv3/public/js/templates/entity/EntityLabelDefineView_tmpl.html
@@ -56,10 +56,12 @@
{{#ifCond swapItem "===" true}}
<select class="form-control" data-id="addLabelOptions" multiple="multiple"></select>
{{else}}
+ {{#ifCond readOnlyEntity "===" false}}
<div class="badge-container">
No labels have been created yet. To add a labels, click <a href="javascript:void(0)" data-id="addLabels">here</a>
</div>
{{/ifCond}}
+ {{/ifCond}}
</div>
</div>
</div>
diff --git a/dashboardv3/public/js/templates/entity/EntityUserDefineView_tmpl.html b/dashboardv3/public/js/templates/entity/EntityUserDefineView_tmpl.html
index 4434300..074d39b 100644
--- a/dashboardv3/public/js/templates/entity/EntityUserDefineView_tmpl.html
+++ b/dashboardv3/public/js/templates/entity/EntityUserDefineView_tmpl.html
@@ -56,7 +56,9 @@
{{#ifCond swapItem "===" true}}
<div id="r_entityUserDefinedItemView"></div>
{{else}}
+ {{#ifCond readOnlyEntity "===" false}}
No properties have been created yet. To add a property, click <a href="javascript:void(0)" data-id="addItem">here</a>
+ {{/ifCond}}
</div>
{{/ifCond}}
</div>
diff --git a/dashboardv3/public/js/views/entity/EntityBusinessMetaDataView.js b/dashboardv3/public/js/views/entity/EntityBusinessMetaDataView.js
index fe13f01..5e4643e 100644
--- a/dashboardv3/public/js/views/entity/EntityBusinessMetaDataView.js
+++ b/dashboardv3/public/js/views/entity/EntityBusinessMetaDataView.js
@@ -24,10 +24,11 @@ define([
"models/VEntity",
"utils/Utils",
"utils/Messages",
+ "utils/Enums",
"utils/CommonViewFunction",
"moment",
"utils/Globals"
-], function(require, Backbone, EntityBusinessMetaDataView_tmpl, EntityBusinessMetaDataItemView, VEntity, Utils, Messages, CommonViewFunction, moment, Globals) {
+], function(require, Backbone, EntityBusinessMetaDataView_tmpl, EntityBusinessMetaDataItemView, VEntity, Utils, Messages, Enums, CommonViewFunction, moment, Globals) {
"use strict";
return Backbone.Marionette.CompositeView.extend({
@@ -43,6 +44,11 @@ define([
enumDefCollection: this.enumDefCollection
};
},
+ templateHelpers: function() {
+ return {
+ readOnlyEntity: this.readOnlyEntity
+ }
+ },
/** ui selector cache */
ui: {
addItem: "[data-id='addItem']",
@@ -63,6 +69,7 @@ define([
var that = this;
_.extend(this, _.pick(options, "entity", "businessMetadataCollection", "enumDefCollection", "guid", "fetchCollection"));
this.editMode = false;
+ this.readOnlyEntity = Enums.entityStateReadOnly[this.entity.status];
this.$("editBox").hide();
this.actualCollection = new Backbone.Collection(
_.map(this.entity.businessAttributes, function(val, key) {
@@ -243,7 +250,7 @@ define([
li += that.associateAttributePanel(obj, attrLi);
});
var html = li;
- if (html === "") {
+ if (html === "" && this.readOnlyEntity === false) {
html = '<div class="col-md-12"> No business metadata have been created yet. To add a business metadata, click <a href="javascript:void(0)" data-id="addBusinessMetadata">here</a></div>';
}
this.ui.businessMetadataTree.html(html);