n8n-editor-ui 1.68.0 → 1.69.0

package/dist/assets/{pushConnection.store-w_WxpOeH.js → pushConnection.store-C9cp1cmF.js}

@@ -1,4 +1,4 @@
-import { C as createEventBus, R as defineStore, S as STORES, Z as useRootStore, m as useSettingsStore, p as computed, r as ref, W as TIME } from "./index-40I5DMGP.js";
+import { C as createEventBus, R as defineStore, S as STORES, Z as useRootStore, p as useSettingsStore, q as computed, r as ref, W as TIME } from "./index-BcRlEQdt.js";
 const globalLinkActionsEventBus = createEventBus();
 const usePushConnectionStore = defineStore(STORES.PUSH, () => {
   const rootStore = useRootStore();

package/dist/assets/{templateActions-D4EHdA9n.js → templateActions-BM1BlED1.js}

@@ -1,4 +1,4 @@
-import { iE as TEMPLATE_CREDENTIAL_SETUP_EXPERIMENT, fg as assert, V as VIEWS, gz as tryToParseNumber, iI as doesNodeHaveCredentialsToFill, iJ as getNewWorkflow, iK as replaceAllTemplateNodeCredentials, gy as getFixedNodesList } from "./index-40I5DMGP.js";
+import { iE as TEMPLATE_CREDENTIAL_SETUP_EXPERIMENT, fi as assert, V as VIEWS, gB as tryToParseNumber, iI as doesNodeHaveCredentialsToFill, iJ as getNewWorkflow, iK as replaceAllTemplateNodeCredentials, gA as getFixedNodesList } from "./index-BcRlEQdt.js";
 async function createWorkflowFromTemplate(opts) {
   const { credentialOverrides, nodeTypeProvider, rootStore, template, workflowsStore } = opts;
   const workflowData = await getNewWorkflow(rootStore.restApiContext, { name: template.name });

package/dist/assets/{useBugReporting-CFOQlQpP.js → useBugReporting-D4ibEI2f.js}

@@ -1,4 +1,4 @@
-import { hL as useDebugInfo } from "./index-40I5DMGP.js";
+import { hM as useDebugInfo } from "./index-BcRlEQdt.js";
 const BASE_FORUM_URL = "https://github.com/n8n-io/n8n/issues/new?labels=bug-report";
 const REPORT_TEMPLATE = `
 <!-- Please follow the template below. Skip the questions that are not relevant to you. -->

package/dist/assets/{useExecutionDebugging-LQQWXhPj.js → useExecutionDebugging-B9k8m7iG.js}

@@ -1,4 +1,4 @@
-import { b as useRouter, a as useToast, T as useWorkflowsStore, m as useSettingsStore, K as useUIStore, a5 as usePageRedirectionHelper, p as computed, a8 as EnterpriseEditionFeature, aq as h, hC as sanitizeHtml, ae as MODAL_CONFIRM, V as VIEWS, Z as useRootStore, i5 as isFullExecutionResponse, i6 as DEBUG_PAYWALL_MODAL_KEY, ak as useTelemetry, g as useI18n, al as useMessage } from "./index-40I5DMGP.js";
+import { b as useRouter, a as useToast, T as useWorkflowsStore, p as useSettingsStore, K as useUIStore, a5 as usePageRedirectionHelper, q as computed, a8 as EnterpriseEditionFeature, aq as h, hD as sanitizeHtml, ae as MODAL_CONFIRM, V as VIEWS, Z as useRootStore, i5 as isFullExecutionResponse, i6 as DEBUG_PAYWALL_MODAL_KEY, ak as useTelemetry, g as useI18n, al as useMessage } from "./index-BcRlEQdt.js";
 const useExecutionDebugging = () => {
   const telemetry = useTelemetry();
   const router = useRouter();

package/dist/assets/useExecutionHelpers-DYE5_K78.js

@@ -0,0 +1,113 @@
+import { j2 as dateformat, b as useRouter, V as VIEWS, g as useI18n, ak as useTelemetry } from "./index-BcRlEQdt.js";
+const convertToDisplayDateComponents = (fullDate) => {
+  const mask = `d mmm${new Date(fullDate).getFullYear() === (/* @__PURE__ */ new Date()).getFullYear() ? "" : ", yyyy"}#HH:MM:ss`;
+  const formattedDate = dateformat(fullDate, mask);
+  const [date, time] = formattedDate.split("#");
+  return { date, time };
+};
+function convertToDisplayDate(fullDate) {
+  const mask = `d mmm${new Date(fullDate).getFullYear() === (/* @__PURE__ */ new Date()).getFullYear() ? "" : ", yyyy"}#HH:MM:ss`;
+  const formattedDate = dateformat(fullDate, mask);
+  const [date, time] = formattedDate.split("#");
+  return { date, time };
+}
+const toDayMonth = (fullDate) => dateformat(fullDate, "d mmm");
+const toTime = (fullDate) => dateformat(fullDate, "HH:MM:ss");
+function useExecutionHelpers() {
+  const i18n = useI18n();
+  const router = useRouter();
+  const telemetry = useTelemetry();
+  function getUIDetails(execution) {
+    var _a, _b;
+    const status = {
+      name: "unknown",
+      createdAt: ((_a = execution.createdAt) == null ? void 0 : _a.toString()) ?? "",
+      startTime: formatDate(execution.startedAt),
+      label: "Status unknown",
+      runningTime: "",
+      showTimestamp: true,
+      tags: ((_b = execution.annotation) == null ? void 0 : _b.tags) ?? []
+    };
+    if (execution.status === "new") {
+      status.name = "new";
+      status.label = i18n.baseText("executionsList.new");
+      status.showTimestamp = false;
+    } else if (execution.status === "waiting") {
+      status.name = "waiting";
+      status.label = i18n.baseText("executionsList.waiting");
+      status.showTimestamp = false;
+    } else if (execution.status === "canceled") {
+      status.label = i18n.baseText("executionsList.canceled");
+    } else if (execution.status === "running") {
+      status.name = "running";
+      status.label = i18n.baseText("executionsList.running");
+    } else if (execution.status === "success") {
+      status.name = "success";
+      status.label = i18n.baseText("executionsList.succeeded");
+    } else if (execution.status === "error" || execution.status === "crashed") {
+      status.name = "error";
+      status.label = i18n.baseText("executionsList.error");
+    }
+    if (!execution.status) execution.status = "unknown";
+    if (execution.startedAt && execution.stoppedAt) {
+      const stoppedAt = execution.stoppedAt ? new Date(execution.stoppedAt).getTime() : Date.now();
+      status.runningTime = i18n.displayTimer(
+        stoppedAt - new Date(execution.startedAt).getTime(),
+        true
+      );
+    }
+    return status;
+  }
+  function formatDate(fullDate) {
+    const { date, time } = convertToDisplayDate(fullDate);
+    return i18n.baseText("executionsList.started", { interpolate: { time, date } });
+  }
+  function isExecutionRetriable(execution) {
+    return ["crashed", "error"].includes(execution.status) && !execution.retrySuccessId;
+  }
+  function openExecutionInNewTab(executionId, workflowId) {
+    const route = router.resolve({
+      name: VIEWS.EXECUTION_PREVIEW,
+      params: { name: workflowId, executionId }
+    });
+    window.open(route.href, "_blank");
+  }
+  function resolveRelatedExecutionUrl(metadata) {
+    const info = metadata.parentExecution || metadata.subExecution;
+    if (!info) {
+      return "";
+    }
+    const { workflowId, executionId } = info;
+    return router.resolve({
+      name: VIEWS.EXECUTION_PREVIEW,
+      params: { name: workflowId, executionId }
+    }).fullPath;
+  }
+  function trackOpeningRelatedExecution(metadata, view) {
+    const info = metadata.parentExecution || metadata.subExecution;
+    if (!info) {
+      return;
+    }
+    telemetry.track(
+      metadata.parentExecution ? "User clicked parent execution button" : "User clicked inspect sub-workflow",
+      {
+        view
+      }
+    );
+  }
+  return {
+    getUIDetails,
+    formatDate,
+    isExecutionRetriable,
+    openExecutionInNewTab,
+    trackOpeningRelatedExecution,
+    resolveRelatedExecutionUrl
+  };
+}
+export {
+  toTime as a,
+  convertToDisplayDate as b,
+  convertToDisplayDateComponents as c,
+  toDayMonth as t,
+  useExecutionHelpers as u
+};

package/dist/assets/useGlobalEntityCreation-DtWHHZf8.js

@@ -0,0 +1,168 @@
+import { a1 as useProjectsStore, a0 as useSourceControlStore, b as useRouter, a as useToast, q as computed, aH as sortByProperty, V as VIEWS, cV as toValue, a5 as usePageRedirectionHelper, g as useI18n, am as getResourcePermissions } from "./index-BcRlEQdt.js";
+const useGlobalEntityCreation = (multipleProjects = true) => {
+  const CREATE_PROJECT_ID = "create-project";
+  const projectsStore = useProjectsStore();
+  const sourceControlStore = useSourceControlStore();
+  const router = useRouter();
+  const i18n = useI18n();
+  const toast = useToast();
+  const displayProjects = computed(
+    () => sortByProperty(
+      "name",
+      projectsStore.myProjects.filter((p) => p.type === "team")
+    )
+  );
+  const disabledWorkflow = (scopes = []) => sourceControlStore.preferences.branchReadOnly || !getResourcePermissions(scopes).workflow.create;
+  const disabledCredential = (scopes = []) => sourceControlStore.preferences.branchReadOnly || !getResourcePermissions(scopes).credential.create;
+  const menu = computed(() => {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+    if (!projectsStore.canCreateProjects) {
+      return [
+        {
+          id: "workflow",
+          title: "Workflow",
+          route: {
+            name: VIEWS.NEW_WORKFLOW,
+            query: {
+              projectId: (_a = projectsStore.personalProject) == null ? void 0 : _a.id
+            }
+          }
+        },
+        {
+          id: "credential",
+          title: "Credential",
+          route: {
+            name: VIEWS.CREDENTIALS,
+            params: {
+              projectId: (_b = projectsStore.personalProject) == null ? void 0 : _b.id,
+              credentialId: "create"
+            }
+          }
+        }
+      ];
+    }
+    if (!toValue(multipleProjects)) {
+      return [
+        {
+          id: "workflow",
+          title: "Workflow",
+          disabled: disabledWorkflow((_c = projectsStore.currentProject) == null ? void 0 : _c.scopes),
+          route: {
+            name: VIEWS.NEW_WORKFLOW,
+            query: {
+              projectId: (_d = projectsStore.currentProject) == null ? void 0 : _d.id
+            }
+          }
+        },
+        {
+          id: "credential",
+          title: "Credential",
+          disabled: disabledCredential((_e = projectsStore.currentProject) == null ? void 0 : _e.scopes),
+          route: {
+            name: VIEWS.PROJECTS_CREDENTIALS,
+            params: {
+              projectId: (_f = projectsStore.currentProject) == null ? void 0 : _f.id,
+              credentialId: "create"
+            }
+          }
+        }
+      ];
+    }
+    return [
+      {
+        id: "workflow",
+        title: "Workflow",
+        submenu: [
+          {
+            id: "workflow-title",
+            title: "Create in",
+            disabled: true
+          },
+          {
+            id: "workflow-personal",
+            title: i18n.baseText("projects.menu.personal"),
+            icon: "user",
+            disabled: disabledWorkflow((_g = projectsStore.personalProject) == null ? void 0 : _g.scopes),
+            route: {
+              name: VIEWS.NEW_WORKFLOW,
+              query: { projectId: (_h = projectsStore.personalProject) == null ? void 0 : _h.id }
+            }
+          },
+          ...displayProjects.value.map((project) => ({
+            id: `workflow-${project.id}`,
+            title: project.name,
+            icon: "layer-group",
+            disabled: disabledWorkflow(project.scopes),
+            route: {
+              name: VIEWS.NEW_WORKFLOW,
+              query: { projectId: project.id }
+            }
+          }))
+        ]
+      },
+      {
+        id: "credential",
+        title: "Credential",
+        submenu: [
+          {
+            id: "credential-title",
+            title: "Create in",
+            disabled: true
+          },
+          {
+            id: "credential-personal",
+            title: i18n.baseText("projects.menu.personal"),
+            icon: "user",
+            disabled: disabledCredential((_i = projectsStore.personalProject) == null ? void 0 : _i.scopes),
+            route: {
+              name: VIEWS.PROJECTS_CREDENTIALS,
+              params: { projectId: (_j = projectsStore.personalProject) == null ? void 0 : _j.id, credentialId: "create" }
+            }
+          },
+          ...displayProjects.value.map((project) => ({
+            id: `credential-${project.id}`,
+            title: project.name,
+            icon: "layer-group",
+            disabled: disabledCredential(project.scopes),
+            route: {
+              name: VIEWS.PROJECTS_CREDENTIALS,
+              params: { projectId: project.id, credentialId: "create" }
+            }
+          }))
+        ]
+      },
+      {
+        id: CREATE_PROJECT_ID,
+        title: "Project"
+      }
+    ];
+  });
+  const createProject = async () => {
+    try {
+      const newProject = await projectsStore.createProject({
+        name: i18n.baseText("projects.settings.newProjectName")
+      });
+      await router.push({ name: VIEWS.PROJECT_SETTINGS, params: { projectId: newProject.id } });
+      toast.showMessage({
+        title: i18n.baseText("projects.settings.save.successful.title", {
+          interpolate: { projectName: newProject.name }
+        }),
+        type: "success"
+      });
+    } catch (error) {
+      toast.showError(error, i18n.baseText("projects.error.title"));
+    }
+  };
+  const handleSelect = (id) => {
+    if (id !== CREATE_PROJECT_ID) return;
+    if (projectsStore.canCreateProjects) {
+      void createProject();
+      return;
+    }
+    void usePageRedirectionHelper().goToUpgrade("rbac", "upgrade-rbac");
+  };
+  return { menu, handleSelect };
+};
+export {
+  useGlobalEntityCreation as u
+};

package/dist/assets/{useNodeViewVersionSwitcher-BLo5Qp-N.js → useNodeViewVersionSwitcher-CSLoLUvW.js}

@@ -1,4 +1,4 @@
-import { K as useUIStore, $ as useCanvasStore, r as ref, p as computed, V as VIEWS, g as useI18n, at as useNDVStore, T as useWorkflowsStore, m as useSettingsStore, hJ as refDebounced, hK as useLocalStorage, ak as useTelemetry } from "./index-40I5DMGP.js";
+import { K as useUIStore, $ as useCanvasStore, r as ref, q as computed, V as VIEWS, g as useI18n, at as useNDVStore, T as useWorkflowsStore, p as useSettingsStore, hK as refDebounced, hL as useLocalStorage, ak as useTelemetry } from "./index-BcRlEQdt.js";
 function useBeforeUnload({ route }) {
   const uiStore = useUIStore();
   const canvasStore = useCanvasStore();

package/dist/assets/{usePushConnection-B5ija5f5.js → usePushConnection-BLi9GBVo.js}

@@ -1,5 +1,5 @@
-import { iY as makeRestApiRequest, R as defineStore, Z as useRootStore, d as defineComponent, c as openBlock, h as createElementBlock, k as createTextVNode, t as toDisplayString, j as createBaseVNode, A as unref, g as useI18n, a4 as useWorkflowHelpers, bg as useNodeHelpers, a as useToast, dS as useCredentialsStore, bf as useNodeTypesStore, m as useSettingsStore, K as useUIStore, T as useWorkflowsStore, hP as useAssistantStore, r as ref, iZ as parse, i_ as codeNodeEditorEventBus, ag as WORKFLOW_SETTINGS_MODAL_KEY, gw as generateNodesGraph, aq as h, eV as getTriggerNodeServiceName, aK as useExternalHooks, ak as useTelemetry } from "./index-40I5DMGP.js";
-import { u as usePushConnectionStore, g as globalLinkActionsEventBus } from "./pushConnection.store-w_WxpOeH.js";
+import { iY as makeRestApiRequest, R as defineStore, Z as useRootStore, d as defineComponent, cF as resolveDirective, c as openBlock, h as createElementBlock, ax as withDirectives, j as createBaseVNode, t as toDisplayString, l as unref, g as useI18n, a4 as useWorkflowHelpers, bi as useNodeHelpers, a as useToast, dU as useCredentialsStore, bh as useNodeTypesStore, p as useSettingsStore, K as useUIStore, T as useWorkflowsStore, hQ as useAssistantStore, r as ref, iZ as parse, i_ as codeNodeEditorEventBus, ag as WORKFLOW_SETTINGS_MODAL_KEY, gy as generateNodesGraph, aq as h, eX as getTriggerNodeServiceName, aM as useExternalHooks, ak as useTelemetry } from "./index-BcRlEQdt.js";
+import { u as usePushConnectionStore, g as globalLinkActionsEventBus } from "./pushConnection.store-C9cp1cmF.js";
 const GET_STATUS_ENDPOINT = "/orchestration/worker/status";
 const sendGetWorkerStatus = async (context) => {
   await makeRestApiRequest(context, "POST", GET_STATUS_ENDPOINT);
@@ -62,7 +62,8 @@ const useOrchestrationStore = defineStore("orchestrationManager", {
     }
   }
 });
-const _hoisted_1 = ["data-action-parameter-node"];
+const _hoisted_1 = { "data-test-id": "sanitized-error-message" };
+const _hoisted_2 = ["data-action-parameter-node"];
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "NodeExecutionErrorMessage",
   props: {
@@ -72,13 +73,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props) {
     const i18n = useI18n();
     return (_ctx, _cache) => {
+      const _directive_n8n_html = resolveDirective("n8n-html");
       return openBlock(), createElementBlock("div", null, [
-        createTextVNode(toDisplayString(_ctx.errorMessage), 1),
+        withDirectives(createBaseVNode("span", _hoisted_1, null, 512), [
+          [_directive_n8n_html, _ctx.errorMessage]
+        ]),
         _cache[0] || (_cache[0] = createBaseVNode("br", null, null, -1)),
         createBaseVNode("a", {
           "data-action": "openNodeDetail",
           "data-action-parameter-node": _ctx.nodeName
-        }, toDisplayString(unref(i18n).baseText("node.executionError.openNode")), 9, _hoisted_1)
+        }, toDisplayString(unref(i18n).baseText("node.executionError.openNode")), 9, _hoisted_2)
       ]);
     };
   }
