From 197d0ac7646ecff6b8e1939790d22351e7b7c5e5 Mon Sep 17 00:00:00 2001
From: daskyrk <daskyrk@163.com>
Date: Wed, 12 May 2021 14:31:40 +0800
Subject: [PATCH] feat: add commit action 'update'

---
 .../yml-editor/pipeline-yml/pipeline-editor.tsx  |  9 ++++-----
 .../pages/pipeline/config-detail/index.tsx       |  9 ++++-----
 .../pages/repo/components/add-pipelineyml.tsx    |  5 ++---
 .../repo/components/audit-template-manager.tsx   |  7 +++----
 .../pages/repo/components/repo-editor.tsx        | 13 ++++++-------
 .../repo/components/repo-file-container.tsx      | 12 +++++-------
 .../pages/repo/components/repo-mr-form.tsx       |  5 ++---
 .../pages/repo/components/repo-nav.tsx           |  7 +++----
 .../pages/repo/components/yml-editor.tsx         | 16 +++++++---------
 shell/app/modules/application/types/repo.d.ts    |  2 +-
 10 files changed, 37 insertions(+), 48 deletions(-)

diff --git a/shell/app/modules/application/common/yml-editor/pipeline-yml/pipeline-editor.tsx b/shell/app/modules/application/common/yml-editor/pipeline-yml/pipeline-editor.tsx
index 1864bf10e7..85741845ed 100644
--- a/shell/app/modules/application/common/yml-editor/pipeline-yml/pipeline-editor.tsx
+++ b/shell/app/modules/application/common/yml-editor/pipeline-yml/pipeline-editor.tsx
@@ -107,20 +107,19 @@ const PipelineEditor = (props: IYmlEditorProps) => {
   const commitData = (commitContent: string, values: any) => {
     const { path } = tree;
     const { branch, message: commitMsg } = values;
-    const data = {
+
+    commit({
       branch,
       message: commitMsg || `Update ${fileName}`,
       actions: [
         {
           content: commitContent,
           path,
-          action: 'add',
+          action: 'update',
           pathType: 'blob',
         },
       ],
-    };
-
-    commit(data).then(() => {
+    }).then(() => {
       onCancel();
       message.success(i18n.t('application:modify file successfully'));
       getRepoBlob();
diff --git a/shell/app/modules/application/pages/pipeline/config-detail/index.tsx b/shell/app/modules/application/pages/pipeline/config-detail/index.tsx
index 680dcf7cca..0a9773eecb 100644
--- a/shell/app/modules/application/pages/pipeline/config-detail/index.tsx
+++ b/shell/app/modules/application/pages/pipeline/config-detail/index.tsx
@@ -62,20 +62,19 @@ const PipelineConfigDetail = (props: IProps) => {
   const onUpdateYml = (ymlStr: string) => {
     const fileName = caseDetail.name;
     const { branch, path } = getBranchPath(caseDetail);
-    const data = {
+
+    return commit({
       branch,
       message: `Update ${fileName}`,
       actions: [
         {
           content: ymlStr,
           path,
-          action: 'add',
+          action: 'update',
           pathType: 'blob',
         },
       ],
-    };
-
-    return commit(data).then(() => {
+    }).then(() => {
       getTreeNodeDetailNew({ id: nodeId, ...scopeParams });
       if (recordRef.current && recordRef.current.reload) {
         recordRef.current.reload();
diff --git a/shell/app/modules/application/pages/repo/components/add-pipelineyml.tsx b/shell/app/modules/application/pages/repo/components/add-pipelineyml.tsx
index 2510a6292f..109b0bd751 100644
--- a/shell/app/modules/application/pages/repo/components/add-pipelineyml.tsx
+++ b/shell/app/modules/application/pages/repo/components/add-pipelineyml.tsx
@@ -136,7 +136,7 @@ const AddPipelineYml = () => {
           if (error) {
             return;
           }
-          const data = {
+          commit({
             ...values,
             actions: [
               {
@@ -146,8 +146,7 @@ const AddPipelineYml = () => {
                 pathType: 'blob',
               },
             ],
-          };
-          commit(data).then((res: any) => {
+          }).then((res: any) => {
             if (res.success) {
               cancelEdit();
               message.success(i18n.t('application:create file successfully'));
diff --git a/shell/app/modules/application/pages/repo/components/audit-template-manager.tsx b/shell/app/modules/application/pages/repo/components/audit-template-manager.tsx
index 5fcddfba13..6a8fc199c7 100644
--- a/shell/app/modules/application/pages/repo/components/audit-template-manager.tsx
+++ b/shell/app/modules/application/pages/repo/components/audit-template-manager.tsx
@@ -65,10 +65,10 @@ export const AuditTemplateManager = () => {
   });
 
   const handleSubmit = (content: string) => {
-    const data = {
+    commit({
       actions: [
         {
-          action: 'add',
+          action: 'update',
           content,
           path: 'audit/template.json',
           pathType: 'blob',
@@ -76,8 +76,7 @@ export const AuditTemplateManager = () => {
       ],
       branch,
       message: 'Update template.json',
-    };
-    commit(data).then((res) => {
+    }).then((res) => {
       if (res.success) {
         message.success(i18n.t('application:update file successfully'));
         getRepoBlob();
diff --git a/shell/app/modules/application/pages/repo/components/repo-editor.tsx b/shell/app/modules/application/pages/repo/components/repo-editor.tsx
index 9025b42eac..0ff805eccd 100644
--- a/shell/app/modules/application/pages/repo/components/repo-editor.tsx
+++ b/shell/app/modules/application/pages/repo/components/repo-editor.tsx
@@ -82,22 +82,21 @@ const RepoEditor = ({ autoHeight, maxLines, ops, isDiceOrPipelineFile, name, blo
       }
     }
 
-    form.validateFields((error: Error, values: Pick<REPOSITORY.Commit, 'message'| 'branch'>) => {
+    form.validateFields((error: Error, values: Pick<REPOSITORY.Commit, 'message' | 'branch'>) => {
       if (error) {
         return;
       }
-      const data = {
+      commit({
         ...values,
         actions: [
           {
-            action: 'add',
+            action: isAddMode ? 'add' : 'update',
             content: state.value,
             path,
             pathType: 'blob',
           },
         ],
-      };
-      commit(data).then((res) => {
+      }).then((res) => {
         if (res.success) {
           changeMode({ editFile: false, addFile: false });
           if (isAddMode) {
@@ -131,14 +130,14 @@ const RepoEditor = ({ autoHeight, maxLines, ops, isDiceOrPipelineFile, name, blo
         name: 'branch',
         type: 'select',
         initialValue: branch || 'master',
-        options: branches.map((a:string) => ({ name: a, value: a })),
+        options: branches.map((a: string) => ({ name: a, value: a })),
         itemProps: {
           placeholder: i18n.t('application:submit branch'),
           disabled: true,
         },
       },
       {
-        getComp: ({ form }: {form: any}) => (
+        getComp: ({ form }: { form: any }) => (
           <div>
             <Button type="primary" onClick={() => handleSubmit(form)}>
               {i18n.t('application:save')}
diff --git a/shell/app/modules/application/pages/repo/components/repo-file-container.tsx b/shell/app/modules/application/pages/repo/components/repo-file-container.tsx
index 0f00df8577..06200a5231 100644
--- a/shell/app/modules/application/pages/repo/components/repo-file-container.tsx
+++ b/shell/app/modules/application/pages/repo/components/repo-file-container.tsx
@@ -74,7 +74,7 @@ const RepoFileContainerComp = (props: IProps) => {
   }, [isDiceOrPipelineFile, getRepoBlobLoading, parsePipelineYmlStructureLoading, pipelineYmlStructure, updater]);
 
   const handleDelete = (values: Pick<REPOSITORY.Commit, 'message'| 'branch'>) => {
-    const data = {
+    commit({
       ...values,
       actions: [
         {
@@ -83,8 +83,7 @@ const RepoFileContainerComp = (props: IProps) => {
           pathType: 'blob',
         },
       ],
-    };
-    commit(data).then((res) => {
+    }).then((res) => {
       toggleModal(false);
       if (res.success) {
         message.success(i18n.t('application:delete file successfully'));
@@ -193,19 +192,18 @@ const RepoFileContainerComp = (props: IProps) => {
     const { path } = tree;
     const { branch } = getInfoFromRefName(tree.refName);
 
-    const data = {
+    commit({
       branch,
       message: `Update ${path}`,
       actions: [
         {
-          action: 'add',
+          action: 'update',
           content: ymlContent,
           path,
           pathType: 'blob',
         },
       ],
-    };
-    commit(data).then((res) => {
+    }).then((res) => {
       if (res.success) {
         changeMode({ editFile: false, addFile: false });
         message.success(i18n.t('application:modify file successfully'));
diff --git a/shell/app/modules/application/pages/repo/components/repo-mr-form.tsx b/shell/app/modules/application/pages/repo/components/repo-mr-form.tsx
index 62a601a76c..aba45f9229 100644
--- a/shell/app/modules/application/pages/repo/components/repo-mr-form.tsx
+++ b/shell/app/modules/application/pages/repo/components/repo-mr-form.tsx
@@ -396,7 +396,7 @@ class RepoMRForm extends React.PureComponent<IProps, IState> {
     const { templateConfig, getTemplateConfig } = this.props;
     const { tplContent } = this.state;
     const { branch, path } = templateConfig;
-    const data = {
+    this.props.commit({
       message: `Add merge request template: ${values.name}`,
       branch,
       actions: [
@@ -407,8 +407,7 @@ class RepoMRForm extends React.PureComponent<IProps, IState> {
           pathType: 'blob',
         },
       ],
-    };
-    this.props.commit(data).then((res: any) => {
+    }).then((res: any) => {
       if (res.success) {
         message.success(i18n.t('template was created successfully'));
         this.toggleTplModel(false);
diff --git a/shell/app/modules/application/pages/repo/components/repo-nav.tsx b/shell/app/modules/application/pages/repo/components/repo-nav.tsx
index 8768a5d3ca..9fd4427733 100644
--- a/shell/app/modules/application/pages/repo/components/repo-nav.tsx
+++ b/shell/app/modules/application/pages/repo/components/repo-nav.tsx
@@ -72,9 +72,9 @@ const PureRepoNavOperation = () => {
     return fieldsList;
   };
 
-  const handleAdd = ({ dirName, ...values }: {dirName: string}) => {
+  const handleAdd = ({ dirName, ...values }: { dirName: string, message: string, branch: string }) => {
     const path = `${tree.path ? `${tree.path}/` : tree.path}${dirName}`;
-    const data = {
+    commit({
       ...values,
       actions: [
         {
@@ -83,8 +83,7 @@ const PureRepoNavOperation = () => {
           pathType: 'tree',
         },
       ],
-    };
-    commit(data).then((res) => {
+    }).then((res) => {
       toggleModal(false);
       if (res.success) {
         getRepoTree();
diff --git a/shell/app/modules/application/pages/repo/components/yml-editor.tsx b/shell/app/modules/application/pages/repo/components/yml-editor.tsx
index a8fcddf297..86a2beb86d 100644
--- a/shell/app/modules/application/pages/repo/components/yml-editor.tsx
+++ b/shell/app/modules/application/pages/repo/components/yml-editor.tsx
@@ -337,7 +337,7 @@ const YmlEditor = (props: IProps) => {
 
   const handleDelete = (values: any) => {
     const { path } = tree;
-    const data = {
+    commit({
       ...values,
       actions: [
         {
@@ -346,8 +346,7 @@ const YmlEditor = (props: IProps) => {
           pathType: 'blob',
         },
       ],
-    };
-    commit(data).then((res: any) => {
+    }).then((res: any) => {
       toggleModal(false);
       if (res.success) {
         message.success(i18n.t('application:delete file successfully'));
@@ -663,21 +662,20 @@ const YmlEditor = (props: IProps) => {
   const commitData = (commitContent: string, values: any) => {
     const { path } = tree;
     const { branch, message: commitMsg } = values;
-    const data = {
+    updater.openDrawer(false);
+
+    commit({
       branch,
       message: commitMsg || `Update ${fileName}`,
       actions: [
         {
           content: commitContent,
           path,
-          action: 'add',
+          action: 'update',
           pathType: 'blob',
         },
       ],
-    };
-    updater.openDrawer(false);
-
-    commit(data).then(() => {
+    }).then(() => {
       changeMode({
         editFile: false,
         addFile: false,
diff --git a/shell/app/modules/application/types/repo.d.ts b/shell/app/modules/application/types/repo.d.ts
index 6977f80fbe..37a9587ac2 100644
--- a/shell/app/modules/application/types/repo.d.ts
+++ b/shell/app/modules/application/types/repo.d.ts
@@ -255,7 +255,7 @@ declare namespace REPOSITORY {
   }
 
   interface CommitAction {
-    action: string;
+    action: 'add' | 'update' | 'delete';
     content?: string;
     path: string,
     pathType: string,