chore: update factor schema type

dhis2 · Nov 12, 2024 · 91d58e3 · 91d58e3
1 parent 1f63709
commit 91d58e3
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 14 deletions.
diff --git a/src/components/form/FormBase.tsx b/src/components/form/FormBase.tsx
@@ -1,4 +1,3 @@
-// import { NoticeBox } from '@dhis2/ui'
 import React, { useMemo } from 'react'
 import { FormProps, Form as ReactFinalForm } from 'react-final-form'
 import {
@@ -11,7 +10,6 @@ import { useCustomAttributesQuery } from './attributes'
 type MaybeModelWithAttributes = {
     id?: string
     name?: string
-    factor?: string
     attributeValues?: PartialAttributeValue[] | undefined
 }
 
@@ -46,10 +44,6 @@ export function FormBase<TInitialValues extends MaybeModelWithAttributes>({
         }
     }, [customAttributes.data, initialValues, includeAttributes])
 
-    // if (customAttributes.error) {
-    //     return <NoticeBox error title="Failed to load custom attributes" />
-    // }
-
     if (!initialValuesWithAttributes || customAttributes.loading) {
         return <LoadingSpinner />
     }

diff --git a/src/lib/sectionList/listViews/sectionListViewsConfig.ts b/src/lib/sectionList/listViews/sectionListViewsConfig.ts
@@ -128,12 +128,30 @@ export const modelListViewsConfig = {
     },
     indicator: {
         columns: {
-            default: ['name', DESCRIPTORS.publicAccess, 'lastUpdated'],
+            default: [
+                'name',
+                { label: i18n.t('Indicator Type'), path: 'indicatorType' },
+                DESCRIPTORS.publicAccess,
+                'lastUpdated',
+            ],
         },
         filters: {
             default: ['indicatorType'],
         },
     },
+    indicatorType: {
+        columns: {
+            default: [
+                'name',
+                { label: i18n.t('Factor'), path: 'factor' },
+                DESCRIPTORS.publicAccess,
+                'lastUpdated',
+            ],
+        },
+        filters: {
+            default: [],
+        },
+    },
     categoryOptionGroupSet: {
         columns: {
             default: [

diff --git a/src/pages/indicatorTypes/Edit.tsx b/src/pages/indicatorTypes/Edit.tsx
@@ -28,15 +28,15 @@ export const Component = () => {
             fields: fieldFilters.concat(),
         },
     }
-    const IndicatorTypeQuery = useQuery({
+    const indicatorTypeQuery = useQuery({
         queryKey: [query],
         queryFn: queryFn<IndicatorTypesFormValues>,
     })
     return (
         <FormBase
             onSubmit={useOnSubmitEdit({ section, modelId })}
             section={section}
-            initialValues={IndicatorTypeQuery.data as IndicatorTypesFormValues}
+            initialValues={indicatorTypeQuery.data}
             validate={validate}
         >
             <DefaultNewFormContents section={section}>

diff --git a/src/pages/indicatorTypes/form/IndicatorTypesSchema.ts b/src/pages/indicatorTypes/form/IndicatorTypesSchema.ts
@@ -5,10 +5,7 @@ const { identifiable } = modelFormSchemas
 
 export const IndicatorSchema = identifiable.extend({
     name: z.string().min(1, 'Name is required'),
-    factor: z
-        .string()
-        .min(1, 'Factor is required')
-        .regex(/^\d+(\.\d+)?$/, 'Factor must be a valid number'),
+    factor: z.coerce.number().int(),
 })
 
 export const initialValues = getDefaults(IndicatorSchema)

diff --git a/src/types/generated/models.ts b/src/types/generated/models.ts
@@ -4776,7 +4776,7 @@ export type IndicatorType = {
     created: string
     createdBy: User
     displayName: string
-    factor: string
+    factor: number
     favorite: boolean
     favorites: Array<string>
     href: string