Commit 60f878e5 by kevalbhatt

ATLAS-3657 : UI: changes for entity purge audits (Minor title changes)

parent 721fcb41
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<ul class="nav nav-tabs" data-id="tab-list"> <ul class="nav nav-tabs" data-id="tab-list">
<li role="businessMetadata" class="tab active"><a href="#tab-businessMetadata" aria-controls="tab-businessMetadata" role="tab" data-toggle="tab">Business Metadata</a></li> <li role="businessMetadata" class="tab active"><a href="#tab-businessMetadata" aria-controls="tab-businessMetadata" role="tab" data-toggle="tab">Business Metadata</a></li>
<li role="enum"><a href="#tab-enum" aria-controls="tab-enum" role="tab" data-toggle="tab">Enumerations</a></li> <li role="enum"><a href="#tab-enum" aria-controls="tab-enum" role="tab" data-toggle="tab">Enumerations</a></li>
<li role="admin"><a href="#tab-admin" aria-controls="tab-admin" role="tab" data-toggle="tab">Audits</a></li> <li role="audit"><a href="#tab-audit" aria-controls="tab-audit" role="tab" data-toggle="tab">Audits</a></li>
</ul> </ul>
</div> </div>
</div> </div>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<div id="r_enumTableLayoutView"> <div id="r_enumTableLayoutView">
</div> </div>
</div> </div>
<div id="tab-admin" role="admin" class="tab-pane animated fadeIn"> <div id="tab-audit" role="audit" class="tab-pane animated fadeIn">
<div id="r_adminTableLayoutView"> <div id="r_adminTableLayoutView">
</div> </div>
</div> </div>
......
...@@ -79,7 +79,6 @@ define(['require', ...@@ -79,7 +79,6 @@ define(['require',
this.limit = 25; this.limit = 25;
this.entityCollection.url = UrlLinks.adminApiUrl(); this.entityCollection.url = UrlLinks.adminApiUrl();
this.entityCollection.modelAttrName = "events"; this.entityCollection.modelAttrName = "events";
this.onlyAdmin = true;
this.commonTableOptions = { this.commonTableOptions = {
collection: this.entityCollection, collection: this.entityCollection,
includeFilter: false, includeFilter: false,
...@@ -152,7 +151,7 @@ define(['require', ...@@ -152,7 +151,7 @@ define(['require',
}] }]
}, },
onRender: function() { onRender: function() {
var str = '<option>All</option><option>Admin</option>'; var str = '<option>All</option><option>Purged</option>';
this.ui.adminType.html(str); this.ui.adminType.html(str);
this.ui.adminType.select2({}); this.ui.adminType.select2({});
this.ui.adminRegion.hide(); this.ui.adminRegion.hide();
...@@ -174,7 +173,7 @@ define(['require', ...@@ -174,7 +173,7 @@ define(['require',
"operator": "like", "operator": "like",
"attributeValue": "admin" "attributeValue": "admin"
}]; }];
if (!this.onlyAdmin) { if (this.onlyPurged === true) {
adminAttributes.push({ adminAttributes.push({
"attributeName": "operation", "attributeName": "operation",
"operator": "like", "operator": "like",
...@@ -281,7 +280,7 @@ define(['require', ...@@ -281,7 +280,7 @@ define(['require',
} else { } else {
adminValues = ''; adminValues = '';
} }
var adminText = '<div class="row"><div class="col-sm-12 attr-details admin-attr-details"><div class="col-sm-2">Admin Entities: </div><div class="col-sm-10">' + adminValues + '</div></div></div>'; var adminText = '<div class="row"><div class="col-sm-12 attr-details admin-attr-details"><div class="col-sm-2">Purged Entities: </div><div class="col-sm-10">' + adminValues + '</div></div></div>';
$(el).append($('<div>').html(adminText)); $(el).append($('<div>').html(adminText));
} }
...@@ -294,18 +293,7 @@ define(['require', ...@@ -294,18 +293,7 @@ define(['require',
operation: { operation: {
label: "Operation", label: "Operation",
cell: "String", cell: "String",
editable: false, editable: false
formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
if (rawValue === "PURGE" && model.attributes.params) {
var adminLength = model.attributes.result.replace('[', '').replace(']', '').split(',').length;
return adminLength === 1 ? adminLength + " entity purged." : adminLength + " entities purged.";
} else {
return "No entity purged.";
}
}
})
}, },
clientId: { clientId: {
label: "Client ID", label: "Client ID",
...@@ -336,7 +324,7 @@ define(['require', ...@@ -336,7 +324,7 @@ define(['require',
}, },
onClickAdminType: function(e, value) { onClickAdminType: function(e, value) {
this.onlyAdmin = e.currentTarget.value === "Admin" ? false : true; this.onlyPurged = e.currentTarget.value === "Purged";
this.getAdminCollection(); this.getAdminCollection();
}, },
onClickAdminEntity: function(e) { onClickAdminEntity: function(e) {
...@@ -348,7 +336,7 @@ define(['require', ...@@ -348,7 +336,7 @@ define(['require',
guid: $(e.target).text(), guid: $(e.target).text(),
}, },
modal = new Modal({ modal = new Modal({
title: "Admin Entity Details : " + obj.guid, title: "Purged Entity Details: " + obj.guid,
content: new AuditTableLayoutView(obj), content: new AuditTableLayoutView(obj),
mainClass: "modal-full-screen", mainClass: "modal-full-screen",
okCloses: true, okCloses: true,
......
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