fix: ts errors

henrikmv · henrikmv · commit 2f41152175be · 2025-08-19T11:09:48.000+02:00
diff --git a/src/core_modules/capture-core/components/DataEntries/EnrollmentRegistrationEntry/EnrollmentRegistrationEntry.component.tsx b/src/core_modules/capture-core/components/DataEntries/EnrollmentRegistrationEntry/EnrollmentRegistrationEntry.component.tsx
@@ -8,6 +8,7 @@ import { scopeTypes } from '../../../metaData';
 import { DiscardDialog } from '../../Dialogs/DiscardDialog.component';
 import { EnrollmentDataEntry } from '../Enrollment';
 import type { Props, PlainProps } from './EnrollmentRegistrationEntry.types';
+import type { Enrollment } from '../../../metaData';
 import { withSaveHandler } from '../../DataEntry';
 import { withLoadingIndicator } from '../../../HOC';
 import { InfoIconText } from '../../InfoIconText';
@@ -72,14 +73,14 @@ const EnrollmentRegistrationEntryPlain =
       return (
           <>
               {
-                  scopeType === scopeTypes.TRACKER_PROGRAM && formId && orgUnit &&
+                  scopeType === scopeTypes.TRACKER_PROGRAM && formId && orgUnit && enrollmentMetadata && 'enrollmentForm' in enrollmentMetadata && formFoundation &&
                   <>
                       <EnrollmentDataEntry
                           teiId={teiId}
                           orgUnit={orgUnit}
                           programId={selectedScopeId}
                           formFoundation={formFoundation}
-                          enrollmentMetadata={enrollmentMetadata}
+                          enrollmentMetadata={enrollmentMetadata as Enrollment}
                           id={id}
                           onPostProcessErrorMessage={onPostProcessErrorMessage}
                           onGetUnsavedAttributeValues={() => console.log('onGetUnsavedAttributeValues will be here in the future')}
diff --git a/src/core_modules/capture-core/components/DataEntries/EnrollmentRegistrationEntry/EnrollmentRegistrationEntry.container.tsx b/src/core_modules/capture-core/components/DataEntries/EnrollmentRegistrationEntry/EnrollmentRegistrationEntry.container.tsx
@@ -37,7 +37,7 @@ export const EnrollmentRegistrationEntry: ComponentType<OwnProps> = ({
         dataEntryId: id,
         orgUnitId,
         teiId,
-        trackedEntityTypeId: enrollmentMetadata?.trackedEntityType?.id,
+        trackedEntityTypeId: enrollmentMetadata?.trackedEntityType?.id || undefined,
     });
 
     const isUserInteractionInProgress: boolean = useSelector(
diff --git a/src/core_modules/capture-core/components/DataEntries/EnrollmentRegistrationEntry/EnrollmentRegistrationEntry.types.ts b/src/core_modules/capture-core/components/DataEntries/EnrollmentRegistrationEntry/EnrollmentRegistrationEntry.types.ts
@@ -3,7 +3,7 @@ import type { RenderCustomCardActions } from '../../CardList';
 import type { SaveForDuplicateCheck } from '../common/TEIAndEnrollment/DuplicateCheckOnSave';
 import type { ExistingUniqueValueDialogActionsComponent } from '../withErrorMessagePostProcessor';
 import type { InputAttribute } from './hooks/useFormValues';
-import { RenderFoundation, ProgramStage, Enrollment } from '../../../metaData';
+import { RenderFoundation, ProgramStage, Enrollment, TeiRegistration } from '../../../metaData';
 import type { RelatedStageRefPayload } from '../../WidgetRelatedStages';
 import { relatedStageActions } from '../../WidgetRelatedStages';
 
@@ -14,7 +14,7 @@ type TrackedEntityAttributes = Array<{
 
 export type EnrollmentPayload = {
     trackedEntity: string;
-    trackedEntityType: string;
+    trackedEntityType?: string;
     orgUnit: string;
     geometry: any;
     attributes: TrackedEntityAttributes;
@@ -82,8 +82,8 @@ type ContainerProps = {
     onCancel: () => void;
     isUserInteractionInProgress: boolean;
     isSavingInProgress: boolean;
-    enrollmentMetadata: Enrollment;
-    formFoundation: RenderFoundation;
+    enrollmentMetadata: Enrollment | TeiRegistration | null;
+    formFoundation: RenderFoundation | null;
     formId: string | null;
     saveButtonText: string;
 };
diff --git a/src/core_modules/capture-core/components/DataEntries/EnrollmentRegistrationEntry/hooks/useBuildEnrollmentPayload.ts b/src/core_modules/capture-core/components/DataEntries/EnrollmentRegistrationEntry/hooks/useBuildEnrollmentPayload.ts
@@ -35,7 +35,7 @@ type DataEntryReduxConverterProps = {
     itemId?: string;
     orgUnitId: string;
     teiId?: string;
-    trackedEntityTypeId: string;
+    trackedEntityTypeId?: string;
 };
 
 function getClientValuesForFormData(formValues: Record<string, unknown>, formFoundation: RenderFoundation) {
@@ -181,7 +181,7 @@ export const useBuildEnrollmentPayload = ({
             teiWithEnrollment: {
                 trackedEntity: teiId || generateUID(),
                 orgUnit: orgUnitId,
-                trackedEntityType: trackedEntityTypeId,
+                trackedEntityType: trackedEntityTypeId || undefined,
                 attributes,
                 geometry: tetGeometry,
                 enrollments: [enrollment],
diff --git a/src/core_modules/capture-core/components/DataEntries/EnrollmentRegistrationEntry/hooks/useLifecycle.ts b/src/core_modules/capture-core/components/DataEntries/EnrollmentRegistrationEntry/hooks/useLifecycle.ts
@@ -88,7 +88,7 @@ export const useLifecycle = (
         skipDuplicateCheck: !!teiId,
         firstStageMetaData,
         formId,
-        enrollmentMetadata,
+        enrollmentMetadata: scopeType === scopeTypes.TRACKER_PROGRAM ? enrollmentMetadata : null,
         formFoundation,
     };
 };
diff --git a/src/core_modules/capture-core/components/DataEntries/common/ProgramStage/useMetadataForProgramStage.ts b/src/core_modules/capture-core/components/DataEntries/common/ProgramStage/useMetadataForProgramStage.ts
@@ -71,8 +71,8 @@ export const useMetadataForProgramStage = ({
     );
 
     return {
-        formFoundation: programStageMetadata?.stageForm,
-        stage: programStageMetadata,
+        formFoundation: programStageMetadata?.stageForm ?? null,
+        stage: programStageMetadata ?? null,
         isLoading: isLoading || isIdle,
         isError,
     };
diff --git a/src/core_modules/capture-core/components/DataEntries/common/TEIAndEnrollment/useMetadataForRegistrationForm/hooks/useDataEntryFormConfig.ts b/src/core_modules/capture-core/components/DataEntries/common/TEIAndEnrollment/useMetadataForRegistrationForm/hooks/useDataEntryFormConfig.ts
@@ -14,7 +14,7 @@ export const useDataEntryFormConfig = ({ selectedScopeId }: Props) => {
         configQuery,
         {
             enabled: !!selectedScopeId,
-            select: dataEntryFormConfigQuery => dataEntryFormConfigQuery[selectedScopeId],
+            select: (dataEntryFormConfigQuery: any) => dataEntryFormConfigQuery[selectedScopeId],
         },
     );
 
diff --git a/src/core_modules/capture-core/components/DataEntries/common/TEIAndEnrollment/useMetadataForRegistrationForm/hooks/useTrackedEntityTypeCollection.ts b/src/core_modules/capture-core/components/DataEntries/common/TEIAndEnrollment/useMetadataForRegistrationForm/hooks/useTrackedEntityTypeCollection.ts
@@ -66,6 +66,6 @@ export const useTrackedEntityTypeCollection = ({
     );
 
     return {
-        trackedEntityTypeCollection,
+        trackedEntityTypeCollection: trackedEntityTypeCollection || null,
     };
 };
diff --git a/src/core_modules/capture-core/components/MetadataAutoSelectInitializer/hooks/useMetadataAutoSelect.ts b/src/core_modules/capture-core/components/MetadataAutoSelectInitializer/hooks/useMetadataAutoSelect.ts
@@ -40,7 +40,7 @@ export const useMetadataAutoSelect = () => {
         if (programs && programs.length === 1) {
             paramsToAdd.programId = programs[0].id;
         }
-        if (searchOrgUnits && searchOrgUnits.length === 1) {
+        if (searchOrgUnits && (searchOrgUnits as any).length === 1) {
             paramsToAdd.orgUnitId = searchOrgUnits[0].id;
         }
 
diff --git a/src/core_modules/capture-core/components/SearchBox/hooks/useSearchOption.ts b/src/core_modules/capture-core/components/SearchBox/hooks/useSearchOption.ts
@@ -3,7 +3,8 @@ import { useProgramFromIndexedDB } from '../../../utils/cachedDataHooks/useProgr
 import { buildSearchOption } from '../../../hooks/useSearchOptions';
 import { useTrackedEntityTypeFromIndexedDB } from '../../../utils/cachedDataHooks/useTrackedEntityTypeFromIndexedDB';
 import { useUserLocale } from '../../../utils/localeData/useUserLocale';
-import type { AvailableSearchOption, SearchGroups } from '../SearchBox.types';
+import type { AvailableSearchOption } from '../SearchBox.types';
+import type { SearchGroup } from '../../../metaData/SearchGroup/SearchGroup';
 import { useIndexedDBQuery } from '../../../utils/reactQueryHelpers';
 import { buildSearchGroup } from './index';
 
@@ -44,27 +45,28 @@ export const useSearchOption = ({
     const searchData = (programData ?? trackedEntityTypeData);
     const { id: searchId, displayName: searchName } = searchData ?? {};
 
-    const { data, isLoading, isError } = useIndexedDBQuery<AvailableSearchOption | undefined>(
+    const { data: searchGroups, isLoading, isError } = useIndexedDBQuery<SearchGroup[]>(
         ['searchGroup', searchId],
         () => buildSearchGroup(searchData, locale),
         {
             enabled: !!(searchId && locale && searchData),
-            select: (searchGroups?: SearchGroups) => {
-                if (!searchName || !searchGroups || !searchScope) {
-                    return undefined;
-                }
-                return buildSearchOption(
-                    searchId,
-                    searchName,
-                    searchGroups,
-                    searchScope,
-                );
-            },
         },
     );
 
+    const searchOption = useMemo(() => {
+        if (!searchName || !searchGroups || !searchScope) {
+            return undefined;
+        }
+        return buildSearchOption(
+            searchId,
+            searchName,
+            searchGroups as any,
+            searchScope,
+        );
+    }, [searchName, searchGroups, searchScope, searchId]);
+
     return {
-        searchOption: data,
+        searchOption,
         isLoading,
         isError,
     };
diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/TransferModal/OrgUnitField/useSearchScopeWithFallback.ts b/src/core_modules/capture-core/components/WidgetEnrollment/TransferModal/OrgUnitField/useSearchScopeWithFallback.ts
@@ -16,7 +16,7 @@ export const useSearchScopeWithFallback = ({ searchText }: Props) => {
         {
             enabled: !searchText,
             select: (data) => {
-                const { teiSearchOrganisationUnits, organisationUnits } = data;
+                const { teiSearchOrganisationUnits, organisationUnits } = data as any;
                 return teiSearchOrganisationUnits.length
                     ? teiSearchOrganisationUnits
                     : organisationUnits;
@@ -40,7 +40,7 @@ export const useSearchScopeWithFallback = ({ searchText }: Props) => {
             enabled: Boolean(searchText),
             cacheTime: 120 * 60 * 1000,
             select: (data) => {
-                const { organisationUnits } = data;
+                const { organisationUnits } = data as any;
                 return organisationUnits;
             },
         },
diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/TransferModal/hooks/useProgramAccessLevel.ts b/src/core_modules/capture-core/components/WidgetEnrollment/TransferModal/hooks/useProgramAccessLevel.ts
@@ -27,7 +27,7 @@ export const useProgramAccessLevel = ({ programId }: Props) => {
     );
 
     return {
-        accessLevel: program?.accessLevel,
+        accessLevel: (program as any)?.accessLevel,
         isLoading,
     };
 };
diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/RelatedStagesActions/RelatedStagesActions.container.tsx b/src/core_modules/capture-core/components/WidgetRelatedStages/RelatedStagesActions/RelatedStagesActions.container.tsx
@@ -52,10 +52,10 @@ const RelatedStagesActionsPlain = ({
     const expiryPeriod = useProgramExpiryForUser(programId);
 
     useEffect(() => {
-        if (!orgUnitLoading && data?.length === 1) {
+        if (!orgUnitLoading && (data as any)?.length === 1) {
             setRelatedStageDataValues(prev => ({
                 ...prev,
-                orgUnit: data[0],
+                orgUnit: (data as any)[0],
             }));
         }
     }, [data, orgUnitLoading, setRelatedStageDataValues]);
diff --git a/src/core_modules/capture-core/components/WidgetTwoEventWorkspace/hooks/useLinkedEventByOriginId.ts b/src/core_modules/capture-core/components/WidgetTwoEventWorkspace/hooks/useLinkedEventByOriginId.ts
@@ -90,7 +90,7 @@ export const useLinkedEventByOriginId = ({ originEventId, skipBidirectionalCheck
         linkedEvent: dataValues ? linkedEvent : fallbackDataValues,
         relationship,
         relationshipType,
-        dataValues: dataValues || fallbackDataValues?.dataValues,
+        dataValues: dataValues || (fallbackDataValues as any)?.dataValues,
         isLoading: isLoading || isLoadingFallback,
         isError,
         error,
diff --git a/src/core_modules/capture-core/components/WidgetsChangelog/common/hooks/useChangelogData.ts b/src/core_modules/capture-core/components/WidgetsChangelog/common/hooks/useChangelogData.ts
@@ -63,7 +63,7 @@ export const useChangelogData = ({ entityId, entityType, programId }: Props) =>
 
     return {
         rawRecords: data,
-        pager: data?.pager,
+        pager: (data as any)?.pager,
         setPage,
         setPageSize: handleChangePageSize,
         sortDirection,
diff --git a/src/core_modules/capture-core/utils/reactQueryHelpers/query/useApiDataQuery.ts b/src/core_modules/capture-core/utils/reactQueryHelpers/query/useApiDataQuery.ts
@@ -1,7 +1,7 @@
 import { useQuery } from 'react-query';
 import { useDataEngine } from '@dhis2/app-runtime';
-import type { ResourceQuery } from '../../../../capture-core-utils/types/app-runtime';
 import type { QueryFunction, UseQueryOptions } from 'react-query';
+import type { ResourceQuery } from '../../../../capture-core-utils/types/app-runtime';
 import type { Result } from './useMetadataQuery.types';
 import { ReactQueryAppNamespace } from '../reactQueryHelpers.const';
 
@@ -18,7 +18,7 @@ export const useApiDataQuery = <TResultData>(
         return dataEngine.query({ theQuerykey: queryObject })
             .then(response => response.theQuerykey as TResultData);
     };
-    
+
     return useQuery<TResultData>(
         [ReactQueryAppNamespace, ...queryKey],
         queryFn,
diff --git a/src/core_modules/capture-core/utils/reactQueryHelpers/query/useMetadataQuery.ts b/src/core_modules/capture-core/utils/reactQueryHelpers/query/useMetadataQuery.ts
@@ -1,10 +1,10 @@
 import { useQuery } from 'react-query';
 import log from 'loglevel';
 import { useDataEngine } from '@dhis2/app-runtime';
+import type { QueryFunction, UseQueryOptions, QueryKey } from 'react-query';
 import type { ResourceQuery } from '../../../../capture-core-utils/types/app-runtime';
-import type { QueryFunction, UseQueryOptions } from 'react-query';
-import { IndexedDBError } from '../../../../capture-core-utils/storage/IndexedDBError/IndexedDBError';
 import type { Result } from './useMetadataQuery.types';
+import { IndexedDBError } from '../../../../capture-core-utils/storage/IndexedDBError/IndexedDBError';
 import { ReactQueryAppNamespace, IndexedDBNamespace } from '../reactQueryHelpers.const';
 
 const throwErrorForIndexedDB = (error: any) => {
@@ -18,32 +18,37 @@ const throwErrorForIndexedDB = (error: any) => {
     throw Error('There was an error fetching metadata');
 };
 
-const useAsyncMetadata = <TResultData>(
+// Generic over both the raw data (TQueryFnData) and the transformed data (TData)
+const useAsyncMetadata = <TQueryFnData, TData = TQueryFnData>(
     queryKey: Array<string | number | any | null | undefined>,
-    queryFn: QueryFunction<TResultData>,
-    queryOptions: UseQueryOptions<TResultData>,
-): Result<TResultData> => useQuery<TResultData>([ReactQueryAppNamespace, ...queryKey], queryFn, {
-    staleTime: Infinity,
-    ...queryOptions,
-});
+    queryFn: QueryFunction<TQueryFnData>,
+    queryOptions: UseQueryOptions<TQueryFnData, unknown, TData, QueryKey>,
+): Result<TData> =>
+        useQuery<TQueryFnData, unknown, TData, QueryKey>(
+            [ReactQueryAppNamespace, ...queryKey],
+            queryFn,
+            {
+                staleTime: Infinity,
+                ...queryOptions,
+            },
+        );
 
-export const useCustomMetadataQuery = <TResultData>(
+export const useCustomMetadataQuery = <TQueryFnData, TData = TQueryFnData>(
     queryKey: Array<string | number | any | null | undefined>,
-    queryFn: QueryFunction<TResultData>,
-    queryOptions?: UseQueryOptions<TResultData>,
-): Result<TResultData> =>
-        useAsyncMetadata(queryKey, queryFn, {
+    queryFn: QueryFunction<TQueryFnData>,
+    queryOptions?: UseQueryOptions<TQueryFnData, unknown, TData, QueryKey>,
+): Result<TData> =>
+        useAsyncMetadata<TQueryFnData, TData>(queryKey, queryFn, {
             cacheTime: 5,
             ...queryOptions,
         });
 
-
-export const useIndexedDBQuery = <TResultData>(
+export const useIndexedDBQuery = <TQueryFnData, TData = TQueryFnData>(
     queryKey: Array<string | number | any | null | undefined>,
-    queryFn: QueryFunction<TResultData>,
-    queryOptions?: UseQueryOptions<TResultData>,
-): Result<TResultData> =>
-        useAsyncMetadata([IndexedDBNamespace, ...queryKey], queryFn, {
+    queryFn: QueryFunction<TQueryFnData>,
+    queryOptions?: UseQueryOptions<TQueryFnData, unknown, TData, QueryKey>,
+): Result<TData> =>
+        useAsyncMetadata<TQueryFnData, TData>([IndexedDBNamespace, ...queryKey], queryFn, {
             cacheTime: 0,
             ...queryOptions,
             onError: (error) => {
@@ -52,24 +57,28 @@ export const useIndexedDBQuery = <TResultData>(
             },
         });
 
-export const useApiMetadataQuery = <TResultData>(
+export const useApiMetadataQuery = <TQueryFnData, TData = TQueryFnData>(
     queryKey: Array<string | number | any | null | undefined>,
     queryObject: ResourceQuery | undefined,
-    queryOptions?: UseQueryOptions<TResultData>,
-): Result<TResultData> => {
+    queryOptions?: UseQueryOptions<TQueryFnData, unknown, TData, QueryKey>,
+): Result<TData> => {
     const dataEngine = useDataEngine();
-    const queryFn: QueryFunction<TResultData> = () => {
+
+    const queryFn: QueryFunction<TQueryFnData> = () => {
         if (!queryObject) {
-            return Promise.resolve(undefined as TResultData);
+            // Returner "undefined" som TQueryFnData for å holde generics konsistente
+            return Promise.resolve(undefined as unknown as TQueryFnData);
         }
-        return dataEngine.query({ theQuerykey: queryObject })
-            .then(response => response.theQuerykey as TResultData);
+
+        return dataEngine
+            .query({ theQuerykey: queryObject })
+            .then(response => response.theQuerykey as TQueryFnData);
     };
 
-    return useAsyncMetadata(queryKey, queryFn, {
+    return useAsyncMetadata<TQueryFnData, TData>(queryKey, queryFn, {
         cacheTime: Infinity,
         staleTime: Infinity,
-        ...queryOptions,
         enabled: true,
+        ...queryOptions,
     });
 };

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ export const useDataEntryFormConfig = ({ selectedScopeId }: Props) => {`
`14`	`14`	`configQuery,`
`15`	`15`	`{`
`16`	`16`	`enabled: !!selectedScopeId,`
`17`		`- select: dataEntryFormConfigQuery => dataEntryFormConfigQuery[selectedScopeId],`
	`17`	`+ select: (dataEntryFormConfigQuery: any) => dataEntryFormConfigQuery[selectedScopeId],`
`18`	`18`	`},`
`19`	`19`	`);`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ export const useMetadataAutoSelect = () => {`
`40`	`40`	`if (programs && programs.length === 1) {`
`41`	`41`	`paramsToAdd.programId = programs[0].id;`
`42`	`42`	`}`
`43`		`- if (searchOrgUnits && searchOrgUnits.length === 1) {`
	`43`	`+ if (searchOrgUnits && (searchOrgUnits as any).length === 1) {`
`44`	`44`	`paramsToAdd.orgUnitId = searchOrgUnits[0].id;`
`45`	`45`	`}`
`46`	`46`