Skip to content

Commit 19c1485

Browse files
committed
Merge branch 'feature/canary-visibility' of github.com:devtron-labs/devtron-fe-common-lib into feat/app-group-manage-traffic
2 parents 6050c82 + 3a309cb commit 19c1485

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'
@@ -69,6 +70,7 @@ import { ReactComponent as ICHelm } from '@IconsV2/ic-helm.svg'
6970
import { ReactComponent as ICHelpFilled } from '@IconsV2/ic-help-filled.svg'
7071
import { ReactComponent as ICHelpOutline } from '@IconsV2/ic-help-outline.svg'
7172
import { ReactComponent as ICHibernate } from '@IconsV2/ic-hibernate.svg'
73+
import { ReactComponent as ICHibernateCircle } from '@IconsV2/ic-hibernate-circle.svg'
7274
import { ReactComponent as ICInProgress } from '@IconsV2/ic-in-progress.svg'
7375
import { ReactComponent as ICInfoFilled } from '@IconsV2/ic-info-filled.svg'
7476
import { ReactComponent as ICInfoOutline } from '@IconsV2/ic-info-outline.svg'
@@ -89,6 +91,7 @@ import { ReactComponent as ICMemory } from '@IconsV2/ic-memory.svg'
8991
import { ReactComponent as ICMicrosoft } from '@IconsV2/ic-microsoft.svg'
9092
import { ReactComponent as ICMissing } from '@IconsV2/ic-missing.svg'
9193
import { ReactComponent as ICMonitoring } from '@IconsV2/ic-monitoring.svg'
94+
import { ReactComponent as ICMoreVertical } from '@IconsV2/ic-more-vertical.svg'
9295
import { ReactComponent as ICNew } from '@IconsV2/ic-new.svg'
9396
import { ReactComponent as ICNodeScript } from '@IconsV2/ic-node-script.svg'
9497
import { ReactComponent as ICOidc } from '@IconsV2/ic-oidc.svg'
@@ -116,13 +119,15 @@ import { ReactComponent as ICStrategyCanary } from '@IconsV2/ic-strategy-canary.
116119
import { ReactComponent as ICStrategyRecreate } from '@IconsV2/ic-strategy-recreate.svg'
117120
import { ReactComponent as ICStrategyRolling } from '@IconsV2/ic-strategy-rolling.svg'
118121
import { ReactComponent as ICSuccess } from '@IconsV2/ic-success.svg'
122+
import { ReactComponent as ICSun } from '@IconsV2/ic-sun.svg'
119123
import { ReactComponent as ICSuspended } from '@IconsV2/ic-suspended.svg'
120124
import { ReactComponent as ICTata1mg } from '@IconsV2/ic-tata1mg.svg'
121125
import { ReactComponent as ICTerminalFill } from '@IconsV2/ic-terminal-fill.svg'
122126
import { ReactComponent as ICThumbDown } from '@IconsV2/ic-thumb-down.svg'
123127
import { ReactComponent as ICThumbUp } from '@IconsV2/ic-thumb-up.svg'
124128
import { ReactComponent as ICTimeoutDash } from '@IconsV2/ic-timeout-dash.svg'
125129
import { ReactComponent as ICTimer } from '@IconsV2/ic-timer.svg'
130+
import { ReactComponent as ICTrafficSignal } from '@IconsV2/ic-traffic-signal.svg'
126131
import { ReactComponent as ICTravclan } from '@IconsV2/ic-travclan.svg'
127132
import { ReactComponent as ICUnknown } from '@IconsV2/ic-unknown.svg'
128133
import { ReactComponent as ICUserKey } from '@IconsV2/ic-user-key.svg'
@@ -141,6 +146,7 @@ export const iconMap = {
141146
'ic-app-group': ICAppGroup,
142147
'ic-arrow-clockwise': ICArrowClockwise,
143148
'ic-arrow-right': ICArrowRight,
149+
'ic-arrows-clockwise': ICArrowsClockwise,
144150
'ic-arrows-left-right': ICArrowsLeftRight,
145151
'ic-ather': ICAther,
146152
'ic-azure': ICAzure,
@@ -202,6 +208,7 @@ export const iconMap = {
202208
'ic-helm': ICHelm,
203209
'ic-help-filled': ICHelpFilled,
204210
'ic-help-outline': ICHelpOutline,
211+
'ic-hibernate-circle': ICHibernateCircle,
205212
'ic-hibernate': ICHibernate,
206213
'ic-in-progress': ICInProgress,
207214
'ic-info-filled': ICInfoFilled,
@@ -223,6 +230,7 @@ export const iconMap = {
223230
'ic-microsoft': ICMicrosoft,
224231
'ic-missing': ICMissing,
225232
'ic-monitoring': ICMonitoring,
233+
'ic-more-vertical': ICMoreVertical,
226234
'ic-new': ICNew,
227235
'ic-node-script': ICNodeScript,
228236
'ic-oidc': ICOidc,
@@ -250,13 +258,15 @@ export const iconMap = {
250258
'ic-strategy-recreate': ICStrategyRecreate,
251259
'ic-strategy-rolling': ICStrategyRolling,
252260
'ic-success': ICSuccess,
261+
'ic-sun': ICSun,
253262
'ic-suspended': ICSuspended,
254263
'ic-tata1mg': ICTata1mg,
255264
'ic-terminal-fill': ICTerminalFill,
256265
'ic-thumb-down': ICThumbDown,
257266
'ic-thumb-up': ICThumbUp,
258267
'ic-timeout-dash': ICTimeoutDash,
259268
'ic-timer': ICTimer,
269+
'ic-traffic-signal': ICTrafficSignal,
260270
'ic-travclan': ICTravclan,
261271
'ic-unknown': ICUnknown,
262272
'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)