refactor(option set select): use hooks from lib

dhis2 · Nov 15, 2023 · 4b47400 · 4b47400
1 parent ba37aa4
commit 4b47400
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 91 deletions.
diff --git a/src/components/metadataFormControls/OptionSetSelect/OptionSetSelect.tsx b/src/components/metadataFormControls/OptionSetSelect/OptionSetSelect.tsx
@@ -1,8 +1,8 @@
 import i18n from '@dhis2/d2-i18n'
 import React, { forwardRef } from 'react'
+import { useOptionSetsQuery } from '../../../lib'
 import { ModelSingleSelect } from '../ModelSingleSelect'
 import { useInitialOptionQuery } from './useInitialOptionQuery'
-import { useOptionsQuery } from './useOptionsQuery'
 
 interface OptionSetSelectProps {
     onChange: ({ selected }: { selected: string }) => void
@@ -31,7 +31,7 @@ export const OptionSetSelect = forwardRef(function OptionSetSelect(
             ref={ref}
             invalid={invalid}
             useInitialOptionQuery={useInitialOptionQuery}
-            useOptionsQuery={useOptionsQuery}
+            useOptionsQuery={useOptionSetsQuery}
             placeholder={placeholder}
             showAllOption={showAllOption}
             onChange={onChange}

diff --git a/src/components/metadataFormControls/OptionSetSelect/useInitialOptionQuery.ts b/src/components/metadataFormControls/OptionSetSelect/useInitialOptionQuery.ts
@@ -1,22 +1,12 @@
-import { useDataQuery } from '@dhis2/app-runtime'
 import { useRef } from 'react'
+import { useOptionSetQuery } from '../../../lib'
 import { SelectOption } from '../../../types'
 import { FilteredOptionSet } from './types'
 
 type InitialOptionSetQueryResult = {
     optionSet: FilteredOptionSet
 }
 
-const INITIAL_OPTION_QUERY = {
-    optionSet: {
-        resource: 'optionSets',
-        id: (variables: Record<string, string>) => variables.id,
-        params: {
-            fields: ['id', 'displayName'],
-        },
-    },
-}
-
 export function useInitialOptionQuery({
     selected,
     onComplete,
@@ -25,10 +15,10 @@ export function useInitialOptionQuery({
     selected?: string
 }) {
     const initialSelected = useRef(selected)
-    return useDataQuery<InitialOptionSetQueryResult>(INITIAL_OPTION_QUERY, {
+    return useOptionSetQuery<InitialOptionSetQueryResult>({
         lazy: !initialSelected.current,
         variables: { id: selected },
-        onComplete: (data) => {
+        onComplete: (data: InitialOptionSetQueryResult) => {
             const optionSet = data.optionSet
             const { id: value, displayName: label } = optionSet
             onComplete({ value, label })

diff --git a/src/components/metadataFormControls/OptionSetSelect/useOptionsQuery.ts b/src/components/metadataFormControls/OptionSetSelect/useOptionsQuery.ts