Skip to content

Commit 8838100

Browse files
gskrobiszgskrobisz
committed
separate actions in the frontend
1 parent 1878e5a commit 8838100

File tree

15 files changed

+214
-62
lines changed

15 files changed

+214
-62
lines changed

‎designer/client/src/assets/img/toolbarButtons/redeploy.svg

+1
Loading

‎designer/client/src/components/Process/ProcessStateUtils.ts

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
1-
import { ActionName, PredefinedActionName, ProcessStateType, Scenario } from "./types";
21
import { descriptionProcessArchived, unknownDescription, unknownTooltip } from "./messages";
2+
import type { ActionName, ProcessStateType, Scenario } from "./types";
3+
import { PredefinedActionName } from "./types";
34

45
export const unknownIcon = "/assets/states/status-unknown.svg";
56
const archivedIcon = "/assets/process/archived.svg";
67

78
class ProcessStateUtils {
9+
public canSeeDeploy = (state: ProcessStateType): boolean => state?.visibleActions.includes(PredefinedActionName.Deploy);
10+
811
public canDeploy = (state: ProcessStateType): boolean => state?.allowedActions.includes(PredefinedActionName.Deploy);
912

13+
public canSeeRedeploy = (state: ProcessStateType): boolean => state?.visibleActions.includes(PredefinedActionName.Redeploy);
14+
15+
public canRedeploy = (state: ProcessStateType): boolean => state?.allowedActions.includes(PredefinedActionName.Redeploy);
16+
1017
public canCancel = (state: ProcessStateType): boolean => state?.allowedActions.includes(PredefinedActionName.Cancel);
1118

1219
public canArchive = (state: ProcessStateType): boolean => state?.allowedActions.includes(PredefinedActionName.Archive);

‎designer/client/src/components/Process/types.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/* eslint-disable i18next/no-literal-string */
2-
import { Instant } from "../../types/common";
3-
import { ScenarioGraph, ValidationResult } from "../../types";
4-
import { ProcessingMode } from "../../http/HttpService";
2+
import type { ProcessingMode } from "../../http/HttpService";
3+
import type { ScenarioGraph, ValidationResult } from "../../types";
4+
import type { Instant } from "../../types/common";
55

66
export enum PredefinedActionName {
77
Deploy = "DEPLOY",
8+
Redeploy = "REDEPLOY",
89
Cancel = "CANCEL",
910
Archive = "ARCHIVE",
1011
UnArchive = "UNARCHIVE",

‎designer/client/src/components/modals/DeployProcessDialog.tsx

+11-7
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
import { css, cx } from "@emotion/css";
2-
import { WindowButtonProps, WindowContentProps } from "@touk/window-manager";
2+
import { FormHelperText, Typography } from "@mui/material";
3+
import type { WindowButtonProps, WindowContentProps } from "@touk/window-manager";
34
import React, { useCallback, useMemo, useState } from "react";
45
import { useTranslation } from "react-i18next";
56
import { useSelector } from "react-redux";
7+
8+
import type { NodesDeploymentData } from "../../http/HttpService";
69
import { getProcessName, getProcessVersionId } from "../../reducers/selectors/graph";
710
import { getFeatureSettings } from "../../reducers/selectors/settings";
8-
import { ProcessName, ProcessVersionId } from "../Process/types";
9-
import { PromptContent, WindowKind } from "../../windowManager";
11+
import type { WindowKind } from "../../windowManager";
12+
import { PromptContent } from "../../windowManager";
13+
import { LoadingButtonTypes } from "../../windowManager/LoadingButton";
1014
import CommentInput from "../comment/CommentInput";
15+
import type { ProcessName, ProcessVersionId } from "../Process/types";
16+
import type { ScenarioActionResult} from "../toolbars/scenarioActions/buttons/types";
17+
import { ScenarioActionResultType } from "../toolbars/scenarioActions/buttons/types";
1118
import ProcessDialogWarnings from "./ProcessDialogWarnings";
12-
import { FormHelperText, Typography } from "@mui/material";
13-
import { LoadingButtonTypes } from "../../windowManager/LoadingButton";
14-
import { ScenarioActionResult, ScenarioActionResultType } from "../toolbars/scenarioActions/buttons/types";
15-
import { NodesDeploymentData } from "../../http/HttpService";
1619

1720
export type ToggleProcessActionModalData = {
1821
action: (
@@ -22,6 +25,7 @@ export type ToggleProcessActionModalData = {
2225
nodeData?: NodesDeploymentData,
2326
) => Promise<ScenarioActionResult>;
2427
displayWarnings?: boolean;
28+
actionName?: string;
2529
};
2630

2731
export function DeployProcessDialog(props: WindowContentProps<WindowKind, ToggleProcessActionModalData>): JSX.Element {

‎designer/client/src/components/modals/DeployWithParameters/AdvancedParameters.tsx

+19-10
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
1+
import { Typography } from "@mui/material";
2+
import { groupBy, mapValues } from "lodash";
13
import React, { useEffect } from "react";
4+
import { useErrorBoundary } from "react-error-boundary";
25
import { useTranslation } from "react-i18next";
3-
import { groupBy, mapValues } from "lodash";
4-
import { Typography } from "@mui/material";
5-
import { AdvancedParametersSection } from "./AdvancedParametersSection";
6+
import { useLocalstorageState } from "rooks";
7+
import { clear, suspend } from "suspend-react";
8+
9+
import type { NodesDeploymentData } from "../../../http/HttpService";
10+
import HttpService from "../../../http/HttpService";
11+
import type { ActionNodeParameters } from "../../../types/action";
612
import { NodeTable } from "../../graph/node-modal/NodeDetailsContent/NodeTable";
13+
import { AdvancedParametersSection } from "./AdvancedParametersSection";
714
import { GroupedActionParameter } from "./GroupedActionParameter";
8-
import HttpService, { NodesDeploymentData } from "../../../http/HttpService";
9-
import { ActionNodeParameters } from "../../../types/action";
10-
import { useErrorBoundary } from "react-error-boundary";
11-
import { clear, suspend } from "suspend-react";
12-
import { useLocalstorageState } from "rooks";
15+
1316

1417
interface AdvancedParametersProps {
1518
processName: string;
19+
actionName: string;
1620
setParametersValues: (values: NodesDeploymentData) => void;
1721
parametersValues: NodesDeploymentData;
1822
}
@@ -27,15 +31,20 @@ function initialNodesData(params: ActionNodeParameters[]): NodesDeploymentData {
2731
);
2832
}
2933

30-
export const AdvancedParameters: React.FC<AdvancedParametersProps> = ({ processName, setParametersValues, parametersValues }) => {
34+
export const AdvancedParameters: React.FC<AdvancedParametersProps> = ({
35+
processName,
36+
actionName,
37+
setParametersValues,
38+
parametersValues,
39+
}) => {
3140
const { t } = useTranslation();
3241
const { showBoundary } = useErrorBoundary();
3342
const [expandedState, setExpandedState] = useLocalstorageState("actionParametersExpandedState", {});
3443

3544
const parametersDefinition: ActionNodeParameters[] | undefined = suspend(async () => {
3645
return HttpService.getActionParameters(processName)
3746
.then((response) => {
38-
const definition = response.data.actionNameToParameters["DEPLOY"] || ([] as ActionNodeParameters[]);
47+
const definition = response.data.actionNameToParameters[actionName] || ([] as ActionNodeParameters[]);
3948
const initialValues = initialNodesData(definition);
4049

4150
setParametersValues(initialValues);

‎designer/client/src/components/modals/DeployWithParameters/DeployWithParametersDialog.tsx

+13-11
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,29 @@
11
import { css, cx } from "@emotion/css";
2-
import { WindowButtonProps, WindowContentProps } from "@touk/window-manager";
2+
import { FormHelperText, Typography } from "@mui/material";
3+
import type { WindowButtonProps, WindowContentProps } from "@touk/window-manager";
34
import React, { Suspense, useCallback, useMemo, useState } from "react";
45
import { useTranslation } from "react-i18next";
56
import { useSelector } from "react-redux";
7+
8+
import type { NodesDeploymentData } from "../../../http/HttpService";
69
import { getProcessName, getProcessVersionId } from "../../../reducers/selectors/graph";
710
import { getFeatureSettings } from "../../../reducers/selectors/settings";
8-
import { PromptContent, WindowKind } from "../../../windowManager";
9-
import CommentInput from "../../comment/CommentInput";
10-
import ProcessDialogWarnings from "../ProcessDialogWarnings";
11-
import { FormHelperText, Typography } from "@mui/material";
11+
import type { WindowKind } from "../../../windowManager";
12+
import { PromptContent } from "../../../windowManager";
1213
import { LoadingButtonTypes } from "../../../windowManager/LoadingButton";
13-
import { ScenarioActionResultType } from "../../toolbars/scenarioActions/buttons/types";
14-
import { NodesDeploymentData } from "../../../http/HttpService";
15-
import { ToggleProcessActionModalData } from "../DeployProcessDialog";
16-
import { useLocalstorageState } from "rooks";
17-
import { AdvancedParameters } from "./AdvancedParameters";
14+
import CommentInput from "../../comment/CommentInput";
1815
import { ErrorBoundary } from "../../common/error-boundary";
1916
import { TextErrorBoundaryFallbackComponent } from "../../common/error-boundary";
2017
import LoaderSpinner from "../../spinner/Spinner";
18+
import { ScenarioActionResultType } from "../../toolbars/scenarioActions/buttons/types";
19+
import type { ToggleProcessActionModalData } from "../DeployProcessDialog";
20+
import ProcessDialogWarnings from "../ProcessDialogWarnings";
21+
import { AdvancedParameters } from "./AdvancedParameters";
2122

2223
export function DeployWithParametersDialog(props: WindowContentProps<WindowKind, ToggleProcessActionModalData>): JSX.Element {
2324
// TODO: get rid of meta
2425
const {
25-
meta: { action, displayWarnings },
26+
meta: { action, displayWarnings, actionName },
2627
} = props.data;
2728
const processName = useSelector(getProcessName);
2829
const processVersionId = useSelector(getProcessVersionId);
@@ -92,6 +93,7 @@ export function DeployWithParametersDialog(props: WindowContentProps<WindowKind,
9293
>
9394
<AdvancedParameters
9495
processName={processName}
96+
actionName={actionName}
9597
setParametersValues={setParametersValues}
9698
parametersValues={parametersValues}
9799
/>

‎designer/client/src/components/toolbarSettings/buttons/BuiltinButtonTypes.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
export enum BuiltinButtonTypes {
22
processSave = "process-save",
33
processDeploy = "process-deploy",
4+
processRedeploy = "process-redeploy",
45
processCancel = "process-cancel",
56
processRunOffSchedule = "process-run-off-schedule",
67
editUndo = "edit-undo",

‎designer/client/src/components/toolbarSettings/buttons/TOOLBAR_BUTTONS_MAP.ts

+10-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { ComponentType } from "react";
1+
import type { ComponentType } from "react";
2+
23
import CopyButton from "../../toolbars/edit/buttons/CopyButton";
34
import DeleteButton from "../../toolbars/edit/buttons/DeleteButton";
45
import LayoutButton from "../../toolbars/edit/buttons/LayoutButton";
@@ -8,29 +9,30 @@ import UndoButton from "../../toolbars/edit/buttons/UndoButton";
89
import ArchiveButton from "../../toolbars/process/buttons/ArchiveButton";
910
import { ArchiveToggleButton } from "../../toolbars/process/buttons/ArchiveToggleButton";
1011
import CompareButton from "../../toolbars/process/buttons/CompareButton";
11-
import ImportButton from "../../toolbars/process/buttons/ImportButton";
1212
import ExportButton from "../../toolbars/process/buttons/ExportButton";
13+
import ImportButton from "../../toolbars/process/buttons/ImportButton";
1314
import MigrateButton from "../../toolbars/process/buttons/MigrateButton";
1415
import PDFButton from "../../toolbars/process/buttons/PDFButton";
1516
import SaveButton from "../../toolbars/process/buttons/SaveButton";
1617
import UnArchiveButton from "../../toolbars/process/buttons/UnArchiveButton";
17-
import { LinkButton } from "./LinkButton";
1818
import CancelDeployButton from "../../toolbars/scenarioActions/buttons/CancelDeployButton";
1919
import DeployButton from "../../toolbars/scenarioActions/buttons/DeployButton";
2020
import PropertiesButton from "../../toolbars/scenarioActions/buttons/PropertiesButton";
21+
import RedeployButton from "../../toolbars/scenarioActions/buttons/RedeployButton";
22+
import RunOffScheduleButton from "../../toolbars/scenarioActions/buttons/RunOffScheduleButton";
23+
import AdhocTestingButton from "../../toolbars/test/buttons/AdhocTestingButton";
2124
import CountsButton from "../../toolbars/test/buttons/CountsButton";
2225
import FromFileButton from "../../toolbars/test/buttons/FromFileButton";
23-
import GenerateButton from "../../toolbars/test/buttons/GenerateButton";
2426
import GenerateAndTestButton from "../../toolbars/test/buttons/GenerateAndTestButton";
25-
import AdhocTestingButton from "../../toolbars/test/buttons/AdhocTestingButton";
27+
import GenerateButton from "../../toolbars/test/buttons/GenerateButton";
2628
import HideButton from "../../toolbars/test/buttons/HideButton";
2729
import { ResetViewButton } from "../../toolbars/view/buttons/ResetViewButton";
2830
import { ZoomInButton } from "../../toolbars/view/buttons/ZoomInButton";
2931
import { ZoomOutButton } from "../../toolbars/view/buttons/ZoomOutButton";
3032
import { BuiltinButtonTypes } from "./BuiltinButtonTypes";
3133
import { CustomButtonTypes } from "./CustomButtonTypes";
32-
import { ToolbarButton, ToolbarButtonTypes } from "./types";
33-
import RunOffScheduleButton from "../../toolbars/scenarioActions/buttons/RunOffScheduleButton";
34+
import { LinkButton } from "./LinkButton";
35+
import type { ToolbarButton, ToolbarButtonTypes } from "./types";
3436

3537
export type PropsOfButton<T> = ToolbarButton & {
3638
type: T;
@@ -43,6 +45,7 @@ type ToolbarButtonsMap = {
4345
export const TOOLBAR_BUTTONS_MAP: ToolbarButtonsMap = {
4446
[BuiltinButtonTypes.processSave]: SaveButton,
4547
[BuiltinButtonTypes.processDeploy]: DeployButton,
48+
[BuiltinButtonTypes.processRedeploy]: RedeployButton,
4649
[BuiltinButtonTypes.processCancel]: CancelDeployButton,
4750
[BuiltinButtonTypes.processRunOffSchedule]: RunOffScheduleButton,
4851
[BuiltinButtonTypes.viewZoomIn]: ZoomInButton,

‎designer/client/src/components/toolbars/scenarioActions/buttons/DeployButton.tsx

+20-16
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {
1111
getProcessVersionId,
1212
hasError,
1313
isDeployPossible,
14+
isDeployVisible,
1415
isSaveDisabled,
1516
isValidationResultPresent,
1617
} from "../../../../reducers/selectors/graph";
@@ -25,7 +26,8 @@ import type { ToolbarButtonProps } from "../../types";
2526

2627
export default function DeployButton(props: ToolbarButtonProps) {
2728
const dispatch = useDispatch();
28-
const deployPossible = useSelector(isDeployPossible);
29+
const isVisible = useSelector(isDeployVisible);
30+
const isPossible = useSelector(isDeployPossible);
2931
const saveDisabled = useSelector(isSaveDisabled);
3032
const hasErrors = useSelector(hasError);
3133
const validationResultPresent = useSelector(isValidationResultPresent);
@@ -34,7 +36,7 @@ export default function DeployButton(props: ToolbarButtonProps) {
3436
const capabilities = useSelector(getCapabilities);
3537
const { disabled, type } = props;
3638

37-
const available = validationResultPresent && !disabled && deployPossible && capabilities.deploy;
39+
const available = validationResultPresent && !disabled && isPossible && capabilities.deploy;
3840
const { t } = useTranslation();
3941
const deployToolTip = !capabilities.deploy
4042
? t("panels.actions.deploy.tooltips.forbidden", "Deploy forbidden for current scenario.")
@@ -70,7 +72,7 @@ export default function DeployButton(props: ToolbarButtonProps) {
7072
title: message,
7173
kind: WindowKind.deployWithParameters,
7274
width: ACTION_DIALOG_WIDTH,
73-
meta: { action, displayWarnings: true },
75+
meta: { action, displayWarnings: true, actionName: "DEPLOY" },
7476
});
7577
}
7678
},
@@ -81,22 +83,24 @@ export default function DeployButton(props: ToolbarButtonProps) {
8183
title: message,
8284
kind: WindowKind.deployWithParameters,
8385
width: ACTION_DIALOG_WIDTH,
84-
meta: { action, displayWarnings: true },
86+
meta: { action, displayWarnings: true, actionName: "DEPLOY" },
8587
});
8688
}
8789
});
8890
};
8991

90-
return (
91-
<ToolbarButton
92-
name={t("panels.actions.deploy.button", "deploy")}
93-
disabled={!available}
94-
icon={<Icon />}
95-
title={deployToolTip}
96-
onClick={handleOnClick}
97-
onMouseOver={deployMouseOver}
98-
onMouseOut={deployMouseOut}
99-
type={type}
100-
/>
101-
);
92+
if (isVisible) {
93+
return (
94+
<ToolbarButton
95+
name={t("panels.actions.deploy.button", "deploy")}
96+
disabled={!available}
97+
icon={<Icon />}
98+
title={deployToolTip}
99+
onClick={handleOnClick}
100+
onMouseOver={deployMouseOver}
101+
onMouseOut={deployMouseOut}
102+
type={type}
103+
/>
104+
);
105+
} else return <></>;
102106
}

0 commit comments

Comments
 (0)