From ae1e375d4ecda40df438be42eff57cbe5fd341f9 Mon Sep 17 00:00:00 2001
From: Rohit Raj <rohit.raj@devtron.ai>
Date: Mon, 7 Apr 2025 17:48:55 +0530
Subject: [PATCH 01/22] feat: add rocket launch icon

---
 src/Assets/IconV2/ic-rocket-launch.svg | 3 +++
 src/Shared/Components/Icon/Icon.tsx    | 2 ++
 2 files changed, 5 insertions(+)
 create mode 100644 src/Assets/IconV2/ic-rocket-launch.svg

diff --git a/src/Assets/IconV2/ic-rocket-launch.svg b/src/Assets/IconV2/ic-rocket-launch.svg
new file mode 100644
index 000000000..652cd1197
--- /dev/null
+++ b/src/Assets/IconV2/ic-rocket-launch.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path stroke="#3B444C" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M8.818 17.303c-1.06 3.182-5.303 3.182-5.303 3.182s0-4.243 3.182-5.303M12 16.242l6.364-6.364c2.41-2.41 2.386-4.82 2.233-5.847a.747.747 0 0 0-.629-.628c-1.027-.154-3.437-.177-5.847 2.233L7.757 12M12 16.242 7.757 12M12 16.242l.786 3.93a.75.75 0 0 0 1.266.383l3.032-3.032a.75.75 0 0 0 .22-.53v-6.054M7.756 12l-3.929-.785a.75.75 0 0 1-.383-1.266l3.032-3.032a.75.75 0 0 1 .53-.22h6.054" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Shared/Components/Icon/Icon.tsx b/src/Shared/Components/Icon/Icon.tsx
index a859c144e..518480072 100644
--- a/src/Shared/Components/Icon/Icon.tsx
+++ b/src/Shared/Components/Icon/Icon.tsx
@@ -85,6 +85,7 @@ import { ReactComponent as ICPaperPlaneColor } from '@IconsV2/ic-paper-plane-col
 import { ReactComponent as ICPencil } from '@IconsV2/ic-pencil.svg'
 import { ReactComponent as ICQuay } from '@IconsV2/ic-quay.svg'
 import { ReactComponent as ICQuote } from '@IconsV2/ic-quote.svg'
+import { ReactComponent as ICRocketLaunch } from '@IconsV2/ic-rocket-launch.svg'
 import { ReactComponent as ICShieldCheck } from '@IconsV2/ic-shield-check.svg'
 import { ReactComponent as ICSortAscending } from '@IconsV2/ic-sort-ascending.svg'
 import { ReactComponent as ICSortDescending } from '@IconsV2/ic-sort-descending.svg'
