Merge branch 'develop' of https://github.com/devtron-labs/dashboard into feat/deployment-status-modal

Author: AbhishekA1509

.eslintignore

@@ -52,7 +52,6 @@ src/components/CIPipelineN/ciPipeline.utils.tsx
 src/components/ClusterNodes/ClusterEvents.tsx
 src/components/ClusterNodes/ClusterManifest.tsx
 src/components/ClusterNodes/ClusterNodeEmptyStates.tsx
-src/components/ClusterNodes/ClusterOverview.tsx
 src/components/ClusterNodes/NodeActions/EditTaintsModal.tsx
 src/components/ClusterNodes/NodeActions/NodeActionsMenu.tsx
 src/components/ClusterNodes/NodeActions/validationRules.ts
@@ -208,7 +207,6 @@ src/components/ciPipeline/ciPipeline.service.ts
 src/components/ciPipeline/validationRules.ts
 src/components/cluster/Cluster.tsx
 src/components/cluster/ClusterComponentModal.tsx
-src/components/cluster/ClusterForm.tsx
 src/components/cluster/ClusterInfoStepsModal.tsx
 src/components/cluster/ClusterInstallStatus.tsx
 src/components/cluster/UseNameListDropdown.tsx

.github/workflows/pr-issue-validator.yaml

@@ -1,4 +1,3 @@
-
 name: Validate Pull Request
 
 on:
@@ -141,4 +140,4 @@ jobs:
           gh pr edit $PRNUM --add-label "PR:Issue-verification-failed"
           gh pr edit $PRNUM --remove-label "PR:Ready-to-Review"
           exit 1
-        fi
+        fi

Dockerfile

@@ -1,38 +1,42 @@
 FROM node:20-alpine AS builder
 
-RUN apk add --no-cache git
-
 WORKDIR /app
-COPY package.json .
-COPY yarn.lock .
 
+COPY package.json yarn.lock .
+
+RUN apk add --no-cache git
 RUN yarn install --frozen-lockfile --network-timeout 600000
 
-COPY src/ src
-COPY nginx.conf .
-COPY tsconfig.json .
-COPY vite.config.mts .
 COPY . .
 
-RUN echo `git rev-parse --short=9 HEAD` > health.html
+RUN echo `git rev-parse --short HEAD` > health.html && \
+    echo "SENTRY_RELEASE_VERSION=dashboard@$(git rev-parse --short HEAD)" >> .env && \
+    yarn build
 
-RUN echo "SENTRY_RELEASE_VERSION=dashboard@$(git rev-parse --short HEAD)\n" >> .env
+FROM fholzer/nginx-brotli:v1.26.2
 
-RUN yarn build
+# Install bash
+RUN apk add --no-cache bash shadow
 
-FROM nginx:stable
+RUN useradd -m -s /bin/bash devtron
 
-RUN useradd -ms /bin/bash devtron
 COPY --from=builder /app/dist/ /usr/share/nginx/html
 COPY ./nginx.conf /etc/nginx/nginx.conf
 COPY ./nginx-default.conf /etc/nginx/conf.d/default.conf
+
 WORKDIR /usr/share/nginx/html
-COPY --from=builder  /app/./env.sh .
-COPY --from=builder  /app/.env .
-COPY --from=builder  /app/health.html .
 
-RUN chown -R devtron:devtron /usr/share/nginx/html
-# Make our shell script executable
-RUN chmod +x env.sh
+
+COPY --from=builder /app/env.sh .
+COPY --from=builder /app/.env .
+COPY --from=builder /app/health.html .
+
+RUN chown -R devtron:devtron /usr/share/nginx/html && \
+    chmod +x env.sh
+
 USER devtron
-CMD ["/bin/bash", "-c", "/usr/share/nginx/html/env.sh && nginx -g \"daemon off;\""]
+
+# Override the default ENTRYPOINT to allow shell scripting as fholzer/nginx-brotli has by-default entrypoint of nginx
+ENTRYPOINT ["/bin/bash", "-c"]
+
+CMD ["./env.sh && nginx -g 'daemon off;'"]

