consolidate data model url hooks

Author: cammiida

src/features/datamodel/DataModelsProvider.tsx

@@ -14,7 +14,7 @@ import { useApplicationMetadata } from 'src/features/applicationMetadata/Applica
 import { getFirstDataElementId } from 'src/features/applicationMetadata/appMetadataUtils';
 import { useCustomValidationConfigQuery } from 'src/features/customValidation/useCustomValidationQuery';
 import { UpdateDataElementIdsForCypress } from 'src/features/datamodel/DataElementIdsForCypress';
-import { useCurrentDataModelName, useDataModelUrl } from 'src/features/datamodel/useBindingSchema';
+import { useCurrentDataModelName, useGetDataModelUrl } from 'src/features/datamodel/useBindingSchema';
 import { useDataModelSchemaQuery } from 'src/features/datamodel/useDataModelSchemaQuery';
 import {
   getAllReferencedDataTypes,
@@ -310,7 +310,7 @@ function LoadInitialData({ dataType, overrideDataElement }: LoaderProps & { over
   const dataElementId = overrideDataElement ?? getFirstDataElementId(dataElements, dataType);
   const metaData = useApplicationMetadata();
 
-  const url = useDataModelUrl({
+  const url = useGetDataModelUrl()({
     dataType,
     dataElementId,
     includeRowIds: true,

src/features/datamodel/useBindingSchema.tsx

@@ -1,4 +1,4 @@
-import { useCallback, useMemo } from 'react';
+import { useMemo } from 'react';
 
 import type { JSONSchema7 } from 'json-schema';
 
@@ -102,44 +102,17 @@ export function useGetDataModelUrl() {
   const instanceId = useLaxInstanceId();
   const currentLanguage = useAsRef(useCurrentLanguage());
 
-  return useCallback(
-    ({ dataType, dataElementId, includeRowIds, language }: DataModelProps) =>
-      getDataModelUrl({
-        dataType,
-        dataElementId,
-        includeRowIds,
-        language: language ?? currentLanguage.current,
-        isAnonymous,
-        isStateless,
-        instanceId,
-      }),
-    [currentLanguage, instanceId, isAnonymous, isStateless],
-  );
-}
-
-// We assume that the first data element of the correct type is the one we should use, same as isDataTypeWritable
-export function useDataModelUrl({
-  dataType,
-  dataElementId,
-  includeRowIds,
-  language,
-  prefillFromQueryParams,
-}: DataModelProps) {
-  const isAnonymous = useAllowAnonymous();
-  const isStateless = useApplicationMetadata().isStatelessApp;
-  const instanceId = useLaxInstanceId();
-  const currentLanguage = useAsRef(useCurrentLanguage());
-
-  return getDataModelUrl({
-    dataType,
-    dataElementId,
-    includeRowIds,
-    language: language ?? currentLanguage.current,
-    isAnonymous,
-    isStateless,
-    instanceId,
-    prefillFromQueryParams,
-  });
+  return ({ dataType, dataElementId, includeRowIds, language, prefillFromQueryParams }: DataModelProps) =>
+    getDataModelUrl({
+      dataType,
+      dataElementId,
+      includeRowIds,
+      language: language ?? currentLanguage.current,
+      isAnonymous,
+      isStateless,
+      instanceId,
+      prefillFromQueryParams,
+    });
 }
 
 export function useCurrentDataModelName() {

src/features/formData/FormDataReaders.tsx

@@ -6,7 +6,7 @@ import dot from 'dot-object';
 import { ContextNotProvided, createContext } from 'src/core/contexts/context';
 import { getFirstDataElementId } from 'src/features/applicationMetadata/appMetadataUtils';
 import { useAvailableDataModels } from 'src/features/datamodel/useAvailableDataModels';
-import { useDataModelUrl } from 'src/features/datamodel/useBindingSchema';
+import { useGetDataModelUrl } from 'src/features/datamodel/useBindingSchema';
 import { useFormDataQuery } from 'src/features/formData/useFormDataQuery';
 import { useInstanceDataElements } from 'src/features/instance/InstanceContext';
 import { useCurrentLanguage } from 'src/features/language/LanguageProvider';
@@ -198,7 +198,7 @@ function SpecificDataModelFetcher({ reader, isAvailable }: { reader: DataModelRe
   const dataType = reader.getName();
   const dataElements = useInstanceDataElements(dataType);
   const dataElementId = getFirstDataElementId(dataElements, dataType);
-  const url = useDataModelUrl({ includeRowIds: false, dataType, dataElementId, language: useCurrentLanguage() });
+  const url = useGetDataModelUrl()({ includeRowIds: false, dataType, dataElementId, language: useCurrentLanguage() });
   const enabled = isAvailable && reader.isLoading();
   const { data, error } = useFormDataQuery(enabled ? url : undefined);
   const { updateModel } = useCtx();