fix(categoryOptionGroup): remove dataDimension field (#460)

* fix: remove data dimension and add data dimension type filter * chore: remove data dimension from edit form * chore: resolved filters
dhis2 · Dec 5, 2024 · 276e4ab · 276e4ab
1 parent 8790d86
commit 276e4ab
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 13 deletions.
diff --git a/i18n/en.pot b/i18n/en.pot
@@ -5,6 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"POT-Creation-Date: 2024-12-05T06:06:51.471Z\n"
+"PO-Revision-Date: 2024-12-05T06:06:51.471Z\n"
 "POT-Creation-Date: 2024-12-03T07:31:45.454Z\n"
 "PO-Revision-Date: 2024-12-03T07:31:45.455Z\n"
 

diff --git a/src/components/sectionList/listView/useModelListView.tsx b/src/components/sectionList/listView/useModelListView.tsx
@@ -149,6 +149,7 @@ export const useModelListView = () => {
 
     const columns = selectedView.columns
     const filters = selectedView.filters
+
     return { view: selectedView, columns, filters, query }
 }
 

diff --git a/src/pages/categoryOptionGroups/Edit.tsx b/src/pages/categoryOptionGroups/Edit.tsx
@@ -22,7 +22,6 @@ const fieldFilters = [
     'code',
     'description',
     'categoryOptions[id,displayName]',
-    'dataDimension',
     'dataDimensionType',
 ] as const
 

diff --git a/src/pages/categoryOptionGroups/form/CategoryOptionGroupFormFields.tsx b/src/pages/categoryOptionGroups/form/CategoryOptionGroupFormFields.tsx
@@ -66,17 +66,6 @@ function CategoryOptionGroupFormFields() {
                         />
                     </HorizontalFieldGroup>
                 </StandardFormField>
-                <StandardFormField>
-                    <Field
-                        name="dataDimension"
-                        type="checkbox"
-                        component={CheckboxFieldFF}
-                        label={i18n.t('Use as data dimension')}
-                        helpText={i18n.t(
-                            'Category option group will be available to the analytics as another dimension'
-                        )}
-                    />
-                </StandardFormField>
             </StandardFormSection>
 
             <StandardFormSection>

diff --git a/src/pages/categoryOptionGroups/form/categoryOptionGroupSchema.ts b/src/pages/categoryOptionGroups/form/categoryOptionGroupSchema.ts
@@ -16,7 +16,6 @@ export const categoryOptionGroupSchema = identifiable
         dataDimensionType: z
             .nativeEnum(CategoryOptionGroup.dataDimensionType)
             .default(CategoryOptionGroup.dataDimensionType.DISAGGREGATION),
-        dataDimension: z.boolean().default(true),
         categoryOptions: referenceCollection
             .min(1, 'At least one category option is required')
             .default([]),
-Original file line number
+Diff line change
@@ Expand Up / @@ -149,6 +149,7 @@ export const useModelListView = () => { @@
         const columns = selectedView.columns
         const filters = selectedView.filters
         return { view: selectedView, columns, filters, query }
     }
@@ Expand Down @@