Merge pull request #2261 from devtron-labs/release-candidate-v0.24.0

chore: release candidate v0.24.0

Author: eshankvaish

.env

@@ -62,3 +62,4 @@ FEATURE_PROMO_EMBEDDED_BUTTON_TEXT=
 FEATURE_PROMO_EMBEDDED_MODAL_TITLE=
 FEATURE_PROMO_EMBEDDED_IFRAME_URL=
 FEATURE_BULK_RESTART_WORKLOADS_FROM_RB=deployment,rollout,daemonset,statefulset
+FEATURE_DEFAULT_LANDING_RB_ENABLE=false

.eslintignore

@@ -66,16 +66,13 @@ src/components/ClusterNodes/ClusterEvents.tsx
 src/components/ClusterNodes/ClusterManifest.tsx
 src/components/ClusterNodes/ClusterNodeEmptyStates.tsx
 src/components/ClusterNodes/ClusterOverview.tsx
-src/components/ClusterNodes/ColumnSelector.tsx
 src/components/ClusterNodes/NodeActions/CordonNodeModal.tsx
 src/components/ClusterNodes/NodeActions/DeleteNodeModal.tsx
 src/components/ClusterNodes/NodeActions/DrainNodeModal.tsx
 src/components/ClusterNodes/NodeActions/EditTaintsModal.tsx
 src/components/ClusterNodes/NodeActions/NodeActionsMenu.tsx
 src/components/ClusterNodes/NodeActions/validationRules.ts
 src/components/ClusterNodes/NodeDetails.tsx
-src/components/ClusterNodes/NodeDetailsList.tsx
-src/components/ClusterNodes/NodeListSearchFilter.tsx
 src/components/ClusterNodes/__tests__/ClusterManifest.test.tsx
 src/components/ClusterNodes/__tests__/NodeList.test.tsx
 src/components/ClusterNodes/constants.ts

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

@@ -11,6 +11,7 @@ on:
     branches:    
       - 'main'
       - 'release-**'
+      - 'develop'
 
 jobs:
   validate-PR-issue:

package.json

