Merge remote-tracking branch 'origin/main' into feat/lock-config

Author: prajjwal-devtron

.env

@@ -37,3 +37,4 @@ DEFAULT_CI_TRIGGER_TYPE_MANUAL=false
 ANNOUNCEMENT_BANNER_MSG=
 LOGIN_PAGE_IMAGE=
 LOGIN_PAGE_IMAGE_BG=
+HIDE_DEFAULT_CLUSTER=false

config.md

@@ -27,5 +27,6 @@
 | 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        |
+| DEFAULT_CI_TRIGGER_TYPE_MANUAL     | "false"    | Change default trigger behaviour of newly created ci-pipeline to manual |
 
 # DASHBOARD CONFIG SECRET

package.json

@@ -4,7 +4,10 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "0.0.43",
+        "@devtron-labs/devtron-fe-common-lib": "0.0.48",
+        "@rjsf/core": "^5.13.3",
+        "@rjsf/utils": "^5.13.3",
+        "@rjsf/validator-ajv8": "^5.13.3",
         "@sentry/browser": "^7.3.1",
         "@sentry/integrations": "^7.3.1",
         "@sentry/tracing": "^7.3.1",
@@ -43,6 +46,7 @@
         "react-virtualized": "^9.22.3",
         "recharts": "^2.1.9",
         "rxjs": "^7.5.4",
+        "tippy.js": "^6.3.7",
         "xterm": "^4.19.0",
         "xterm-addon-fit": "^0.5.0",
         "xterm-addon-search": "^0.9.0",

src/assets/icons/ic-login-dt-with-hat.svg

@@ -4,15 +4,13 @@ import {
     CiPipelineResult,
     WorkflowResult,
     NodeAttr,
-    PipelineType,
-    WorkflowNodeType,
     CiPipeline,
 } from '../app/details/triggerView/types'
 import { WebhookListResponse } from '../ciPipeline/Webhook/types'
 import { processWorkflow } from '../app/details/triggerView/workflow.service'
 import { WorkflowTrigger } from '../app/details/triggerView/config'
 import { ModuleNameMap, Routes, URLS } from '../../config'
-import { get, post, put, ResponseType, trash } from '@devtron-labs/devtron-fe-common-lib'
+import { get, post, put, ResponseType, trash, WorkflowNodeType, PipelineType } from '@devtron-labs/devtron-fe-common-lib'
 import {
     AppGroupList,
     CIConfigListType,
@@ -79,21 +77,23 @@ export const getWorkflows = (envID: string, appIds: string): Promise<WorkflowsRe
         for (const _ciConfig of ciConfig.result) {
             _ciConfigMap.set(_ciConfig.appId, _ciConfig)
         }
-        for (const workflowResult of workflow.result.workflows) {
-            const processWorkflowData = processWorkflow(
-                {
-                    ...workflowResult,
-                    workflows: [workflowResult],
-                } as WorkflowResult,
-                _ciConfigMap.get(workflowResult.appId),
-                cdConfig.result as CdPipelineResult,
-                externalCIConfig.result,
-                WorkflowTrigger,
-                WorkflowTrigger.workflow,
-                filterChildAndSiblingCD(envID),
-            )
-            _workflows.push(...processWorkflowData.workflows)
-            _filteredCIPipelines.set(workflowResult.appId, processWorkflowData.filteredCIPipelines)
+        if (workflow?.result?.workflows) {
+            for (const workflowResult of workflow.result.workflows) {
+                const processWorkflowData = processWorkflow(
+                    {
+                        ...workflowResult,
+                        workflows: [workflowResult],
+                    } as WorkflowResult,
+                    _ciConfigMap.get(workflowResult.appId),
+                    cdConfig.result as CdPipelineResult,
+                    externalCIConfig.result,
+                    WorkflowTrigger,
+                    WorkflowTrigger.workflow,
+                    filterChildAndSiblingCD(envID),
+                )
+                _workflows.push(...processWorkflowData.workflows)
+                _filteredCIPipelines.set(workflowResult.appId, processWorkflowData.filteredCIPipelines)
+            }
         }
         return { workflows: _workflows, filteredCIPipelines: _filteredCIPipelines }
     })

src/assets/icons/ic-sidebar-dt-with-hat.svg

@@ -4,9 +4,10 @@ import {
     FilterConditionsListType,
     ResponseType,
     UserApprovalConfigType,
+    WorkflowNodeType
 } from '@devtron-labs/devtron-fe-common-lib'
 import { MultiValue } from 'react-select'
-import { WebhookPayloads, WorkflowNodeType, WorkflowType } from '../app/details/triggerView/types'
+import { WebhookPayloads, WorkflowType } from '../app/details/triggerView/types'
 import { EditDescRequest, OptionType } from '../app/types'
 import { AppFilterTabs, BulkResponseStatus } from './Constants'
 

src/assets/img/cluster-redirect.png

@@ -45,6 +45,7 @@ export enum BulkResponseStatus {
     'PASS' = 'pass',
     'FAIL' = 'fail',
     'UNAUTHORIZE' = 'unauthorized',
+    'SKIP' = 'skip',
 }
 
 export const BULK_VIRTUAL_RESPONSE_STATUS = {
@@ -180,6 +181,8 @@ export const CREATE_GROUP_TABS = {
 
 export const GetBranchChangeStatus = (statusText: string): BulkResponseStatus => {
     switch (statusText) {
+        case BulkResponseStatus.SKIP:
+            return BulkResponseStatus.SKIP
         case BULK_VIRTUAL_RESPONSE_STATUS.pass:
             return BulkResponseStatus.PASS
         case BULK_VIRTUAL_RESPONSE_STATUS.fail:
@@ -191,4 +194,6 @@ export const GetBranchChangeStatus = (statusText: string): BulkResponseStatus =>
     }
 }
 
-export const FILTER_NAME_REGEX = /^[a-z][a-z0-9-]{1,}[a-z0-9]$/
+export const FILTER_NAME_REGEX = /^[a-z][a-z0-9-]{1,}[a-z0-9]$/
+export const SKIPPED_RESOURCES_MESSAGE = 'Build action is not applicable'
+export const SKIPPED_RESOURCES_STATUS_TEXT = 'Skipped'

src/components/ApplicationGroup/AppGroup.service.ts

@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react'
 import { generatePath, Route, useHistory, useParams, useRouteMatch } from 'react-router-dom'
-import { Progressing, showError, sortCallback, useAsync } from '@devtron-labs/devtron-fe-common-lib'
+import { Progressing, showError, sortCallback, useAsync, PipelineType } from '@devtron-labs/devtron-fe-common-lib'
 import { URLS } from '../../../../config'
 import { APP_GROUP_CI_DETAILS } from '../../../../config/constantMessaging'
 import { EmptyView, LogResizeButton } from '../../../app/details/cicdHistory/History.components'
@@ -12,7 +12,7 @@ import {
     FetchIdDataStatus,
 } from '../../../app/details/cicdHistory/types'
 import { Details } from '../../../app/details/cIDetails/CIDetails'
-import { CiPipeline, PipelineType } from '../../../app/details/triggerView/types'
+import { CiPipeline } from '../../../app/details/triggerView/types'
 import { getTriggerHistory } from '../../../app/service'
 import { asyncWrap, mapByKey, useInterval } from '../../../common'
 import { getCIConfigList } from '../../AppGroup.service'