ATLAS-3766:- UI:Atlas Admin Audit UI pagination is not working
diff --git a/dashboardv2/public/css/scss/business-metadata.scss b/dashboardv2/public/css/scss/business-metadata.scss
index 6502fb5..9507b83 100644
--- a/dashboardv2/public/css/scss/business-metadata.scss
+++ b/dashboardv2/public/css/scss/business-metadata.scss
@@ -142,26 +142,6 @@
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 {
.modal-footer {
text-align: center;
diff --git a/dashboardv2/public/css/scss/table.scss b/dashboardv2/public/css/scss/table.scss
index 2ee30a2..669bcfc 100644
--- a/dashboardv2/public/css/scss/table.scss
+++ b/dashboardv2/public/css/scss/table.scss
@@ -213,6 +213,29 @@
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 {
@@ -255,8 +278,8 @@
display: flex;
flex-wrap: wrap;
justify-content: center;
-}
-.auditStatusContainer>div {
- flex-grow: 1;
+ &>div {
+ flex-grow: 1;
+ }
}
\ No newline at end of file
diff --git a/dashboardv2/public/js/router/Router.js b/dashboardv2/public/js/router/Router.js
index 68c5fc0..9172aea 100644
--- a/dashboardv2/public/js/router/Router.js
+++ b/dashboardv2/public/js/router/Router.js
@@ -70,6 +70,10 @@
'metricCollection': this.metricCollection,
'businessMetadataDefCollection': this.businessMetadataDefCollection
}
+ this.ventObj = {
+ searchVent: this.searchVent,
+ importVent: this.importVent
+ }
this.sharedObj = {
searchTableColumns: {},
glossary: {
@@ -87,8 +91,7 @@
require([
'views/site/Statistics',
], function(Statistics) {
- new Statistics(_.extend({}, that.preFetchedCollectionLists,
- that.sharedObj));
+ new Statistics(_.extend({}, that.preFetchedCollectionLists, that.sharedObj, that.ventObj));
});
});
$('body').on('click', 'li.aboutAtlas', function() {
@@ -139,7 +142,7 @@
this.view.currentView.manualRender();
},
render: function() {
- return new Header(_.extend({ importVent: that.importVent }, that.preFetchedCollectionLists, that.sharedObj, options));
+ return new Header(_.extend({}, that.preFetchedCollectionLists, that.sharedObj, that.ventObj, options));
}
}
},
@@ -153,7 +156,8 @@
'collection/VEntityList'
], function(Header, DetailPageLayoutView, SideNavLayoutView, VEntityList) {
this.entityCollection = new VEntityList([], {});
- var paramObj = Utils.getUrlState.getQueryParams();
+ var paramObj = Utils.getUrlState.getQueryParams(),
+ options = _.extend({}, that.preFetchedCollectionLists, that.sharedObj, that.ventObj);
that.renderViewIfNotExists(that.getHeaderOptions(Header));
that.renderViewIfNotExists({
view: App.rSideNav,
@@ -161,16 +165,10 @@
this.view.currentView.selectTab();
},
render: function() {
- return new SideNavLayoutView(
- _.extend({}, that.preFetchedCollectionLists, that.sharedObj)
- );
+ return new SideNavLayoutView(options);
}
});
- App.rNContent.show(new DetailPageLayoutView(_.extend({
- 'collection': this.entityCollection,
- 'id': id,
- 'value': paramObj
- }, that.preFetchedCollectionLists, that.sharedObj)));
+ App.rNContent.show(new DetailPageLayoutView(_.extend({ 'collection': this.entityCollection, 'id': id, 'value': paramObj }, options)));
this.entityCollection.url = UrlLinks.entitiesApiUrl({ guid: id, minExtInfo: true });
this.entityCollection.fetch({ reset: true });
});
@@ -184,7 +182,8 @@
'views/tag/TagDetailLayoutView',
], function(Header, SideNavLayoutView, TagDetailLayoutView) {
var paramObj = Utils.getUrlState.getQueryParams(),
- url = Utils.getUrlState.getQueryUrl().queyParams[0];
+ url = Utils.getUrlState.getQueryUrl().queyParams[0],
+ options = _.extend({ 'tag': tagName, 'value': paramObj }, that.preFetchedCollectionLists, that.sharedObj, that.ventObj);
that.renderViewIfNotExists(that.getHeaderOptions(Header));
that.renderViewIfNotExists({
view: App.rSideNav,
@@ -207,12 +206,7 @@
updateTabState: true
});
}
- return new SideNavLayoutView(
- _.extend({
- 'tag': tagName,
- 'value': paramObj
- }, that.preFetchedCollectionLists, that.sharedObj)
- );
+ return new SideNavLayoutView(options);
}
});
if (tagName) {
@@ -221,12 +215,7 @@
if (paramObj && paramObj.dlttag) {
return false;
}
- App.rNContent.show(new TagDetailLayoutView(
- _.extend({
- 'tag': tagName,
- 'value': paramObj
- }, that.preFetchedCollectionLists, that.sharedObj)
- ));
+ App.rNContent.show(new TagDetailLayoutView(options));
}
});
},
@@ -238,9 +227,9 @@
'views/glossary/GlossaryDetailLayoutView',
'views/site/SideNavLayoutView'
], function(Header, GlossaryDetailLayoutView, SideNavLayoutView) {
- var paramObj = Utils.getUrlState.getQueryParams();
+ var paramObj = Utils.getUrlState.getQueryParams(),
+ options = _.extend({ 'guid': id, 'value': paramObj }, that.preFetchedCollectionLists, that.sharedObj, that.ventObj);
that.renderViewIfNotExists(that.getHeaderOptions(Header));
- var options = _.extend({}, that.preFetchedCollectionLists, that.sharedObj, { 'guid': id, 'value': paramObj, importVent: that.importVent })
that.renderViewIfNotExists({
view: App.rSideNav,
manualRender: function() {
@@ -255,115 +244,6 @@
});
}
},
- commonAction: function() {
- var that = this;
- require([
- 'views/site/Header',
- 'views/site/SideNavLayoutView',
- 'views/search/SearchDetailLayoutView',
- ], function(Header, SideNavLayoutView, SearchDetailLayoutView) {
- var paramObj = Utils.getUrlState.getQueryParams();
- that.renderViewIfNotExists(that.getHeaderOptions(Header));
- that.renderViewIfNotExists({
- view: App.rSideNav,
- manualRender: function() {
- this.view.currentView.selectTab();
- if (Utils.getUrlState.isTagTab()) {
- this.view.currentView.RTagLayoutView.currentView.manualRender();
- } else if (Utils.getUrlState.isGlossaryTab()) {
- this.view.currentView.RGlossaryLayoutView.currentView.manualRender(_.extend({ "isTrigger": true, "value": paramObj }));
- }
- },
- render: function() {
- return new SideNavLayoutView(
- _.extend({
- 'searchVent': that.searchVent,
- 'importVent': that.importVent
- }, that.preFetchedCollectionLists, that.sharedObj)
- )
- }
- });
-
- if (Globals.entityCreate && Utils.getUrlState.isSearchTab()) {
- App.rNContent.show(new SearchDetailLayoutView(
- _.extend({
- 'value': paramObj,
- 'initialView': true,
- 'searchVent': that.searchVent
- }, that.preFetchedCollectionLists, that.sharedObj)
- ));
- } else {
- if (App.rNContent.currentView) {
- App.rNContent.currentView.destroy();
- } else {
- App.rNContent.$el.empty();
- }
- }
- });
- },
- administrator: function() {
- var that = this;
- require(["views/site/Header", "views/site/SideNavLayoutView", 'views/administrator/AdministratorLayoutView'], function(Header, SideNavLayoutView, AdministratorLayoutView) {
- var value = Utils.getUrlState.getQueryParams(),
- paramObj = Utils.getUrlState.getQueryParams();
- that.renderViewIfNotExists(that.getHeaderOptions(Header));
- that.renderViewIfNotExists({
- view: App.rSideNav,
- manualRender: function() {
- this.view.currentView.selectTab();
- if (Utils.getUrlState.isTagTab()) {
- this.view.currentView.RTagLayoutView.currentView.manualRender();
- } else if (Utils.getUrlState.isGlossaryTab()) {
- this.view.currentView.RGlossaryLayoutView.currentView.manualRender(_.extend({ "isTrigger": true }, { "value": paramObj }));
- }
- },
- render: function() {
- return new SideNavLayoutView(
- _.extend({
- 'searchVent': that.searchVent
- }, that.preFetchedCollectionLists, that.sharedObj)
- )
- }
- });
- paramObj = _.extend({ value: value, guid: null }, that.preFetchedCollectionLists, that.sharedObj);
- App.rNContent.show(new AdministratorLayoutView(paramObj));
- });
- },
- businessMetadataDetailPage: function(guid) {
- var that = this;
- require(["views/site/Header", "views/site/SideNavLayoutView", "views/business_metadata/BusinessMetadataContainerLayoutView", ], function(Header, SideNavLayoutView, BusinessMetadataContainerLayoutView) {
- var paramObj = Utils.getUrlState.getQueryParams();
- that.renderViewIfNotExists(that.getHeaderOptions(Header));
- var options = _.extend({
- guid: guid,
- value: paramObj,
- searchVent: that.searchVent,
- categoryEvent: that.categoryEvent
- },
- that.preFetchedCollectionLists,
- that.sharedObj
- )
- that.renderViewIfNotExists({
- view: App.rSideNav,
- manualRender: function() {
- this.view.currentView.selectTab();
- if (Utils.getUrlState.isTagTab()) {
- this.view.currentView.RTagLayoutView.currentView.manualRender();
- } else if (Utils.getUrlState.isGlossaryTab()) {
- this.view.currentView.RGlossaryLayoutView.currentView.manualRender(_.extend({ "isTrigger": true }, { "value": paramObj }));
- }
- },
- render: function() {
- return new SideNavLayoutView(
- _.extend({
- 'searchVent': that.searchVent
- }, that.preFetchedCollectionLists, that.sharedObj)
- )
- }
- });
- App.rNContent.show(new BusinessMetadataContainerLayoutView(options));
- });
- },
searchResult: function() {
var that = this;
require([
@@ -371,7 +251,8 @@
'views/site/SideNavLayoutView',
'views/search/SearchDetailLayoutView'
], function(Header, SideNavLayoutView, SearchDetailLayoutView) {
- var paramObj = Utils.getUrlState.getQueryParams();
+ var paramObj = Utils.getUrlState.getQueryParams(),
+ options = _.extend({}, that.preFetchedCollectionLists, that.sharedObj, that.ventObj);
if (paramObj.tag) {
var tagValidate = paramObj.tag,
isTagPresent = false;
@@ -406,12 +287,7 @@
this.view.currentView.RSearchLayoutView.currentView.manualRender(paramObj);
},
render: function() {
- return new SideNavLayoutView(
- _.extend({
- 'value': paramObj,
- 'searchVent': that.searchVent
- }, that.preFetchedCollectionLists, that.sharedObj)
- )
+ return new SideNavLayoutView(_.extend({ 'value': paramObj }, options));
}
});
App.rSideNav.currentView.selectTab();
@@ -421,13 +297,94 @@
App.rNContent.show(new SearchDetailLayoutView(
_.extend({
'value': paramObj,
- 'searchVent': that.searchVent,
'initialView': isinitialView,
'isTypeTagNotExists': ((paramObj.type != tempParam.type) || (tempParam.tag != paramObj.tag))
- }, that.preFetchedCollectionLists, that.sharedObj)
+ }, options)
));
});
},
+ administrator: function() {
+ var that = this;
+ require(["views/site/Header", "views/site/SideNavLayoutView", 'views/administrator/AdministratorLayoutView'], function(Header, SideNavLayoutView, AdministratorLayoutView) {
+ var paramObj = Utils.getUrlState.getQueryParams(),
+ options = _.extend({}, that.preFetchedCollectionLists, that.sharedObj, that.ventObj);
+ that.renderViewIfNotExists(that.getHeaderOptions(Header));
+ that.renderViewIfNotExists({
+ view: App.rSideNav,
+ manualRender: function() {
+ this.view.currentView.selectTab();
+ if (Utils.getUrlState.isTagTab()) {
+ this.view.currentView.RTagLayoutView.currentView.manualRender();
+ } else if (Utils.getUrlState.isGlossaryTab()) {
+ this.view.currentView.RGlossaryLayoutView.currentView.manualRender(_.extend({ "isTrigger": true, "value": paramObj }));
+ }
+ },
+ render: function() {
+ return new SideNavLayoutView(options);
+ }
+ });
+ App.rNContent.show(new AdministratorLayoutView(_.extend({ value: paramObj, guid: null }, options)));
+ });
+ },
+ businessMetadataDetailPage: function(guid) {
+ var that = this;
+ require(["views/site/Header", "views/site/SideNavLayoutView", "views/business_metadata/BusinessMetadataContainerLayoutView", ], function(Header, SideNavLayoutView, BusinessMetadataContainerLayoutView) {
+ var paramObj = Utils.getUrlState.getQueryParams(),
+ options = _.extend({}, that.preFetchedCollectionLists, that.sharedObj, that.ventObj);
+ that.renderViewIfNotExists(that.getHeaderOptions(Header));
+ that.renderViewIfNotExists({
+ view: App.rSideNav,
+ manualRender: function() {
+ this.view.currentView.selectTab();
+ if (Utils.getUrlState.isTagTab()) {
+ this.view.currentView.RTagLayoutView.currentView.manualRender();
+ } else if (Utils.getUrlState.isGlossaryTab()) {
+ this.view.currentView.RGlossaryLayoutView.currentView.manualRender(_.extend({ "isTrigger": true, "value": paramObj }));
+ }
+ },
+ render: function() {
+ return new SideNavLayoutView(options);
+ }
+ });
+ App.rNContent.show(new BusinessMetadataContainerLayoutView(_.extend({ guid: guid, value: paramObj }, options)));
+ });
+ },
+ commonAction: function() {
+ var that = this;
+ require([
+ 'views/site/Header',
+ 'views/site/SideNavLayoutView',
+ 'views/search/SearchDetailLayoutView',
+ ], function(Header, SideNavLayoutView, SearchDetailLayoutView) {
+ var paramObj = Utils.getUrlState.getQueryParams(),
+ options = _.extend({}, that.preFetchedCollectionLists, that.sharedObj, that.ventObj);
+ that.renderViewIfNotExists(that.getHeaderOptions(Header));
+ that.renderViewIfNotExists({
+ view: App.rSideNav,
+ manualRender: function() {
+ this.view.currentView.selectTab();
+ if (Utils.getUrlState.isTagTab()) {
+ this.view.currentView.RTagLayoutView.currentView.manualRender();
+ } else if (Utils.getUrlState.isGlossaryTab()) {
+ this.view.currentView.RGlossaryLayoutView.currentView.manualRender(_.extend({ "isTrigger": true, "value": paramObj }));
+ }
+ },
+ render: function() {
+ return new SideNavLayoutView(options);
+ }
+ });
+
+ if (Globals.entityCreate && Utils.getUrlState.isSearchTab()) {
+ App.rNContent.show(new SearchDetailLayoutView(_.extend({ 'value': paramObj, 'initialView': true }, options)));
+ } else {
+ if (App.rNContent.currentView) {
+ App.rNContent.currentView.destroy();
+ } else {
+ App.rNContent.$el.empty();
+ }
+ }
+ });
+ },
defaultAction: function(actions) {
// We have no matching route, lets just log what the URL was
Utils.setUrl({
diff --git a/dashboardv2/public/js/templates/common/TableLayout_tmpl.html b/dashboardv2/public/js/templates/common/TableLayout_tmpl.html
index db1f0b3..4b5698a 100644
--- a/dashboardv2/public/js/templates/common/TableLayout_tmpl.html
+++ b/dashboardv2/public/js/templates/common/TableLayout_tmpl.html
@@ -22,13 +22,6 @@
{{/unless}}
</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 data-id="r_tableList" class="table-responsive tableBorder"> </div>
{{#if includeTableLoader}}
@@ -70,7 +63,10 @@
</div>
{{/if}} {{#if includeAtlasPagination}}
<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="backgrid-paginator inline">
<ul class="" data-id="paginationDiv" style="display:none">
diff --git a/dashboardv2/public/js/utils/TableLayout.js b/dashboardv2/public/js/utils/TableLayout.js
index a66411e..7edce4d 100644
--- a/dashboardv2/public/js/utils/TableLayout.js
+++ b/dashboardv2/public/js/utils/TableLayout.js
@@ -267,7 +267,7 @@
this.renderFooterRecords(this.collection.state);
}
if (this.includeAtlasPagination) {
- this.renderAtlasPagination(collection, options);
+ this.renderAtlasPagination(options);
}
}, this);
diff --git a/dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js b/dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js
index ba8a9f8..00e0953 100644
--- a/dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js
+++ b/dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js
@@ -77,30 +77,28 @@
_.extend(this, _.pick(options, 'searchTableFilters', 'entityDefCollection', 'enumDefCollection'));
this.entityCollection = new VEntityList();
this.limit = 25;
+ this.offset = 0;
this.entityCollection.url = UrlLinks.adminApiUrl();
this.entityCollection.modelAttrName = "events";
this.commonTableOptions = {
collection: this.entityCollection,
- includeFilter: false,
- includePagination: true,
- includeFooterRecords: true,
- includePageSize: true,
- includeAtlasTableSorting: true,
- includeTableLoader: true,
+ includePagination: false,
+ includeAtlasPagination: true,
+ includeFooterRecords: false,
includeColumnManager: false,
- gridOpts: {
- className: "table table-hover backgrid table-quickMenu",
- emptyText: 'No records found!'
+ includeOrderAbleColumns: false,
+ includeSizeAbleColumns: false,
+ includeTableLoader: true,
+ includeAtlasPageSize: true,
+ includeAtlasTableSorting: true,
+ atlasPaginationOpts: {
+ limit: this.limit,
+ offset: this.offset,
+ fetchCollection: this.getAdminCollection.bind(this),
},
- columnOpts: {
- opts: {
- initialColumnsVisible: null,
- saveState: false
- },
- visibilityControlOpts: {
- buttonTemplate: _.template("<button class='btn btn-action btn-sm pull-right'>Columns <i class='fa fa-caret-down'></i></button>")
- },
- el: this.ui.colManager
+ gridOpts: {
+ emptyText: 'No Record found!',
+ className: 'table table-hover backgrid table-quickMenu colSort'
},
filterOpts: {},
paginatorOpts: {}
@@ -116,6 +114,7 @@
this.entityCollection.comparator = function(model) {
return -model.get('timestamp');
}
+ this.renderTableLayoutView();
},
bindEvents: function() {},
closeAttributeModel: function() {
@@ -172,10 +171,11 @@
}
if (isFilterValidate) {
that.closeAttributeModel();
+ that.defaultPagination();
that.getAdminCollection();
}
},
- getAdminCollection: function() {
+ getAdminCollection: function(option) {
var that = this,
options = {
isDateParsed: true,
@@ -193,13 +193,12 @@
that.searchTableFilters["adminAttrFilters"] = CommonViewFunction.attributeFilter.generateUrl({ value: auditQueryParam, formatedDateToLong: true });
this.$('.fontLoader').show();
this.$('.tableOverlay').show();
- $.extend(that.entityCollection.queryParams, { limit: this.limit, offset: 0, auditFilters: adminParam });
+ $.extend(that.entityCollection.queryParams, { auditFilters: adminParam });
var apiObj = {
sort: false,
data: that.entityCollection.queryParams,
success: function(dataOrCollection, response) {
- that.entityCollection.fullCollection.reset(dataOrCollection);
- that.renderTableLayoutView();
+ that.entityCollection.fullCollection.reset(dataOrCollection, option);
that.$('.fontLoader').hide();
that.$('.tableOverlay').hide();
that.$('.auditTable').show();
@@ -296,15 +295,20 @@
}, this.entityCollection);
},
+ defaultPagination: function() {
+ $.extend(this.entityCollection.queryParams, { limit: this.limit, offset: this.offset });
+ this.renderTableLayoutView();
+ },
onClickAdminType: function(e, value) {
this.onlyPurged = e.currentTarget.value === "Purged";
+ this.defaultPagination();
this.getAdminCollection();
},
onClickAdminEntity: function(e) {
var that = this;
require([
- 'modules/Modal', 'views/audit/AuditTableLayoutView', 'views/audit/CreateAuditTableLayoutView',
- ], function(Modal, AuditTableLayoutView, CreateAuditTableLayoutView) {
+ 'modules/Modal', 'views/audit/AuditTableLayoutView'
+ ], function(Modal, AuditTableLayoutView) {
var obj = {
guid: $(e.target).text(),
},
diff --git a/dashboardv2/public/js/views/audit/AuditTableLayoutView.js b/dashboardv2/public/js/views/audit/AuditTableLayoutView.js
index 65b8818..be911d2 100644
--- a/dashboardv2/public/js/views/audit/AuditTableLayoutView.js
+++ b/dashboardv2/public/js/views/audit/AuditTableLayoutView.js
@@ -39,7 +39,6 @@
/** ui selector cache */
ui: {
- auditCreate: "[data-id='auditCreate']",
previousAuditData: "[data-id='previousAuditData']",
nextAuditData: "[data-id='nextAuditData']",
pageRecordText: "[data-id='pageRecordText']",
@@ -48,7 +47,6 @@
/** ui events hash */
events: function() {
var events = {};
- events["click " + this.ui.auditCreate] = "onClickAuditCreate";
events["click " + this.ui.nextAuditData] = "onClickNextAuditData";
events["click " + this.ui.previousAuditData] = "onClickPreviousAuditData";
return events;
@@ -237,34 +235,6 @@
}, 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() {
var that = this;
this.ui.previousAuditData.removeAttr("disabled");
diff --git a/dashboardv2/public/js/views/audit/CreateAuditTableLayoutView.js b/dashboardv2/public/js/views/audit/CreateAuditTableLayoutView.js
index a820616..ba6bfec 100644
--- a/dashboardv2/public/js/views/audit/CreateAuditTableLayoutView.js
+++ b/dashboardv2/public/js/views/audit/CreateAuditTableLayoutView.js
@@ -59,7 +59,6 @@
/** ui events hash */
events: function() {
var events = {};
- events["click " + this.ui.auditCreate] = "onClickAuditCreate";
return events;
},
/**
diff --git a/dashboardv2/public/js/views/audit/ReplicationAuditTableLayoutView.js b/dashboardv2/public/js/views/audit/ReplicationAuditTableLayoutView.js
index bddea1d..0d7c95d 100644
--- a/dashboardv2/public/js/views/audit/ReplicationAuditTableLayoutView.js
+++ b/dashboardv2/public/js/views/audit/ReplicationAuditTableLayoutView.js
@@ -41,13 +41,10 @@
},
/** ui selector cache */
- ui: {
- auditDetail: "[data-action='audit_detail']",
- },
+ ui: {},
/** ui events hash */
events: function() {
var events = {}
- events["click " + this.ui.auditDetail] = "onClickAuditDetails";
return events;
},
/**
@@ -70,6 +67,8 @@
includeOrderAbleColumns: false,
includeSizeAbleColumns: false,
includeTableLoader: true,
+ includeAtlasPageSize: true,
+ includeAtlasTableSorting: true,
atlasPaginationOpts: {
limit: this.limit,
offset: this.offset,
@@ -123,7 +122,21 @@
getColumn: function(argument) {
var that = this,
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'] = {
label: "Operation",
cell: "string",
@@ -175,46 +188,8 @@
}
})
};
- 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);
- },
- 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;
});
\ No newline at end of file
diff --git a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
index 84b9c78..82e834b 100644
--- a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
+++ b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
@@ -482,9 +482,11 @@
onClickAddTermBtn: function(e) {
var that = this,
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) {
var view = new AssignTermLayoutView({
guid: that.id,
diff --git a/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js b/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
index c2ad03f..799acf6 100644
--- a/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
+++ b/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
@@ -142,9 +142,11 @@
that[$(this).find('a').data('fn')](e)
});
}
- this.importVent.on("Import:Glossary:Update", function(options) {
- that.getGlossary();
- });
+ if (this.importVent) {
+ this.importVent.on("Import:Glossary:Update", function(options) {
+ that.getGlossary();
+ });
+ }
},
onRender: function() {
this.changeLoaderState(true);
diff --git a/dashboardv2/public/js/views/site/Header.js b/dashboardv2/public/js/views/site/Header.js
index b77ee1f..ff8f847 100644
--- a/dashboardv2/public/js/views/site/Header.js
+++ b/dashboardv2/public/js/views/site/Header.js
@@ -299,10 +299,12 @@
], function(ImportLayoutView) {
var view = new ImportLayoutView({
callback: function() {
- if (isGlossary) {
- that.options.importVent.trigger("Import:Glossary:Update");
- } else {
- that.options.importVent.trigger("Import:BM:Update");
+ if (that.options.importVent) {
+ if (isGlossary) {
+ that.options.importVent.trigger("Import:Glossary:Update");
+ } else {
+ that.options.importVent.trigger("Import:BM:Update");
+ }
}
},
isGlossary: isGlossary
diff --git a/dashboardv2/public/js/views/site/Statistics.js b/dashboardv2/public/js/views/site/Statistics.js
index 6da44cb..8fef47d 100644
--- a/dashboardv2/public/js/views/site/Statistics.js
+++ b/dashboardv2/public/js/views/site/Statistics.js
@@ -101,12 +101,12 @@
that.fetchMetricData({ update: true });
}
}]
- }).open();
-
+ });
modal.on('closeModal', function() {
modal.trigger('cancel');
});
this.modal = modal;
+ modal.open();
}
},
diff --git a/dashboardv3/public/css/scss/business-metadata.scss b/dashboardv3/public/css/scss/business-metadata.scss
index f1f7427..543f3d6 100644
--- a/dashboardv3/public/css/scss/business-metadata.scss
+++ b/dashboardv3/public/css/scss/business-metadata.scss
@@ -142,26 +142,6 @@
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 {
.modal-footer {
text-align: center;
diff --git a/dashboardv3/public/css/scss/table.scss b/dashboardv3/public/css/scss/table.scss
index 2ee30a2..669bcfc 100644
--- a/dashboardv3/public/css/scss/table.scss
+++ b/dashboardv3/public/css/scss/table.scss
@@ -213,6 +213,29 @@
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 {
@@ -255,8 +278,8 @@
display: flex;
flex-wrap: wrap;
justify-content: center;
-}
-.auditStatusContainer>div {
- flex-grow: 1;
+ &>div {
+ flex-grow: 1;
+ }
}
\ No newline at end of file
diff --git a/dashboardv3/public/css/scss/theme.scss b/dashboardv3/public/css/scss/theme.scss
index c126809..22b63ae 100644
--- a/dashboardv3/public/css/scss/theme.scss
+++ b/dashboardv3/public/css/scss/theme.scss
@@ -55,6 +55,14 @@
}
}
+.detail-page {
+ .back-button {
+ top: 15px;
+ font-size: 45px;
+ }
+}
+
+
.atlas-page-header {
height: 70px;
background-color: #d3e0eb;
diff --git a/dashboardv3/public/js/router/Router.js b/dashboardv3/public/js/router/Router.js
index 40b22dd..11afd88 100644
--- a/dashboardv3/public/js/router/Router.js
+++ b/dashboardv3/public/js/router/Router.js
@@ -74,6 +74,10 @@
metricCollection: this.metricCollection,
businessMetadataDefCollection: this.businessMetadataDefCollection
};
+ this.ventObj = {
+ searchVent: this.searchVent,
+ categoryEvent: this.categoryEvent
+ }
this.sharedObj = {
searchTableColumns: {},
glossary: {
@@ -89,8 +93,7 @@
var that = this;
$("body").on("click", "a.show-stat", function() {
require(["views/site/Statistics"], function(Statistics) {
- new Statistics(_.extend({ searchVent: that.searchVent }, that.preFetchedCollectionLists,
- that.sharedObj));
+ new Statistics(_.extend({}, that.preFetchedCollectionLists, that.sharedObj, that.ventObj));
});
});
$("body").on("click", "li.aboutAtlas", function() {
@@ -167,29 +170,45 @@
this.view.currentView.manualRender(options);
},
render: function() {
- return new Header(_.extend({}, that.preFetchedCollectionLists, that.sharedObj, options));
+ return new Header(_.extend({}, that.preFetchedCollectionLists, that.sharedObj, that.ventObj, options));
}
};
},
+ detailPage: function(id) {
+ var that = this;
+ if (id) {
+ require(["views/site/Header", "views/detail_page/DetailPageLayoutView", "collection/VEntityList", "views/site/SideNavLayoutView"], function(Header, DetailPageLayoutView, VEntityList, SideNavLayoutView) {
+ this.entityCollection = new VEntityList([], {});
+ var paramObj = Utils.getUrlState.getQueryParams(),
+ options = _.extend({}, that.preFetchedCollectionLists, that.sharedObj, that.ventObj);
+ that.renderViewIfNotExists(that.getHeaderOptions(Header));
+ that.renderViewIfNotExists({
+ view: App.rSideNav,
+ manualRender: function() {
+ this.view.currentView.manualRender(options);
+ },
+ render: function() {
+ return new SideNavLayoutView(options);
+ }
+ });
+ App.rContent.show(new DetailPageLayoutView(_.extend({ collection: this.entityCollection, id: id, value: paramObj }, options)));
+ this.entityCollection.url = UrlLinks.entitiesApiUrl({ guid: id, minExtInfo: true });
+ this.entityCollection.fetch({ reset: true });
+ });
+ }
+ },
renderTagLayoutView: function(tagName) {
var that = this;
require(["views/site/Header", "views/tag/TagContainerLayoutView", "views/site/SideNavLayoutView"], function(Header, TagContainerLayoutView, SideNavLayoutView) {
- var paramObj = Utils.getUrlState.getQueryParams(),
- url = Utils.getUrlState.getQueryUrl().queyParams[0];
+ var paramObj = Utils.getUrlState.getQueryParams();
that.renderViewIfNotExists(that.getHeaderOptions(Header));
- // updating paramObj to check for new queryparam.
- paramObj = Utils.getUrlState.getQueryParams();
- if (paramObj && paramObj.dlttag) {
- return false;
- }
var options = _.extend({
tag: tagName,
- value: paramObj,
- searchVent: that.searchVent,
- categoryEvent: that.categoryEvent
+ value: paramObj
},
that.preFetchedCollectionLists,
- that.sharedObj
+ that.sharedObj,
+ that.ventObj
)
that.renderViewIfNotExists({
view: App.rSideNav,
@@ -200,39 +219,21 @@
return new SideNavLayoutView(options);
}
});
- App.rContent.show(
- new TagContainerLayoutView(
- _.extend({
- tag: tagName,
- value: paramObj,
- searchVent: that.searchVent
- },
- that.preFetchedCollectionLists,
- that.sharedObj
- )
- )
- );
+ App.rContent.show(new TagContainerLayoutView(options));
});
},
renderGlossaryLayoutView: function(id) {
var that = this;
require(["views/site/Header", "views/glossary/GlossaryContainerLayoutView", "views/site/SideNavLayoutView"], function(Header, GlossaryContainerLayoutView, SideNavLayoutView) {
- var paramObj = Utils.getUrlState.getQueryParams(),
- url = Utils.getUrlState.getQueryUrl().queyParams[0];
+ var paramObj = Utils.getUrlState.getQueryParams();
that.renderViewIfNotExists(that.getHeaderOptions(Header));
- // updating paramObj to check for new queryparam.
- paramObj = Utils.getUrlState.getQueryParams();
- if (paramObj && paramObj.dlttag) {
- return false;
- }
var options = _.extend({
guid: id,
- value: paramObj,
- searchVent: that.searchVent,
- categoryEvent: that.categoryEvent
+ value: paramObj
},
that.preFetchedCollectionLists,
- that.sharedObj
+ that.sharedObj,
+ that.ventObj
);
that.renderViewIfNotExists({
@@ -327,8 +328,6 @@
}
var options = _.extend({
value: paramObj,
- searchVent: that.searchVent,
- categoryEvent: that.categoryEvent,
initialView: isinitialView,
fromDefaultSearch: opt ? (opt && !opt.fromSearchResultView) : true,
fromSearchResultView: (opt && opt.fromSearchResultView) || false,
@@ -336,7 +335,8 @@
isTypeTagNotExists: paramObj && (paramObj.type != tempParam.type || tempParam.tag != paramObj.tag)
},
that.preFetchedCollectionLists,
- that.sharedObj
+ that.sharedObj,
+ that.ventObj
);
that.renderViewIfNotExists(
that.getHeaderOptions(Header, {
@@ -349,9 +349,7 @@
this.view.currentView.manualRender(options);
},
render: function() {
- return new SideNavLayoutView(
- _.extend({}, that.preFetchedCollectionLists, that.sharedObj, options)
- );
+ return new SideNavLayoutView(options);
}
});
that.renderViewIfNotExists({
@@ -366,153 +364,30 @@
});
});
},
- detailPage: function(id) {
- var that = this;
- if (id) {
- require(["views/site/Header", "views/detail_page/DetailPageLayoutView", "collection/VEntityList", "views/site/SideNavLayoutView"], function(
- Header,
- DetailPageLayoutView,
- VEntityList,
- SideNavLayoutView
- ) {
- this.entityCollection = new VEntityList([], {});
- var paramObj = Utils.getUrlState.getQueryParams();
- that.renderViewIfNotExists(that.getHeaderOptions(Header));
- that.renderViewIfNotExists({
- view: App.rSideNav,
- manualRender: function() {
- this.view.currentView.manualRender();
- },
- render: function() {
- return new SideNavLayoutView(
- _.extend({
- searchVent: that.searchVent,
- categoryEvent: that.categoryEvent
- }, that.preFetchedCollectionLists, that.sharedObj)
- );
- }
- });
- App.rContent.show(
- new DetailPageLayoutView(
- _.extend({
- collection: this.entityCollection,
- id: id,
- value: paramObj,
- searchVent: that.searchVent
- },
- that.preFetchedCollectionLists,
- that.sharedObj
- )
- )
- );
- this.entityCollection.url = UrlLinks.entitiesApiUrl({ guid: id, minExtInfo: true });
- this.entityCollection.fetch({ reset: true });
- });
- }
- },
- glossaryDetailPage: function(id) {
- var that = this;
- if (id) {
- require(["views/site/Header", "views/glossary/GlossaryDetailLayoutView", "views/site/SideNavLayoutView"], function(Header, GlossaryDetailLayoutView, SideNavLayoutView) {
- var paramObj = Utils.getUrlState.getQueryParams();
- that.renderViewIfNotExists(that.getHeaderOptions(Header));
- that.renderViewIfNotExists({
- view: App.rSideNav,
- manualRender: function() {
- this.view.currentView.RGlossaryLayoutView.currentView.manualRender(_.extend({}, { 'guid': id, 'value': paramObj }));
- this.view.currentView.selectTab();
- },
- render: function() {
- return new SideNavLayoutView(
- _.extend({}, that.preFetchedCollectionLists, that.sharedObj, { 'guid': id, 'value': paramObj })
- )
- }
- });
- App.rContent.show(
- new GlossaryDetailLayoutView(
- _.extend({
- guid: id,
- value: paramObj
- },
- that.preFetchedCollectionLists,
- that.sharedObj
- )
- )
- );
- });
- }
- },
- commonAction: function() {
- var that = this;
- require(["views/site/Header", "views/search/SearchDetailLayoutView", "views/site/SideNavLayoutView"], function(Header, SearchDetailLayoutView, SideNavLayoutView) {
- var paramObj = Utils.getUrlState.getQueryParams();
- that.renderViewIfNotExists(that.getHeaderOptions(Header));
- that.renderViewIfNotExists({
- view: App.rSideNav,
- manualRender: function() {
- this.view.currentView.selectTab();
- },
- render: function() {
- return new SideNavLayoutView(
- _.extend({}, that.preFetchedCollectionLists, that.sharedObj)
- );
- }
- });
-
- if (Globals.entityCreate && Utils.getUrlState.isSearchTab()) {
- App.rContent.show(
- new SearchDetailLayoutView(
- _.extend({
- value: paramObj,
- initialView: true,
- searchVent: that.searchVent
- },
- that.preFetchedCollectionLists,
- that.sharedObj
- )
- )
- );
- } else {
- if (App.rNContent.currentView) {
- App.rNContent.currentView.destroy();
- }
- }
- });
- },
administrator: function() {
var that = this;
require(["views/site/Header", "views/site/SideNavLayoutView", 'views/administrator/AdministratorLayoutView'], function(Header, SideNavLayoutView, AdministratorLayoutView) {
- var value = Utils.getUrlState.getQueryParams(),
- paramObj = _.extend({ value: value, guid: null }, that.preFetchedCollectionLists, that.sharedObj);
+ var paramObj = Utils.getUrlState.getQueryParams(),
+ options = _.extend({}, that.preFetchedCollectionLists, that.sharedObj, that.ventObj);
that.renderViewIfNotExists(that.getHeaderOptions(Header));
that.renderViewIfNotExists({
view: App.rSideNav,
manualRender: function() {
- this.view.currentView.manualRender(paramObj);
+ this.view.currentView.manualRender(options);
},
render: function() {
- return new SideNavLayoutView(
- _.extend({ searchVent: that.searchVent, categoryEvent: that.categoryEvent }, that.preFetchedCollectionLists, that.sharedObj)
- );
+ return new SideNavLayoutView(options);
}
});
- App.rContent.show(new AdministratorLayoutView(paramObj));
+ App.rContent.show(new AdministratorLayoutView(_.extend({ value: paramObj, guid: null }, options)));
});
},
businessMetadataDetailPage: function(guid) {
var that = this;
require(["views/site/Header", "views/site/SideNavLayoutView", "views/business_metadata/BusinessMetadataContainerLayoutView", ], function(Header, SideNavLayoutView, BusinessMetadataContainerLayoutView) {
- var paramObj = Utils.getUrlState.getQueryParams();
+ var paramObj = Utils.getUrlState.getQueryParams(),
+ options = _.extend({ guid: guid, value: paramObj }, that.preFetchedCollectionLists, that.sharedObj, that.ventObj);
that.renderViewIfNotExists(that.getHeaderOptions(Header));
- var options = _.extend({
- guid: guid,
- value: paramObj,
- searchVent: that.searchVent,
- categoryEvent: that.categoryEvent
- },
- that.preFetchedCollectionLists,
- that.sharedObj
- )
that.renderViewIfNotExists({
view: App.rSideNav,
manualRender: function() {
diff --git a/dashboardv3/public/js/templates/common/TableLayout_tmpl.html b/dashboardv3/public/js/templates/common/TableLayout_tmpl.html
index db1f0b3..4b5698a 100644
--- a/dashboardv3/public/js/templates/common/TableLayout_tmpl.html
+++ b/dashboardv3/public/js/templates/common/TableLayout_tmpl.html
@@ -22,13 +22,6 @@
{{/unless}}
</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 data-id="r_tableList" class="table-responsive tableBorder"> </div>
{{#if includeTableLoader}}
@@ -70,7 +63,10 @@
</div>
{{/if}} {{#if includeAtlasPagination}}
<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="backgrid-paginator inline">
<ul class="" data-id="paginationDiv" style="display:none">
diff --git a/dashboardv3/public/js/utils/TableLayout.js b/dashboardv3/public/js/utils/TableLayout.js
index a66411e..7edce4d 100644
--- a/dashboardv3/public/js/utils/TableLayout.js
+++ b/dashboardv3/public/js/utils/TableLayout.js
@@ -267,7 +267,7 @@
this.renderFooterRecords(this.collection.state);
}
if (this.includeAtlasPagination) {
- this.renderAtlasPagination(collection, options);
+ this.renderAtlasPagination(options);
}
}, this);
diff --git a/dashboardv3/public/js/views/audit/AdminAuditTableLayoutView.js b/dashboardv3/public/js/views/audit/AdminAuditTableLayoutView.js
index ba8a9f8..00e0953 100644
--- a/dashboardv3/public/js/views/audit/AdminAuditTableLayoutView.js
+++ b/dashboardv3/public/js/views/audit/AdminAuditTableLayoutView.js
@@ -77,30 +77,28 @@
_.extend(this, _.pick(options, 'searchTableFilters', 'entityDefCollection', 'enumDefCollection'));
this.entityCollection = new VEntityList();
this.limit = 25;
+ this.offset = 0;
this.entityCollection.url = UrlLinks.adminApiUrl();
this.entityCollection.modelAttrName = "events";
this.commonTableOptions = {
collection: this.entityCollection,
- includeFilter: false,
- includePagination: true,
- includeFooterRecords: true,
- includePageSize: true,
- includeAtlasTableSorting: true,
- includeTableLoader: true,
+ includePagination: false,
+ includeAtlasPagination: true,
+ includeFooterRecords: false,
includeColumnManager: false,
- gridOpts: {
- className: "table table-hover backgrid table-quickMenu",
- emptyText: 'No records found!'
+ includeOrderAbleColumns: false,
+ includeSizeAbleColumns: false,
+ includeTableLoader: true,
+ includeAtlasPageSize: true,
+ includeAtlasTableSorting: true,
+ atlasPaginationOpts: {
+ limit: this.limit,
+ offset: this.offset,
+ fetchCollection: this.getAdminCollection.bind(this),
},
- columnOpts: {
- opts: {
- initialColumnsVisible: null,
- saveState: false
- },
- visibilityControlOpts: {
- buttonTemplate: _.template("<button class='btn btn-action btn-sm pull-right'>Columns <i class='fa fa-caret-down'></i></button>")
- },
- el: this.ui.colManager
+ gridOpts: {
+ emptyText: 'No Record found!',
+ className: 'table table-hover backgrid table-quickMenu colSort'
},
filterOpts: {},
paginatorOpts: {}
@@ -116,6 +114,7 @@
this.entityCollection.comparator = function(model) {
return -model.get('timestamp');
}
+ this.renderTableLayoutView();
},
bindEvents: function() {},
closeAttributeModel: function() {
@@ -172,10 +171,11 @@
}
if (isFilterValidate) {
that.closeAttributeModel();
+ that.defaultPagination();
that.getAdminCollection();
}
},
- getAdminCollection: function() {
+ getAdminCollection: function(option) {
var that = this,
options = {
isDateParsed: true,
@@ -193,13 +193,12 @@
that.searchTableFilters["adminAttrFilters"] = CommonViewFunction.attributeFilter.generateUrl({ value: auditQueryParam, formatedDateToLong: true });
this.$('.fontLoader').show();
this.$('.tableOverlay').show();
- $.extend(that.entityCollection.queryParams, { limit: this.limit, offset: 0, auditFilters: adminParam });
+ $.extend(that.entityCollection.queryParams, { auditFilters: adminParam });
var apiObj = {
sort: false,
data: that.entityCollection.queryParams,
success: function(dataOrCollection, response) {
- that.entityCollection.fullCollection.reset(dataOrCollection);
- that.renderTableLayoutView();
+ that.entityCollection.fullCollection.reset(dataOrCollection, option);
that.$('.fontLoader').hide();
that.$('.tableOverlay').hide();
that.$('.auditTable').show();
@@ -296,15 +295,20 @@
}, this.entityCollection);
},
+ defaultPagination: function() {
+ $.extend(this.entityCollection.queryParams, { limit: this.limit, offset: this.offset });
+ this.renderTableLayoutView();
+ },
onClickAdminType: function(e, value) {
this.onlyPurged = e.currentTarget.value === "Purged";
+ this.defaultPagination();
this.getAdminCollection();
},
onClickAdminEntity: function(e) {
var that = this;
require([
- 'modules/Modal', 'views/audit/AuditTableLayoutView', 'views/audit/CreateAuditTableLayoutView',
- ], function(Modal, AuditTableLayoutView, CreateAuditTableLayoutView) {
+ 'modules/Modal', 'views/audit/AuditTableLayoutView'
+ ], function(Modal, AuditTableLayoutView) {
var obj = {
guid: $(e.target).text(),
},
diff --git a/dashboardv3/public/js/views/audit/AuditTableLayoutView.js b/dashboardv3/public/js/views/audit/AuditTableLayoutView.js
index 65b8818..be911d2 100644
--- a/dashboardv3/public/js/views/audit/AuditTableLayoutView.js
+++ b/dashboardv3/public/js/views/audit/AuditTableLayoutView.js
@@ -39,7 +39,6 @@
/** ui selector cache */
ui: {
- auditCreate: "[data-id='auditCreate']",
previousAuditData: "[data-id='previousAuditData']",
nextAuditData: "[data-id='nextAuditData']",
pageRecordText: "[data-id='pageRecordText']",
@@ -48,7 +47,6 @@
/** ui events hash */
events: function() {
var events = {};
- events["click " + this.ui.auditCreate] = "onClickAuditCreate";
events["click " + this.ui.nextAuditData] = "onClickNextAuditData";
events["click " + this.ui.previousAuditData] = "onClickPreviousAuditData";
return events;
@@ -237,34 +235,6 @@
}, 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() {
var that = this;
this.ui.previousAuditData.removeAttr("disabled");
diff --git a/dashboardv3/public/js/views/audit/CreateAuditTableLayoutView.js b/dashboardv3/public/js/views/audit/CreateAuditTableLayoutView.js
index a820616..ba6bfec 100644
--- a/dashboardv3/public/js/views/audit/CreateAuditTableLayoutView.js
+++ b/dashboardv3/public/js/views/audit/CreateAuditTableLayoutView.js
@@ -59,7 +59,6 @@
/** ui events hash */
events: function() {
var events = {};
- events["click " + this.ui.auditCreate] = "onClickAuditCreate";
return events;
},
/**
diff --git a/dashboardv3/public/js/views/audit/ReplicationAuditTableLayoutView.js b/dashboardv3/public/js/views/audit/ReplicationAuditTableLayoutView.js
index bddea1d..0d7c95d 100644
--- a/dashboardv3/public/js/views/audit/ReplicationAuditTableLayoutView.js
+++ b/dashboardv3/public/js/views/audit/ReplicationAuditTableLayoutView.js
@@ -41,13 +41,10 @@
},
/** ui selector cache */
- ui: {
- auditDetail: "[data-action='audit_detail']",
- },
+ ui: {},
/** ui events hash */
events: function() {
var events = {}
- events["click " + this.ui.auditDetail] = "onClickAuditDetails";
return events;
},
/**
@@ -70,6 +67,8 @@
includeOrderAbleColumns: false,
includeSizeAbleColumns: false,
includeTableLoader: true,
+ includeAtlasPageSize: true,
+ includeAtlasTableSorting: true,
atlasPaginationOpts: {
limit: this.limit,
offset: this.offset,
@@ -123,7 +122,21 @@
getColumn: function(argument) {
var that = this,
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'] = {
label: "Operation",
cell: "string",
@@ -175,46 +188,8 @@
}
})
};
- 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);
- },
- 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;
});
\ No newline at end of file
diff --git a/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js b/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js
index 9863962..bb57a19 100644
--- a/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js
+++ b/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js
@@ -486,9 +486,11 @@
onClickAddTermBtn: function(e) {
var that = this,
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) {
var view = new AssignTermLayoutView({
guid: that.id,
diff --git a/dashboardv3/public/js/views/site/Statistics.js b/dashboardv3/public/js/views/site/Statistics.js
index 9673bb0..2b8bd1f 100644
--- a/dashboardv3/public/js/views/site/Statistics.js
+++ b/dashboardv3/public/js/views/site/Statistics.js
@@ -83,18 +83,20 @@
that.fetchMetricData({ update: true });
}
}]
- }).open();
-
+ });
modal.on('closeModal', function() {
modal.trigger('cancel');
});
this.modal = modal;
+ modal.open();
},
bindEvents: function() {
var that = this;
- this.$el.on('click', '.linkClicked', function() {
- that.modal.close();
- })
+ if (this.modal) {
+ this.$el.on('click', '.linkClicked', function() {
+ that.modal.close();
+ })
+ }
},
fetchMetricData: function(options) {
var that = this;
