fix: update SingleSelectField and TrackedEntityTypeSelector for improved type safety

Author: henrikmv

src/core_modules/capture-core/components/FormFields/New/Fields/SingleSelectField/SingleSelectField.component.tsx

@@ -42,7 +42,7 @@ const NewSingleSelectFieldComponentPlain = ({
 
     const selectedOption = value != null
         ? options.find(option => option.value === value) ?? { value, label: String(value) }
-        : null;
+        : undefined;
 
     const handleChange = (nextValue: string | { value: string }) => {
         const resolvedValue = typeof nextValue === 'string' ? nextValue : nextValue?.value;
@@ -91,7 +91,6 @@ const NewSingleSelectFieldComponentPlain = ({
             <SimpleSingleSelect
                 name={fieldName}
                 options={options}
-                // @ts-expect-error - selected is not typed correctly
                 selected={selectedOption}
                 placeholder={placeholder}
                 clearable={clearable}

src/core_modules/capture-core/components/TrackedEntityTypeSelector/TrackedEntityTypeSelector.component.tsx

@@ -4,7 +4,7 @@ import { withStyles, type WithStyles } from 'capture-core-utils/styles';
 import { spacers } from '@dhis2/ui';
 // @ts-expect-error - SimpleSingleSelectField exists but types may not be available
 import { SimpleSingleSelectField } from '@dhis2-ui/select';
-import type { Props } from './TrackedEntityTypeSelector.types';
+import type { Props, SelectOption } from './TrackedEntityTypeSelector.types';
 import { scopeTypes } from '../../metaData';
 import { useTrackedEntityTypesWithCorrelatedPrograms, useCurrentTrackedEntityTypeId } from '../../hooks';
 
@@ -23,7 +23,7 @@ export const TrackedEntityTypeSelectorPlain =
         const trackedEntityTypesWithCorrelatedPrograms = useTrackedEntityTypesWithCorrelatedPrograms();
         const selectedSearchScopeId = useCurrentTrackedEntityTypeId();
 
-        const options = useMemo(() =>
+        const options: SelectOption[] = useMemo(() =>
             Object.values(trackedEntityTypesWithCorrelatedPrograms)
                 .filter(({ trackedEntityTypeAccess }: any) => {
                     if (accessNeeded === 'write') {
@@ -48,7 +48,7 @@ export const TrackedEntityTypeSelectorPlain =
             return options.find(opt => opt.value === selectedSearchScopeId);
         }, [selectedSearchScopeId, options]);
 
-        const handleSelectionChange = (option: { value: string; label: string }) => {
+        const handleSelectionChange = (option: SelectOption) => {
             onSelect(option.value, scopeTypes.TRACKED_ENTITY_TYPE as keyof typeof scopeTypes);
             onSetTrackedEntityTypeIdOnUrl({ trackedEntityTypeId: option.value });
         };

src/core_modules/capture-core/components/TrackedEntityTypeSelector/TrackedEntityTypeSelector.types.ts

@@ -1,5 +1,10 @@
 import type { scopeTypes } from '../../metaData';
 
+export type SelectOption = {
+    label: string;
+    value: string;
+};
+
 export type OwnProps = {
     accessNeeded?: 'write' | 'read';
     onSelect: (searchScopeId: string, searchScopeType: keyof typeof scopeTypes) => void;