Skip to content

Commit 5efac09

Browse files
authored
Merge pull request #705 from devtron-labs/feat/info-bar-replacement
feat: Info-bar-replacement
2 parents 0a808e2 + afd72f8 commit 5efac09

File tree

10 files changed

+25
-52
lines changed

10 files changed

+25
-52
lines changed

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devtron-labs/devtron-fe-common-lib",
3-
"version": "1.11.0-pre-8",
3+
"version": "1.11.0-pre-9",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",

src/Assets/Icon/ic-cpu.svg

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/Assets/Icon/ic-memory.svg

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/Assets/IconV2/ic-cpu.svg

Lines changed: 3 additions & 0 deletions
Loading

src/Assets/IconV2/ic-help-filled.svg

Lines changed: 4 additions & 0 deletions
Loading

src/Assets/IconV2/ic-memory.svg

Lines changed: 3 additions & 0 deletions
Loading

src/Pages/GlobalConfigurations/BuildInfra/constants.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { ReactComponent as ICCpu } from '@Icons/ic-cpu.svg'
18-
import { ReactComponent as ICMemory } from '@Icons/ic-memory.svg'
1917
import { ReactComponent as ICSprayCan } from '@Icons/ic-spray-can.svg'
2018
import { ReactComponent as ICTag } from '@Icons/ic-tag.svg'
2119
import { ReactComponent as ICTimer } from '@Icons/ic-timer.svg'
20+
import { ReactComponent as ICCpu } from '@IconsV2/ic-cpu.svg'
21+
import { ReactComponent as ICMemory } from '@IconsV2/ic-memory.svg'
2222
import { UseBreadcrumbProps } from '@Common/BreadCrumb/Types'
2323
import { CMSecretComponentType } from '@Shared/Services'
2424

src/Shared/Components/Icon/Icon.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import { ReactComponent as ICCode } from '@IconsV2/ic-code.svg'
3333
import { ReactComponent as ICContainer } from '@IconsV2/ic-container.svg'
3434
import { ReactComponent as ICCookr } from '@IconsV2/ic-cookr.svg'
3535
import { ReactComponent as ICCopy } from '@IconsV2/ic-copy.svg'
36+
import { ReactComponent as ICCpu } from '@IconsV2/ic-cpu.svg'
3637
import { ReactComponent as ICCrown } from '@IconsV2/ic-crown.svg'
3738
import { ReactComponent as ICCube } from '@IconsV2/ic-cube.svg'
3839
import { ReactComponent as ICDelete } from '@IconsV2/ic-delete.svg'
@@ -59,6 +60,7 @@ import { ReactComponent as ICHeartGreen } from '@IconsV2/ic-heart-green.svg'
5960
import { ReactComponent as ICHeartRed } from '@IconsV2/ic-heart-red.svg'
6061
import { ReactComponent as ICHeartRedAnimated } from '@IconsV2/ic-heart-red-animated.svg'
6162
import { ReactComponent as ICHelm } from '@IconsV2/ic-helm.svg'
63+
import { ReactComponent as ICHelpFilled } from '@IconsV2/ic-help-filled.svg'
6264
import { ReactComponent as ICHelpOutline } from '@IconsV2/ic-help-outline.svg'
6365
import { ReactComponent as ICHibernate } from '@IconsV2/ic-hibernate.svg'
6466
import { ReactComponent as ICInProgress } from '@IconsV2/ic-in-progress.svg'
@@ -74,6 +76,7 @@ import { ReactComponent as ICLoginDevtronLogo } from '@IconsV2/ic-login-devtron-
7476
import { ReactComponent as ICLogout } from '@IconsV2/ic-logout.svg'
7577
import { ReactComponent as ICMediumDelete } from '@IconsV2/ic-medium-delete.svg'
7678
import { ReactComponent as ICMediumPaintbucket } from '@IconsV2/ic-medium-paintbucket.svg'
79+
import { ReactComponent as ICMemory } from '@IconsV2/ic-memory.svg'
7780
import { ReactComponent as ICMicrosoft } from '@IconsV2/ic-microsoft.svg'
7881
import { ReactComponent as ICMissing } from '@IconsV2/ic-missing.svg'
7982
import { ReactComponent as ICMonitoring } from '@IconsV2/ic-monitoring.svg'
@@ -146,6 +149,7 @@ export const iconMap = {
146149
'ic-container': ICContainer,
147150
'ic-cookr': ICCookr,
148151
'ic-copy': ICCopy,
152+
'ic-cpu': ICCpu,
149153
'ic-crown': ICCrown,
150154
'ic-cube': ICCube,
151155
'ic-delete-lightning': ICDeleteLightning,
@@ -172,6 +176,7 @@ export const iconMap = {
172176
'ic-heart-red-animated': ICHeartRedAnimated,
173177
'ic-heart-red': ICHeartRed,
174178
'ic-helm': ICHelm,
179+
'ic-help-filled': ICHelpFilled,
175180
'ic-help-outline': ICHelpOutline,
176181
'ic-hibernate': ICHibernate,
177182
'ic-in-progress': ICInProgress,
@@ -187,6 +192,7 @@ export const iconMap = {
187192
'ic-logout': ICLogout,
188193
'ic-medium-delete': ICMediumDelete,
189194
'ic-medium-paintbucket': ICMediumPaintbucket,
195+
'ic-memory': ICMemory,
190196
'ic-microsoft': ICMicrosoft,
191197
'ic-missing': ICMissing,
192198
'ic-monitoring': ICMonitoring,

src/Shared/Components/InfoBlock/constants.tsx

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { ReactComponent as ICError } from '@Icons/ic-error.svg'
18-
import { ReactComponent as ICHelp } from '@Icons/ic-help.svg'
19-
import { ReactComponent as ICSuccess } from '@Icons/ic-success.svg'
20-
import { ReactComponent as ICWarningY5 } from '@Icons/ic-warning-y5.svg'
2117
import { ComponentSizeType } from '@Shared/constants'
2218

2319
import { ButtonProps } from '../Button'
@@ -34,11 +30,11 @@ export const VARIANT_TO_BG_MAP: Record<InfoBlockProps['variant'], string> = {
3430
}
3531

3632
export const VARIANT_TO_ICON_MAP: Record<InfoBlockProps['variant'], InfoBlockProps['customIcon']> = {
37-
error: <ICError />,
38-
help: <ICHelp className="fcv-5" />,
33+
error: <Icon name="ic-error" color="R500" />,
34+
help: <Icon name="ic-help-outline" color="V500" />,
3935
information: <Icon name="ic-info-filled" color="B500" />,
40-
success: <ICSuccess />,
41-
warning: <ICWarningY5 />,
36+
success: <Icon name="ic-success" color="G500" />,
37+
warning: <Icon name="ic-warning" color="Y500" />,
4238
neutral: <Icon name="ic-info-filled" color={null} />,
4339
}
4440

0 commit comments

Comments
 (0)