From 3848a98570a24b163f4e43e9e4bcb0e338ef76a1 Mon Sep 17 00:00:00 2001
From: Vardan Bansal <vardan.bansal@harness.io>
Date: Thu, 7 Sep 2023 11:29:58 -0700
Subject: [PATCH] Fix commit logic

---
 .../pages/AddUpdatePipeline/AddUpdatePipeline.tsx | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/web/src/pages/AddUpdatePipeline/AddUpdatePipeline.tsx b/web/src/pages/AddUpdatePipeline/AddUpdatePipeline.tsx
index 77a3562fb..2b86cd0fb 100644
--- a/web/src/pages/AddUpdatePipeline/AddUpdatePipeline.tsx
+++ b/web/src/pages/AddUpdatePipeline/AddUpdatePipeline.tsx
@@ -22,7 +22,7 @@ import pipelineSchema from './schema/pipeline-schema.json'
 import css from './AddUpdatePipeline.module.scss'
 
 const starterPipelineAsString =
-  'stages:\n- type: ci\n  spec:\n    steps:\n    - type: script\n      spec:\n        run: echo hello world'
+  'version: 1\nstages:\n- type: ci\n  spec:\n    steps:\n    - type: script\n      spec:\n        run: echo hello world'
 
 const AddUpdatePipeline = (): JSX.Element => {
   const { routes } = useAppContext()
@@ -46,7 +46,7 @@ const AddUpdatePipeline = (): JSX.Element => {
     lazy: !repoMetadata
   })
 
-  const { data: resourceContent, loading: resourceLoading } = useGetResourceContent({
+  const { data: pipelineYAMLFileContent, loading: resourceLoading } = useGetResourceContent({
     repoMetadata,
     gitRef: pipelineData?.default_branch || '',
     resourcePath: pipelineData?.config_path || ''
@@ -54,9 +54,9 @@ const AddUpdatePipeline = (): JSX.Element => {
 
   useEffect(() => {
     if (!resourceLoading) {
-      setIsExistingPipeline(!isEmpty(pipelineData) && !isUndefined(pipelineData.id))
+      setIsExistingPipeline(!isEmpty(pipelineYAMLFileContent) && !isUndefined(pipelineYAMLFileContent.content))
     }
-  }, [resourceContent, resourceLoading])
+  }, [pipelineYAMLFileContent, resourceLoading])
 
   const handleSaveAndRun = (): void => {
     try {
@@ -66,7 +66,7 @@ const AddUpdatePipeline = (): JSX.Element => {
             action: isExistingPipeline ? 'UPDATE' : 'CREATE',
             path: pipelineData?.config_path,
             payload: pipelineAsYAML,
-            sha: isExistingPipeline ? resourceContent?.sha : ''
+            sha: isExistingPipeline ? pipelineYAMLFileContent?.sha : ''
           }
         ],
         branch: repoMetadata?.default_branch,
@@ -122,9 +122,8 @@ const AddUpdatePipeline = (): JSX.Element => {
                 language={'yaml'}
                 schema={pipelineSchema}
                 source={
-                  isExistingPipeline
-                    ? decodeGitContent((resourceContent?.content as RepoFileContent)?.data)
-                    : starterPipelineAsString
+                  decodeGitContent((pipelineYAMLFileContent?.content as RepoFileContent)?.data) ||
+                  starterPipelineAsString
                 }
                 onChange={(value: string) => setPipelineAsYaml(value)}
               />