Merge branch 'staging' into preview/aggregate-ui

designer/client/cypress/support/process.ts

@@ -310,12 +310,13 @@ function layoutScenario(waitTime = 600) {
 function deployScenario(comment = "issues/123", withScreenshot?: boolean) {
     cy.contains(/^deploy$/i).click();
     cy.intercept("POST", "/api/processManagement/deploy/*").as("deploy");
+    cy.intercept("GET", "/api/processes/*/activity/activities").as("activities");
     if (withScreenshot) {
         cy.get("[data-testid=window]").matchImage();
     }
     cy.get("[data-testid=window] textarea").click().type(comment);
     cy.contains(/^ok$/i).should("be.enabled").click();
-    cy.wait(["@deploy", "@fetch"], {
+    cy.wait(["@deploy", "@activities"], {
         timeout: 20000,
         log: true,
     }).each((res) => {

designer/client/src/actions/actionTypes.ts

@@ -26,7 +26,6 @@ export type ActionTypes =
     | "UPDATE_TEST_CAPABILITIES"
     | "UPDATE_TEST_FORM_PARAMETERS"
     | "DISPLAY_PROCESS"
-    | "DISPLAY_PROCESS_ACTIVITY"
     | "GET_SCENARIO_ACTIVITIES"
     | "UPDATE_SCENARIO_ACTIVITIES"
     | "PROCESS_FETCH"

designer/client/src/actions/nk/assignSettings.ts

@@ -32,7 +32,7 @@ export type FeaturesSettings = {
     remoteEnvironment: { targetEnvironmentId: string };
     environmentAlert: EnvironmentTagSettings;
     commentSettings: { substitutionPattern: string; substitutionLink: string };
-    deploymentCommentSettings?: { exampleComment: string };
+    deploymentCommentSettings?: { exampleComment: string } | null;
     intervalTimeSettings: { processes: number; healthCheck: number }; // TODO: verify usage
     tabs: DynamicTabData[];
     testDataSettings?: TestDataSettings;

designer/client/src/actions/nk/fetchVisualizationData.ts

@@ -1,6 +1,5 @@
 import { ThunkAction } from "../reduxTypes";
 import { displayCurrentProcessVersion } from "./process";
-import { displayProcessActivity } from "./displayProcessActivity";
 import { fetchProcessDefinition } from "./processDefinitionData";
 import { loadProcessToolbarsConfiguration } from "./loadProcessToolbarsConfiguration";
 import { ProcessName } from "../../components/Process/types";
@@ -11,7 +10,6 @@ export function fetchVisualizationData(processName: ProcessName, onSuccess: () =
             const scenario = await dispatch(displayCurrentProcessVersion(processName));
             const { name, isFragment, processingType } = scenario;
             await dispatch(loadProcessToolbarsConfiguration(name));
-            dispatch(displayProcessActivity(name));
             const processDefinitionData = await dispatch(fetchProcessDefinition(processingType, isFragment));
             dispatch({ type: "CORRECT_INVALID_SCENARIO", processDefinitionData });
             onSuccess();

designer/client/src/actions/nk/index.ts

@@ -1,7 +1,5 @@
 export * from "./assignSettings";
 export * from "./assignUser";
-export * from "./comment";
-export * from "./displayProcessActivity";
 export * from "./displayProcessCounts";
 export * from "./editNode";
 export * from "./importExport";

designer/client/src/actions/nk/process.ts

@@ -6,7 +6,6 @@ import { getProcessDefinitionData } from "../../reducers/selectors/settings";
 import { ProcessDefinitionData, ScenarioGraph } from "../../types";
 import { ThunkAction } from "../reduxTypes";
 import HttpService from "./../../http/HttpService";
-import { displayProcessActivity } from "./displayProcessActivity";
 
 export type ScenarioActions =
     | { type: "CORRECT_INVALID_SCENARIO"; processDefinitionData: ProcessDefinitionData }
@@ -80,8 +79,3 @@ export function hideRunProcessDetails() {
     replaceSearchQuery(omit(["from", "to", "refresh"]));
     return { type: "HIDE_RUN_PROCESS_DETAILS" };
 }
-
-export function addAttachment(processName: ProcessName, processVersionId: ProcessVersionId, file: File) {
-    return (dispatch) =>
-        HttpService.addAttachment(processName, processVersionId, file).then(() => dispatch(displayProcessActivity(processName)));
-}

designer/client/src/actions/reduxTypes.ts

@@ -2,22 +2,19 @@ import { AnyAction, Reducer as ReduxReducer } from "redux";
 import { ThunkAction as TA, ThunkDispatch as TD } from "redux-thunk";
 
 import { ActionTypes } from "./actionTypes";
-import { CountsActions, DisplayProcessActivityAction, NodeActions, ScenarioActions, SelectionActions } from "./nk";
+import { CountsActions, NodeActions, ScenarioActions, SelectionActions, NodeDetailsActions } from "./nk";
 import { UserSettingsActions } from "./nk/userSettings";
 import { UiActions } from "./nk/ui/uiActions";
 import { SettingsActions } from "./settingsActions";
 import { ToolbarActions } from "./nk/toolbars";
 import { RootState } from "../reducers";
-import { NodeDetailsActions } from "./nk/nodeDetails";
 import { NotificationActions } from "./nk/notifications";
 import { DisplayTestResultsDetailsAction } from "./nk/displayTestResults";
-import { LoadProcessVersionsAction } from "./nk/loadProcessVersions";
 import { GetScenarioActivitiesAction, UpdateScenarioActivitiesAction } from "./nk/scenarioActivities";
 
 type TypedAction =
     | UiActions
     | SettingsActions
-    | DisplayProcessActivityAction
     | GetScenarioActivitiesAction
     | UpdateScenarioActivitiesAction
     | NodeActions
@@ -28,7 +25,6 @@ type TypedAction =
     | NotificationActions
     | DisplayTestResultsDetailsAction
     | CountsActions
-    | LoadProcessVersionsAction
     | ScenarioActions;
 
 interface UntypedAction extends AnyAction {

designer/client/src/components/comment/StyledComment.tsx

@@ -1,61 +1,4 @@
-import { lighten, styled } from "@mui/material";
-import { NkButton } from "../button/NkButton";
-import { StyledCloseIcon } from "../toolbarComponents/toolbarWrapper/ToolbarStyled";
-
-export const ProcessCommentsWrapper = styled("div")`
-    padding: 0 13px 10px;
-`;
-
-export const ProcessCommentsList = styled("div")`
-    font-size: 10px;
-    margin: 15px 0;
-    padding: 0;
-`;
-
-export const RemoveButton = styled(StyledCloseIcon)`
-    float: right;
-    &:hover {
-        cursor: pointer;
-        opacity: 0.5;
-    }
-`;
-
-export const AddCommentPanel = styled("div")(
-    ({ theme }) => `
-    font-size: 12px !important;
-    display: flex;
-    flex-direction: column !important;
-    textarea {
-        width: 100% !important;
-        height: ${theme.custom.spacing.controlHeight} !important;
-        font-size: 12px;
-        font-weight: 400;
-        border-radius: 3px;
-        border: none;
-        background-color: ${lighten(theme.palette.background.paper, 0.1)};
-        padding: 4px 6px;
-        resize: none;
-    }
-`,
-);
-
-export const CommentButton = styled(NkButton)(
-    ({ theme }) => `
-    font-size: 12px !important;
-    background-color: ${lighten(theme.palette.background.paper, 0.2)} !important;
-    border: none !important;
-    width: 20% !important;
-    height: 30px !important;
-    align-self: flex-end !important;
-    margin: 5px 0 10px !important;
-    padding: 3px 0 !important;
-    border-radius: 3px !important;
-    cursor: pointer;
-    &:hover {
-        background-color: ${theme.palette.action.hover} !important;
-    }
-`,
-);
+import { styled } from "@mui/material";
 
 export const PanelComment = styled("div")(({ theme }) => ({
     marginTop: "1px",