From 55f66f161e1c02a6e67d58e59adbdfe9f8559d05 Mon Sep 17 00:00:00 2001
From: Ali <83188384+testA113@users.noreply.github.com>
Date: Mon, 15 Jan 2024 10:56:53 +1300
Subject: [PATCH] fix(app): fix env var state and validation [EE-6232] (#10941)

Co-authored-by: testa113 <testa113>
---
 .../EnvironmentVariablesFieldset.tsx                      | 6 +++---
 .../form-components/EnvironmentVariablesFieldset/utils.ts | 1 +
 .../ApplicationForm/kubeEnvVarValidationSchema.ts         | 8 ++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/react/components/form-components/EnvironmentVariablesFieldset/EnvironmentVariablesFieldset.tsx b/app/react/components/form-components/EnvironmentVariablesFieldset/EnvironmentVariablesFieldset.tsx
index 5ad291eff..55b25b83c 100644
--- a/app/react/components/form-components/EnvironmentVariablesFieldset/EnvironmentVariablesFieldset.tsx
+++ b/app/react/components/form-components/EnvironmentVariablesFieldset/EnvironmentVariablesFieldset.tsx
@@ -45,15 +45,15 @@ export function EnvironmentVariablesFieldset({
 export function envVarValidation(): SchemaOf<Values> {
   return array(
     object({
-      name: string().required('Name is required'),
+      name: string().required('Environment variable name is required'),
       value: string().default(''),
       needsDeletion: boolean().default(false),
     })
   ).test(
     'unique',
-    'This environment variable is already defined.',
+    'This environment variable is already defined',
     buildUniquenessTest(
-      () => 'This environment variable is already defined.',
+      () => 'This environment variable is already defined',
       'name'
     )
   );
diff --git a/app/react/components/form-components/EnvironmentVariablesFieldset/utils.ts b/app/react/components/form-components/EnvironmentVariablesFieldset/utils.ts
index 7d17b9b84..f561dc5a4 100644
--- a/app/react/components/form-components/EnvironmentVariablesFieldset/utils.ts
+++ b/app/react/components/form-components/EnvironmentVariablesFieldset/utils.ts
@@ -35,6 +35,7 @@ export function parseArrayOfStrings(array: Array<string> = []): Array<EnvVar> {
       return {
         name: parsedKeyValArr[1].trim(),
         value: parsedKeyValArr[3].trim() || '',
+        needsDeletion: false,
       };
     })
   );
diff --git a/app/react/kubernetes/applications/ApplicationForm/kubeEnvVarValidationSchema.ts b/app/react/kubernetes/applications/ApplicationForm/kubeEnvVarValidationSchema.ts
index 5800aac99..c47f4ed9a 100644
--- a/app/react/kubernetes/applications/ApplicationForm/kubeEnvVarValidationSchema.ts
+++ b/app/react/kubernetes/applications/ApplicationForm/kubeEnvVarValidationSchema.ts
@@ -7,19 +7,19 @@ export function kubeEnvVarValidationSchema(): SchemaOf<EnvVar[]> {
   return array(
     object({
       name: string()
-        .required('Name is required')
+        .required('Environment variable name is required')
         .matches(
           /^[a-zA-Z][a-zA-Z0-9_.-]*$/,
-          `This field must consist of alphabetic characters, digits, '_', '-', or '.', and must not start with a digit (e.g. 'my.env-name', or 'MY_ENV.NAME', or 'MyEnvName1'.`
+          `This field must consist of alphabetic characters, digits, '_', '-', or '.', and must not start with a digit (e.g. 'my.env-name', or 'MY_ENV.NAME', or 'MyEnvName1'`
         ),
       value: string().default(''),
       needsDeletion: bool().default(false),
     })
   ).test(
     'unique',
-    'This environment variable is already defined.',
+    'This environment variable is already defined',
     buildUniquenessTest(
-      () => 'This environment variable is already defined.',
+      () => 'This environment variable is already defined',
       'name'
     )
   );