Merge branch 'develop' of github.com:devtron-labs/devtron-fe-common-lib into feat/use-rjsf-chart-store

Author: Elessar1802

src/Common/AppStatus/AppStatus.tsx

@@ -15,6 +15,7 @@
  */
 
 import Tippy from '@tippyjs/react'
+import { ReactComponent as ICErrorCross } from '@Icons/ic-error-cross.svg'
 import { ReactComponent as InfoIcon } from '../../Assets/Icon/ic-info-outlined.svg'
 import { StatusConstants, YET_TO_RUN } from './constants'
 import { AppStatusType } from './types'
@@ -52,7 +53,11 @@ export default function AppStatus({
 
     const renderIcon = () => {
         if (iconClass) {
-            return <span className={`dc__app-summary__icon icon-dim-16 ${iconClass} ${iconClass}--node`} />
+            return iconClass === 'failed' || iconClass === 'error' ? (
+                <ICErrorCross className="icon-dim-16 dc__no-shrink ic-error-cross-red" />
+            ) : (
+                <span className={`dc__app-summary__icon icon-dim-16 ${iconClass} ${iconClass}--node`} />
+            )
         }
         if (isVirtualEnv) {
             return (

src/Shared/Components/DeploymentConfigDiff/DeploymentConfigDiff.component.tsx

@@ -1,6 +1,6 @@
 import { DeploymentConfigDiffNavigation } from './DeploymentConfigDiffNavigation'
 import { DeploymentConfigDiffMain } from './DeploymentConfigDiffMain'
-import { DeploymentConfigDiffProps } from './types'
+import { DeploymentConfigDiffProps } from './DeploymentConfigDiff.types'
 import './DeploymentConfigDiff.scss'
 
 export const DeploymentConfigDiff = ({
@@ -11,6 +11,7 @@ export const DeploymentConfigDiff = ({
     goBackURL,
     navHeading,
     navHelpText,
+    tabConfig,
     ...resProps
 }: DeploymentConfigDiffProps) => (
     <div className="deployment-config-diff">
@@ -21,6 +22,7 @@ export const DeploymentConfigDiff = ({
             goBackURL={goBackURL}
             navHeading={navHeading}
             navHelpText={navHelpText}
+            tabConfig={tabConfig}
         />
         <DeploymentConfigDiffMain isLoading={isLoading} configList={configList} {...resProps} />
     </div>

src/Shared/Components/DeploymentConfigDiff/DeploymentConfigDiff.scss

@@ -21,6 +21,13 @@
         height: calc(100vh - 122px);
         overflow: auto;
 
+        &__heading {
+            display: grid;
+            // -15px to accommodate the right side bar of the code-editor
+            grid-template-columns: calc(50% - 15px) calc(50% - 15px);
+            grid-template-rows: auto;
+        }
+
         &__comparison {
             margin: 16px 0 0;
         }
@@ -29,4 +36,14 @@
     & .react-monaco-editor-container {
         min-height: 100px;
     }
+
+    &__tab-list {
+        label {
+            flex-grow: 1
+        }
+
+        .radio__item-label {
+            justify-content: center;
+        }
+    }
 }

src/Shared/Components/DeploymentConfigDiff/types.ts renamed to src/Shared/Components/DeploymentConfigDiff/DeploymentConfigDiff.types.ts

@@ -1,6 +1,13 @@
 import { SortingOrder } from '@Common/Constants'
 
-import { ConfigMapSecretDataConfigDatumDTO, DeploymentTemplateDTO } from '@Shared/Services'
+import {
+    AppEnvDeploymentConfigDTO,
+    ConfigMapSecretDataConfigDatumDTO,
+    DeploymentTemplateDTO,
+    EnvResourceType,
+    ManifestTemplateDTO,
+} from '@Shared/Services'
+
 import { DeploymentHistoryDetail } from '../CICDHistory'
 import { CollapsibleListConfig, CollapsibleListItem } from '../CollapsibleList'
 import { SelectPickerProps } from '../SelectPicker'
@@ -45,6 +52,11 @@ export interface DeploymentConfigDiffNavigationCollapsibleItem
 
 export interface DeploymentConfigDiffProps {
     isLoading?: boolean
+    errorConfig?: {
+        error: boolean
+        code: number
+        reload: () => void
+    }
     configList: DeploymentConfigListItem[]
     headerText?: string
     scrollIntoViewId?: string
@@ -62,18 +74,29 @@ export interface DeploymentConfigDiffProps {
     goBackURL?: string
     navHeading: string
     navHelpText?: string
+    tabConfig?: {
+        tabs: string[]
+        activeTab: string
+        onClick: (tab: string) => void
+    }
 }
 
 export interface DeploymentConfigDiffNavigationProps
     extends Pick<
         DeploymentConfigDiffProps,
-        'isLoading' | 'navList' | 'collapsibleNavList' | 'goBackURL' | 'navHeading' | 'navHelpText'
+        'isLoading' | 'navList' | 'collapsibleNavList' | 'goBackURL' | 'navHeading' | 'navHelpText' | 'tabConfig'
     > {}
 
 export interface DeploymentConfigDiffMainProps
     extends Pick<
         DeploymentConfigDiffProps,
-        'isLoading' | 'headerText' | 'configList' | 'scrollIntoViewId' | 'selectorsConfig' | 'sortingConfig'
+        | 'isLoading'
+        | 'errorConfig'
+        | 'headerText'
+        | 'configList'
+        | 'scrollIntoViewId'
+        | 'selectorsConfig'
+        | 'sortingConfig'
     > {}
 
 export interface DeploymentConfigDiffAccordionProps extends Pick<CollapseProps, 'onTransitionEnd'> {
@@ -88,3 +111,18 @@ export interface DeploymentConfigDiffAccordionProps extends Pick<CollapseProps,
 export type DiffHeadingDataType<DeploymentTemplate> = DeploymentTemplate extends true
     ? DeploymentTemplateDTO
     : ConfigMapSecretDataConfigDatumDTO
+
+export type AppEnvDeploymentConfigListParams<IsManifestView> = (IsManifestView extends true
+    ? {
+          currentList: ManifestTemplateDTO
+          compareList: ManifestTemplateDTO
+          sortOrder?: never
+      }
+    : {
+          currentList: AppEnvDeploymentConfigDTO
+          compareList: AppEnvDeploymentConfigDTO
+          sortOrder?: SortingOrder
+      }) & {
+    getNavItemHref: (resourceType: EnvResourceType, resourceName: string) => string
+    isManifestView?: IsManifestView
+}