Merge branch 'feat/rb-table' of github.com:devtron-labs/dashboard into feat/table-storybook

Author: Elessar1802

.env

@@ -32,6 +32,9 @@ ENABLE_RESTART_WORKLOAD=false
 ENABLE_SCOPED_VARIABLES=true
 DEFAULT_CI_TRIGGER_TYPE_MANUAL=false
 ANNOUNCEMENT_BANNER_MSG=
+ANNOUNCEMENT_BANNER_TYPE=help
+ANNOUNCEMENT_BANNER_BUTTON_TEXT=
+ANNOUNCEMENT_BANNER_BUTTON_LINK=
 HIDE_DEFAULT_CLUSTER=false
 GLOBAL_API_TIMEOUT=60000
 TRIGGER_API_TIMEOUT=60000
@@ -61,6 +64,8 @@ FEATURE_CLUSTER_MAP_ENABLE=true
 FEATURE_DEFAULT_LANDING_RB_ENABLE=false
 FEATURE_ACTION_AUDIOS_ENABLE=true
 FEATURE_APPLICATION_TEMPLATES_ENABLE=true
-FEATURE_CODE_MIRROR_ENABLE=false
+FEATURE_CODE_MIRROR_ENABLE=true
 FEATURE_DEFAULT_AUTHENTICATED_VIEW_ENABLE=false
-GATEKEEPER_URL=devtron.ai
+GATEKEEPER_URL=https://license.devtron.ai/dashboard
+FEATURE_AI_INTEGRATION_ENABLE=false
+LOGIN_PAGE_IMAGE=

.eslintignore

@@ -6,7 +6,6 @@
 vite.config.mts
 
 # The following files have eslint errors/warnings
-src/App.tsx
 src/Pages/GlobalConfigurations/Authorization/APITokens/__tests__/ApiTokens.test.tsx
 src/components/AppSelector/ChartSelector.tsx
 src/components/ApplicationGroup/AppGroup.service.ts
@@ -36,7 +35,6 @@ src/components/ApplicationGroup/SearchBar.tsx
 src/components/CIPipelineN/AdvancedConfigOptions.tsx
 src/components/CIPipelineN/Build.tsx
 src/components/CIPipelineN/CIPipeline.tsx
-src/components/CIPipelineN/ConditionContainer.tsx
 src/components/CIPipelineN/CustomImageTags.tsx
 src/components/CIPipelineN/CustomInputOutputVariables.tsx
 src/components/CIPipelineN/CustomInputVariableSelect.tsx
@@ -54,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
@@ -86,7 +83,6 @@ src/components/app/create/CreateApp.tsx
 src/components/app/create/validationRules.ts
 src/components/app/details/AboutAppInfoModal.tsx
 src/components/app/details/AboutTagEditModal.tsx
-src/components/app/details/AppHeader.tsx
 src/components/app/details/appDetails/AppMetrics.tsx
 src/components/app/details/appDetails/AppStatusCard.tsx
 src/components/app/details/appDetails/DeploymentStatusDetailModal.tsx
@@ -211,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
@@ -332,7 +327,6 @@ src/components/v2/appDetails/ReleaseStatusEmptyState.tsx
 src/components/v2/appDetails/SyncError.component.tsx
 src/components/v2/appDetails/__tests__/index.store.test.ts
 src/components/v2/appDetails/appDetails.api.ts
-src/components/v2/appDetails/appDetails.type.ts
 src/components/v2/appDetails/ea/EAAppDetail.component.tsx
 src/components/v2/appDetails/k8Resource/FilterResource.tsx
 src/components/v2/appDetails/k8Resource/nodeDetail/EphemeralContainerDrawer.tsx
@@ -369,7 +363,6 @@ src/components/v2/devtronStackManager/DevtronStackManager.service.tsx
 src/components/v2/devtronStackManager/DevtronStackManager.tsx
 src/components/v2/devtronStackManager/DevtronStackManager.utils.ts
 src/components/v2/devtronStackManager/SuccessModalComponent.tsx
-src/components/v2/headers/AppHeader.component.tsx
 src/components/v2/headers/ChartHeader.component.tsx
 src/components/v2/headers/EAHeader.component.tsx
 src/components/v2/index.tsx
@@ -385,7 +378,6 @@ src/components/v2/values/chartValuesDiff/ProjectUpdateModal.tsx
 src/components/v2/values/common/chartValues.api.ts
 src/components/workflowEditor/CDSuccessModal.tsx
 src/components/workflowEditor/CreateWorkflow.tsx
-src/components/workflowEditor/DeprecatedPipelineWarning.tsx
 src/components/workflowEditor/DeprecatedWarningModal.tsx
 src/components/workflowEditor/EmptyWorkflow.tsx
 src/components/workflowEditor/NoGitOpsConfiguredWarning.tsx

.eslintrc.js

@@ -14,9 +14,11 @@
  * limitations under the License.
  */
 
+const tsconfigPath = require('./tsconfig.json')
+
 module.exports = {
     parser: '@typescript-eslint/parser',
-    plugins: ['@typescript-eslint', 'react', 'prettier', 'import'],
+    plugins: ['@typescript-eslint', 'react', 'prettier', 'import', 'simple-import-sort'],
     env: {
         browser: true,
         es2021: true,
@@ -112,6 +114,26 @@ module.exports = {
         'import/named': 'off',
         'no-use-before-define': 'off',
         '@typescript-eslint/no-use-before-define': 'error',
+        'simple-import-sort/imports': [
+            'error',
+            {
+                groups: [
+                    // Packages `react` related packages and external packages.
+                    ['^react', '^@?\\w'],
+                    // Devtron packages
+                    ['^@devtron-labs'],
+                    // Internal packages.
+                    [...Object.keys(tsconfigPath.compilerOptions.paths).map((alias) => alias.replace('/*', ''))],
+                    // Side effect imports.
+                    ['^\\u0000'],
+                    // Put same-folder imports, `..` and `.` last. Other relative imports.
+                    ['^\\.\\.(?!/?$)', '^\\.\\./?$', '^\\./(?=.*/)(?!/?$)', '^\\.(?!/?$)', '^\\./?$',],
+                    // Style imports.
+                    [ '^.+\\.?(css|scss)$'],
+                ],
+            },
+        ],
+        'simple-import-sort/exports': 'error',
     },
     overrides: [
         {

.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

.storybook/preview.tsx

@@ -57,6 +57,7 @@ const preview: Preview = {
                     <SwitchThemeDialogWrapper />
 
                     <div id="animated-dialog-backdrop" />
+                    <div id="visible-modal" />
 
                     <div id="visible-modal" />
 

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;'"]