@@ -193,6 +194,7 @@ export const iconMap = {
     'ic-pencil': ICPencil,
     'ic-quay': ICQuay,
     'ic-quote': ICQuote,
+    'ic-rocket-launch': ICRocketLaunch,
     'ic-shield-check': ICShieldCheck,
     'ic-sort-ascending': ICSortAscending,
     'ic-sort-descending': ICSortDescending,

From 07ff6e3892737440b50c11b92b12737d42508e08 Mon Sep 17 00:00:00 2001
From: Rohit Raj <rohit.raj@devtron.ai>
Date: Mon, 7 Apr 2025 17:55:53 +0530
Subject: [PATCH 02/22] feat: AnimatedDeployButton - add support for exception
 user

---
 .../AnimatedDeployButton.tsx                  | 22 ++++++++++++++++---
 .../Components/AnimatedDeployButton/types.tsx |  2 ++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/Shared/Components/AnimatedDeployButton/AnimatedDeployButton.tsx b/src/Shared/Components/AnimatedDeployButton/AnimatedDeployButton.tsx
index 28ede4e1b..a1634513a 100644
--- a/src/Shared/Components/AnimatedDeployButton/AnimatedDeployButton.tsx
+++ b/src/Shared/Components/AnimatedDeployButton/AnimatedDeployButton.tsx
@@ -19,11 +19,16 @@ import { ReactComponent as ICDeploy } from '@Icons/ic-nav-rocket.svg'
 import { ComponentSizeType } from '@Shared/constants'
 import { SyntheticEvent, useEffect, useRef, useState } from 'react'
 import DeployAudio from '@Sounds/DeployAudio.mp3'
-import { Button } from '../Button'
+import { Button, ButtonStyleType } from '../Button'
 import './animatedDeployButton.scss'
 import { AnimatedDeployButtonProps } from './types'
 
-const AnimatedDeployButton = ({ isVirtualEnvironment, onButtonClick }: AnimatedDeployButtonProps) => {
+const AnimatedDeployButton = ({
+    isVirtualEnvironment,
+    onButtonClick,
+    canDeployWithoutApproval,
+    isBulkCDTrigger,
+}: AnimatedDeployButtonProps) => {
     const audioRef = useRef<HTMLAudioElement>(null)
     const timeoutRef = useRef<ReturnType<typeof setTimeout>>(null)
     const isAudioEnabled: boolean = window._env_.FEATURE_ACTION_AUDIOS_ENABLE
@@ -63,7 +68,11 @@ const AnimatedDeployButton = ({ isVirtualEnvironment, onButtonClick }: AnimatedD
         <motion.div whileHover="hover" className={`${clicked ? 'hide-button-text' : ''}`}>
             <Button
                 dataTestId="cd-trigger-deploy-button"
-                text={`Deploy${isVirtualEnvironment ? ' to isolated env' : ''}`}
+                text={
+                    canDeployWithoutApproval
+                        ? 'Deploy without approval'
+                        : `Deploy${isVirtualEnvironment ? ' to isolated env' : ''}`
+                }
                 startIcon={
                     <motion.div
                         variants={svgMotionVariants}
@@ -85,6 +94,13 @@ const AnimatedDeployButton = ({ isVirtualEnvironment, onButtonClick }: AnimatedD
                 }
                 size={ComponentSizeType.large}
                 onClick={handleButtonClick}
+                style={canDeployWithoutApproval && !isBulkCDTrigger ? ButtonStyleType.warning : ButtonStyleType.default}
+                showTooltip={canDeployWithoutApproval}
+                tooltipProps={{
+                    content: isBulkCDTrigger
+                        ? 'Non-approved image(s) are selected for some applications. You are authorized to deploy.'
+                        : 'A non-approved image is selected. You are authorized to deploy.',
+                }}
             />
             {/* Disabling es-lint as captions are not required */}
             {/* eslint-disable-next-line jsx-a11y/media-has-caption */}
diff --git a/src/Shared/Components/AnimatedDeployButton/types.tsx b/src/Shared/Components/AnimatedDeployButton/types.tsx
index 5ca2bb0de..3bba93a54 100644
--- a/src/Shared/Components/AnimatedDeployButton/types.tsx
+++ b/src/Shared/Components/AnimatedDeployButton/types.tsx
@@ -17,4 +17,6 @@
 export interface AnimatedDeployButtonProps {
     isVirtualEnvironment: boolean
     onButtonClick: (e, disableDeployButton: boolean) => void
+    canDeployWithoutApproval?: boolean
+    isBulkCDTrigger?: boolean
 }

From fc72c2e6d02a878606ed9cfc666a5eedd2effa0f Mon Sep 17 00:00:00 2001
From: Rohit Raj <rohit.raj@devtron.ai>
Date: Tue, 8 Apr 2025 11:00:54 +0530
Subject: [PATCH 03/22] feat: add support for exceptionUser in deployment APIs

---
 src/Common/Common.service.ts | 10 +++-----
 src/Common/Types.ts          | 47 ++++++++++++++++++++----------------
 src/Shared/types.ts          |  1 +
 3 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/src/Common/Common.service.ts b/src/Common/Common.service.ts
index d94cd279c..f193a95db 100644
--- a/src/Common/Common.service.ts
+++ b/src/Common/Common.service.ts
@@ -22,11 +22,7 @@ import {
     sanitizeUserApprovalList,
     stringComparatorBySortOrder,
 } from '@Shared/Helpers'
-import {
-    PolicyBlockInfo,
-    RuntimeParamsAPIResponseType,
-    RuntimePluginVariables,
-} from '@Shared/types'
+import { PolicyBlockInfo, RuntimeParamsAPIResponseType, RuntimePluginVariables } from '@Shared/types'
 import { GitProviderType, ROUTES } from './Constants'
 import { getUrlWithSearchParams, sortCallback } from './Helper'
 import {
@@ -264,7 +260,7 @@ export const parseRuntimeParams = (response: RuntimeParamsAPIResponseType): Runt
     const runtimeParams = (response?.runtimePluginVariables ?? []).map<RuntimePluginVariables>((variable) => ({
         ...variable,
         defaultValue: variable.value,
-        stepVariableId: variable.stepVariableId || Math.floor(new Date().valueOf() * Math.random())
+        stepVariableId: variable.stepVariableId || Math.floor(new Date().valueOf() * Math.random()),
     }))
 
     runtimeParams.push(...envVariables)
@@ -324,6 +320,7 @@ export const processCDMaterialServiceResponse = (
             ...processCDMaterialsMetaInfo(cdMaterialsResult),
             ...processCDMaterialsApprovalInfo(false, cdMaterialsResult),
             ...processImagePromotionInfo(cdMaterialsResult),
+            isExceptionUser: false,
         }
     }
 
@@ -352,6 +349,7 @@ export const processCDMaterialServiceResponse = (
         ...approvalInfo,
         ...metaInfo,
         ...imagePromotionInfo,
+        isExceptionUser: cdMaterialsResult.userApprovalConfig?.isExceptionUser ?? false,
     }
 }
 
diff --git a/src/Common/Types.ts b/src/Common/Types.ts
index fd9d9700f..3dcdd5b5c 100644
--- a/src/Common/Types.ts
+++ b/src/Common/Types.ts
@@ -230,25 +230,27 @@ interface InfoColourBarTextConfigType {
     actionButtonConfig?: ButtonProps
 }
 
-type InfoColourBarMessageProp = {
-    message: ReactNode
-    linkText?: ReactNode
-    redirectLink?: string
-    linkOnClick?: () => void
-    linkClass?: string
-    internalLink?: boolean
-
-    textConfig?: never
-} | {
-    textConfig: InfoColourBarTextConfigType
-
-    message?: never
-    linkText?: never
-    redirectLink?: never
-    linkOnClick?: () => never
-    linkClass?: never
-    internalLink?: never
-}
+type InfoColourBarMessageProp =
+    | {
+          message: ReactNode
+          linkText?: ReactNode
+          redirectLink?: string
+          linkOnClick?: () => void
+          linkClass?: string
+          internalLink?: boolean
+
+          textConfig?: never
+      }
+    | {
+          textConfig: InfoColourBarTextConfigType
+
+          message?: never
+          linkText?: never
+          redirectLink?: never
+          linkOnClick?: () => never
+          linkClass?: never
+          internalLink?: never
+      }
 
 export type InfoColourBarType = InfoColourBarMessageProp & {
     classname: string
@@ -783,6 +785,7 @@ export interface CDMaterialResponseType
         CDMaterialsApprovalInfo,
         ImagePromotionMaterialInfo {
     materials: CDMaterialType[]
+    isExceptionUser: boolean
 }
 
 export interface InputDetailType {
@@ -847,7 +850,7 @@ export interface Strategy {
     default?: boolean
 }
 
-export interface CDStage extends Partial<Pick<CommonNodeAttr, 'triggerBlockedInfo' | 'isTriggerBlocked' >> {
+export interface CDStage extends Partial<Pick<CommonNodeAttr, 'triggerBlockedInfo' | 'isTriggerBlocked'>> {
     status: string
     name: string
     triggerType: 'AUTOMATIC' | 'MANUAL'
@@ -859,7 +862,9 @@ export interface CDStageConfigMapSecretNames {
     secrets: any[]
 }
 
-export interface PrePostDeployStageType extends MandatoryPluginBaseStateType, Partial<Pick<CommonNodeAttr, 'triggerBlockedInfo'>> {
+export interface PrePostDeployStageType
+    extends MandatoryPluginBaseStateType,
+        Partial<Pick<CommonNodeAttr, 'triggerBlockedInfo'>> {
     isValid: boolean
     steps: TaskErrorObj[]
     triggerType: string
diff --git a/src/Shared/types.ts b/src/Shared/types.ts
index 399863e3a..b40c0cb8c 100644
--- a/src/Shared/types.ts
+++ b/src/Shared/types.ts
@@ -296,6 +296,7 @@ export interface WorkflowType {
     showTippy?: boolean
     appId?: number
     isSelected?: boolean
+    isExceptionUser?: boolean
     approvalConfiguredIdsMap?: Record<number, ApprovalConfigDataType>
     imageReleaseTags: string[]
     appReleaseTags?: string[]

From c0a2124a1d4b80505ee9a215161390105fd1be46 Mon Sep 17 00:00:00 2001
From: Rohit Raj <rohit.raj@devtron.ai>
Date: Tue, 8 Apr 2025 11:01:31 +0530
Subject: [PATCH 04/22] feat: add support for image deployed without approval

---
 src/Shared/Components/CICDHistory/Artifacts.tsx          | 2 ++
 src/Shared/Components/CICDHistory/History.components.tsx | 2 ++
 src/Shared/Components/CICDHistory/TriggerOutput.tsx      | 1 +
 src/Shared/Components/CICDHistory/types.tsx              | 7 +++++--
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/Shared/Components/CICDHistory/Artifacts.tsx b/src/Shared/Components/CICDHistory/Artifacts.tsx
index 433550608..0d9db9b1b 100644
--- a/src/Shared/Components/CICDHistory/Artifacts.tsx
+++ b/src/Shared/Components/CICDHistory/Artifacts.tsx
@@ -65,6 +65,7 @@ export const CIListItem = ({
     selectedEnvironmentName,
     renderCIListHeader,
     targetPlatforms,
+    isDeploymentWithoutApproval,
 }: CIListItemType) => {
     const headerMetaDataPresent =
         !!getIsApprovalPolicyConfigured(userApprovalMetadata?.approvalConfigData) ||
@@ -90,6 +91,7 @@ export const CIListItem = ({
                     appliedFiltersTimestamp,
                     promotionApprovalMetadata,
                     selectedEnvironmentName,
+                    isDeploymentWithoutApproval,
                 })}
 
             <div
diff --git a/src/Shared/Components/CICDHistory/History.components.tsx b/src/Shared/Components/CICDHistory/History.components.tsx
index 0f06c2aef..12f22f8ac 100644
--- a/src/Shared/Components/CICDHistory/History.components.tsx
+++ b/src/Shared/Components/CICDHistory/History.components.tsx
@@ -135,6 +135,7 @@ export const GitChanges = ({
     selectedEnvironmentName,
     renderCIListHeader,
     targetPlatforms,
+    isDeploymentWithoutApproval,
 }: GitChangesType) => {
     const { isSuperAdmin } = useGetUserRoles()
 
@@ -199,6 +200,7 @@ export const GitChanges = ({
                         selectedEnvironmentName={selectedEnvironmentName}
                         renderCIListHeader={renderCIListHeader}
                         targetPlatforms={targetPlatforms}
+                        isDeploymentWithoutApproval={isDeploymentWithoutApproval}
                     >
                         <div className="flex column left hover-trigger">
                             <div className="cn-9 fs-14 flex left">
diff --git a/src/Shared/Components/CICDHistory/TriggerOutput.tsx b/src/Shared/Components/CICDHistory/TriggerOutput.tsx
index 4371257a8..4b5b595b3 100644
--- a/src/Shared/Components/CICDHistory/TriggerOutput.tsx
+++ b/src/Shared/Components/CICDHistory/TriggerOutput.tsx
@@ -153,6 +153,7 @@ const HistoryLogs: React.FC<HistoryLogsProps> = ({
                             promotionApprovalMetadata={triggerDetails?.promotionApprovalMetadata}
                             renderCIListHeader={renderCIListHeader}
                             targetPlatforms={targetPlatforms}
+                            isDeploymentWithoutApproval={triggerDetails.isDeploymentWithoutApproval ?? false}
                         />
                     </Route>
                     {triggerDetails.stage === 'DEPLOY' && (
diff --git a/src/Shared/Components/CICDHistory/types.tsx b/src/Shared/Components/CICDHistory/types.tsx
index c16375743..c48248dbc 100644
--- a/src/Shared/Components/CICDHistory/types.tsx
+++ b/src/Shared/Components/CICDHistory/types.tsx
@@ -185,6 +185,7 @@ export interface History extends Pick<TargetPlatformsDTO, 'targetPlatforms'>, Wo
     triggerMetadata?: string
     runSource?: RunSourceType
     targetConfig?: TargetConfigType
+    isDeploymentWithoutApproval?: boolean
 }
 
 export interface ExecutionInfoType {
@@ -443,7 +444,7 @@ export interface DeploymentDetailStepsType {
     renderDeploymentApprovalInfo: (userApprovalMetadata: UserApprovalMetadataType) => JSX.Element
 }
 
-export interface RenderCIListHeaderProps {
+export interface RenderCIListHeaderProps extends Pick<History, 'isDeploymentWithoutApproval'> {
     userApprovalMetadata: UserApprovalMetadataType
     triggeredBy: string
     appliedFilters: FilterConditionsListType[]
@@ -463,7 +464,7 @@ export interface VirtualHistoryArtifactProps {
     }
 }
 
-export type CIListItemType = Pick<History, 'promotionApprovalMetadata'> & {
+export type CIListItemType = Pick<History, 'promotionApprovalMetadata' | 'isDeploymentWithoutApproval'> & {
     userApprovalMetadata?: UserApprovalMetadataType
     triggeredBy?: string
     children: ReactNode
@@ -735,6 +736,7 @@ export type GitChangesType = {
           appliedFilters?: never
           appliedFiltersTimestamp?: never
           renderCIListHeader?: never
+          isDeploymentWithoutApproval?: never
       }
     | {
           artifact: string
@@ -753,6 +755,7 @@ export type GitChangesType = {
           appliedFilters?: FilterConditionsListType[]
           appliedFiltersTimestamp?: string
           renderCIListHeader: (renderCIListHeaderProps: RenderCIListHeaderProps) => JSX.Element
+          isDeploymentWithoutApproval?: History['isDeploymentWithoutApproval']
       }
 )
 

From b32d4bed41012a3165dbbcbbbd12a9b3830fdeae Mon Sep 17 00:00:00 2001
From: Rohit Raj <rohit.raj@devtron.ai>
Date: Tue, 8 Apr 2025 13:40:45 +0530
Subject: [PATCH 05/22] feat: AnimatedDeployButton add support for isLoading
 prop

---
 .../Components/AnimatedDeployButton/AnimatedDeployButton.tsx    | 2 ++
 src/Shared/Components/AnimatedDeployButton/types.tsx            | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/Shared/Components/AnimatedDeployButton/AnimatedDeployButton.tsx b/src/Shared/Components/AnimatedDeployButton/AnimatedDeployButton.tsx
index a1634513a..c631a8852 100644
--- a/src/Shared/Components/AnimatedDeployButton/AnimatedDeployButton.tsx
+++ b/src/Shared/Components/AnimatedDeployButton/AnimatedDeployButton.tsx
@@ -24,6 +24,7 @@ import './animatedDeployButton.scss'
 import { AnimatedDeployButtonProps } from './types'
 
 const AnimatedDeployButton = ({
+    isLoading,
     isVirtualEnvironment,
     onButtonClick,
     canDeployWithoutApproval,
@@ -68,6 +69,7 @@ const AnimatedDeployButton = ({
         <motion.div whileHover="hover" className={`${clicked ? 'hide-button-text' : ''}`}>
             <Button
                 dataTestId="cd-trigger-deploy-button"
+                isLoading={isLoading}
                 text={
                     canDeployWithoutApproval
                         ? 'Deploy without approval'
diff --git a/src/Shared/Components/AnimatedDeployButton/types.tsx b/src/Shared/Components/AnimatedDeployButton/types.tsx
index 3bba93a54..4080cf3c7 100644
--- a/src/Shared/Components/AnimatedDeployButton/types.tsx
+++ b/src/Shared/Components/AnimatedDeployButton/types.tsx
@@ -15,6 +15,7 @@
  */
 
 export interface AnimatedDeployButtonProps {
+    isLoading?: boolean
     isVirtualEnvironment: boolean
     onButtonClick: (e, disableDeployButton: boolean) => void
     canDeployWithoutApproval?: boolean

From 4613a17809a690fdb38b21dc3d728765ef808e13 Mon Sep 17 00:00:00 2001
From: Rohit Raj <rohit.raj@devtron.ai>
Date: Thu, 10 Apr 2025 12:46:33 +0530
Subject: [PATCH 06/22] chore: add ic-checks & ic-selected icon

---
 src/Assets/IconV2/ic-checks.svg     |  3 +++
 src/Assets/IconV2/ic-selected.svg   | 20 ++++++++++++++++++++
 src/Shared/Components/Icon/Icon.tsx |  4 ++++
 3 files changed, 27 insertions(+)
 create mode 100644 src/Assets/IconV2/ic-checks.svg
 create mode 100644 src/Assets/IconV2/ic-selected.svg

diff --git a/src/Assets/IconV2/ic-checks.svg b/src/Assets/IconV2/ic-checks.svg
new file mode 100644
index 000000000..1a48f93b4
--- /dev/null
+++ b/src/Assets/IconV2/ic-checks.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path stroke="#3B444C" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m13.875 7.875-8.25 8.25L1.5 12m21-4.125-8.25 8.25-2.191-2.191" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-selected.svg b/src/Assets/IconV2/ic-selected.svg
new file mode 100644
index 000000000..e42627f7e
--- /dev/null
+++ b/src/Assets/IconV2/ic-selected.svg
@@ -0,0 +1,20 @@
+<!--
+  - Copyright (c) 2024. Devtron Inc.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+  -->
+
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="12" cy="12" r="10" fill="var(--B500)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.7071 9.29291C17.0976 9.68344 17.0976 10.3166 16.7071 10.7071L11.3738 16.0402C10.9832 16.4307 10.3501 16.4307 9.95959 16.0402L7.29292 13.3738C6.90238 12.9833 6.90235 12.3501 7.29286 11.9596C7.68337 11.5691 8.31653 11.569 8.70708 11.9595L10.6667 13.9189L15.2929 9.29288C15.6834 8.90236 16.3166 8.90238 16.7071 9.29291Z" fill="var(--N0)"/>
+</svg>
diff --git a/src/Shared/Components/Icon/Icon.tsx b/src/Shared/Components/Icon/Icon.tsx
index b14959613..b14c24325 100644
--- a/src/Shared/Components/Icon/Icon.tsx
+++ b/src/Shared/Components/Icon/Icon.tsx
@@ -21,6 +21,7 @@ import { ReactComponent as ICCaretLeft } from '@IconsV2/ic-caret-left.svg'
 import { ReactComponent as ICCd } from '@IconsV2/ic-cd.svg'
 import { ReactComponent as ICChatCircleDots } from '@IconsV2/ic-chat-circle-dots.svg'
 import { ReactComponent as ICCheck } from '@IconsV2/ic-check.svg'
+import { ReactComponent as ICChecks } from '@IconsV2/ic-checks.svg'
 import { ReactComponent as ICCiLinked } from '@IconsV2/ic-ci-linked.svg'
 import { ReactComponent as ICCiWebhook } from '@IconsV2/ic-ci-webhook.svg'
 import { ReactComponent as ICCircleLoader } from '@IconsV2/ic-circle-loader.svg'
@@ -86,6 +87,7 @@ import { ReactComponent as ICPencil } from '@IconsV2/ic-pencil.svg'
 import { ReactComponent as ICQuay } from '@IconsV2/ic-quay.svg'
 import { ReactComponent as ICQuote } from '@IconsV2/ic-quote.svg'
 import { ReactComponent as ICRocketLaunch } from '@IconsV2/ic-rocket-launch.svg'
+import { ReactComponent as ICSelected } from '@IconsV2/ic-selected.svg'
 import { ReactComponent as ICShieldCheck } from '@IconsV2/ic-shield-check.svg'
 import { ReactComponent as ICSortAscending } from '@IconsV2/ic-sort-ascending.svg'
 import { ReactComponent as ICSortDescending } from '@IconsV2/ic-sort-descending.svg'
@@ -130,6 +132,7 @@ export const iconMap = {
     'ic-cd': ICCd,
     'ic-chat-circle-dots': ICChatCircleDots,
     'ic-check': ICCheck,
+    'ic-checks': ICChecks,
     'ic-ci-linked': ICCiLinked,
     'ic-ci-webhook': ICCiWebhook,
     'ic-circle-loader': ICCircleLoader,
@@ -195,6 +198,7 @@ export const iconMap = {
     'ic-quay': ICQuay,
     'ic-quote': ICQuote,
     'ic-rocket-launch': ICRocketLaunch,
+    'ic-selected': ICSelected,
     'ic-shield-check': ICShieldCheck,
     'ic-sort-ascending': ICSortAscending,
     'ic-sort-descending': ICSortDescending,

From 7c882a449d5da0c221b3e8fe13fd23c34d1313ab Mon Sep 17 00:00:00 2001
From: Rohit Raj <rohit.raj@devtron.ai>
Date: Thu, 10 Apr 2025 12:50:07 +0530
Subject: [PATCH 07/22] fix: adjust gap in ArtifactInfo component

---
 src/Shared/Components/ImageCard/ArtifactInfo/ArtifactInfo.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Shared/Components/ImageCard/ArtifactInfo/ArtifactInfo.tsx b/src/Shared/Components/ImageCard/ArtifactInfo/ArtifactInfo.tsx
index 35129d8c2..b4e8aae2a 100644
--- a/src/Shared/Components/ImageCard/ArtifactInfo/ArtifactInfo.tsx
+++ b/src/Shared/Components/ImageCard/ArtifactInfo/ArtifactInfo.tsx
@@ -61,7 +61,7 @@ const ArtifactInfo = ({
         }
 
         return (
-            <div className="material-history__info flex left fs-13 dc__gap-8">
+            <div className="material-history__info flex left fs-13 dc__gap-6">
                 <DeployIcon className="icon-dim-16 scn-6" />
                 <span className="fs-13 fw-4">{deployedTime}</span>
             </div>

From aa87441096c6408587083fe4c1a8e502f4f6aaff Mon Sep 17 00:00:00 2001
From: Rohit Raj <rohit.raj@devtron.ai>
Date: Fri, 11 Apr 2025 17:18:10 +0530
Subject: [PATCH 08/22] feat: replace ic-timeout-two-dash with ic-timeout-dash
 icon and update references

---
 .../{ic-timeout-two-dash.svg => ic-timeout-dash.svg}      | 8 ++++----
 src/Shared/Components/Icon/Icon.tsx                       | 4 ++--
 src/Shared/Components/StatusComponent/utils.ts            | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename src/Assets/IconV2/{ic-timeout-two-dash.svg => ic-timeout-dash.svg} (53%)

diff --git a/src/Assets/IconV2/ic-timeout-two-dash.svg b/src/Assets/IconV2/ic-timeout-dash.svg
similarity index 53%
rename from src/Assets/IconV2/ic-timeout-two-dash.svg
rename to src/Assets/IconV2/ic-timeout-dash.svg
index 85b6d9893..08932efac 100644
--- a/src/Assets/IconV2/ic-timeout-two-dash.svg
+++ b/src/Assets/IconV2/ic-timeout-dash.svg
@@ -14,8 +14,8 @@
   - limitations under the License.
   -->
 
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3 12C3 7.02944 7.02944 3 12 3" stroke="#3B444C" stroke-width="1.5" stroke-miterlimit="10" stroke-linecap="round" stroke-dasharray="2 3"/>
-<path d="M12 6.75V12L15 16" stroke="#3B444C" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3 12C3 16.9706 7.02944 21 12 21C16.9706 21 21 16.9706 21 12C21 7.02944 16.9706 3 12 3" stroke="#3B444C" stroke-width="1.5" stroke-miterlimit="10"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path stroke="#3B444C" stroke-dasharray="1 3" stroke-linecap="round" stroke-miterlimit="10" stroke-width="1.5" d="M3 12a9 9 0 0 1 9-9" vector-effect="non-scaling-stroke"/>
+  <path stroke="#3B444C" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M12 6.75V12l3 4" vector-effect="non-scaling-stroke"/>
+  <path stroke="#3B444C" stroke-miterlimit="10" stroke-width="1.5" d="M3 12a9 9 0 1 0 9-9" vector-effect="non-scaling-stroke"/>
 </svg>
diff --git a/src/Shared/Components/Icon/Icon.tsx b/src/Shared/Components/Icon/Icon.tsx
index b14c24325..203ead883 100644
--- a/src/Shared/Components/Icon/Icon.tsx
+++ b/src/Shared/Components/Icon/Icon.tsx
@@ -98,7 +98,7 @@ import { ReactComponent as ICStamp } from '@IconsV2/ic-stamp.svg'
 import { ReactComponent as ICSuccess } from '@IconsV2/ic-success.svg'
 import { ReactComponent as ICSuspended } from '@IconsV2/ic-suspended.svg'
 import { ReactComponent as ICTata1mg } from '@IconsV2/ic-tata1mg.svg'
-import { ReactComponent as ICTimeoutTwoDash } from '@IconsV2/ic-timeout-two-dash.svg'
+import { ReactComponent as ICTimeoutDash } from '@IconsV2/ic-timeout-dash.svg'
 import { ReactComponent as ICTimer } from '@IconsV2/ic-timer.svg'
 import { ReactComponent as ICTravclan } from '@IconsV2/ic-travclan.svg'
 import { ReactComponent as ICUnknown } from '@IconsV2/ic-unknown.svg'
@@ -209,7 +209,7 @@ export const iconMap = {
     'ic-success': ICSuccess,
     'ic-suspended': ICSuspended,
     'ic-tata1mg': ICTata1mg,
-    'ic-timeout-two-dash': ICTimeoutTwoDash,
+    'ic-timeout-dash': ICTimeoutDash,
     'ic-timer': ICTimer,
     'ic-travclan': ICTravclan,
     'ic-unknown': ICUnknown,
diff --git a/src/Shared/Components/StatusComponent/utils.ts b/src/Shared/Components/StatusComponent/utils.ts
index eddd95a1e..b6303d7c8 100644
--- a/src/Shared/Components/StatusComponent/utils.ts
+++ b/src/Shared/Components/StatusComponent/utils.ts
@@ -70,7 +70,7 @@ export const getIconName = (status: string, showAnimatedIcon: boolean): IconName
             return 'ic-hibernate'
         case 'timedout':
         case 'timed_out':
-            return 'ic-timeout-two-dash'
+            return 'ic-timeout-dash'
         default:
             return null
     }

From 7a8e4911eb45e0b70af8d9e8b3446ce801512cf6 Mon Sep 17 00:00:00 2001
From: Rohit Raj <rohit.raj@devtron.ai>
Date: Wed, 16 Apr 2025 15:01:59 +0530
Subject: [PATCH 09/22] feat: TabGroup - add truncate to tabs

---
 src/Shared/Components/TabGroup/TabGroup.component.tsx | 8 +++++---
 src/Shared/Components/TabGroup/TabGroup.scss          | 4 ++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Shared/Components/TabGroup/TabGroup.component.tsx b/src/Shared/Components/TabGroup/TabGroup.component.tsx
index 801a4d806..8532103e2 100644
--- a/src/Shared/Components/TabGroup/TabGroup.component.tsx
+++ b/src/Shared/Components/TabGroup/TabGroup.component.tsx
@@ -62,12 +62,14 @@ const Tab = ({
     const getTabComponent = () => {
         const content = (
             <>
-                <p className="m-0 flexbox dc__align-items-center dc__gap-6">
+                <span className="m-0 flexbox dc__align-items-center dc__gap-6">
                     {getTabIcon({ className: iconClassName, icon, showError, showWarning, size, active })}
-                    {label}
+                    <Tooltip content={label}>
+                        <span className="dc__truncate">{label}</span>
+                    </Tooltip>
                     {getTabBadge(badge, badgeClassName)}
                     {getTabIndicator(showIndicator)}
-                </p>
+                </span>
                 {getTabDescription(description)}
             </>
         )
diff --git a/src/Shared/Components/TabGroup/TabGroup.scss b/src/Shared/Components/TabGroup/TabGroup.scss
index a4f18a8a5..c5a352898 100644
--- a/src/Shared/Components/TabGroup/TabGroup.scss
+++ b/src/Shared/Components/TabGroup/TabGroup.scss
@@ -90,6 +90,10 @@
                 color: var(--B500);
                 font-weight: 600;
                 @include svg-styles(var(--B500));
+
+                svg.icon-component-color {
+                    --overrideIconColor: var(--B500);
+                }
             }
 
             &:not(.active) {

From c1962beb95744d1d4473635ad2dbbbb00d760079 Mon Sep 17 00:00:00 2001
From: Rohit Raj <rohit.raj@devtron.ai>
Date: Thu, 17 Apr 2025 15:36:06 +0530
Subject: [PATCH 10/22] feat: update AnimatedDeployButton to use
 exceptionUserConfig for deployment approval logic

---
 .../AnimatedDeployButton/AnimatedDeployButton.tsx   | 13 +++++++------
 .../Components/AnimatedDeployButton/types.tsx       |  5 ++++-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/Shared/Components/AnimatedDeployButton/AnimatedDeployButton.tsx b/src/Shared/Components/AnimatedDeployButton/AnimatedDeployButton.tsx
index 0cf421422..f5e364133 100644
--- a/src/Shared/Components/AnimatedDeployButton/AnimatedDeployButton.tsx
+++ b/src/Shared/Components/AnimatedDeployButton/AnimatedDeployButton.tsx
@@ -30,7 +30,7 @@ const AnimatedDeployButton = ({
     isLoading,
     isVirtualEnvironment,
     onButtonClick,
-    canDeployWithoutApproval,
+    exceptionUserConfig,
     isBulkCDTrigger,
 }: AnimatedDeployButtonProps) => {
     const audioRef = useRef<HTMLAudioElement>(null)
@@ -42,6 +42,7 @@ const AnimatedDeployButton = ({
             rotate: 45,
         },
     }
+    const isExceptionUser = exceptionUserConfig?.canDeploy || exceptionUserConfig?.isImageApprover
 
     const handleButtonClick = async (e: SyntheticEvent) => {
         if (clicked) {
@@ -74,7 +75,7 @@ const AnimatedDeployButton = ({
                 dataTestId="cd-trigger-deploy-button"
                 isLoading={isLoading}
                 text={
-                    canDeployWithoutApproval
+                    exceptionUserConfig?.canDeploy
                         ? 'Deploy without approval'
                         : `Deploy${isVirtualEnvironment ? ' to isolated env' : ''}`
                 }
@@ -99,12 +100,12 @@ const AnimatedDeployButton = ({
                 }
                 size={ComponentSizeType.large}
                 onClick={handleButtonClick}
-                style={canDeployWithoutApproval && !isBulkCDTrigger ? ButtonStyleType.warning : ButtonStyleType.default}
-                showTooltip={canDeployWithoutApproval}
+                style={isExceptionUser && !isBulkCDTrigger ? ButtonStyleType.warning : ButtonStyleType.default}
+                showTooltip={isExceptionUser}
                 tooltipProps={{
                     content: isBulkCDTrigger
-                        ? 'Non-approved image(s) are selected for some applications. You are authorized to deploy.'
-                        : 'A non-approved image is selected. You are authorized to deploy.',
+                        ? 'You are authorized to deploy as an exception user for some applications'
+                        : 'You are authorized to deploy as an exception user',
                 }}
             />
             {/* Disabling es-lint as captions are not required */}
diff --git a/src/Shared/Components/AnimatedDeployButton/types.tsx b/src/Shared/Components/AnimatedDeployButton/types.tsx
index 4080cf3c7..4cb944cbc 100644
--- a/src/Shared/Components/AnimatedDeployButton/types.tsx
+++ b/src/Shared/Components/AnimatedDeployButton/types.tsx
@@ -18,6 +18,9 @@ export interface AnimatedDeployButtonProps {
     isLoading?: boolean
     isVirtualEnvironment: boolean
     onButtonClick: (e, disableDeployButton: boolean) => void
-    canDeployWithoutApproval?: boolean
+    exceptionUserConfig?: {
+        canDeploy: boolean
+        isImageApprover: boolean
+    }
     isBulkCDTrigger?: boolean
 }

From c400d9bcaa585192ac3fbe4ee61e47b4e164e26a Mon Sep 17 00:00:00 2001
From: Rohit Raj <rohit.raj@devtron.ai>
Date: Thu, 17 Apr 2025 15:36:40 +0530
Subject: [PATCH 11/22] feat: display text for deployments by exception users

---
 src/Shared/Components/CICDHistory/Artifacts.tsx | 13 +++++++++++--
 src/Shared/Components/CICDHistory/types.tsx     |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/Shared/Components/CICDHistory/Artifacts.tsx b/src/Shared/Components/CICDHistory/Artifacts.tsx
index 4069b2c6b..5298043fa 100644
--- a/src/Shared/Components/CICDHistory/Artifacts.tsx
+++ b/src/Shared/Components/CICDHistory/Artifacts.tsx
@@ -36,6 +36,7 @@ import {
     useGetUserRoles,
 } from '../../../Common'
 import { EMPTY_STATE_STATUS } from '../../constants'
+import { Icon } from '../Icon'
 import { TargetPlatformBadgeList } from '../TargetPlatforms'
 import { TERMINAL_STATUS_MAP } from './constants'
 import { ArtifactType, CIListItemType } from './types'
@@ -84,6 +85,13 @@ export const CIListItem = ({
                 </div>
             )}
 
+            {isDeploymentWithoutApproval && (
+                <div className="w-100 bg__primary flex left dc__gap-6 px-12 pt-8 pb-7 border__secondary--bottom border__primary--top border__primary--left border__primary--right dc__top-radius-4">
+                    <Icon name="ic-lightning-fill" color="Y500" />
+                    <p className="m-0 fs-13 lh-20 cn-9">Deployed by an exception user</p>
+                </div>
+            )}
+
             {headerMetaDataPresent &&
                 renderCIListHeader &&
                 renderCIListHeader({
@@ -93,12 +101,13 @@ export const CIListItem = ({
                     appliedFiltersTimestamp,
                     promotionApprovalMetadata,
                     selectedEnvironmentName,
-                    isDeploymentWithoutApproval,
                 })}
 
             <div
                 className={`dc__h-fit-content ci-artifact image-tag-parent-card bg__primary br-4 dc__border p-12 w-100 dc__mxw-800 ci-artifact--${type} ${
-                    headerMetaDataPresent && renderCIListHeader ? 'dc__no-top-radius dc__no-top-border' : ''
+                    (headerMetaDataPresent && renderCIListHeader) || isDeploymentWithoutApproval
+                        ? 'dc__no-top-radius dc__no-top-border'
+                        : ''
                 }`}
                 data-testid="hover-on-report-artifact"
             >
diff --git a/src/Shared/Components/CICDHistory/types.tsx b/src/Shared/Components/CICDHistory/types.tsx
index 0864bbf4e..5b8c77b8b 100644
--- a/src/Shared/Components/CICDHistory/types.tsx
+++ b/src/Shared/Components/CICDHistory/types.tsx
@@ -446,7 +446,7 @@ export interface DeploymentDetailStepsType {
     renderDeploymentApprovalInfo: (userApprovalMetadata: UserApprovalMetadataType) => JSX.Element
 }
 
-export interface RenderCIListHeaderProps extends Pick<History, 'isDeploymentWithoutApproval'> {
+export interface RenderCIListHeaderProps {
     userApprovalMetadata: UserApprovalMetadataType
     triggeredBy: string
     appliedFilters: FilterConditionsListType[]

From 7fa7c13b47cd081d265a637abfe8f3dda4eb621c Mon Sep 17 00:00:00 2001
From: Rohit Raj <rohit.raj@devtron.ai>
Date: Tue, 22 Apr 2025 15:42:47 +0530
Subject: [PATCH 12/22] feat: DeploymentDetailSteps - virtual environment -
 show deployed by exception user

---
 .../Components/CICDHistory/Artifacts.tsx       | 18 +++++-------------
 .../CICDHistory/DeploymentDetailSteps.tsx      | 12 +++++++++++-
 .../CICDHistory/DeploymentStatusDetailRow.tsx  |  4 +++-
 .../Components/CICDHistory/TriggerOutput.tsx   |  1 +
 src/Shared/Components/CICDHistory/types.tsx    |  8 ++++----
 5 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/Shared/Components/CICDHistory/Artifacts.tsx b/src/Shared/Components/CICDHistory/Artifacts.tsx
index 5298043fa..b35d1df90 100644
--- a/src/Shared/Components/CICDHistory/Artifacts.tsx
+++ b/src/Shared/Components/CICDHistory/Artifacts.tsx
@@ -36,7 +36,6 @@ import {
     useGetUserRoles,
 } from '../../../Common'
 import { EMPTY_STATE_STATUS } from '../../constants'
-import { Icon } from '../Icon'
 import { TargetPlatformBadgeList } from '../TargetPlatforms'
 import { TERMINAL_STATUS_MAP } from './constants'
 import { ArtifactType, CIListItemType } from './types'
@@ -75,6 +74,8 @@ export const CIListItem = ({
         !!appliedFilters?.length ||
         !!promotionApprovalMetadata?.promotedFromType
 
+    const showCIListHeader = (headerMetaDataPresent || isDeploymentWithoutApproval) && !!renderCIListHeader
+
     return (
         <>
             {type === 'deployed-artifact' && (
@@ -85,15 +86,7 @@ export const CIListItem = ({
                 </div>
             )}
 
-            {isDeploymentWithoutApproval && (
-                <div className="w-100 bg__primary flex left dc__gap-6 px-12 pt-8 pb-7 border__secondary--bottom border__primary--top border__primary--left border__primary--right dc__top-radius-4">
-                    <Icon name="ic-lightning-fill" color="Y500" />
-                    <p className="m-0 fs-13 lh-20 cn-9">Deployed by an exception user</p>
-                </div>
-            )}
-
-            {headerMetaDataPresent &&
-                renderCIListHeader &&
+            {showCIListHeader &&
                 renderCIListHeader({
                     userApprovalMetadata,
                     triggeredBy,
@@ -101,13 +94,12 @@ export const CIListItem = ({
                     appliedFiltersTimestamp,
                     promotionApprovalMetadata,
                     selectedEnvironmentName,
+                    isDeploymentWithoutApproval,
                 })}
 
             <div
                 className={`dc__h-fit-content ci-artifact image-tag-parent-card bg__primary br-4 dc__border p-12 w-100 dc__mxw-800 ci-artifact--${type} ${
-                    (headerMetaDataPresent && renderCIListHeader) || isDeploymentWithoutApproval
-                        ? 'dc__no-top-radius dc__no-top-border'
-                        : ''
+                    showCIListHeader ? 'dc__no-top-radius dc__no-top-border' : ''
                 }`}
                 data-testid="hover-on-report-artifact"
             >
diff --git a/src/Shared/Components/CICDHistory/DeploymentDetailSteps.tsx b/src/Shared/Components/CICDHistory/DeploymentDetailSteps.tsx
index 08f56b220..115cab8cf 100644
--- a/src/Shared/Components/CICDHistory/DeploymentDetailSteps.tsx
+++ b/src/Shared/Components/CICDHistory/DeploymentDetailSteps.tsx
@@ -43,6 +43,7 @@ const DeploymentDetailSteps = ({
     isVirtualEnvironment,
     processVirtualEnvironmentDeploymentData,
     renderDeploymentApprovalInfo,
+    isDeploymentWithoutApproval,
 }: DeploymentDetailStepsType) => {
     const history = useHistory()
     const { url } = useRouteMatch()
@@ -51,6 +52,8 @@ const DeploymentDetailSteps = ({
         deploymentStatus?.toUpperCase() !== TIMELINE_STATUS.ABORTED,
     )
     const isVirtualEnv = useRef(isVirtualEnvironment)
+    const isDeploymentWithoutApprovalRef = useRef(isDeploymentWithoutApproval)
+
     const processedData =
         isVirtualEnv.current && processVirtualEnvironmentDeploymentData
             ? processVirtualEnvironmentDeploymentData()
@@ -69,7 +72,10 @@ const DeploymentDetailSteps = ({
             .then((deploymentStatusDetailRes) => {
                 if (deploymentStatus !== 'Aborted') {
                     // eslint-disable-next-line no-use-before-define
-                    processDeploymentStatusData(deploymentStatusDetailRes.result)
+                    processDeploymentStatusData({
+                        ...deploymentStatusDetailRes.result,
+                        isDeploymentWithoutApproval: isDeploymentWithoutApprovalRef.current,
+                    })
                 }
             })
             .catch(() => {
@@ -97,6 +103,10 @@ const DeploymentDetailSteps = ({
         isVirtualEnv.current = isVirtualEnvironment
     }, [isVirtualEnvironment])
 
+    useEffect(() => {
+        isDeploymentWithoutApprovalRef.current = isDeploymentWithoutApproval
+    }, [isDeploymentWithoutApproval])
+
     const processDeploymentStatusData = (deploymentStatusDetailRes: DeploymentStatusDetailsType): void => {
         const processedDeploymentStatusDetailsData =
             isVirtualEnv.current && processVirtualEnvironmentDeploymentData
diff --git a/src/Shared/Components/CICDHistory/DeploymentStatusDetailRow.tsx b/src/Shared/Components/CICDHistory/DeploymentStatusDetailRow.tsx
index d55511dbd..56417d711 100644
--- a/src/Shared/Components/CICDHistory/DeploymentStatusDetailRow.tsx
+++ b/src/Shared/Components/CICDHistory/DeploymentStatusDetailRow.tsx
@@ -176,7 +176,9 @@ export const DeploymentStatusDetailRow = ({
                 >
                     {renderIcon(statusBreakDownType.icon)}
                     <span className="ml-12 mr-12 fs-13">
-                        <span data-testid="deployment-status-step-name">{statusBreakDownType.displayText}</span>
+                        <span data-testid="deployment-status-step-name" className="flex left">
+                            {statusBreakDownType.displayText}
+                        </span>
                         {statusBreakDownType.displaySubText && (
                             <span className={`ml-12 f-${statusBreakDownType.icon || 'waiting'}`}>
                                 {statusBreakDownType.displaySubText}
diff --git a/src/Shared/Components/CICDHistory/TriggerOutput.tsx b/src/Shared/Components/CICDHistory/TriggerOutput.tsx
index 1f630f5b3..79690560d 100644
--- a/src/Shared/Components/CICDHistory/TriggerOutput.tsx
+++ b/src/Shared/Components/CICDHistory/TriggerOutput.tsx
@@ -133,6 +133,7 @@ const HistoryLogs: React.FC<HistoryLogsProps> = ({
                                 isVirtualEnvironment={triggerDetails.IsVirtualEnvironment}
                                 processVirtualEnvironmentDeploymentData={processVirtualEnvironmentDeploymentData}
                                 renderDeploymentApprovalInfo={renderDeploymentApprovalInfo}
+                                isDeploymentWithoutApproval={triggerDetails.isDeploymentWithoutApproval ?? false}
                             />
                         </Route>
                     )}
diff --git a/src/Shared/Components/CICDHistory/types.tsx b/src/Shared/Components/CICDHistory/types.tsx
index 5b8c77b8b..417f5ed8b 100644
--- a/src/Shared/Components/CICDHistory/types.tsx
+++ b/src/Shared/Components/CICDHistory/types.tsx
@@ -390,7 +390,7 @@ export interface DeploymentStatusDetailsTimelineType {
     statusTime: string
     resourceDetails?: SyncStageResourceDetail[]
 }
-export interface DeploymentStatusDetailsType {
+export interface DeploymentStatusDetailsType extends Pick<History, 'isDeploymentWithoutApproval'> {
     deploymentFinishedOn: string
     deploymentStartedOn: string
     triggeredBy: string
@@ -406,7 +406,7 @@ export interface DeploymentStatusDetailsResponse extends ResponseType {
 
 interface DeploymentStatusDetailRow {
     icon: string
-    displayText: string
+    displayText: ReactNode
     displaySubText: string
     time: string
     resourceDetails?: any
@@ -432,7 +432,7 @@ export interface DeploymentStatusDetailsBreakdownDataType {
     }
 }
 
-export interface DeploymentDetailStepsType {
+export interface DeploymentDetailStepsType extends Pick<History, 'isDeploymentWithoutApproval'> {
     deploymentStatus?: string
     deploymentAppType?: DeploymentAppTypes
     isHelmApps?: boolean
@@ -446,7 +446,7 @@ export interface DeploymentDetailStepsType {
     renderDeploymentApprovalInfo: (userApprovalMetadata: UserApprovalMetadataType) => JSX.Element
 }
 
-export interface RenderCIListHeaderProps {
+export interface RenderCIListHeaderProps extends Required<Pick<History, 'isDeploymentWithoutApproval'>> {
     userApprovalMetadata: UserApprovalMetadataType
     triggeredBy: string
     appliedFilters: FilterConditionsListType[]

From 6799f341a1be3b402c862c00161ba6a7fde9db14 Mon Sep 17 00:00:00 2001
From: Rohit Raj <rohit.raj@devtron.ai>
Date: Tue, 22 Apr 2025 15:43:15 +0530
Subject: [PATCH 13/22] fix: update badge element in TabGroup to use span
 instead of div

---
 src/Shared/Components/TabGroup/TabGroup.helpers.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Shared/Components/TabGroup/TabGroup.helpers.tsx b/src/Shared/Components/TabGroup/TabGroup.helpers.tsx
index 3d515b910..861e7550b 100644
--- a/src/Shared/Components/TabGroup/TabGroup.helpers.tsx
+++ b/src/Shared/Components/TabGroup/TabGroup.helpers.tsx
@@ -47,7 +47,7 @@ export const getTabIcon = ({
 }
 
 export const getTabBadge = (badge: TabProps['badge'], className: string) =>
-    badge !== null && <div className={`tab-group__tab__badge bcn-1 cn-7 fw-6 flex px-4 ${className}`}>{badge}</div>
+    badge !== null && <span className={`tab-group__tab__badge bcn-1 cn-7 fw-6 flex px-4 ${className}`}>{badge}</span>
 
 export const getTabIndicator = (showIndicator: TabProps['showIndicator']) =>
     showIndicator && <span className="tab-group__tab__indicator bcr-5 mt-4 dc__align-self-start" />

From 794725a39c8f793010d5ceeec4dc608f5db0ab29 Mon Sep 17 00:00:00 2001
From: Rohit Raj <rohit.raj@devtron.ai>
Date: Tue, 22 Apr 2025 16:52:42 +0530
Subject: [PATCH 14/22] chore: add ic-key icon

---
 src/Assets/IconV2/ic-key.svg        | 3 +++
 src/Shared/Components/Icon/Icon.tsx | 2 ++
 2 files changed, 5 insertions(+)
 create mode 100644 src/Assets/IconV2/ic-key.svg

diff --git a/src/Assets/IconV2/ic-key.svg b/src/Assets/IconV2/ic-key.svg
new file mode 100644
index 000000000..fc4da3ebc
--- /dev/null
+++ b/src/Assets/IconV2/ic-key.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path stroke="#3B444C" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m15.59 7 1.414 1.414m-8.27 3.101a6.744 6.744 0 1 1 3.75 3.75L11.25 16.5H9v2.25H6.75V21H3v-3.75l5.735-5.735Z" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Shared/Components/Icon/Icon.tsx b/src/Shared/Components/Icon/Icon.tsx
index 68cd908b3..080d8e05a 100644
--- a/src/Shared/Components/Icon/Icon.tsx
+++ b/src/Shared/Components/Icon/Icon.tsx
@@ -65,6 +65,7 @@ import { ReactComponent as ICInfoFilled } from '@IconsV2/ic-info-filled.svg'
 import { ReactComponent as ICInfoOutline } from '@IconsV2/ic-info-outline.svg'
 import { ReactComponent as ICJobColor } from '@IconsV2/ic-job-color.svg'
 import { ReactComponent as ICK8sJob } from '@IconsV2/ic-k8s-job.svg'
+import { ReactComponent as ICKey } from '@IconsV2/ic-key.svg'
 import { ReactComponent as ICLdap } from '@IconsV2/ic-ldap.svg'
 import { ReactComponent as ICLightning } from '@IconsV2/ic-lightning.svg'
 import { ReactComponent as ICLightningFill } from '@IconsV2/ic-lightning-fill.svg'
@@ -177,6 +178,7 @@ export const iconMap = {
     'ic-info-outline': ICInfoOutline,
     'ic-job-color': ICJobColor,
     'ic-k8s-job': ICK8sJob,
+    'ic-key': ICKey,
     'ic-ldap': ICLdap,
     'ic-lightning-fill': ICLightningFill,
     'ic-lightning': ICLightning,

From 3404e9c7a7ed969b8514ce1a0e79d0dfb0c9f5d4 Mon Sep 17 00:00:00 2001
From: Rohit Raj <rohit.raj@devtron.ai>
Date: Tue, 22 Apr 2025 16:53:14 +0530
Subject: [PATCH 15/22] feat: add UserIdentifier component

---
 .../UserIdentifier/UserIdentifier.tsx         | 72 +++++++++++++++++++
 src/Shared/Components/UserIdentifier/index.ts |  2 +
 src/Shared/Components/UserIdentifier/types.ts | 12 ++++
 src/Shared/Components/index.ts                |  1 +
 4 files changed, 87 insertions(+)
 create mode 100644 src/Shared/Components/UserIdentifier/UserIdentifier.tsx
 create mode 100644 src/Shared/Components/UserIdentifier/index.ts
 create mode 100644 src/Shared/Components/UserIdentifier/types.ts

diff --git a/src/Shared/Components/UserIdentifier/UserIdentifier.tsx b/src/Shared/Components/UserIdentifier/UserIdentifier.tsx
new file mode 100644
index 000000000..cdcf998b8
--- /dev/null
+++ b/src/Shared/Components/UserIdentifier/UserIdentifier.tsx
@@ -0,0 +1,72 @@
+import { getAlphabetIcon } from '@Common/Helper'
+import { Tooltip } from '@Common/Tooltip'
+import { API_TOKEN_PREFIX } from '@Shared/constants'
+import { useUserEmail } from '@Shared/Providers'
+
+import { Icon } from '../Icon'
+import { UserIdentifierProps } from './types'
+
+const UserIdentifierTooltip = ({
+    children,
+    tooltipContent,
+}: Pick<UserIdentifierProps, 'children' | 'tooltipContent'>) => (
+    <Tooltip alwaysShowTippyOnHover={!!tooltipContent} content={tooltipContent}>
+        <div className="flexbox dc__gap-8 dc__align-items-center">{children}</div>
+    </Tooltip>
+)
+
+export const UserIdentifier = ({
+    email,
+    children,
+    rootClassName,
+    tooltipContent,
+    isUserGroup = false,
+}: UserIdentifierProps) => {
+    // HOOKS
+    const { email: currentUserEmail } = useUserEmail()
+
+    // CONSTANTS
+    const isCurrentUser = email === currentUserEmail
+
+    return (
+        <div className={`flexbox dc__gap-8 ${rootClassName || ''}`}>
+            {email.startsWith(API_TOKEN_PREFIX) ? (
+                <UserIdentifierTooltip tooltipContent={tooltipContent}>
+                    <Icon name="ic-key" color="N700" size={20} />
+                    <div className="flexbox dc__gap-2">
+                        <Tooltip
+                            {...(tooltipContent
+                                ? { content: email, alwaysShowTippyOnHover: false }
+                                : { content: email })}
+                        >
+                            <span className="cn-9 fs-13 fw-4 lh-20 dc__truncate">
+                                {isCurrentUser ? 'You' : email.split(':')?.[1] || '-'}
+                            </span>
+                        </Tooltip>
+                        {children}
+                    </div>
+                </UserIdentifierTooltip>
+            ) : (
+                <UserIdentifierTooltip tooltipContent={tooltipContent}>
+                    {isUserGroup ? (
+                        <span className="flex p-1">
+                            <Icon name="ic-users" color="N700" size={18} />
+                        </span>
+                    ) : (
+                        getAlphabetIcon(email, 'dc__no-shrink m-0-imp')
+                    )}
+                    <div className="flexbox dc__gap-2">
+                        <Tooltip
+                            {...(tooltipContent
+                                ? { content: email, alwaysShowTippyOnHover: false }
+                                : { content: email })}
+                        >
+                            <span className="cn-9 fs-13 fw-4 lh-20 dc__truncate">{isCurrentUser ? 'You' : email}</span>
+                        </Tooltip>
+                        {children}
+                    </div>
+                </UserIdentifierTooltip>
+            )}
+        </div>
+    )
+}
diff --git a/src/Shared/Components/UserIdentifier/index.ts b/src/Shared/Components/UserIdentifier/index.ts
new file mode 100644
index 000000000..0b3e4d0e6
--- /dev/null
+++ b/src/Shared/Components/UserIdentifier/index.ts
@@ -0,0 +1,2 @@
+export * from './types'
+export * from './UserIdentifier'
diff --git a/src/Shared/Components/UserIdentifier/types.ts b/src/Shared/Components/UserIdentifier/types.ts
new file mode 100644
index 000000000..17de36d4d
--- /dev/null
+++ b/src/Shared/Components/UserIdentifier/types.ts
@@ -0,0 +1,12 @@
+import { ReactNode } from 'react'
+
+export interface UserIdentifierProps {
+    email: string
+    children?: ReactNode
+    isUserGroup?: boolean
+    rootClassName?: string
+    /**
+     * @description - If given, would show tooltip on div containing avatar, email and children
+     */
+    tooltipContent?: string
+}
diff --git a/src/Shared/Components/index.ts b/src/Shared/Components/index.ts
index 673dbe2ca..fa9c56524 100644
--- a/src/Shared/Components/index.ts
+++ b/src/Shared/Components/index.ts
@@ -94,5 +94,6 @@ export * from './ThemeSwitcher'
 export * from './ToggleResolveScopedVariables'
 export * from './UnsavedChanges'
 export * from './UnsavedChangesDialog'
+export * from './UserIdentifier'
 export * from './VirtualizedList'
 export * from './WorkflowOptionsModal'

From 4e9ee8432b48bdca0ca446dfa3a96eeccef82202 Mon Sep 17 00:00:00 2001
From: Rohit Raj <rohit.raj@devtron.ai>
Date: Tue, 22 Apr 2025 17:49:01 +0530
Subject: [PATCH 16/22] fix: remove isExceptionUser from CDMaterialResponseType
 and related logic

---
 src/Common/Common.service.ts                                    | 2 --
 src/Common/Types.ts                                             | 1 -
 .../Components/AnimatedDeployButton/AnimatedDeployButton.tsx    | 2 +-
 src/Shared/types.ts                                             | 1 +
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Common/Common.service.ts b/src/Common/Common.service.ts
index f193a95db..bb1c9fe72 100644
--- a/src/Common/Common.service.ts
+++ b/src/Common/Common.service.ts
@@ -320,7 +320,6 @@ export const processCDMaterialServiceResponse = (
             ...processCDMaterialsMetaInfo(cdMaterialsResult),
             ...processCDMaterialsApprovalInfo(false, cdMaterialsResult),
             ...processImagePromotionInfo(cdMaterialsResult),
-            isExceptionUser: false,
         }
     }
 
@@ -349,7 +348,6 @@ export const processCDMaterialServiceResponse = (
         ...approvalInfo,
         ...metaInfo,
         ...imagePromotionInfo,
-        isExceptionUser: cdMaterialsResult.userApprovalConfig?.isExceptionUser ?? false,
     }
 }
 
diff --git a/src/Common/Types.ts b/src/Common/Types.ts
index 3dcdd5b5c..d78d333f5 100644
--- a/src/Common/Types.ts
+++ b/src/Common/Types.ts
@@ -785,7 +785,6 @@ export interface CDMaterialResponseType
         CDMaterialsApprovalInfo,
         ImagePromotionMaterialInfo {
     materials: CDMaterialType[]
-    isExceptionUser: boolean
 }
 
 export interface InputDetailType {
diff --git a/src/Shared/Components/AnimatedDeployButton/AnimatedDeployButton.tsx b/src/Shared/Components/AnimatedDeployButton/AnimatedDeployButton.tsx
index f5e364133..43a301db4 100644
--- a/src/Shared/Components/AnimatedDeployButton/AnimatedDeployButton.tsx
+++ b/src/Shared/Components/AnimatedDeployButton/AnimatedDeployButton.tsx
@@ -100,7 +100,7 @@ const AnimatedDeployButton = ({
                 }
                 size={ComponentSizeType.large}
                 onClick={handleButtonClick}
-                style={isExceptionUser && !isBulkCDTrigger ? ButtonStyleType.warning : ButtonStyleType.default}
+                style={isExceptionUser ? ButtonStyleType.warning : ButtonStyleType.default}
                 showTooltip={isExceptionUser}
                 tooltipProps={{
                     content: isBulkCDTrigger
diff --git a/src/Shared/types.ts b/src/Shared/types.ts
index 9077d3f68..13e2cb7e4 100644
--- a/src/Shared/types.ts
+++ b/src/Shared/types.ts
@@ -299,6 +299,7 @@ export interface WorkflowType {
     appId?: number
     isSelected?: boolean
     isExceptionUser?: boolean
+    canApproverDeploy?: boolean
     approvalConfiguredIdsMap?: Record<number, ApprovalConfigDataType>
     imageReleaseTags: string[]
     appReleaseTags?: string[]

From 0450fbead0de73432f5cef6e4b0f918c906b1c37 Mon Sep 17 00:00:00 2001
From: Rohit Raj <rohit.raj@devtron.ai>
Date: Tue, 22 Apr 2025 17:49:32 +0530
Subject: [PATCH 17/22] refactor: UserIdentifier - styling update

---
 src/Shared/Components/UserIdentifier/UserIdentifier.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Shared/Components/UserIdentifier/UserIdentifier.tsx b/src/Shared/Components/UserIdentifier/UserIdentifier.tsx
index cdcf998b8..b8050c72e 100644
--- a/src/Shared/Components/UserIdentifier/UserIdentifier.tsx
+++ b/src/Shared/Components/UserIdentifier/UserIdentifier.tsx
@@ -49,9 +49,7 @@ export const UserIdentifier = ({
             ) : (
                 <UserIdentifierTooltip tooltipContent={tooltipContent}>
                     {isUserGroup ? (
-                        <span className="flex p-1">
-                            <Icon name="ic-users" color="N700" size={18} />
-                        </span>
+                        <Icon name="ic-users" color="N700" size={20} />
                     ) : (
                         getAlphabetIcon(email, 'dc__no-shrink m-0-imp')
                     )}

From c88025af1c9c95bc6e57606dc03e23b80f94ac92 Mon Sep 17 00:00:00 2001
From: Rohit Raj <rohit.raj@devtron.ai>
Date: Wed, 23 Apr 2025 18:42:57 +0530
Subject: [PATCH 18/22] fix: DeploymentHistoryConfigDiff - incorrect config
 diff showing fix

---
 .../DeploymentHistoryConfigDiff.tsx           | 30 ++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/Shared/Components/CICDHistory/DeploymentHistoryConfigDiff/DeploymentHistoryConfigDiff.tsx b/src/Shared/Components/CICDHistory/DeploymentHistoryConfigDiff/DeploymentHistoryConfigDiff.tsx
index c032eb833..4c0721de8 100644
--- a/src/Shared/Components/CICDHistory/DeploymentHistoryConfigDiff/DeploymentHistoryConfigDiff.tsx
+++ b/src/Shared/Components/CICDHistory/DeploymentHistoryConfigDiff/DeploymentHistoryConfigDiff.tsx
@@ -21,9 +21,9 @@ import { ReactComponent as ICError } from '@Icons/ic-error.svg'
 import ErrorScreenManager from '@Common/ErrorScreenManager'
 import { useAsync } from '@Common/Helper'
 import { useUrlFilters } from '@Common/Hooks'
-import { GenericEmptyState, InfoColourBar } from '@Common/index'
+import { GenericEmptyState, InfoColourBar, SortingOrder } from '@Common/index'
 import { Progressing } from '@Common/Progressing'
-import { getAppEnvDeploymentConfigList } from '@Shared/Components/DeploymentConfigDiff'
+import { DEPLOYMENT_CONFIG_DIFF_SORT_KEY, getAppEnvDeploymentConfigList } from '@Shared/Components/DeploymentConfigDiff'
 import { groupArrayByObjectKey } from '@Shared/Helpers'
 import { useMainContext } from '@Shared/Providers'
 import { EnvResourceType, getAppEnvDeploymentConfig, getCompareSecretsData } from '@Shared/Services'
@@ -125,7 +125,7 @@ export const DeploymentHistoryConfigDiff = ({
         `${generatePath(path, { ...params })}/${resourceType}${resourceName ? `/${resourceName}` : ''}${search}`
 
     // Generate the deployment history config list
-    const deploymentConfigList = useMemo(() => {
+    const { deploymentConfigList, sortedDeploymentConfigList } = useMemo(() => {
         if (!compareDeploymentConfigLoader && compareDeploymentConfig) {
             const compareList =
                 isPreviousDeploymentConfigAvailable && compareDeploymentConfig[1].status === 'fulfilled'
@@ -140,6 +140,8 @@ export const DeploymentHistoryConfigDiff = ({
             const currentList =
                 compareDeploymentConfig[0].status === 'fulfilled' ? compareDeploymentConfig[0].value.result : null
 
+            // This data is displayed on the deployment history diff view page.
+            // It requires dynamic sorting based on the current sortBy and sortOrder, which the user can modify using the Sort Button.
             const configData = getAppEnvDeploymentConfigList({
                 currentList,
                 compareList,
@@ -147,10 +149,21 @@ export const DeploymentHistoryConfigDiff = ({
                 convertVariables,
                 sortingConfig: { sortBy, sortOrder },
             })
-            return configData
+
+            // Sorting is hardcoded here because this data is displayed on the deployment history configuration tab.
+            // The diff needs to be shown on sorted data, and no additional sorting will be applied.
+            const sortedConfigData = getAppEnvDeploymentConfigList({
+                currentList,
+                compareList,
+                getNavItemHref,
+                convertVariables,
+                sortingConfig: { sortBy: DEPLOYMENT_CONFIG_DIFF_SORT_KEY, sortOrder: SortingOrder.ASC },
+            })
+
+            return { deploymentConfigList: configData, sortedDeploymentConfigList: sortedConfigData }
         }
 
-        return null
+        return { deploymentConfigList: null, sortedDeploymentConfigList: null }
     }, [
         isPreviousDeploymentConfigAvailable,
         compareDeploymentConfigLoader,
@@ -170,8 +183,11 @@ export const DeploymentHistoryConfigDiff = ({
     )
 
     const groupedDeploymentConfigList = useMemo(
-        () => (deploymentConfigList ? groupArrayByObjectKey(deploymentConfigList.configList, 'groupHeader') : []),
-        [deploymentConfigList],
+        () =>
+            sortedDeploymentConfigList
+                ? groupArrayByObjectKey(sortedDeploymentConfigList.configList, 'groupHeader')
+                : [],
+        [sortedDeploymentConfigList],
     )
 
     /** Previous deployment config has 404 error. */

From 0c33ac3528fdd451660ed2ae676a654ec88c7e47 Mon Sep 17 00:00:00 2001
From: Rohit Raj <rohit.raj@devtron.ai>
Date: Thu, 24 Apr 2025 15:11:20 +0530
Subject: [PATCH 19/22] refactor: Artifacts, UserIdentifier - code
 optimization, remove redundancy

---
 .../Components/CICDHistory/Artifacts.tsx      | 12 +--
 .../UserIdentifier/UserIdentifier.tsx         | 75 ++++++++++---------
 2 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/src/Shared/Components/CICDHistory/Artifacts.tsx b/src/Shared/Components/CICDHistory/Artifacts.tsx
index b35d1df90..9e4f2beda 100644
--- a/src/Shared/Components/CICDHistory/Artifacts.tsx
+++ b/src/Shared/Components/CICDHistory/Artifacts.tsx
@@ -69,12 +69,12 @@ export const CIListItem = ({
     targetPlatforms,
     isDeploymentWithoutApproval,
 }: CIListItemType) => {
-    const headerMetaDataPresent =
-        !!getIsApprovalPolicyConfigured(userApprovalMetadata?.approvalConfigData) ||
-        !!appliedFilters?.length ||
-        !!promotionApprovalMetadata?.promotedFromType
-
-    const showCIListHeader = (headerMetaDataPresent || isDeploymentWithoutApproval) && !!renderCIListHeader
+    const showCIListHeader =
+        !!renderCIListHeader &&
+        (!!getIsApprovalPolicyConfigured(userApprovalMetadata?.approvalConfigData) ||
+            !!appliedFilters?.length ||
+            !!promotionApprovalMetadata?.promotedFromType ||
+            isDeploymentWithoutApproval)
 
     return (
         <>
diff --git a/src/Shared/Components/UserIdentifier/UserIdentifier.tsx b/src/Shared/Components/UserIdentifier/UserIdentifier.tsx
index b8050c72e..70cd6663c 100644
--- a/src/Shared/Components/UserIdentifier/UserIdentifier.tsx
+++ b/src/Shared/Components/UserIdentifier/UserIdentifier.tsx
@@ -25,46 +25,51 @@ export const UserIdentifier = ({
     // HOOKS
     const { email: currentUserEmail } = useUserEmail()
 
+    if (!email) {
+        return null
+    }
+
     // CONSTANTS
     const isCurrentUser = email === currentUserEmail
+    const isApiToken = email.startsWith(API_TOKEN_PREFIX)
+
+    const renderIcon = () => {
+        if (isApiToken) {
+            return <Icon name="ic-key" color="N700" size={20} />
+        }
+
+        return isUserGroup ? (
+            <Icon name="ic-users" color="N700" size={20} />
+        ) : (
+            getAlphabetIcon(email, 'dc__no-shrink m-0-imp')
+        )
+    }
+
+    const renderText = () => {
+        if (isCurrentUser) {
+            return 'You'
+        }
+
+        if (isApiToken) {
+            return email.split(':')?.[1] || '-'
+        }
+
+        return email
+    }
 
     return (
         <div className={`flexbox dc__gap-8 ${rootClassName || ''}`}>
-            {email.startsWith(API_TOKEN_PREFIX) ? (
-                <UserIdentifierTooltip tooltipContent={tooltipContent}>
-                    <Icon name="ic-key" color="N700" size={20} />
-                    <div className="flexbox dc__gap-2">
-                        <Tooltip
-                            {...(tooltipContent
-                                ? { content: email, alwaysShowTippyOnHover: false }
-                                : { content: email })}
-                        >
-                            <span className="cn-9 fs-13 fw-4 lh-20 dc__truncate">
-                                {isCurrentUser ? 'You' : email.split(':')?.[1] || '-'}
-                            </span>
-                        </Tooltip>
-                        {children}
-                    </div>
-                </UserIdentifierTooltip>
-            ) : (
-                <UserIdentifierTooltip tooltipContent={tooltipContent}>
-                    {isUserGroup ? (
-                        <Icon name="ic-users" color="N700" size={20} />
-                    ) : (
-                        getAlphabetIcon(email, 'dc__no-shrink m-0-imp')
-                    )}
-                    <div className="flexbox dc__gap-2">
-                        <Tooltip
-                            {...(tooltipContent
-                                ? { content: email, alwaysShowTippyOnHover: false }
-                                : { content: email })}
-                        >
-                            <span className="cn-9 fs-13 fw-4 lh-20 dc__truncate">{isCurrentUser ? 'You' : email}</span>
-                        </Tooltip>
-                        {children}
-                    </div>
-                </UserIdentifierTooltip>
-            )}
+            <UserIdentifierTooltip tooltipContent={tooltipContent}>
+                {renderIcon()}
+                <div className="flexbox dc__gap-2">
+                    <Tooltip
+                        {...(tooltipContent ? { content: email, alwaysShowTippyOnHover: false } : { content: email })}
+                    >
+                        <span className="cn-9 fs-13 fw-4 lh-20 dc__truncate">{renderText()}</span>
+                    </Tooltip>
+                    {children}
+                </div>
+            </UserIdentifierTooltip>
         </div>
     )
 }

From ffc73b7e3d60bde51667fa85a02255f40b948b0a Mon Sep 17 00:00:00 2001
From: Rohit Raj <rohit.raj@devtron.ai>
Date: Mon, 28 Apr 2025 15:32:30 +0530
Subject: [PATCH 20/22] chore(version): bump to 1.12.0-beta-2

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 40ebd223c..0304d5b37 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "1.12.0-pre-0",
+    "version": "1.12.0-beta-2",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@devtron-labs/devtron-fe-common-lib",
-            "version": "1.12.0-pre-0",
+            "version": "1.12.0-beta-2",
             "hasInstallScript": true,
             "license": "ISC",
             "dependencies": {
diff --git a/package.json b/package.json
index 6fe84e4cf..37ff28408 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "1.12.0-pre-0",
+    "version": "1.12.0-beta-2",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",

From a013fbfd1be1733b9fdf548515dcbca6aa78ce64 Mon Sep 17 00:00:00 2001
From: Rohit Raj <rohit.raj@devtron.ai>
Date: Mon, 5 May 2025 15:41:46 +0530
Subject: [PATCH 21/22] refactor: rename email prop to identifier in
 UserIdentifier component

---
 .../UserIdentifier/UserIdentifier.tsx          | 18 ++++++++++--------
 src/Shared/Components/UserIdentifier/types.ts  |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/Shared/Components/UserIdentifier/UserIdentifier.tsx b/src/Shared/Components/UserIdentifier/UserIdentifier.tsx
index 70cd6663c..8e9318cc2 100644
--- a/src/Shared/Components/UserIdentifier/UserIdentifier.tsx
+++ b/src/Shared/Components/UserIdentifier/UserIdentifier.tsx
@@ -16,7 +16,7 @@ const UserIdentifierTooltip = ({
 )
 
 export const UserIdentifier = ({
-    email,
+    identifier,
     children,
     rootClassName,
     tooltipContent,
@@ -25,13 +25,13 @@ export const UserIdentifier = ({
     // HOOKS
     const { email: currentUserEmail } = useUserEmail()
 
-    if (!email) {
+    if (!identifier) {
         return null
     }
 
     // CONSTANTS
-    const isCurrentUser = email === currentUserEmail
-    const isApiToken = email.startsWith(API_TOKEN_PREFIX)
+    const isCurrentUser = identifier === currentUserEmail
+    const isApiToken = identifier.startsWith(API_TOKEN_PREFIX)
 
     const renderIcon = () => {
         if (isApiToken) {
@@ -41,7 +41,7 @@ export const UserIdentifier = ({
         return isUserGroup ? (
             <Icon name="ic-users" color="N700" size={20} />
         ) : (
-            getAlphabetIcon(email, 'dc__no-shrink m-0-imp')
+            getAlphabetIcon(identifier, 'dc__no-shrink m-0-imp')
         )
     }
 
@@ -51,10 +51,10 @@ export const UserIdentifier = ({
         }
 
         if (isApiToken) {
-            return email.split(':')?.[1] || '-'
+            return identifier.split(':')?.[1] || '-'
         }
 
-        return email
+        return identifier
     }
 
     return (
@@ -63,7 +63,9 @@ export const UserIdentifier = ({
                 {renderIcon()}
                 <div className="flexbox dc__gap-2">
                     <Tooltip
-                        {...(tooltipContent ? { content: email, alwaysShowTippyOnHover: false } : { content: email })}
+                        {...(tooltipContent
+                            ? { content: identifier, alwaysShowTippyOnHover: false }
+                            : { content: identifier })}
                     >
                         <span className="cn-9 fs-13 fw-4 lh-20 dc__truncate">{renderText()}</span>
                     </Tooltip>
diff --git a/src/Shared/Components/UserIdentifier/types.ts b/src/Shared/Components/UserIdentifier/types.ts
index 17de36d4d..7a2e3b8dc 100644
--- a/src/Shared/Components/UserIdentifier/types.ts
+++ b/src/Shared/Components/UserIdentifier/types.ts
@@ -1,7 +1,7 @@
 import { ReactNode } from 'react'
 
 export interface UserIdentifierProps {
-    email: string
+    identifier: string
     children?: ReactNode
     isUserGroup?: boolean
     rootClassName?: string

From afd87c80373ed0fc55ffdf8891ff1ea74b986aaa Mon Sep 17 00:00:00 2001
From: Rohit Raj <rohit.raj@devtron.ai>
Date: Mon, 5 May 2025 15:42:07 +0530
Subject: [PATCH 22/22] chore(version): bump to 1.12.0-pre-4

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 386347e6d..b3f206a49 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "1.12.0-pre-3",
+    "version": "1.12.0-pre-4",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@devtron-labs/devtron-fe-common-lib",
-            "version": "1.12.0-pre-3",
+            "version": "1.12.0-pre-4",
             "hasInstallScript": true,
             "license": "ISC",
             "dependencies": {
diff --git a/package.json b/package.json
index 77e914d22..a6af9db1f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "1.12.0-pre-3",
+    "version": "1.12.0-pre-4",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",