@@ -110,8 +114,8 @@ function usePushConnection({ router }) {
       removeEventListener.value();
     }
   }
-  function queuePushMessage(event2, retryAttempts) {
-    pushMessageQueue.value.push({ message: event2, retriesLeft: retryAttempts });
+  function queuePushMessage(event, retryAttempts) {
+    pushMessageQueue.value.push({ message: event, retriesLeft: retryAttempts });
     if (retryTimeout.value === null) {
       retryTimeout.value = setTimeout(processWaitingPushMessages, 20);
     }
@@ -138,7 +142,7 @@ function usePushConnection({ router }) {
     }
   }
   async function pushMessageReceived(receivedData, isRetry) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
     const retryAttempts = 5;
     if (receivedData.type === "sendWorkerStatusMessage") {
       const pushData = receivedData.data;
@@ -161,52 +165,11 @@ function usePushConnection({ router }) {
       const pushData = receivedData.data;
       if (workflowsStore.activeExecutionId !== pushData.executionId) {
         if (isRetry !== true) {
-          queuePushMessage(event, retryAttempts);
+          queuePushMessage(receivedData, retryAttempts);
         }
         return false;
       }
     }
-    let recoveredPushData = void 0;
-    if (receivedData.type === "executionRecovered") {
-      const recoveredExecutionId = (_a = receivedData.data) == null ? void 0 : _a.executionId;
-      const isWorkflowRunning = uiStore.isActionActive["workflowRunning"];
-      if (isWorkflowRunning && workflowsStore.activeExecutionId === recoveredExecutionId) {
-        const executionData = await workflowsStore.fetchExecutionDataById(
-          workflowsStore.activeExecutionId
-        );
-        if (executionData == null ? void 0 : executionData.data) {
-          executionData.data = parse(executionData.data);
-          const iRunExecutionData = {
-            startData: (_b = executionData.data) == null ? void 0 : _b.startData,
-            resultData: ((_c = executionData.data) == null ? void 0 : _c.resultData) ?? { runData: {} },
-            executionData: (_d = executionData.data) == null ? void 0 : _d.executionData
-          };
-          if (((_e = workflowsStore.workflowExecutionData) == null ? void 0 : _e.workflowId) === executionData.workflowId) {
-            const activeRunData = (_h = (_g = (_f = workflowsStore.workflowExecutionData) == null ? void 0 : _f.data) == null ? void 0 : _g.resultData) == null ? void 0 : _h.runData;
-            if (activeRunData) {
-              for (const key of Object.keys(activeRunData)) {
-                iRunExecutionData.resultData.runData[key] = activeRunData[key];
-              }
-            }
-          }
-          const iRun = {
-            data: iRunExecutionData,
-            finished: executionData.finished,
-            mode: executionData.mode,
-            waitTill: (_i = executionData.data) == null ? void 0 : _i.waitTill,
-            startedAt: executionData.startedAt,
-            stoppedAt: executionData.stoppedAt,
-            status: "crashed"
-          };
-          if (executionData.data) {
-            recoveredPushData = {
-              executionId: executionData.id,
-              data: iRun
-            };
-          }
-        }
-      }
-    }
     if (receivedData.type === "workflowFailedToActivate" && workflowsStore.workflowId === receivedData.data.workflowId) {
       workflowsStore.setWorkflowInactive(receivedData.data.workflowId);
       workflowsStore.setActive(false);
@@ -227,37 +190,37 @@ function usePushConnection({ router }) {
       return true;
     }
     if (receivedData.type === "executionFinished" || receivedData.type === "executionRecovered") {
-      let pushData;
-      if (receivedData.type === "executionRecovered" && recoveredPushData !== void 0) {
-        pushData = recoveredPushData;
-      } else {
-        pushData = receivedData.data;
-      }
-      const { activeExecutionId } = workflowsStore;
-      if (activeExecutionId === pushData.executionId) {
-        const activeRunData = (_l = (_k = (_j = workflowsStore.workflowExecutionData) == null ? void 0 : _j.data) == null ? void 0 : _k.resultData) == null ? void 0 : _l.runData;
-        if (activeRunData) {
-          for (const key of Object.keys(activeRunData)) {
-            if (((_w = (_v = (_u = (_t = (_s = (_r = (_q = (_p = (_o = (_n = (_m = pushData.data) == null ? void 0 : _m.data) == null ? void 0 : _n.resultData) == null ? void 0 : _o.runData) == null ? void 0 : _p[key]) == null ? void 0 : _q[0]) == null ? void 0 : _r.data) == null ? void 0 : _s.main) == null ? void 0 : _t[0]) == null ? void 0 : _u[0]) == null ? void 0 : _v.json) == null ? void 0 : _w.isArtificialRecoveredEventItem) === true && activeRunData[key].length > 0)
-              pushData.data.data.resultData.runData[key] = activeRunData[key];
-          }
-        }
-        workflowsStore.finishActiveExecution(pushData);
-      }
       if (!uiStore.isActionActive["workflowRunning"]) {
         return false;
       }
-      if (activeExecutionId !== pushData.executionId) {
+      const { executionId } = receivedData.data;
+      const { activeExecutionId } = workflowsStore;
+      if (executionId !== activeExecutionId) {
         if (isRetry !== true) {
-          queuePushMessage(event, retryAttempts);
+          queuePushMessage(receivedData, retryAttempts);
         }
         return false;
       }
-      const runDataExecuted = pushData.data;
-      let runDataExecutedErrorMessage = getExecutionError(runDataExecuted.data);
-      if (runDataExecuted.status === "crashed") {
+      const executionData = await workflowsStore.fetchExecutionDataById(executionId);
+      if (!(executionData == null ? void 0 : executionData.data)) return false;
+      executionData.data = parse(executionData.data);
+      const iRunExecutionData = {
+        startData: (_a = executionData.data) == null ? void 0 : _a.startData,
+        resultData: ((_b = executionData.data) == null ? void 0 : _b.resultData) ?? { runData: {} },
+        executionData: (_c = executionData.data) == null ? void 0 : _c.executionData
+      };
+      if (((_d = workflowsStore.workflowExecutionData) == null ? void 0 : _d.workflowId) === executionData.workflowId) {
+        const activeRunData = (_g = (_f = (_e = workflowsStore.workflowExecutionData) == null ? void 0 : _e.data) == null ? void 0 : _f.resultData) == null ? void 0 : _g.runData;
+        if (activeRunData) {
+          for (const key of Object.keys(activeRunData)) {
+            iRunExecutionData.resultData.runData[key] = activeRunData[key];
+          }
+        }
+      }
+      let runDataExecutedErrorMessage = getExecutionError(iRunExecutionData);
+      if (executionData.status === "crashed") {
         runDataExecutedErrorMessage = i18n.baseText("pushConnection.executionFailed.message");
-      } else if (runDataExecuted.status === "canceled") {
+      } else if (executionData.status === "canceled") {
         runDataExecutedErrorMessage = i18n.baseText(
           "executionsList.showMessage.stopExecution.message",
           {
@@ -265,10 +228,10 @@ function usePushConnection({ router }) {
           }
         );
       }
-      const lineNumber = (_z = (_y = (_x = runDataExecuted == null ? void 0 : runDataExecuted.data) == null ? void 0 : _x.resultData) == null ? void 0 : _y.error) == null ? void 0 : _z.lineNumber;
+      const lineNumber = (_i = (_h = iRunExecutionData.resultData) == null ? void 0 : _h.error) == null ? void 0 : _i.lineNumber;
       codeNodeEditorEventBus.emit("highlightLine", lineNumber ?? "final");
       const workflow = workflowHelpers.getCurrentWorkflow();
-      if (runDataExecuted.waitTill !== void 0) {
+      if (((_j = executionData.data) == null ? void 0 : _j.waitTill) !== void 0) {
         const workflowSettings = workflowsStore.workflowSettings;
         const saveManualExecutions = settingsStore.saveManualExecutions;
         const isSavingExecutions = workflowSettings.saveManualExecutions === void 0 ? saveManualExecutions : workflowSettings.saveManualExecutions;
@@ -282,10 +245,10 @@ function usePushConnection({ router }) {
           });
         }
         workflowHelpers.setDocumentTitle(workflow.name, "IDLE");
-      } else if (runDataExecuted.finished !== true) {
+      } else if (executionData.finished !== true) {
         workflowHelpers.setDocumentTitle(workflow.name, "ERROR");
-        if (((_A = runDataExecuted.data.resultData.error) == null ? void 0 : _A.name) === "ExpressionError" && runDataExecuted.data.resultData.error.functionality === "pairedItem") {
-          const error = runDataExecuted.data.resultData.error;
+        if (((_k = iRunExecutionData.resultData.error) == null ? void 0 : _k.name) === "ExpressionError" && iRunExecutionData.resultData.error.functionality === "pairedItem") {
+          const error = iRunExecutionData.resultData.error;
           void workflowHelpers.getWorkflowDataToSave().then((workflowData) => {
             const eventData = {
               caused_by_credential: false,
@@ -317,8 +280,8 @@ function usePushConnection({ router }) {
             });
           });
         }
-        if (((_B = runDataExecuted.data.resultData.error) == null ? void 0 : _B.name) === "SubworkflowOperationError") {
-          const error = runDataExecuted.data.resultData.error;
+        if (((_l = iRunExecutionData.resultData.error) == null ? void 0 : _l.name) === "SubworkflowOperationError") {
+          const error = iRunExecutionData.resultData.error;
           workflowsStore.subWorkflowExecutionError = error;
           toast.showMessage({
             title: error.message,
@@ -326,9 +289,9 @@ function usePushConnection({ router }) {
             type: "error",
             duration: 0
           });
-        } else if ((((_C = runDataExecuted.data.resultData.error) == null ? void 0 : _C.name) === "NodeOperationError" || ((_D = runDataExecuted.data.resultData.error) == null ? void 0 : _D.name) === "NodeApiError") && runDataExecuted.data.resultData.error.functionality === "configuration-node") {
+        } else if ((((_m = iRunExecutionData.resultData.error) == null ? void 0 : _m.name) === "NodeOperationError" || ((_n = iRunExecutionData.resultData.error) == null ? void 0 : _n.name) === "NodeApiError") && iRunExecutionData.resultData.error.functionality === "configuration-node") {
           let title;
-          const nodeError = runDataExecuted.data.resultData.error;
+          const nodeError = iRunExecutionData.resultData.error;
           if (nodeError.node.name) {
             title = `Error in sub-node ‘${nodeError.node.name}‘`;
           } else {
@@ -345,15 +308,15 @@ function usePushConnection({ router }) {
           });
         } else {
           let title;
-          const isManualExecutionCancelled = runDataExecuted.mode === "manual" && runDataExecuted.status === "canceled";
+          const isManualExecutionCancelled = executionData.mode === "manual" && executionData.status === "canceled";
           if (isManualExecutionCancelled) {
             toast.showMessage({
               title: i18n.baseText("nodeView.showMessage.stopExecutionTry.title"),
               type: "success"
             });
           } else {
-            if (runDataExecuted.data.resultData.lastNodeExecuted) {
-              title = `Problem in node ‘${runDataExecuted.data.resultData.lastNodeExecuted}‘`;
+            if (iRunExecutionData.resultData.lastNodeExecuted) {
+              title = `Problem in node ‘${iRunExecutionData.resultData.lastNodeExecuted}‘`;
             } else {
               title = "Problem executing workflow";
             }
@@ -361,7 +324,8 @@ function usePushConnection({ router }) {
               title,
               message: runDataExecutedErrorMessage,
               type: "error",
-              duration: 0
+              duration: 0,
+              dangerouslyUseHTMLString: true
             });
           }
         }
@@ -371,7 +335,7 @@ function usePushConnection({ router }) {
         if (execution == null ? void 0 : execution.executedNode) {
           const node = workflowsStore.getNodeByName(execution.executedNode);
           const nodeType = node && nodeTypesStore.getNodeType(node.type, node.typeVersion);
-          const nodeOutput = execution && execution.executedNode && ((_G = (_F = (_E = execution.data) == null ? void 0 : _E.resultData) == null ? void 0 : _F.runData) == null ? void 0 : _G[execution.executedNode]);
+          const nodeOutput = execution && execution.executedNode && ((_q = (_p = (_o = execution.data) == null ? void 0 : _o.resultData) == null ? void 0 : _p.runData) == null ? void 0 : _q[execution.executedNode]);
           if ((nodeType == null ? void 0 : nodeType.polling) && !nodeOutput) {
             toast.showMessage({
               title: i18n.baseText("pushConnection.pollingNode.dataNotFound", {
@@ -400,41 +364,29 @@ function usePushConnection({ router }) {
         }
       }
       if (workflowsStore.getWorkflowRunData) {
-        runDataExecuted.data.resultData.runData = workflowsStore.getWorkflowRunData;
+        iRunExecutionData.resultData.runData = workflowsStore.getWorkflowRunData;
       }
       workflowsStore.executingNode.length = 0;
-      workflowsStore.setWorkflowExecutionData(runDataExecuted);
+      workflowsStore.setWorkflowExecutionData(executionData);
       uiStore.removeActiveAction("workflowRunning");
       nodeHelpers.updateNodesExecutionIssues();
-      const lastNodeExecuted = runDataExecuted.data.resultData.lastNodeExecuted;
+      const lastNodeExecuted = iRunExecutionData.resultData.lastNodeExecuted;
       let itemsCount = 0;
-      if (lastNodeExecuted && runDataExecuted.data.resultData.runData[lastNodeExecuted] && !runDataExecutedErrorMessage) {
-        itemsCount = runDataExecuted.data.resultData.runData[lastNodeExecuted][0].data.main[0].length;
+      if (lastNodeExecuted && iRunExecutionData.resultData.runData[lastNodeExecuted] && !runDataExecutedErrorMessage) {
+        itemsCount = iRunExecutionData.resultData.runData[lastNodeExecuted][0].data.main[0].length;
       }
       void useExternalHooks().run("pushConnection.executionFinished", {
         itemsCount,
-        nodeName: runDataExecuted.data.resultData.lastNodeExecuted,
+        nodeName: iRunExecutionData.resultData.lastNodeExecuted,
         errorMessage: runDataExecutedErrorMessage,
-        runDataExecutedStartData: runDataExecuted.data.startData,
-        resultDataError: runDataExecuted.data.resultData.error
+        runDataExecutedStartData: iRunExecutionData.startData,
+        resultDataError: iRunExecutionData.resultData.error
       });
-    } else if (receivedData.type === "executionStarted") {
-      const pushData = receivedData.data;
-      const executionData = {
-        id: pushData.executionId,
-        finished: false,
-        status: "running",
-        mode: pushData.mode,
-        startedAt: pushData.startedAt,
-        retryOf: pushData.retryOf,
-        workflowId: pushData.workflowId,
-        workflowName: pushData.workflowName
-      };
-      workflowsStore.addActiveExecution(executionData);
-    } else if (receivedData.type === "nodeExecuteAfter") {
+    } else if (receivedData.type === "executionWaiting") ;
+    else if (receivedData.type === "executionStarted") ;
+    else if (receivedData.type === "nodeExecuteAfter") {
       const pushData = receivedData.data;
-      workflowsStore.addNodeExecutionData(pushData);
-      workflowsStore.removeExecutingNode(pushData.nodeName);
+      workflowsStore.updateNodeExecutionData(pushData);
       void assistantStore.onNodeExecution(pushData);
     } else if (receivedData.type === "nodeExecuteBefore") {
       const pushData = receivedData.data;