applies qa suggested changes

Author: cammiida

src/features/instance/useProcessNext.tsx

@@ -105,14 +105,15 @@ export function useProcessNext({ action }: ProcessNextProps = {}) {
     },
     onError: async (error: HttpClientError<ProblemDetails | undefined>) => {
       window.logError('Process next failed:\n', error);
-      const { data: newProcess } = await refetchProcessData();
-      const newCurrentTask = newProcess?.currentTask;
 
       if (!appSupportsUnlockingOnProcessNextFailure(applicationMetadata)) {
         displayError(error);
         return;
       }
 
+      const { data: newProcess } = await refetchProcessData();
+      const newCurrentTask = newProcess?.currentTask;
+
       if (newCurrentTask?.elementId && newCurrentTask?.elementId !== process?.currentTask?.elementId) {
         await reFetchInstanceData();
         navigateToTask(newCurrentTask.elementId);

src/layout/Button/ButtonComponent.tsx

@@ -3,6 +3,7 @@ import React from 'react';
 import { Button } from 'src/app-components/Button/Button';
 import { useAttachmentState } from 'src/features/attachments/hooks';
 import { useSetReturnToView } from 'src/features/form/layout/PageNavigationContext';
+import { useLayoutSets } from 'src/features/form/layoutSets/LayoutSetsProvider';
 import { useProcessNext } from 'src/features/instance/useProcessNext';
 import { useProcessQuery, useTaskTypeFromBackend } from 'src/features/instance/useProcessQuery';
 import { Lang } from 'src/features/language/Lang';
@@ -12,7 +13,7 @@ import { getComponentFromMode } from 'src/layout/Button/getComponentFromMode';
 import { ComponentStructureWrapper } from 'src/layout/ComponentStructureWrapper';
 import { alignStyle } from 'src/layout/RepeatingGroup/Container/RepeatingGroupContainer';
 import { ProcessTaskType } from 'src/types';
-import { ELEMENT_TYPE } from 'src/types/shared';
+import { behavesLikeDataTask } from 'src/utils/formLayout';
 import { useItemWhenType } from 'src/utils/layout/useNodeItem';
 import type { PropsFromGenericComponent } from 'src/layout';
 import type { CompInternal } from 'src/layout/layout';
@@ -30,10 +31,11 @@ export const ButtonComponent = ({ baseComponentId, ...componentProps }: PropsFro
   const currentTaskType = useTaskTypeFromBackend();
   const { data: process } = useProcessQuery();
   const currentTask = process?.currentTask;
-  const { actions, write, elementType: currentElementType } = currentTask ?? {};
+  const { actions, write } = currentTask ?? {};
   const attachmentState = useAttachmentState();
   const { mutate: processNext, isPending: isProcessingNext } = useProcessNext();
   const { mutate: processConfirm, isPending: isConfirming } = useProcessNext({ action: 'confirm' });
+  const layoutSets = useLayoutSets();
 
   const setReturnToView = useSetReturnToView();
 
@@ -55,10 +57,8 @@ export const ButtonComponent = ({ baseComponentId, ...componentProps }: PropsFro
   }
 
   function submitTask() {
-    const isServiceTask = currentElementType === ELEMENT_TYPE.SERVICE_TASK;
-
     setReturnToView?.(undefined);
-    if (currentTaskType === ProcessTaskType.Data || isServiceTask) {
+    if (currentTaskType === ProcessTaskType.Data || behavesLikeDataTask(currentTask?.elementId, layoutSets)) {
       processNext();
     } else if (currentTaskType === ProcessTaskType.Confirm) {
       processConfirm();

src/types/shared.ts

@@ -241,9 +241,9 @@ export type ITask = {
   flow: number;
   started: string;
   elementId: string;
-  elementType: ElementType;
   name: string;
   altinnTaskType: string;
+  elementType?: ElementType;
   ended?: string | null;
   validated?: IValidated | null;
 

src/utils/formLayout.ts

@@ -2,13 +2,13 @@ import type { ILayoutSet } from 'src/layout/common.generated';
 
 /**
  * Some tasks other than data (for instance confirm, or other in the future) can be configured to behave like data steps
- * @param task the task
+ * @param taskId the task element id
  * @param layoutSets the layout sets
  */
-export function behavesLikeDataTask(task: string | null | undefined, layoutSets: ILayoutSet[] | null): boolean {
-  if (!task) {
+export function behavesLikeDataTask(taskId: string | null | undefined, layoutSets: ILayoutSet[] | null): boolean {
+  if (!taskId) {
     return false;
   }
 
-  return !!layoutSets?.some((set) => set.tasks?.includes(task));
+  return !!layoutSets?.some((set) => set.tasks?.includes(taskId));
 }