@dhis2/analytics 21.0.0-alpha.1 → 21.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +2775 -0
- package/build/cjs/__demo__/Filter.stories.js +2 -2
- package/build/cjs/__demo__/FixedPeriodSelect.stories.js +2 -2
- package/build/cjs/__demo__/OpenFileDialog.stories.js +1 -1
- package/build/cjs/__demo__/OrgUnitDimension.stories.js +17 -8
- package/build/cjs/__demo__/PivotTable.stories.js +2 -2
- package/build/cjs/api/analytics/AnalyticsBase.js +1 -1
- package/build/cjs/api/analytics/AnalyticsRequest.js +1 -1
- package/build/cjs/api/analytics/AnalyticsRequestBase.js +3 -3
- package/build/cjs/api/analytics/AnalyticsRequestPropertiesMixin.js +7 -7
- package/build/cjs/api/analytics/AnalyticsResponse.js +2 -2
- package/build/cjs/api/analytics/__tests__/AnalyticsAggregate.spec.js +1 -11
- package/build/cjs/api/analytics/__tests__/AnalyticsRequest.spec.js +9 -9
- package/build/cjs/api/analytics/__tests__/AnalyticsRequestBase.spec.js +4 -4
- package/build/cjs/api/analytics/utils.js +1 -1
- package/build/cjs/api/dimensions.js +37 -37
- package/build/cjs/api/organisationUnits.js +5 -5
- package/build/cjs/components/AboutAOUnit/AboutAOUnit.js +226 -0
- package/build/cjs/components/AboutAOUnit/styles/AboutAOUnit.style.js +13 -0
- package/build/cjs/components/DataDimension/DataTypesSelector.js +3 -3
- package/build/cjs/components/DataDimension/DetailSelector.js +2 -2
- package/build/cjs/components/DataDimension/GroupSelector.js +9 -9
- package/build/cjs/components/DataDimension/ItemSelector.js +19 -19
- package/build/cjs/components/DataDimension/MetricSelector.js +3 -3
- package/build/cjs/components/DataDimension/styles/DataTypesSelector.style.js +1 -1
- package/build/cjs/components/DataDimension/styles/DetailSelector.style.js +1 -1
- package/build/cjs/components/DataDimension/styles/GroupSelector.style.js +1 -1
- package/build/cjs/components/DataDimension/styles/MetricSelector.style.js +1 -1
- package/build/cjs/components/DimensionMenu.js +10 -10
- package/build/cjs/components/DimensionsPanel/DimensionsPanel.js +2 -2
- package/build/cjs/components/DimensionsPanel/List/DimensionItem.js +5 -5
- package/build/cjs/components/DimensionsPanel/List/DimensionLabel.js +2 -2
- package/build/cjs/components/DimensionsPanel/List/DimensionList.js +10 -10
- package/build/cjs/components/DimensionsPanel/List/styles/DimensionList.style.js +1 -1
- package/build/cjs/components/DimensionsPanel/styles/DimensionsPanel.style.js +1 -1
- package/build/cjs/components/DynamicDimension/DynamicDimension.js +4 -4
- package/build/cjs/components/DynamicDimension/ItemSelector.js +8 -8
- package/build/cjs/components/DynamicDimension/styles/DynamicDimension.style.js +1 -1
- package/build/cjs/components/FileMenu/DeleteDialog.js +4 -4
- package/build/cjs/components/FileMenu/FileMenu.js +7 -7
- package/build/cjs/components/FileMenu/FileMenu.styles.js +1 -1
- package/build/cjs/components/FileMenu/GetLinkDialog.js +3 -3
- package/build/cjs/components/FileMenu/RenameDialog.js +4 -4
- package/build/cjs/components/FileMenu/SaveAsDialog.js +4 -4
- package/build/cjs/components/FileMenu/__tests__/DeleteDialog.spec.js +1 -1
- package/build/cjs/components/FileMenu/__tests__/RenameDialog.spec.js +1 -1
- package/build/cjs/components/FileMenu/__tests__/SaveAsDialog.spec.js +1 -1
- package/build/cjs/components/FileMenu/utils.js +3 -3
- package/build/cjs/components/Filter/Filter.js +1 -1
- package/build/cjs/components/Filter/styles/Filter.style.js +1 -1
- package/build/cjs/components/LegendKey/LegendKey.js +9 -9
- package/build/cjs/components/LegendKey/styles/LegendKey.style.js +1 -1
- package/build/cjs/components/OpenFileDialog/CustomSelectOption.js +2 -2
- package/build/cjs/components/OpenFileDialog/OpenFileDialog.js +21 -21
- package/build/cjs/components/OpenFileDialog/OpenFileDialog.styles.js +1 -1
- package/build/cjs/components/OpenFileDialog/styles/CustomSelectOption.style.js +1 -1
- package/build/cjs/components/Options/VisualizationOptions.js +2 -2
- package/build/cjs/components/Options/styles/VisualizationOptions.style.js +10 -10
- package/build/cjs/components/OrgUnitDimension/OrgUnitDimension.js +90 -20
- package/build/cjs/components/OrgUnitDimension/styles/OrgUnitDimension.style.js +2 -2
- package/build/cjs/components/PeriodDimension/FixedPeriodFilter.js +5 -5
- package/build/cjs/components/PeriodDimension/FixedPeriodSelect.js +6 -6
- package/build/cjs/components/PeriodDimension/PeriodTransfer.js +11 -11
- package/build/cjs/components/PeriodDimension/RelativePeriodFilter.js +2 -2
- package/build/cjs/components/PeriodDimension/styles/FixedPeriodSelect.style.js +1 -1
- package/build/cjs/components/PeriodDimension/styles/PeriodFilter.style.js +1 -1
- package/build/cjs/components/PeriodDimension/utils/fixedPeriods.js +49 -49
- package/build/cjs/components/PivotTable/PivotTable.js +2 -2
- package/build/cjs/components/PivotTable/PivotTableCell.js +3 -3
- package/build/cjs/components/PivotTable/PivotTableColumnHeaderCell.js +2 -2
- package/build/cjs/components/PivotTable/PivotTableContainer.js +2 -2
- package/build/cjs/components/PivotTable/PivotTableEngineContext.js +2 -2
- package/build/cjs/components/PivotTable/PivotTableSortIcon.js +2 -2
- package/build/cjs/components/PivotTable/PivotTableTitleRow.js +4 -4
- package/build/cjs/components/PivotTable/PivotTableValueCell.js +2 -2
- package/build/cjs/components/PivotTable/styles/PivotTable.style.js +3 -3
- package/build/cjs/components/TransferOption.js +7 -7
- package/build/cjs/components/styles/DimensionSelector.style.js +1 -1
- package/build/cjs/components/styles/TransferOption.style.js +1 -1
- package/build/cjs/index.js +28 -2
- package/build/cjs/locales/en/translations.json +26 -0
- package/build/cjs/modules/axis.js +1 -1
- package/build/cjs/modules/layoutUiRules/rules.js +1 -1
- package/build/cjs/modules/list.js +25 -0
- package/build/cjs/modules/ouIdHelper/index.js +2 -2
- package/build/cjs/modules/pivotTable/PivotTableEngine.js +3 -3
- package/build/cjs/modules/pivotTable/measureText.js +1 -1
- package/build/cjs/modules/visTypes.js +1 -1
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/addTrendLines.js +1 -1
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/axis.js +2 -2
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/getAxisTitle.js +1 -1
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/index.js +2 -2
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/legend.js +8 -19
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/legendSet.js +1 -1
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/plotOptions.js +1 -1
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/subtitle/index.js +1 -1
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/title/index.js +1 -1
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/title/scatter.js +1 -1
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/xAxis/index.js +1 -1
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/yAxis/gauge.js +3 -3
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/yAxis/index.js +2 -2
- package/build/cjs/visualizations/config/generators/dhis/singleValue.js +5 -5
- package/build/cjs/visualizations/config/index.js +3 -3
- package/build/cjs/visualizations/store/adapters/dhis_dhis/index.js +1 -1
- package/build/cjs/visualizations/store/adapters/dhis_highcharts/index.js +1 -1
- package/build/cjs/visualizations/store/adapters/dhis_highcharts/twoCategory.js +1 -1
- package/build/cjs/visualizations/store/index.js +2 -2
- package/build/cjs/visualizations/util/__tests__/getFilterText.spec.js +1 -1
- package/build/cjs/visualizations/util/axisId.js +1 -1
- package/build/cjs/visualizations/util/getFilterText.js +4 -12
- package/build/es/__demo__/OpenFileDialog.stories.js +1 -1
- package/build/es/__demo__/OrgUnitDimension.stories.js +15 -6
- package/build/es/api/analytics/AnalyticsBase.js +1 -1
- package/build/es/api/analytics/AnalyticsRequest.js +1 -1
- package/build/es/api/analytics/AnalyticsRequestBase.js +3 -3
- package/build/es/api/analytics/AnalyticsRequestPropertiesMixin.js +7 -7
- package/build/es/api/analytics/AnalyticsResponse.js +2 -2
- package/build/es/api/analytics/__tests__/AnalyticsAggregate.spec.js +1 -11
- package/build/es/api/analytics/__tests__/AnalyticsRequest.spec.js +9 -9
- package/build/es/api/analytics/__tests__/AnalyticsRequestBase.spec.js +4 -4
- package/build/es/api/analytics/utils.js +1 -1
- package/build/es/api/dimensions.js +39 -39
- package/build/es/api/organisationUnits.js +5 -5
- package/build/es/components/AboutAOUnit/AboutAOUnit.js +203 -0
- package/build/es/components/AboutAOUnit/styles/AboutAOUnit.style.js +4 -0
- package/build/es/components/DataDimension/DataTypesSelector.js +3 -3
- package/build/es/components/DataDimension/DetailSelector.js +2 -2
- package/build/es/components/DataDimension/GroupSelector.js +7 -7
- package/build/es/components/DataDimension/ItemSelector.js +17 -17
- package/build/es/components/DataDimension/MetricSelector.js +3 -3
- package/build/es/components/DataDimension/styles/DataTypesSelector.style.js +1 -1
- package/build/es/components/DataDimension/styles/DetailSelector.style.js +1 -1
- package/build/es/components/DataDimension/styles/GroupSelector.style.js +1 -1
- package/build/es/components/DataDimension/styles/MetricSelector.style.js +1 -1
- package/build/es/components/DimensionMenu.js +10 -10
- package/build/es/components/DimensionsPanel/List/DimensionItem.js +3 -3
- package/build/es/components/DimensionsPanel/List/DimensionList.js +8 -8
- package/build/es/components/DimensionsPanel/List/styles/DimensionList.style.js +1 -1
- package/build/es/components/DimensionsPanel/styles/DimensionsPanel.style.js +1 -1
- package/build/es/components/DynamicDimension/DynamicDimension.js +4 -4
- package/build/es/components/DynamicDimension/ItemSelector.js +6 -6
- package/build/es/components/DynamicDimension/styles/DynamicDimension.style.js +1 -1
- package/build/es/components/FileMenu/DeleteDialog.js +1 -1
- package/build/es/components/FileMenu/FileMenu.js +4 -4
- package/build/es/components/FileMenu/FileMenu.styles.js +1 -1
- package/build/es/components/FileMenu/GetLinkDialog.js +2 -2
- package/build/es/components/FileMenu/RenameDialog.js +1 -1
- package/build/es/components/FileMenu/SaveAsDialog.js +1 -1
- package/build/es/components/FileMenu/__tests__/DeleteDialog.spec.js +1 -1
- package/build/es/components/FileMenu/__tests__/RenameDialog.spec.js +1 -1
- package/build/es/components/FileMenu/__tests__/SaveAsDialog.spec.js +1 -1
- package/build/es/components/FileMenu/utils.js +3 -3
- package/build/es/components/Filter/Filter.js +1 -1
- package/build/es/components/Filter/styles/Filter.style.js +1 -1
- package/build/es/components/LegendKey/LegendKey.js +9 -9
- package/build/es/components/LegendKey/styles/LegendKey.style.js +1 -1
- package/build/es/components/OpenFileDialog/CustomSelectOption.js +2 -2
- package/build/es/components/OpenFileDialog/OpenFileDialog.js +19 -19
- package/build/es/components/OpenFileDialog/OpenFileDialog.styles.js +1 -1
- package/build/es/components/OpenFileDialog/styles/CustomSelectOption.style.js +1 -1
- package/build/es/components/Options/styles/VisualizationOptions.style.js +10 -10
- package/build/es/components/OrgUnitDimension/OrgUnitDimension.js +88 -19
- package/build/es/components/OrgUnitDimension/styles/OrgUnitDimension.style.js +2 -2
- package/build/es/components/PeriodDimension/FixedPeriodFilter.js +5 -5
- package/build/es/components/PeriodDimension/FixedPeriodSelect.js +8 -8
- package/build/es/components/PeriodDimension/PeriodTransfer.js +9 -9
- package/build/es/components/PeriodDimension/RelativePeriodFilter.js +2 -2
- package/build/es/components/PeriodDimension/styles/FixedPeriodSelect.style.js +1 -1
- package/build/es/components/PeriodDimension/styles/PeriodFilter.style.js +1 -1
- package/build/es/components/PeriodDimension/utils/fixedPeriods.js +49 -49
- package/build/es/components/PivotTable/PivotTableCell.js +3 -3
- package/build/es/components/PivotTable/PivotTableColumnHeaderCell.js +2 -2
- package/build/es/components/PivotTable/PivotTableContainer.js +2 -2
- package/build/es/components/PivotTable/PivotTableSortIcon.js +2 -2
- package/build/es/components/PivotTable/PivotTableTitleRow.js +2 -2
- package/build/es/components/PivotTable/styles/PivotTable.style.js +3 -3
- package/build/es/components/TransferOption.js +17 -17
- package/build/es/components/styles/DimensionSelector.style.js +1 -1
- package/build/es/components/styles/TransferOption.style.js +1 -1
- package/build/es/index.js +3 -2
- package/build/es/locales/en/translations.json +26 -0
- package/build/es/modules/axis.js +1 -1
- package/build/es/modules/layoutUiRules/rules.js +1 -1
- package/build/es/modules/list.js +13 -0
- package/build/es/modules/ouIdHelper/index.js +2 -2
- package/build/es/modules/pivotTable/PivotTableEngine.js +3 -3
- package/build/es/modules/pivotTable/measureText.js +1 -1
- package/build/es/modules/visTypes.js +1 -1
- package/build/es/visualizations/config/adapters/dhis_highcharts/addTrendLines.js +1 -1
- package/build/es/visualizations/config/adapters/dhis_highcharts/axis.js +2 -2
- package/build/es/visualizations/config/adapters/dhis_highcharts/getAxisTitle.js +1 -1
- package/build/es/visualizations/config/adapters/dhis_highcharts/legend.js +8 -19
- package/build/es/visualizations/config/adapters/dhis_highcharts/legendSet.js +1 -1
- package/build/es/visualizations/config/adapters/dhis_highcharts/plotOptions.js +1 -1
- package/build/es/visualizations/config/adapters/dhis_highcharts/subtitle/index.js +1 -1
- package/build/es/visualizations/config/adapters/dhis_highcharts/title/index.js +1 -1
- package/build/es/visualizations/config/adapters/dhis_highcharts/title/scatter.js +1 -1
- package/build/es/visualizations/config/adapters/dhis_highcharts/xAxis/index.js +1 -1
- package/build/es/visualizations/config/adapters/dhis_highcharts/yAxis/gauge.js +3 -3
- package/build/es/visualizations/config/adapters/dhis_highcharts/yAxis/index.js +2 -2
- package/build/es/visualizations/config/generators/dhis/singleValue.js +5 -5
- package/build/es/visualizations/config/index.js +3 -3
- package/build/es/visualizations/store/adapters/dhis_dhis/index.js +1 -1
- package/build/es/visualizations/store/adapters/dhis_highcharts/index.js +1 -1
- package/build/es/visualizations/store/adapters/dhis_highcharts/twoCategory.js +1 -1
- package/build/es/visualizations/store/index.js +2 -2
- package/build/es/visualizations/util/__tests__/getFilterText.spec.js +1 -1
- package/build/es/visualizations/util/axisId.js +1 -1
- package/build/es/visualizations/util/getFilterText.js +5 -13
- package/package.json +4 -4
- package/build/cjs/components/OrgUnitDimension/OrgUnitDimensionOld.js +0 -244
- package/build/es/components/OrgUnitDimension/OrgUnitDimensionOld.js +0 -220
|
@@ -8,9 +8,9 @@ var _Filter = _interopRequireDefault(require("../components/Filter/Filter"));
|
|
|
8
8
|
|
|
9
9
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
10
10
|
|
|
11
|
-
function _getRequireWildcardCache(
|
|
11
|
+
function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
|
|
12
12
|
|
|
13
|
-
function _interopRequireWildcard(obj
|
|
13
|
+
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
14
14
|
|
|
15
15
|
function FilterWithState() {
|
|
16
16
|
const [text, setText] = (0, _react2.useState)(null);
|
|
@@ -8,9 +8,9 @@ var _FixedPeriodSelect = _interopRequireDefault(require("../components/PeriodDim
|
|
|
8
8
|
|
|
9
9
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
10
10
|
|
|
11
|
-
function _getRequireWildcardCache(
|
|
11
|
+
function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
|
|
12
12
|
|
|
13
|
-
function _interopRequireWildcard(obj
|
|
13
|
+
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
14
14
|
|
|
15
15
|
(0, _react.storiesOf)('FixedPeriodSelect', module).add('No value', () => {
|
|
16
16
|
const [value, setValue] = (0, _react2.useState)();
|
|
@@ -20,7 +20,7 @@ const user = {
|
|
|
20
20
|
username: 'admin'
|
|
21
21
|
};
|
|
22
22
|
|
|
23
|
-
const onFileSelect = id => alert(
|
|
23
|
+
const onFileSelect = id => alert("Opening ".concat(id));
|
|
24
24
|
|
|
25
25
|
(0, _react.storiesOf)('OpenFileDialog', module).add('List of visualizations', () => /*#__PURE__*/_react2.default.createElement(_appRuntime.Provider, {
|
|
26
26
|
config: configMock
|
|
@@ -10,23 +10,23 @@ var _OrgUnitDimension = _interopRequireDefault(require("../components/OrgUnitDim
|
|
|
10
10
|
|
|
11
11
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
12
12
|
|
|
13
|
-
function _getRequireWildcardCache(
|
|
13
|
+
function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
|
|
14
14
|
|
|
15
|
-
function _interopRequireWildcard(obj
|
|
15
|
+
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
16
16
|
|
|
17
17
|
const Wrapper = story => /*#__PURE__*/_react2.default.createElement(_appRuntime.DataProvider, {
|
|
18
18
|
baseUrl: "http://localhost:8080/",
|
|
19
19
|
apiVersion: ""
|
|
20
20
|
}, story());
|
|
21
21
|
|
|
22
|
-
const
|
|
22
|
+
const defaultRootOrgUnits = ['ImspTQPwCqd']; // Sierra Leone
|
|
23
23
|
|
|
24
24
|
(0, _react.storiesOf)('OrgUnitDimension', module).addDecorator(Wrapper).add('None selected', () => {
|
|
25
25
|
const [selected, setSelected] = (0, _react2.useState)([]);
|
|
26
26
|
return /*#__PURE__*/_react2.default.createElement(_OrgUnitDimension.default, {
|
|
27
27
|
selected: selected,
|
|
28
28
|
onSelect: response => setSelected(response.items),
|
|
29
|
-
|
|
29
|
+
roots: defaultRootOrgUnits
|
|
30
30
|
});
|
|
31
31
|
});
|
|
32
32
|
(0, _react.storiesOf)('OrgUnitDimension', module).addDecorator(Wrapper).add('Root selected', () => {
|
|
@@ -38,7 +38,7 @@ const rootOrgUnit = 'ImspTQPwCqd'; // Sierra Leone
|
|
|
38
38
|
return /*#__PURE__*/_react2.default.createElement(_OrgUnitDimension.default, {
|
|
39
39
|
selected: selected,
|
|
40
40
|
onSelect: response => setSelected(response.items),
|
|
41
|
-
|
|
41
|
+
roots: defaultRootOrgUnits
|
|
42
42
|
});
|
|
43
43
|
});
|
|
44
44
|
(0, _react.storiesOf)('OrgUnitDimension', module).addDecorator(Wrapper).add('Single level 2 child selected', () => {
|
|
@@ -50,7 +50,7 @@ const rootOrgUnit = 'ImspTQPwCqd'; // Sierra Leone
|
|
|
50
50
|
return /*#__PURE__*/_react2.default.createElement(_OrgUnitDimension.default, {
|
|
51
51
|
selected: selected,
|
|
52
52
|
onSelect: response => setSelected(response.items),
|
|
53
|
-
|
|
53
|
+
roots: defaultRootOrgUnits
|
|
54
54
|
});
|
|
55
55
|
});
|
|
56
56
|
(0, _react.storiesOf)('OrgUnitDimension', module).addDecorator(Wrapper).add('Multiple level 2 children selected', () => {
|
|
@@ -70,7 +70,7 @@ const rootOrgUnit = 'ImspTQPwCqd'; // Sierra Leone
|
|
|
70
70
|
return /*#__PURE__*/_react2.default.createElement(_OrgUnitDimension.default, {
|
|
71
71
|
selected: selected,
|
|
72
72
|
onSelect: response => setSelected(response.items),
|
|
73
|
-
|
|
73
|
+
roots: defaultRootOrgUnits
|
|
74
74
|
});
|
|
75
75
|
});
|
|
76
76
|
(0, _react.storiesOf)('OrgUnitDimension', module).addDecorator(Wrapper).add('Multiple selected across different levels', () => {
|
|
@@ -90,6 +90,15 @@ const rootOrgUnit = 'ImspTQPwCqd'; // Sierra Leone
|
|
|
90
90
|
return /*#__PURE__*/_react2.default.createElement(_OrgUnitDimension.default, {
|
|
91
91
|
selected: selected,
|
|
92
92
|
onSelect: response => setSelected(response.items),
|
|
93
|
-
|
|
93
|
+
roots: defaultRootOrgUnits
|
|
94
|
+
});
|
|
95
|
+
});
|
|
96
|
+
(0, _react.storiesOf)('OrgUnitDimension', module).addDecorator(Wrapper).add('Multiple roots', () => {
|
|
97
|
+
const [selected, setSelected] = (0, _react2.useState)([]);
|
|
98
|
+
return /*#__PURE__*/_react2.default.createElement(_OrgUnitDimension.default, {
|
|
99
|
+
selected: selected,
|
|
100
|
+
onSelect: response => setSelected(response.items),
|
|
101
|
+
roots: ['O6uvpzGd5pu', 'fdc6uOvgoji'] // Bo + Bombali
|
|
102
|
+
|
|
94
103
|
});
|
|
95
104
|
});
|
|
@@ -88,9 +88,9 @@ var _weeklyColumnsMetadata = _interopRequireDefault(require("./data/weeklyColumn
|
|
|
88
88
|
|
|
89
89
|
var _weeklyColumnsVisualization = _interopRequireDefault(require("./data/weeklyColumns.visualization.json"));
|
|
90
90
|
|
|
91
|
-
function _getRequireWildcardCache(
|
|
91
|
+
function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
|
|
92
92
|
|
|
93
|
-
function _interopRequireWildcard(obj
|
|
93
|
+
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
94
94
|
|
|
95
95
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
96
96
|
|
|
@@ -59,7 +59,7 @@ class AnalyticsRequest extends (0, _AnalyticsRequestDimensionsMixin.default)((0,
|
|
|
59
59
|
let dimension = d.dimension;
|
|
60
60
|
|
|
61
61
|
if (d.filter) {
|
|
62
|
-
dimension +=
|
|
62
|
+
dimension += ":".concat(d.filter);
|
|
63
63
|
}
|
|
64
64
|
|
|
65
65
|
request = request.addDimension(dimension, d.items.map(item => item.id));
|
|
@@ -72,13 +72,13 @@ class AnalyticsRequestBase {
|
|
|
72
72
|
encodedItems.sort();
|
|
73
73
|
}
|
|
74
74
|
|
|
75
|
-
return
|
|
75
|
+
return "".concat(dimension, ":").concat(encodedItems.join(';'));
|
|
76
76
|
}
|
|
77
77
|
|
|
78
78
|
return dimension;
|
|
79
79
|
});
|
|
80
80
|
const endPoint = [this.endPoint, this.path, this.program].filter(e => !!e).join('/');
|
|
81
|
-
return
|
|
81
|
+
return "".concat(endPoint, ".").concat(this.format, "?dimension=").concat(encodedDimensions.join('&dimension='));
|
|
82
82
|
}
|
|
83
83
|
/**
|
|
84
84
|
* @private
|
|
@@ -113,7 +113,7 @@ class AnalyticsRequestBase {
|
|
|
113
113
|
encodedItems.sort();
|
|
114
114
|
}
|
|
115
115
|
|
|
116
|
-
return
|
|
116
|
+
return "".concat(dimension, ":").concat(encodedItems.join(';'));
|
|
117
117
|
}
|
|
118
118
|
|
|
119
119
|
return dimension;
|
|
@@ -107,7 +107,7 @@ class extends base {
|
|
|
107
107
|
if (aggregationTypes.has(aggregationType)) {
|
|
108
108
|
this.parameters.aggregationType = aggregationType;
|
|
109
109
|
} else if (aggregationType !== 'DEFAULT') {
|
|
110
|
-
console.warn(
|
|
110
|
+
console.warn("analytics.request.withAggregationType(): \"".concat(value, "\" not listed as possible value"));
|
|
111
111
|
this.parameters.aggregationType = value;
|
|
112
112
|
}
|
|
113
113
|
|
|
@@ -343,7 +343,7 @@ class extends base {
|
|
|
343
343
|
if (displayProperties.has(displayProperty)) {
|
|
344
344
|
this.parameters.displayProperty = displayProperty;
|
|
345
345
|
} else {
|
|
346
|
-
console.warn(
|
|
346
|
+
console.warn("analytics.request.withDisplayProperty(): \"".concat(value, "\" not listed as possible value"));
|
|
347
347
|
this.parameters.displayProperty = value;
|
|
348
348
|
}
|
|
349
349
|
|
|
@@ -590,7 +590,7 @@ class extends base {
|
|
|
590
590
|
if (eventStatuses.has(eventStatus)) {
|
|
591
591
|
this.parameters.eventStatus = eventStatus;
|
|
592
592
|
} else {
|
|
593
|
-
console.warn(
|
|
593
|
+
console.warn("analytics.request.withEventStatus(): \"".concat(value, "\" not listed as possible value"));
|
|
594
594
|
this.parameters.eventStatus = value;
|
|
595
595
|
}
|
|
596
596
|
|
|
@@ -616,7 +616,7 @@ class extends base {
|
|
|
616
616
|
if (programStatuses.has(programStatus)) {
|
|
617
617
|
this.parameters.programStatus = programStatus;
|
|
618
618
|
} else {
|
|
619
|
-
console.warn(
|
|
619
|
+
console.warn("analytics.request.withProgramStatus(): \"".concat(value, "\" not listed as possible value"));
|
|
620
620
|
this.parameters.programStatus = value;
|
|
621
621
|
}
|
|
622
622
|
|
|
@@ -642,7 +642,7 @@ class extends base {
|
|
|
642
642
|
if (ouModes.has(ouMode)) {
|
|
643
643
|
this.parameters.ouMode = ouMode;
|
|
644
644
|
} else {
|
|
645
|
-
console.warn(
|
|
645
|
+
console.warn("analytics.request.withOuMode(): \"".concat(value, "\" not listed as possible value"));
|
|
646
646
|
this.parameters.ouMode = value;
|
|
647
647
|
}
|
|
648
648
|
|
|
@@ -780,7 +780,7 @@ class extends base {
|
|
|
780
780
|
if (sortOrders.has(sortOrder)) {
|
|
781
781
|
this.parameters.sortOrder = sortOrder;
|
|
782
782
|
} else {
|
|
783
|
-
console.warn(
|
|
783
|
+
console.warn("analytics.request.withSortOrder(): \"".concat(value, "\" not listed as possible value"));
|
|
784
784
|
this.parameters.sortOrder = value;
|
|
785
785
|
}
|
|
786
786
|
|
|
@@ -827,7 +827,7 @@ class extends base {
|
|
|
827
827
|
if (outputTypes.has(type)) {
|
|
828
828
|
this.parameters.outputType = type;
|
|
829
829
|
} else {
|
|
830
|
-
console.warn(
|
|
830
|
+
console.warn("analytics.request.withOutputType(): \"".concat(value, "\" not listed as possible value"));
|
|
831
831
|
this.parameters.outputType = value;
|
|
832
832
|
}
|
|
833
833
|
|
|
@@ -24,7 +24,7 @@ const getParseMiddleware = type => {
|
|
|
24
24
|
switch (type) {
|
|
25
25
|
case 'STRING':
|
|
26
26
|
case 'TEXT':
|
|
27
|
-
return value =>
|
|
27
|
+
return value => "".concat(value);
|
|
28
28
|
|
|
29
29
|
case 'INTEGER':
|
|
30
30
|
case 'NUMBER':
|
|
@@ -51,7 +51,7 @@ const isCollectHeader = (header, dimensions) => {
|
|
|
51
51
|
return Boolean(Array.isArray(dimensions) && dimensions.length === 0);
|
|
52
52
|
};
|
|
53
53
|
|
|
54
|
-
const getPrefixedId = (id, prefix) =>
|
|
54
|
+
const getPrefixedId = (id, prefix) => "".concat(prefix || '', " ").concat(id);
|
|
55
55
|
|
|
56
56
|
const getNameByIdsByValueType = (id, valueType) => {
|
|
57
57
|
if (valueType === 'BOOLEAN') {
|
|
@@ -10,17 +10,7 @@ var _AnalyticsRequest = _interopRequireDefault(require("../AnalyticsRequest"));
|
|
|
10
10
|
|
|
11
11
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
12
12
|
|
|
13
|
-
const debugSqlFixture =
|
|
14
|
-
start_date, pe.enddate as end_date, pt.name as pt_name, ou.name as ou_name, ou.uid as ou_uid, ou.organisationunitid as
|
|
15
|
-
ou_id, coc.name as coc_name, coc.uid as coc_uid, coc.categoryoptioncomboid as coc_id, aoc.name as aoc_name, aoc.uid as
|
|
16
|
-
aoc_uid, aoc.categoryoptioncomboid as aoc_id, dv.value as datavalue from datavalue dv inner join dataelement de on
|
|
17
|
-
dv.dataelementid = de.dataelementid inner join period pe on dv.periodid = pe.periodid inner join periodtype pt on
|
|
18
|
-
pe.periodtypeid = pt.periodtypeid inner join organisationunit ou on dv.sourceid = ou.organisationunitid inner join
|
|
19
|
-
categoryoptioncombo coc on dv.categoryoptioncomboid = coc.categoryoptioncomboid inner join categoryoptioncombo aoc on
|
|
20
|
-
dv.attributeoptioncomboid = aoc.categoryoptioncomboid where dv.dataelementid in (359596,359597) and ((pe.startdate >=
|
|
21
|
-
'2016-01-01' and pe.enddate <= '2016-03-31') or (pe.startdate >= '2016-04-01' and pe.enddate <= '2016-06-30') ) and
|
|
22
|
-
((dv.sourceid in (select organisationunitid from _orgunitstructure where idlevel2 = 264)) ) and dv.deleted is false
|
|
23
|
-
limit 100000`;
|
|
13
|
+
const debugSqlFixture = "select de.name as de_name, de.uid as de_uid, de.dataelementid as de_id, pe.startdate as\nstart_date, pe.enddate as end_date, pt.name as pt_name, ou.name as ou_name, ou.uid as ou_uid, ou.organisationunitid as\nou_id, coc.name as coc_name, coc.uid as coc_uid, coc.categoryoptioncomboid as coc_id, aoc.name as aoc_name, aoc.uid as\naoc_uid, aoc.categoryoptioncomboid as aoc_id, dv.value as datavalue from datavalue dv inner join dataelement de on\ndv.dataelementid = de.dataelementid inner join period pe on dv.periodid = pe.periodid inner join periodtype pt on\npe.periodtypeid = pt.periodtypeid inner join organisationunit ou on dv.sourceid = ou.organisationunitid inner join\ncategoryoptioncombo coc on dv.categoryoptioncomboid = coc.categoryoptioncomboid inner join categoryoptioncombo aoc on\ndv.attributeoptioncomboid = aoc.categoryoptioncomboid where dv.dataelementid in (359596,359597) and ((pe.startdate >=\n '2016-01-01' and pe.enddate <= '2016-03-31') or (pe.startdate >= '2016-04-01' and pe.enddate <= '2016-06-30') ) and\n((dv.sourceid in (select organisationunitid from _orgunitstructure where idlevel2 = 264)) ) and dv.deleted is false\nlimit 100000";
|
|
24
14
|
describe('Analytics.aggregate', () => {
|
|
25
15
|
let aggregate;
|
|
26
16
|
let request;
|
|
@@ -9,7 +9,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
|
|
|
9
9
|
let request;
|
|
10
10
|
let expectedParameters;
|
|
11
11
|
|
|
12
|
-
const getFuncName = parameter =>
|
|
12
|
+
const getFuncName = parameter => "with".concat(parameter.charAt(0).toUpperCase()).concat(parameter.slice(1));
|
|
13
13
|
|
|
14
14
|
describe('AnalyticsRequest', () => {
|
|
15
15
|
beforeEach(() => {
|
|
@@ -241,12 +241,12 @@ describe('AnalyticsRequest', () => {
|
|
|
241
241
|
;
|
|
242
242
|
['aggregateData', 'coordinatesOnly', 'collapseDataDimensions', 'hideEmptyRows', 'hideEmptyColumns', 'hierarchyMeta', 'ignoreLimit', 'includeClusterPoints', 'includeNumDen', 'showHierarchy', 'skipData', 'skipMeta', 'skipRounding', 'tableLayout', 'includeMetadataDetails'].forEach(parameter => {
|
|
243
243
|
const funcName = getFuncName(parameter);
|
|
244
|
-
it(
|
|
244
|
+
it("should add the ".concat(parameter, " parameter with default value"), () => {
|
|
245
245
|
request[funcName]();
|
|
246
246
|
expectedParameters[parameter] = true;
|
|
247
247
|
expect(request.parameters).toEqual(expectedParameters);
|
|
248
248
|
});
|
|
249
|
-
it(
|
|
249
|
+
it("should replace the ".concat(parameter, " parameter on subsequent calls with the specified value"), () => {
|
|
250
250
|
request[funcName](false);
|
|
251
251
|
expectedParameters[parameter] = false;
|
|
252
252
|
expect(request.parameters).toEqual(expectedParameters);
|
|
@@ -262,18 +262,18 @@ describe('AnalyticsRequest', () => {
|
|
|
262
262
|
'stage', 'startDate', 'userOrgUnit', 'value' // XXX
|
|
263
263
|
].forEach(parameter => {
|
|
264
264
|
const funcName = getFuncName(parameter);
|
|
265
|
-
it(
|
|
265
|
+
it("should add the ".concat(parameter, " parameter with the specified value"), () => {
|
|
266
266
|
request[funcName]('test');
|
|
267
267
|
expectedParameters[parameter] = 'test';
|
|
268
268
|
expect(request.parameters).toEqual(expectedParameters);
|
|
269
269
|
});
|
|
270
|
-
it(
|
|
270
|
+
it("should replace the ".concat(parameter, " parameter on subsequent calls with the specified value"), () => {
|
|
271
271
|
request = request[funcName]('test');
|
|
272
272
|
request[funcName]('test2');
|
|
273
273
|
expectedParameters[parameter] = 'test2';
|
|
274
274
|
expect(request.parameters).toEqual(expectedParameters);
|
|
275
275
|
});
|
|
276
|
-
it(
|
|
276
|
+
it("should not replace the ".concat(parameter, " parameter when called without passing a value"), () => {
|
|
277
277
|
request = request[funcName]('test');
|
|
278
278
|
request[funcName]();
|
|
279
279
|
expectedParameters[parameter] = 'test';
|
|
@@ -289,17 +289,17 @@ describe('AnalyticsRequest', () => {
|
|
|
289
289
|
Object.entries(params).forEach(([key, value]) => {
|
|
290
290
|
const parameter = key;
|
|
291
291
|
const funcName = getFuncName(parameter);
|
|
292
|
-
it(
|
|
292
|
+
it("should add the ".concat(parameter, " parameter with the default value"), () => {
|
|
293
293
|
request[funcName]();
|
|
294
294
|
expectedParameters[parameter] = value;
|
|
295
295
|
expect(request.parameters).toEqual(expectedParameters);
|
|
296
296
|
});
|
|
297
|
-
it(
|
|
297
|
+
it("should add the ".concat(parameter, " parameter with the specified value"), () => {
|
|
298
298
|
request[funcName](10);
|
|
299
299
|
expectedParameters[parameter] = 10;
|
|
300
300
|
expect(request.parameters).toEqual(expectedParameters);
|
|
301
301
|
});
|
|
302
|
-
it(
|
|
302
|
+
it("should replace the ".concat(parameter, " parameter on subsequent calls with the specified value"), () => {
|
|
303
303
|
request = request[funcName](10);
|
|
304
304
|
request[funcName](20);
|
|
305
305
|
expectedParameters[parameter] = 20;
|
|
@@ -7,13 +7,13 @@ var _utils = require("../utils");
|
|
|
7
7
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
8
8
|
|
|
9
9
|
jest.mock('../utils', () => ({
|
|
10
|
-
customEncodeURIComponent: jest.fn(x =>
|
|
10
|
+
customEncodeURIComponent: jest.fn(x => "<".concat(x, ">"))
|
|
11
11
|
}));
|
|
12
12
|
const endPoint = 'foo';
|
|
13
13
|
const path = 'bar';
|
|
14
14
|
const program = 'census';
|
|
15
15
|
const format = 'json';
|
|
16
|
-
const basePath =
|
|
16
|
+
const basePath = "".concat(endPoint, "/").concat(path, "/").concat(program, ".").concat(format);
|
|
17
17
|
const dimensions = [{
|
|
18
18
|
dimension: 'ou',
|
|
19
19
|
items: ['mars', 'earth']
|
|
@@ -50,7 +50,7 @@ describe('AnalyticsRequestBase', () => {
|
|
|
50
50
|
});
|
|
51
51
|
const url = request.buildUrl();
|
|
52
52
|
expect(_utils.customEncodeURIComponent).toHaveBeenCalledTimes(4);
|
|
53
|
-
expect(url).toBe(
|
|
53
|
+
expect(url).toBe("".concat(basePath, "?dimension=ou:<mars>;<earth>&dimension=dx:<population>&dimension=question&dimension=answer:<42>"));
|
|
54
54
|
});
|
|
55
55
|
it('Should build a URL with sorted dimension parameters when options.sorted=true', () => {
|
|
56
56
|
const request = buildRequest({
|
|
@@ -60,7 +60,7 @@ describe('AnalyticsRequestBase', () => {
|
|
|
60
60
|
sorted: true
|
|
61
61
|
});
|
|
62
62
|
expect(_utils.customEncodeURIComponent).toHaveBeenCalledTimes(4);
|
|
63
|
-
expect(url).toBe(
|
|
63
|
+
expect(url).toBe("".concat(basePath, "?dimension=answer:<42>&dimension=dx:<population>&dimension=ou:<earth>;<mars>&dimension=question"));
|
|
64
64
|
});
|
|
65
65
|
it('Should not choke on a null or empty filter array', () => {
|
|
66
66
|
const request = buildRequest();
|
|
@@ -7,7 +7,7 @@ exports.customEncodeURIComponent = void 0;
|
|
|
7
7
|
// Define our very own special list of characters that we don't want to encode in the URI
|
|
8
8
|
const whitelistURI = ',&$=/;:';
|
|
9
9
|
const whitelistURICodes = whitelistURI.split('').map(c => encodeURIComponent(c));
|
|
10
|
-
const whitelistRegExp = new RegExp(
|
|
10
|
+
const whitelistRegExp = new RegExp("(?:".concat(whitelistURICodes.join('|'), ")"), 'g');
|
|
11
11
|
|
|
12
12
|
const customEncodeURIComponent = uri => encodeURIComponent(uri).replace(whitelistRegExp, decodeURIComponent);
|
|
13
13
|
|
|
@@ -19,8 +19,8 @@ const dimensionsQuery = {
|
|
|
19
19
|
params: ({
|
|
20
20
|
nameProp
|
|
21
21
|
}) => ({
|
|
22
|
-
fields:
|
|
23
|
-
order:
|
|
22
|
+
fields: "id,".concat(nameProp, "~rename(name),dimensionType,dataDimensionType"),
|
|
23
|
+
order: "".concat(nameProp, ":asc"),
|
|
24
24
|
paging: false
|
|
25
25
|
})
|
|
26
26
|
};
|
|
@@ -34,11 +34,11 @@ const recommendedDimensionsQuery = {
|
|
|
34
34
|
const dimensions = [];
|
|
35
35
|
|
|
36
36
|
if (dxIds.length) {
|
|
37
|
-
dimensions.push(
|
|
37
|
+
dimensions.push("dx:".concat(dxIds.join(';')));
|
|
38
38
|
}
|
|
39
39
|
|
|
40
40
|
if (ouIds.length) {
|
|
41
|
-
dimensions.push(
|
|
41
|
+
dimensions.push("ou:".concat(ouIds.join(';')));
|
|
42
42
|
}
|
|
43
43
|
|
|
44
44
|
return {
|
|
@@ -58,22 +58,22 @@ const dataItemsQuery = {
|
|
|
58
58
|
const filters = []; // TODO: Extract all of this logic out of the query?
|
|
59
59
|
|
|
60
60
|
if ((filter === null || filter === void 0 ? void 0 : filter.dataType) === _dataTypes.EVENT_DATA_ITEMS) {
|
|
61
|
-
filters.push(
|
|
61
|
+
filters.push("dimensionItemType:in:[".concat(_dataTypes.PROGRAM_DATA_ELEMENT, ",").concat(_dataTypes.PROGRAM_ATTRIBUTE, "]"));
|
|
62
62
|
} else if (filter !== null && filter !== void 0 && filter.dataType && filter.dataType !== _dataTypes.ALL_ID) {
|
|
63
|
-
filters.push(
|
|
63
|
+
filters.push("dimensionItemType:eq:".concat(filter.dataType));
|
|
64
64
|
}
|
|
65
65
|
|
|
66
66
|
if (filter !== null && filter !== void 0 && filter.group && filter.group !== _dataTypes.ALL_ID && [_dataTypes.EVENT_DATA_ITEMS, _dataTypes.PROGRAM_INDICATORS].includes(filter.dataType)) {
|
|
67
|
-
filters.push(
|
|
67
|
+
filters.push("programId:eq:".concat(filter.group));
|
|
68
68
|
}
|
|
69
69
|
|
|
70
70
|
if (searchTerm) {
|
|
71
|
-
filters.push(
|
|
71
|
+
filters.push("".concat(nameProp, ":ilike:").concat(searchTerm));
|
|
72
72
|
}
|
|
73
73
|
|
|
74
74
|
return (0, _objectClean.default)({
|
|
75
|
-
fields:
|
|
76
|
-
order:
|
|
75
|
+
fields: "id,".concat(nameProp, "~rename(name),dimensionItemType"),
|
|
76
|
+
order: "".concat(nameProp, ":asc"),
|
|
77
77
|
filter: filters,
|
|
78
78
|
paging: true,
|
|
79
79
|
page
|
|
@@ -92,16 +92,16 @@ const indicatorsQuery = {
|
|
|
92
92
|
const filters = [];
|
|
93
93
|
|
|
94
94
|
if (filter !== null && filter !== void 0 && filter.group && filter.group !== _dataTypes.ALL_ID) {
|
|
95
|
-
filters.push(
|
|
95
|
+
filters.push("indicatorGroups.id:eq:".concat(filter.group));
|
|
96
96
|
}
|
|
97
97
|
|
|
98
98
|
if (searchTerm) {
|
|
99
|
-
filters.push(
|
|
99
|
+
filters.push("".concat(nameProp, ":ilike:").concat(searchTerm));
|
|
100
100
|
}
|
|
101
101
|
|
|
102
102
|
return {
|
|
103
|
-
fields:
|
|
104
|
-
order:
|
|
103
|
+
fields: "id,".concat(nameProp, "~rename(name),dimensionItemType"),
|
|
104
|
+
order: "".concat(nameProp, ":asc"),
|
|
105
105
|
filter: filters,
|
|
106
106
|
paging: true,
|
|
107
107
|
page
|
|
@@ -114,8 +114,8 @@ const indicatorGroupsQuery = {
|
|
|
114
114
|
params: ({
|
|
115
115
|
nameProp
|
|
116
116
|
}) => ({
|
|
117
|
-
fields:
|
|
118
|
-
order:
|
|
117
|
+
fields: "id,".concat(nameProp, "~rename(name)"),
|
|
118
|
+
order: "".concat(nameProp, ":asc"),
|
|
119
119
|
paging: false
|
|
120
120
|
})
|
|
121
121
|
};
|
|
@@ -132,16 +132,16 @@ const dataElementsQuery = {
|
|
|
132
132
|
const filters = ['domainType:eq:AGGREGATE'];
|
|
133
133
|
|
|
134
134
|
if (filter !== null && filter !== void 0 && filter.group && filter.group !== _dataTypes.ALL_ID) {
|
|
135
|
-
filters.push(
|
|
135
|
+
filters.push("dataElementGroups.id:eq:".concat(filter.group));
|
|
136
136
|
}
|
|
137
137
|
|
|
138
138
|
if (searchTerm) {
|
|
139
|
-
filters.push(
|
|
139
|
+
filters.push("".concat(nameProp, ":ilike:").concat(searchTerm));
|
|
140
140
|
}
|
|
141
141
|
|
|
142
142
|
return {
|
|
143
|
-
fields:
|
|
144
|
-
order:
|
|
143
|
+
fields: "".concat(idField, ",").concat(nameProp, "~rename(name),dimensionItemType"),
|
|
144
|
+
order: "".concat(nameProp, ":asc"),
|
|
145
145
|
filter: filters,
|
|
146
146
|
paging: true,
|
|
147
147
|
page
|
|
@@ -154,17 +154,17 @@ const dataElementGroupsQuery = {
|
|
|
154
154
|
params: ({
|
|
155
155
|
nameProp
|
|
156
156
|
}) => ({
|
|
157
|
-
fields:
|
|
158
|
-
order:
|
|
157
|
+
fields: "id,".concat(nameProp, "~rename(name)"),
|
|
158
|
+
order: "".concat(nameProp, ":asc"),
|
|
159
159
|
paging: false
|
|
160
160
|
})
|
|
161
161
|
};
|
|
162
162
|
exports.dataElementGroupsQuery = dataElementGroupsQuery;
|
|
163
163
|
const itemsByDimensionQuery = {
|
|
164
|
-
resource:
|
|
164
|
+
resource: "dimensions",
|
|
165
165
|
id: ({
|
|
166
166
|
id
|
|
167
|
-
}) =>
|
|
167
|
+
}) => "".concat(id, "/items"),
|
|
168
168
|
params: ({
|
|
169
169
|
searchTerm,
|
|
170
170
|
page,
|
|
@@ -173,12 +173,12 @@ const itemsByDimensionQuery = {
|
|
|
173
173
|
const filters = [];
|
|
174
174
|
|
|
175
175
|
if (searchTerm) {
|
|
176
|
-
filters.push(
|
|
176
|
+
filters.push("".concat(nameProp, ":ilike:").concat(searchTerm));
|
|
177
177
|
}
|
|
178
178
|
|
|
179
179
|
return {
|
|
180
|
-
fields:
|
|
181
|
-
order:
|
|
180
|
+
fields: "id,".concat(nameProp, "~rename(name)"),
|
|
181
|
+
order: "".concat(nameProp, ":asc"),
|
|
182
182
|
filter: filters,
|
|
183
183
|
paging: true,
|
|
184
184
|
page
|
|
@@ -198,16 +198,16 @@ const dataElementOperandsQuery = {
|
|
|
198
198
|
const filters = [];
|
|
199
199
|
|
|
200
200
|
if (filter !== null && filter !== void 0 && filter.group && filter.group !== _dataTypes.ALL_ID) {
|
|
201
|
-
filters.push(
|
|
201
|
+
filters.push("dataElement.dataElementGroups.id:eq:".concat(filter.group));
|
|
202
202
|
}
|
|
203
203
|
|
|
204
204
|
if (searchTerm) {
|
|
205
|
-
filters.push(
|
|
205
|
+
filters.push("".concat(nameProp, ":ilike:").concat(searchTerm));
|
|
206
206
|
}
|
|
207
207
|
|
|
208
208
|
return {
|
|
209
|
-
fields:
|
|
210
|
-
order:
|
|
209
|
+
fields: "".concat(idField, ",").concat(nameProp, "~rename(name),dimensionItemType"),
|
|
210
|
+
order: "".concat(nameProp, ":asc"),
|
|
211
211
|
filter: filters,
|
|
212
212
|
paging: true,
|
|
213
213
|
page
|
|
@@ -226,16 +226,16 @@ const dataSetsQuery = {
|
|
|
226
226
|
const filters = [];
|
|
227
227
|
|
|
228
228
|
if (searchTerm) {
|
|
229
|
-
filters.push(
|
|
229
|
+
filters.push("".concat(nameProp, ":ilike:").concat(searchTerm));
|
|
230
230
|
}
|
|
231
231
|
|
|
232
232
|
if (filter !== null && filter !== void 0 && filter.group && filter.group !== _dataTypes.ALL_ID) {
|
|
233
|
-
filters.push(
|
|
233
|
+
filters.push("id:eq:".concat(filter.group));
|
|
234
234
|
}
|
|
235
235
|
|
|
236
236
|
const query = {
|
|
237
|
-
fields:
|
|
238
|
-
order:
|
|
237
|
+
fields: "dimensionItem~rename(id),".concat(nameProp, "~rename(name),dimensionItemType"),
|
|
238
|
+
order: "".concat(nameProp, ":asc"),
|
|
239
239
|
filter: filters,
|
|
240
240
|
paging: false
|
|
241
241
|
};
|
|
@@ -254,8 +254,8 @@ const programsQuery = {
|
|
|
254
254
|
params: ({
|
|
255
255
|
nameProp
|
|
256
256
|
}) => ({
|
|
257
|
-
fields:
|
|
258
|
-
order:
|
|
257
|
+
fields: "id,".concat(nameProp, "~rename(name)"),
|
|
258
|
+
order: "".concat(nameProp, ":asc"),
|
|
259
259
|
paging: false
|
|
260
260
|
})
|
|
261
261
|
}; // Fetch functions
|
|
@@ -11,8 +11,8 @@ const orgUnitLevelsQuery = {
|
|
|
11
11
|
resource: 'organisationUnitLevels',
|
|
12
12
|
params: ({
|
|
13
13
|
displayNameProp = 'displayName'
|
|
14
|
-
}) => ({
|
|
15
|
-
fields:
|
|
14
|
+
} = {}) => ({
|
|
15
|
+
fields: "id,level,".concat(displayNameProp, "~rename(displayName),name"),
|
|
16
16
|
paging: false
|
|
17
17
|
})
|
|
18
18
|
};
|
|
@@ -20,8 +20,8 @@ const orgUnitGroupsQuery = {
|
|
|
20
20
|
resource: 'organisationUnitGroups',
|
|
21
21
|
params: ({
|
|
22
22
|
displayNameProp = 'displayName'
|
|
23
|
-
}) => ({
|
|
24
|
-
fields:
|
|
23
|
+
} = {}) => ({
|
|
24
|
+
fields: "id,".concat(displayNameProp, "~rename(displayName),name"),
|
|
25
25
|
paging: false
|
|
26
26
|
})
|
|
27
27
|
};
|
|
@@ -38,7 +38,7 @@ const orgUnitsQuery = {
|
|
|
38
38
|
params: ({
|
|
39
39
|
displayNameProp
|
|
40
40
|
}) => ({
|
|
41
|
-
fields:
|
|
41
|
+
fields: "id,path,".concat(displayNameProp, "~rename(displayName),children::isNotEmpty"),
|
|
42
42
|
level: 1,
|
|
43
43
|
userDataViewFallback: true,
|
|
44
44
|
paging: false
|