console: restart message up

walmartlabs · Jan 12, 2024 · 0c8fd26 · 0c8fd26
1 parent 381424a
commit 0c8fd26
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 18 deletions.
diff --git a/console2/src/api/process/index.ts b/console2/src/api/process/index.ts
@@ -264,6 +264,12 @@ export const get = (
     return fetchJson(`/api/v2/process/${instanceId}?${params.toString()}`);
 };
 
+export const getRoot = (
+    instanceId: ConcordId
+): Promise<ProcessEntry> => {
+    return fetchJson(`/api/v1/process/${instanceId}/root`);
+};
+
 export const disable = (instanceId: ConcordId, disabled: boolean): Promise<{}> =>
     managedFetch(`/api/v1/process/${instanceId}/disable/${disabled}`, { method: 'POST' });
 

diff --git a/console2/src/components/organisms/ProcessActivity/Toolbar.tsx b/console2/src/components/organisms/ProcessActivity/Toolbar.tsx
@@ -54,11 +54,12 @@ interface ExternalProps {
     loading: boolean;
     instanceId: ConcordId;
     process?: ProcessEntry;
+    rootInstanceId?: ConcordId;
     refresh: () => void;
 }
 
 const ProcessToolbar = memo((props: ExternalProps) => {
-    const { stickyRef, loading, refresh, process, instanceId } = props;
+    const { stickyRef, loading, refresh, process, instanceId, rootInstanceId } = props;
 
     const [isFixed, setFixed] = useState(false);
 
@@ -87,7 +88,7 @@ const ProcessToolbar = memo((props: ExternalProps) => {
 
                 <MenuItem>{renderStartAt(process)}</MenuItem>
 
-                <MenuItem position={'right'}>{renderProcessMainActions(refresh, process)}</MenuItem>
+                <MenuItem position={'right'}>{renderProcessMainActions(refresh, process, rootInstanceId)}</MenuItem>
 
                 <MenuItem>{renderProcessSecondaryActions(refresh, process)}</MenuItem>
             </Menu>
@@ -179,7 +180,7 @@ const renderStartAt = (process?: ProcessEntry) => {
     return;
 };
 
-const renderProcessMainActions = (refresh: () => void, process?: ProcessEntry) => {
+const renderProcessMainActions = (refresh: () => void, process?: ProcessEntry, rootInstanceId?: ConcordId) => {
     if (!process) {
         return (
             <Button.Group>
@@ -235,7 +236,7 @@ const renderProcessMainActions = (refresh: () => void, process?: ProcessEntry) =
             {canBeRestarted(process.status) && process.runtime === 'concord-v2' &&
                 <RestartProcessPopup
                     instanceId={process.instanceId}
-                    parentInstanceId={process.parentInstanceId}
+                    rootInstanceId={rootInstanceId}
                     refresh={refresh}
                     trigger={renderRestartProcessTrigger}
                 />

diff --git a/console2/src/components/organisms/ProcessActivity/index.tsx b/console2/src/components/organisms/ProcessActivity/index.tsx
@@ -19,13 +19,13 @@
  */
 
 import * as React from 'react';
-import { useCallback, useRef, useState } from 'react';
+import { useCallback, useRef, useState, useEffect } from 'react';
 
 import { Link, Redirect, Route, Switch } from 'react-router-dom';
 import { Icon, Menu } from 'semantic-ui-react';
 
 import { ConcordId } from '../../../api/common';
-import { get as apiGet, isFinal, ProcessEntry } from '../../../api/process';
+import { get as apiGet, getRoot as apiGetRoot, isFinal, ProcessEntry } from '../../../api/process';
 import { NotFoundPage } from '../../pages';
 import {
     ProcessAnsibleActivity,
@@ -116,13 +116,23 @@ const ProcessActivity = (props: ExternalProps) => {
     }, []);
 
     const [process, setProcess] = useState<ProcessEntry>();
+    const rootProcessRef = useRef<ProcessEntry | null>(null);
 
     const fetchData = useCallback(async () => {
         const process = await apiGet(props.instanceId, []);
         setProcess(process);
+
+        if (process.parentInstanceId && !rootProcessRef.current) {
+            rootProcessRef.current = await apiGetRoot(process.parentInstanceId);
+        }
+
         return !isFinal(process.status);
     }, [props.instanceId]);
 
+    useEffect(() => {
+        rootProcessRef.current = null;
+    }, [props.instanceId]);
+
     useStatusFavicon(process);
 
     const refreshHandler = useCallback(() => {
@@ -145,6 +155,7 @@ const ProcessActivity = (props: ExternalProps) => {
                 loading={loading}
                 instanceId={instanceId}
                 process={process}
+                rootInstanceId={rootProcessRef.current?.instanceId}
                 refresh={refreshHandler}
                 stickyRef={stickyRef}
             />

diff --git a/console2/src/components/organisms/RestartProcessPopup/index.tsx b/console2/src/components/organisms/RestartProcessPopup/index.tsx
@@ -25,11 +25,11 @@ import { SingleOperationPopup } from '../../molecules';
 import { memo, useCallback } from 'react';
 import { restart as apiRestart } from '../../../api/process';
 import { useState } from 'react';
-import {Message} from "semantic-ui-react";
+import { Message } from "semantic-ui-react";
 
 interface ExternalProps {
     instanceId: ConcordId;
-    parentInstanceId?: ConcordId;
+    rootInstanceId?: ConcordId;
     refresh: () => void;
     trigger: (onClick: () => void) => React.ReactNode;
 }
@@ -40,9 +40,9 @@ const RestartProcessPopup = memo((props: ExternalProps) => {
     const [success, setSuccess] = useState(false);
 
     const instanceId = props.instanceId;
-    const parentInstanceId = props.parentInstanceId;
+    const rootInstanceId = props.rootInstanceId;
 
-    const cancelProcess = useCallback(async () => {
+    const restartProcess = useCallback(async () => {
         setRestarting(true);
 
         try {
@@ -68,13 +68,30 @@ const RestartProcessPopup = memo((props: ExternalProps) => {
             trigger={trigger}
             title="Restart the process?"
             introMsg={
-            <>
-                <p>Are you sure you want to restart the selected process?</p>
-                {parentInstanceId && <Message warning>
-                    <Message.Header>Warning!</Message.Header>
-                    <p>The root process will be restarted</p>
-                </Message>}
-            </>
+                <>
+                    {!rootInstanceId && <p>Are you sure you want to restart the selected process?</p>}
+                    {rootInstanceId &&
+                        <>
+                        <Message warning>
+                            <Message.Header>You are about to restart a child process. Please note:</Message.Header>
+                            <Message.List style={{marginTop: "10px"}}>
+                                <Message.Item>
+                                    Only the <a href={`#/process/${rootInstanceId}/log`} target="_blank"
+                                                   rel="noopener noreferrer">parent (root) process</a> will be restarted.
+                                </Message.Item>
+                                <Message.Item>
+                                    Restarting the parent process may also re-run this and other child processes.
+                                </Message.Item>
+                                <Message.Item>
+                                    Ensure that this is the desired action before proceeding.
+                                </Message.Item>
+                            </Message.List>
+                        </Message>
+
+                        <p>Do you want to continue with restarting the parent process?</p>
+                        </>
+                    }
+                </>
             }
             running={restarting}
             runningMsg={<p>Restarting...</p>}
@@ -83,7 +100,7 @@ const RestartProcessPopup = memo((props: ExternalProps) => {
             error={error}
             reset={reset}
             onDone={refresh}
-            onConfirm={cancelProcess}
+            onConfirm={restartProcess}
         />
     );
 });