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 320 additions and 572 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/router/Router.js
...@@ -70,6 +70,10 @@ define([ ...@@ -70,6 +70,10 @@ define([
'metricCollection': this.metricCollection, 'metricCollection': this.metricCollection,
'businessMetadataDefCollection': this.businessMetadataDefCollection 'businessMetadataDefCollection': this.businessMetadataDefCollection
} }
this.ventObj = {
searchVent: this.searchVent,
importVent: this.importVent
}
this.sharedObj = { this.sharedObj = {
searchTableColumns: {}, searchTableColumns: {},
glossary: { glossary: {
...@@ -87,8 +91,7 @@ define([ ...@@ -87,8 +91,7 @@ define([
require([ require([
'views/site/Statistics', 'views/site/Statistics',
], function(Statistics) { ], function(Statistics) {
new Statistics(_.extend({}, that.preFetchedCollectionLists, new Statistics(_.extend({}, that.preFetchedCollectionLists, that.sharedObj, that.ventObj));
that.sharedObj));
}); });
}); });
$('body').on('click', 'li.aboutAtlas', function() { $('body').on('click', 'li.aboutAtlas', function() {
...@@ -139,7 +142,7 @@ define([ ...@@ -139,7 +142,7 @@ define([
this.view.currentView.manualRender(); this.view.currentView.manualRender();
}, },
render: function() { 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 @@ define([ ...@@ -153,7 +156,8 @@ define([
'collection/VEntityList' 'collection/VEntityList'
], function(Header, DetailPageLayoutView, SideNavLayoutView, VEntityList) { ], function(Header, DetailPageLayoutView, SideNavLayoutView, VEntityList) {
this.entityCollection = new 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(that.getHeaderOptions(Header));
that.renderViewIfNotExists({ that.renderViewIfNotExists({
view: App.rSideNav, view: App.rSideNav,
...@@ -161,16 +165,10 @@ define([ ...@@ -161,16 +165,10 @@ define([
this.view.currentView.selectTab(); this.view.currentView.selectTab();
}, },
render: function() { render: function() {
return new SideNavLayoutView( return new SideNavLayoutView(options);
_.extend({}, that.preFetchedCollectionLists, that.sharedObj)
);
} }
}); });
App.rNContent.show(new DetailPageLayoutView(_.extend({ App.rNContent.show(new DetailPageLayoutView(_.extend({ 'collection': this.entityCollection, 'id': id, 'value': paramObj }, options)));
'collection': this.entityCollection,
'id': id,
'value': paramObj
}, that.preFetchedCollectionLists, that.sharedObj)));
this.entityCollection.url = UrlLinks.entitiesApiUrl({ guid: id, minExtInfo: true }); this.entityCollection.url = UrlLinks.entitiesApiUrl({ guid: id, minExtInfo: true });
this.entityCollection.fetch({ reset: true }); this.entityCollection.fetch({ reset: true });
}); });
...@@ -184,7 +182,8 @@ define([ ...@@ -184,7 +182,8 @@ define([
'views/tag/TagDetailLayoutView', 'views/tag/TagDetailLayoutView',
], function(Header, SideNavLayoutView, TagDetailLayoutView) { ], function(Header, SideNavLayoutView, TagDetailLayoutView) {
var paramObj = Utils.getUrlState.getQueryParams(), 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(that.getHeaderOptions(Header));
that.renderViewIfNotExists({ that.renderViewIfNotExists({
view: App.rSideNav, view: App.rSideNav,
...@@ -207,12 +206,7 @@ define([ ...@@ -207,12 +206,7 @@ define([
updateTabState: true updateTabState: true
}); });
} }
return new SideNavLayoutView( return new SideNavLayoutView(options);
_.extend({
'tag': tagName,
'value': paramObj
}, that.preFetchedCollectionLists, that.sharedObj)
);
} }
}); });
if (tagName) { if (tagName) {
...@@ -221,12 +215,7 @@ define([ ...@@ -221,12 +215,7 @@ define([
if (paramObj && paramObj.dlttag) { if (paramObj && paramObj.dlttag) {
return false; return false;
} }
App.rNContent.show(new TagDetailLayoutView( App.rNContent.show(new TagDetailLayoutView(options));
_.extend({
'tag': tagName,
'value': paramObj
}, that.preFetchedCollectionLists, that.sharedObj)
));
} }
}); });
}, },
...@@ -238,9 +227,9 @@ define([ ...@@ -238,9 +227,9 @@ define([
'views/glossary/GlossaryDetailLayoutView', 'views/glossary/GlossaryDetailLayoutView',
'views/site/SideNavLayoutView' 'views/site/SideNavLayoutView'
], function(Header, GlossaryDetailLayoutView, 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)); that.renderViewIfNotExists(that.getHeaderOptions(Header));
var options = _.extend({}, that.preFetchedCollectionLists, that.sharedObj, { 'guid': id, 'value': paramObj, importVent: that.importVent })
that.renderViewIfNotExists({ that.renderViewIfNotExists({
view: App.rSideNav, view: App.rSideNav,
manualRender: function() { manualRender: function() {
...@@ -255,57 +244,70 @@ define([ ...@@ -255,57 +244,70 @@ define([
}); });
} }
}, },
commonAction: function() { searchResult: function() {
var that = this; var that = this;
require([ require([
'views/site/Header', 'views/site/Header',
'views/site/SideNavLayoutView', 'views/site/SideNavLayoutView',
'views/search/SearchDetailLayoutView', 'views/search/SearchDetailLayoutView'
], function(Header, SideNavLayoutView, 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;
if ((tagValidate.indexOf('*') == -1)) {
classificationDefCollection.fullCollection.each(function(model) {
var name = Utils.getName(model.toJSON(), 'name');
if (model.get('category') == 'CLASSIFICATION') {
if (tagValidate) {
if (name === tagValidate) {
isTagPresent = true;
}
}
}
});
_.each(Enums.addOnClassification, function(classificationName) {
if (classificationName === tagValidate) {
isTagPresent = true;
}
});
if (!isTagPresent) {
paramObj.tag = null;
}
}
}
var isinitialView = true,
isTypeTagNotExists = false,
tempParam = _.extend({}, paramObj);
that.renderViewIfNotExists(that.getHeaderOptions(Header)); that.renderViewIfNotExists(that.getHeaderOptions(Header));
that.renderViewIfNotExists({ that.renderViewIfNotExists({
view: App.rSideNav, view: App.rSideNav,
manualRender: function() { manualRender: function() {
this.view.currentView.selectTab(); this.view.currentView.RSearchLayoutView.currentView.manualRender(paramObj);
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() { render: function() {
return new SideNavLayoutView( return new SideNavLayoutView(_.extend({ 'value': paramObj }, options));
_.extend({
'searchVent': that.searchVent,
'importVent': that.importVent
}, that.preFetchedCollectionLists, that.sharedObj)
)
} }
}); });
App.rSideNav.currentView.selectTab();
if (Globals.entityCreate && Utils.getUrlState.isSearchTab()) { if (paramObj) {
isinitialView = (paramObj.type || (paramObj.dslChecked == "true" ? "" : (paramObj.tag || paramObj.term)) || (paramObj.query ? paramObj.query.trim() : "")).length === 0;
}
App.rNContent.show(new SearchDetailLayoutView( App.rNContent.show(new SearchDetailLayoutView(
_.extend({ _.extend({
'value': paramObj, 'value': paramObj,
'initialView': true, 'initialView': isinitialView,
'searchVent': that.searchVent 'isTypeTagNotExists': ((paramObj.type != tempParam.type) || (tempParam.tag != paramObj.tag))
}, that.preFetchedCollectionLists, that.sharedObj) }, options)
)); ));
} else {
if (App.rNContent.currentView) {
App.rNContent.currentView.destroy();
} else {
App.rNContent.$el.empty();
}
}
}); });
}, },
administrator: function() { administrator: function() {
var that = this; var that = this;
require(["views/site/Header", "views/site/SideNavLayoutView", 'views/administrator/AdministratorLayoutView'], function(Header, SideNavLayoutView, AdministratorLayoutView) { require(["views/site/Header", "views/site/SideNavLayoutView", 'views/administrator/AdministratorLayoutView'], function(Header, SideNavLayoutView, AdministratorLayoutView) {
var value = Utils.getUrlState.getQueryParams(), var paramObj = Utils.getUrlState.getQueryParams(),
paramObj = Utils.getUrlState.getQueryParams(); options = _.extend({}, that.preFetchedCollectionLists, that.sharedObj, that.ventObj);
that.renderViewIfNotExists(that.getHeaderOptions(Header)); that.renderViewIfNotExists(that.getHeaderOptions(Header));
that.renderViewIfNotExists({ that.renderViewIfNotExists({
view: App.rSideNav, view: App.rSideNav,
...@@ -314,35 +316,22 @@ define([ ...@@ -314,35 +316,22 @@ define([
if (Utils.getUrlState.isTagTab()) { if (Utils.getUrlState.isTagTab()) {
this.view.currentView.RTagLayoutView.currentView.manualRender(); this.view.currentView.RTagLayoutView.currentView.manualRender();
} else if (Utils.getUrlState.isGlossaryTab()) { } else if (Utils.getUrlState.isGlossaryTab()) {
this.view.currentView.RGlossaryLayoutView.currentView.manualRender(_.extend({ "isTrigger": true }, { "value": paramObj })); this.view.currentView.RGlossaryLayoutView.currentView.manualRender(_.extend({ "isTrigger": true, "value": paramObj }));
} }
}, },
render: function() { render: function() {
return new SideNavLayoutView( return new SideNavLayoutView(options);
_.extend({
'searchVent': that.searchVent
}, that.preFetchedCollectionLists, that.sharedObj)
)
} }
}); });
paramObj = _.extend({ value: value, guid: null }, that.preFetchedCollectionLists, that.sharedObj); App.rNContent.show(new AdministratorLayoutView(_.extend({ value: paramObj, guid: null }, options)));
App.rNContent.show(new AdministratorLayoutView(paramObj));
}); });
}, },
businessMetadataDetailPage: function(guid) { businessMetadataDetailPage: function(guid) {
var that = this; var that = this;
require(["views/site/Header", "views/site/SideNavLayoutView", "views/business_metadata/BusinessMetadataContainerLayoutView", ], function(Header, SideNavLayoutView, BusinessMetadataContainerLayoutView) { 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({}, that.preFetchedCollectionLists, that.sharedObj, that.ventObj);
that.renderViewIfNotExists(that.getHeaderOptions(Header)); that.renderViewIfNotExists(that.getHeaderOptions(Header));
var options = _.extend({
guid: guid,
value: paramObj,
searchVent: that.searchVent,
categoryEvent: that.categoryEvent
},
that.preFetchedCollectionLists,
that.sharedObj
)
that.renderViewIfNotExists({ that.renderViewIfNotExists({
view: App.rSideNav, view: App.rSideNav,
manualRender: function() { manualRender: function() {
...@@ -350,82 +339,50 @@ define([ ...@@ -350,82 +339,50 @@ define([
if (Utils.getUrlState.isTagTab()) { if (Utils.getUrlState.isTagTab()) {
this.view.currentView.RTagLayoutView.currentView.manualRender(); this.view.currentView.RTagLayoutView.currentView.manualRender();
} else if (Utils.getUrlState.isGlossaryTab()) { } else if (Utils.getUrlState.isGlossaryTab()) {
this.view.currentView.RGlossaryLayoutView.currentView.manualRender(_.extend({ "isTrigger": true }, { "value": paramObj })); this.view.currentView.RGlossaryLayoutView.currentView.manualRender(_.extend({ "isTrigger": true, "value": paramObj }));
} }
}, },
render: function() { render: function() {
return new SideNavLayoutView( return new SideNavLayoutView(options);
_.extend({
'searchVent': that.searchVent
}, that.preFetchedCollectionLists, that.sharedObj)
)
} }
}); });
App.rNContent.show(new BusinessMetadataContainerLayoutView(options)); App.rNContent.show(new BusinessMetadataContainerLayoutView(_.extend({ guid: guid, value: paramObj }, options)));
}); });
}, },
searchResult: function() { commonAction: function() {
var that = this; var that = this;
require([ require([
'views/site/Header', 'views/site/Header',
'views/site/SideNavLayoutView', 'views/site/SideNavLayoutView',
'views/search/SearchDetailLayoutView' 'views/search/SearchDetailLayoutView',
], function(Header, SideNavLayoutView, SearchDetailLayoutView) { ], function(Header, SideNavLayoutView, SearchDetailLayoutView) {
var paramObj = Utils.getUrlState.getQueryParams(); var paramObj = Utils.getUrlState.getQueryParams(),
if (paramObj.tag) { options = _.extend({}, that.preFetchedCollectionLists, that.sharedObj, that.ventObj);
var tagValidate = paramObj.tag,
isTagPresent = false;
if ((tagValidate.indexOf('*') == -1)) {
classificationDefCollection.fullCollection.each(function(model) {
var name = Utils.getName(model.toJSON(), 'name');
if (model.get('category') == 'CLASSIFICATION') {
if (tagValidate) {
if (name === tagValidate) {
isTagPresent = true;
}
}
}
});
_.each(Enums.addOnClassification, function(classificationName) {
if (classificationName === tagValidate) {
isTagPresent = true;
}
});
if (!isTagPresent) {
paramObj.tag = null;
}
}
}
var isinitialView = true,
isTypeTagNotExists = false,
tempParam = _.extend({}, paramObj);
that.renderViewIfNotExists(that.getHeaderOptions(Header)); that.renderViewIfNotExists(that.getHeaderOptions(Header));
that.renderViewIfNotExists({ that.renderViewIfNotExists({
view: App.rSideNav, view: App.rSideNav,
manualRender: function() { manualRender: function() {
this.view.currentView.RSearchLayoutView.currentView.manualRender(paramObj); 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() { render: function() {
return new SideNavLayoutView( return new SideNavLayoutView(options);
_.extend({
'value': paramObj,
'searchVent': that.searchVent
}, that.preFetchedCollectionLists, that.sharedObj)
)
} }
}); });
App.rSideNav.currentView.selectTab();
if (paramObj) { if (Globals.entityCreate && Utils.getUrlState.isSearchTab()) {
isinitialView = (paramObj.type || (paramObj.dslChecked == "true" ? "" : (paramObj.tag || paramObj.term)) || (paramObj.query ? paramObj.query.trim() : "")).length === 0; 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();
}
} }
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)
));
}); });
}, },
defaultAction: function(actions) { defaultAction: function(actions) {
......
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,
columnOpts: { includeAtlasTableSorting: true,
opts: { atlasPaginationOpts: {
initialColumnsVisible: null, limit: this.limit,
saveState: false offset: this.offset,
}, fetchCollection: this.getAdminCollection.bind(this),
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 gridOpts: {
emptyText: 'No Record found!',
className: 'table table-hover backgrid table-quickMenu colSort'
}, },
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)
}); });
} }
if (this.importVent) {
this.importVent.on("Import:Glossary:Update", function(options) { this.importVent.on("Import:Glossary:Update", function(options) {
that.getGlossary(); that.getGlossary();
}); });
}
}, },
onRender: function() { onRender: function() {
this.changeLoaderState(true); this.changeLoaderState(true);
......
dashboardv2/public/js/views/site/Header.js
...@@ -299,11 +299,13 @@ define(['require', ...@@ -299,11 +299,13 @@ define(['require',
], function(ImportLayoutView) { ], function(ImportLayoutView) {
var view = new ImportLayoutView({ var view = new ImportLayoutView({
callback: function() { callback: function() {
if (that.options.importVent) {
if (isGlossary) { if (isGlossary) {
that.options.importVent.trigger("Import:Glossary:Update"); that.options.importVent.trigger("Import:Glossary:Update");
} else { } else {
that.options.importVent.trigger("Import:BM:Update"); 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/router/Router.js
...@@ -74,6 +74,10 @@ define([ ...@@ -74,6 +74,10 @@ define([
metricCollection: this.metricCollection, metricCollection: this.metricCollection,
businessMetadataDefCollection: this.businessMetadataDefCollection businessMetadataDefCollection: this.businessMetadataDefCollection
}; };
this.ventObj = {
searchVent: this.searchVent,
categoryEvent: this.categoryEvent
}
this.sharedObj = { this.sharedObj = {
searchTableColumns: {}, searchTableColumns: {},
glossary: { glossary: {
...@@ -89,8 +93,7 @@ define([ ...@@ -89,8 +93,7 @@ define([
var that = this; var that = this;
$("body").on("click", "a.show-stat", function() { $("body").on("click", "a.show-stat", function() {
require(["views/site/Statistics"], function(Statistics) { require(["views/site/Statistics"], function(Statistics) {
new Statistics(_.extend({ searchVent: that.searchVent }, that.preFetchedCollectionLists, new Statistics(_.extend({}, that.preFetchedCollectionLists, that.sharedObj, that.ventObj));
that.sharedObj));
}); });
}); });
$("body").on("click", "li.aboutAtlas", function() { $("body").on("click", "li.aboutAtlas", function() {
...@@ -167,29 +170,45 @@ define([ ...@@ -167,29 +170,45 @@ define([
this.view.currentView.manualRender(options); this.view.currentView.manualRender(options);
}, },
render: function() { render: function() {
return new Header(_.extend({}, that.preFetchedCollectionLists, that.sharedObj, options)); return new Header(_.extend({}, that.preFetchedCollectionLists, that.sharedObj, that.ventObj, options));
} }
}; };
}, },
renderTagLayoutView: function(tagName) { detailPage: function(id) {
var that = this; var that = this;
require(["views/site/Header", "views/tag/TagContainerLayoutView", "views/site/SideNavLayoutView"], function(Header, TagContainerLayoutView, SideNavLayoutView) { 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(), var paramObj = Utils.getUrlState.getQueryParams(),
url = Utils.getUrlState.getQueryUrl().queyParams[0]; options = _.extend({}, that.preFetchedCollectionLists, that.sharedObj, that.ventObj);
that.renderViewIfNotExists(that.getHeaderOptions(Header)); that.renderViewIfNotExists(that.getHeaderOptions(Header));
// updating paramObj to check for new queryparam. that.renderViewIfNotExists({
paramObj = Utils.getUrlState.getQueryParams(); view: App.rSideNav,
if (paramObj && paramObj.dlttag) { manualRender: function() {
return false; 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();
that.renderViewIfNotExists(that.getHeaderOptions(Header));
var options = _.extend({ var options = _.extend({
tag: tagName, tag: tagName,
value: paramObj, value: paramObj
searchVent: that.searchVent,
categoryEvent: that.categoryEvent
}, },
that.preFetchedCollectionLists, that.preFetchedCollectionLists,
that.sharedObj that.sharedObj,
that.ventObj
) )
that.renderViewIfNotExists({ that.renderViewIfNotExists({
view: App.rSideNav, view: App.rSideNav,
...@@ -200,39 +219,21 @@ define([ ...@@ -200,39 +219,21 @@ define([
return new SideNavLayoutView(options); return new SideNavLayoutView(options);
} }
}); });
App.rContent.show( App.rContent.show(new TagContainerLayoutView(options));
new TagContainerLayoutView(
_.extend({
tag: tagName,
value: paramObj,
searchVent: that.searchVent
},
that.preFetchedCollectionLists,
that.sharedObj
)
)
);
}); });
}, },
renderGlossaryLayoutView: function(id) { renderGlossaryLayoutView: function(id) {
var that = this; var that = this;
require(["views/site/Header", "views/glossary/GlossaryContainerLayoutView", "views/site/SideNavLayoutView"], function(Header, GlossaryContainerLayoutView, SideNavLayoutView) { require(["views/site/Header", "views/glossary/GlossaryContainerLayoutView", "views/site/SideNavLayoutView"], function(Header, GlossaryContainerLayoutView, SideNavLayoutView) {
var paramObj = Utils.getUrlState.getQueryParams(), var paramObj = Utils.getUrlState.getQueryParams();
url = Utils.getUrlState.getQueryUrl().queyParams[0];
that.renderViewIfNotExists(that.getHeaderOptions(Header)); 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({ var options = _.extend({
guid: id, guid: id,
value: paramObj, value: paramObj
searchVent: that.searchVent,
categoryEvent: that.categoryEvent
}, },
that.preFetchedCollectionLists, that.preFetchedCollectionLists,
that.sharedObj that.sharedObj,
that.ventObj
); );
that.renderViewIfNotExists({ that.renderViewIfNotExists({
...@@ -327,8 +328,6 @@ define([ ...@@ -327,8 +328,6 @@ define([
} }
var options = _.extend({ var options = _.extend({
value: paramObj, value: paramObj,
searchVent: that.searchVent,
categoryEvent: that.categoryEvent,
initialView: isinitialView, initialView: isinitialView,
fromDefaultSearch: opt ? (opt && !opt.fromSearchResultView) : true, fromDefaultSearch: opt ? (opt && !opt.fromSearchResultView) : true,
fromSearchResultView: (opt && opt.fromSearchResultView) || false, fromSearchResultView: (opt && opt.fromSearchResultView) || false,
...@@ -336,7 +335,8 @@ define([ ...@@ -336,7 +335,8 @@ define([
isTypeTagNotExists: paramObj && (paramObj.type != tempParam.type || tempParam.tag != paramObj.tag) isTypeTagNotExists: paramObj && (paramObj.type != tempParam.type || tempParam.tag != paramObj.tag)
}, },
that.preFetchedCollectionLists, that.preFetchedCollectionLists,
that.sharedObj that.sharedObj,
that.ventObj
); );
that.renderViewIfNotExists( that.renderViewIfNotExists(
that.getHeaderOptions(Header, { that.getHeaderOptions(Header, {
...@@ -349,9 +349,7 @@ define([ ...@@ -349,9 +349,7 @@ define([
this.view.currentView.manualRender(options); this.view.currentView.manualRender(options);
}, },
render: function() { render: function() {
return new SideNavLayoutView( return new SideNavLayoutView(options);
_.extend({}, that.preFetchedCollectionLists, that.sharedObj, options)
);
} }
}); });
that.renderViewIfNotExists({ that.renderViewIfNotExists({
...@@ -366,153 +364,30 @@ define([ ...@@ -366,153 +364,30 @@ define([
}); });
}); });
}, },
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() { administrator: function() {
var that = this; var that = this;
require(["views/site/Header", "views/site/SideNavLayoutView", 'views/administrator/AdministratorLayoutView'], function(Header, SideNavLayoutView, AdministratorLayoutView) { require(["views/site/Header", "views/site/SideNavLayoutView", 'views/administrator/AdministratorLayoutView'], function(Header, SideNavLayoutView, AdministratorLayoutView) {
var value = Utils.getUrlState.getQueryParams(), var paramObj = Utils.getUrlState.getQueryParams(),
paramObj = _.extend({ value: value, guid: null }, that.preFetchedCollectionLists, that.sharedObj); options = _.extend({}, that.preFetchedCollectionLists, that.sharedObj, that.ventObj);
that.renderViewIfNotExists(that.getHeaderOptions(Header)); that.renderViewIfNotExists(that.getHeaderOptions(Header));
that.renderViewIfNotExists({ that.renderViewIfNotExists({
view: App.rSideNav, view: App.rSideNav,
manualRender: function() { manualRender: function() {
this.view.currentView.manualRender(paramObj); this.view.currentView.manualRender(options);
}, },
render: function() { render: function() {
return new SideNavLayoutView( return new SideNavLayoutView(options);
_.extend({ searchVent: that.searchVent, categoryEvent: that.categoryEvent }, that.preFetchedCollectionLists, that.sharedObj)
);
} }
}); });
App.rContent.show(new AdministratorLayoutView(paramObj)); App.rContent.show(new AdministratorLayoutView(_.extend({ value: paramObj, guid: null }, options)));
}); });
}, },
businessMetadataDetailPage: function(guid) { businessMetadataDetailPage: function(guid) {
var that = this; var that = this;
require(["views/site/Header", "views/site/SideNavLayoutView", "views/business_metadata/BusinessMetadataContainerLayoutView", ], function(Header, SideNavLayoutView, BusinessMetadataContainerLayoutView) { 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)); that.renderViewIfNotExists(that.getHeaderOptions(Header));
var options = _.extend({
guid: guid,
value: paramObj,
searchVent: that.searchVent,
categoryEvent: that.categoryEvent
},
that.preFetchedCollectionLists,
that.sharedObj
)
that.renderViewIfNotExists({ that.renderViewIfNotExists({
view: App.rSideNav, view: App.rSideNav,
manualRender: function() { manualRender: function() {
......
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,
columnOpts: { includeAtlasTableSorting: true,
opts: { atlasPaginationOpts: {
initialColumnsVisible: null, limit: this.limit,
saveState: false offset: this.offset,
}, fetchCollection: this.getAdminCollection.bind(this),
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 gridOpts: {
emptyText: 'No Record found!',
className: 'table table-hover backgrid table-quickMenu colSort'
}, },
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;
if (this.modal) {
this.$el.on('click', '.linkClicked', function() { this.$el.on('click', '.linkClicked', function() {
that.modal.close(); 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