Merge branch 'develop' of github.com:devtron-labs/dashboard into feat/grouped-filter-select-picker

Author: RohitRaj011

.env

@@ -74,3 +74,5 @@ FEATURE_MANAGE_TRAFFIC_ENABLE=false
 FEATURE_REDFISH_NODE_ENABLE=false
 FEATURE_INFRA_PROVISION_INFO_BLOCK_HIDE=false
 FEATURE_GROUPED_APP_LIST_FILTERS_ENABLE=false
+FEATURE_FLUX_DEPLOYMENTS_ENABLE=false
+FEATURE_LINK_EXTERNAL_FLUX_ENABLE=false

.eslintignore

@@ -238,7 +238,6 @@ src/components/common/hooks/__tests__/FileReader.test.tsx
 src/components/common/icons/Icons.tsx
 src/components/common/lineChart/lineChart.tsx
 src/components/common/navigation/Navigation.tsx
-src/components/common/navigation/NavigationRoutes.tsx
 src/components/dockerRegistry/Docker.tsx
 src/components/dockerRegistry/ManageRegistry.tsx
 src/components/dockerRegistry/service.tsx

Dockerfile

@@ -15,9 +15,9 @@ RUN yarn install --immutable --network-timeout 600000
 
 COPY . .
 
-RUN echo `git rev-parse --short HEAD` > health.html && \
+RUN echo `git rev-parse --short=9 HEAD` > health.html && \
     echo "" >> .env && \
-    echo "SENTRY_RELEASE_VERSION=dashboard@$(git rev-parse --short HEAD)" >> .env && \
+    echo "SENTRY_RELEASE_VERSION=dashboard@$(git rev-parse --short=9 HEAD)" >> .env && \
     yarn build
 
 FROM fholzer/nginx-brotli:v1.26.2
@@ -33,7 +33,6 @@ 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 .

config.md

@@ -50,5 +50,7 @@
 | FEATURE_USER_DEFINED_GITOPS_REPO_ENABLE                   | false                                    | If enabled user can pass the manual gitops repo                                                                  |
 | SENTRY_RELEASE_VERSION                                    |                                          | Sentry release Version                                                                                           |
 | LOGIN_PAGE_IMAGE                                          |                                          | Login page image url                                                                                             |
+| FEATURE_FLUX_DEPLOYMENTS_ENABLE                           | false                                    | Enables flux cd deployment type for devtron apps and devtron charts                                              |
+| FEATURE_LINK_EXTERNAL_FLUX_ENABLE                         | false                                    | Enables external flux cd migration                                                                               |
 
 # DASHBOARD CONFIG SECRET

index.html

@@ -38,6 +38,8 @@
                     display: flex;
                     justify-content: center;
                     align-items: center;
+                    /* cannot use --bg-primary here, so using rgb */
+                    background: rgb(30, 31, 40);
                 "
             >
                 <svg width="80" height="80" viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg">

nginx.conf

@@ -20,7 +20,6 @@ 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;
@@ -29,10 +28,9 @@ http {
     gzip_comp_level 6;
     gzip_static on;
 
-    # btrotli compression
-    brotli on;
+    brotli off;
     brotli_comp_level 6;
-    brotli_static on;
+    brotli_static on; # enabling this will ensure to serve pre-compressed file only
     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.16.0-pre-2",
+        "@devtron-labs/devtron-fe-common-lib": "1.17.0-pre-0",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",

src/App.tsx

@@ -178,9 +178,7 @@ const App = () => {
         <div className={customThemeClassName}>
             <Suspense fallback={null}>
                 {validating ? (
-                    <div className="full-height-width">
-                        <DevtronProgressing parentClasses="h-100 flex bg__primary" classes="icon-dim-80" />
-                    </div>
+                    <DevtronProgressing parentClasses="full-height-width flex bg__primary" classes="icon-dim-80" />
                 ) : (
                     renderRoutesWithErrorBoundary()
                 )}

src/Pages/App/Configurations/WorkflowEditor/CDPipelineDeploymentAppType/CDPipelineDeploymentAppType.tsx

@@ -34,6 +34,8 @@ export const CDPipelineDeploymentAppType = ({
                 isGitOpsRepoNotConfigured={isGitOpsRepoNotConfigured}
                 gitOpsRepoConfigInfoBar={gitOpsRepoConfigInfoBar}
                 areGitopsCredentialsConfigured={!isGitOpsInstalledButNotConfigured}
+                // Want to show this when gitops module is installed, does not matter if it is configured or not
+                showGitOpsOption={!noGitOpsModuleInstalledAndConfigured || isGitOpsInstalledButNotConfigured}
             />
         </div>
     )

src/Pages/App/Configurations/WorkflowEditor/CreateCICDPipeline/CreateCICDPipeline.tsx

@@ -113,7 +113,7 @@ export const CreateCICDPipeline = ({
             }
         }
 
-        if (deploymentAppType === DeploymentAppTypes.GITOPS && isGitOpsInstalledButNotConfigured) {
+        if (deploymentAppType === DeploymentAppTypes.ARGO && isGitOpsInstalledButNotConfigured) {
             ToastManager.showToast({
                 variant: ToastVariantType.error,
                 title: 'GitOps credentials not configured',