Merge remote-tracking branch 'origin/staging' into add-standard-devia…

…tion-and-variance-aggregations
TouK · Dec 12, 2024 · ec2dbd3 · ec2dbd3
2 parents c8f2e76 + 671cc85
commit ec2dbd3
Show file tree

Hide file tree

Showing 68 changed files with 857 additions and 501 deletions.
diff --git a/designer/client/cypress/e2e/connectionError.cy.ts b/designer/client/cypress/e2e/connectionError.cy.ts
@@ -82,12 +82,12 @@ describe("Connection error", () => {
 
         const statusIntervalTick = 10000;
         const visibleStatusToastMessageBeforeConnectionError = () => {
-            cy.intercept("/api/processes/*/status", { statusCode: 502 });
+            cy.intercept("/api/processes/*/status?currentlyPresentedVersionId=*", { statusCode: 502 });
 
             // Check if the status toast message is not visible after the backend connection issue. We need to speed up interval to not wait 12s for a request
             cy.contains(/Cannot fetch status/).should("be.visible");
 
-            cy.intercept("/api/processes/*/status", (req) => {
+            cy.intercept("/api/processes/*/status?currentlyPresentedVersionId=*", (req) => {
                 req.continue();
             });
         };

diff --git a/designer/client/package-lock.json b/designer/client/package-lock.json
diff --git a/designer/client/package.json b/designer/client/package.json
@@ -159,7 +159,7 @@
         "babel-loader": "8.2.3",
         "babel-plugin-istanbul": "6.1.1",
         "chalk": "4.1.2",
-        "chevrotain": "11.0.3",
+        "chevrotain": "10.5.0",
         "color": "4.2.0",
         "copy-webpack-plugin": "11.0.0",
         "crypto-browserify": "3.12.0",

diff --git a/designer/client/src/actions/nk/process.ts b/designer/client/src/actions/nk/process.ts
@@ -26,9 +26,9 @@ export function fetchProcessToDisplay(processName: ProcessName, versionId?: Proc
     };
 }
 
-export function loadProcessState(processName: ProcessName): ThunkAction {
+export function loadProcessState(processName: ProcessName, processVersionId: number): ThunkAction {
     return (dispatch) =>
-        HttpService.fetchProcessState(processName).then(({ data }) =>
+        HttpService.fetchProcessState(processName, processVersionId).then(({ data }) =>
             dispatch({
                 type: "PROCESS_STATE_LOADED",
                 processState: data,

diff --git a/designer/client/src/components/graph/PanZoomPlugin.ts b/designer/client/src/components/graph/PanZoomPlugin.ts
@@ -1,11 +1,11 @@
 /* @refresh reset */
 import { dia, g } from "jointjs";
 import { throttle } from "lodash";
+import { isVisualTesting } from "../../devHelpers";
 import { GlobalCursor } from "./GlobalCursor";
 import { select, Selection } from "d3-selection";
 import { D3ZoomEvent, zoom, ZoomBehavior, ZoomedElementBaseType, zoomIdentity, ZoomTransform } from "d3-zoom";
 import { rafThrottle } from "./rafThrottle";
-import { isVisualTesting } from "../toolbarSettings/DEV_TOOLBARS";
 
 function isModified(event: MouseEvent | TouchEvent) {
     return event.shiftKey || event.ctrlKey || event.altKey || event.metaKey;