feat: revert optional namespace for virtual env

Author: arunjaindev

src/Pages/GlobalConfigurations/ClustersAndEnvironments/ClusterEnvironmentDrawer/ClusterEnvironmentDrawer.tsx

@@ -105,9 +105,6 @@ export const ClusterEnvironmentDrawer = ({
         error: ServerErrors
     }>(INITIAL_NAMESPACES)
 
-    // Need different state since validations change on basis of this state
-    const [isSelectedClusterVirtual, setIsSelectedClusterVirtual] = useState(isVirtualCluster ?? false)
-
     const [clusterListLoading, clusterListResult, clusterListError, reloadClusterList] = useAsync(
         () => getClusterListing(true),
         [],
@@ -123,8 +120,9 @@ export const ClusterEnvironmentDrawer = ({
             isProduction: !!isProduction,
             category: category ?? null,
             description: description ?? '',
+            isVirtualCluster,
         },
-        validations: clusterEnvironmentDrawerFormValidationSchema({ isNamespaceMandatory: !isSelectedClusterVirtual }),
+        validations: clusterEnvironmentDrawerFormValidationSchema(),
     })
 
     const [, clusterDetails] = useAsync(
@@ -135,10 +133,10 @@ export const ClusterEnvironmentDrawer = ({
 
     useEffect(() => {
         if (clusterDetails) {
-            setIsSelectedClusterVirtual(clusterDetails[0].isVirtualCluster)
             setClusterNamespaces(INITIAL_NAMESPACES)
             setNamespaceLabels(INITIAL_NAMESPACE_LABELS)
-            reset(data, { keepErrors: false })
+            const updatedData = { ...data, isVirtualCluster: clusterDetails[0]?.isVirtualCluster ?? false }
+            reset(updatedData, { keepErrors: false })
         }
     }, [clusterDetails])
 
@@ -209,11 +207,10 @@ export const ClusterEnvironmentDrawer = ({
                 envId,
                 namespaceLabels: namespaceLabels.labels,
                 resourceVersion: namespaceLabels.resourceVersion,
-                isVirtualCluster: isSelectedClusterVirtual,
             })
 
             let api
-            if (isSelectedClusterVirtual) {
+            if (data.isVirtualCluster) {
                 api = getVirtualClusterSaveUpdate(envId)
             } else {
                 api = envId ? updateEnvironment : saveEnvironment
@@ -284,7 +281,6 @@ export const ClusterEnvironmentDrawer = ({
     const onDelete = async () => {
         const payload = getClusterEnvironmentUpdatePayload({
             data,
-            isVirtualCluster: isSelectedClusterVirtual,
             envId,
         })
         await deleteEnvironment(payload)
@@ -369,7 +365,7 @@ export const ClusterEnvironmentDrawer = ({
                             {...register('namespace')}
                             label="Namespace"
                             shouldTrim={false}
-                            required={!isSelectedClusterVirtual}
+                            required
                         />
 
                         <CustomInput
@@ -423,7 +419,7 @@ export const ClusterEnvironmentDrawer = ({
                             </div>
                         )}
 
-                        {EnvironmentLabels && !isSelectedClusterVirtual && (
+                        {EnvironmentLabels && !data.isVirtualCluster && (
                             <div className="dc__border-top-n1 pt-16">
                                 <EnvironmentLabels
                                     tags={namespaceLabels.labels}

src/Pages/GlobalConfigurations/ClustersAndEnvironments/ClusterEnvironmentDrawer/schema.ts

@@ -18,11 +18,7 @@ import { UseFormValidations } from '@devtron-labs/devtron-fe-common-lib'
 
 import { EnvironmentFormType } from './types'
 
-export const clusterEnvironmentDrawerFormValidationSchema = ({
-    isNamespaceMandatory,
-}: {
-    isNamespaceMandatory: boolean
-}): UseFormValidations<EnvironmentFormType> => ({
+export const clusterEnvironmentDrawerFormValidationSchema = (): UseFormValidations<EnvironmentFormType> => ({
     clusterId: {
         required: true,
         pattern: [{ message: 'Please select a cluster', value: /^(?!0$)\d+$/ }],
@@ -36,19 +32,15 @@ export const clusterEnvironmentDrawerFormValidationSchema = ({
             { message: 'Minimum 1 and Maximum 16 characters required', value: /^.{1,16}$/ },
         ],
     },
-    ...(isNamespaceMandatory
-        ? {
-              namespace: {
-                  required: true,
-                  pattern: [
-                      { message: 'Namespace is required', value: /^.*$/ },
-                      { message: "Use only lowercase alphanumeric characters or '-'", value: /^[a-z0-9-]+$/ },
-                      { message: "Cannot start/end with '-'", value: /^(?![-]).*[^-]$/ },
-                      { message: 'Maximum 63 characters required', value: /^.{1,63}$/ },
-                  ],
-              },
-          }
-        : {}),
+    namespace: {
+        required: true,
+        pattern: [
+            { message: 'Namespace is required', value: /^.*$/ },
+            { message: "Use only lowercase alphanumeric characters or '-'", value: /^[a-z0-9-]+$/ },
+            { message: "Cannot start/end with '-'", value: /^(?![-]).*[^-]$/ },
+            { message: 'Maximum 63 characters required', value: /^.{1,63}$/ },
+        ],
+    },
     isProduction: {
         required: true,
         pattern: { message: 'token is required', value: /[^]+/ },

src/Pages/GlobalConfigurations/ClustersAndEnvironments/ClusterEnvironmentDrawer/types.ts

@@ -36,15 +36,14 @@ export type EnvDrawerProps = { reload: () => void; hideClusterDrawer: () => void
     | ({ drawerType: 'editEnv'; clusterId: number; clusterName: string } & EnvDetails)
 )
 
-export type EnvironmentFormType = Omit<EnvDetails, 'isVirtualCluster' | 'envId'> & {
+export type EnvironmentFormType = Omit<EnvDetails, 'envId'> & {
     clusterId: number
 }
 
 export type GetClusterEnvironmentUpdatePayloadType = Partial<Pick<ClusterNamespacesDTO, 'resourceVersion'>> & {
     data: EnvironmentFormType
     envId: number
     namespaceLabels?: TagType[]
-    isVirtualCluster: boolean
 }
 
 interface ClusterNamespacesLabel {

src/Pages/GlobalConfigurations/ClustersAndEnvironments/ClusterEnvironmentDrawer/utils.ts

@@ -25,9 +25,8 @@ export const getClusterEnvironmentUpdatePayload = ({
     envId,
     namespaceLabels,
     resourceVersion,
-    isVirtualCluster,
 }: GetClusterEnvironmentUpdatePayloadType) =>
-    isVirtualCluster
+    data.isVirtualCluster
         ? {
               id: envId,
               environment_name: data.envName,