Skip to content

A
atlas
Commit 1c07f93b by kevalbhatt
Options

ATLAS-3766:- UI:Atlas Admin Audit UI pagination is not working

parent a43b5488
Showing with 198 additions and 282 deletions
dashboardv2/public/css/scss/business-metadata.scss
...@@ -142,26 +142,6 @@ ...@@ -142,26 +142,6 @@
opacity: 0.2; opacity: 0.2;
} }
.business-metadata-details {
.backgrid {
td.expandable-content {
max-width: none;
background: #f8f8f8;
div {
table {
width: 100%;
}
}
}
tbody>tr:last-child>td {
border-bottom: none;
}
}
}
.business-metadata-attr-page { .business-metadata-attr-page {
.modal-footer { .modal-footer {
text-align: center; text-align: center;
......
dashboardv2/public/css/scss/table.scss
...@@ -213,6 +213,29 @@ tr.empty { ...@@ -213,6 +213,29 @@ tr.empty {
text-align: center; text-align: center;
} }
} }
.expandable {
.expandable-content {
max-width: none;
background: #f8f8f8;
div {
table {
width: 100%;
td {
display: table-cell;
}
tr:last-child>td {
border-bottom: none;
}
}
}
}
}
} }
td { td {
...@@ -255,8 +278,8 @@ td { ...@@ -255,8 +278,8 @@ td {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: center; justify-content: center;
}
.auditStatusContainer>div { &>div {
flex-grow: 1; flex-grow: 1;
}
} }
\ No newline at end of file
dashboardv2/public/js/templates/common/TableLayout_tmpl.html
...@@ -22,13 +22,6 @@ ...@@ -22,13 +22,6 @@
{{/unless}} {{/unless}}
</div> </div>
</div> </div>
{{#if includeAtlasPagination}}
<div class="row form-group pagination-box filter-box">
<div class="col-sm-4">
<span class="labelShowRecord pull-left" data-id="pageRecordText"> </span>
</div>
</div>
{{/if}}
<div class="position-relative thick-border"> <div class="position-relative thick-border">
<div data-id="r_tableList" class="table-responsive tableBorder"> </div> <div data-id="r_tableList" class="table-responsive tableBorder"> </div>
{{#if includeTableLoader}} {{#if includeTableLoader}}
...@@ -70,7 +63,10 @@ ...@@ -70,7 +63,10 @@
</div> </div>
{{/if}} {{#if includeAtlasPagination}} {{/if}} {{#if includeAtlasPagination}}
<div class="row pagination-box"> <div class="row pagination-box">
<div class="col-sm-offset-4 col-sm-8"> <div class="col-sm-4">
<span class="labelShowRecord pull-left" data-id="pageRecordText"> </span>
</div>
<div class="col-sm-8">
<div class="inline-content-fr"> <div class="inline-content-fr">
<div class="backgrid-paginator inline"> <div class="backgrid-paginator inline">
<ul class="" data-id="paginationDiv" style="display:none"> <ul class="" data-id="paginationDiv" style="display:none">
......
dashboardv2/public/js/utils/TableLayout.js
...@@ -267,7 +267,7 @@ define(['require', ...@@ -267,7 +267,7 @@ define(['require',
this.renderFooterRecords(this.collection.state); this.renderFooterRecords(this.collection.state);
} }
if (this.includeAtlasPagination) { if (this.includeAtlasPagination) {
this.renderAtlasPagination(collection, options); this.renderAtlasPagination(options);
} }
}, this); }, this);
......
dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js
...@@ -77,30 +77,28 @@ define(['require', ...@@ -77,30 +77,28 @@ define(['require',
_.extend(this, _.pick(options, 'searchTableFilters', 'entityDefCollection', 'enumDefCollection')); _.extend(this, _.pick(options, 'searchTableFilters', 'entityDefCollection', 'enumDefCollection'));
this.entityCollection = new VEntityList(); this.entityCollection = new VEntityList();
this.limit = 25; this.limit = 25;
this.offset = 0;
this.entityCollection.url = UrlLinks.adminApiUrl(); this.entityCollection.url = UrlLinks.adminApiUrl();
this.entityCollection.modelAttrName = "events"; this.entityCollection.modelAttrName = "events";
this.commonTableOptions = { this.commonTableOptions = {
collection: this.entityCollection, collection: this.entityCollection,
includeFilter: false, includePagination: false,
includePagination: true, includeAtlasPagination: true,
includeFooterRecords: true, includeFooterRecords: false,
includePageSize: true,
includeAtlasTableSorting: true,
includeTableLoader: true,
includeColumnManager: false, includeColumnManager: false,
gridOpts: { includeOrderAbleColumns: false,
className: "table table-hover backgrid table-quickMenu", includeSizeAbleColumns: false,
emptyText: 'No records found!' includeTableLoader: true,
includeAtlasPageSize: true,
includeAtlasTableSorting: true,
atlasPaginationOpts: {
limit: this.limit,
offset: this.offset,
fetchCollection: this.getAdminCollection.bind(this),
}, },
columnOpts: { gridOpts: {
opts: { emptyText: 'No Record found!',
initialColumnsVisible: null, className: 'table table-hover backgrid table-quickMenu colSort'
saveState: false
},
visibilityControlOpts: {
buttonTemplate: _.template("<button class='btn btn-action btn-sm pull-right'>Columns&nbsp<i class='fa fa-caret-down'></i></button>")
},
el: this.ui.colManager
}, },
filterOpts: {}, filterOpts: {},
paginatorOpts: {} paginatorOpts: {}
...@@ -116,6 +114,7 @@ define(['require', ...@@ -116,6 +114,7 @@ define(['require',
this.entityCollection.comparator = function(model) { this.entityCollection.comparator = function(model) {
return -model.get('timestamp'); return -model.get('timestamp');
} }
this.renderTableLayoutView();
}, },
bindEvents: function() {}, bindEvents: function() {},
closeAttributeModel: function() { closeAttributeModel: function() {
...@@ -172,10 +171,11 @@ define(['require', ...@@ -172,10 +171,11 @@ define(['require',
} }
if (isFilterValidate) { if (isFilterValidate) {
that.closeAttributeModel(); that.closeAttributeModel();
that.defaultPagination();
that.getAdminCollection(); that.getAdminCollection();
} }
}, },
getAdminCollection: function() { getAdminCollection: function(option) {
var that = this, var that = this,
options = { options = {
isDateParsed: true, isDateParsed: true,
...@@ -193,13 +193,12 @@ define(['require', ...@@ -193,13 +193,12 @@ define(['require',
that.searchTableFilters["adminAttrFilters"] = CommonViewFunction.attributeFilter.generateUrl({ value: auditQueryParam, formatedDateToLong: true }); that.searchTableFilters["adminAttrFilters"] = CommonViewFunction.attributeFilter.generateUrl({ value: auditQueryParam, formatedDateToLong: true });
this.$('.fontLoader').show(); this.$('.fontLoader').show();
this.$('.tableOverlay').show(); this.$('.tableOverlay').show();
$.extend(that.entityCollection.queryParams, { limit: this.limit, offset: 0, auditFilters: adminParam }); $.extend(that.entityCollection.queryParams, { auditFilters: adminParam });
var apiObj = { var apiObj = {
sort: false, sort: false,
data: that.entityCollection.queryParams, data: that.entityCollection.queryParams,
success: function(dataOrCollection, response) { success: function(dataOrCollection, response) {
that.entityCollection.fullCollection.reset(dataOrCollection); that.entityCollection.fullCollection.reset(dataOrCollection, option);
that.renderTableLayoutView();
that.$('.fontLoader').hide(); that.$('.fontLoader').hide();
that.$('.tableOverlay').hide(); that.$('.tableOverlay').hide();
that.$('.auditTable').show(); that.$('.auditTable').show();
...@@ -296,15 +295,20 @@ define(['require', ...@@ -296,15 +295,20 @@ define(['require',
}, this.entityCollection); }, this.entityCollection);
}, },
defaultPagination: function() {
$.extend(this.entityCollection.queryParams, { limit: this.limit, offset: this.offset });
this.renderTableLayoutView();
},
onClickAdminType: function(e, value) { onClickAdminType: function(e, value) {
this.onlyPurged = e.currentTarget.value === "Purged"; this.onlyPurged = e.currentTarget.value === "Purged";
this.defaultPagination();
this.getAdminCollection(); this.getAdminCollection();
}, },
onClickAdminEntity: function(e) { onClickAdminEntity: function(e) {
var that = this; var that = this;
require([ require([
'modules/Modal', 'views/audit/AuditTableLayoutView', 'views/audit/CreateAuditTableLayoutView', 'modules/Modal', 'views/audit/AuditTableLayoutView'
], function(Modal, AuditTableLayoutView, CreateAuditTableLayoutView) { ], function(Modal, AuditTableLayoutView) {
var obj = { var obj = {
guid: $(e.target).text(), guid: $(e.target).text(),
}, },
......
dashboardv2/public/js/views/audit/AuditTableLayoutView.js
...@@ -39,7 +39,6 @@ define(['require', ...@@ -39,7 +39,6 @@ define(['require',
/** ui selector cache */ /** ui selector cache */
ui: { ui: {
auditCreate: "[data-id='auditCreate']",
previousAuditData: "[data-id='previousAuditData']", previousAuditData: "[data-id='previousAuditData']",
nextAuditData: "[data-id='nextAuditData']", nextAuditData: "[data-id='nextAuditData']",
pageRecordText: "[data-id='pageRecordText']", pageRecordText: "[data-id='pageRecordText']",
...@@ -48,7 +47,6 @@ define(['require', ...@@ -48,7 +47,6 @@ define(['require',
/** ui events hash */ /** ui events hash */
events: function() { events: function() {
var events = {}; var events = {};
events["click " + this.ui.auditCreate] = "onClickAuditCreate";
events["click " + this.ui.nextAuditData] = "onClickNextAuditData"; events["click " + this.ui.nextAuditData] = "onClickNextAuditData";
events["click " + this.ui.previousAuditData] = "onClickPreviousAuditData"; events["click " + this.ui.previousAuditData] = "onClickPreviousAuditData";
return events; return events;
...@@ -237,34 +235,6 @@ define(['require', ...@@ -237,34 +235,6 @@ define(['require',
}, this.entityCollection); }, this.entityCollection);
}, },
onClickAuditCreate: function(e) {
var that = this;
require([
'modules/Modal',
'views/audit/CreateAuditTableLayoutView',
], function(Modal, CreateAuditTableLayoutView) {
that.action = $(e.target).data("action");
$(e.target).attr('disabled', true);
var eventModel = that.entityCollection.fullCollection.findWhere({ 'eventKey': $(e.currentTarget).data('modalid') }).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 });
var modal = new Modal({
title: that.action,
content: view,
okCloses: true,
showFooter: true,
}).open();
view.on('closeModal', function() {
modal.trigger('cancel');
});
view.$el.on('click', 'td a', function() {
modal.trigger('cancel');
});
view.on('hidden.bs.modal', function() {
that.$('.btn-action[data-id="auditCreate"]').attr('disabled', false);
});
});
},
onClickNextAuditData: function() { onClickNextAuditData: function() {
var that = this; var that = this;
this.ui.previousAuditData.removeAttr("disabled"); this.ui.previousAuditData.removeAttr("disabled");
......
dashboardv2/public/js/views/audit/CreateAuditTableLayoutView.js
...@@ -59,7 +59,6 @@ define(['require', ...@@ -59,7 +59,6 @@ define(['require',
/** ui events hash */ /** ui events hash */
events: function() { events: function() {
var events = {}; var events = {};
events["click " + this.ui.auditCreate] = "onClickAuditCreate";
return events; return events;
}, },
/** /**
......
dashboardv2/public/js/views/audit/ReplicationAuditTableLayoutView.js
...@@ -41,13 +41,10 @@ define(['require', ...@@ -41,13 +41,10 @@ define(['require',
}, },
/** ui selector cache */ /** ui selector cache */
ui: { ui: {},
auditDetail: "[data-action='audit_detail']",
},
/** ui events hash */ /** ui events hash */
events: function() { events: function() {
var events = {} var events = {}
events["click " + this.ui.auditDetail] = "onClickAuditDetails";
return events; return events;
}, },
/** /**
...@@ -70,6 +67,8 @@ define(['require', ...@@ -70,6 +67,8 @@ define(['require',
includeOrderAbleColumns: false, includeOrderAbleColumns: false,
includeSizeAbleColumns: false, includeSizeAbleColumns: false,
includeTableLoader: true, includeTableLoader: true,
includeAtlasPageSize: true,
includeAtlasTableSorting: true,
atlasPaginationOpts: { atlasPaginationOpts: {
limit: this.limit, limit: this.limit,
offset: this.offset, offset: this.offset,
...@@ -123,7 +122,21 @@ define(['require', ...@@ -123,7 +122,21 @@ define(['require',
getColumn: function(argument) { getColumn: function(argument) {
var that = this, var that = this,
col = {}; col = {};
col['tools'] = {
label: "",
cell: "html",
editable: false,
sortable: false,
fixWidth: "20",
cell: Backgrid.ExpandableCell,
accordion: false,
expand: function(el, model) {
el.attr('colspan', '6');
var result = JSON.parse(model.get("resultSummary")),
view = "<table class='table table-bordered table-striped'>" + CommonViewFunction.propertyTable({ scope: that, valueObject: result, attributeDefs: that.attributeDefs }) + "</table>";
$(el).append($('<div>').html(view));
}
};
col['operation'] = { col['operation'] = {
label: "Operation", label: "Operation",
cell: "string", cell: "string",
...@@ -175,46 +188,8 @@ define(['require', ...@@ -175,46 +188,8 @@ define(['require',
} }
}) })
}; };
col['tools'] = {
label: "Tools",
cell: "html",
editable: false,
sortable: false,
formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
return '<div class="btn btn-action btn-sm" data-action="audit_detail" data-guid="' + model.get('guid') + '">Detail</div>';
}
})
};
return this.searchCollection.constructor.getTableCols(col, this.searchCollection); return this.searchCollection.constructor.getTableCols(col, this.searchCollection);
}, }
onClickAuditDetails: function(e) {
var that = this;
require([
'modules/Modal',
'views/audit/CreateAuditTableLayoutView',
], function(Modal, CreateAuditTableLayoutView) {
$(e.target).attr('disabled', true);
var guid = $(e.target).data("guid"),
model = that.searchCollection.fullCollection.findWhere({ 'guid': guid }),
result = JSON.parse(model.get("resultSummary")),
view = "<table class='table table-bordered table-striped'>" + CommonViewFunction.propertyTable({ scope: that, valueObject: result, attributeDefs: that.attributeDefs }) + "</table>";
var modal = new Modal({
title: model.get("operation") + " Details",
content: view,
contentHtml: true,
okCloses: true,
showFooter: true,
});
modal.open();
modal.on('closeModal', function() {
modal.trigger('cancel');
});
modal.on('hidden.bs.modal', function() {
that.$('.btn-action[data-action="audit_detail"]').attr('disabled', false);
});
});
},
}); });
return ReplicationAuditTableLayoutView; return ReplicationAuditTableLayoutView;
}); });
\ No newline at end of file
dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
...@@ -482,9 +482,11 @@ define(['require', ...@@ -482,9 +482,11 @@ define(['require',
onClickAddTermBtn: function(e) { onClickAddTermBtn: function(e) {
var that = this, var that = this,
entityGuid = that.id, entityGuid = that.id,
associatedTerms = this.collection.first().get('entity').relationshipAttributes.meanings; entityObj = this.collection.first().get('entity'),
associatedTerms = [];
if (entityObj && entityObj.relationshipAttributes && entityObj.relationshipAttributes.meanings) {
associatedTerms = entityObj.relationshipAttributes.meanings;
}
require(['views/glossary/AssignTermLayoutView'], function(AssignTermLayoutView) { require(['views/glossary/AssignTermLayoutView'], function(AssignTermLayoutView) {
var view = new AssignTermLayoutView({ var view = new AssignTermLayoutView({
guid: that.id, guid: that.id,
......
dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
...@@ -142,9 +142,11 @@ define(['require', ...@@ -142,9 +142,11 @@ define(['require',
that[$(this).find('a').data('fn')](e) that[$(this).find('a').data('fn')](e)
}); });
} }
this.importVent.on("Import:Glossary:Update", function(options) { if (this.importVent) {
that.getGlossary(); this.importVent.on("Import:Glossary:Update", function(options) {
}); that.getGlossary();
});
}
}, },
onRender: function() { onRender: function() {
this.changeLoaderState(true); this.changeLoaderState(true);
......
dashboardv2/public/js/views/site/Header.js
...@@ -299,10 +299,12 @@ define(['require', ...@@ -299,10 +299,12 @@ define(['require',
], function(ImportLayoutView) { ], function(ImportLayoutView) {
var view = new ImportLayoutView({ var view = new ImportLayoutView({
callback: function() { callback: function() {
if (isGlossary) { if (that.options.importVent) {
that.options.importVent.trigger("Import:Glossary:Update"); if (isGlossary) {
} else { that.options.importVent.trigger("Import:Glossary:Update");
that.options.importVent.trigger("Import:BM:Update"); } else {
that.options.importVent.trigger("Import:BM:Update");
}
} }
}, },
isGlossary: isGlossary isGlossary: isGlossary
......
dashboardv2/public/js/views/site/Statistics.js
...@@ -101,12 +101,12 @@ define(['require', ...@@ -101,12 +101,12 @@ define(['require',
that.fetchMetricData({ update: true }); that.fetchMetricData({ update: true });
} }
}] }]
}).open(); });
modal.on('closeModal', function() { modal.on('closeModal', function() {
modal.trigger('cancel'); modal.trigger('cancel');
}); });
this.modal = modal; this.modal = modal;
modal.open();
} }
}, },
......
dashboardv3/public/css/scss/business-metadata.scss
...@@ -142,26 +142,6 @@ ...@@ -142,26 +142,6 @@
opacity: 0.2; opacity: 0.2;
} }
.business-metadata-details {
.backgrid {
td.expandable-content {
max-width: none;
background: #f8f8f8;
div {
table {
width: 100%;
}
}
}
tbody>tr:last-child>td {
border-bottom: none;
}
}
}
.business-metadata-attr-page { .business-metadata-attr-page {
.modal-footer { .modal-footer {
text-align: center; text-align: center;
......
dashboardv3/public/css/scss/table.scss
...@@ -213,6 +213,29 @@ tr.empty { ...@@ -213,6 +213,29 @@ tr.empty {
text-align: center; text-align: center;
} }
} }
.expandable {
.expandable-content {
max-width: none;
background: #f8f8f8;
div {
table {
width: 100%;
td {
display: table-cell;
}
tr:last-child>td {
border-bottom: none;
}
}
}
}
}
} }
td { td {
...@@ -255,8 +278,8 @@ td { ...@@ -255,8 +278,8 @@ td {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: center; justify-content: center;
}
.auditStatusContainer>div { &>div {
flex-grow: 1; flex-grow: 1;
}
} }
\ No newline at end of file
dashboardv3/public/css/scss/theme.scss
...@@ -55,6 +55,14 @@ body { ...@@ -55,6 +55,14 @@ body {
} }
} }
.detail-page {
.back-button {
top: 15px;
font-size: 45px;
}
}
.atlas-page-header { .atlas-page-header {
height: 70px; height: 70px;
background-color: #d3e0eb; background-color: #d3e0eb;
......
dashboardv3/public/js/templates/common/TableLayout_tmpl.html
...@@ -22,13 +22,6 @@ ...@@ -22,13 +22,6 @@
{{/unless}} {{/unless}}
</div> </div>
</div> </div>
{{#if includeAtlasPagination}}
<div class="row form-group pagination-box filter-box">
<div class="col-sm-4">
<span class="labelShowRecord pull-left" data-id="pageRecordText"> </span>
</div>
</div>
{{/if}}
<div class="position-relative thick-border"> <div class="position-relative thick-border">
<div data-id="r_tableList" class="table-responsive tableBorder"> </div> <div data-id="r_tableList" class="table-responsive tableBorder"> </div>
{{#if includeTableLoader}} {{#if includeTableLoader}}
...@@ -70,7 +63,10 @@ ...@@ -70,7 +63,10 @@
</div> </div>
{{/if}} {{#if includeAtlasPagination}} {{/if}} {{#if includeAtlasPagination}}
<div class="row pagination-box"> <div class="row pagination-box">
<div class="col-sm-offset-4 col-sm-8"> <div class="col-sm-4">
<span class="labelShowRecord pull-left" data-id="pageRecordText"> </span>
</div>
<div class="col-sm-8">
<div class="inline-content-fr"> <div class="inline-content-fr">
<div class="backgrid-paginator inline"> <div class="backgrid-paginator inline">
<ul class="" data-id="paginationDiv" style="display:none"> <ul class="" data-id="paginationDiv" style="display:none">
......
dashboardv3/public/js/utils/TableLayout.js
...@@ -267,7 +267,7 @@ define(['require', ...@@ -267,7 +267,7 @@ define(['require',
this.renderFooterRecords(this.collection.state); this.renderFooterRecords(this.collection.state);
} }
if (this.includeAtlasPagination) { if (this.includeAtlasPagination) {
this.renderAtlasPagination(collection, options); this.renderAtlasPagination(options);
} }
}, this); }, this);
......
dashboardv3/public/js/views/audit/AdminAuditTableLayoutView.js
...@@ -77,30 +77,28 @@ define(['require', ...@@ -77,30 +77,28 @@ define(['require',
_.extend(this, _.pick(options, 'searchTableFilters', 'entityDefCollection', 'enumDefCollection')); _.extend(this, _.pick(options, 'searchTableFilters', 'entityDefCollection', 'enumDefCollection'));
this.entityCollection = new VEntityList(); this.entityCollection = new VEntityList();
this.limit = 25; this.limit = 25;
this.offset = 0;
this.entityCollection.url = UrlLinks.adminApiUrl(); this.entityCollection.url = UrlLinks.adminApiUrl();
this.entityCollection.modelAttrName = "events"; this.entityCollection.modelAttrName = "events";
this.commonTableOptions = { this.commonTableOptions = {
collection: this.entityCollection, collection: this.entityCollection,
includeFilter: false, includePagination: false,
includePagination: true, includeAtlasPagination: true,
includeFooterRecords: true, includeFooterRecords: false,
includePageSize: true,
includeAtlasTableSorting: true,
includeTableLoader: true,
includeColumnManager: false, includeColumnManager: false,
gridOpts: { includeOrderAbleColumns: false,
className: "table table-hover backgrid table-quickMenu", includeSizeAbleColumns: false,
emptyText: 'No records found!' includeTableLoader: true,
includeAtlasPageSize: true,
includeAtlasTableSorting: true,
atlasPaginationOpts: {
limit: this.limit,
offset: this.offset,
fetchCollection: this.getAdminCollection.bind(this),
}, },
columnOpts: { gridOpts: {
opts: { emptyText: 'No Record found!',
initialColumnsVisible: null, className: 'table table-hover backgrid table-quickMenu colSort'
saveState: false
},
visibilityControlOpts: {
buttonTemplate: _.template("<button class='btn btn-action btn-sm pull-right'>Columns&nbsp<i class='fa fa-caret-down'></i></button>")
},
el: this.ui.colManager
}, },
filterOpts: {}, filterOpts: {},
paginatorOpts: {} paginatorOpts: {}
...@@ -116,6 +114,7 @@ define(['require', ...@@ -116,6 +114,7 @@ define(['require',
this.entityCollection.comparator = function(model) { this.entityCollection.comparator = function(model) {
return -model.get('timestamp'); return -model.get('timestamp');
} }
this.renderTableLayoutView();
}, },
bindEvents: function() {}, bindEvents: function() {},
closeAttributeModel: function() { closeAttributeModel: function() {
...@@ -172,10 +171,11 @@ define(['require', ...@@ -172,10 +171,11 @@ define(['require',
} }
if (isFilterValidate) { if (isFilterValidate) {
that.closeAttributeModel(); that.closeAttributeModel();
that.defaultPagination();
that.getAdminCollection(); that.getAdminCollection();
} }
}, },
getAdminCollection: function() { getAdminCollection: function(option) {
var that = this, var that = this,
options = { options = {
isDateParsed: true, isDateParsed: true,
...@@ -193,13 +193,12 @@ define(['require', ...@@ -193,13 +193,12 @@ define(['require',
that.searchTableFilters["adminAttrFilters"] = CommonViewFunction.attributeFilter.generateUrl({ value: auditQueryParam, formatedDateToLong: true }); that.searchTableFilters["adminAttrFilters"] = CommonViewFunction.attributeFilter.generateUrl({ value: auditQueryParam, formatedDateToLong: true });
this.$('.fontLoader').show(); this.$('.fontLoader').show();
this.$('.tableOverlay').show(); this.$('.tableOverlay').show();
$.extend(that.entityCollection.queryParams, { limit: this.limit, offset: 0, auditFilters: adminParam }); $.extend(that.entityCollection.queryParams, { auditFilters: adminParam });
var apiObj = { var apiObj = {
sort: false, sort: false,
data: that.entityCollection.queryParams, data: that.entityCollection.queryParams,
success: function(dataOrCollection, response) { success: function(dataOrCollection, response) {
that.entityCollection.fullCollection.reset(dataOrCollection); that.entityCollection.fullCollection.reset(dataOrCollection, option);
that.renderTableLayoutView();
that.$('.fontLoader').hide(); that.$('.fontLoader').hide();
that.$('.tableOverlay').hide(); that.$('.tableOverlay').hide();
that.$('.auditTable').show(); that.$('.auditTable').show();
...@@ -296,15 +295,20 @@ define(['require', ...@@ -296,15 +295,20 @@ define(['require',
}, this.entityCollection); }, this.entityCollection);
}, },
defaultPagination: function() {
$.extend(this.entityCollection.queryParams, { limit: this.limit, offset: this.offset });
this.renderTableLayoutView();
},
onClickAdminType: function(e, value) { onClickAdminType: function(e, value) {
this.onlyPurged = e.currentTarget.value === "Purged"; this.onlyPurged = e.currentTarget.value === "Purged";
this.defaultPagination();
this.getAdminCollection(); this.getAdminCollection();
}, },
onClickAdminEntity: function(e) { onClickAdminEntity: function(e) {
var that = this; var that = this;
require([ require([
'modules/Modal', 'views/audit/AuditTableLayoutView', 'views/audit/CreateAuditTableLayoutView', 'modules/Modal', 'views/audit/AuditTableLayoutView'
], function(Modal, AuditTableLayoutView, CreateAuditTableLayoutView) { ], function(Modal, AuditTableLayoutView) {
var obj = { var obj = {
guid: $(e.target).text(), guid: $(e.target).text(),
}, },
......
dashboardv3/public/js/views/audit/AuditTableLayoutView.js
...@@ -39,7 +39,6 @@ define(['require', ...@@ -39,7 +39,6 @@ define(['require',
/** ui selector cache */ /** ui selector cache */
ui: { ui: {
auditCreate: "[data-id='auditCreate']",
previousAuditData: "[data-id='previousAuditData']", previousAuditData: "[data-id='previousAuditData']",
nextAuditData: "[data-id='nextAuditData']", nextAuditData: "[data-id='nextAuditData']",
pageRecordText: "[data-id='pageRecordText']", pageRecordText: "[data-id='pageRecordText']",
...@@ -48,7 +47,6 @@ define(['require', ...@@ -48,7 +47,6 @@ define(['require',
/** ui events hash */ /** ui events hash */
events: function() { events: function() {
var events = {}; var events = {};
events["click " + this.ui.auditCreate] = "onClickAuditCreate";
events["click " + this.ui.nextAuditData] = "onClickNextAuditData"; events["click " + this.ui.nextAuditData] = "onClickNextAuditData";
events["click " + this.ui.previousAuditData] = "onClickPreviousAuditData"; events["click " + this.ui.previousAuditData] = "onClickPreviousAuditData";
return events; return events;
...@@ -237,34 +235,6 @@ define(['require', ...@@ -237,34 +235,6 @@ define(['require',
}, this.entityCollection); }, this.entityCollection);
}, },
onClickAuditCreate: function(e) {
var that = this;
require([
'modules/Modal',
'views/audit/CreateAuditTableLayoutView',
], function(Modal, CreateAuditTableLayoutView) {
that.action = $(e.target).data("action");
$(e.target).attr('disabled', true);
var eventModel = that.entityCollection.fullCollection.findWhere({ 'eventKey': $(e.currentTarget).data('modalid') }).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 });
var modal = new Modal({
title: that.action,
content: view,
okCloses: true,
showFooter: true,
}).open();
view.on('closeModal', function() {
modal.trigger('cancel');
});
view.$el.on('click', 'td a', function() {
modal.trigger('cancel');
});
view.on('hidden.bs.modal', function() {
that.$('.btn-action[data-id="auditCreate"]').attr('disabled', false);
});
});
},
onClickNextAuditData: function() { onClickNextAuditData: function() {
var that = this; var that = this;
this.ui.previousAuditData.removeAttr("disabled"); this.ui.previousAuditData.removeAttr("disabled");
......
dashboardv3/public/js/views/audit/CreateAuditTableLayoutView.js
...@@ -59,7 +59,6 @@ define(['require', ...@@ -59,7 +59,6 @@ define(['require',
/** ui events hash */ /** ui events hash */
events: function() { events: function() {
var events = {}; var events = {};
events["click " + this.ui.auditCreate] = "onClickAuditCreate";
return events; return events;
}, },
/** /**
......
dashboardv3/public/js/views/audit/ReplicationAuditTableLayoutView.js
...@@ -41,13 +41,10 @@ define(['require', ...@@ -41,13 +41,10 @@ define(['require',
}, },
/** ui selector cache */ /** ui selector cache */
ui: { ui: {},
auditDetail: "[data-action='audit_detail']",
},
/** ui events hash */ /** ui events hash */
events: function() { events: function() {
var events = {} var events = {}
events["click " + this.ui.auditDetail] = "onClickAuditDetails";
return events; return events;
}, },
/** /**
...@@ -70,6 +67,8 @@ define(['require', ...@@ -70,6 +67,8 @@ define(['require',
includeOrderAbleColumns: false, includeOrderAbleColumns: false,
includeSizeAbleColumns: false, includeSizeAbleColumns: false,
includeTableLoader: true, includeTableLoader: true,
includeAtlasPageSize: true,
includeAtlasTableSorting: true,
atlasPaginationOpts: { atlasPaginationOpts: {
limit: this.limit, limit: this.limit,
offset: this.offset, offset: this.offset,
...@@ -123,7 +122,21 @@ define(['require', ...@@ -123,7 +122,21 @@ define(['require',
getColumn: function(argument) { getColumn: function(argument) {
var that = this, var that = this,
col = {}; col = {};
col['tools'] = {
label: "",
cell: "html",
editable: false,
sortable: false,
fixWidth: "20",
cell: Backgrid.ExpandableCell,
accordion: false,
expand: function(el, model) {
el.attr('colspan', '6');
var result = JSON.parse(model.get("resultSummary")),
view = "<table class='table table-bordered table-striped'>" + CommonViewFunction.propertyTable({ scope: that, valueObject: result, attributeDefs: that.attributeDefs }) + "</table>";
$(el).append($('<div>').html(view));
}
};
col['operation'] = { col['operation'] = {
label: "Operation", label: "Operation",
cell: "string", cell: "string",
...@@ -175,46 +188,8 @@ define(['require', ...@@ -175,46 +188,8 @@ define(['require',
} }
}) })
}; };
col['tools'] = {
label: "Tools",
cell: "html",
editable: false,
sortable: false,
formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
return '<div class="btn btn-action btn-sm" data-action="audit_detail" data-guid="' + model.get('guid') + '">Detail</div>';
}
})
};
return this.searchCollection.constructor.getTableCols(col, this.searchCollection); return this.searchCollection.constructor.getTableCols(col, this.searchCollection);
}, }
onClickAuditDetails: function(e) {
var that = this;
require([
'modules/Modal',
'views/audit/CreateAuditTableLayoutView',
], function(Modal, CreateAuditTableLayoutView) {
$(e.target).attr('disabled', true);
var guid = $(e.target).data("guid"),
model = that.searchCollection.fullCollection.findWhere({ 'guid': guid }),
result = JSON.parse(model.get("resultSummary")),
view = "<table class='table table-bordered table-striped'>" + CommonViewFunction.propertyTable({ scope: that, valueObject: result, attributeDefs: that.attributeDefs }) + "</table>";
var modal = new Modal({
title: model.get("operation") + " Details",
content: view,
contentHtml: true,
okCloses: true,
showFooter: true,
});
modal.open();
modal.on('closeModal', function() {
modal.trigger('cancel');
});
modal.on('hidden.bs.modal', function() {
that.$('.btn-action[data-action="audit_detail"]').attr('disabled', false);
});
});
},
}); });
return ReplicationAuditTableLayoutView; return ReplicationAuditTableLayoutView;
}); });
\ No newline at end of file
dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js
...@@ -486,9 +486,11 @@ define(['require', ...@@ -486,9 +486,11 @@ define(['require',
onClickAddTermBtn: function(e) { onClickAddTermBtn: function(e) {
var that = this, var that = this,
entityGuid = that.id, entityGuid = that.id,
associatedTerms = this.collection.first().get('entity').relationshipAttributes.meanings; entityObj = this.collection.first().get('entity'),
associatedTerms = [];
if (entityObj && entityObj.relationshipAttributes && entityObj.relationshipAttributes.meanings) {
associatedTerms = entityObj.relationshipAttributes.meanings;
}
require(['views/glossary/AssignTermLayoutView'], function(AssignTermLayoutView) { require(['views/glossary/AssignTermLayoutView'], function(AssignTermLayoutView) {
var view = new AssignTermLayoutView({ var view = new AssignTermLayoutView({
guid: that.id, guid: that.id,
......
dashboardv3/public/js/views/site/Statistics.js
...@@ -83,18 +83,20 @@ define(['require', ...@@ -83,18 +83,20 @@ define(['require',
that.fetchMetricData({ update: true }); that.fetchMetricData({ update: true });
} }
}] }]
}).open(); });
modal.on('closeModal', function() { modal.on('closeModal', function() {
modal.trigger('cancel'); modal.trigger('cancel');
}); });
this.modal = modal; this.modal = modal;
modal.open();
}, },
bindEvents: function() { bindEvents: function() {
var that = this; var that = this;
this.$el.on('click', '.linkClicked', function() { if (this.modal) {
that.modal.close(); this.$el.on('click', '.linkClicked', function() {
}) that.modal.close();
})
}
}, },
fetchMetricData: function(options) { fetchMetricData: function(options) {
var that = this; var that = this;
......
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