fix: roll back and renaming

dhis2 · Feb 4, 2025 · e306ae3 · e306ae3
1 parent d5baa60
commit e306ae3
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 18 deletions.
diff --git a/src/core_modules/capture-core-utils/featuresSupport/support.js b/src/core_modules/capture-core-utils/featuresSupport/support.js
@@ -9,7 +9,7 @@ export const FEATURES = Object.freeze({
     trackerImageEndpoint: 'trackerImageEndpoint',
     trackerFileEndpoint: 'trackerFileEndpoint',
     trackedEntitiesCSV: 'trackedEntitiesCSV',
-    newAocApiSeparator: 'newAocApiSeparator',
+    newUIDsSeparator: 'newUIDsSeparator',
     newEntityFilterQueryParam: 'newEntityFilterQueryParam',
     newNoteEndpoint: 'newNoteEndpoint',
     newRelationshipQueryParam: 'newRelationshipQueryParam',
@@ -26,7 +26,7 @@ const MINOR_VERSION_SUPPORT = Object.freeze({
     [FEATURES.newTransferQueryParam]: 41,
     [FEATURES.changelogs]: 41,
     [FEATURES.trackedEntitiesCSV]: 40,
-    [FEATURES.newAocApiSeparator]: 41,
+    [FEATURES.newUIDsSeparator]: 41,
     [FEATURES.newEntityFilterQueryParam]: 41,
     [FEATURES.newNoteEndpoint]: 42,
     [FEATURES.newRelationshipQueryParam]: 41,

diff --git a/...ngleEventRegistrationEntry/DataEntryWrapper/DataEntry/epics/getConvertedNewSingleEvent.js b/...ngleEventRegistrationEntry/DataEntryWrapper/DataEntry/epics/getConvertedNewSingleEvent.js
@@ -10,14 +10,14 @@ const getApiCategoriesArgument = (categories: ?{ [id: string]: string}, serverMi
     if (!categories) {
         return null;
     }
-    const useNewSeparator = hasAPISupportForFeature(serverMinorVersion, FEATURES.newAocApiSeparator);
+    const newUIDsSeparator = hasAPISupportForFeature(serverMinorVersion, FEATURES.newUIDsSeparator);
 
     return {
         attributeCategoryOptions: Object
             .keys(categories)
 
             .map(key => categories[key])
-            .join(useNewSeparator ? ',' : ';'),
+            .join(newUIDsSeparator ? ',' : ';'),
     };
 };
 

diff --git a/.../capture-core/components/WidgetEventEdit/ViewEventDataEntry/viewEventDataEntry.actions.js b/.../capture-core/components/WidgetEventEdit/ViewEventDataEntry/viewEventDataEntry.actions.js
@@ -95,9 +95,9 @@ export const loadViewEventDataEntry =
         let attributeCategoryOptions;
 
         if (eventContainer.event && eventContainer.event.attributeCategoryOptions) {
-            const useNewAocApiSeparator = hasAPISupportForFeature(serverMinorVersion, FEATURES.newAocApiSeparator);
+            const newUIDsSeparator = hasAPISupportForFeature(serverMinorVersion, FEATURES.newUIDsSeparator);
             // $FlowFixMe - this should work
-            const attributeCategoryOptionIds = eventContainer.event?.attributeCategoryOptions.split(useNewAocApiSeparator ? ',' : ';');
+            const attributeCategoryOptionIds = eventContainer.event?.attributeCategoryOptions.split(newUIDsSeparator ? ',' : ';');
             const getCategoryOptionsFromIndexedDB = async (optionIds) => {
                 const categoryOptionsPromises = optionIds.map(async (optionId) => {
                     const cachedCategoryOption = await getCachedSingleResourceFromKeyAsync(userStores.CATEGORY_OPTIONS, optionId);

diff --git a/..._modules/capture-core/components/WorkingLists/EventWorkingLists/epics/getEventListData.js b/..._modules/capture-core/components/WorkingLists/EventWorkingLists/epics/getEventListData.js
@@ -104,7 +104,7 @@ const getApiCategoriesQueryArgument = (categories: ?{ [id: string]: string}, cat
     if (!categories || !categoryCombinationId) {
         return null;
     }
-    const newUIDsSeparator = featureAvailable(FEATURES.newAocApiSeparator);
+    const newUIDsSeparator = featureAvailable(FEATURES.newUIDsSeparator);
     const { aCCQueryParam, aCOQueryParam }: { aCCQueryParam: string, aCOQueryParam: string } = featureAvailable(
         FEATURES.newEntityFilterQueryParam,
     )

diff --git a/...kingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getEventListData/getEventListData.js b/...kingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getEventListData/getEventListData.js
@@ -88,7 +88,7 @@ export const getEventListData = async (
         };
     }
 
-    const useNewSeparator = featureAvailable(FEATURES.newAocApiSeparator);
+    const useNewSeparator = featureAvailable(FEATURES.newUIDsSeparator);
 
     const trackedEntityIds = apiEvents
         .reduce((acc, { trackedEntity }) => (acc.includes(trackedEntity) ? acc : [...acc, trackedEntity]), [])

diff --git a/...ists/WorkingListsCommon/helpers/buildFilterQueryArgs/filterConverters/booleanConverter.js b/...ists/WorkingListsCommon/helpers/buildFilterQueryArgs/filterConverters/booleanConverter.js
@@ -1,5 +1,5 @@
 // @flow
-import { pipe, FEATURES, featureAvailable } from 'capture-core-utils';
+import { pipe } from 'capture-core-utils';
 import type { BooleanFilterData } from '../../../../../ListView';
 
 const booleanFilterValues = {
@@ -12,10 +12,7 @@ export function convertBoolean(filter: BooleanFilterData) {
         values => values.map(filterValue => booleanFilterValues[filterValue]),
         values =>
             (values.length > 1 ?
-                {
-                    valueString: values.join(featureAvailable(FEATURES.newAocApiSeparator) ? ',' : ';'),
-                    single: false,
-                } :
+                { valueString: values.join(';'), single: false } :
                 { valueString: values[0], single: true }
             ),
         ({ valueString, single }) => (single ? `eq:${valueString}` : `in:${valueString}`),

diff --git a/...ListsCommon/helpers/buildFilterQueryArgs/filterConverters/optionSet/optionSetConverter.js b/...ListsCommon/helpers/buildFilterQueryArgs/filterConverters/optionSet/optionSetConverter.js
@@ -1,5 +1,5 @@
 // @flow
-import { pipe, FEATURES, featureAvailable } from 'capture-core-utils';
+import { pipe } from 'capture-core-utils';
 import { convertDataTypeValueToRequest } from './basicDataTypeConverters';
 import { typeof dataElementTypes } from '../../../../../../../metaData';
 import type { OptionSetFilterData } from '../../../../../../ListView';
@@ -11,7 +11,7 @@ export function convertOptionSet(
 ) {
     return pipe(
         values => values.map(filterValue => escapeString(convertDataTypeValueToRequest(filterValue, type))),
-        values => values.join(featureAvailable(FEATURES.newAocApiSeparator) ? ',' : ';'),
+        values => values.join(';'),
         valueString => `in:${valueString}`,
     )(sourceValue.values);
 }
diff --git a/src/core_modules/capture-core/converters/clientToServer.js b/src/core_modules/capture-core/converters/clientToServer.js
@@ -85,7 +85,7 @@ export function convertCategoryOptionsToServer(
                 acc.push(value[categoryId]);
             }
             return acc;
-        }, []).join(hasAPISupportForFeature(serverMinorVersion, FEATURES.newAocApiSeparator) ? ',' : ';');
+        }, []).join(hasAPISupportForFeature(serverMinorVersion, FEATURES.newUIDsSeparator) ? ',' : ';');
     }
     return value;
 }
diff --git a/src/core_modules/capture-core/events/convertEventAttributeOptions.js b/src/core_modules/capture-core/events/convertEventAttributeOptions.js
@@ -8,15 +8,15 @@ export const convertEventAttributeOptions = (event: Object, serverMinorVersion:
         .filter(key => key.startsWith(`${attributeCategoryKey}-`));
 
     if (editedAttributeOptions.length > 0) {
-        const useNewAocApiSeparator = hasAPISupportForFeature(serverMinorVersion, FEATURES.newAocApiSeparator);
+        const newUIDsSeparator = hasAPISupportForFeature(serverMinorVersion, FEATURES.newUIDsSeparator);
         const newAttributeCategoryOptions = [];
         editedAttributeOptions.forEach((key) => {
             newAttributeCategoryOptions.push(event[key]);
             delete event[key];
         });
         return {
             ...event,
-            attributeCategoryOptions: newAttributeCategoryOptions.join(useNewAocApiSeparator ? ',' : ';'),
+            attributeCategoryOptions: newAttributeCategoryOptions.join(newUIDsSeparator ? ',' : ';'),
         };
     }
     return event;