@@ -1,10 +1,10 @@
 {
     "name": "dashboard",
-    "version": "1.1.0",
+    "version": "1.2.0",
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.1.0-patch-1",
+        "@devtron-labs/devtron-fe-common-lib": "1.2.0",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",
@@ -14,7 +14,6 @@
         "@sentry/tracing": "7.50.0",
         "@tippyjs/react": "4.2.6",
         "@typeform/embed-react": "2.20.0",
-        "@types/marked": "4.0.8",
         "@vitejs/plugin-react": "4.3.1",
         "command-line-parser": "^0.2.10",
         "compute-histogram": "^0.9.11",
@@ -23,7 +22,6 @@
         "fast-json-patch": "^3.1.1",
         "flexsearch": "^0.6.32",
         "jsonpath-plus": "^10.0.0",
-        "marked": "4.3.0",
         "moment": "^2.29.4",
         "monaco-editor": "0.44.0",
         "monaco-yaml": "5.1.1",

src/App.tsx

@@ -337,6 +337,7 @@ export default function App() {
                                     <div id="full-screen-modal" />
                                     <div id="visible-modal" />
                                     <div id="visible-modal-2" />
+                                    <div id="animated-dialog-backdrop" />
                                     {import.meta.env.VITE_NODE_ENV === 'production' &&
                                         window._env_ &&
                                         window._env_.HOTJAR_ENABLED && <Hotjar />}

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

@@ -1,5 +1,5 @@
-import { useEffect, useMemo, useState } from 'react'
-import { generatePath, useHistory, useRouteMatch } from 'react-router-dom'
+import { useEffect, useMemo, useRef, useState } from 'react'
+import { generatePath, useHistory, useLocation, useRouteMatch } from 'react-router-dom'
 
 import {
     useUrlFilters,
@@ -57,9 +57,11 @@ export const DeploymentConfigCompare = ({
     const { push } = useHistory()
     const { path, params } = useRouteMatch<DeploymentConfigParams>()
     const { compareTo, resourceType, resourceName, appId, envId } = params
+    const location = useLocation()
 
     // STATES
     const [convertVariables, setConvertVariables] = useState(false)
+    const isDefaultLandingPreviousDeploymentSet = useRef<boolean>(false)
 
     // GLOBAL CONSTANTS
     const isManifestView = resourceType === EnvResourceType.Manifest
@@ -133,6 +135,32 @@ export const DeploymentConfigCompare = ({
         [options, optionsLoader],
     )
 
+    useEffect(() => {
+        if (!compareEnvOptions || isDefaultLandingPreviousDeploymentSet.current) {
+            return
+        }
+
+        isDefaultLandingPreviousDeploymentSet.current = true
+
+        if (!compareEnvOptions.previousDeployments?.length) {
+            updateSearchParams({
+                compareWith: null,
+            })
+
+            return
+        }
+
+        const previousDeploymentData = compareEnvOptions.previousDeployments[0]
+
+        updateSearchParams({
+            [AppEnvDeploymentConfigQueryParams.COMPARE_WITH_CONFIG_TYPE]:
+                AppEnvDeploymentConfigType.PREVIOUS_DEPLOYMENTS,
+            compareWithIdentifierId: previousDeploymentData.deploymentTemplateHistoryId,
+            compareWithPipelineId: previousDeploymentData.pipelineId,
+            compareWithManifestChartRefId: isManifestView ? previousDeploymentData.chartRefId : null,
+        })
+    }, [compareEnvOptions])
+
     const fetchManifestData = async () => {
         const [{ result: currentList }, { result: compareList }] = await Promise.all([
             getDeploymentTemplateData({ type, appName, envName, configType, compareName: compareTo }),
@@ -480,13 +508,49 @@ export const DeploymentConfigCompare = ({
         if (_isManifestView) {
             setConvertVariables(false)
         }
-        push(
-            generatePath(path, {
+
+        const currentSearchParams = new URLSearchParams(location.search)
+
+        // NOTE: need to find the corresponding chartRefId(s) for compareWith and compareTo
+        // and set/delete them based on _isManifestView
+        const _compareWithManifestChartRefId =
+            currentSearchParams.has('compareWithIdentifierId') && _isManifestView
+                ? compareEnvOptions.previousDeployments.find(
+                      (prev) =>
+                          prev.deploymentTemplateHistoryId ===
+                          Number(currentSearchParams.get('compareWithIdentifierId')),
+                  )?.chartRefId ?? null
+                : null
+
+        const _manifestChartRefId =
+            currentSearchParams.has('identifierId') && _isManifestView
+                ? currentEnvOptions.previousDeployments.find(
+                      (prev) => prev.deploymentTemplateHistoryId === Number(currentSearchParams.get('identifierId')),
+                  )?.chartRefId ?? null
+                : null
+
+        if (_compareWithManifestChartRefId) {
+            currentSearchParams.set('compareWithManifestChartRefId', String(_compareWithManifestChartRefId))
+        } else {
+            // NOTE: make sure to not set null as URLSearchParams will save the null as string
+            // i.e suppose we save 'hello' = null, we get ?hello=null as search param
+            currentSearchParams.delete('compareWithManifestChartRefId')
+        }
+
+        if (_manifestChartRefId) {
+            currentSearchParams.set('manifestChartRefId', String(_manifestChartRefId))
+        } else {
+            currentSearchParams.delete('manifestChartRefId')
+        }
+
+        push({
+            pathname: generatePath(path, {
                 ...params,
                 resourceType: _isManifestView ? EnvResourceType.Manifest : EnvResourceType.DeploymentTemplate,
                 resourceName: null,
             }),
-        )
+            search: currentSearchParams.toString(),
+        })
     }
 
     const tabConfig: DeploymentConfigDiffProps['tabConfig'] = {

src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/DeploymentConfigCompare/utils.ts

@@ -120,7 +120,7 @@ export const parseCompareWithSearchParams =
                 // If `type` is 'app' (Application), set `compareWith` to the first environment if available,
                 // otherwise `null` (base configuration).
                 if (type === 'app') {
-                    compareWith = environments.length && !compareTo ? environments[0].name : null
+                    compareWith = compareTo || (environments.length ? environments[0].name : null)
                 } else {
                     // If `type` is 'appGroup' (Application Groups), set `compareWith` to the first application.
                     // If the application to compare (`compareTo`) is the same as the first application,

src/Pages/GlobalConfigurations/Authorization/Shared/components/K8sObjectPermissions/K8sListItemCard.tsx

@@ -30,6 +30,7 @@ import {
     GVKType,
     getK8sResourceList,
     EntityTypes,
+    ApiResourceGroupType,
 } from '@devtron-labs/devtron-fe-common-lib'
 import CreatableSelect from 'react-select/creatable'
 import Tippy from '@tippyjs/react'
@@ -177,13 +178,16 @@ const K8sListItemCard = ({
     const createKindData = (selected, _allKindMapping, _k8SObjectMap = null) => {
         const kind = []
         let selectedGvk: GVKType
+        const isAllNamespaceSelected = k8sPermission.namespace.some((option) => option.value === SELECT_ALL_VALUE)
         if (_k8SObjectMap ?? processedData) {
             if (selected.value === SELECT_ALL_VALUE) {
                 // eslint-disable-next-line no-restricted-syntax
                 for (const value of (_k8SObjectMap ?? processedData).values()) {
                     // eslint-disable-next-line no-loop-func
-                    value?.child.forEach((ele: { gvk: GVKType }) => {
-                        kind.push({ value: ele.gvk.Kind, label: ele.gvk.Kind, gvk: ele.gvk })
+                    value?.child.forEach((ele: ApiResourceGroupType) => {
+                        if (isAllNamespaceSelected || ele.namespaced) {
+                            kind.push({ label: ele.gvk.Kind, value: ele.gvk.Kind, gvk: ele.gvk })
+                        }
                         if (!selectedGvk && ele.gvk.Kind === k8sPermission.kind?.value) {
                             selectedGvk = ele.gvk
                         }
@@ -192,7 +196,7 @@ const K8sListItemCard = ({
             } else {
                 const data = (_k8SObjectMap ?? processedData).get(selected.value === 'k8sempty' ? '' : selected.value)
                 data?.child?.forEach((ele) => {
-                    if (ele.namespaced) {
+                    if (isAllNamespaceSelected || ele.namespaced) {
                         kind.push({ label: ele.gvk.Kind, value: ele.gvk.Kind, gvk: ele.gvk })
                     }
                     if (!selectedGvk && ele.gvk.Kind === k8sPermission.kind?.value) {

src/components/ApplicationGroup/AppGroup.types.ts

@@ -116,6 +116,7 @@ export interface BulkCITriggerType extends BulkRuntimeParamsType {
     onClickTriggerBulkCI: (appIgnoreCache: Record<number, boolean>, appsToRetry?: Record<string, boolean>) => void
     getWebhookPayload: (id, webhookTimeStampOrder: typeof TIME_STAMP_ORDER) => void
     webhookPayloads: WebhookPayloadType
+    setWebhookPayloads: React.Dispatch<React.SetStateAction<WebhookPayloadType>>
     isWebhookPayloadLoading: boolean
     isShowRegexModal: (_appId: number, ciNodeId: number, inputMaterialList: any[]) => boolean
     responseList: ResponseRowType[]

src/components/ApplicationGroup/Details/TriggerView/BulkCITrigger.tsx

@@ -100,6 +100,7 @@ const BulkCITrigger = ({
     setRuntimeParamsErrorState,
     setPageViewType,
     webhookPayloads,
+    setWebhookPayloads,
     isWebhookPayloadLoading,
 }: BulkCITriggerType) => {
     const [showRegexModal, setShowRegexModal] = useState(false)
@@ -299,7 +300,10 @@ const BulkCITrigger = ({
         }
     }
 
-    const onCloseWebhookModal = () => setIsWebhookBulkCI(false)
+    const onCloseWebhookModal = () => {
+        setIsWebhookBulkCI(false)
+        setWebhookPayloads(null)
+    }
 
     const renderHeaderSection = (): JSX.Element | null => {
         if (showWebhookModal) {
@@ -658,21 +662,19 @@ const BulkCITrigger = ({
         )
     }
 
-    const renderWebhookModal = (): JSX.Element => {
-        return (
-            <WebhookReceivedPayloadModal
-                workflowId={+selectedApp.workFlowId}
-                webhookPayloads={webhookPayloads}
-                isWebhookPayloadLoading={isWebhookPayloadLoading}
-                material={selectedApp.material}
-                pipelineId={selectedApp.ciPipelineId}
-                title={selectedApp.ciPipelineName}
-                getWebhookPayload={getWebhookPayload}
-                appId={selectedApp.appId.toString()}
-                isBulkCIWebhook={isWebhookBulkCI}
-            />
-        )
-    }
+    const renderWebhookModal = (selectedMaterialList: CIMaterialType[]): JSX.Element => (
+        <WebhookReceivedPayloadModal
+            workflowId={+selectedApp.workFlowId}
+            webhookPayloads={webhookPayloads}
+            isWebhookPayloadLoading={isWebhookPayloadLoading}
+            material={selectedMaterialList}
+            pipelineId={selectedApp.ciPipelineId}
+            title={selectedApp.ciPipelineName}
+            getWebhookPayload={getWebhookPayload}
+            appId={selectedApp.appId.toString()}
+            isBulkCIWebhook={isWebhookBulkCI}
+        />
+    )
 
     const renderBodySection = (): JSX.Element => {
         if (isLoading) {
@@ -697,7 +699,7 @@ const BulkCITrigger = ({
         return (
             <div className={`bulk-ci-trigger  ${showWebhookModal ? 'webhook-modal' : ''}`}>
                 {isWebhookBulkCI ? (
-                    renderWebhookModal()
+                    renderWebhookModal(selectedMaterialList)
                 ) : (
                     <div className="sidebar bcn-0 dc__height-inherit dc__overflow-auto">
                         <div