refactor useformdataquery further

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, useGetDataModelUrl } from 'src/features/datamodel/useBindingSchema';
+import { useCurrentDataModelName } from 'src/features/datamodel/useBindingSchema';
 import { useDataModelSchemaQuery } from 'src/features/datamodel/useDataModelSchemaQuery';
 import {
   getAllReferencedDataTypes,
@@ -31,6 +31,7 @@ import {
   instanceQueries,
   useInstanceDataElements,
   useInstanceDataQueryArgs,
+  useLaxInstanceId,
 } from 'src/features/instance/InstanceContext';
 import { MissingRolesError } from 'src/features/instantiate/containers/MissingRolesError';
 import { useIsPdf } from 'src/hooks/useIsPdf';
@@ -309,23 +310,23 @@ function LoadInitialData({ dataType, overrideDataElement }: LoaderProps & { over
   const dataElements = useInstanceDataElements(dataType);
   const dataElementId = overrideDataElement ?? getFirstDataElementId(dataElements, dataType);
   const metaData = useApplicationMetadata();
+  const instanceId = useLaxInstanceId();
 
-  const url = useGetDataModelUrl()({
+  const { data, error } = useFormDataQuery({
     dataType,
     dataElementId,
     includeRowIds: true,
+    instanceId,
     prefillFromQueryParams: getValidPrefillDataFromQueryParams(metaData, dataType),
   });
 
-  const { data, error } = useFormDataQuery(url);
-
   useEffect(() => {
-    if (!data || !url) {
+    if (!data) {
       return;
     }
     sessionStorage.removeItem('queryParams');
     setInitialData(dataType, data);
-  }, [data, dataType, metaData.id, setInitialData, url]);
+  }, [data, dataType, metaData.id, setInitialData]);
 
   useEffect(() => {
     setDataElementId(dataType, dataElementId ?? null);

src/features/datamodel/useBindingSchema.tsx

@@ -10,13 +10,8 @@ import {
 } from 'src/features/applicationMetadata/appMetadataUtils';
 import { DataModels } from 'src/features/datamodel/DataModelsProvider';
 import { useLayoutSets } from 'src/features/form/layoutSets/LayoutSetsProvider';
-import { useInstanceDataQuery, useLaxInstanceId } from 'src/features/instance/InstanceContext';
+import { useInstanceDataQuery } from 'src/features/instance/InstanceContext';
 import { useProcessTaskId } from 'src/features/instance/useProcessTaskId';
-import { useCurrentLanguage } from 'src/features/language/LanguageProvider';
-import { useAllowAnonymous } from 'src/features/stateless/getAllowAnonymous';
-import { useAsRef } from 'src/hooks/useAsRef';
-import { getStatefulDataModelUrl, getStatelessDataModelUrl } from 'src/utils/urls/appUrlHelper';
-import { getUrlWithLanguage } from 'src/utils/urls/urlHelper';
 import type { IDataModelReference } from 'src/layout/common.generated';
 import type { IDataModelBindings } from 'src/layout/layout';
 
@@ -44,60 +39,6 @@ export function useCurrentDataModelGuid() {
   }).data;
 }
 
-type DataModelDeps = {
-  language: string;
-  isAnonymous: boolean;
-  instanceId?: string;
-};
-
-type DataModelProps = {
-  dataType?: string;
-  dataElementId?: string;
-  includeRowIds?: boolean;
-  language?: string;
-  prefillFromQueryParams?: string;
-};
-
-function getDataModelUrl({
-  dataType,
-  dataElementId,
-  includeRowIds = false,
-  language,
-  isAnonymous,
-  instanceId,
-  prefillFromQueryParams,
-}: DataModelDeps & DataModelProps) {
-  if (!instanceId && dataType) {
-    return getUrlWithLanguage(
-      getStatelessDataModelUrl({ dataType, includeRowIds, prefillFromQueryParams, isAnonymous }),
-      language,
-    );
-  }
-
-  if (instanceId && dataElementId) {
-    return getUrlWithLanguage(getStatefulDataModelUrl(instanceId, dataElementId, includeRowIds), language);
-  }
-
-  return undefined;
-}
-
-export function useGetDataModelUrl() {
-  const isAnonymous = useAllowAnonymous();
-  const instanceId = useLaxInstanceId();
-  const currentLanguage = useAsRef(useCurrentLanguage());
-
-  return ({ dataType, dataElementId, includeRowIds, language, prefillFromQueryParams }: DataModelProps) =>
-    getDataModelUrl({
-      dataType,
-      dataElementId,
-      includeRowIds,
-      language: language ?? currentLanguage.current,
-      isAnonymous,
-      instanceId,
-      prefillFromQueryParams,
-    });
-}
-
 export function useCurrentDataModelName() {
   const overriddenDataModelType = useTaskStore((state) => state.overriddenDataModelType);
 

src/features/formData/FormDataReaders.tsx

@@ -6,10 +6,8 @@ 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 { 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';
+import { useInstanceDataElements, useLaxInstanceId } from 'src/features/instance/InstanceContext';
 import { useNavigationParam } from 'src/hooks/navigation';
 import { useAsRef } from 'src/hooks/useAsRef';
 import type { IDataModelReference } from 'src/layout/common.generated';
@@ -198,9 +196,15 @@ function SpecificDataModelFetcher({ reader, isAvailable }: { reader: DataModelRe
   const dataType = reader.getName();
   const dataElements = useInstanceDataElements(dataType);
   const dataElementId = getFirstDataElementId(dataElements, dataType);
-  const url = useGetDataModelUrl()({ includeRowIds: false, dataType, dataElementId, language: useCurrentLanguage() });
+  const instanceId = useLaxInstanceId();
   const enabled = isAvailable && reader.isLoading();
-  const { data, error } = useFormDataQuery(enabled ? url : undefined);
+  const { data, error } = useFormDataQuery({
+    enabled,
+    includeRowIds: false,
+    dataType,
+    dataElementId,
+    instanceId,
+  });
   const { updateModel } = useCtx();
 
   useEffect(() => {

src/features/formData/FormDataWrite.tsx

@@ -11,14 +11,13 @@ import { ContextNotProvided } from 'src/core/contexts/context';
 import { createZustandContext } from 'src/core/contexts/zustandContext';
 import { useApplicationMetadata } from 'src/features/applicationMetadata/ApplicationMetadataProvider';
 import { DataModels } from 'src/features/datamodel/DataModelsProvider';
-import { useGetDataModelUrl } from 'src/features/datamodel/useBindingSchema';
 import { useRuleConnections } from 'src/features/form/dynamics/DynamicsContext';
 import { usePageSettings } from 'src/features/form/layoutSettings/LayoutSettingsContext';
 import { useFormDataWriteProxies } from 'src/features/formData/FormDataWriteProxies';
 import { createFormDataWriteStore } from 'src/features/formData/FormDataWriteStateMachine';
 import { createPatch } from 'src/features/formData/jsonPatch/createPatch';
 import { ALTINN_ROW_ID } from 'src/features/formData/types';
-import { getFormDataQueryKey } from 'src/features/formData/useFormDataQuery';
+import { formDataQueries, useGetDataModelUrl } from 'src/features/formData/useFormDataQuery';
 import { useLaxInstanceId, useOptimisticallyUpdateCachedInstance } from 'src/features/instance/InstanceContext';
 import { useCurrentLanguage } from 'src/features/language/LanguageProvider';
 import { useSelectedParty } from 'src/features/party/PartiesProvider';
@@ -109,11 +108,13 @@ function useFormDataSaveMutation() {
   // the main form and a subform).
   function updateQueryCache(result: FDSaveFinished) {
     for (const { dataType, data, dataElementId } of result.newDataModels) {
-      const url = getDataModelUrl({ dataType, dataElementId, includeRowIds: true });
-      if (!url) {
-        continue;
-      }
-      const queryKey = getFormDataQueryKey(url);
+      const queryKey = formDataQueries.formDataKey({
+        dataType,
+        dataElementId,
+        includeRowIds: true,
+        isAnonymous: false,
+        instanceId,
+      });
       queryClient.setQueryData(queryKey, data);
     }
   }
@@ -174,6 +175,7 @@ function useFormDataSaveMutation() {
   }
 
   const mutation = useMutation({
+    scope: { id: 'saveFormData' },
     mutationKey: ['saveFormData'],
     mutationFn: async (): Promise<FDSaveFinished | undefined> => {
       // While we could get the next model from a ref, we want to make sure we get the latest model after debounce