minor changes to formdatareaders

Author: cammiida

src/features/datamodel/useAvailableDataModels.tsx

@@ -1,11 +1,5 @@
-import { useApplicationMetadata } from 'src/features/applicationMetadata/ApplicationMetadataProvider';
 import type { IDataType } from 'src/types/shared';
 
-export function useAvailableDataModels() {
-  const dataTypes = useApplicationMetadata().dataTypes;
-  return dataTypes.filter((dataType) => getDataTypeVariant(dataType) === DataTypeVariant.DataModel);
-}
-
 export enum DataTypeVariant {
   Pdf = 'pdf',
   Attachment = 'attachment',

src/features/formData/FormDataReaders.tsx

@@ -4,8 +4,9 @@ import type { PropsWithChildren } from 'react';
 import dot from 'dot-object';
 
 import { ContextNotProvided, createContext } from 'src/core/contexts/context';
+import { useApplicationMetadata } from 'src/features/applicationMetadata/ApplicationMetadataProvider';
 import { getFirstDataElementId } from 'src/features/applicationMetadata/appMetadataUtils';
-import { useAvailableDataModels } from 'src/features/datamodel/useAvailableDataModels';
+import { DataTypeVariant, getDataTypeVariant } from 'src/features/datamodel/useAvailableDataModels';
 import { useFormDataQuery } from 'src/features/formData/useFormDataQuery';
 import { useInstanceDataElements, useLaxInstanceId } from 'src/features/instance/InstanceContext';
 import { useNavigationParam } from 'src/hooks/navigation';
@@ -102,7 +103,10 @@ export class DataModelReaders {
  * to render FormDataReadersProvider somewhere inside if rendering in a form, and render DataModelFetcher.
  */
 export function GlobalFormDataReadersProvider({ children }: PropsWithChildren) {
-  const availableModels = useAvailableDataModels().map((dm) => dm.id);
+  const dataTypes = useApplicationMetadata().dataTypes;
+  const availableModels = dataTypes
+    .filter((dataType) => getDataTypeVariant(dataType) === DataTypeVariant.DataModel)
+    .map((dm) => dm.id);
   const [readerMap, setReaderMap] = useState<{ [name: string]: DataModelReader }>({});
 
   const updateModel = useCallback((newModel: DataModelReader) => {