feat: data set required and setup fields #474
Conversation
✅ Deploy Preview for dhis2-maintenance-app-beta ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
| @@ -30,8 +30,8 @@ export const CategoryComboSelect = forwardRef(function CategoryComboSelect( | |||
| required={required} | |||
| invalid={invalid} | |||
| disabled={disabled} | |||
| useInitialOptionQuery={useInitialOptionQuery} | |||
| useOptionsQuery={useOptionsQuery} | |||
| useInitialOptionQuery={useInitialCategoryComboQuery} | |||
There was a problem hiding this comment.
these are just renaming
| onComplete({ value, label }) | ||
| }, | ||
| }) | ||
| return useDataQuery<InitialCategoryComboQueryResult>( |
There was a problem hiding this comment.
again only renaming in this file
| @@ -39,7 +39,7 @@ export const BaseModelSingleSelect = < | |||
| const { allModelsMap, allSingleSelectOptions } = useMemo(() => { | |||
| const allModelsMap = new Map(available.map((o) => [o.id, o])) | |||
| // due to pagination, the selected model might not be in the available list, so add it | |||
| if (selected && !allModelsMap.get(selected.id)) { | |||
| if (selected && selected.id && !allModelsMap.get(selected.id)) { | |||
There was a problem hiding this comment.
How can the selected be truthy but not contain an id with the types here? This is more protective and it can stay, but it shouldn't really happen with correct typing.
There was a problem hiding this comment.
ah i added it cause i messed everything up by sending selected=undefined. But you are right, prob if i fixed teh types before that it would not have happened
| @@ -10,7 +10,7 @@ type OptionSetQueryResult = { | |||
| } | |||
| } | |||
|
|
|||
| const CATEGORY_COMBOS_QUERY = { | |||
| const OPTION_SETS_QUERY = { | |||
| const CATEGORY_COMBOS_QUERY = { | ||
| resource: 'categoryCombos', | ||
| params: { | ||
| filter: ['dataDimensionType:eq:ATTRIBUTE'], | ||
| }, | ||
| } | ||
|
|
||
| const DEFAULT_CATEGORY_SELECT_OPTION = { | ||
| id: DEFAULT_CATEGORY_COMBO.id, | ||
| displayName: DEFAULT_CATEGORY_COMBO.displayName, | ||
| } |
There was a problem hiding this comment.
These could easily be statically defined outside render?
| } | ||
|
|
||
| return ( | ||
| <Field |
There was a problem hiding this comment.
You could use ModelSingleSelectField here?
| // categoryCombo: z.object({ id: z.string() }), | ||
| categoryCombo: z | ||
| .object({ id: z.string() }) | ||
| .default({ id: DEFAULT_CATEGORY_COMBO.id }), |
There was a problem hiding this comment.
Could we change this so we can default to the whole of default? Eg so we don't have to fetch displayName?
categoryCombo: z.object({ id: z.string(), displayName: z.string()}).default({ ...fromdefaultcatcombo})
Maybe we could take the transformed values into account when before fetching selectedWithoutId in ModelSingleSelect instead?
There was a problem hiding this comment.
I went for your first suggestion as i think really transform is a function that should run once the values are fetched. We could add a default value prop but maybe for now giving the default prop values in their completed form is less complex
| }} | ||
| transform={(catCombos) => [ | ||
| ...catCombos, | ||
| DEFAULT_CATEGORY_SELECT_OPTION, |
There was a problem hiding this comment.
This should be the first option to match old app behaviour
| import { useBoundResourceQueryFn } from '../../../lib/query/useBoundQueryFn' | ||
|
|
||
| export type PeriodTypes = { periodTypes: [{ name: string }] } | ||
| const periodTypesToTranslatedValues: Record<string, string> = { |
There was a problem hiding this comment.
I would prefer for these to be defined in translatedModelConstants. Then use getConstantTranslation to get the value (which will take care of the fallback).
There was a problem hiding this comment.
ah amazing thanks. Forgot we had already something
flaminic
force-pushed
the
DHIS2-18538/data-set-required-fields
branch
from
a3a9ae5 to
364e0ae
Compare
flaminic
force-pushed
the
DHIS2-18538/data-set-required-fields
branch
from
364e0ae to
0e4b907
Compare
No description provided.