refactor: convert reactQueryHelpers folder from Flow to TypeScript (#4357)

* refactor: convert reactQueryHelpers folder from Flow to TypeScript

- Convert all 6 JavaScript files to TypeScript with minimal changes
- Remove Flow type annotations and replace with TypeScript equivalents
- Update imports to use TypeScript syntax (import type)
- Maintain all existing function logic and structure
- Update ResourceQuery type to support function-based id properties
- Follow existing TypeScript patterns from the codebase

Files converted:
- reactQueryHelpers.const.js → .ts
- query/useMetadataQuery.types.js → .ts
- query/useMetadataQuery.js → .ts
- query/useApiDataQuery.js → .ts
- query/index.js → .ts
- index.js → .ts

Co-Authored-By: [email protected] <[email protected]>

* fix: update ResourceQuery type to be compatible with existing codebase

- Use 'any' type for id, data, and params properties to maintain compatibility
- Resolves TypeScript compilation errors in converted reactQueryHelpers files
- Maintains minimal changes approach as requested

Co-Authored-By: [email protected] <[email protected]>

* fix: allow optional ResourceQuery in useApiMetadataQuery to handle conditional queries

- Update useApiMetadataQuery function signature to accept ResourceQuery | undefined
- Add null check in queryFn implementation to return empty object when no query provided
- This fixes TypeScript errors in files using conditional query patterns like useRelationshipTypes.ts

Co-Authored-By: [email protected] <[email protected]>

* fix: update useApiDataQuery to handle optional ResourceQuery parameters

- Allow ResourceQuery | undefined parameter type
- Add enabled: !!queryObject to prevent queries when queryObject is undefined
- Use non-null assertion in queryFn since query is disabled when queryObject is undefined
- This should resolve remaining 'Property X does not exist on type {}' errors

Co-Authored-By: [email protected] <[email protected]>

* fix: return undefined when queryObject is undefined to match React Query disabled query behavior

Co-Authored-By: [email protected] <[email protected]>

* fix: add enabled flag and remove select function for disabled queries

Co-Authored-By: [email protected] <[email protected]>

* fix: simplify query functions to return undefined when queryObject is undefined

Co-Authored-By: [email protected] <[email protected]>

* fix: use enabled flag to prevent query execution when queryObject is undefined

Co-Authored-By: [email protected] <[email protected]>

* fix: return undefined when queryObject is undefined to resolve TypeScript errors

Co-Authored-By: [email protected] <[email protected]>

* fix: update Result type to include undefined for disabled queries

Co-Authored-By: [email protected] <[email protected]>

* fix: ensure enabled flag takes precedence over queryOptions

Co-Authored-By: [email protected] <[email protected]>

* fix: ts errors

---------

Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: [email protected] <[email protected]>
Co-authored-by: henrikmv <[email protected]>

Author: 3 people

src/core_modules/capture-core-utils/types/app-runtime.ts

@@ -9,13 +9,14 @@ export type QueryParameters = {
     page?: number
     fields?: string | string[]
     filter?: string | string[]
+    [key: string]: any
 }
 export type QueryVariables = any;
 
 export type ResourceQuery = {
-    resource: string
-    id?: string
-    data?: any
-    params?: any
+    resource: string;
+    id?: any;
+    data?: any;
+    params?: any;
 };
 

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')}

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(

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;
 };

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],

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,
     };
 };

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,
     };

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],
         },
     );
 

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,
     };
 };

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;
         }