Merge branch 'develop' of github.com:devtron-labs/devtron-fe-common-lib into feat/app-details-chat

Author: Amrit Kashyap Borah

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "1.15.0-pre-7",
+    "version": "1.15.1-pre-2",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",

package.json

@@ -79,6 +79,7 @@ import { ReactComponent as ICFiles } from '@IconsV2/ic-files.svg'
 import { ReactComponent as ICFilter } from '@IconsV2/ic-filter.svg'
 import { ReactComponent as ICFilterApplied } from '@IconsV2/ic-filter-applied.svg'
 import { ReactComponent as ICFlask } from '@IconsV2/ic-flask.svg'
+import { ReactComponent as ICFolderColor } from '@IconsV2/ic-folder-color.svg'
 import { ReactComponent as ICFolderUser } from '@IconsV2/ic-folder-user.svg'
 import { ReactComponent as ICGear } from '@IconsV2/ic-gear.svg'
 import { ReactComponent as ICGift } from '@IconsV2/ic-gift.svg'
@@ -125,6 +126,7 @@ import { ReactComponent as ICMegaphoneRight } from '@IconsV2/ic-megaphone-right.
 import { ReactComponent as ICMemory } from '@IconsV2/ic-memory.svg'
 import { ReactComponent as ICMicrosoft } from '@IconsV2/ic-microsoft.svg'
 import { ReactComponent as ICMinikube } from '@IconsV2/ic-minikube.svg'
+import { ReactComponent as ICMinus } from '@IconsV2/ic-minus.svg'
 import { ReactComponent as ICMissing } from '@IconsV2/ic-missing.svg'
 import { ReactComponent as ICMobile } from '@IconsV2/ic-mobile.svg'
 import { ReactComponent as ICMonitoring } from '@IconsV2/ic-monitoring.svg'
@@ -273,6 +275,7 @@ export const iconMap = {
     'ic-filter-applied': ICFilterApplied,
     'ic-filter': ICFilter,
     'ic-flask': ICFlask,
+    'ic-folder-color': ICFolderColor,
     'ic-folder-user': ICFolderUser,
     'ic-gear': ICGear,
     'ic-gift-gradient': ICGiftGradient,
@@ -319,6 +322,7 @@ export const iconMap = {
     'ic-memory': ICMemory,
     'ic-microsoft': ICMicrosoft,
     'ic-minikube': ICMinikube,
+    'ic-minus': ICMinus,
     'ic-missing': ICMissing,
     'ic-mobile': ICMobile,
     'ic-monitoring': ICMonitoring,

src/Assets/IconV2/ic-add.svg

@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-import { ReactComponent as ICErrorExclamation } from '@Icons/ic-error-exclamation.svg'
-import { ReactComponent as ICWarning } from '@Icons/ic-warning.svg'
-
 import { Icon } from '../Icon'
 import { TabGroupProps, TabProps } from './TabGroup.types'
 import { TAB_ICON_SIZE_MAP } from './TabGroup.utils'
@@ -32,10 +29,10 @@ export const getTabIcon = ({
 }: Pick<TabProps, 'showError' | 'showWarning' | 'icon' | 'active' | 'iconElement'> &
     Pick<TabGroupProps, 'size'> & { className: string }) => {
     if (showError) {
-        return <ICErrorExclamation className={className} />
+        return <Icon name="ic-error" color={null} size={TAB_ICON_SIZE_MAP[size]} />
     }
     if (showWarning) {
-        return <ICWarning className={`${className} warning-icon-y7`} />
+        return <Icon name="ic-warning" color={null} size={TAB_ICON_SIZE_MAP[size]} />
     }
     if (typeof icon === 'string') {
         return <Icon name={icon} color={active ? 'B500' : 'N700'} size={TAB_ICON_SIZE_MAP[size]} />

src/Assets/IconV2/ic-folder-color.svg

@@ -166,6 +166,13 @@ export interface customEnv {
      * @default false
      */
     FEATURE_MANAGE_TRAFFIC_ENABLE?: boolean
+    FEATURE_INFRA_PROVISION_INFO_BLOCK_HIDE?: boolean
+    /**
+     * If true, online/offline connectivity banner is enabled
+     *
+     *  @default true
+     */
+    FEATURE_INTERNET_CONNECTIVITY_ENABLE?: boolean
 }
 declare global {
     interface Window {