Skip to content

Commit 44f241d

Browse files
committed
Merge branch 'feature/canary-visibility' of https://github.com/devtron-labs/devtron-fe-common-lib into feat/canary-details-app
2 parents 1d3eacb + 3a309cb commit 44f241d

File tree

8 files changed

+28
-3
lines changed

8 files changed

+28
-3
lines changed
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading

src/Assets/IconV2/ic-hibernate.svg

Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading

src/Assets/IconV2/ic-sun.svg

Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading

src/Shared/Components/Icon/Icon.tsx

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { ReactComponent as ICApica } from '@IconsV2/ic-apica.svg'
77
import { ReactComponent as ICAppGroup } from '@IconsV2/ic-app-group.svg'
88
import { ReactComponent as ICArrowClockwise } from '@IconsV2/ic-arrow-clockwise.svg'
99
import { ReactComponent as ICArrowRight } from '@IconsV2/ic-arrow-right.svg'
10+
import { ReactComponent as ICArrowsClockwise } from '@IconsV2/ic-arrows-clockwise.svg'
1011
import { ReactComponent as ICArrowsLeftRight } from '@IconsV2/ic-arrows-left-right.svg'
1112
import { ReactComponent as ICAther } from '@IconsV2/ic-ather.svg'
1213
import { ReactComponent as ICAzure } from '@IconsV2/ic-azure.svg'
@@ -67,6 +68,7 @@ import { ReactComponent as ICHelm } from '@IconsV2/ic-helm.svg'
6768
import { ReactComponent as ICHelpFilled } from '@IconsV2/ic-help-filled.svg'
6869
import { ReactComponent as ICHelpOutline } from '@IconsV2/ic-help-outline.svg'
6970
import { ReactComponent as ICHibernate } from '@IconsV2/ic-hibernate.svg'
71+
import { ReactComponent as ICHibernateCircle } from '@IconsV2/ic-hibernate-circle.svg'
7072
import { ReactComponent as ICInProgress } from '@IconsV2/ic-in-progress.svg'
7173
import { ReactComponent as ICInfoFilled } from '@IconsV2/ic-info-filled.svg'
7274
import { ReactComponent as ICInfoOutline } from '@IconsV2/ic-info-outline.svg'
@@ -87,6 +89,7 @@ import { ReactComponent as ICMemory } from '@IconsV2/ic-memory.svg'
8789
import { ReactComponent as ICMicrosoft } from '@IconsV2/ic-microsoft.svg'
8890
import { ReactComponent as ICMissing } from '@IconsV2/ic-missing.svg'
8991
import { ReactComponent as ICMonitoring } from '@IconsV2/ic-monitoring.svg'
92+
import { ReactComponent as ICMoreVertical } from '@IconsV2/ic-more-vertical.svg'
9093
import { ReactComponent as ICNew } from '@IconsV2/ic-new.svg'
9194
import { ReactComponent as ICNodeScript } from '@IconsV2/ic-node-script.svg'
9295
import { ReactComponent as ICOidc } from '@IconsV2/ic-oidc.svg'
@@ -114,13 +117,15 @@ import { ReactComponent as ICStrategyCanary } from '@IconsV2/ic-strategy-canary.
114117
import { ReactComponent as ICStrategyRecreate } from '@IconsV2/ic-strategy-recreate.svg'
115118
import { ReactComponent as ICStrategyRolling } from '@IconsV2/ic-strategy-rolling.svg'
116119
import { ReactComponent as ICSuccess } from '@IconsV2/ic-success.svg'
120+
import { ReactComponent as ICSun } from '@IconsV2/ic-sun.svg'
117121
import { ReactComponent as ICSuspended } from '@IconsV2/ic-suspended.svg'
118122
import { ReactComponent as ICTata1mg } from '@IconsV2/ic-tata1mg.svg'
119123
import { ReactComponent as ICTerminalFill } from '@IconsV2/ic-terminal-fill.svg'
120124
import { ReactComponent as ICThumbDown } from '@IconsV2/ic-thumb-down.svg'
121125
import { ReactComponent as ICThumbUp } from '@IconsV2/ic-thumb-up.svg'
122126
import { ReactComponent as ICTimeoutDash } from '@IconsV2/ic-timeout-dash.svg'
123127
import { ReactComponent as ICTimer } from '@IconsV2/ic-timer.svg'
128+
import { ReactComponent as ICTrafficSignal } from '@IconsV2/ic-traffic-signal.svg'
124129
import { ReactComponent as ICTravclan } from '@IconsV2/ic-travclan.svg'
125130
import { ReactComponent as ICUnknown } from '@IconsV2/ic-unknown.svg'
126131
import { ReactComponent as ICUserKey } from '@IconsV2/ic-user-key.svg'
@@ -139,6 +144,7 @@ export const iconMap = {
139144
'ic-app-group': ICAppGroup,
140145
'ic-arrow-clockwise': ICArrowClockwise,
141146
'ic-arrow-right': ICArrowRight,
147+
'ic-arrows-clockwise': ICArrowsClockwise,
142148
'ic-arrows-left-right': ICArrowsLeftRight,
143149
'ic-ather': ICAther,
144150
'ic-azure': ICAzure,
@@ -198,6 +204,7 @@ export const iconMap = {
198204
'ic-helm': ICHelm,
199205
'ic-help-filled': ICHelpFilled,
200206
'ic-help-outline': ICHelpOutline,
207+
'ic-hibernate-circle': ICHibernateCircle,
201208
'ic-hibernate': ICHibernate,
202209
'ic-in-progress': ICInProgress,
203210
'ic-info-filled': ICInfoFilled,
@@ -219,6 +226,7 @@ export const iconMap = {
219226
'ic-microsoft': ICMicrosoft,
220227
'ic-missing': ICMissing,
221228
'ic-monitoring': ICMonitoring,
229+
'ic-more-vertical': ICMoreVertical,
222230
'ic-new': ICNew,
223231
'ic-node-script': ICNodeScript,
224232
'ic-oidc': ICOidc,
@@ -246,13 +254,15 @@ export const iconMap = {
246254
'ic-strategy-recreate': ICStrategyRecreate,
247255
'ic-strategy-rolling': ICStrategyRolling,
248256
'ic-success': ICSuccess,
257+
'ic-sun': ICSun,
249258
'ic-suspended': ICSuspended,
250259
'ic-tata1mg': ICTata1mg,
251260
'ic-terminal-fill': ICTerminalFill,
252261
'ic-thumb-down': ICThumbDown,
253262
'ic-thumb-up': ICThumbUp,
254263
'ic-timeout-dash': ICTimeoutDash,
255264
'ic-timer': ICTimer,
265+
'ic-traffic-signal': ICTrafficSignal,
256266
'ic-travclan': ICTravclan,
257267
'ic-unknown': ICUnknown,
258268
'ic-user-key': ICUserKey,

src/Shared/Components/StatusComponent/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export const getIconName = (status: string, showAnimatedIcon: boolean): IconName
6767
return 'ic-in-progress'
6868
case 'hibernating':
6969
case 'hibernated':
70-
return 'ic-hibernate'
70+
return 'ic-hibernate-circle'
7171
case 'timedout':
7272
case 'timed_out':
7373
return 'ic-timeout-dash'

0 commit comments

Comments
 (0)