Merge pull request #57 from xuzhu-591/feat-approval

feat: support checks for rollback and restart
horizoncd · Dec 11, 2023 · db60605 · db60605
2 parents e2919ab + 3ccc661
commit db60605
Show file tree

Hide file tree

Showing 9 changed files with 85 additions and 50 deletions.
diff --git a/package.json b/package.json
@@ -19,6 +19,7 @@
     "lint:style": "stylelint --fix \"src/**/*.less\" --syntax less",
     "prettier": "prettier -c --write \"src/**/*\"",
     "start": "cross-env UMI_ENV=dev umi dev",
+    "start:new": "cross-env NODE_OPTIONS=--openssl-legacy-provider UMI_ENV=dev umi dev",
     "start:dev": "cross-env NODE_OPTIONS=--openssl-legacy-provider REACT_APP_ENV=dev MOCK=true UMI_ENV=dev umi dev",
     "start:no-mock": "cross-env MOCK=none UMI_ENV=dev umi dev",
     "start:no-ui": "cross-env UMI_UI=none UMI_ENV=dev umi dev",

diff --git a/src/const.tsx b/src/const.tsx
@@ -15,6 +15,8 @@ export enum ResourceType {
 export enum PublishType {
   BUILD_DEPLOY = 'builddeploy',
   DEPLOY = 'deploy',
+  RESTART = 'restart',
+  ROLLBACK = 'rollback',
 }
 
 export enum MemberType {

diff --git a/src/pages/instances/Detail/v1/index.tsx b/src/pages/instances/Detail/v1/index.tsx
@@ -65,10 +65,6 @@ export default () => {
             templateSchema={templateSchema}
             cluster={cluster}
           />
-          <AdminTag
-            clusterID={clusterID}
-            clusterFullPath={clusterFullPath}
-          />
         </TabPane>
         <TabPane tab={intl.formatMessage({ id: 'pages.clusterDetail.output' })} key="2">
           <Output clusterID={clusterID} />
@@ -79,6 +75,12 @@ export default () => {
             clusterFullPath={clusterFullPath}
           />
         </TabPane>
+        <TabPane tab={intl.formatMessage({ id: 'pages.tags.admin' })} key="4">
+          <AdminTag
+            clusterID={clusterID}
+            clusterFullPath={clusterFullPath}
+          />
+        </TabPane>
       </Tabs>
     </PageWithBreadcrumb>
   );

diff --git a/src/pages/instances/Detail/v2/index.tsx b/src/pages/instances/Detail/v2/index.tsx
@@ -106,10 +106,6 @@ export default () => {
               templateSchema={templateSchema}
               buildSchema={buildSchema}
             />
-            <AdminTag
-              clusterID={clusterID}
-              clusterFullPath={clusterFullPath}
-            />
           </TabPane>
           <TabPane tab={intl.formatMessage({ id: 'pages.clusterDetail.output' })} key="2">
             <Output clusterID={clusterID} />
@@ -120,6 +116,12 @@ export default () => {
               clusterFullPath={clusterFullPath}
             />
           </TabPane>
+          <TabPane tab={intl.formatMessage({ id: 'pages.tags.admin' })} key="4">
+            <AdminTag
+              clusterID={clusterID}
+              clusterFullPath={clusterFullPath}
+            />
+          </TabPane>
         </Tabs>
       </MaxSpace>
     </PageWithBreadcrumb>

diff --git a/src/pages/instances/Pods/components/ButtonBar.tsx b/src/pages/instances/Pods/components/ButtonBar.tsx
diff --git a/src/pages/instances/Pods/components/ButtonBarV2.tsx b/src/pages/instances/Pods/components/ButtonBarV2.tsx
diff --git a/src/pages/instances/pipelines/Detail/MergeBox.tsx b/src/pages/instances/pipelines/Detail/MergeBox.tsx
@@ -86,13 +86,17 @@ const Status = (props: StatusProps) => {
 
 interface ConfirmButtonProps extends Omit<ButtonProps, 'type'> {
   pipelinerunID: number;
+  pipelinerunAction: string;
   forceRun: boolean;
 }
 
 const ConfirmButton = (props: ConfirmButtonProps) => {
-  const { pipelinerunID, forceRun: forceRunFlag, disabled } = props;
+  const {
+    pipelinerunID, pipelinerunAction, forceRun: forceRunFlag, disabled,
+  } = props;
   const intl = useIntl();
   const history = useHistory();
+  const { successAlert } = useModel('alert');
   const { initialState } = useModel('@@initialState');
   const { fullPath } = initialState?.resource || {};
 
@@ -109,32 +113,35 @@ const ConfirmButton = (props: ConfirmButtonProps) => {
     };
   }, [forceRunFlag, intl, disabled]);
 
-  const { run } = useRequest(() => runPipelineRun(pipelinerunID), {
-    onSuccess: () => {
-      history.push(`${fullPath}`);
-    },
-    manual: true,
-  });
+  const doRun = useCallback(() => {
+    if (forceRunFlag) {
+      return forceRunPipelineRun(pipelinerunID);
+    }
+    return runPipelineRun(pipelinerunID);
+  }, [forceRunFlag, pipelinerunID]);
 
-  const { run: forceRun } = useRequest(() => forceRunPipelineRun(pipelinerunID), {
+  const { run, loading } = useRequest(() => doRun(), {
     onSuccess: () => {
+      switch (pipelinerunAction) {
+        case 'restart':
+          successAlert(intl.formatMessage({ id: 'pages.message.cluster.restart.success' }));
+          break;
+        case 'rollback':
+          successAlert(intl.formatMessage({ id: 'pages.message.cluster.rollback.submitted' }));
+          break;
+        default:
+          break;
+      }
       history.push(`${fullPath}`);
     },
     manual: true,
   });
 
-  const onClick = useCallback(() => {
-    if (forceRunFlag) {
-      forceRun();
-    } else {
-      run();
-    }
-  }, [forceRunFlag, forceRun, run]);
-
   return (
     <Button
       type="primary"
-      onClick={onClick}
+      loading={loading}
+      onClick={run}
       style={{ backgroundColor: params.color, borderColor: params.color }}
       {...props}
     >
@@ -233,7 +240,7 @@ const CheckRunItem = (props: { checkrun: PIPELINES.CheckRun }) => {
 };
 
 const MergeBox = (props: { pipelinerun: PIPELINES.Pipeline, checkruns?: PIPELINES.CheckRun[] }) => {
-  const { pipelinerun: { status, id }, checkruns = [] } = props;
+  const { pipelinerun: { status, id, action }, checkruns = [] } = props;
   const needButton = useMemo(() => status === 'ready' || status === 'pending', [status]);
   return (
     <Row>
@@ -249,6 +256,7 @@ const MergeBox = (props: { pipelinerun: PIPELINES.Pipeline, checkruns?: PIPELINE
                   <ConfirmButton
                     forceRun={status === 'pending' && rbac.Permissions.forceRunPipelineRun.allowed}
                     pipelinerunID={id}
+                    pipelinerunAction={action}
                     disabled={status === 'pending' && !rbac.Permissions.forceRunPipelineRun.allowed}
                   />
                   <CancelButton pipelinerunID={id} />

diff --git a/src/pages/instances/pipelines/Detail/index.tsx b/src/pages/instances/pipelines/Detail/index.tsx
@@ -6,9 +6,7 @@ import { useParams } from 'umi';
 import { useRequest } from '@@/plugin-request/request';
 import copy from 'copy-to-clipboard';
 import { useMemo, useState } from 'react';
-import {
-  Button, Card, Modal,
-} from 'antd';
+import { Button, Card, Modal } from 'antd';
 import { CopyOutlined, FullscreenOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
 import PageWithBreadcrumb from '@/components/PageWithBreadcrumb';
 import type { Param } from '@/components/DetailCard';
@@ -29,7 +27,7 @@ import {
 import Utils from '@/utils';
 import { PublishType } from '@/const';
 import FullscreenModal from '@/components/FullscreenModal';
-import { rollback } from '@/services/clusters/clusters';
+import { createPipelineRun } from '@/services/clusters/clusters';
 import { GitRefType } from '@/services/code/code';
 import ButtonWithoutPadding from '@/components/Widget/ButtonWithoutPadding';
 import MergeBox from './MergeBox';
@@ -49,15 +47,21 @@ export default (props: any) => {
   const { initialState } = useModel('@@initialState');
   const { id, fullPath } = initialState!.resource;
 
-  const pollingInterval = 6000;
+  const pollingInterval = 3000;
 
-  const { data: pipeline } = useRequest(() => getPipeline(pipelineID), {
+  const { data: checkruns, cancel: cancelListCheckRuns } = useRequest(() => listCheckRuns(pipelineID), {
     pollingInterval,
     pollingWhenHidden: false,
   });
-  const { data: checkruns } = useRequest(() => listCheckRuns(pipelineID), {
+  const { data: pipeline, cancel: cancelGetPipeline } = useRequest(() => getPipeline(pipelineID), {
     pollingInterval,
     pollingWhenHidden: false,
+    onSuccess: (data) => {
+      if (data?.status && data?.status !== 'pending') {
+        cancelListCheckRuns();
+        cancelGetPipeline();
+      }
+    },
   });
   const { data: diff } = useRequest(() => getPipelineDiffs(pipelineID));
   const { data: buildLog } = useRequest(() => queryPipelineLog(pipelineID), {
@@ -160,11 +164,13 @@ export default (props: any) => {
     setFullscreen(true);
   };
 
-  const { run: runRollback, loading } = useRequest((prID: number) => rollback(id, { pipelinerunID: prID }), {
-    onSuccess: () => {
-      // jump to pods' url
-      successAlert(intl.formatMessage({ id: 'pages.message.cluster.rollback.submitted' }));
-      history.push(`${fullPath}`);
+  const { run: runRollback, loading } = useRequest((prID: number) => createPipelineRun(id, {
+    action: 'rollback',
+    pipelinerunID: prID,
+  }), {
+    onSuccess: (pr: PIPELINES.Pipeline) => {
+      history.push(`/instances${fullPath}/-/pipelines/${pr.id}`);
+      window.location.reload();
     },
     manual: true,
   });

diff --git a/src/services/clusters.d.ts b/src/services/clusters.d.ts
@@ -179,8 +179,8 @@ declare namespace CLUSTER {
   };
 
   type PipelineRunCreate = {
-    action: 'builddeploy' | 'deploy' | 'rollback'
-    title: string,
+    action: 'builddeploy' | 'deploy' | 'rollback' | 'restart'
+    title?: string,
     description?: string;
     git?: {
       branch: string;