diff --git a/designer/client/src/components/toolbars/activities/ActivitiesPanelRow.tsx b/designer/client/src/components/toolbars/activities/ActivitiesPanelRow.tsx index 3f956ee9bc6..d6b53011f02 100644 --- a/designer/client/src/components/toolbars/activities/ActivitiesPanelRow.tsx +++ b/designer/client/src/components/toolbars/activities/ActivitiesPanelRow.tsx @@ -27,7 +27,8 @@ export const ActivitiesPanelRow = memo(({ index, style, setRowHeight, handleShow () => activities.findIndex((activeItem) => activeItem.uiType === "item" && activeItem.type === "SCENARIO_DEPLOYED"), [activities], ); - const isRunning = firstDeployedIndex === index && scenarioState.status.name === "RUNNING"; + const scenarioStatusesToActiveDeploy = ["RUNNING", "SCHEDULED"]; + const isDeploymentActive = firstDeployedIndex === index && scenarioStatusesToActiveDeploy.includes(scenarioState.status.name); const isFirstDateItem = activities.findIndex((activeItem) => activeItem.uiType === "date") === index; useEffect(() => { @@ -41,7 +42,7 @@ export const ActivitiesPanelRow = memo(({ index, style, setRowHeight, handleShow case "item": { return ( - + ); } @@ -69,7 +70,7 @@ export const ActivitiesPanelRow = memo(({ index, style, setRowHeight, handleShow return null; } } - }, [activity, handleHideRows, handleShowRows, isRunning, isFirstDateItem, searchQuery, t]); + }, [activity, handleHideRows, handleShowRows, isDeploymentActive, isFirstDateItem, searchQuery, t]); return (
diff --git a/designer/client/src/components/toolbars/activities/ActivityPanelRowItem/ActivityItem.tsx b/designer/client/src/components/toolbars/activities/ActivityPanelRowItem/ActivityItem.tsx index 9ca4a896f1a..1508436cf31 100644 --- a/designer/client/src/components/toolbars/activities/ActivityPanelRowItem/ActivityItem.tsx +++ b/designer/client/src/components/toolbars/activities/ActivityPanelRowItem/ActivityItem.tsx @@ -28,7 +28,7 @@ const StyledActivityBody = styled("div")(({ theme }) => ({ export const ActivityItem = forwardRef( ( - { activity, isRunning, searchQuery }: { activity: ItemActivity; isRunning: boolean; searchQuery: string }, + { activity, isDeploymentActive, searchQuery }: { activity: ItemActivity; isDeploymentActive: boolean; searchQuery: string }, ref: ForwardedRef, ) => { const { t } = useTranslation(); @@ -55,7 +55,7 @@ export const ActivityItem = forwardRef( > ({ gap: theme.spacing(0.5), })); -const StyledActivityItemHeader = styled("div")<{ isHighlighted: boolean; isRunning: boolean; isActiveFound: boolean }>( - ({ theme, isHighlighted, isRunning, isActiveFound }) => ({ +const StyledActivityItemHeader = styled("div")<{ isHighlighted: boolean; isDeploymentActive: boolean; isActiveFound: boolean }>( + ({ theme, isHighlighted, isDeploymentActive, isActiveFound }) => ({ display: "flex", alignItems: "center", padding: theme.spacing(0.5, 0.5, 0.5, 0.75), borderRadius: theme.spacing(0.5), - ...getHeaderColors(theme, isHighlighted, isRunning, isActiveFound), + ...getHeaderColors(theme, isHighlighted, isDeploymentActive, isActiveFound), }), ); @@ -167,7 +167,7 @@ const HeaderActivity = ({ interface Props { activity: ItemActivity; - isRunning: boolean; + isDeploymentActive: boolean; isActiveFound: boolean; isFound: boolean; searchQuery: string; @@ -230,7 +230,7 @@ const WithOpenVersion = ({ ); }; -const ActivityItemHeader = ({ activity, isRunning, isFound, isActiveFound, searchQuery }: Props) => { +const ActivityItemHeader = ({ activity, isDeploymentActive, isFound, isActiveFound, searchQuery }: Props) => { const scenario = useSelector(getScenario); const { processVersionId } = scenario || {}; @@ -279,7 +279,7 @@ const ActivityItemHeader = ({ activity, isRunning, isFound, isActiveFound, searc ]); return ( - + {getHeaderTitle} diff --git a/designer/client/src/components/toolbars/activities/helpers/activityItemColors.ts b/designer/client/src/components/toolbars/activities/helpers/activityItemColors.ts index d0192a16818..0afdb0b454c 100644 --- a/designer/client/src/components/toolbars/activities/helpers/activityItemColors.ts +++ b/designer/client/src/components/toolbars/activities/helpers/activityItemColors.ts @@ -12,8 +12,8 @@ const runningHeaderBackground = (theme: Theme) => blend(theme.palette.background const activeFoundItemBackground = (theme: Theme) => blend(theme.palette.background.paper, theme.palette.primary.main, 0.2); const foundItemBackground = (theme: Theme) => blend(theme.palette.background.paper, theme.palette.primary.main, 0.08); -export const getHeaderColors = (theme: Theme, isHighlighted: boolean, isRunning: boolean, isActiveFound: boolean) => { - if (isRunning && isActiveFound) { +export const getHeaderColors = (theme: Theme, isHighlighted: boolean, isDeploymentActive: boolean, isActiveFound: boolean) => { + if (isDeploymentActive && isActiveFound) { return { backgroundColor: runningActiveFoundHeaderBackground(theme), border: activeBorder(theme), @@ -27,7 +27,7 @@ export const getHeaderColors = (theme: Theme, isHighlighted: boolean, isRunning: }; } - if (isRunning) { + if (isDeploymentActive) { return { backgroundColor: runningHeaderBackground(theme), border: defaultBorder(theme), diff --git a/docs/Changelog.md b/docs/Changelog.md index 11d9f3e4c79..7e2e73657b8 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -26,6 +26,7 @@ * [#7269](https://github.com/TouK/nussknacker/pull/7269) Fixed focus scrolling in expression editor * [#7270](https://github.com/TouK/nussknacker/pull/7270) Savepoint deserialization fixup - some taken savepoints (e.g. for scenarios with async enrichers) were not deserializable which led to errors during redeployments on Flink * [#7279](https://github.com/TouK/nussknacker/pull/7279) Fixed Flink TaskManager and Designer containers restarts in installation example +* [#7283](https://github.com/TouK/nussknacker/pull/7283) fix deployment status indicator for periodic scenarios type ### 1.18.0 (22 November 2024)