Skip to content

Commit c769c0f

Browse files
committed
chore: removed cpu and memory svgs
1 parent 87fde4b commit c769c0f

File tree

5 files changed

+8
-74
lines changed

5 files changed

+8
-74
lines changed

src/assets/icons/appstatus/ic-cpu.svg

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

src/assets/icons/ic-cpu.svg

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

src/assets/icons/ic-memory.svg

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

src/components/ClusterNodes/NodeDetails.tsx

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import {
3737
CodeEditorThemesKeys,
3838
noop,
3939
AppThemeType,
40+
Icon,
4041
} from '@devtron-labs/devtron-fe-common-lib'
4142
import { useParams, useLocation, useHistory } from 'react-router-dom'
4243
import YAML from 'yaml'
@@ -45,8 +46,6 @@ import { applyPatch } from 'fast-json-patch'
4546
import { ReactComponent as Info } from '@Icons/ic-info-filled.svg'
4647
import { ReactComponent as Error } from '@Icons/ic-error-exclamation.svg'
4748
import { ReactComponent as AlertTriangle } from '@Icons/ic-alert-triangle.svg'
48-
import { ReactComponent as Cpu } from '@Icons/ic-cpu.svg'
49-
import { ReactComponent as Memory } from '@Icons/ic-memory.svg'
5049
import { ReactComponent as Storage } from '@Icons/ic-storage.svg'
5150
import { ReactComponent as Edit } from '@Icons/ic-pencil.svg'
5251
import { ReactComponent as Dropdown } from '@Icons/ic-chevron-down.svg'
@@ -543,7 +542,7 @@ const NodeDetails = ({ addTab, lowercaseKindToResourceGroupMap, updateTabUrl }:
543542

544543
return (
545544
<div>
546-
<div className='dc__border-bottom dc__position-sticky dc__top-0 dc__zi-1 bg__primary'>
545+
<div className="dc__border-bottom dc__position-sticky dc__top-0 dc__zi-1 bg__primary">
547546
<div className="en-2 bw-1 dc__top-radius-4 bg__primary dc__no-bottom-border resource-row dc__border-bottom fw-6 fs-13 pt-8 pb-8 pr-20 pl-20 cn-7">
548547
<div />
549548
<div>Resource</div>
@@ -554,10 +553,10 @@ const NodeDetails = ({ addTab, lowercaseKindToResourceGroupMap, updateTabUrl }:
554553
<div>Capacity</div>
555554
</div>
556555
</div>
557-
<div className='en-2 bw-1 br-4 dc__no-top-radius dc__no-top-border bg__primary mb-20'>
556+
<div className="en-2 bw-1 br-4 dc__no-top-radius dc__no-top-border bg__primary mb-20">
558557
{cpuData && (
559558
<div className="resource-row dc__border-bottom-n1 fw-4 fs-13 pt-8 pb-8 pr-20 pl-20 cn-9">
560-
<Cpu className="mt-2 mb-2 icon-dim-18" />
559+
<Icon name="ic-cpu" color={null} size={18} />
561560
<div>{cpuData.name || '-'}</div>
562561
<div>{cpuData.requestPercentage || '-'}</div>
563562
<div>{cpuData.limitPercentage || '-'}</div>
@@ -568,7 +567,7 @@ const NodeDetails = ({ addTab, lowercaseKindToResourceGroupMap, updateTabUrl }:
568567
)}
569568
{memoryData && (
570569
<div className="resource-row dc__border-bottom-n1 fw-4 fs-13 pt-8 pb-8 pr-20 pl-20 cn-9">
571-
<Memory className="mt-2 mb-2 icon-dim-18" />
570+
<Icon name="ic-memory" color={null} size={18} />
572571
<div>{memoryData.name || '-'}</div>
573572
<div>{memoryData.requestPercentage || '-'}</div>
574573
<div>{memoryData.limitPercentage || '-'}</div>
@@ -833,7 +832,7 @@ const NodeDetails = ({ addTab, lowercaseKindToResourceGroupMap, updateTabUrl }:
833832
{renderProbableIssuesOverviewCard()}
834833
{renderNodeOverviewCard()}
835834
</div>
836-
<div className='dc__overflow-auto pr-20'>
835+
<div className="dc__overflow-auto pr-20">
837836
{renderResourceList()}
838837
{renderLabelAnnotationTaint()}
839838
{renderPodList()}
@@ -1055,9 +1054,7 @@ const NodeDetails = ({ addTab, lowercaseKindToResourceGroupMap, updateTabUrl }:
10551054
return (
10561055
<ErrorScreenManager
10571056
code={errorResponseCode}
1058-
subtitle={
1059-
errorResponseCode == 403 ? unauthorizedInfoText(SIDEBAR_KEYS.nodeGVK.Kind.toLowerCase()) : ''
1060-
}
1057+
subtitle={errorResponseCode == 403 ? unauthorizedInfoText(SIDEBAR_KEYS.nodeGVK.Kind.toLowerCase()) : ''}
10611058
/>
10621059
)
10631060
}

src/components/ClusterNodes/clusterNodes.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@
118118
display: grid;
119119
grid-template-columns: 20px minmax(auto, 200px) repeat(5, 100px);
120120
column-gap: 12px;
121+
align-items: center;
121122

122123
&:hover:not(:first-of-type) {
123124
background-color: var(--bg-secondary);

0 commit comments

Comments
 (0)