Skip to content

A
atlas
Commit 95923fba by kevalbhatt
Options

ATLAS-3706 : UI: Audit change for Business metadata/labels/user-define property

parent 2fbfb557
Showing with 114 additions and 72 deletions
dashboardv2/public/js/templates/audit/CreateAuditTableLayoutView_tmpl.html
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
--> -->
<h4 style="word-break: break-word;">Name: <span data-id="name"></span></h4> <h4 style="word-break: break-word;" data-id="name"></h4>
<div class="panel-group server-stats-container statsContainer " id="accordion"> <div class="panel-group server-stats-container statsContainer " id="accordion">
<div class="panel panel-default custom-panel expand_collapse_panel-icon hide" data-id="detailsAttribute"> <div class="panel panel-default custom-panel expand_collapse_panel-icon hide" data-id="detailsAttribute">
<div class="panel-heading" data-toggle="collapse" href="#detailAttributeTableCollapse" aria-expanded="true"> <div class="panel-heading" data-toggle="collapse" href="#detailAttributeTableCollapse" aria-expanded="true">
......
dashboardv2/public/js/utils/Enums.js
...@@ -38,7 +38,9 @@ define(['require'], function(require) { ...@@ -38,7 +38,9 @@ define(['require'], function(require) {
TERM_DELETE: "Term Deleted", TERM_DELETE: "Term Deleted",
LABEL_ADD: "Label(s) Added", LABEL_ADD: "Label(s) Added",
LABEL_DELETE: "Label(s) Deleted", LABEL_DELETE: "Label(s) Deleted",
ENTITY_PURGE: "Entity Purged" ENTITY_PURGE: "Entity Purged",
BUSINESS_ATTRIBUTE_ADD: "Business Attribute(s) Added",
BUSINESS_ATTRIBUTE_DELETE: "Business Attribute(s) Deleted"
} }
Enums.entityStateReadOnly = { Enums.entityStateReadOnly = {
...@@ -212,4 +214,4 @@ define(['require'], function(require) { ...@@ -212,4 +214,4 @@ define(['require'], function(require) {
1: "true" 1: "true"
}; };
return Enums; return Enums;
}); });
\ No newline at end of file
dashboardv2/public/js/views/audit/CreateAuditTableLayoutView.js
...@@ -82,7 +82,7 @@ define(['require', ...@@ -82,7 +82,7 @@ define(['require',
}, },
updateName: function(name) { updateName: function(name) {
this.ui.name.text(name); this.ui.name.html("<span>Name: </span><span>" + name + "</span>");
}, },
noDetailsShow: function() { noDetailsShow: function() {
this.ui.noData.removeClass('hide'); this.ui.noData.removeClass('hide');
...@@ -91,73 +91,85 @@ define(['require', ...@@ -91,73 +91,85 @@ define(['require',
var that = this, var that = this,
table = ""; table = "";
var detailObj = this.entityModel.get('details'); var detailObj = this.entityModel.get('details');
if (detailObj && detailObj.search(':') >= 0) { if (detailObj) {
var parseDetailsObject = detailObj.split(':'); if (detailObj.search(':') >= 0) {
if (parseDetailsObject.length > 1) { var parseDetailsObject = detailObj.split(':'),
parseDetailsObject.shift(); type = "",
var auditData = parseDetailsObject.join(":"); auditData = "";
} if (parseDetailsObject.length > 1) {
try { type = parseDetailsObject[0];
parseDetailsObject = JSON.parse(auditData); parseDetailsObject.shift();
var skipAttribute = parseDetailsObject.typeName ? "guid" : null, auditData = parseDetailsObject.join(":");
name = Utils.getName(parseDetailsObject, null, skipAttribute);
if (name == "-") {
name = _.escape(parseDetailsObject.typeName);
} }
var name = ((name ? name : this.entityName)); if (auditData.search('{') === -1) {
that.updateName(name); if (type.trim() === "Added labels" || type.trim() === "Deleted labels") {
if (parseDetailsObject) { this.updateName(auditData.trim().split(" ").join(","));
var attributesDetails = parseDetailsObject.attributes, } else {
customAttr = parseDetailsObject.customAttributes, this.updateName(auditData);
labelsDetails = parseDetailsObject.labels,
relationshipAttributes = parseDetailsObject.relationshipAttributes;
if (attributesDetails) {
that.ui.attributeDetails.removeClass('hide');
that.action.indexOf("Classification") === -1 ? that.ui.panelAttrHeading.html("Technical properties ") : that.ui.panelAttrHeading.html("Properties ");
var attrTable = that.createTableWithValues(attributesDetails);
that.ui.attributeCard.html(
attrTable);
}
if (!_.isEmpty(customAttr)) {
that.ui.customAttributeDetails.removeClass('hide');
var customAttrTable = that.createTableWithValues(customAttr);
that.ui.customAttrCard.html(
customAttrTable);
}
if (!_.isEmpty(labelsDetails)) {
this.ui.labelsDetailsTable.removeClass('hide');
var labelsTable = '';
_.each(labelsDetails, function(value, key, list) {
labelsTable += "<label class='label badge-default'>" + value + "</label>";
});
that.ui.labelCard.html(
labelsTable);
}
if (!_.isEmpty(relationshipAttributes)) {
that.ui.relationShipAttributeDetails.removeClass('hide');
var relationshipAttrTable = that.createTableWithValues(relationshipAttributes);
that.ui.relationshipAttrCard.html(
relationshipAttrTable);
}
if (!attributesDetails && !customAttr && !labelsDetails && !relationshipAttributes) {
that.ui.detailsAttribute.removeClass('hide');
var attrDetailTable = that.createTableWithValues(parseDetailsObject);
that.ui.attributeDetailCard.html(
attrDetailTable);
} }
} else { } else {
that.noDetailsShow(); try {
} parseDetailsObject = JSON.parse(auditData);
} catch (err) { var skipAttribute = parseDetailsObject.typeName ? "guid" : null,
if (_.isArray(parseDetailsObject)) { name = Utils.getName(parseDetailsObject, null, skipAttribute);
var name = _.escape(parseDetailsObject[0]); if (name == "-") {
name = _.escape(parseDetailsObject.typeName);
}
var name = ((name ? name : this.entityName));
that.updateName(name);
if (parseDetailsObject) {
var attributesDetails = parseDetailsObject.attributes,
customAttr = parseDetailsObject.customAttributes,
labelsDetails = parseDetailsObject.labels,
relationshipAttributes = parseDetailsObject.relationshipAttributes;
if (attributesDetails) {
that.ui.attributeDetails.removeClass('hide');
that.action.indexOf("Classification") === -1 ? that.ui.panelAttrHeading.html("Technical properties ") : that.ui.panelAttrHeading.html("Properties ");
var attrTable = that.createTableWithValues(attributesDetails);
that.ui.attributeCard.html(
attrTable);
}
if (!_.isEmpty(customAttr)) {
that.ui.customAttributeDetails.removeClass('hide');
var customAttrTable = that.createTableWithValues(customAttr);
that.ui.customAttrCard.html(
customAttrTable);
}
if (!_.isEmpty(labelsDetails)) {
this.ui.labelsDetailsTable.removeClass('hide');
var labelsTable = '';
_.each(labelsDetails, function(value, key, list) {
labelsTable += "<label class='label badge-default'>" + value + "</label>";
});
that.ui.labelCard.html(
labelsTable);
}
if (!_.isEmpty(relationshipAttributes)) {
that.ui.relationShipAttributeDetails.removeClass('hide');
var relationshipAttrTable = that.createTableWithValues(relationshipAttributes);
that.ui.relationshipAttrCard.html(
relationshipAttrTable);
}
if (!attributesDetails && !customAttr && !labelsDetails && !relationshipAttributes) {
that.ui.detailsAttribute.removeClass('hide');
var attrDetailTable = that.createTableWithValues(parseDetailsObject);
that.ui.attributeDetailCard.html(
attrDetailTable);
}
} else {
that.noDetailsShow();
}
} catch (err) {
if (_.isArray(parseDetailsObject)) {
var name = _.escape(parseDetailsObject[0]);
}
that.updateName(name);
that.noDetailsShow();
}
} }
that.updateName(name); } else if (detailObj == "Deleted entity" || detailObj == "Purged entity") {
that.noDetailsShow(); this.entityName ? this.updateName(this.entityName) : (this.ui.name.hide() && this.ui.noData.removeClass("hide"));
} }
} else if (detailObj == "Deleted entity") {
that.updateName(this.entityName);
} }
} }
}); });
......
dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
...@@ -170,6 +170,9 @@ define(['require', ...@@ -170,6 +170,9 @@ define(['require',
if (collectionJSON) { if (collectionJSON) {
this.name = Utils.getName(collectionJSON); this.name = Utils.getName(collectionJSON);
if (collectionJSON.attributes) { if (collectionJSON.attributes) {
if (collectionJSON.typeName) {
collectionJSON.attributes.typeName = _.escape(collectionJSON.typeName);
}
if (this.name && collectionJSON.typeName) { if (this.name && collectionJSON.typeName) {
this.name = this.name + ' (' + _.escape(collectionJSON.typeName) + ')'; this.name = this.name + ' (' + _.escape(collectionJSON.typeName) + ')';
} }
...@@ -244,6 +247,9 @@ define(['require', ...@@ -244,6 +247,9 @@ define(['require',
})(), })(),
editEntity: this.editEntity || false editEntity: this.editEntity || false
} }
obj["renderAuditTableLayoutView"] = function() {
that.renderAuditTableLayoutView(obj);
};
this.renderEntityDetailTableLayoutView(obj); this.renderEntityDetailTableLayoutView(obj);
this.renderEntityUserDefineView(obj); this.renderEntityUserDefineView(obj);
this.renderEntityLabelDefineView(obj); this.renderEntityLabelDefineView(obj);
......
dashboardv2/public/js/views/entity/EntityLabelDefineView.js
...@@ -55,7 +55,7 @@ define(['require', ...@@ -55,7 +55,7 @@ define(['require',
}, },
initialize: function(options) { initialize: function(options) {
var self = this; var self = this;
_.extend(this, _.pick(options, 'entity', 'customFilter')); _.extend(this, _.pick(options, 'entity', 'customFilter', 'renderAuditTableLayoutView'));
this.swapItem = false, this.saveLabels = false; this.swapItem = false, this.saveLabels = false;
this.readOnlyEntity = this.customFilter === undefined ? Enums.entityStateReadOnly[this.entity.status] : this.customFilter; this.readOnlyEntity = this.customFilter === undefined ? Enums.entityStateReadOnly[this.entity.status] : this.customFilter;
this.entityModel = new VEntity(this.entity); this.entityModel = new VEntity(this.entity);
...@@ -164,6 +164,9 @@ define(['require', ...@@ -164,6 +164,9 @@ define(['require',
that.swapItem = false; that.swapItem = false;
that.saveLabels = false; that.saveLabels = false;
that.render(); that.render();
if (that.renderAuditTableLayoutView) {
that.renderAuditTableLayoutView();
}
}, },
error: function(e) { error: function(e) {
that.ui.saveLabels && that.ui.saveLabels.length > 0 && that.ui.saveLabels[0].setAttribute("disabled", false); that.ui.saveLabels && that.ui.saveLabels.length > 0 && that.ui.saveLabels[0].setAttribute("disabled", false);
......
dashboardv2/public/js/views/entity/EntityUserDefineView.js
...@@ -53,7 +53,7 @@ define(['require', ...@@ -53,7 +53,7 @@ define(['require',
return events; return events;
}, },
initialize: function(options) { initialize: function(options) {
_.extend(this, _.pick(options, 'entity', 'customFilter')); _.extend(this, _.pick(options, 'entity', 'customFilter', 'renderAuditTableLayoutView'));
this.userDefineAttr = this.entity && this.entity.customAttributes || []; this.userDefineAttr = this.entity && this.entity.customAttributes || [];
this.initialCall = false; this.initialCall = false;
this.swapItem = false, this.saveAttrItems = false; this.swapItem = false, this.saveAttrItems = false;
...@@ -136,6 +136,9 @@ define(['require', ...@@ -136,6 +136,9 @@ define(['require',
that.swapItem = false; that.swapItem = false;
that.saveAttrItems = false; that.saveAttrItems = false;
that.render(); that.render();
if (that.renderAuditTableLayoutView) {
that.renderAuditTableLayoutView();
}
}, },
error: function(e) { error: function(e) {
that.initialCall = false; that.initialCall = false;
......
dashboardv3/public/css/scss/table.scss
...@@ -254,6 +254,7 @@ td { ...@@ -254,6 +254,7 @@ td {
.auditStatusContainer { .auditStatusContainer {
display: flex; display: flex;
flex-wrap: wrap;
justify-content: center; justify-content: center;
} }
......
dashboardv3/public/js/templates/audit/CreateAuditTableLayoutView_tmpl.html
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
--> -->
<h4 class="entity-name" style="word-break: break-word;" data-id="nameContainer">Name: <span data-id="name"></span></h4> <h4 style="word-break: break-word;" data-id="name"></h4>
<div class="panel-group server-stats-container auditStatusContainer clearfix" id="accordion"> <div class="panel-group server-stats-container auditStatusContainer clearfix" id="accordion">
<div class="panel panel-default custom-panel expand_collapse_panel-icon hide col-sm-5" data-id="detailsAttribute"> <div class="panel panel-default custom-panel expand_collapse_panel-icon hide col-sm-5" data-id="detailsAttribute">
<div class="panel-heading" data-toggle="collapse" href="#detailAttributeTableCollapse" aria-expanded="true"> <div class="panel-heading" data-toggle="collapse" href="#detailAttributeTableCollapse" aria-expanded="true">
......
dashboardv3/public/js/utils/Enums.js
...@@ -38,7 +38,9 @@ define(['require'], function(require) { ...@@ -38,7 +38,9 @@ define(['require'], function(require) {
TERM_DELETE: "Term Deleted", TERM_DELETE: "Term Deleted",
LABEL_ADD: "Label(s) Added", LABEL_ADD: "Label(s) Added",
LABEL_DELETE: "Label(s) Deleted", LABEL_DELETE: "Label(s) Deleted",
ENTITY_PURGE: "Entity Purged" ENTITY_PURGE: "Entity Purged",
BUSINESS_ATTRIBUTE_ADD: "Business Attribute(s) Added",
BUSINESS_ATTRIBUTE_DELETE: "Business Attribute(s) Deleted"
} }
Enums.entityStateReadOnly = { Enums.entityStateReadOnly = {
......
dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js
...@@ -176,6 +176,9 @@ define(['require', ...@@ -176,6 +176,9 @@ define(['require',
if (collectionJSON) { if (collectionJSON) {
this.name = Utils.getName(collectionJSON); this.name = Utils.getName(collectionJSON);
if (collectionJSON.attributes) { if (collectionJSON.attributes) {
if (collectionJSON.typeName) {
collectionJSON.attributes.typeName = _.escape(collectionJSON.typeName);
}
if (this.name && collectionJSON.typeName) { if (this.name && collectionJSON.typeName) {
this.name = this.name + ' (' + _.escape(collectionJSON.typeName) + ')'; this.name = this.name + ' (' + _.escape(collectionJSON.typeName) + ')';
} }
...@@ -252,6 +255,9 @@ define(['require', ...@@ -252,6 +255,9 @@ define(['require',
})(), })(),
editEntity: this.editEntity || false editEntity: this.editEntity || false
} }
obj["renderAuditTableLayoutView"] = function() {
that.renderAuditTableLayoutView(obj);
};
this.renderEntityDetailTableLayoutView(obj); this.renderEntityDetailTableLayoutView(obj);
this.renderEntityUserDefineView(obj); this.renderEntityUserDefineView(obj);
this.renderEntityLabelDefineView(obj); this.renderEntityLabelDefineView(obj);
......
dashboardv3/public/js/views/entity/EntityLabelDefineView.js
...@@ -55,7 +55,7 @@ define(['require', ...@@ -55,7 +55,7 @@ define(['require',
}, },
initialize: function(options) { initialize: function(options) {
var self = this; var self = this;
_.extend(this, _.pick(options, 'entity', 'customFilter')); _.extend(this, _.pick(options, 'entity', 'customFilter', 'renderAuditTableLayoutView'));
this.swapItem = false, this.saveLabels = false; this.swapItem = false, this.saveLabels = false;
this.readOnlyEntity = this.customFilter === undefined ? Enums.entityStateReadOnly[this.entity.status] : this.customFilter; this.readOnlyEntity = this.customFilter === undefined ? Enums.entityStateReadOnly[this.entity.status] : this.customFilter;
this.entityModel = new VEntity(this.entity); this.entityModel = new VEntity(this.entity);
...@@ -164,6 +164,9 @@ define(['require', ...@@ -164,6 +164,9 @@ define(['require',
that.swapItem = false; that.swapItem = false;
that.saveLabels = false; that.saveLabels = false;
that.render(); that.render();
if (that.renderAuditTableLayoutView) {
that.renderAuditTableLayoutView();
}
}, },
error: function(e) { error: function(e) {
that.ui.saveLabels.attr("disabled", false); that.ui.saveLabels.attr("disabled", false);
......
dashboardv3/public/js/views/entity/EntityUserDefineView.js
...@@ -53,7 +53,7 @@ define(['require', ...@@ -53,7 +53,7 @@ define(['require',
return events; return events;
}, },
initialize: function(options) { initialize: function(options) {
_.extend(this, _.pick(options, 'entity', 'customFilter')); _.extend(this, _.pick(options, 'entity', 'customFilter', 'renderAuditTableLayoutView'));
this.userDefineAttr = this.entity && this.entity.customAttributes || []; this.userDefineAttr = this.entity && this.entity.customAttributes || [];
this.initialCall = false; this.initialCall = false;
this.swapItem = false, this.saveAttrItems = false; this.swapItem = false, this.saveAttrItems = false;
...@@ -136,6 +136,9 @@ define(['require', ...@@ -136,6 +136,9 @@ define(['require',
that.swapItem = false; that.swapItem = false;
that.saveAttrItems = false; that.saveAttrItems = false;
that.render(); that.render();
if (that.renderAuditTableLayoutView) {
that.renderAuditTableLayoutView();
}
}, },
error: function(e) { error: function(e) {
that.initialCall = false; that.initialCall = false;
......
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