Merge branch 'develop' of github.com:devtron-labs/devtron-fe-common-lib into feat/deployment-exception

Author: RohitRaj011

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "1.11.0-pre-8",
+    "version": "1.12.0-pre-0",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",

package.json

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-import { ReactComponent as ICCpu } from '@Icons/ic-cpu.svg'
-import { ReactComponent as ICMemory } from '@Icons/ic-memory.svg'
 import { ReactComponent as ICSprayCan } from '@Icons/ic-spray-can.svg'
 import { ReactComponent as ICTag } from '@Icons/ic-tag.svg'
 import { ReactComponent as ICTimer } from '@Icons/ic-timer.svg'
+import { ReactComponent as ICCpu } from '@IconsV2/ic-cpu.svg'
+import { ReactComponent as ICMemory } from '@IconsV2/ic-memory.svg'
 import { UseBreadcrumbProps } from '@Common/BreadCrumb/Types'
 import { CMSecretComponentType } from '@Shared/Services'
 

src/Assets/Icon/ic-cpu.svg

@@ -34,6 +34,7 @@ import { ReactComponent as ICCode } from '@IconsV2/ic-code.svg'
 import { ReactComponent as ICContainer } from '@IconsV2/ic-container.svg'
 import { ReactComponent as ICCookr } from '@IconsV2/ic-cookr.svg'
 import { ReactComponent as ICCopy } from '@IconsV2/ic-copy.svg'
+import { ReactComponent as ICCpu } from '@IconsV2/ic-cpu.svg'
 import { ReactComponent as ICCrown } from '@IconsV2/ic-crown.svg'
 import { ReactComponent as ICCube } from '@IconsV2/ic-cube.svg'
 import { ReactComponent as ICDelete } from '@IconsV2/ic-delete.svg'
@@ -60,6 +61,7 @@ import { ReactComponent as ICHeartGreen } from '@IconsV2/ic-heart-green.svg'
 import { ReactComponent as ICHeartRed } from '@IconsV2/ic-heart-red.svg'
 import { ReactComponent as ICHeartRedAnimated } from '@IconsV2/ic-heart-red-animated.svg'
 import { ReactComponent as ICHelm } from '@IconsV2/ic-helm.svg'
+import { ReactComponent as ICHelpFilled } from '@IconsV2/ic-help-filled.svg'
 import { ReactComponent as ICHelpOutline } from '@IconsV2/ic-help-outline.svg'
 import { ReactComponent as ICHibernate } from '@IconsV2/ic-hibernate.svg'
 import { ReactComponent as ICInProgress } from '@IconsV2/ic-in-progress.svg'
@@ -76,6 +78,7 @@ import { ReactComponent as ICLoginDevtronLogo } from '@IconsV2/ic-login-devtron-
 import { ReactComponent as ICLogout } from '@IconsV2/ic-logout.svg'
 import { ReactComponent as ICMediumDelete } from '@IconsV2/ic-medium-delete.svg'
 import { ReactComponent as ICMediumPaintbucket } from '@IconsV2/ic-medium-paintbucket.svg'
+import { ReactComponent as ICMemory } from '@IconsV2/ic-memory.svg'
 import { ReactComponent as ICMicrosoft } from '@IconsV2/ic-microsoft.svg'
 import { ReactComponent as ICMissing } from '@IconsV2/ic-missing.svg'
 import { ReactComponent as ICMonitoring } from '@IconsV2/ic-monitoring.svg'
@@ -151,6 +154,7 @@ export const iconMap = {
     'ic-container': ICContainer,
     'ic-cookr': ICCookr,
     'ic-copy': ICCopy,
+    'ic-cpu': ICCpu,
     'ic-crown': ICCrown,
     'ic-cube': ICCube,
     'ic-delete-lightning': ICDeleteLightning,
@@ -177,6 +181,7 @@ export const iconMap = {
     'ic-heart-red-animated': ICHeartRedAnimated,
     'ic-heart-red': ICHeartRed,
     'ic-helm': ICHelm,
+    'ic-help-filled': ICHelpFilled,
     'ic-help-outline': ICHelpOutline,
     'ic-hibernate': ICHibernate,
     'ic-in-progress': ICInProgress,
@@ -193,6 +198,7 @@ export const iconMap = {
     'ic-logout': ICLogout,
     'ic-medium-delete': ICMediumDelete,
     'ic-medium-paintbucket': ICMediumPaintbucket,
+    'ic-memory': ICMemory,
     'ic-microsoft': ICMicrosoft,
     'ic-missing': ICMissing,
     'ic-monitoring': ICMonitoring,

src/Assets/Icon/ic-memory.svg

@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-import { ReactComponent as ICError } from '@Icons/ic-error.svg'
-import { ReactComponent as ICHelp } from '@Icons/ic-help.svg'
-import { ReactComponent as ICSuccess } from '@Icons/ic-success.svg'
-import { ReactComponent as ICWarningY5 } from '@Icons/ic-warning-y5.svg'
 import { ComponentSizeType } from '@Shared/constants'
 
 import { ButtonProps } from '../Button'
@@ -34,11 +30,11 @@ export const VARIANT_TO_BG_MAP: Record<InfoBlockProps['variant'], string> = {
 }
 
 export const VARIANT_TO_ICON_MAP: Record<InfoBlockProps['variant'], InfoBlockProps['customIcon']> = {
-    error: <ICError />,
-    help: <ICHelp className="fcv-5" />,
+    error: <Icon name="ic-error" color="R500" />,
+    help: <Icon name="ic-help-outline" color="V500" />,
     information: <Icon name="ic-info-filled" color="B500" />,
-    success: <ICSuccess />,
-    warning: <ICWarningY5 />,
+    success: <Icon name="ic-success" color="G500" />,
+    warning: <Icon name="ic-warning" color="Y500" />,
     neutral: <Icon name="ic-info-filled" color={null} />,
 }