@dhis2/analytics 28.0.2 → 28.0.4
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 +3 -4
- 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 +2 -2
- package/build/cjs/__demo__/OrgUnitDimension.stories.js +3 -4
- package/build/cjs/__demo__/PeriodDimension.stories.js +2 -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 +9 -10
- package/build/cjs/components/DimensionsPanel/List/OptionsButton.js +8 -11
- package/build/cjs/components/DimensionsPanel/List/RecommendedIcon.js +10 -13
- 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__/FileMenu.spec.js +6 -2
- package/build/cjs/components/FileMenu/__tests__/GetLinkDialog.spec.js +7 -8
- package/build/cjs/components/FileMenu/utils.js +10 -12
- package/build/cjs/components/Filter/Filter.js +21 -27
- 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 +20 -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 +36 -45
- package/build/cjs/components/OpenFileDialog/PaginationControls.js +22 -28
- package/build/cjs/components/OpenFileDialog/VisTypeFilter.js +28 -37
- package/build/cjs/components/Options/VisualizationOptions.js +35 -46
- package/build/cjs/components/OrgUnitDimension/OrgUnitDimension.js +38 -60
- package/build/cjs/components/PeriodDimension/FixedPeriodFilter.js +16 -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 +24 -30
- package/build/cjs/components/PeriodDimension/__tests__/__snapshots__/FixedPeriodSingleSelect.spec.js.snap +0 -1
- package/build/cjs/components/PeriodDimension/__tests__/__snapshots__/PeriodDimension.spec.js.snap +0 -1
- 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/Parser/Parser.js +5 -10
- 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 +4 -5
- package/build/cjs/components/Toolbar/HoverMenuBar/__tests__/HoverMenuList.spec.js +13 -11
- package/build/cjs/components/Toolbar/InterpretationsAndDetailsToggler.js +15 -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/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 +8 -10
- package/build/cjs/components/TranslationDialog/TranslationModal/TranslationModalActions.js +18 -27
- package/build/cjs/components/TranslationDialog/TranslationModal/__tests__/TranslationModal.spec.js +52 -0
- 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__/DataDimension.stories.js +2 -2
- package/build/es/__demo__/OpenFileDialog.stories.js +2 -2
- package/build/es/__demo__/OrgUnitDimension.stories.js +2 -2
- package/build/es/__demo__/PeriodDimension.stories.js +2 -2
- 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 +8 -8
- package/build/es/components/DimensionsPanel/List/OptionsButton.js +8 -11
- package/build/es/components/DimensionsPanel/List/RecommendedIcon.js +10 -13
- 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__/FileMenu.spec.js +6 -2
- package/build/es/components/FileMenu/__tests__/GetLinkDialog.spec.js +7 -8
- package/build/es/components/FileMenu/utils.js +10 -12
- package/build/es/components/Filter/Filter.js +21 -27
- 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 +20 -26
- 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 +35 -43
- package/build/es/components/OpenFileDialog/PaginationControls.js +22 -28
- package/build/es/components/OpenFileDialog/VisTypeFilter.js +28 -37
- package/build/es/components/Options/VisualizationOptions.js +34 -44
- package/build/es/components/OrgUnitDimension/OrgUnitDimension.js +37 -58
- package/build/es/components/PeriodDimension/FixedPeriodFilter.js +16 -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 +24 -30
- package/build/es/components/PeriodDimension/__tests__/__snapshots__/FixedPeriodSingleSelect.spec.js.snap +0 -1
- package/build/es/components/PeriodDimension/__tests__/__snapshots__/PeriodDimension.spec.js.snap +0 -1
- 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/Parser/Parser.js +4 -8
- 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 +4 -5
- package/build/es/components/Toolbar/HoverMenuBar/__tests__/HoverMenuList.spec.js +6 -4
- package/build/es/components/Toolbar/InterpretationsAndDetailsToggler.js +15 -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/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 +7 -8
- package/build/es/components/TranslationDialog/TranslationModal/TranslationModalActions.js +18 -27
- package/build/es/components/TranslationDialog/TranslationModal/__tests__/TranslationModal.spec.js +49 -0
- 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 +12 -12
|
@@ -2,34 +2,28 @@ import i18n from '@dhis2/d2-i18n';
|
|
|
2
2
|
import { Pagination } from '@dhis2/ui';
|
|
3
3
|
import PropTypes from 'prop-types';
|
|
4
4
|
import React from 'react';
|
|
5
|
-
export const PaginationControls =
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
lastItemIndex,
|
|
28
|
-
totalNumberOfItems
|
|
29
|
-
});
|
|
30
|
-
}
|
|
31
|
-
});
|
|
32
|
-
};
|
|
5
|
+
export const PaginationControls = ({
|
|
6
|
+
page,
|
|
7
|
+
pager,
|
|
8
|
+
onPageChange
|
|
9
|
+
}) => /*#__PURE__*/React.createElement(Pagination, {
|
|
10
|
+
page: page,
|
|
11
|
+
pageCount: pager.pageCount,
|
|
12
|
+
pageSize: pager.pageSize,
|
|
13
|
+
total: pager.total,
|
|
14
|
+
onPageChange: onPageChange,
|
|
15
|
+
onPageSizeChange: Function.prototype,
|
|
16
|
+
hidePageSizeSelect: true,
|
|
17
|
+
pageSummaryText: ({
|
|
18
|
+
firstItem: firstItemIndex,
|
|
19
|
+
lastItem: lastItemIndex,
|
|
20
|
+
total: totalNumberOfItems
|
|
21
|
+
}) => i18n.t('{{firstItemIndex}}-{{lastItemIndex}} of {{totalNumberOfItems}}', {
|
|
22
|
+
firstItemIndex,
|
|
23
|
+
lastItemIndex,
|
|
24
|
+
totalNumberOfItems
|
|
25
|
+
})
|
|
26
|
+
});
|
|
33
27
|
PaginationControls.propTypes = {
|
|
34
28
|
page: PropTypes.number,
|
|
35
29
|
pager: PropTypes.object,
|
|
@@ -5,43 +5,34 @@ import React from 'react';
|
|
|
5
5
|
import { getDisplayNameByVisType, visTypeIcons } from '../../modules/visTypes.js';
|
|
6
6
|
import { VisTypeIcon } from '../VisTypeIcon.js';
|
|
7
7
|
import { CustomSelectOption } from './CustomSelectOption.js';
|
|
8
|
-
export const VisTypeFilter =
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
selected
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
value: type,
|
|
37
|
-
icon: visTypeIcons[type] ? /*#__PURE__*/React.createElement(VisTypeIcon, {
|
|
38
|
-
type: type,
|
|
39
|
-
useSmall: true,
|
|
40
|
-
color: colors.grey600
|
|
41
|
-
}) : undefined
|
|
42
|
-
});
|
|
43
|
-
}));
|
|
44
|
-
};
|
|
8
|
+
export const VisTypeFilter = ({
|
|
9
|
+
visTypes,
|
|
10
|
+
selected,
|
|
11
|
+
onChange
|
|
12
|
+
}) => /*#__PURE__*/React.createElement(SingleSelect, {
|
|
13
|
+
selected: selected,
|
|
14
|
+
onChange: ({
|
|
15
|
+
selected
|
|
16
|
+
}) => onChange(selected),
|
|
17
|
+
prefix: i18n.t('Type'),
|
|
18
|
+
dense: true,
|
|
19
|
+
maxHeight: "400px"
|
|
20
|
+
}, visTypes === null || visTypes === void 0 ? void 0 : visTypes.map(({
|
|
21
|
+
type,
|
|
22
|
+
disabled,
|
|
23
|
+
insertDivider
|
|
24
|
+
}) => /*#__PURE__*/React.createElement(CustomSelectOption, {
|
|
25
|
+
key: type,
|
|
26
|
+
disabled: disabled,
|
|
27
|
+
label: getDisplayNameByVisType(type),
|
|
28
|
+
insertDivider: insertDivider,
|
|
29
|
+
value: type,
|
|
30
|
+
icon: visTypeIcons[type] ? /*#__PURE__*/React.createElement(VisTypeIcon, {
|
|
31
|
+
type: type,
|
|
32
|
+
useSmall: true,
|
|
33
|
+
color: colors.grey600
|
|
34
|
+
}) : undefined
|
|
35
|
+
})));
|
|
45
36
|
VisTypeFilter.propTypes = {
|
|
46
37
|
selected: PropTypes.string,
|
|
47
38
|
visTypes: PropTypes.arrayOf(PropTypes.shape({
|
|
@@ -3,40 +3,33 @@ import { ButtonStrip, Modal, ModalTitle, ModalContent, ModalActions, Button, Fie
|
|
|
3
3
|
import PropTypes from 'prop-types';
|
|
4
4
|
import React, { useState } from 'react';
|
|
5
5
|
import { modalContent, tabSection, tabSectionTitle, tabSectionTitleDisabled, tabSectionTitleMargin, tabSectionOption, tabSectionOptionItem, tabSectionOptionToggleable, tabSectionToggleableSubsection, tabSectionOptionComplexInline, tabSectionOptionText, tabBar, tabContent, tabSectionOptionIcon } from './styles/VisualizationOptions.style.js';
|
|
6
|
-
const VisualizationOptions =
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
} = _ref;
|
|
6
|
+
const VisualizationOptions = ({
|
|
7
|
+
initiallyActiveTabKey,
|
|
8
|
+
optionsConfig,
|
|
9
|
+
onClose,
|
|
10
|
+
onUpdate
|
|
11
|
+
}) => {
|
|
13
12
|
const [activeTabKey, setActiveTabKey] = useState(initiallyActiveTabKey);
|
|
14
|
-
const generateTabContent = sections => sections.map(
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
return {
|
|
35
|
-
key,
|
|
36
|
-
label,
|
|
37
|
-
content: generateTabContent(content)
|
|
38
|
-
};
|
|
39
|
-
});
|
|
13
|
+
const generateTabContent = sections => sections.map(({
|
|
14
|
+
key,
|
|
15
|
+
label,
|
|
16
|
+
content,
|
|
17
|
+
helpText
|
|
18
|
+
}) => /*#__PURE__*/React.createElement("div", {
|
|
19
|
+
key: key,
|
|
20
|
+
className: tabSection.className
|
|
21
|
+
}, /*#__PURE__*/React.createElement(FieldSet, null, label ? /*#__PURE__*/React.createElement(Legend, null, /*#__PURE__*/React.createElement("span", {
|
|
22
|
+
className: tabSectionTitle.className
|
|
23
|
+
}, label)) : null, content, helpText ? /*#__PURE__*/React.createElement(Legend, null, /*#__PURE__*/React.createElement(Help, null, helpText)) : null)));
|
|
24
|
+
const generateTabs = tabs => tabs.map(({
|
|
25
|
+
key,
|
|
26
|
+
label,
|
|
27
|
+
content
|
|
28
|
+
}) => ({
|
|
29
|
+
key,
|
|
30
|
+
label,
|
|
31
|
+
content: generateTabContent(content)
|
|
32
|
+
}));
|
|
40
33
|
const getModalContent = () => {
|
|
41
34
|
const tabs = generateTabs(optionsConfig);
|
|
42
35
|
let activeTabIndex = tabs.findIndex(tab => tab.key === activeTabKey);
|
|
@@ -47,17 +40,14 @@ const VisualizationOptions = _ref => {
|
|
|
47
40
|
className: tabBar.className
|
|
48
41
|
}, /*#__PURE__*/React.createElement(TabBar, {
|
|
49
42
|
dataTest: 'options-modal-tab-bar'
|
|
50
|
-
}, tabs.map((
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
selected: index === activeTabIndex
|
|
59
|
-
}, label);
|
|
60
|
-
})), tabBar.styles), /*#__PURE__*/React.createElement("div", {
|
|
43
|
+
}, tabs.map(({
|
|
44
|
+
key,
|
|
45
|
+
label
|
|
46
|
+
}, index) => /*#__PURE__*/React.createElement(Tab, {
|
|
47
|
+
key: key,
|
|
48
|
+
onClick: () => setActiveTabKey(key),
|
|
49
|
+
selected: index === activeTabIndex
|
|
50
|
+
}, label))), tabBar.styles), /*#__PURE__*/React.createElement("div", {
|
|
61
51
|
className: tabContent.className
|
|
62
52
|
}, tabs[activeTabIndex].content, tabContent.styles, tabSection.styles, tabSectionTitle.styles, tabSectionTitleDisabled.styles, tabSectionTitleMargin.styles, tabSectionOption.styles, tabSectionOptionItem.styles, tabSectionOptionToggleable.styles, tabSectionToggleableSubsection.styles, tabSectionOptionComplexInline.styles, tabSectionOptionText.styles, tabSectionOptionIcon.styles));
|
|
63
53
|
};
|
|
@@ -11,17 +11,16 @@ import { ouIdHelper, USER_ORG_UNIT, USER_ORG_UNIT_CHILDREN, USER_ORG_UNIT_GRANDC
|
|
|
11
11
|
import { DIMENSION_ID_ORGUNIT } from '../../modules/predefinedDimensions.js';
|
|
12
12
|
import styles from './styles/OrgUnitDimension.style.js';
|
|
13
13
|
const DYNAMIC_ORG_UNITS = [USER_ORG_UNIT, USER_ORG_UNIT_CHILDREN, USER_ORG_UNIT_GRANDCHILDREN];
|
|
14
|
-
const OrgUnitDimension =
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
} = _ref;
|
|
14
|
+
const OrgUnitDimension = ({
|
|
15
|
+
roots,
|
|
16
|
+
selected,
|
|
17
|
+
onSelect,
|
|
18
|
+
hideGroupSelect = false,
|
|
19
|
+
hideLevelSelect = false,
|
|
20
|
+
hideUserOrgUnits = false,
|
|
21
|
+
warning,
|
|
22
|
+
displayNameProp
|
|
23
|
+
}) => {
|
|
25
24
|
const [ouLevels, setOuLevels] = useState([]);
|
|
26
25
|
const [ouGroups, setOuGroups] = useState([]);
|
|
27
26
|
const dataEngine = useDataEngine();
|
|
@@ -138,44 +137,35 @@ const OrgUnitDimension = _ref => {
|
|
|
138
137
|
}, /*#__PURE__*/React.createElement(Checkbox, {
|
|
139
138
|
label: i18n.t('User organisation unit'),
|
|
140
139
|
checked: selected.some(item => item.id === USER_ORG_UNIT),
|
|
141
|
-
onChange:
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
displayName: i18n.t('User organisation unit')
|
|
149
|
-
});
|
|
150
|
-
},
|
|
140
|
+
onChange: ({
|
|
141
|
+
checked
|
|
142
|
+
}) => onSelectItems({
|
|
143
|
+
id: USER_ORG_UNIT,
|
|
144
|
+
checked,
|
|
145
|
+
displayName: i18n.t('User organisation unit')
|
|
146
|
+
}),
|
|
151
147
|
dense: true
|
|
152
148
|
}), /*#__PURE__*/React.createElement(Checkbox, {
|
|
153
149
|
label: i18n.t('User sub-units'),
|
|
154
150
|
checked: selected.some(item => item.id === USER_ORG_UNIT_CHILDREN),
|
|
155
|
-
onChange:
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
displayName: i18n.t('User sub-units')
|
|
163
|
-
});
|
|
164
|
-
},
|
|
151
|
+
onChange: ({
|
|
152
|
+
checked
|
|
153
|
+
}) => onSelectItems({
|
|
154
|
+
id: USER_ORG_UNIT_CHILDREN,
|
|
155
|
+
checked,
|
|
156
|
+
displayName: i18n.t('User sub-units')
|
|
157
|
+
}),
|
|
165
158
|
dense: true
|
|
166
159
|
}), /*#__PURE__*/React.createElement(Checkbox, {
|
|
167
160
|
label: i18n.t('User sub-x2-units'),
|
|
168
161
|
checked: selected.some(item => item.id === USER_ORG_UNIT_GRANDCHILDREN),
|
|
169
|
-
onChange:
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
displayName: i18n.t('User sub-x2-units')
|
|
177
|
-
});
|
|
178
|
-
},
|
|
162
|
+
onChange: ({
|
|
163
|
+
checked
|
|
164
|
+
}) => onSelectItems({
|
|
165
|
+
id: USER_ORG_UNIT_GRANDCHILDREN,
|
|
166
|
+
checked,
|
|
167
|
+
displayName: i18n.t('User sub-x2-units')
|
|
168
|
+
}),
|
|
179
169
|
dense: true
|
|
180
170
|
})), /*#__PURE__*/React.createElement("div", {
|
|
181
171
|
className: `jsx-${styles.__hash}` + " " + "orgUnitTreeWrapper"
|
|
@@ -191,12 +181,9 @@ const OrgUnitDimension = _ref => {
|
|
|
191
181
|
}) || "")
|
|
192
182
|
}, !hideLevelSelect && /*#__PURE__*/React.createElement(MultiSelect, {
|
|
193
183
|
selected: ouLevels.length ? selected.filter(item => ouIdHelper.hasLevelPrefix(item.id)).map(item => ouIdHelper.removePrefix(item.id)) : [],
|
|
194
|
-
onChange:
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
} = _ref5;
|
|
198
|
-
return onLevelChange(selected);
|
|
199
|
-
},
|
|
184
|
+
onChange: ({
|
|
185
|
+
selected
|
|
186
|
+
}) => onLevelChange(selected),
|
|
200
187
|
placeholder: i18n.t('Select a level'),
|
|
201
188
|
loading: !ouLevels.length,
|
|
202
189
|
dense: true,
|
|
@@ -208,12 +195,9 @@ const OrgUnitDimension = _ref => {
|
|
|
208
195
|
dataTest: `org-unit-level-select-option-${level.id}`
|
|
209
196
|
}))), !hideGroupSelect && /*#__PURE__*/React.createElement(MultiSelect, {
|
|
210
197
|
selected: ouGroups.length ? selected.filter(item => ouIdHelper.hasGroupPrefix(item.id)).map(item => ouIdHelper.removePrefix(item.id)) : [],
|
|
211
|
-
onChange:
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
} = _ref6;
|
|
215
|
-
return onGroupChange(selected);
|
|
216
|
-
},
|
|
198
|
+
onChange: ({
|
|
199
|
+
selected
|
|
200
|
+
}) => onGroupChange(selected),
|
|
217
201
|
placeholder: i18n.t('Select a group'),
|
|
218
202
|
loading: !ouGroups.length,
|
|
219
203
|
dense: true,
|
|
@@ -244,11 +228,6 @@ const OrgUnitDimension = _ref => {
|
|
|
244
228
|
id: styles.__hash
|
|
245
229
|
}, styles));
|
|
246
230
|
};
|
|
247
|
-
OrgUnitDimension.defaultProps = {
|
|
248
|
-
hideGroupSelect: false,
|
|
249
|
-
hideLevelSelect: false,
|
|
250
|
-
hideUserOrgUnits: false
|
|
251
|
-
};
|
|
252
231
|
OrgUnitDimension.propTypes = {
|
|
253
232
|
displayNameProp: PropTypes.string,
|
|
254
233
|
hideGroupSelect: PropTypes.bool,
|
|
@@ -6,27 +6,24 @@ 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
21
|
className: `jsx-${styles.__hash}` + " " + "leftSection"
|
|
22
22
|
}, /*#__PURE__*/React.createElement(SingleSelectField, {
|
|
23
23
|
label: i18n.t('Period type'),
|
|
24
|
-
onChange:
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
} = _ref2;
|
|
28
|
-
return onSelectPeriodType(selected);
|
|
29
|
-
},
|
|
24
|
+
onChange: ({
|
|
25
|
+
selected
|
|
26
|
+
}) => onSelectPeriodType(selected),
|
|
30
27
|
dense: true,
|
|
31
28
|
selected: currentPeriodType,
|
|
32
29
|
disabled: onlyAllowedTypeIsSelected,
|
|
@@ -45,21 +42,15 @@ const FixedPeriodFilter = _ref => {
|
|
|
45
42
|
type: "number",
|
|
46
43
|
placeholder: i18n.t('Select year'),
|
|
47
44
|
value: currentYear,
|
|
48
|
-
onChange:
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
} = _ref3;
|
|
52
|
-
return onSelectYear(value);
|
|
53
|
-
},
|
|
45
|
+
onChange: ({
|
|
46
|
+
value
|
|
47
|
+
}) => onSelectYear(value),
|
|
54
48
|
dense: true,
|
|
55
49
|
dataTest: `${dataTest}-year`
|
|
56
50
|
})), /*#__PURE__*/React.createElement(_JSXStyle, {
|
|
57
51
|
id: styles.__hash
|
|
58
52
|
}, styles));
|
|
59
53
|
};
|
|
60
|
-
FixedPeriodFilter.defaultProps = {
|
|
61
|
-
excludedPeriodTypes: []
|
|
62
|
-
};
|
|
63
54
|
FixedPeriodFilter.propTypes = {
|
|
64
55
|
currentPeriodType: PropTypes.string.isRequired,
|
|
65
56
|
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,
|