Skip to content

Commit 6be4a5b

Browse files
committed
Merge branch 'develop' of https://github.com/devtron-labs/devtron-fe-common-lib into feat/app-env-details
2 parents c4da692 + 5efac09 commit 6be4a5b

File tree

11 files changed

+31
-52
lines changed

11 files changed

+31
-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-beta-1",
3+
"version": "1.11.0-pre-9-beta-2",
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
Lines changed: 4 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: 8 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'
@@ -55,10 +56,12 @@ import { ReactComponent as ICGoogle } from '@IconsV2/ic-google.svg'
5556
import { ReactComponent as ICGoogleArtifactRegistry } from '@IconsV2/ic-google-artifact-registry.svg'
5657
import { ReactComponent as ICGoogleContainerRegistry } from '@IconsV2/ic-google-container-registry.svg'
5758
import { ReactComponent as ICGridView } from '@IconsV2/ic-grid-view.svg'
59+
import { ReactComponent as ICHandPointing } from '@IconsV2/ic-hand-pointing.svg'
5860
import { ReactComponent as ICHeartGreen } from '@IconsV2/ic-heart-green.svg'
5961
import { ReactComponent as ICHeartRed } from '@IconsV2/ic-heart-red.svg'
6062
import { ReactComponent as ICHeartRedAnimated } from '@IconsV2/ic-heart-red-animated.svg'
6163
import { ReactComponent as ICHelm } from '@IconsV2/ic-helm.svg'
64+
import { ReactComponent as ICHelpFilled } from '@IconsV2/ic-help-filled.svg'
6265
import { ReactComponent as ICHelpOutline } from '@IconsV2/ic-help-outline.svg'
6366
import { ReactComponent as ICHibernate } from '@IconsV2/ic-hibernate.svg'
6467
import { ReactComponent as ICInProgress } from '@IconsV2/ic-in-progress.svg'
@@ -74,6 +77,7 @@ import { ReactComponent as ICLoginDevtronLogo } from '@IconsV2/ic-login-devtron-
7477
import { ReactComponent as ICLogout } from '@IconsV2/ic-logout.svg'
7578
import { ReactComponent as ICMediumDelete } from '@IconsV2/ic-medium-delete.svg'
7679
import { ReactComponent as ICMediumPaintbucket } from '@IconsV2/ic-medium-paintbucket.svg'
80+
import { ReactComponent as ICMemory } from '@IconsV2/ic-memory.svg'
7781
import { ReactComponent as ICMicrosoft } from '@IconsV2/ic-microsoft.svg'
7882
import { ReactComponent as ICMissing } from '@IconsV2/ic-missing.svg'
7983
import { ReactComponent as ICMonitoring } from '@IconsV2/ic-monitoring.svg'
@@ -146,6 +150,7 @@ export const iconMap = {
146150
'ic-container': ICContainer,
147151
'ic-cookr': ICCookr,
148152
'ic-copy': ICCopy,
153+
'ic-cpu': ICCpu,
149154
'ic-crown': ICCrown,
150155
'ic-cube': ICCube,
151156
'ic-delete-lightning': ICDeleteLightning,
@@ -168,10 +173,12 @@ export const iconMap = {
168173
'ic-google-container-registry': ICGoogleContainerRegistry,
169174
'ic-google': ICGoogle,
170175
'ic-grid-view': ICGridView,
176+
'ic-hand-pointing': ICHandPointing,
171177
'ic-heart-green': ICHeartGreen,
172178
'ic-heart-red-animated': ICHeartRedAnimated,
173179
'ic-heart-red': ICHeartRed,
174180
'ic-helm': ICHelm,
181+
'ic-help-filled': ICHelpFilled,
175182
'ic-help-outline': ICHelpOutline,
176183
'ic-hibernate': ICHibernate,
177184
'ic-in-progress': ICInProgress,
@@ -187,6 +194,7 @@ export const iconMap = {
187194
'ic-logout': ICLogout,
188195
'ic-medium-delete': ICMediumDelete,
189196
'ic-medium-paintbucket': ICMediumPaintbucket,
197+
'ic-memory': ICMemory,
190198
'ic-microsoft': ICMicrosoft,
191199
'ic-missing': ICMissing,
192200
'ic-monitoring': ICMonitoring,

0 commit comments

Comments
 (0)