simpify datamodel url creation further

Author: cammiida

src/features/datamodel/useBindingSchema.tsx

@@ -15,12 +15,7 @@ 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 {
-  getAnonymousStatelessDataModelUrl,
-  getStatefulDataModelUrl,
-  getStatelessDataModelUrl,
-  getStatelessDataModelUrlWithPrefill,
-} from 'src/utils/urls/appUrlHelper';
+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';
@@ -52,7 +47,6 @@ export function useCurrentDataModelGuid() {
 type DataModelDeps = {
   language: string;
   isAnonymous: boolean;
-  isStateless: boolean;
   instanceId?: string;
 };
 
@@ -70,25 +64,16 @@ function getDataModelUrl({
   includeRowIds = false,
   language,
   isAnonymous,
-  isStateless,
   instanceId,
   prefillFromQueryParams,
 }: DataModelDeps & DataModelProps) {
-  if (prefillFromQueryParams && !isAnonymous && isStateless && dataType) {
+  if (!instanceId && dataType) {
     return getUrlWithLanguage(
-      getStatelessDataModelUrlWithPrefill(dataType, includeRowIds, prefillFromQueryParams),
+      getStatelessDataModelUrl({ dataType, includeRowIds, prefillFromQueryParams, isAnonymous }),
       language,
     );
   }
 
-  if (isStateless && isAnonymous && dataType) {
-    return getUrlWithLanguage(getAnonymousStatelessDataModelUrl(dataType, includeRowIds), language);
-  }
-
-  if (isStateless && !isAnonymous && dataType) {
-    return getUrlWithLanguage(getStatelessDataModelUrl(dataType, includeRowIds), language);
-  }
-
   if (instanceId && dataElementId) {
     return getUrlWithLanguage(getStatefulDataModelUrl(instanceId, dataElementId, includeRowIds), language);
   }
@@ -98,7 +83,6 @@ function getDataModelUrl({
 
 export function useGetDataModelUrl() {
   const isAnonymous = useAllowAnonymous();
-  const isStateless = useApplicationMetadata().isStatelessApp;
   const instanceId = useLaxInstanceId();
   const currentLanguage = useAsRef(useCurrentLanguage());
 
@@ -109,7 +93,6 @@ export function useGetDataModelUrl() {
       includeRowIds,
       language: language ?? currentLanguage.current,
       isAnonymous,
-      isStateless,
       instanceId,
       prefillFromQueryParams,
     });

src/utils/urls/appUrlHelper.ts

@@ -48,18 +48,31 @@ export const getFileTagUrl = (instanceId: string, dataGuid: string, tag: string
   return `${appPath}/instances/${instanceId}/data/${dataGuid}/tags`;
 };
 
-export const getAnonymousStatelessDataModelUrl = (dataType: string, includeRowIds: boolean) =>
-  `${appPath}/v1/data/anonymous?dataType=${dataType}&includeRowId=${includeRowIds.toString()}`;
-
-export const getStatelessDataModelUrlWithPrefill = (
-  dataType: string,
-  includeRowIds: boolean,
-  prefillFromQueryParams: string,
-) =>
-  `${appPath}/v1/data?dataType=${dataType}&includeRowId=${includeRowIds.toString()}&prefill=${prefillFromQueryParams}`;
-
-export const getStatelessDataModelUrl = (dataType: string, includeRowIds: boolean) =>
-  `${appPath}/v1/data?dataType=${dataType}&includeRowId=${includeRowIds.toString()}`;
+export const getStatelessDataModelUrl = ({
+  dataType,
+  includeRowIds,
+  prefillFromQueryParams,
+  isAnonymous = false,
+}: {
+  dataType: string;
+  includeRowIds: boolean;
+  prefillFromQueryParams?: string;
+  isAnonymous?: boolean;
+}) => {
+  const queryParams = new URLSearchParams({
+    dataType,
+    includeRowId: includeRowIds.toString(),
+  });
+  if (isAnonymous) {
+    return `${appPath}/v1/data/anonymous?${queryParams}`;
+  }
+
+  if (prefillFromQueryParams) {
+    queryParams.append('prefill', prefillFromQueryParams);
+  }
+
+  return `${appPath}/v1/data?${queryParams}`;
+};
 
 export const getStatefulDataModelUrl = (instanceId: string, dataGuid: string, includeRowIds: boolean) =>
   `${appPath}/instances/${instanceId}/data/${dataGuid}?includeRowId=${includeRowIds.toString()}`;