Skip to content

Commit

Permalink
fix: [email protected] (#1019)
Browse files Browse the repository at this point in the history 
* fix: dep upgrade

* add totalPages param

* upgrade d2-a

* d2-analysis
  • Loading branch information
@janhenrikoverland
janhenrikoverland authored Apr 20, 2022
1 parent 0c1fd58 commit 26c46b7
Show file tree
Hide file tree
Showing 9 changed files with 56 additions and 53 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
"homepage": "https://github.com/dhis2/event-reports-app#readme",
"dependencies": {
"d2-analysis": "33.2.24",
"d2-analysis": "^33.2.27",
"d2-utilizr": "0.2.13"
},
"devDependencies": {
Expand Down
18 changes: 9 additions & 9 deletions src/api/Dimension.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,33 +22,33 @@ export var Dimension = function(refs, c, applyConfig, forceApplyConfig) {
t.programStage = c.programStage;
}

if (isString(c.filter)) {
if (isString(c.filter)) {
t.filter = c.filter;
}

if (isString(c.name)) {
if (isString(c.name)) {
t.name = c.name;
}

if (isObject(c.legendSet)) {
if (isObject(c.legendSet)) {
t.legendSet = c.legendSet;
}

// force apply
Object.assign(t, forceApplyConfig);

t.getIgnoreUrlDimensions = function() {
t.getIgnoreUrlDimensions = function() {
return _ignoreUrlDimensions;
};

t.getRefs = function() {
t.getRefs = function() {
return refs;
};
};

Dimension.prototype = d2aDimension.prototype;

Dimension.prototype.isIgnoreDimension = function() {
Dimension.prototype.isIgnoreDimension = function() {
return arrayContains(this.getIgnoreUrlDimensions(), this.dimension);
};

Expand All @@ -57,13 +57,13 @@ Dimension.prototype.isIgnoreDimension = function() {
const getFullId = dim => (dim.programStage ? dim.programStage.id + '.' : '') + dim.dimension;

Dimension.prototype.url = function(isSorted, response, isFilter) {
if (this.isIgnoreDimension()) {
if (this.isIgnoreDimension()) {
return '';
}

var url = (isFilter ? 'filter' : 'dimension') + '=' + getFullId(this);

if (isObject(this.legendSet)) {
if (isObject(this.legendSet)) {
url += '-' + this.legendSet.id;
}

Expand All @@ -73,7 +73,7 @@ Dimension.prototype.url = function(isSorted, response, isFilter) {
url += ':' + records.join(';');
}

if (isString(this.filter)) {
if (isString(this.filter)) {
url += ':' + this.filter;
}

Expand Down
3 changes: 3 additions & 0 deletions src/api/Layout.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,9 @@ Layout.prototype.req = function(source, format, isSorted, isTableLayout, isFilte
request.add('completedOnly=true');
}

// total pages
request.add('totalPages=false')

// normal request only
if (!isTableLayout) {
// hierarchy
Expand Down
34 changes: 17 additions & 17 deletions src/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ appManager.init(() => {
requestManager.run();
});

function initialize() {
function initialize() {

// i18n init
var i18n = i18nManager.get();
Expand All @@ -134,13 +134,13 @@ function initialize() {
appManager.appName = i18n.event_reports || 'Event Reports';

// instance manager
instanceManager.setFn(function(layout) {
instanceManager.setFn(function(layout) {

let tableOptions = { renderLimit: 100000 }
let sortingId = layout.sorting ? layout.sorting.id : null;
let response = layout.getResponse();

let afterLoad = function() {
let afterLoad = function() {

// mask
uiManager.unmask();
Expand All @@ -149,7 +149,7 @@ function initialize() {
instanceManager.postDataStatistics();
};

let createPivotTable = function(layout, response) {
let createPivotTable = function(layout, response) {

let statusBar = uiManager.get('statusBar');

Expand All @@ -161,7 +161,7 @@ function initialize() {
}

// pre-sort if id
if (sortingId && sortingId !== 'total') {
if (sortingId && sortingId !== 'total') {
layout.sort();
}

Expand All @@ -183,11 +183,11 @@ function initialize() {
afterLoad();
};

var createEventDataTable = function(layout, response) {
var createEventDataTable = function(layout, response) {
var _table = new table.EventDataTable(refs, layout, response);
var statusBar = uiManager.get('statusBar');

if (_table) {
if (_table) {

// render
uiManager.update(_table.html);
Expand All @@ -199,15 +199,15 @@ function initialize() {
// events
tableManager.setColumnHeaderMouseHandlers(_layout, _table);

if (statusBar) {
if (statusBar) {
statusBar.setStatus(layout, response);
}

afterLoad();
}
};

if (layout.dataType === 'AGGREGATED_VALUES') {
if (layout.dataType === 'AGGREGATED_VALUES') {
createPivotTable(layout, response);
}
else if (layout.dataType === 'EVENTS') {
Expand All @@ -226,7 +226,7 @@ function initialize() {
}

// sort if total
if (sortingId && sortingId === 'total') {
if (sortingId && sortingId === 'total') {

// sort pivot table based on totals
layout.sort(pivotTable);
Expand Down Expand Up @@ -364,14 +364,14 @@ function initialize() {
menuItem3Text: i18n.open_last_chart
});

var getWindowByDataType = function(aggName, queryName) {
var getWindowByDataType = function(aggName, queryName) {
var dataType = uiManager.get('dataTypeToolbar').getDataType(),
window;

if (dataType === dimensionConfig.dataType['aggregated_values']) {
if (dataType === dimensionConfig.dataType['aggregated_values']) {
window = uiManager.get(aggName);
}
else if (dataType === dimensionConfig.dataType['individual_cases']) {
else if (dataType === dimensionConfig.dataType['individual_cases']) {
window = uiManager.get(queryName);
}

Expand All @@ -385,16 +385,16 @@ function initialize() {
westRegionItems: westRegionItems,
dataTypeToolbar: dataTypeToolbar,
statusBar: statusBar,
integrationButtons: [
integrationButtons: [
defaultIntegrationButton,
chartIntegrationButton
],
DownloadButtonItems: DownloadButtonItems,
}, {
getLayoutWindow: function() {
}, {
getLayoutWindow: function() {
return getWindowByDataType('aggregateLayoutWindow', 'queryLayoutWindow');
},
getOptionsWindow: function() {
getOptionsWindow: function() {
return getWindowByDataType('aggregateOptionsWindow', 'queryOptionsWindow');
},
}), 'viewport');
Expand Down
16 changes: 8 additions & 8 deletions src/manager/InstanceManager.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,27 @@ import { InstanceManager } from 'd2-analysis';

export { InstanceManager };

InstanceManager.prototype.getReport = function(layout, isFavorite, skipState, forceUiState, fn) {
InstanceManager.prototype.getReport = function(layout, isFavorite, skipState, forceUiState, fn) {
var t = this,
refs = t.getRefs();

// var { indexedDbManager } = refs;

var { Response } = refs.api;

var _fn = function() {
if (!skipState) {
var _fn = function() {
if (!skipState) {
t.setState(layout, isFavorite, false, forceUiState);
}

(fn || t.getFn())(layout);
};

// layout
if (!layout) {
if (!layout) {
layout = t.getLayout();

if (!layout) {
if (!layout) {
return;
}
}
Expand All @@ -40,7 +40,7 @@ InstanceManager.prototype.getReport = function(layout, isFavorite, skipState, fo
var response = layout.getResponse();

// fn
if (response) {
if (response) {
_fn();
}
else {
Expand All @@ -53,14 +53,14 @@ InstanceManager.prototype.getReport = function(layout, isFavorite, skipState, fo

// var optionSetIds = res.headers.filter(h => !!h.optionSet).map(h => h.optionSet);

// var fn = function() {
// var fn = function() {
// layout.setResponse(new Response(refs, res));

// _fn();
// };

// init
// if (optionSetIds.length) {
// if (optionSetIds.length) {
// indexedDbManager.getOptionSets(optionSetIds, fn);
// }
// else {
Expand Down
24 changes: 12 additions & 12 deletions src/plugin.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ dimensionConfig.applyTo(arrayTo(table));
optionConfig.applyTo([].concat(arrayTo(api), arrayTo(table)));

// plugin
function render(plugin, layout) {
function render(plugin, layout) {
if (!util.dom.validateTargetDiv(layout.el)) {
return;
}
Expand Down Expand Up @@ -108,7 +108,7 @@ function render(plugin, layout) {
// initialize
uiManager.setInstanceManager(instanceManager);

instanceManager.setFn(function(_layout) {
instanceManager.setFn(function(_layout) {

if (!util.dom.validateTargetDiv(_layout.el)) {
return;
Expand All @@ -123,10 +123,10 @@ function render(plugin, layout) {
uiManager.getTitleHtml(title) : '') + _tableObject.html;
};

var createPivotTable = function(__layout) {
var createPivotTable = function(__layout) {

// pre-sort if id
if (sortingId && sortingId !== 'total') {
if (sortingId && sortingId !== 'total') {
__layout.sort();
}

Expand All @@ -137,7 +137,7 @@ function render(plugin, layout) {
pivotTable.initialize();

// sort if total
if (sortingId && sortingId === 'total') {
if (sortingId && sortingId === 'total') {
__layout.sort(pivotTable);
pivotTable.initialize();
}
Expand All @@ -159,12 +159,12 @@ function render(plugin, layout) {
uiManager.unmask();
};

var createEventDataTable = function(__layout) {
var createEventDataTable = function(__layout) {
let statusBar = uiManager.get('statusBar');

let eventTable = new table.EventDataTable(refs, __layout, _response);

if (eventTable) {
if (eventTable) {

var html = getHtml(__layout.title || __layout.name, eventTable);

Expand All @@ -177,7 +177,7 @@ function render(plugin, layout) {
// events
tableManager.setColumnHeaderMouseHandlers(__layout, eventTable);

if (statusBar) {
if (statusBar) {
statusBar.setStatus(__layout, _response);
}

Expand All @@ -186,20 +186,20 @@ function render(plugin, layout) {
}
};

if (_layout.dataType === dimensionConfig.dataType['aggregated_values']) {
if (_layout.dataType === dimensionConfig.dataType['aggregated_values']) {
createPivotTable(_layout);
}
else if (_layout.dataType === dimensionConfig.dataType['individual_cases']) {
createEventDataTable(_layout);
}
});

if (plugin.loadingIndicator) {
if (plugin.loadingIndicator) {
uiManager.renderLoadingIndicator(layout.el);
}

if (layout.id) {
instanceManager.getById(layout.id, function(_layout) {
if (layout.id) {
instanceManager.getById(layout.id, function(_layout) {
_layout = new api.Layout(instanceRefs, objectApplyIf(layout, _layout));

if (!util.dom.validateTargetDiv(_layout.el)) {
Expand Down
2 changes: 1 addition & 1 deletion src/ui/DataTypeToolbar.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export var DataTypeToolbar;

DataTypeToolbar = function(refs) {
DataTypeToolbar = function(refs) {
var uiManager = refs.uiManager,
i18nManager = refs.i18nManager,
dimensionConfig = refs.dimensionConfig,
Expand Down
2 changes: 1 addition & 1 deletion src/ui/QueryLayoutWindow.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ QueryLayoutWindow = function(c) {
saveState: saveState,
resetData: resetData,
reset: reset,
getDefaultStore: function() {
getDefaultStore: function() {
return colStore;
},
getValueConfig: function() {
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1734,10 +1734,10 @@ currently-unhandled@^0.4.1:
dependencies:
array-find-index "^1.0.1"

[email protected].24:
version "33.2.24"
resolved "https://registry.yarnpkg.com/d2-analysis/-/d2-analysis-33.2.24.tgz#abc8ef91610ad5d537f09ede613cdb0a8c477725"
integrity sha512-BSJvhdWZMPLBKYj/nRwM1Oe36eKIighmItgud9eN52jJ/99OPbO5O81dHaajJMggwGx3FFXDaivlIZEIBNXPZg==
d2-analysis@^33.2.27:
version "33.2.27"
resolved "https://registry.yarnpkg.com/d2-analysis/-/d2-analysis-33.2.27.tgz#e8cd6c83762b89321e1a7e914fbd20fb2a7f9653"
integrity sha512-DTeABRfu7ZUA6UHsB5J2uyMNUI9WqUe7dzL6LyaPhwmyGwCErPwOqhKhCY6vPn+uv1soFYCs/gxLCV4AeEuTfw==
dependencies:
"@dhis2/d2-ui-rich-text" "^5.1.0"
d2-utilizr "^0.2.16"
Expand Down

0 comments on commit 26c46b7

Please sign in to comment.