@orchestrator-ui/orchestrator-ui-components 6.1.1 → 6.2.1

package/src/messages/nl-NL.json

@@ -249,8 +249,11 @@
             "submitTaskFormLabel": "Verstuur het formulier om deze taak te starten",
             "submitWorkflowFormLabel": "Verstuur het formulier om deze workflow te starten",
             "traceback": "Traceback",
-            "tableView": "Tabelweergave",
-            "jsonView": "JSON weergave"
+            "codeView": {
+                "json": "JSON",
+                "table": "Tab",
+                "raw": "Raw"
+            }
         },
         "delta": {
             "title": "Subscription delta",

package/src/pages/processes/WfoProcessDetail.tsx

@@ -1,4 +1,4 @@
-import React, { useContext } from 'react';
+import React, { useContext, useEffect, useRef } from 'react';
 
 import { useTranslations } from 'next-intl';
 import { useRouter } from 'next/router';
@@ -88,6 +88,18 @@ interface ProcessDetailProps {
     hasError?: boolean;
 }
 
+function useHasPreviousRoute() {
+    const hasPrev = useRef(false);
+
+    useEffect(() => {
+        if (document.referrer && document.referrer !== window.location.href) {
+            hasPrev.current = true;
+        }
+    }, []);
+
+    return hasPrev.current;
+}
+
 export const WfoProcessDetail = ({
     children,
     processDetail,
@@ -105,6 +117,7 @@ export const WfoProcessDetail = ({
     const [retryProcess] = useRetryProcessMutation();
     const [deleteProcess] = useDeleteProcessMutation();
     const [abortProcess] = useAbortProcessMutation();
+    const hasPreviousRoute = useHasPreviousRoute();
 
     const router = useRouter();
     const { isEngineRunningNow } = useCheckEngineStatus();
@@ -177,7 +190,12 @@ export const WfoProcessDetail = ({
                 if (processDetail?.processId) {
                     abortProcess({ processId: processDetail.processId });
                 }
-                router.push(processIsTask ? PATH_TASKS : PATH_WORKFLOWS);
+
+                if (hasPreviousRoute) {
+                    router.back();
+                } else {
+                    router.push(processIsTask ? PATH_TASKS : PATH_WORKFLOWS);
+                }
             },
         });
 

package/src/rtk/slices/toastMessages.ts

@@ -1,7 +1,7 @@
 import { createSlice } from '@reduxjs/toolkit';
 import type { PayloadAction, Reducer, Slice } from '@reduxjs/toolkit';
 
-import { Toast } from '@/types';
+import type { Toast } from '@/types';
 
 export type ToastState = {
     messages: Toast[];

package/src/types/types.ts

@@ -1,7 +1,5 @@
 import { ReactNode } from 'react';
 
-import { Toast } from '@elastic/eui/src/components/toast/global_toast_list';
-
 import { FormUserPermissions, InputForm } from './forms';
 
 export type Nullable<T> = T | null;
@@ -570,13 +568,14 @@ export type ExternalService = {
 
 export type WfoTreeNodeMap = { [key: number]: TreeBlock };
 
-export type { Toast };
-
 export enum ToastTypes {
     ERROR = 'ERROR',
     SUCCESS = 'SUCCESS',
 }
-
+export type Toast = {
+    id: string;
+    [key: string]: unknown;
+};
 export enum Environment {
     DEVELOPMENT = 'Development',
     PRODUCTION = 'Production',

package/src/utils/getToastMessage.ts

@@ -1,10 +1,12 @@
-import { ToastTypes } from '../types';
-import type { Toast } from '../types';
+import { ReactNode } from 'react';
+
+import { ToastTypes } from '@/types';
+import type { Toast } from '@/types';
 
 export const getToastMessage = (
     type: ToastTypes,
-    text: string, // We use string here instead of Toast['text'] because we want to prevent passing in react component because they trigger an "unsynchronizable values in payload detected" error',
-    title: string, // same as above for string instead of Toast['title']
+    text: ReactNode,
+    title: string,
 ) => {
     const getTypeProps = (type: ToastTypes): Partial<Toast> => {
         switch (type) {