Dhis2 18281/indicator list

i18n/en.pot

@@ -312,6 +312,9 @@ msgstr "Data set"
 msgid "Search by name, code or ID"
 msgstr "Search by name, code or ID"
 
+msgid "Indicator Type"
+msgstr "Indicator Type"
+
 msgid "Public access"
 msgstr "Public access"
 
@@ -961,48 +964,6 @@ msgstr "Filter selected categories"
 msgid "At least one category is required"
 msgstr "At least one category is required"
 
-msgid "Set up the basic information for this category option group set."
-msgstr "Set up the basic information for this category option group set."
-
-msgid "Explain the purpose of this category option group set."
-msgstr "Explain the purpose of this category option group set."
-
-msgid ""
-"Choose how this category option group set will be used to capture and "
-"analyze"
-msgstr ""
-"Choose how this category option group set will be used to capture and "
-"analyze"
-
-msgid ""
-"Category option group set will be available to the analytics as another "
-"dimension"
-msgstr ""
-"Category option group set will be available to the analytics as another "
-"dimension"
-
-msgid "Category option Groups"
-msgstr "Category option Groups"
-
-msgid ""
-"Choose the category option groups to include in this category option group "
-"set."
-msgstr ""
-"Choose the category option groups to include in this category option group "
-"set."
-
-msgid "Available category option groups"
-msgstr "Available category option groups"
-
-msgid "Selected category option groups"
-msgstr "Selected category option groups"
-
-msgid "Filter available category option groups"
-msgstr "Filter available category option groups"
-
-msgid "Filter selected category option groups"
-msgstr "Filter selected category option groups"
-
 msgid "Set up the basic information for this category option group."
 msgstr "Set up the basic information for this category option group."
 
@@ -1239,6 +1200,12 @@ msgstr "Set up the organisation unit location."
 msgid "Reference assignment"
 msgstr "Reference assignment"
 
+msgid "Longitude"
+msgstr "Longitude"
+
+msgid "Reference assignment"
+msgstr "Reference assignment"
+
 msgid "Assign the organisation unit to related objects."
 msgstr "Assign the organisation unit to related objects."
 

src/components/sectionList/filters/DynamicFilters.tsx

@@ -8,6 +8,7 @@ import {
     CategoryOptionGroupFilter,
     DataDimensionTypeFilter,
     DataSetFilter,
+    IndicatorFilter,
     DomainTypeSelectionFilter,
     IgnoreApprovalFilter,
     PublicAccessFilter,
@@ -19,6 +20,7 @@ type FilterKeyToComponentMap = Partial<Record<ConfigurableFilterKey, React.FC>>
 
 const filterKeyToComponentMap: FilterKeyToComponentMap = {
     category: Categoryfilter,
+    indicatorType: IndicatorFilter,
     categoryOption: CategoryOptionFilter,
     categoryCombo: CategoryComboFilter,
     categoryOptionGroup: CategoryOptionGroupFilter,
@@ -33,6 +35,7 @@ const filterKeyToComponentMap: FilterKeyToComponentMap = {
 
 export const DynamicFilters = () => {
     const filterKeys = useFilterKeys()
+
     return (
         <>
             {filterKeys.map((filterKey) => {

src/components/sectionList/filters/filterSelectors/IndicatorFilter.tsx

@@ -0,0 +1,24 @@
+import i18n from '@dhis2/d2-i18n'
+import React from 'react'
+import { useSectionListFilter } from '../../../../lib'
+import { createFilterDataQuery } from './createFilterDataQuery'
+import { ModelFilterSelect } from './ModelFilter'
+
+const query = createFilterDataQuery('indicatorTypes')
+
+export const IndicatorFilter = () => {
+    const [filter, setFilter] = useSectionListFilter('indicatorType')
+
+    const selected = filter?.[0]
+
+    return (
+        <ModelFilterSelect
+            placeholder={i18n.t('Indicator Type')}
+            query={query}
+            selected={selected}
+            onChange={({ selected }) =>
+                setFilter(selected ? [selected] : undefined)
+            }
+        />
+    )
+}

src/components/sectionList/filters/filterSelectors/index.ts

@@ -8,3 +8,4 @@ export * from './CategoryFilter'
 export * from './CategoryOptionGroupFilter'
 export * from './BooleanFilters'
 export * from './CategoryOptionFilter'
+export * from './IndicatorFilter'

src/lib/sectionList/filters/filterConfig.tsx

@@ -25,6 +25,7 @@ export const filterParamsSchema = z
         valueType: z.array(z.nativeEnum(DataElement.valueType)),
         dataDimensionType: z.nativeEnum(Category.dataDimensionType),
         ignoreApproval: z.boolean(),
+        indicatorType: zodArrayIds,
     })
     .partial()
 
@@ -43,6 +44,7 @@ export const filterQueryParamType = {
     publicAccess: CustomDelimitedArrayParam,
     dataDimensionType: StringParam,
     ignoreApproval: BooleanParam,
+    indicatorType: CustomDelimitedArrayParam,
 } as const satisfies QueryParamsConfigMap
 
 export const validFilterKeys = Object.keys(filterQueryParamType)

src/lib/sectionList/filters/parseFiltersToQueryParams.ts

@@ -32,6 +32,7 @@ const filterToQueryParamMap: FilterToQueryParamsMap = {
     identifiable: (value) => `identifiable:token:${value}`,
     category: (value) => inFilter('categories.id', value),
     categoryOption: (value) => inFilter('categoryOptions.id', value),
+    indicatorType: (value) => inFilter('indicatorType.id', value),
     categoryCombo: (value, section) => {
         if (section.name === 'category') {
             return inFilter('categoryCombos.id', value)

src/lib/sectionList/listViews/sectionListViewsConfig.ts

@@ -126,6 +126,14 @@ export const modelListViewsConfig = {
             default: ['dataDimensionType', 'categoryCombo'],
         },
     },
+    indicator: {
+        columns: {
+            default: ['name', DESCRIPTORS.publicAccess, 'lastUpdated'],
+        },
+        filters: {
+            default: ['indicatorType'],
+        },
+    },
     categoryOptionGroupSet: {
         columns: {
             default: [

src/pages/indicators/List.tsx

@@ -0,0 +1,4 @@
+import React from 'react'
+import { DefaultSectionList } from '../DefaultSectionList'
+
+export const Component = () => <DefaultSectionList />

src/pages/organisationUnits/form/OrganisationUnitFormFields.tsx

@@ -9,8 +9,6 @@ import {
     StandardFormSection,
     StandardFormSectionDescription,
     StandardFormSectionTitle,
-} from '../../../components'
-import {
     DefaultIdentifiableFields,
     DescriptionField,
 } from '../../../components'