feat: misc enhancements

.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

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.1.6",
+        "@devtron-labs/devtron-fe-common-lib": "1.1.6-beta-3",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",

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,43 @@ 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/remove 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
+
+        currentSearchParams.set(
+            'compareWithManifestChartRefId',
+            // NOTE: need to convert to string but leave null as is
+            _compareWithManifestChartRefId ? String(_compareWithManifestChartRefId) : null,
+        )
+
+        currentSearchParams.set('manifestChartRefId', _manifestChartRefId ? String(_manifestChartRefId) : null)
+
+        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/components/ClusterNodes/NodeActions/DeleteNodeModal.tsx

@@ -67,7 +67,9 @@ export default function DeleteNodeModal({ name, version, kind, closePopup }: Nod
             delete={deleteAPI}
             closeDelete={onClose}
             deletePostfix={DELETE_NODE_MODAL_MESSAGING.deletePostfix}
+            showDeleteConfirmation
             apiCallInProgress={apiCallInProgress}
+            deleteConfirmationText={name}
         >
             <InfoColourBar
                 classname="question-bar p-lr-12"

src/components/ResourceBrowser/ResourceList/DeleteResourcePopup.tsx

@@ -87,6 +87,8 @@ const DeleteResourcePopup: React.FC<DeleteResourcePopupType> = ({
             delete={handleDelete}
             closeDelete={toggleDeleteDialog}
             apiCallInProgress={apiCallInProgress}
+            showDeleteConfirmation
+            deleteConfirmationText={resourceData.name as string}
         >
             <DeleteDialog.Description>
                 <p className="mb-12">{DELETE_MODAL_MESSAGING.description}</p>

src/components/app/list-new/AppList.tsx

@@ -16,7 +16,16 @@
  */
 
 import React, { useState, useEffect, useMemo } from 'react'
-import { Switch, Route, useHistory, useParams, useRouteMatch, useLocation } from 'react-router-dom'
+import {
+    Switch,
+    Route,
+    useHistory,
+    useParams,
+    useRouteMatch,
+    useLocation,
+    Redirect,
+    RedirectProps,
+} from 'react-router-dom'
 import {
     Progressing,
     stopPropagation,
@@ -68,7 +77,7 @@ const AppList = ({ isArgoInstalled }: AppListPropType) => {
     const location = useLocation()
     const { url } = useRouteMatch()
     const params = useParams<{ appType: string }>()
-    const { serverMode } = useMainContext()
+    const { serverMode, isSuperAdmin } = useMainContext()
     const { setCurrentAppName } = useAppContext()
 
     const [lastDataSyncTimeString, setLastDataSyncTimeString] = useState<React.ReactNode>('')
@@ -284,70 +293,70 @@ const AppList = ({ isArgoInstalled }: AppListPropType) => {
             />
         )
 
-    const renderAppTabs = () => {
-        const tabs: TabProps[] = [
-            ...(serverMode === SERVER_MODE.FULL
-                ? [
-                      {
-                          id: 'devtron-apps',
-                          label: 'Devtron Apps',
-                          tabType: 'navLink' as const,
-                          props: {
-                              to: {
-                                  pathname: getChangeAppTabURL(AppListConstants.AppTabs.DEVTRON_APPS),
-                                  search: location.search,
-                              },
-                              'data-testid': 'devtron-app-list-button',
+    const tabs: TabProps[] = [
+        ...(serverMode === SERVER_MODE.FULL
+            ? [
+                  {
+                      id: AppListConstants.AppType.DEVTRON_APPS,
+                      label: 'Devtron Apps',
+                      tabType: 'navLink' as const,
+                      props: {
+                          to: {
+                              pathname: getChangeAppTabURL(AppListConstants.AppTabs.DEVTRON_APPS),
+                              search: location.search,
                           },
+                          'data-testid': 'devtron-app-list-button',
                       },
-                  ]
-                : []),
-            {
-                id: 'helm-apps',
-                label: 'Helm Apps',
-                tabType: 'navLink',
-                props: {
-                    to: {
-                        pathname: getChangeAppTabURL(AppListConstants.AppTabs.HELM_APPS),
-                        search: location.search,
-                    },
-                    'data-testid': 'helm-app-list-button',
+                  },
+              ]
+            : []),
+        {
+            id: AppListConstants.AppType.HELM_APPS,
+            label: 'Helm Apps',
+            tabType: 'navLink',
+            props: {
+                to: {
+                    pathname: getChangeAppTabURL(AppListConstants.AppTabs.HELM_APPS),
+                    search: location.search,
                 },
+                'data-testid': 'helm-app-list-button',
             },
-            ...(window._env_?.ENABLE_EXTERNAL_ARGO_CD
-                ? [
-                      {
-                          id: 'argo-cd-apps',
-                          label: AppListConstants.AppTabs.ARGO_APPS,
-                          tabType: 'navLink' as const,
-                          props: {
-                              to: {
-                                  pathname: getChangeAppTabURL(AppListConstants.AppTabs.ARGO_APPS),
-                                  search: location.search,
-                              },
-                              'data-testid': 'argo-app-list-button',
+        },
+        ...(window._env_?.ENABLE_EXTERNAL_ARGO_CD && isSuperAdmin
+            ? [
+                  {
+                      id: AppListConstants.AppType.ARGO_APPS,
+                      label: AppListConstants.AppTabs.ARGO_APPS,
+                      tabType: 'navLink' as const,
+                      props: {
+                          to: {
+                              pathname: getChangeAppTabURL(AppListConstants.AppTabs.ARGO_APPS),
+                              search: location.search,
                           },
+                          'data-testid': 'argo-app-list-button',
                       },
-                  ]
-                : []),
-            ...(window._env_?.FEATURE_EXTERNAL_FLUX_CD_ENABLE
-                ? [
-                      {
-                          id: 'flux-cd-apps',
-                          label: AppListConstants.AppTabs.FLUX_APPS,
-                          tabType: 'navLink' as const,
-                          props: {
-                              to: {
-                                  pathname: getChangeAppTabURL(AppListConstants.AppTabs.FLUX_APPS),
-                                  search: location.search,
-                              },
-                              'data-testid': 'flux-app-list-button',
+                  },
+              ]
+            : []),
+        ...(window._env_?.FEATURE_EXTERNAL_FLUX_CD_ENABLE && isSuperAdmin
+            ? [
+                  {
+                      id: AppListConstants.AppType.FLUX_APPS,
+                      label: AppListConstants.AppTabs.FLUX_APPS,
+                      tabType: 'navLink' as const,
+                      props: {
+                          to: {
+                              pathname: getChangeAppTabURL(AppListConstants.AppTabs.FLUX_APPS),
+                              search: location.search,
                           },
+                          'data-testid': 'flux-app-list-button',
                       },
-                  ]
-                : []),
-        ]
+                  },
+              ]
+            : []),
+    ]
 
+    const renderAppTabs = () => {
         const rightComponent = (
             <div className="flex fs-13">
                 {lastDataSyncTimeString &&
@@ -503,6 +512,7 @@ const AppList = ({ isArgoInstalled }: AppListPropType) => {
                     setShowPulsatingDot={setShowPulsatingDot}
                 />
             )}
+            {tabs.every((tab) => tab.id !== params.appType) && <Redirect {...(tabs[0].props as RedirectProps)} />}
         </div>
     )
 }

src/components/common/navigation/Navigation.tsx

@@ -425,7 +425,7 @@ export default class Navigation extends Component<
                                 return this.renderNavLink(item)
                             }
                         })}
-                        {!window._env_.K8S_CLIENT && !this.props.isAirgapped && (
+                        {!window._env_.K8S_CLIENT && !this.props.isAirgapped && this.props.serverMode !== SERVER_MODE.EA_ONLY &&  (
                             <>
                                 <div className="short-nav__divider" />
                                 {this.renderNavLink(NavigationStack, 'short-nav__stack-manager')}