nginx.conf

@@ -20,6 +20,7 @@ http {
     #tcp_nopush     on;
     keepalive_timeout  65;
 
+    # gzip compression
     gzip  on;
     gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript image/svg+xml;
     gzip_vary on;
@@ -28,5 +29,11 @@ http {
     gzip_comp_level 6;
     gzip_static on;
 
+    # btrotli compression
+    brotli on;
+    brotli_comp_level 6;
+    brotli_static on;
+    brotli_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript image/svg+xml;
+
     include /etc/nginx/conf.d/*.conf;
 }

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.13.0-beta-5",
+        "@devtron-labs/devtron-fe-common-lib": "1.13.0-pre-5",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",

src/Pages/App/Details/ExternalFlux/ExternalFluxAppDetails.tsx

@@ -69,9 +69,12 @@ const ExternalFluxAppDetails = () => {
         setAppDetailsError(null)
     }
 
+    /**
+     * Throws error in case request is aborted
+     */
     const handleFetchExternalFluxCDAppDetails = () =>
         // NOTE: returning a promise so that we can trigger the next timeout after this api call completes
-        new Promise<void>((resolve) => {
+        new Promise<void>((resolve, reject) => {
             setIsReloadResourceTreeInProgress(true)
 
             abortPreviousRequests(
@@ -87,6 +90,8 @@ const ExternalFluxAppDetails = () => {
                         } else {
                             setAppDetailsError(error)
                         }
+                    } else {
+                        reject(error)
                     }
                 })
                 .finally(() => {
@@ -107,7 +112,11 @@ const ExternalFluxAppDetails = () => {
     }
 
     const handleReloadResourceTree = async () => {
-        await handleFetchExternalFluxCDAppDetails()
+        try {
+            await handleFetchExternalFluxCDAppDetails()
+        } catch {
+            // do nothing
+        }
     }
 
     useEffect(() => {

src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/constants.tsx

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { EnterpriseTag, OverrideMergeStrategyType, SelectPickerOptionType } from '@devtron-labs/devtron-fe-common-lib'
+import { Icon, OverrideMergeStrategyType, SelectPickerOptionType } from '@devtron-labs/devtron-fe-common-lib'
 
 import { importComponentFromFELibrary } from '@Components/common'
 
@@ -37,7 +37,11 @@ export const MERGE_STRATEGY_OPTIONS: SelectPickerOptionType[] = [
         label: (
             <div className="flexbox dc__gap-8">
                 <span>Patch</span>
-                {!isFELibAvailable && <EnterpriseTag />}
+                {!isFELibAvailable && (
+                    <div className="dc__fill-available-space dc__w-fit-content h-20">
+                        <Icon name="ic-enterprise-tag" size={null} color={null} />
+                    </div>
+                )}
             </div>
         ),
         description: 'Override values for specific keys',

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

@@ -15,6 +15,7 @@
  */
 
 import { useEffect, useState } from 'react'
+import { generatePath } from 'react-router-dom'
 
 import {
     Button,
@@ -32,6 +33,7 @@ import {
     TagType,
     ToastManager,
     ToastVariantType,
+    Tooltip,
     useForm,
     UseFormSubmitHandler,
 } from '@devtron-labs/devtron-fe-common-lib'
@@ -45,6 +47,7 @@ import { ADD_ENVIRONMENT_FORM_LOCAL_STORAGE_KEY } from '@Components/cluster/cons
 import { importComponentFromFELibrary } from '@Components/common'
 import { URLS } from '@Config/routes'
 
+import { CreateClusterTypeEnum } from '../CreateCluster/types'
 import { EnvironmentDeleteComponent } from '../EnvironmentDeleteComponent'
 import { clusterEnvironmentDrawerFormValidationSchema } from './schema'
 import { ClusterEnvironmentDrawerFormProps, ClusterEnvironmentDrawerProps, ClusterNamespacesDTO } from './types'
@@ -61,12 +64,12 @@ export const ClusterEnvironmentDrawer = ({
     namespace,
     id,
     clusterId,
-    prometheusEndpoint,
     isProduction,
     description,
     reload,
     hideClusterDrawer,
     isVirtual,
+    clusterName,
 }: ClusterEnvironmentDrawerProps) => {
     // STATES
     // Manages the loading state for create and update actions
@@ -89,6 +92,8 @@ export const ClusterEnvironmentDrawer = ({
         error: null,
     })
 
+    const addEnvironmentHeaderText = `Add Environment in '${clusterName}'`
+
     /**
      * Fetches the list of namespaces from the cluster and updates the state accordingly. \
      * Optionally sets namespace labels after the fetch is complete.
@@ -169,7 +174,6 @@ export const ClusterEnvironmentDrawer = ({
                 clusterId,
                 id,
                 namespaceLabels: namespaceLabels.labels,
-                prometheusEndpoint,
                 resourceVersion: namespaceLabels.resourceVersion,
                 isVirtual,
             })
@@ -248,7 +252,6 @@ export const ClusterEnvironmentDrawer = ({
             data,
             clusterId,
             id,
-            prometheusEndpoint,
             isVirtual,
         })
         await deleteEnvironment(payload)
@@ -259,7 +262,9 @@ export const ClusterEnvironmentDrawer = ({
         <Button
             dataTestId="add_cluster_button"
             linkProps={{
-                to: URLS.GLOBAL_CONFIG_CREATE_CLUSTER,
+                to: generatePath(URLS.GLOBAL_CONFIG_CREATE_CLUSTER, {
+                    type: CreateClusterTypeEnum.CONNECT_CLUSTER,
+                }),
             }}
             component={ButtonComponentType.link}
             startIcon={<ICAdd />}
@@ -400,7 +405,12 @@ export const ClusterEnvironmentDrawer = ({
         <Drawer position="right" width="800px" onEscape={hideClusterDrawer} onClose={hideClusterDrawer}>
             <div className="h-100 bg__primary flexbox-col" onClick={stopPropagation}>
                 <div className="flexbox dc__align-items-center dc__content-space dc__border-bottom bg__primary py-12 px-20">
-                    <h3 className="m-0 fs-16 fw-6 lh-1-43">{id ? 'Edit Environment' : 'Add Environment'}</h3>
+                    {/* NOTE: only in case of add environment, can we have truncation */}
+                    <Tooltip content={addEnvironmentHeaderText}>
+                        <h3 className="m-0 fs-16 fw-6 lh-1-43 dc__truncate">
+                            {id ? 'Edit Environment' : addEnvironmentHeaderText}
+                        </h3>
+                    </Tooltip>
                     <button
                         type="button"
                         aria-label="close-btn"

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

@@ -26,15 +26,15 @@ export interface ClusterEnvironmentDrawerFormProps {
 export interface ClusterEnvironmentDrawerProps extends ClusterEnvironmentDrawerFormProps {
     id: string
     clusterId: number
-    prometheusEndpoint: string
     reload: () => void
     hideClusterDrawer: () => void
     isVirtual: boolean
+    clusterName: string
 }
 
 export type GetClusterEnvironmentUpdatePayloadType = Pick<
     ClusterEnvironmentDrawerProps,
-    'clusterId' | 'id' | 'prometheusEndpoint' | 'isVirtual'
+    'clusterId' | 'id' | 'isVirtual'
 > &
     Partial<Pick<ClusterNamespacesDTO, 'resourceVersion'>> & {
         data: ClusterEnvironmentDrawerFormProps

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

@@ -19,7 +19,6 @@ import { ClusterNamespacesDTO, GetClusterEnvironmentUpdatePayloadType } from './
 export const getClusterEnvironmentUpdatePayload = ({
     id,
     data,
-    prometheusEndpoint,
     clusterId,
     namespaceLabels,
     resourceVersion,
@@ -38,7 +37,6 @@ export const getClusterEnvironmentUpdatePayload = ({
               id,
               environment_name: data.environmentName,
               cluster_id: clusterId,
-              prometheus_endpoint: prometheusEndpoint,
               namespace: data.namespace || '',
               active: true,
               default: data.isProduction,