Merge branch 'main' into feat-async-install-devtron

Author: Ash-exp

.env

@@ -30,7 +30,10 @@ CLUSTER_TERMINAL_CONNECTION_RETRY_COUNT=7
 ENABLE_CHART_SEARCH_IN_HELM_DEPLOY=false
 HIDE_EXCLUDE_INCLUDE_GIT_COMMITS=true
 ENABLE_BUILD_CONTEXT=false
-CLAIR_TOOL_VERSION= 
+CLAIR_TOOL_VERSION=
 ENABLE_RESTART_WORKLOAD=false
 ENABLE_SCOPED_VARIABLES=false
-DEFAULT_CI_TRIGGER_TYPE_MANUAL=false
+DEFAULT_CI_TRIGGER_TYPE_MANUAL=false
+ANNOUNCEMENT_BANNER_MSG=
+LOGIN_PAGE_IMAGE=
+LOGIN_PAGE_IMAGE_BG=

config.md

@@ -12,7 +12,7 @@
 | SENTRY_ENABLED                     | "false"   | Sentry integration status                      |
 | SENTRY_ENV                         | stage     | Sentry environment                              |
 | SENTRY_ERROR_ENABLED               | false     |  To send uncaught errors to sentry             |
-| SENTRY_PERFORMANCE_ENABLED         | false     |  To send persormance sentry      | 
+| SENTRY_PERFORMANCE_ENABLED         | false     |  To send persormance sentry      |
 | SENTRY_DSN                         | ''        | SENTRY Data Source Name |
 | SENTRY_TRACES_SAMPLE_RATE          | 0.2       | Rate at which data send to sentry.(min=0 max=1)|
 | USE_V2                             | "true"    | Use the v2 APIs                                 |
@@ -25,5 +25,7 @@
 | RECOMMEND_SECURITY_SCANNING        | "false"    | Recommend security scanning                  |
 | FORCE_SECURITY_SCANNING            | "false"    |  Force Security Scanning                |
 | CLUSTER_TERMINAL_CONNECTION_POLLING_INTERVAL     | 7000    |  Interval for checking connection with cluster terminal.     |
+| LOGIN_PAGE_IMAGE                   | ""         | Login page image url                          |
+| LOGIN_PAGE_IMAGE_BG                | ""         | Login page image background color code        |
 
 # DASHBOARD CONFIG SECRET

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "0.0.34",
+        "@devtron-labs/devtron-fe-common-lib": "0.0.40",
         "@sentry/browser": "^7.3.1",
         "@sentry/integrations": "^7.3.1",
         "@sentry/tracing": "^7.3.1",

public/index.html

@@ -5,6 +5,10 @@
   <meta charset="utf-8" />
   <link rel="preload" as="style" href='//fonts.googleapis.com/css?family=Open+Sans' type='text/css'>
   <link href="https://fonts.googleapis.com/css2?family=Inconsolata&display=swap" rel="stylesheet">
+  <link
+      href="https://fonts.googleapis.com/css2?family=Merriweather:wght@300;400;700;900&display=swap"
+      rel="stylesheet"
+  />
   <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
   <script src="%PUBLIC_URL%/env-config.js"></script>
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
@@ -57,4 +61,4 @@
     title_el.innerHTML = "Devtron Sandbox";
 </script>
 
-</html>
+</html>

src/assets/icons/cluster-overview.svg

@@ -24,6 +24,7 @@ export interface BulkCIDetailType extends BulkTriggerAppDetailType {
     isFirstTrigger: boolean
     isCacheAvailable: boolean
     isLinkedCI: boolean
+    isJobCI: boolean
     isWebhookCI: boolean
     parentAppId: number
     parentCIPipelineId: number
@@ -43,6 +44,7 @@ export interface BulkCDDetailType extends BulkTriggerAppDetailType {
     stageType?: DeploymentNodeType
     triggerType?: string
     envName: string
+    envId: number
     parentPipelineId?: string
     parentPipelineType?: WorkflowNodeType
     parentEnvironmentName?: string
@@ -88,14 +90,14 @@ export interface BulkCDTriggerType {
     closePopup: (e) => void
     updateBulkInputMaterial: (materialList: Record<string, any>) => void
     onClickTriggerBulkCD: (appsToRetry?: Record<string, boolean>) => void
-    changeTab: (
+    changeTab?: (
         materrialId: string | number,
         artifactId: number,
         tab: CDModalTabType,
         selectedCDDetail?: { id: number; type: DeploymentNodeType },
     ) => void
-    toggleSourceInfo: (materialIndex: number, selectedCDDetail?: { id: number; type: DeploymentNodeType }) => void
-    selectImage: (
+    toggleSourceInfo?: (materialIndex: number, selectedCDDetail?: { id: number; type: DeploymentNodeType }) => void
+    selectImage?: (
         index: number,
         materialType: string,
         selectedCDDetail?: { id: number; type: DeploymentNodeType },