@dhis2/analytics 28.0.3 → 28.0.5
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/build/cjs/__demo__/DataDimension.stories.js +1 -2
- package/build/cjs/__demo__/Filter.stories.js +1 -2
- package/build/cjs/__demo__/FixedPeriodSelect.stories.js +1 -2
- package/build/cjs/__demo__/OpenFileDialog.stories.js +19 -1
- package/build/cjs/__demo__/OrgUnitDimension.stories.js +1 -2
- package/build/cjs/__demo__/PivotTable.stories.js +166 -224
- package/build/cjs/__demo__/ScatterPlotPdfExport.stories.js +1 -2
- package/build/cjs/__demo__/SingleValue.stories.js +1 -2
- package/build/cjs/__demo__/Toolbar.stories.js +1 -2
- package/build/cjs/api/__tests__/dimensions.spec.js +1 -2
- package/build/cjs/api/analytics/Analytics.js +8 -9
- package/build/cjs/api/analytics/AnalyticsBase.js +58 -77
- package/build/cjs/api/analytics/AnalyticsRequest.js +1 -2
- package/build/cjs/api/analytics/AnalyticsRequestBase.js +18 -21
- package/build/cjs/api/analytics/AnalyticsRequestPropertiesMixin.js +19 -38
- package/build/cjs/api/analytics/AnalyticsResponseHeader.js +5 -7
- package/build/cjs/api/analytics/__tests__/AnalyticsBase.spec.js +9 -12
- package/build/cjs/api/analytics/__tests__/AnalyticsRequest.spec.js +8 -2
- package/build/cjs/api/analytics/utils.js +11 -17
- package/build/cjs/api/dimensions.js +119 -148
- package/build/cjs/api/expression.js +39 -60
- package/build/cjs/api/organisationUnits.js +23 -35
- package/build/cjs/components/AboutAOUnit/AboutAOUnit.js +12 -20
- package/build/cjs/components/CachedDataQueryProvider.js +7 -9
- package/build/cjs/components/DashboardPluginWrapper/DashboardPluginWrapper.js +18 -22
- package/build/cjs/components/DataDimension/Calculation/CalculationModal.js +44 -61
- package/build/cjs/components/DataDimension/Calculation/DataElementOption.js +5 -6
- package/build/cjs/components/DataDimension/Calculation/DataElementSelector.js +29 -38
- package/build/cjs/components/DataDimension/Calculation/DndContext.js +29 -37
- package/build/cjs/components/DataDimension/Calculation/DraggingItem.js +5 -6
- package/build/cjs/components/DataDimension/Calculation/DropZone.js +4 -5
- package/build/cjs/components/DataDimension/Calculation/FormulaField.js +29 -32
- package/build/cjs/components/DataDimension/Calculation/FormulaItem.js +14 -16
- package/build/cjs/components/DataDimension/Calculation/MathOperatorSelector.js +23 -29
- package/build/cjs/components/DataDimension/Calculation/Operator.js +6 -7
- package/build/cjs/components/DataDimension/DataDimension.js +20 -32
- package/build/cjs/components/DataDimension/Info/CalculationInfo.js +14 -22
- package/build/cjs/components/DataDimension/Info/DataElementInfo.js +23 -36
- package/build/cjs/components/DataDimension/Info/DataElementOperandInfo.js +30 -44
- package/build/cjs/components/DataDimension/Info/DataSetInfo.js +26 -39
- package/build/cjs/components/DataDimension/Info/EventDataItemInfo.js +21 -34
- package/build/cjs/components/DataDimension/Info/IndicatorInfo.js +21 -32
- package/build/cjs/components/DataDimension/Info/InfoPopover.js +6 -7
- package/build/cjs/components/DataDimension/Info/InfoTable.js +39 -52
- package/build/cjs/components/DataDimension/Info/OptionInfo.js +13 -20
- package/build/cjs/components/DataDimension/Info/ProgramIndicatorInfo.js +46 -58
- package/build/cjs/components/DataDimension/ItemOptionsSelector/ItemOptionsSelector.js +22 -32
- package/build/cjs/components/DataDimension/ItemSelector/DataTypeSelector.js +6 -7
- package/build/cjs/components/DataDimension/ItemSelector/DetailSelector.js +5 -6
- package/build/cjs/components/DataDimension/ItemSelector/GroupSelector.js +10 -12
- package/build/cjs/components/DataDimension/ItemSelector/ItemSelector.js +86 -104
- package/build/cjs/components/DataDimension/ItemSelector/MetricSelector.js +5 -6
- package/build/cjs/components/DataDimension/SourceEmptyPlaceholder.js +10 -13
- package/build/cjs/components/DataDimension/TransferOption.js +35 -39
- package/build/cjs/components/DimensionMenu.js +13 -14
- package/build/cjs/components/DimensionsPanel/DimensionsPanel.js +8 -9
- package/build/cjs/components/DimensionsPanel/List/DimensionItem.js +12 -13
- package/build/cjs/components/DimensionsPanel/List/DimensionList.js +12 -11
- package/build/cjs/components/DimensionsPanel/List/OptionsButton.js +8 -11
- package/build/cjs/components/DimensionsPanel/List/RecommendedIcon.js +10 -13
- package/build/cjs/components/DimensionsPanel/List/__tests__/DimensionItem.spec.js +48 -41
- package/build/cjs/components/DimensionsPanel/List/__tests__/__snapshots__/DimensionItem.spec.js.snap +110 -114
- package/build/cjs/components/DimensionsPanel/__tests__/DimensionsPanel.spec.js +36 -33
- package/build/cjs/components/DynamicDimension/DynamicDimension.js +9 -13
- package/build/cjs/components/DynamicDimension/ItemSelector.js +25 -38
- package/build/cjs/components/FileMenu/DeleteDialog.js +11 -16
- package/build/cjs/components/FileMenu/FileMenu.js +19 -30
- package/build/cjs/components/FileMenu/GetLinkDialog.js +7 -7
- package/build/cjs/components/FileMenu/RenameDialog.js +13 -21
- package/build/cjs/components/FileMenu/SaveAsDialog.js +13 -21
- package/build/cjs/components/FileMenu/__tests__/DeleteDialog.spec.js +24 -27
- package/build/cjs/components/FileMenu/__tests__/FileMenu.spec.js +55 -31
- package/build/cjs/components/FileMenu/__tests__/GetLinkDialog.spec.js +35 -39
- package/build/cjs/components/FileMenu/__tests__/RenameDialog.spec.js +17 -11
- package/build/cjs/components/FileMenu/__tests__/SaveAsDialog.spec.js +44 -37
- package/build/cjs/components/FileMenu/utils.js +10 -12
- package/build/cjs/components/Filter/Filter.js +21 -27
- package/build/cjs/components/Filter/__tests__/Filter.spec.js +29 -34
- package/build/cjs/components/Interpretations/InterpretationModal/Comment.js +8 -10
- package/build/cjs/components/Interpretations/InterpretationModal/CommentAddForm.js +10 -15
- package/build/cjs/components/Interpretations/InterpretationModal/CommentDeleteButton.js +10 -15
- package/build/cjs/components/Interpretations/InterpretationModal/CommentUpdateForm.js +12 -17
- package/build/cjs/components/Interpretations/InterpretationModal/InterpretationModal.js +19 -25
- package/build/cjs/components/Interpretations/InterpretationModal/InterpretationThread.js +12 -14
- package/build/cjs/components/Interpretations/InterpretationsUnit/InterpretationForm.js +12 -17
- package/build/cjs/components/Interpretations/InterpretationsUnit/InterpretationList.js +10 -11
- package/build/cjs/components/Interpretations/InterpretationsUnit/InterpretationsUnit.js +23 -33
- package/build/cjs/components/Interpretations/common/Interpretation/Interpretation.js +13 -15
- package/build/cjs/components/Interpretations/common/Interpretation/InterpretationDeleteButton.js +7 -11
- package/build/cjs/components/Interpretations/common/Interpretation/InterpretationSharingLink.js +5 -7
- package/build/cjs/components/Interpretations/common/Interpretation/InterpretationUpdateForm.js +15 -23
- package/build/cjs/components/Interpretations/common/Interpretation/useLike.js +5 -6
- package/build/cjs/components/Interpretations/common/Message/Message.js +6 -7
- package/build/cjs/components/Interpretations/common/Message/MessageButtonStrip.js +8 -11
- package/build/cjs/components/Interpretations/common/Message/MessageEditorContainer.js +18 -21
- package/build/cjs/components/Interpretations/common/Message/MessageIconButton.js +34 -40
- package/build/cjs/components/Interpretations/common/Message/MessageInput.js +1 -2
- package/build/cjs/components/Interpretations/common/Message/MessageStatsBar.js +8 -11
- package/build/cjs/components/LegendKey/LegendKey.js +3 -4
- package/build/cjs/components/OfflineTooltip.js +18 -26
- package/build/cjs/components/OpenFileDialog/CreatedByFilter.js +28 -26
- package/build/cjs/components/OpenFileDialog/CustomSelectOption.js +23 -26
- package/build/cjs/components/OpenFileDialog/DateField.js +3 -4
- package/build/cjs/components/OpenFileDialog/FileList.js +19 -22
- package/build/cjs/components/OpenFileDialog/NameFilter.js +15 -21
- package/build/cjs/components/OpenFileDialog/OpenFileDialog.js +50 -79
- package/build/cjs/components/OpenFileDialog/PaginationControls.js +22 -28
- package/build/cjs/components/OpenFileDialog/VisTypeFilter.js +65 -36
- package/build/cjs/components/OpenFileDialog/__tests__/OpenFileDialog.spec.js +51 -0
- package/build/cjs/components/Options/VisualizationOptions.js +35 -46
- package/build/cjs/components/OrgUnitDimension/OrgUnitDimension.js +38 -60
- package/build/cjs/components/OrgUnitDimension/__tests__/OrgUnitDimension.spec.js +78 -44
- package/build/cjs/components/PeriodDimension/FixedPeriodFilter.js +17 -25
- package/build/cjs/components/PeriodDimension/FixedPeriodSelect.js +15 -21
- package/build/cjs/components/PeriodDimension/PeriodDimension.js +9 -12
- package/build/cjs/components/PeriodDimension/PeriodTransfer.js +49 -63
- package/build/cjs/components/PeriodDimension/RelativePeriodFilter.js +25 -30
- package/build/cjs/components/PeriodDimension/__tests__/FixedPeriodSingleSelect.spec.js +14 -21
- package/build/cjs/components/PeriodDimension/__tests__/PeriodDimension.spec.js +27 -23
- package/build/cjs/components/PeriodDimension/utils/fixedPeriods.js +6 -7
- package/build/cjs/components/PeriodDimension/utils/index.js +1 -5
- package/build/cjs/components/PivotTable/PivotTable.js +8 -10
- package/build/cjs/components/PivotTable/PivotTableBody.js +20 -29
- package/build/cjs/components/PivotTable/PivotTableCell.js +8 -12
- package/build/cjs/components/PivotTable/PivotTableClippedAxis.js +14 -17
- package/build/cjs/components/PivotTable/PivotTableColumnHeaderCell.js +7 -8
- package/build/cjs/components/PivotTable/PivotTableColumnHeaders.js +22 -29
- package/build/cjs/components/PivotTable/PivotTableContainer.js +5 -6
- package/build/cjs/components/PivotTable/PivotTableDimensionLabelCell.js +4 -5
- package/build/cjs/components/PivotTable/PivotTableEmptyCell.js +3 -4
- package/build/cjs/components/PivotTable/PivotTableEmptyRow.js +4 -5
- package/build/cjs/components/PivotTable/PivotTableEngineContext.js +5 -7
- package/build/cjs/components/PivotTable/PivotTableHead.js +13 -16
- package/build/cjs/components/PivotTable/PivotTableHeaderCell.js +8 -9
- package/build/cjs/components/PivotTable/PivotTableRow.js +20 -27
- package/build/cjs/components/PivotTable/PivotTableRowHeaderCell.js +5 -6
- package/build/cjs/components/PivotTable/PivotTableSortIcon.js +4 -5
- package/build/cjs/components/PivotTable/PivotTableTitleRow.js +19 -24
- package/build/cjs/components/PivotTable/PivotTableTitleRows.js +4 -5
- package/build/cjs/components/PivotTable/PivotTableValueCell.js +6 -8
- package/build/cjs/components/RichText/Editor/Editor.js +70 -85
- package/build/cjs/components/RichText/Editor/__tests__/Editor.spec.js +6 -7
- package/build/cjs/components/RichText/Parser/Parser.js +5 -10
- package/build/cjs/components/RichText/Parser/__tests__/MdParser.spec.js +1 -1
- package/build/cjs/components/RichText/Parser/__tests__/Parser.spec.js +22 -23
- package/build/cjs/components/Toolbar/HoverMenuBar/HoverMenuBar.js +20 -24
- package/build/cjs/components/Toolbar/HoverMenuBar/HoverMenuDropdown.js +8 -13
- package/build/cjs/components/Toolbar/HoverMenuBar/HoverMenuList.js +9 -17
- package/build/cjs/components/Toolbar/HoverMenuBar/HoverMenuListItem.js +11 -16
- package/build/cjs/components/Toolbar/HoverMenuBar/__tests__/HoverMenuBar.spec.js +56 -47
- package/build/cjs/components/Toolbar/HoverMenuBar/__tests__/HoverMenuDropdown.spec.js +8 -8
- package/build/cjs/components/Toolbar/HoverMenuBar/__tests__/HoverMenuList.spec.js +30 -23
- package/build/cjs/components/Toolbar/HoverMenuBar/__tests__/HoverMenuListItem.spec.js +23 -17
- package/build/cjs/components/Toolbar/HoverMenuBar/__tests__/__snapshots__/HoverMenuList.spec.js.snap +63 -0
- package/build/cjs/components/Toolbar/InterpretationsAndDetailsToggler.js +17 -21
- package/build/cjs/components/Toolbar/Toolbar.js +10 -16
- package/build/cjs/components/Toolbar/ToolbarSidebar.js +12 -18
- package/build/cjs/components/Toolbar/UpdateButton.js +18 -24
- package/build/cjs/components/Toolbar/__tests__/InterpretationsAndDetailsToggler.spec.js +19 -18
- package/build/cjs/components/Toolbar/__tests__/Toolbar.spec.js +8 -8
- package/build/cjs/components/Toolbar/__tests__/ToolbarSidebar.spec.js +14 -11
- package/build/cjs/components/Toolbar/__tests__/UpdateButton.spec.js +16 -14
- package/build/cjs/components/TransferOption.js +14 -15
- package/build/cjs/components/TranslationDialog/TranslationModal/LocalesSelect.js +19 -27
- package/build/cjs/components/TranslationDialog/TranslationModal/TranslationForm.js +17 -25
- package/build/cjs/components/TranslationDialog/TranslationModal/TranslationModal.js +9 -10
- package/build/cjs/components/TranslationDialog/TranslationModal/TranslationModalActions.js +18 -27
- package/build/cjs/components/TranslationDialog/TranslationModal/__tests__/TranslationModal.spec.js +25 -16
- package/build/cjs/components/TranslationDialog/TranslationModal/useTranslationsResults.js +3 -4
- package/build/cjs/components/UserMention/UserList.js +6 -7
- package/build/cjs/components/UserMention/UserMentionWrapper.js +13 -20
- package/build/cjs/components/UserMention/useUserSearchResults.js +12 -16
- package/build/cjs/components/VisTypeIcon.js +5 -6
- package/build/cjs/index.js +38 -39
- package/build/cjs/locales/ar_IQ/translations.json +20 -11
- package/build/cjs/locales/cs/translations.json +2 -0
- package/build/cjs/locales/en/translations.json +1 -0
- package/build/cjs/locales/es/translations.json +2 -0
- package/build/cjs/locales/fr/translations.json +2 -0
- package/build/cjs/locales/id/translations.json +20 -11
- package/build/cjs/locales/index.js +62 -62
- package/build/cjs/locales/lo/translations.json +2 -0
- package/build/cjs/locales/nb/translations.json +2 -0
- package/build/cjs/locales/prs/translations.json +2 -0
- package/build/cjs/locales/ps/translations.json +2 -0
- package/build/cjs/locales/pt/translations.json +2 -0
- package/build/cjs/locales/pt_BR/translations.json +2 -0
- package/build/cjs/locales/ru/translations.json +2 -0
- package/build/cjs/locales/si/translations.json +20 -11
- package/build/cjs/locales/sv/translations.json +20 -11
- package/build/cjs/locales/tet/translations.json +20 -11
- package/build/cjs/locales/tg/translations.json +2 -0
- package/build/cjs/locales/uk/translations.json +2 -0
- package/build/cjs/locales/ur/translations.json +2 -0
- package/build/cjs/locales/uz_UZ_Cyrl/translations.json +2 -0
- package/build/cjs/locales/uz_UZ_Latn/translations.json +4 -2
- package/build/cjs/locales/vi/translations.json +2 -0
- package/build/cjs/locales/zh/translations.json +2 -0
- package/build/cjs/locales/zh_CN/translations.json +17 -15
- package/build/cjs/modules/__tests__/expressions.spec.js +4 -5
- package/build/cjs/modules/__tests__/isNumeric.spec.js +33 -0
- package/build/cjs/modules/dimensionListItem.js +4 -5
- package/build/cjs/modules/expressions.js +3 -9
- package/build/cjs/modules/getPWAInstallationStatus.js +7 -9
- package/build/cjs/modules/layout/dimensionCreate.js +1 -3
- package/build/cjs/modules/layout/dimensionIsValid.js +3 -4
- package/build/cjs/modules/legends.js +5 -6
- package/build/cjs/modules/outliers/index.js +5 -6
- package/build/cjs/modules/outliers/iqr.js +4 -6
- package/build/cjs/modules/outliers/modZScore.js +6 -14
- package/build/cjs/modules/outliers/zScore.js +3 -4
- package/build/cjs/modules/pivotTable/AdaptiveClippingController.js +12 -16
- package/build/cjs/modules/pivotTable/PivotTableEngine.js +48 -59
- package/build/cjs/modules/pivotTable/clipAxis.js +7 -8
- package/build/cjs/modules/pivotTable/clipPartitionedAxis.js +9 -10
- package/build/cjs/modules/pivotTable/getHeaderForDisplay.js +8 -9
- package/build/cjs/modules/pivotTable/measureText.js +7 -9
- package/build/cjs/modules/pivotTable/useParentSize.js +1 -2
- package/build/cjs/modules/pivotTable/useScrollPosition.js +1 -2
- package/build/cjs/modules/pivotTable/useTableClipping.js +6 -7
- package/build/cjs/modules/relativeItems/index.js +1 -4
- package/build/cjs/modules/renderValue.js +1 -2
- package/build/cjs/modules/utils.js +11 -2
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/addTrendLines.js +3 -8
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/axis.js +7 -10
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/customAxes.js +2 -5
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/customSVGOptions/index.js +7 -8
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/customSVGOptions/singleValue/getSingleValueBackgroundColor.js +1 -2
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/customSVGOptions/singleValue/index.js +6 -7
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/getFormatter.js +2 -3
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/getSteps.js +2 -3
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/getTrimmedConfig.js +3 -4
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/index.js +8 -10
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/legend.js +6 -7
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/legendSet.js +22 -26
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/plotOptions.js +8 -9
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/series/index.js +18 -20
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/series/pie.js +1 -4
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/subtitle/index.js +1 -2
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/yAxis/gauge.js +1 -3
- package/build/cjs/visualizations/config/index.js +11 -12
- package/build/cjs/visualizations/config/validators/dhis/index.js +3 -4
- package/build/cjs/visualizations/index.js +1 -4
- package/build/cjs/visualizations/store/adapters/dhis_highcharts/index.js +7 -8
- package/build/cjs/visualizations/store/index.js +15 -17
- package/build/cjs/visualizations/store/validators/dhis/index.js +5 -6
- package/build/cjs/visualizations/util/getFilterText.js +3 -6
- package/build/cjs/visualizations/util/shouldUseContrastColor.js +1 -2
- package/build/es/__demo__/OpenFileDialog.stories.js +17 -0
- package/build/es/__demo__/PivotTable.stories.js +165 -222
- package/build/es/api/__tests__/dimensions.spec.js +1 -2
- package/build/es/api/analytics/Analytics.js +8 -9
- package/build/es/api/analytics/AnalyticsBase.js +58 -77
- package/build/es/api/analytics/AnalyticsRequest.js +1 -2
- package/build/es/api/analytics/AnalyticsRequestBase.js +18 -21
- package/build/es/api/analytics/AnalyticsRequestPropertiesMixin.js +19 -38
- package/build/es/api/analytics/AnalyticsResponseHeader.js +5 -7
- package/build/es/api/analytics/__tests__/AnalyticsBase.spec.js +8 -10
- package/build/es/api/analytics/__tests__/AnalyticsRequest.spec.js +8 -2
- package/build/es/api/analytics/utils.js +11 -17
- package/build/es/api/dimensions.js +119 -148
- package/build/es/api/expression.js +39 -60
- package/build/es/api/organisationUnits.js +23 -35
- package/build/es/components/AboutAOUnit/AboutAOUnit.js +11 -18
- package/build/es/components/CachedDataQueryProvider.js +6 -7
- package/build/es/components/DashboardPluginWrapper/DashboardPluginWrapper.js +17 -20
- package/build/es/components/DataDimension/Calculation/CalculationModal.js +43 -59
- package/build/es/components/DataDimension/Calculation/DataElementOption.js +5 -6
- package/build/es/components/DataDimension/Calculation/DataElementSelector.js +28 -36
- package/build/es/components/DataDimension/Calculation/DndContext.js +28 -35
- package/build/es/components/DataDimension/Calculation/DraggingItem.js +5 -6
- package/build/es/components/DataDimension/Calculation/DropZone.js +4 -5
- package/build/es/components/DataDimension/Calculation/FormulaField.js +29 -32
- package/build/es/components/DataDimension/Calculation/FormulaItem.js +13 -14
- package/build/es/components/DataDimension/Calculation/MathOperatorSelector.js +23 -29
- package/build/es/components/DataDimension/Calculation/Operator.js +6 -7
- package/build/es/components/DataDimension/DataDimension.js +19 -30
- package/build/es/components/DataDimension/Info/CalculationInfo.js +13 -20
- package/build/es/components/DataDimension/Info/DataElementInfo.js +23 -36
- package/build/es/components/DataDimension/Info/DataElementOperandInfo.js +29 -42
- package/build/es/components/DataDimension/Info/DataSetInfo.js +26 -39
- package/build/es/components/DataDimension/Info/EventDataItemInfo.js +21 -34
- package/build/es/components/DataDimension/Info/IndicatorInfo.js +20 -30
- package/build/es/components/DataDimension/Info/InfoPopover.js +6 -7
- package/build/es/components/DataDimension/Info/InfoTable.js +39 -52
- package/build/es/components/DataDimension/Info/OptionInfo.js +13 -20
- package/build/es/components/DataDimension/Info/ProgramIndicatorInfo.js +45 -56
- package/build/es/components/DataDimension/ItemOptionsSelector/ItemOptionsSelector.js +21 -30
- package/build/es/components/DataDimension/ItemSelector/DataTypeSelector.js +6 -7
- package/build/es/components/DataDimension/ItemSelector/DetailSelector.js +5 -6
- package/build/es/components/DataDimension/ItemSelector/GroupSelector.js +9 -10
- package/build/es/components/DataDimension/ItemSelector/ItemSelector.js +85 -102
- package/build/es/components/DataDimension/ItemSelector/MetricSelector.js +5 -6
- package/build/es/components/DataDimension/SourceEmptyPlaceholder.js +10 -13
- package/build/es/components/DataDimension/TransferOption.js +35 -39
- package/build/es/components/DimensionMenu.js +13 -14
- package/build/es/components/DimensionsPanel/DimensionsPanel.js +7 -7
- package/build/es/components/DimensionsPanel/List/DimensionItem.js +11 -11
- package/build/es/components/DimensionsPanel/List/DimensionList.js +11 -9
- package/build/es/components/DimensionsPanel/List/OptionsButton.js +8 -11
- package/build/es/components/DimensionsPanel/List/RecommendedIcon.js +10 -13
- package/build/es/components/DimensionsPanel/List/__tests__/DimensionItem.spec.js +47 -40
- package/build/es/components/DimensionsPanel/List/__tests__/__snapshots__/DimensionItem.spec.js.snap +110 -114
- package/build/es/components/DimensionsPanel/__tests__/DimensionsPanel.spec.js +35 -32
- package/build/es/components/DynamicDimension/DynamicDimension.js +9 -13
- package/build/es/components/DynamicDimension/ItemSelector.js +24 -36
- package/build/es/components/FileMenu/DeleteDialog.js +10 -14
- package/build/es/components/FileMenu/FileMenu.js +18 -28
- package/build/es/components/FileMenu/GetLinkDialog.js +7 -7
- package/build/es/components/FileMenu/RenameDialog.js +12 -19
- package/build/es/components/FileMenu/SaveAsDialog.js +12 -19
- package/build/es/components/FileMenu/__tests__/DeleteDialog.spec.js +23 -26
- package/build/es/components/FileMenu/__tests__/FileMenu.spec.js +56 -32
- package/build/es/components/FileMenu/__tests__/GetLinkDialog.spec.js +34 -38
- package/build/es/components/FileMenu/__tests__/RenameDialog.spec.js +18 -12
- package/build/es/components/FileMenu/__tests__/SaveAsDialog.spec.js +43 -36
- package/build/es/components/FileMenu/utils.js +10 -12
- package/build/es/components/Filter/Filter.js +21 -27
- package/build/es/components/Filter/__tests__/Filter.spec.js +28 -33
- package/build/es/components/Interpretations/InterpretationModal/Comment.js +7 -8
- package/build/es/components/Interpretations/InterpretationModal/CommentAddForm.js +9 -13
- package/build/es/components/Interpretations/InterpretationModal/CommentDeleteButton.js +9 -13
- package/build/es/components/Interpretations/InterpretationModal/CommentUpdateForm.js +11 -15
- package/build/es/components/Interpretations/InterpretationModal/InterpretationModal.js +18 -23
- package/build/es/components/Interpretations/InterpretationModal/InterpretationThread.js +11 -12
- package/build/es/components/Interpretations/InterpretationsUnit/InterpretationForm.js +11 -15
- package/build/es/components/Interpretations/InterpretationsUnit/InterpretationList.js +10 -11
- package/build/es/components/Interpretations/InterpretationsUnit/InterpretationsUnit.js +22 -31
- package/build/es/components/Interpretations/common/Interpretation/Interpretation.js +12 -13
- package/build/es/components/Interpretations/common/Interpretation/InterpretationDeleteButton.js +7 -11
- package/build/es/components/Interpretations/common/Interpretation/InterpretationSharingLink.js +4 -5
- package/build/es/components/Interpretations/common/Interpretation/InterpretationUpdateForm.js +14 -21
- package/build/es/components/Interpretations/common/Interpretation/useLike.js +5 -6
- package/build/es/components/Interpretations/common/Message/Message.js +6 -7
- package/build/es/components/Interpretations/common/Message/MessageButtonStrip.js +8 -11
- package/build/es/components/Interpretations/common/Message/MessageEditorContainer.js +18 -21
- package/build/es/components/Interpretations/common/Message/MessageIconButton.js +34 -40
- package/build/es/components/Interpretations/common/Message/MessageStatsBar.js +8 -11
- package/build/es/components/LegendKey/LegendKey.js +3 -4
- package/build/es/components/OfflineTooltip.js +18 -26
- package/build/es/components/OpenFileDialog/CreatedByFilter.js +26 -25
- package/build/es/components/OpenFileDialog/CustomSelectOption.js +23 -26
- package/build/es/components/OpenFileDialog/DateField.js +3 -4
- package/build/es/components/OpenFileDialog/FileList.js +19 -22
- package/build/es/components/OpenFileDialog/NameFilter.js +15 -21
- package/build/es/components/OpenFileDialog/OpenFileDialog.js +49 -78
- package/build/es/components/OpenFileDialog/PaginationControls.js +22 -28
- package/build/es/components/OpenFileDialog/VisTypeFilter.js +64 -36
- package/build/es/components/OpenFileDialog/__tests__/OpenFileDialog.spec.js +49 -0
- package/build/es/components/Options/VisualizationOptions.js +34 -44
- package/build/es/components/OrgUnitDimension/OrgUnitDimension.js +37 -58
- package/build/es/components/OrgUnitDimension/__tests__/OrgUnitDimension.spec.js +77 -43
- package/build/es/components/PeriodDimension/FixedPeriodFilter.js +17 -25
- package/build/es/components/PeriodDimension/FixedPeriodSelect.js +14 -19
- package/build/es/components/PeriodDimension/PeriodDimension.js +9 -12
- package/build/es/components/PeriodDimension/PeriodTransfer.js +48 -61
- package/build/es/components/PeriodDimension/RelativePeriodFilter.js +25 -30
- package/build/es/components/PeriodDimension/__tests__/FixedPeriodSingleSelect.spec.js +13 -20
- package/build/es/components/PeriodDimension/__tests__/PeriodDimension.spec.js +26 -22
- package/build/es/components/PeriodDimension/utils/fixedPeriods.js +6 -7
- package/build/es/components/PeriodDimension/utils/index.js +1 -5
- package/build/es/components/PivotTable/PivotTable.js +7 -8
- package/build/es/components/PivotTable/PivotTableBody.js +20 -29
- package/build/es/components/PivotTable/PivotTableCell.js +8 -12
- package/build/es/components/PivotTable/PivotTableClippedAxis.js +14 -17
- package/build/es/components/PivotTable/PivotTableColumnHeaderCell.js +7 -8
- package/build/es/components/PivotTable/PivotTableColumnHeaders.js +22 -29
- package/build/es/components/PivotTable/PivotTableContainer.js +5 -6
- package/build/es/components/PivotTable/PivotTableDimensionLabelCell.js +4 -5
- package/build/es/components/PivotTable/PivotTableEmptyCell.js +3 -4
- package/build/es/components/PivotTable/PivotTableEmptyRow.js +4 -5
- package/build/es/components/PivotTable/PivotTableEngineContext.js +4 -5
- package/build/es/components/PivotTable/PivotTableHead.js +13 -16
- package/build/es/components/PivotTable/PivotTableHeaderCell.js +8 -9
- package/build/es/components/PivotTable/PivotTableRow.js +20 -27
- package/build/es/components/PivotTable/PivotTableRowHeaderCell.js +5 -6
- package/build/es/components/PivotTable/PivotTableSortIcon.js +4 -5
- package/build/es/components/PivotTable/PivotTableTitleRow.js +18 -22
- package/build/es/components/PivotTable/PivotTableTitleRows.js +4 -5
- package/build/es/components/PivotTable/PivotTableValueCell.js +5 -6
- package/build/es/components/RichText/Editor/Editor.js +69 -83
- package/build/es/components/RichText/Editor/__tests__/Editor.spec.js +7 -8
- package/build/es/components/RichText/Parser/Parser.js +4 -8
- package/build/es/components/RichText/Parser/__tests__/MdParser.spec.js +1 -1
- package/build/es/components/RichText/Parser/__tests__/Parser.spec.js +21 -22
- package/build/es/components/Toolbar/HoverMenuBar/HoverMenuBar.js +20 -23
- package/build/es/components/Toolbar/HoverMenuBar/HoverMenuDropdown.js +7 -11
- package/build/es/components/Toolbar/HoverMenuBar/HoverMenuList.js +8 -15
- package/build/es/components/Toolbar/HoverMenuBar/HoverMenuListItem.js +10 -14
- package/build/es/components/Toolbar/HoverMenuBar/__tests__/HoverMenuBar.spec.js +57 -48
- package/build/es/components/Toolbar/HoverMenuBar/__tests__/HoverMenuDropdown.spec.js +7 -7
- package/build/es/components/Toolbar/HoverMenuBar/__tests__/HoverMenuList.spec.js +27 -20
- package/build/es/components/Toolbar/HoverMenuBar/__tests__/HoverMenuListItem.spec.js +21 -15
- package/build/es/components/Toolbar/HoverMenuBar/__tests__/__snapshots__/HoverMenuList.spec.js.snap +63 -0
- package/build/es/components/Toolbar/InterpretationsAndDetailsToggler.js +17 -21
- package/build/es/components/Toolbar/Toolbar.js +10 -16
- package/build/es/components/Toolbar/ToolbarSidebar.js +12 -18
- package/build/es/components/Toolbar/UpdateButton.js +18 -24
- package/build/es/components/Toolbar/__tests__/InterpretationsAndDetailsToggler.spec.js +18 -17
- package/build/es/components/Toolbar/__tests__/Toolbar.spec.js +7 -7
- package/build/es/components/Toolbar/__tests__/ToolbarSidebar.spec.js +13 -10
- package/build/es/components/Toolbar/__tests__/UpdateButton.spec.js +15 -13
- package/build/es/components/TransferOption.js +14 -15
- package/build/es/components/TranslationDialog/TranslationModal/LocalesSelect.js +19 -27
- package/build/es/components/TranslationDialog/TranslationModal/TranslationForm.js +16 -23
- package/build/es/components/TranslationDialog/TranslationModal/TranslationModal.js +8 -8
- package/build/es/components/TranslationDialog/TranslationModal/TranslationModalActions.js +18 -27
- package/build/es/components/TranslationDialog/TranslationModal/__tests__/TranslationModal.spec.js +24 -15
- package/build/es/components/TranslationDialog/TranslationModal/useTranslationsResults.js +3 -4
- package/build/es/components/UserMention/UserList.js +6 -7
- package/build/es/components/UserMention/UserMentionWrapper.js +12 -18
- package/build/es/components/UserMention/useUserSearchResults.js +12 -16
- package/build/es/components/VisTypeIcon.js +5 -6
- package/build/es/locales/ar_IQ/translations.json +20 -11
- package/build/es/locales/cs/translations.json +2 -0
- package/build/es/locales/en/translations.json +1 -0
- package/build/es/locales/es/translations.json +2 -0
- package/build/es/locales/fr/translations.json +2 -0
- package/build/es/locales/id/translations.json +20 -11
- package/build/es/locales/lo/translations.json +2 -0
- package/build/es/locales/nb/translations.json +2 -0
- package/build/es/locales/prs/translations.json +2 -0
- package/build/es/locales/ps/translations.json +2 -0
- package/build/es/locales/pt/translations.json +2 -0
- package/build/es/locales/pt_BR/translations.json +2 -0
- package/build/es/locales/ru/translations.json +2 -0
- package/build/es/locales/si/translations.json +20 -11
- package/build/es/locales/sv/translations.json +20 -11
- package/build/es/locales/tet/translations.json +20 -11
- package/build/es/locales/tg/translations.json +2 -0
- package/build/es/locales/uk/translations.json +2 -0
- package/build/es/locales/ur/translations.json +2 -0
- package/build/es/locales/uz_UZ_Cyrl/translations.json +2 -0
- package/build/es/locales/uz_UZ_Latn/translations.json +4 -2
- package/build/es/locales/vi/translations.json +2 -0
- package/build/es/locales/zh/translations.json +2 -0
- package/build/es/locales/zh_CN/translations.json +17 -15
- package/build/es/modules/__tests__/expressions.spec.js +4 -5
- package/build/es/modules/__tests__/isNumeric.spec.js +31 -0
- package/build/es/modules/dimensionListItem.js +4 -5
- package/build/es/modules/expressions.js +3 -9
- package/build/es/modules/getPWAInstallationStatus.js +7 -9
- package/build/es/modules/layout/dimensionCreate.js +1 -3
- package/build/es/modules/layout/dimensionIsValid.js +3 -4
- package/build/es/modules/legends.js +5 -6
- package/build/es/modules/outliers/index.js +2 -3
- package/build/es/modules/outliers/iqr.js +4 -6
- package/build/es/modules/outliers/modZScore.js +6 -14
- package/build/es/modules/outliers/zScore.js +3 -4
- package/build/es/modules/pivotTable/AdaptiveClippingController.js +12 -16
- package/build/es/modules/pivotTable/PivotTableEngine.js +48 -59
- package/build/es/modules/pivotTable/clipAxis.js +7 -8
- package/build/es/modules/pivotTable/clipPartitionedAxis.js +9 -10
- package/build/es/modules/pivotTable/getHeaderForDisplay.js +8 -9
- package/build/es/modules/pivotTable/measureText.js +7 -9
- package/build/es/modules/pivotTable/useParentSize.js +1 -2
- package/build/es/modules/pivotTable/useScrollPosition.js +1 -2
- package/build/es/modules/pivotTable/useTableClipping.js +6 -7
- package/build/es/modules/relativeItems/index.js +1 -4
- package/build/es/modules/renderValue.js +1 -2
- package/build/es/modules/utils.js +9 -1
- package/build/es/visualizations/config/adapters/dhis_highcharts/addTrendLines.js +3 -8
- package/build/es/visualizations/config/adapters/dhis_highcharts/axis.js +2 -5
- package/build/es/visualizations/config/adapters/dhis_highcharts/customAxes.js +2 -5
- package/build/es/visualizations/config/adapters/dhis_highcharts/customSVGOptions/index.js +7 -8
- package/build/es/visualizations/config/adapters/dhis_highcharts/customSVGOptions/singleValue/getSingleValueBackgroundColor.js +1 -2
- package/build/es/visualizations/config/adapters/dhis_highcharts/customSVGOptions/singleValue/index.js +6 -7
- package/build/es/visualizations/config/adapters/dhis_highcharts/getFormatter.js +1 -1
- package/build/es/visualizations/config/adapters/dhis_highcharts/getSteps.js +1 -1
- package/build/es/visualizations/config/adapters/dhis_highcharts/getTrimmedConfig.js +3 -4
- package/build/es/visualizations/config/adapters/dhis_highcharts/index.js +7 -8
- package/build/es/visualizations/config/adapters/dhis_highcharts/legend.js +6 -7
- package/build/es/visualizations/config/adapters/dhis_highcharts/legendSet.js +22 -26
- package/build/es/visualizations/config/adapters/dhis_highcharts/plotOptions.js +8 -9
- package/build/es/visualizations/config/adapters/dhis_highcharts/series/index.js +18 -20
- package/build/es/visualizations/config/adapters/dhis_highcharts/series/pie.js +1 -4
- package/build/es/visualizations/config/adapters/dhis_highcharts/yAxis/gauge.js +1 -3
- package/build/es/visualizations/config/index.js +11 -12
- package/build/es/visualizations/config/validators/dhis/index.js +3 -4
- package/build/es/visualizations/index.js +1 -4
- package/build/es/visualizations/store/adapters/dhis_highcharts/index.js +7 -8
- package/build/es/visualizations/store/index.js +15 -17
- package/build/es/visualizations/store/validators/dhis/index.js +5 -6
- package/build/es/visualizations/util/getFilterText.js +3 -6
- package/build/es/visualizations/util/shouldUseContrastColor.js +1 -2
- package/package.json +13 -15
- package/build/cjs/components/OrgUnitDimension/__tests__/__snapshots__/OrgUnitDimension.spec.js.snap +0 -89
- package/build/cjs/components/PeriodDimension/__tests__/PeriodSelector.spec.js +0 -29
- package/build/cjs/components/PeriodDimension/__tests__/__snapshots__/FixedPeriodSingleSelect.spec.js.snap +0 -93
- package/build/cjs/components/PeriodDimension/__tests__/__snapshots__/PeriodDimension.spec.js.snap +0 -17
- package/build/cjs/components/PeriodDimension/__tests__/__snapshots__/PeriodSelector.spec.js.snap +0 -89
- package/build/es/components/OrgUnitDimension/__tests__/__snapshots__/OrgUnitDimension.spec.js.snap +0 -89
- package/build/es/components/PeriodDimension/__tests__/PeriodSelector.spec.js +0 -26
- package/build/es/components/PeriodDimension/__tests__/__snapshots__/FixedPeriodSingleSelect.spec.js.snap +0 -93
- package/build/es/components/PeriodDimension/__tests__/__snapshots__/PeriodDimension.spec.js.snap +0 -17
- package/build/es/components/PeriodDimension/__tests__/__snapshots__/PeriodSelector.spec.js.snap +0 -89
|
@@ -1,55 +1,89 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { CustomDataProvider } from '@dhis2/app-runtime';
|
|
2
|
+
import { render, screen } from '@testing-library/react';
|
|
3
|
+
import userEvent from '@testing-library/user-event';
|
|
2
4
|
import React from 'react';
|
|
3
5
|
import OrgUnitDimension from '../OrgUnitDimension.js';
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
shallowOrgUnitDimension = shallow(/*#__PURE__*/React.createElement(OrgUnitDimension, props));
|
|
10
|
-
}
|
|
11
|
-
return shallowOrgUnitDimension;
|
|
6
|
+
jest.mock('@dhis2-ui/organisation-unit-tree', () => {
|
|
7
|
+
const lib = jest.requireActual('@dhis2-ui/organisation-unit-tree');
|
|
8
|
+
return {
|
|
9
|
+
...lib,
|
|
10
|
+
OrganisationUnitTree: () => /*#__PURE__*/React.createElement("div", null, "Org unit tree component mock")
|
|
12
11
|
};
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
}
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
12
|
+
});
|
|
13
|
+
describe('OrgUnitDimension', () => {
|
|
14
|
+
const onSelect = jest.fn();
|
|
15
|
+
const props = {
|
|
16
|
+
roots: [],
|
|
17
|
+
selected: [],
|
|
18
|
+
onSelect: onSelect,
|
|
19
|
+
hideGroupSelect: false,
|
|
20
|
+
hideLevelSelect: false,
|
|
21
|
+
hideUserOrgUnits: false,
|
|
22
|
+
warning: ''
|
|
23
|
+
};
|
|
24
|
+
const renderOrgUnitDimension = props => render(/*#__PURE__*/React.createElement(CustomDataProvider, {
|
|
25
|
+
data: {
|
|
26
|
+
organisationUnitLevels: {
|
|
27
|
+
organisationUnitLevels: []
|
|
28
|
+
},
|
|
29
|
+
organisationUnitGroups: {
|
|
30
|
+
organisationUnitGroups: []
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
}, /*#__PURE__*/React.createElement(OrgUnitDimension, props)));
|
|
34
|
+
beforeEach(() => onSelect.mockClear());
|
|
35
|
+
test('OrgUnitDimension is rendered correctly', async () => {
|
|
36
|
+
renderOrgUnitDimension(props);
|
|
37
|
+
|
|
38
|
+
// wait for the component to be loaded, here done by testing that the OrganisationUnitTree component is loaded
|
|
39
|
+
// avoid the act warning due to the snapshot being taken before async code is run
|
|
40
|
+
await screen.findByText('Org unit tree component mock');
|
|
41
|
+
|
|
42
|
+
// the top user org unit checkboxes are rendered
|
|
43
|
+
expect(screen.getByLabelText('User organisation unit')).toBeInTheDocument();
|
|
44
|
+
expect(screen.getByLabelText('User sub-units')).toBeInTheDocument();
|
|
45
|
+
expect(screen.getByLabelText('User sub-x2-units')).toBeInTheDocument();
|
|
46
|
+
|
|
47
|
+
// the OrganisationUnitTree component is rendered
|
|
48
|
+
expect(screen.getByText('Org unit tree component mock')).toBeInTheDocument();
|
|
49
|
+
|
|
50
|
+
// the level selector is rendered
|
|
51
|
+
expect(screen.getByText('Select a level')).toBeInTheDocument();
|
|
52
|
+
|
|
53
|
+
// the group selector is rendered
|
|
54
|
+
expect(screen.getByText('Select a group')).toBeInTheDocument();
|
|
55
|
+
|
|
56
|
+
// the Deselect all button is rendered
|
|
57
|
+
expect(screen.getByRole('button', {
|
|
58
|
+
name: 'Deselect all'
|
|
59
|
+
})).toBeInTheDocument();
|
|
28
60
|
});
|
|
29
|
-
|
|
30
|
-
const
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
path: '/testPath',
|
|
35
|
-
displayName: 'Test Org Unit',
|
|
36
|
-
checked: true
|
|
37
|
-
};
|
|
38
|
-
orgUnitTree.props().onChange(testOrgUnit);
|
|
39
|
-
expect(props.onSelect).toHaveBeenCalledWith({
|
|
61
|
+
test('OrgUnitDimension calls onSelect when an organisation unit is selected', async () => {
|
|
62
|
+
const user = userEvent.setup();
|
|
63
|
+
renderOrgUnitDimension(props);
|
|
64
|
+
await user.click(screen.getByText('User organisation unit'));
|
|
65
|
+
expect(onSelect).toHaveBeenCalledWith({
|
|
40
66
|
dimensionId: 'ou',
|
|
41
67
|
items: [{
|
|
42
|
-
id: '
|
|
43
|
-
|
|
44
|
-
name: 'Test Org Unit'
|
|
68
|
+
id: 'USER_ORGUNIT',
|
|
69
|
+
displayName: 'User organisation unit'
|
|
45
70
|
}]
|
|
46
71
|
});
|
|
47
72
|
});
|
|
48
|
-
|
|
49
|
-
const
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
73
|
+
test('OrgUnitDimension calls onSelect with an empty array when selection is cleared', async () => {
|
|
74
|
+
const user = userEvent.setup();
|
|
75
|
+
renderOrgUnitDimension({
|
|
76
|
+
...props,
|
|
77
|
+
// make some selection to enable the deselect all button
|
|
78
|
+
selected: [{
|
|
79
|
+
id: 'USER_ORGUNIT_CHILDREN',
|
|
80
|
+
name: 'User sub-units'
|
|
81
|
+
}]
|
|
82
|
+
});
|
|
83
|
+
await user.click(screen.getByRole('button', {
|
|
84
|
+
name: 'Deselect all'
|
|
85
|
+
}));
|
|
86
|
+
expect(onSelect).toHaveBeenLastCalledWith({
|
|
53
87
|
dimensionId: 'ou',
|
|
54
88
|
items: []
|
|
55
89
|
});
|
|
@@ -6,27 +6,25 @@ import i18n from '../../locales/index.js';
|
|
|
6
6
|
import styles from './styles/PeriodFilter.style.js';
|
|
7
7
|
import { getFixedPeriodsOptions } from './utils/fixedPeriods.js';
|
|
8
8
|
import { filterPeriodTypesById } from './utils/index.js';
|
|
9
|
-
const
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
9
|
+
const EXCLUDED_PERIOD_TYPES_PROP_DEFAULT = [];
|
|
10
|
+
const FixedPeriodFilter = ({
|
|
11
|
+
allowedPeriodTypes,
|
|
12
|
+
excludedPeriodTypes = EXCLUDED_PERIOD_TYPES_PROP_DEFAULT,
|
|
13
|
+
currentPeriodType,
|
|
14
|
+
currentYear,
|
|
15
|
+
onSelectPeriodType,
|
|
16
|
+
onSelectYear,
|
|
17
|
+
dataTest
|
|
18
|
+
}) => {
|
|
19
19
|
const onlyAllowedTypeIsSelected = Array.isArray(allowedPeriodTypes) && allowedPeriodTypes.length === 1 && allowedPeriodTypes[0] === currentPeriodType;
|
|
20
20
|
return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
|
|
21
|
+
"data-test": dataTest,
|
|
21
22
|
className: `jsx-${styles.__hash}` + " " + "leftSection"
|
|
22
23
|
}, /*#__PURE__*/React.createElement(SingleSelectField, {
|
|
23
24
|
label: i18n.t('Period type'),
|
|
24
|
-
onChange:
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
} = _ref2;
|
|
28
|
-
return onSelectPeriodType(selected);
|
|
29
|
-
},
|
|
25
|
+
onChange: ({
|
|
26
|
+
selected
|
|
27
|
+
}) => onSelectPeriodType(selected),
|
|
30
28
|
dense: true,
|
|
31
29
|
selected: currentPeriodType,
|
|
32
30
|
disabled: onlyAllowedTypeIsSelected,
|
|
@@ -45,21 +43,15 @@ const FixedPeriodFilter = _ref => {
|
|
|
45
43
|
type: "number",
|
|
46
44
|
placeholder: i18n.t('Select year'),
|
|
47
45
|
value: currentYear,
|
|
48
|
-
onChange:
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
} = _ref3;
|
|
52
|
-
return onSelectYear(value);
|
|
53
|
-
},
|
|
46
|
+
onChange: ({
|
|
47
|
+
value
|
|
48
|
+
}) => onSelectYear(value),
|
|
54
49
|
dense: true,
|
|
55
50
|
dataTest: `${dataTest}-year`
|
|
56
51
|
})), /*#__PURE__*/React.createElement(_JSXStyle, {
|
|
57
52
|
id: styles.__hash
|
|
58
53
|
}, styles));
|
|
59
54
|
};
|
|
60
|
-
FixedPeriodFilter.defaultProps = {
|
|
61
|
-
excludedPeriodTypes: []
|
|
62
|
-
};
|
|
63
55
|
FixedPeriodFilter.propTypes = {
|
|
64
56
|
currentPeriodType: PropTypes.string.isRequired,
|
|
65
57
|
currentYear: PropTypes.string.isRequired,
|
|
@@ -10,8 +10,8 @@ import FixedPeriodFilter from './FixedPeriodFilter.js';
|
|
|
10
10
|
import styles from './styles/FixedPeriodSelect.style.js';
|
|
11
11
|
import { parsePeriodCode, getFixedPeriodsOptionsById as getPeriodById, getYearOffsetFromNow } from './utils/fixedPeriods.js';
|
|
12
12
|
class FixedPeriodSelect extends Component {
|
|
13
|
-
constructor() {
|
|
14
|
-
super(...
|
|
13
|
+
constructor(...args) {
|
|
14
|
+
super(...args);
|
|
15
15
|
_defineProperty(this, "state", {
|
|
16
16
|
periodType: '',
|
|
17
17
|
year: '',
|
|
@@ -31,24 +31,19 @@ class FixedPeriodSelect extends Component {
|
|
|
31
31
|
});
|
|
32
32
|
this.props.onChange();
|
|
33
33
|
});
|
|
34
|
-
_defineProperty(this, "onSelectPeriod", (
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
id
|
|
41
|
-
} = _ref2;
|
|
42
|
-
return id === periodId;
|
|
43
|
-
});
|
|
34
|
+
_defineProperty(this, "onSelectPeriod", ({
|
|
35
|
+
selected: periodId
|
|
36
|
+
}, event) => {
|
|
37
|
+
const period = this.state.options.find(({
|
|
38
|
+
id
|
|
39
|
+
}) => id === periodId);
|
|
44
40
|
this.props.onChange(period, event);
|
|
45
41
|
});
|
|
46
42
|
}
|
|
47
|
-
static getDerivedStateFromProps(
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
} = _ref3;
|
|
43
|
+
static getDerivedStateFromProps({
|
|
44
|
+
value,
|
|
45
|
+
allowedPeriodTypes
|
|
46
|
+
}) {
|
|
52
47
|
const period = parsePeriodCode(value, allowedPeriodTypes);
|
|
53
48
|
if (!period) {
|
|
54
49
|
return null;
|
|
@@ -91,10 +86,10 @@ class FixedPeriodSelect extends Component {
|
|
|
91
86
|
}, styles));
|
|
92
87
|
}
|
|
93
88
|
}
|
|
94
|
-
FixedPeriodSelect
|
|
89
|
+
_defineProperty(FixedPeriodSelect, "defaultProps", {
|
|
95
90
|
dataTest: 'dhis2-analytics-fixedperiodselect',
|
|
96
91
|
value: ''
|
|
97
|
-
};
|
|
92
|
+
});
|
|
98
93
|
FixedPeriodSelect.propTypes = {
|
|
99
94
|
onChange: PropTypes.func.isRequired,
|
|
100
95
|
allowedPeriodTypes: PropTypes.arrayOf(PropTypes.string),
|
|
@@ -11,15 +11,15 @@ const userSettingsQuery = {
|
|
|
11
11
|
}
|
|
12
12
|
}
|
|
13
13
|
};
|
|
14
|
-
const
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
14
|
+
const SELECTED_PERIODS_PROP_DEFAULT = [];
|
|
15
|
+
const PeriodDimension = ({
|
|
16
|
+
onSelect,
|
|
17
|
+
selectedPeriods = SELECTED_PERIODS_PROP_DEFAULT,
|
|
18
|
+
rightFooter,
|
|
19
|
+
excludedPeriodTypes,
|
|
20
|
+
infoBoxMessage,
|
|
21
|
+
height
|
|
22
|
+
}) => {
|
|
23
23
|
const {
|
|
24
24
|
systemInfo
|
|
25
25
|
} = useConfig();
|
|
@@ -63,7 +63,4 @@ PeriodDimension.propTypes = {
|
|
|
63
63
|
rightFooter: PropTypes.node,
|
|
64
64
|
selectedPeriods: PropTypes.array
|
|
65
65
|
};
|
|
66
|
-
PeriodDimension.defaultProps = {
|
|
67
|
-
selectedPeriods: []
|
|
68
|
-
};
|
|
69
66
|
export default PeriodDimension;
|
|
@@ -14,36 +14,38 @@ import RelativePeriodFilter from './RelativePeriodFilter.js';
|
|
|
14
14
|
import { getFixedPeriodsOptionsById } from './utils/fixedPeriods.js';
|
|
15
15
|
import { MONTHLY, QUARTERLY } from './utils/index.js';
|
|
16
16
|
import { getRelativePeriodsOptionsById } from './utils/relativePeriods.js';
|
|
17
|
-
const RightHeader =
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
}
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
id: styles.__hash
|
|
31
|
-
}, styles));
|
|
32
|
-
};
|
|
17
|
+
const RightHeader = ({
|
|
18
|
+
infoBoxMessage
|
|
19
|
+
}) => /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("p", {
|
|
20
|
+
className: `jsx-${styles.__hash}` + " " + "rightHeader"
|
|
21
|
+
}, i18n.t('Selected Periods')), infoBoxMessage && /*#__PURE__*/React.createElement("div", {
|
|
22
|
+
className: `jsx-${styles.__hash}` + " " + "info-container"
|
|
23
|
+
}, /*#__PURE__*/React.createElement("div", {
|
|
24
|
+
className: `jsx-${styles.__hash}`
|
|
25
|
+
}, /*#__PURE__*/React.createElement(IconInfo16, null)), /*#__PURE__*/React.createElement("span", {
|
|
26
|
+
className: `jsx-${styles.__hash}` + " " + "info-text"
|
|
27
|
+
}, infoBoxMessage)), /*#__PURE__*/React.createElement(_JSXStyle, {
|
|
28
|
+
id: styles.__hash
|
|
29
|
+
}, styles));
|
|
33
30
|
RightHeader.propTypes = {
|
|
34
31
|
infoBoxMessage: PropTypes.string
|
|
35
32
|
};
|
|
36
|
-
const
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
33
|
+
const SELECTED_ITEMS_PROP_DEFAULT = [];
|
|
34
|
+
const EXCLUDED_PERIOD_TYPES_PROP_DEFAULT = [];
|
|
35
|
+
const PERIODS_SETTINGS_PROP_DEFAULT = {
|
|
36
|
+
calendar: 'gregory',
|
|
37
|
+
locale: 'en'
|
|
38
|
+
};
|
|
39
|
+
const PeriodTransfer = ({
|
|
40
|
+
onSelect,
|
|
41
|
+
dataTest,
|
|
42
|
+
selectedItems = SELECTED_ITEMS_PROP_DEFAULT,
|
|
43
|
+
rightFooter,
|
|
44
|
+
excludedPeriodTypes = EXCLUDED_PERIOD_TYPES_PROP_DEFAULT,
|
|
45
|
+
periodsSettings = PERIODS_SETTINGS_PROP_DEFAULT,
|
|
46
|
+
infoBoxMessage,
|
|
47
|
+
height = TRANSFER_HEIGHT
|
|
48
|
+
}) => {
|
|
47
49
|
const defaultRelativePeriodType = excludedPeriodTypes.includes(MONTHLY) ? getRelativePeriodsOptionsById(QUARTERLY) : getRelativePeriodsOptionsById(MONTHLY);
|
|
48
50
|
const defaultFixedPeriodType = excludedPeriodTypes.includes(MONTHLY) ? getFixedPeriodsOptionsById(QUARTERLY, periodsSettings) : getFixedPeriodsOptionsById(MONTHLY, periodsSettings);
|
|
49
51
|
const now = getNowInCalendar(periodsSettings.calendar);
|
|
@@ -126,10 +128,9 @@ const PeriodTransfer = _ref2 => {
|
|
|
126
128
|
id: styles.__hash
|
|
127
129
|
}, styles));
|
|
128
130
|
return /*#__PURE__*/React.createElement(Transfer, {
|
|
129
|
-
onChange:
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
} = _ref3;
|
|
131
|
+
onChange: ({
|
|
132
|
+
selected
|
|
133
|
+
}) => {
|
|
133
134
|
const formattedItems = selected.map(id => {
|
|
134
135
|
const matchingItem = [...allPeriods, ...selectedItems].find(item => item.id === id);
|
|
135
136
|
return {
|
|
@@ -151,39 +152,25 @@ const PeriodTransfer = _ref2 => {
|
|
|
151
152
|
infoBoxMessage: infoBoxMessage
|
|
152
153
|
}),
|
|
153
154
|
rightFooter: rightFooter,
|
|
154
|
-
options: [...allPeriods, ...selectedItems].map(
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
}
|
|
169
|
-
|
|
170
|
-
value: value,
|
|
171
|
-
active: isActive(value),
|
|
172
|
-
icon: PeriodIcon,
|
|
173
|
-
dataTest: `${dataTest}-transfer-option`
|
|
174
|
-
}));
|
|
175
|
-
},
|
|
155
|
+
options: [...allPeriods, ...selectedItems].map(({
|
|
156
|
+
id,
|
|
157
|
+
name
|
|
158
|
+
}) => ({
|
|
159
|
+
label: name,
|
|
160
|
+
value: id
|
|
161
|
+
})),
|
|
162
|
+
renderOption: ({
|
|
163
|
+
value,
|
|
164
|
+
...props
|
|
165
|
+
}) => /*#__PURE__*/React.createElement(TransferOption, _extends({}, props, {
|
|
166
|
+
value: value,
|
|
167
|
+
active: isActive(value),
|
|
168
|
+
icon: PeriodIcon,
|
|
169
|
+
dataTest: `${dataTest}-transfer-option`
|
|
170
|
+
})),
|
|
176
171
|
dataTest: `${dataTest}-transfer`
|
|
177
172
|
});
|
|
178
173
|
};
|
|
179
|
-
PeriodTransfer.defaultProps = {
|
|
180
|
-
selectedItems: [],
|
|
181
|
-
excludedPeriodTypes: [],
|
|
182
|
-
periodsSettings: {
|
|
183
|
-
calendar: 'gregory',
|
|
184
|
-
locale: 'en'
|
|
185
|
-
}
|
|
186
|
-
};
|
|
187
174
|
PeriodTransfer.propTypes = {
|
|
188
175
|
onSelect: PropTypes.func.isRequired,
|
|
189
176
|
dataTest: PropTypes.string,
|
|
@@ -6,36 +6,31 @@ import i18n from '../../locales/index.js';
|
|
|
6
6
|
import styles from './styles/PeriodFilter.style.js';
|
|
7
7
|
import { filterPeriodTypesById } from './utils/index.js';
|
|
8
8
|
import { getRelativePeriodsOptions } from './utils/relativePeriods.js';
|
|
9
|
-
const RelativePeriodFilter =
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
}
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
dataTest: `${dataTest}-option-${option.id}`
|
|
35
|
-
}))), /*#__PURE__*/React.createElement(_JSXStyle, {
|
|
36
|
-
id: styles.__hash
|
|
37
|
-
}, styles));
|
|
38
|
-
};
|
|
9
|
+
const RelativePeriodFilter = ({
|
|
10
|
+
currentFilter,
|
|
11
|
+
onSelectFilter,
|
|
12
|
+
dataTest,
|
|
13
|
+
excludedPeriodTypes
|
|
14
|
+
}) => /*#__PURE__*/React.createElement("div", {
|
|
15
|
+
"data-test": dataTest,
|
|
16
|
+
className: `jsx-${styles.__hash}` + " " + "leftSection"
|
|
17
|
+
}, /*#__PURE__*/React.createElement(SingleSelectField, {
|
|
18
|
+
label: i18n.t('Period type'),
|
|
19
|
+
onChange: ({
|
|
20
|
+
selected
|
|
21
|
+
}) => onSelectFilter(selected),
|
|
22
|
+
dense: true,
|
|
23
|
+
selected: currentFilter,
|
|
24
|
+
className: "filterElement",
|
|
25
|
+
dataTest: `${dataTest}-period-type`
|
|
26
|
+
}, filterPeriodTypesById(getRelativePeriodsOptions(), excludedPeriodTypes).map(option => /*#__PURE__*/React.createElement(SingleSelectOption, {
|
|
27
|
+
key: option.id,
|
|
28
|
+
value: option.id,
|
|
29
|
+
label: option.name,
|
|
30
|
+
dataTest: `${dataTest}-period-type-option-${option.id}`
|
|
31
|
+
}))), /*#__PURE__*/React.createElement(_JSXStyle, {
|
|
32
|
+
id: styles.__hash
|
|
33
|
+
}, styles));
|
|
39
34
|
RelativePeriodFilter.propTypes = {
|
|
40
35
|
currentFilter: PropTypes.string.isRequired,
|
|
41
36
|
onSelectFilter: PropTypes.func.isRequired,
|
|
@@ -1,24 +1,17 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { render, screen } from '@testing-library/react';
|
|
2
2
|
import React from 'react';
|
|
3
3
|
import FixedPeriodSelect from '../FixedPeriodSelect.js';
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
if (!shallowFixedPeriodSelect) {
|
|
9
|
-
shallowFixedPeriodSelect = shallow(/*#__PURE__*/React.createElement(FixedPeriodSelect, props));
|
|
10
|
-
}
|
|
11
|
-
return shallowFixedPeriodSelect;
|
|
4
|
+
test('FixedPeriodSelect renders correctly', () => {
|
|
5
|
+
const props = {
|
|
6
|
+
value: '201405',
|
|
7
|
+
onChange: () => {}
|
|
12
8
|
};
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
const wrapper = getWrapper();
|
|
22
|
-
expect(wrapper).toMatchSnapshot();
|
|
23
|
-
});
|
|
9
|
+
render(/*#__PURE__*/React.createElement(FixedPeriodSelect, props));
|
|
10
|
+
expect(screen.getByTestId('dhis2-analytics-fixedperiodselect')).toBeInTheDocument();
|
|
11
|
+
expect(screen.getByText('Period type')).toBeInTheDocument();
|
|
12
|
+
expect(screen.getByText('Monthly')).toBeInTheDocument();
|
|
13
|
+
expect(screen.getByText('Year')).toBeInTheDocument();
|
|
14
|
+
const yearSelectEl = screen.getByPlaceholderText('Select year');
|
|
15
|
+
expect(yearSelectEl).toBeInTheDocument();
|
|
16
|
+
expect(yearSelectEl.value).toEqual('2014');
|
|
24
17
|
});
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { render, screen } from '@testing-library/react';
|
|
2
|
+
import userEvent from '@testing-library/user-event';
|
|
2
3
|
import React from 'react';
|
|
3
4
|
import PeriodDimension from '../PeriodDimension.js';
|
|
4
5
|
jest.mock('@dhis2/app-runtime', () => ({
|
|
@@ -13,26 +14,29 @@ jest.mock('@dhis2/app-runtime', () => ({
|
|
|
13
14
|
}
|
|
14
15
|
})
|
|
15
16
|
}));
|
|
17
|
+
global.ResizeObserver = jest.fn().mockImplementation(() => ({
|
|
18
|
+
observe: jest.fn(),
|
|
19
|
+
unobserve: jest.fn(),
|
|
20
|
+
disconnect: jest.fn()
|
|
21
|
+
}));
|
|
16
22
|
afterEach(jest.clearAllMocks);
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
expect(wrapper).toMatchSnapshot();
|
|
37
|
-
});
|
|
23
|
+
const props = {
|
|
24
|
+
selectedPeriods: [],
|
|
25
|
+
onSelect: jest.fn(),
|
|
26
|
+
rightFooter: /*#__PURE__*/React.createElement(React.Fragment, null)
|
|
27
|
+
};
|
|
28
|
+
test('PeriodDimension renders the tabs for relative/fixed with relative pre-selected', () => {
|
|
29
|
+
render(/*#__PURE__*/React.createElement(PeriodDimension, props));
|
|
30
|
+
expect(screen.getByText('Relative periods')).toBeInTheDocument();
|
|
31
|
+
expect(screen.getByTestId('period-dimension-relative-period-filter')).toBeInTheDocument();
|
|
32
|
+
expect(screen.getByText('Fixed periods')).toBeInTheDocument();
|
|
33
|
+
});
|
|
34
|
+
test('PeriodDimension can toggle between relative and fixed period tab', async () => {
|
|
35
|
+
const user = userEvent.setup();
|
|
36
|
+
render(/*#__PURE__*/React.createElement(PeriodDimension, props));
|
|
37
|
+
expect(screen.getByText('Relative periods')).toBeInTheDocument();
|
|
38
|
+
const fixedPeriodButton = screen.getByText('Fixed periods');
|
|
39
|
+
expect(fixedPeriodButton).toBeInTheDocument();
|
|
40
|
+
await user.click(fixedPeriodButton);
|
|
41
|
+
expect(screen.getByTestId('period-dimension-fixed-period-filter')).toBeInTheDocument();
|
|
38
42
|
});
|
|
@@ -37,13 +37,12 @@ export const PERIOD_TYPE_REGEX = {
|
|
|
37
37
|
// YYYY"July"
|
|
38
38
|
[FYAPR]: /^([0-9]{4})April$/ // YYYY"April"
|
|
39
39
|
};
|
|
40
|
-
const getPeriods =
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
} = _ref;
|
|
40
|
+
const getPeriods = ({
|
|
41
|
+
periodType,
|
|
42
|
+
config,
|
|
43
|
+
fnFilter,
|
|
44
|
+
periodSettings = {}
|
|
45
|
+
}) => {
|
|
47
46
|
const offset = parseInt(config.offset, 10);
|
|
48
47
|
const isFilter = config.filterFuturePeriods;
|
|
49
48
|
const isReverse = periodType.match(/^FY|YEARLY/) ? true : config.reversePeriods;
|
|
@@ -17,8 +17,4 @@ export const FYNOV = 'FYNOV';
|
|
|
17
17
|
export const FYOCT = 'FYOCT';
|
|
18
18
|
export const FYJUL = 'FYJUL';
|
|
19
19
|
export const FYAPR = 'FYAPR';
|
|
20
|
-
export const filterPeriodTypesById =
|
|
21
|
-
let allPeriodTypes = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
|
|
22
|
-
let excludedPeriodTypes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
|
|
23
|
-
return allPeriodTypes.filter(period => !excludedPeriodTypes.includes(period.id));
|
|
24
|
-
};
|
|
20
|
+
export const filterPeriodTypesById = (allPeriodTypes = [], excludedPeriodTypes = []) => allPeriodTypes.filter(period => !excludedPeriodTypes.includes(period.id));
|
|
@@ -8,14 +8,13 @@ import { PivotTableBody } from './PivotTableBody.js';
|
|
|
8
8
|
import { PivotTableContainer } from './PivotTableContainer.js';
|
|
9
9
|
import { Provider } from './PivotTableEngineContext.js';
|
|
10
10
|
import { PivotTableHead } from './PivotTableHead.js';
|
|
11
|
-
const PivotTable =
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
} = _ref;
|
|
11
|
+
const PivotTable = ({
|
|
12
|
+
visualization,
|
|
13
|
+
data,
|
|
14
|
+
legendSets,
|
|
15
|
+
renderCounter,
|
|
16
|
+
onToggleContextualMenu
|
|
17
|
+
}) => {
|
|
19
18
|
const containerRef = useRef(undefined);
|
|
20
19
|
const {
|
|
21
20
|
width,
|