refactor: improve service task handling and error management

  - Remove DisplayErrorProvider in favor of toast notifications
  - Support service task navigation on process next failure
  - Add generic typing to HttpClientError
  - Export useGetInstanceDataQuery for wider usage

Author: cammiida

src/core/errorHandling/DisplayErrorProvider.tsx

@@ -126,12 +126,12 @@ export function useInstanceDataQueryDef(
 
 function useGetInstanceDataQuery(
   hasResultFromInstantiation: boolean,
-  partyId: string | undefined,
+  instanceOwnerPartyId: string | undefined,
   instanceGuid: string | undefined,
   enablePolling: boolean = false,
   enabled: boolean = true,
 ) {
-  const queryDef = useInstanceDataQueryDef(hasResultFromInstantiation, partyId, instanceGuid);
+  const queryDef = useInstanceDataQueryDef(hasResultFromInstantiation, instanceOwnerPartyId, instanceGuid);
 
   const utils = useQuery({
     ...queryDef,

src/features/instance/InstanceContext.tsx

@@ -4,7 +4,6 @@ import { toast } from 'react-toastify';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
 import { ContextNotProvided } from 'src/core/contexts/context';
-import { useDisplayError } from 'src/core/errorHandling/DisplayErrorProvider';
 import { useApplicationMetadata } from 'src/features/applicationMetadata/ApplicationMetadataProvider';
 import { useHasPendingScans } from 'src/features/attachments/useHasPendingScans';
 import { invalidateFormDataQueries } from 'src/features/formData/useFormDataQuery';
@@ -18,10 +17,10 @@ import { useOnFormSubmitValidation } from 'src/features/validation/callbacks/onF
 import { Validation } from 'src/features/validation/validationContext';
 import { TaskKeys, useNavigateToTask } from 'src/hooks/useNavigatePage';
 import { doProcessNext } from 'src/queries/queries';
-import { ELEMENT_TYPE, type IActionType, type IProcess } from 'src/types/shared';
 import { isAtLeastVersion } from 'src/utils/versionCompare';
 import type { ApplicationMetadata } from 'src/features/applicationMetadata/types';
 import type { BackendValidationIssue } from 'src/features/validation';
+import type { IActionType, IProcess, ProblemDetails } from 'src/types/shared';
 import type { HttpClientError } from 'src/utils/network/sharedNetworking';
 
 interface ProcessNextProps {
@@ -31,15 +30,14 @@ interface ProcessNextProps {
 export function useProcessNext() {
   const reFetchInstanceData = useStrictInstanceRefetch();
   const language = useCurrentLanguage();
-  const { refetch: refetchProcessData } = useProcessQuery();
+  const { data: process, refetch: refetchProcessData } = useProcessQuery();
   const navigateToTask = useNavigateToTask();
   const instanceId = useLaxInstanceId();
   const onFormSubmitValidation = useOnFormSubmitValidation();
   const updateInitialValidations = useUpdateInitialValidations();
   const setShowAllBackendErrors = Validation.useSetShowAllBackendErrors();
   const onSubmitFormValidation = useOnFormSubmitValidation();
   const applicationMetadata = useApplicationMetadata();
-  const displayError = useDisplayError();
   const queryClient = useQueryClient();
   const hasPendingScans = useHasPendingScans();
 
@@ -93,17 +91,20 @@ export function useProcessNext() {
         }
       }
     },
-    onError: async (error: HttpClientError) => {
+    onError: async (error: HttpClientError<ProblemDetails | undefined>) => {
       window.logError('Process next failed:\n', error);
-      const { data: process } = await refetchProcessData();
-      const currentTask = process?.currentTask;
-      const isCurrentTaskServiceTask = currentTask && currentTask.elementType === ELEMENT_TYPE.SERVICE_TASK;
+      const { data: newProcess } = await refetchProcessData();
+      const newCurrentTask = newProcess?.currentTask;
 
-      if (isCurrentTaskServiceTask) {
-        navigateToTask(currentTask.elementId);
-      } else {
-        displayError(error);
+      if (newCurrentTask?.elementId && newCurrentTask?.elementId !== process?.currentTask?.elementId) {
+        await reFetchInstanceData();
+        navigateToTask(newCurrentTask.elementId);
       }
+
+      toast(<Lang id={error.response?.data?.detail ?? error.message ?? 'process_error.submit_error_please_retry'} />, {
+        type: 'error',
+        autoClose: false,
+      });
     },
   });
 

src/features/instance/useProcessNext.tsx

@@ -22,7 +22,6 @@ import { KeepAliveProvider } from 'src/core/auth/KeepAliveProvider';
 import { AppQueriesProvider } from 'src/core/contexts/AppQueriesProvider';
 import { ProcessingProvider } from 'src/core/contexts/processingContext';
 import { TaskStoreProvider } from 'src/core/contexts/taskStoreContext';
-import { DisplayErrorProvider } from 'src/core/errorHandling/DisplayErrorProvider';
 import { ApplicationMetadataProvider } from 'src/features/applicationMetadata/ApplicationMetadataProvider';
 import { ApplicationSettingsProvider } from 'src/features/applicationSettings/ApplicationSettingsProvider';
 import { UiConfigProvider } from 'src/features/form/layout/UiConfigContext';
@@ -107,11 +106,9 @@ function Root() {
                         <KeepAliveProvider>
                           <HelmetProvider>
                             <TaskStoreProvider>
-                              <DisplayErrorProvider>
-                                <ProcessingProvider>
-                                  <App />
-                                </ProcessingProvider>
-                              </DisplayErrorProvider>
+                              <ProcessingProvider>
+                                <App />
+                              </ProcessingProvider>
                             </TaskStoreProvider>
                             <ToastContainer
                               position='top-center'

src/index.tsx

@@ -12,6 +12,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 { useItemWhenType } from 'src/utils/layout/useNodeItem';
 import type { PropsFromGenericComponent } from 'src/layout';
 import type { CompInternal } from 'src/layout/layout';
@@ -27,7 +28,9 @@ export const ButtonComponent = ({ baseComponentId, ...componentProps }: PropsFro
   const props: IButtonProvidedProps = { baseComponentId, ...componentProps, ...item };
 
   const currentTaskType = useTaskTypeFromBackend();
-  const { actions, write } = useProcessQuery().data?.currentTask || {};
+  const { data: process } = useProcessQuery();
+  const currentTask = process?.currentTask;
+  const { actions, write, elementType: currentElementType } = currentTask ?? {};
   const attachmentState = useAttachmentState();
   const { mutate: processNext, isPending: isProcessingNext } = useProcessNext();
   const { mutate: processConfirm, isPending: isConfirming } = useProcessConfirm();
@@ -52,8 +55,10 @@ export const ButtonComponent = ({ baseComponentId, ...componentProps }: PropsFro
   }
 
   function submitTask() {
+    const isServiceTask = currentElementType === ELEMENT_TYPE.SERVICE_TASK;
+
     setReturnToView?.(undefined);
-    if (currentTaskType === ProcessTaskType.Data) {
+    if (currentTaskType === ProcessTaskType.Data || isServiceTask) {
       processNext();
     } else if (currentTaskType === ProcessTaskType.Confirm) {
       processConfirm();

src/layout/Button/ButtonComponent.tsx

@@ -1,7 +1,8 @@
 import axios from 'axios';
 import type { AxiosError, AxiosRequestConfig, AxiosResponse } from 'axios';
 
-export type HttpClientError = AxiosError;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export type HttpClientError<T = unknown, D = any> = AxiosError<T, D>;
 
 export async function httpGet<T>(url: string, options?: AxiosRequestConfig): Promise<T> {
   const response: AxiosResponse = await axios.get(url, {