refactor: remove component from list config

dhis2 · Oct 11, 2023 · ebec718 · ebec718
1 parent 25568ed
commit ebec718
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 38 deletions.
diff --git a/src/components/sectionList/SectionListWrapper.tsx b/src/components/sectionList/SectionListWrapper.tsx
@@ -95,12 +95,7 @@ export const SectionListWrapper = <Model extends IdentifiableObject>({
                                 <ModelValue
                                     path={path}
                                     schema={schema}
-                                    component={
-                                        headerColumns.find(
-                                            (c) => c.path === path
-                                        )?.component
-                                    }
-                                    model={model}
+                                    sectionModel={model}
                                 />
                             )
                         }}

diff --git a/src/components/sectionList/listView/types.ts b/src/components/sectionList/listView/types.ts
@@ -4,8 +4,8 @@ import type { ModelPropertyDescriptor } from '../../../lib'
 export interface ModelListView {
     name: string
     sectionModel: string
-    columns: Array<ModelPropertyDescriptor>
-    filters: Array<ModelPropertyDescriptor>
+    columns: ReadonlyArray<ModelPropertyDescriptor>
+    filters: ReadonlyArray<ModelPropertyDescriptor>
 }
 
 export type ModelListViews = {

diff --git a/src/components/sectionList/listView/useModelListView.tsx b/src/components/sectionList/listView/useModelListView.tsx
@@ -132,7 +132,8 @@ export const useModelListView = () => {
         select,
     })
 
-    if (query.error) {
+    // 404 errors are expected when user havent saved any views
+    if (query.error && (query.error as any).details?.httpStatusCode !== 404) {
         console.error(query.error)
     }
 

diff --git a/src/components/sectionList/modelValue/ModelValue.tsx b/src/components/sectionList/modelValue/ModelValue.tsx
@@ -11,12 +11,7 @@ import { ModelValueRenderer } from './ModelValueRenderer'
 type ModelValueProps = {
     schema: Schema
     path: string
-    model: unknown
-    // override renderer
-    component?: React.ComponentType<{
-        value: unknown
-        schemaProperty: SchemaFieldProperty
-    }>
+    sectionModel: unknown
 }
 
 const ModelValueError = () => {
@@ -39,27 +34,23 @@ const getSchemaProperty = (
     return schemaProperty
 }
 
-export const ModelValue = ({
-    component,
-    schema,
-    path,
-    model,
-}: ModelValueProps) => {
+export const ModelValue = ({ schema, path, sectionModel }: ModelValueProps) => {
     const schemaProperty = getSchemaProperty(schema, path)
 
-    const value = getIn(model, path)
+    const value = getIn(sectionModel, path)
 
     if (!schemaProperty || value == undefined) {
-        console.warn(
-            `Property ${path} not found in schema, value not rendered: ${value}`
-        )
+        console.warn(`Property ${path} not found, value not rendered: ${value}`)
         return null
     }
 
-    const Component = component || ModelValueRenderer
     return (
         <ErrorBoundary FallbackComponent={ModelValueError}>
-            <Component value={value} schemaProperty={schemaProperty} />
+            <ModelValueRenderer
+                path={path}
+                value={value}
+                schemaProperty={schemaProperty}
+            />
         </ErrorBoundary>
     )
 }
diff --git a/src/components/sectionList/modelValue/ModelValueRenderer.tsx b/src/components/sectionList/modelValue/ModelValueRenderer.tsx
@@ -3,14 +3,24 @@ import { SchemaFieldProperty } from '../../../lib'
 import { BooleanValue } from './BooleanValue'
 import { ConstantValue } from './ConstantValue'
 import { DateValue } from './DateValue'
+import { PublicAccessValue } from './PublicAccess'
 import { TextValue } from './TextValue'
 
 export type ValueDetails = {
     schemaProperty: SchemaFieldProperty
     value: unknown
+    path: string
 }
 
-export const ModelValueRenderer = ({ value, schemaProperty }: ValueDetails) => {
+export const ModelValueRenderer = ({
+    path,
+    value,
+    schemaProperty,
+}: ValueDetails) => {
+    if (path === 'sharing.public' && typeof value === 'string') {
+        return <PublicAccessValue value={value} />
+    }
+
     if (schemaProperty.propertyType === 'CONSTANT') {
         return <ConstantValue value={value as string} />
     }

diff --git a/src/components/sectionList/types.ts b/src/components/sectionList/types.ts
@@ -5,7 +5,7 @@ export type SelectedColumn = {
     path: string
 }
 
-export type SelectedColumns = SelectedColumn[]
+export type SelectedColumns = ReadonlyArray<SelectedColumn>
 
 export type CheckBoxOnChangeObject = {
     checked: boolean

diff --git a/src/lib/constants/index.ts b/src/lib/constants/index.ts
@@ -1,4 +1,4 @@
-export * from './sectionListViews'
+export * from './sectionListViewsConfig'
 export * from './sections'
 export * from './translatedModelConstants'
 export * from './translatedModelProperties'
diff --git a/src/lib/constants/sectionListViews.ts → src/lib/constants/sectionListViewsConfig.ts b/src/lib/constants/sectionListViews.ts → src/lib/constants/sectionListViewsConfig.ts
@@ -1,21 +1,18 @@
 import i18n from '@dhis2/d2-i18n'
-// import { PublicAccessValue } from '../../components/sectionList/modelValue/PublicAccess'
 import { uniqueBy } from '../utils'
 import type { SectionName } from './sections'
 import { getTranslatedProperty } from './translatedModelProperties'
 
 export interface ModelPropertyDescriptor {
     label: string
     path: string
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    component?: React.FC<{ value: any }>
 }
 
 type ModelPropertyConfig = string | ModelPropertyDescriptor
 interface ViewConfigPart {
-    available?: ModelPropertyConfig[]
+    available?: ReadonlyArray<ModelPropertyConfig>
     overrideDefaultAvailable?: boolean
-    default?: ModelPropertyConfig[]
+    default?: ReadonlyArray<ModelPropertyConfig>
 }
 
 interface ViewConfig {
@@ -24,8 +21,8 @@ interface ViewConfig {
 }
 
 interface ResolvedViewConfigPart {
-    available: ModelPropertyDescriptor[]
-    default: ModelPropertyDescriptor[]
+    available: ReadonlyArray<ModelPropertyDescriptor>
+    default: ReadonlyArray<ModelPropertyDescriptor>
 }
 interface ResolvedViewConfig {
     columns: ResolvedViewConfigPart
@@ -52,7 +49,6 @@ const defaultModelViewConfig = {
             {
                 label: i18n.t('Public access'),
                 path: 'sharing.public',
-                // component: PublicAccessValue,
             },
         ],
         default: ['name', 'sharing.public', 'lastUpdated'],