Merge branch 'develop' of https://github.com/devtron-labs/dashboard into fix/trigger-view

Author: AbhishekA1509

.eslintignore

@@ -4,6 +4,7 @@
 *.test.tsx
 .eslintrc.js
 vite.config.mts
+scripts/
 
 # The following files have eslint errors/warnings
 src/Pages/GlobalConfigurations/Authorization/APITokens/__tests__/ApiTokens.test.tsx
@@ -126,7 +127,6 @@ src/components/app/list/appList.modal.ts
 src/components/app/list/emptyView/Empty.tsx
 src/components/app/list/expandedRow/ExpandedRow.tsx
 src/components/app/service.ts
-src/components/bulkEdits/BulkEdits.tsx
 src/components/bulkEdits/bulkedit.utils.tsx
 src/components/cdPipeline/BuildCD.tsx
 src/components/cdPipeline/CDPipeline.tsx

.gitignore

@@ -52,3 +52,6 @@ yalc.lock
 !.yarn/sdks
 !.yarn/versions
 .pnp.*
+
+.env.secrets
+scripts/

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.18.0-beta-0",
+        "@devtron-labs/devtron-fe-common-lib": "1.18.1-pre-6",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",
@@ -49,6 +49,7 @@
         "lint": "tsc --noEmit && eslint 'src/**/*.{js,jsx,ts,tsx}' --max-warnings 0",
         "lint-fix": "eslint 'src/**/*.{js,jsx,ts,tsx}' --fix",
         "start": "vite --open",
+        "dev": "node scripts/secrets-mgr.js",
         "build": "NODE_OPTIONS=--max_old_space_size=8192 vite build",
         "serve": "vite preview",
         "build-light": "NODE_OPTIONS=--max_old_space_size=8192 GENERATE_SOURCEMAP=false vite build",

src/Pages/ChartStore/ChartDetails/ChartDetailsAbout.tsx

@@ -118,16 +118,18 @@ export const ChartDetailsAbout = ({ chartDetails, isLoading }: ChartDetailsAbout
     return (
         <div className="flexbox-col dc__gap-20 mw-none">
             <div className="flexbox-col dc__gap-12">
-                <ImageWithFallback
-                    imageProps={{
-                        src: icon,
-                        alt: 'chart-icon',
-                        className: 'br-6',
-                        height: 48,
-                        width: 48,
-                    }}
-                    fallbackImage={<Icon name="ic-helm" color="N700" size={48} />}
-                />
+                <div className="h-48 dc__mxw-200">
+                    <ImageWithFallback
+                        imageProps={{
+                            src: icon,
+                            alt: 'chart-icon',
+                            className: 'br-6',
+                            height: '100%',
+                            width: 'auto',
+                        }}
+                        fallbackImage={<Icon name="ic-helm" color="N700" size={48} />}
+                    />
+                </div>
                 <h2 className="m-0 fs-16 lh-24 fw-6 cn-9">{name}</h2>
                 <p className="m-0 fs-13 lh-20 cn-9">{description}</p>
             </div>

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,