From 105932fac2c13b4240a24f5fc15b0b87a80621c0 Mon Sep 17 00:00:00 2001
From: Amit Kumar Das <40661238+amityt@users.noreply.github.com>
Date: Thu, 4 Mar 2021 16:45:49 +0530
Subject: [PATCH] Removed generateName in upload YAML functionality (#2498)

* Fixed an edge case for generateName in upload YAML
* Minor fix

Signed-off-by: Amit Kumar Das <amitkumar.das@mayadata.io>
---
 .../frontend/src/components/WorkflowCard/styles.ts  |  2 +-
 .../src/views/CreateWorkflow/TuneWorkflow/index.tsx | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/litmus-portal/frontend/src/components/WorkflowCard/styles.ts b/litmus-portal/frontend/src/components/WorkflowCard/styles.ts
index 89b444149..306c16900 100644
--- a/litmus-portal/frontend/src/components/WorkflowCard/styles.ts
+++ b/litmus-portal/frontend/src/components/WorkflowCard/styles.ts
@@ -7,7 +7,7 @@ const useStyles = makeStyles((theme) => ({
     background: theme.palette.cards.background,
     height: '16rem',
     width: '11.875rem',
-    borderRadius: '3rem',
+    borderRadius: 3,
     fontSize: '0.875rem',
     textAlign: 'center',
     cursor: 'pointer',
diff --git a/litmus-portal/frontend/src/views/CreateWorkflow/TuneWorkflow/index.tsx b/litmus-portal/frontend/src/views/CreateWorkflow/TuneWorkflow/index.tsx
index 5ef01084b..3be05f185 100644
--- a/litmus-portal/frontend/src/views/CreateWorkflow/TuneWorkflow/index.tsx
+++ b/litmus-portal/frontend/src/views/CreateWorkflow/TuneWorkflow/index.tsx
@@ -103,7 +103,10 @@ const TuneWorkflow: React.FC = () => {
       .then((data) => {
         data.text().then((yamlText) => {
           const parsedYaml = YAML.parse(yamlText);
-          delete parsedYaml.metadata.generateName;
+          // Edge case to remove the generateName Field
+          if (parsedYaml.metadata.generateName) {
+            delete parsedYaml.metadata.generateName;
+          }
           parsedYaml.metadata.name = workflowData.name;
           const modifiedYAML = changeEngineName(parsedYaml);
           setYamlFile(modifiedYAML);
@@ -126,7 +129,13 @@ const TuneWorkflow: React.FC = () => {
     if (yaml === 'none' || yaml === '') {
       fetchYaml(link);
     } else {
-      const modifiedYAML = changeEngineName(YAML.parse(yaml));
+      const parsedYaml = YAML.parse(yaml);
+      // Edge case to remove the generateName Field
+      if (parsedYaml.metadata.generateName) {
+        delete parsedYaml.metadata.generateName;
+      }
+      parsedYaml.metadata.name = workflowData.name;
+      const modifiedYAML = changeEngineName(parsedYaml);
       workflow.setWorkflowDetails({
         yaml: modifiedYAML,
       });