Skip to content

Commit c223ab8

Browse files
authored
Merge pull request #771 from devtron-labs/feat/chart-card-ui
feat: chart card UI
2 parents 7c2a40a + 475f8b3 commit c223ab8

7 files changed

Lines changed: 20 additions & 26 deletions

File tree

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.15.0-pre-7",
3+
"version": "1.15.1-pre-1",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",

src/Assets/IconV2/ic-add.svg

Lines changed: 2 additions & 18 deletions
Loading
Lines changed: 6 additions & 0 deletions
Loading

src/Assets/IconV2/ic-minus.svg

Lines changed: 3 additions & 0 deletions
Loading

src/Shared/Components/Icon/Icon.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ import { ReactComponent as ICFiles } from '@IconsV2/ic-files.svg'
7777
import { ReactComponent as ICFilter } from '@IconsV2/ic-filter.svg'
7878
import { ReactComponent as ICFilterApplied } from '@IconsV2/ic-filter-applied.svg'
7979
import { ReactComponent as ICFlask } from '@IconsV2/ic-flask.svg'
80+
import { ReactComponent as ICFolderColor } from '@IconsV2/ic-folder-color.svg'
8081
import { ReactComponent as ICFolderUser } from '@IconsV2/ic-folder-user.svg'
8182
import { ReactComponent as ICGear } from '@IconsV2/ic-gear.svg'
8283
import { ReactComponent as ICGift } from '@IconsV2/ic-gift.svg'
@@ -123,6 +124,7 @@ import { ReactComponent as ICMegaphoneRight } from '@IconsV2/ic-megaphone-right.
123124
import { ReactComponent as ICMemory } from '@IconsV2/ic-memory.svg'
124125
import { ReactComponent as ICMicrosoft } from '@IconsV2/ic-microsoft.svg'
125126
import { ReactComponent as ICMinikube } from '@IconsV2/ic-minikube.svg'
127+
import { ReactComponent as ICMinus } from '@IconsV2/ic-minus.svg'
126128
import { ReactComponent as ICMissing } from '@IconsV2/ic-missing.svg'
127129
import { ReactComponent as ICMobile } from '@IconsV2/ic-mobile.svg'
128130
import { ReactComponent as ICMonitoring } from '@IconsV2/ic-monitoring.svg'
@@ -266,6 +268,7 @@ export const iconMap = {
266268
'ic-filter-applied': ICFilterApplied,
267269
'ic-filter': ICFilter,
268270
'ic-flask': ICFlask,
271+
'ic-folder-color': ICFolderColor,
269272
'ic-folder-user': ICFolderUser,
270273
'ic-gear': ICGear,
271274
'ic-gift-gradient': ICGiftGradient,
@@ -312,6 +315,7 @@ export const iconMap = {
312315
'ic-memory': ICMemory,
313316
'ic-microsoft': ICMicrosoft,
314317
'ic-minikube': ICMinikube,
318+
'ic-minus': ICMinus,
315319
'ic-missing': ICMissing,
316320
'ic-mobile': ICMobile,
317321
'ic-monitoring': ICMonitoring,

src/Shared/Components/TabGroup/TabGroup.helpers.tsx

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

17-
import { ReactComponent as ICErrorExclamation } from '@Icons/ic-error-exclamation.svg'
18-
import { ReactComponent as ICWarning } from '@Icons/ic-warning.svg'
19-
2017
import { Icon } from '../Icon'
2118
import { TabGroupProps, TabProps } from './TabGroup.types'
2219
import { TAB_ICON_SIZE_MAP } from './TabGroup.utils'
@@ -32,10 +29,10 @@ export const getTabIcon = ({
3229
}: Pick<TabProps, 'showError' | 'showWarning' | 'icon' | 'active' | 'iconElement'> &
3330
Pick<TabGroupProps, 'size'> & { className: string }) => {
3431
if (showError) {
35-
return <ICErrorExclamation className={className} />
32+
return <Icon name="ic-error" color={null} size={TAB_ICON_SIZE_MAP[size]} />
3633
}
3734
if (showWarning) {
38-
return <ICWarning className={`${className} warning-icon-y7`} />
35+
return <Icon name="ic-warning" color={null} size={TAB_ICON_SIZE_MAP[size]} />
3936
}
4037
if (typeof icon === 'string') {
4138
return <Icon name={icon} color={active ? 'B500' : 'N700'} size={TAB_ICON_SIZE_MAP[size]} />

0 commit comments

Comments
 (0)