refactor: rename dimensionIds -> dimensionId

dhis2 · Feb 26, 2024 · 25ea22b · 25ea22b
1 parent 7868787
commit 25ea22b
Show file tree

Hide file tree

Showing 24 changed files with 23 additions and 23 deletions.
diff --git a/src/actions/ui.js b/src/actions/ui.js
@@ -8,7 +8,7 @@ import {
     DIMENSION_ID_LAST_UPDATED,
     DIMENSION_ID_CREATED,
 } from '../modules/dimensionConstants.js'
-import { extractDimensionIdParts } from '../modules/dimensionIds.js'
+import { extractDimensionIdParts } from '../modules/dimensionId.js'
 import {
     getDefaultTimeDimensionsMetadata,
     getDynamicTimeDimensionsMetadata,

diff --git a/src/actions/visualization.js b/src/actions/visualization.js
@@ -1,5 +1,5 @@
 import { getUiDimensionType } from '../modules/dimensionConstants.js'
-import { formatDimensionId } from '../modules/dimensionIds.js'
+import { formatDimensionId } from '../modules/dimensionId.js'
 import {
     getDynamicTimeDimensionsMetadata,
     getProgramAsMetadata,

diff --git a/src/api/legendSets.js b/src/api/legendSets.js
@@ -3,7 +3,7 @@ import {
     DIMENSION_TYPE_PROGRAM_ATTRIBUTE,
     DIMENSION_TYPE_PROGRAM_INDICATOR,
 } from '@dhis2/analytics'
-import { extractDimensionIdParts } from '../modules/dimensionIds.js'
+import { extractDimensionIdParts } from '../modules/dimensionId.js'
 
 const dataElementsQuery = {
     resource: 'dataElements',

diff --git a/src/components/App.js b/src/components/App.js
@@ -33,7 +33,7 @@ import {
     DIMENSION_ID_EVENT_STATUS,
     DIMENSION_ID_PROGRAM_STATUS,
 } from '../modules/dimensionConstants.js'
-import { formatDimensionId } from '../modules/dimensionIds.js'
+import { formatDimensionId } from '../modules/dimensionId.js'
 import {
     analyticsGenerationError,
     analyticsRequestError,

diff --git a/src/components/Dialogs/Conditions/ConditionsManager.js b/src/components/Dialogs/Conditions/ConditionsManager.js
@@ -33,7 +33,7 @@ import {
     parseConditionsArrayToString,
     parseConditionsStringToArray,
 } from '../../../modules/conditions.js'
-import { extractDimensionIdParts } from '../../../modules/dimensionIds.js'
+import { extractDimensionIdParts } from '../../../modules/dimensionId.js'
 import {
     OUTPUT_TYPE_ENROLLMENT,
     OUTPUT_TYPE_TRACKED_ENTITY,

diff --git a/src/components/Dialogs/FixedDimension.js b/src/components/Dialogs/FixedDimension.js
@@ -19,7 +19,7 @@ import {
 import {
     extractDimensionIdParts,
     formatDimensionId,
-} from '../../modules/dimensionIds.js'
+} from '../../modules/dimensionId.js'
 import { removeLastPathSegment, getOuPath } from '../../modules/orgUnit.js'
 import {
     STATUS_ACTIVE,

diff --git a/src/components/Dialogs/PeriodDimension/PeriodDimension.js b/src/components/Dialogs/PeriodDimension/PeriodDimension.js
@@ -20,7 +20,7 @@ import { acSetUiItems } from '../../../actions/ui.js'
 import {
     extractDimensionIdParts,
     formatDimensionId,
-} from '../../../modules/dimensionIds.js'
+} from '../../../modules/dimensionId.js'
 import {
     SYSTEM_SETTINGS_HIDE_DAILY_PERIODS,
     SYSTEM_SETTINGS_HIDE_WEEKLY_PERIODS,

diff --git a/src/components/DndContext.js b/src/components/DndContext.js
@@ -17,7 +17,7 @@ import {
     acSetUiDraggingId,
 } from '../actions/ui.js'
 import { getConditionsTexts } from '../modules/conditions.js'
-import { extractDimensionIdParts } from '../modules/dimensionIds.js'
+import { extractDimensionIdParts } from '../modules/dimensionId.js'
 import { sGetMetadata } from '../reducers/metadata.js'
 import {
     sGetUiLayout,

diff --git a/src/components/Layout/TooltipContent.js b/src/components/Layout/TooltipContent.js
@@ -13,7 +13,7 @@ import PropTypes from 'prop-types'
 import React from 'react'
 import { useSelector } from 'react-redux'
 import { DIMENSION_TYPE_STATUS } from '../../modules/dimensionConstants.js'
-import { extractDimensionIdParts } from '../../modules/dimensionIds.js'
+import { extractDimensionIdParts } from '../../modules/dimensionId.js'
 import { sGetMetadata } from '../../reducers/metadata.js'
 import { sGetUiInputType, sGetUiItemsByDimension } from '../../reducers/ui.js'
 import styles from './styles/Tooltip.module.css'

diff --git a/src/components/MainSidebar/ProgramDimensionsPanel/ProgramSelect.js b/src/components/MainSidebar/ProgramDimensionsPanel/ProgramSelect.js
@@ -6,7 +6,7 @@ import PropTypes from 'prop-types'
 import React, { useEffect, useState } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
 import { tSetUiProgram } from '../../../actions/ui.js'
-import { extractDimensionIdParts } from '../../../modules/dimensionIds.js'
+import { extractDimensionIdParts } from '../../../modules/dimensionId.js'
 import { PROGRAM_TYPE_WITH_REGISTRATION } from '../../../modules/programTypes.js'
 import { DERIVED_USER_SETTINGS_DISPLAY_NAME_PROPERTY } from '../../../modules/userSettings.js'
 import {

diff --git a/src/components/MainSidebar/ProgramDimensionsPanel/useProgramDataDimensions.js b/src/components/MainSidebar/ProgramDimensionsPanel/useProgramDataDimensions.js
@@ -5,7 +5,7 @@ import {
 } from '@dhis2/analytics'
 import { useDataEngine } from '@dhis2/app-runtime'
 import { useEffect, useReducer, useCallback, useRef, useMemo } from 'react'
-import { extractDimensionIdParts } from '../../../modules/dimensionIds.js'
+import { extractDimensionIdParts } from '../../../modules/dimensionId.js'
 import { DERIVED_USER_SETTINGS_DISPLAY_NAME_PROPERTY } from '../../../modules/userSettings.js'
 import {
     OUTPUT_TYPE_EVENT,

diff --git a/src/components/MainSidebar/SelectedDimensionsContext.js b/src/components/MainSidebar/SelectedDimensionsContext.js
@@ -11,7 +11,7 @@ import {
     DIMENSION_TYPES_PROGRAM,
     DIMENSION_TYPES_YOURS,
 } from '../../modules/dimensionConstants.js'
-import { extractDimensionIdParts } from '../../modules/dimensionIds.js'
+import { extractDimensionIdParts } from '../../modules/dimensionId.js'
 import { getTimeDimensions } from '../../modules/timeDimensions.js'
 import { OUTPUT_TYPE_TRACKED_ENTITY } from '../../modules/visualization.js'
 import { sGetUiInputType, sGetUiLayout } from '../../reducers/ui.js'

diff --git a/src/components/Visualization/analyticsQueryTools.js b/src/components/Visualization/analyticsQueryTools.js
@@ -11,7 +11,7 @@ import {
     DIMENSION_ID_LAST_UPDATED_BY,
     DIMENSION_IDS_TIME,
 } from '../../modules/dimensionConstants.js'
-import { formatDimensionId } from '../../modules/dimensionIds.js'
+import { formatDimensionId } from '../../modules/dimensionId.js'
 import { getRequestOptions } from '../../modules/getRequestOptions.js'
 import { getHeadersMap } from '../../modules/visualization.js'
 

diff --git a/src/components/Visualization/useAnalyticsData.js b/src/components/Visualization/useAnalyticsData.js
@@ -20,7 +20,7 @@ import { DIMENSION_ID_PROGRAM_STATUS } from '../../modules/dimensionConstants.js
 import {
     extractDimensionIdParts,
     formatDimensionId,
-} from '../../modules/dimensionIds.js'
+} from '../../modules/dimensionId.js'
 import { getDimensionsWithSuffix } from '../../modules/getDimensionsWithSuffix.js'
 import { getMainDimensions } from '../../modules/mainDimensions.js'
 import { getProgramDimensions } from '../../modules/programDimensions.js'

diff --git a/src/modules/__tests__/dimensionIds.spec.js → src/modules/__tests__/dimensionId.spec.js b/src/modules/__tests__/dimensionIds.spec.js → src/modules/__tests__/dimensionId.spec.js
@@ -1,4 +1,4 @@
-import { formatDimensionId, extractDimensionIdParts } from '../dimensionIds.js'
+import { formatDimensionId, extractDimensionIdParts } from '../dimensionId.js'
 import {
     OUTPUT_TYPE_TRACKED_ENTITY,
     OUTPUT_TYPE_ENROLLMENT,

diff --git a/src/modules/current.js b/src/modules/current.js
@@ -1,6 +1,6 @@
 import { dimensionCreate, VIS_TYPE_LINE_LIST } from '@dhis2/analytics'
 import pick from 'lodash-es/pick'
-import { extractDimensionIdParts } from './dimensionIds.js'
+import { extractDimensionIdParts } from './dimensionId.js'
 import { BASE_FIELD_TYPE } from './fields.js'
 import { getAdaptedUiLayoutByType } from './layout.js'
 import {

diff --git a/src/modules/dimensionIds.js → src/modules/dimensionId.js b/src/modules/dimensionIds.js → src/modules/dimensionId.js
diff --git a/src/modules/getDimensionsWithSuffix.js b/src/modules/getDimensionsWithSuffix.js
@@ -4,7 +4,7 @@ import {
     DIMENSION_TYPE_PERIOD,
 } from '@dhis2/analytics'
 import { DIMENSION_TYPE_STATUS } from './dimensionConstants.js'
-import { extractDimensionIdParts } from './dimensionIds.js'
+import { extractDimensionIdParts } from './dimensionId.js'
 import {
     OUTPUT_TYPE_ENROLLMENT,
     OUTPUT_TYPE_TRACKED_ENTITY,

diff --git a/src/modules/metadata.js b/src/modules/metadata.js
@@ -6,7 +6,7 @@ import {
     USER_ORG_UNIT_GRANDCHILDREN,
 } from '@dhis2/analytics'
 import i18n from '@dhis2/d2-i18n'
-import { formatDimensionId } from './dimensionIds.js'
+import { formatDimensionId } from './dimensionId.js'
 import { getMainDimensions, getCreatedDimension } from './mainDimensions.js'
 import { getProgramDimensions } from './programDimensions.js'
 import { getTimeDimensions, getTimeDimensionName } from './timeDimensions.js'

diff --git a/src/modules/programDimensions.js b/src/modules/programDimensions.js
@@ -8,7 +8,7 @@ import {
     DIMENSION_TYPE_STATUS,
     DIMENSION_ID_PROGRAM_STATUS,
 } from './dimensionConstants.js'
-import { extractDimensionIdParts } from './dimensionIds.js'
+import { extractDimensionIdParts } from './dimensionId.js'
 import { getDefaultOrgUnitLabel } from './metadata.js'
 import { PROGRAM_TYPE_WITHOUT_REGISTRATION } from './programTypes.js'
 import {

diff --git a/src/modules/repetition.js b/src/modules/repetition.js
@@ -1,5 +1,5 @@
 import { layoutGetAllDimensions } from '@dhis2/analytics'
-import { formatDimensionId } from './dimensionIds.js'
+import { formatDimensionId } from './dimensionId.js'
 import { parseCurrentRepetition } from './ui.js'
 
 export const getRepetitionFromVisualisation = (vis) => {

diff --git a/src/modules/tableValues.js b/src/modules/tableValues.js
@@ -12,7 +12,7 @@ import {
     DIMENSION_ID_PROGRAM_STATUS,
     DIMENSION_ID_LAST_UPDATED,
 } from './dimensionConstants.js'
-import { extractDimensionIdParts } from './dimensionIds.js'
+import { extractDimensionIdParts } from './dimensionId.js'
 import { headersMap, getStatusNames } from './visualization.js'
 
 const getFormattedCellValue = ({ value, header = {}, visualization = {} }) => {

diff --git a/src/modules/ui.js b/src/modules/ui.js
@@ -6,7 +6,7 @@ import {
     VIS_TYPE_PIVOT_TABLE,
 } from '@dhis2/analytics'
 import isObject from 'lodash-es/isObject'
-import { formatDimensionId } from './dimensionIds.js'
+import { formatDimensionId } from './dimensionId.js'
 import { getInputTypeFromVisualization } from './input.js'
 import { getAdaptedUiLayoutByType, getInverseLayout } from './layout.js'
 import { getOptionsFromVisualization } from './options.js'

diff --git a/src/reducers/ui.js b/src/reducers/ui.js
@@ -19,7 +19,7 @@ import {
 import {
     formatDimensionId,
     extractDimensionIdParts,
-} from '../modules/dimensionIds.js'
+} from '../modules/dimensionId.js'
 import { getFilteredLayout } from '../modules/layout.js'
 import { getMainDimensions } from '../modules/mainDimensions.js'
 import { getOptionsForUi } from '../modules/options.js'