Merge pull request #7285 from TouK/1.18-ports10

1.18 ports10
TouK · Dec 5, 2024 · 5b2a777 · 5b2a777
2 parents 37580f8 + 281a5d2
commit 5b2a777
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git 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 (
                     <ActivityItemProvider>
-                        <ActivityItem activity={activity} ref={rowRef} isRunning={isRunning} searchQuery={searchQuery} />
+                        <ActivityItem activity={activity} ref={rowRef} isDeploymentActive={isDeploymentActive} searchQuery={searchQuery} />
                     </ActivityItemProvider>
                 );
             }
@@ -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 (
         <div style={style} data-testid={`activity-row-${index}`}>

diff --git 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<HTMLDivElement>,
     ) => {
         const { t } = useTranslation();
@@ -55,7 +55,7 @@ export const ActivityItem = forwardRef(
             >
                 <StyledActivityContent isActiveFound={activity.isActiveFound} isFound={activity.isFound}>
                     <ActivityItemHeader
-                        isRunning={isRunning}
+                        isDeploymentActive={isDeploymentActive}
                         searchQuery={searchQuery}
                         activity={activity}
                         isActiveFound={activity.isActiveFound}

diff --git a/...ner/client/src/components/toolbars/activities/ActivityPanelRowItem/ActivityItemHeader.tsx b/...ner/client/src/components/toolbars/activities/ActivityPanelRowItem/ActivityItemHeader.tsx
@@ -37,13 +37,13 @@ const StyledHeaderActionRoot = styled("div")(({ theme }) => ({
     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 (
-        <StyledActivityItemHeader isHighlighted={isHighlighted} isRunning={isRunning} isActiveFound={isActiveFound}>
+        <StyledActivityItemHeader isHighlighted={isHighlighted} isDeploymentActive={isDeploymentActive} isActiveFound={isActiveFound}>
             <StyledHeaderIcon src={activity.activities.icon} id={activity.uiGeneratedId} />
             {getHeaderTitle}
             <StyledHeaderActionRoot>

diff --git 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
@@ -52,6 +52,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)