From ef578b28544a1f1cca450e9b18c29e2a509ebc26 Mon Sep 17 00:00:00 2001 From: Alex Andreev Date: Thu, 15 Dec 2022 14:02:19 +0300 Subject: [PATCH] Convert styles to modules Signed-off-by: Alex Andreev --- .../pod-details-list.test.tsx.snap | 240 +++++++++++++----- .../pod-details-list.module.scss | 56 ++++ .../+workloads-pods/pod-details-list.tsx | 55 ++-- 3 files changed, 272 insertions(+), 79 deletions(-) create mode 100644 src/renderer/components/+workloads-pods/pod-details-list.module.scss diff --git a/src/renderer/components/+workloads-pods/__tests__/__snapshots__/pod-details-list.test.tsx.snap b/src/renderer/components/+workloads-pods/__tests__/__snapshots__/pod-details-list.test.tsx.snap index 13abca230d..25c12c1cd2 100644 --- a/src/renderer/components/+workloads-pods/__tests__/__snapshots__/pod-details-list.test.tsx.snap +++ b/src/renderer/components/+workloads-pods/__tests__/__snapshots__/pod-details-list.test.tsx.snap @@ -3,7 +3,7 @@ exports[` when few pods passed renders table with pods 1`] = `
when few pods passed renders table with pods 1`] = ` Pods
when few pods passed renders table with pods 1`] = `
Ready
@@ -111,7 +111,11 @@ exports[` when few pods passed renders table with pods 1`] = `
- foobar + + foobar +
when few pods passed renders table with pods 1`] = `
- default + + default +
0 / 0
@@ -151,7 +159,11 @@ exports[` when few pods passed renders table with pods 1`] = `
- foobar-failed + + foobar-failed +
when few pods passed renders table with pods 1`] = `
- kube-system + + kube-system +
0 / 0
@@ -191,7 +207,11 @@ exports[` when few pods passed renders table with pods 1`] = `
- foobar-pending + + foobar-pending +
when few pods passed renders table with pods 1`] = `
- default + + default +
0 / 0
@@ -233,7 +257,7 @@ exports[` when few pods passed renders table with pods 1`] = ` exports[` when few pods passed when metrics max values passed renders table with metric lines 1`] = `
when few pods passed when metrics max values passed Pods
when few pods passed when metrics max values passed
Ready
@@ -341,7 +365,11 @@ exports[` when few pods passed when metrics max values passed
- foobar-pending + + foobar-pending +
when few pods passed when metrics max values passed
- default + + default +
0 / 0
@@ -409,7 +441,11 @@ exports[` when few pods passed when metrics max values passed
- foobar-failed + + foobar-failed +
when few pods passed when metrics max values passed
- kube-system + + kube-system +
0 / 0
@@ -477,7 +517,11 @@ exports[` when few pods passed when metrics max values passed
- foobar + + foobar +
when few pods passed when metrics max values passed
- default + + default +
0 / 0
@@ -547,7 +595,7 @@ exports[` when few pods passed when metrics max values passed exports[` when few pods passed when metrics max values passed sorts table by cpu 1`] = `
when few pods passed when metrics max values passed Pods
when few pods passed when metrics max values passed
Ready
@@ -655,7 +703,11 @@ exports[` when few pods passed when metrics max values passed
- foobar-pending + + foobar-pending +
when few pods passed when metrics max values passed
- default + + default +
0 / 0
@@ -723,7 +779,11 @@ exports[` when few pods passed when metrics max values passed
- foobar-failed + + foobar-failed +
when few pods passed when metrics max values passed
- kube-system + + kube-system +
0 / 0
@@ -791,7 +855,11 @@ exports[` when few pods passed when metrics max values passed
- foobar + + foobar +
when few pods passed when metrics max values passed
- default + + default +
0 / 0
@@ -861,7 +933,7 @@ exports[` when few pods passed when metrics max values passed exports[` when few pods passed when metrics max values passed sorts table by memory 1`] = `
when few pods passed when metrics max values passed Pods
when few pods passed when metrics max values passed
Ready
@@ -969,7 +1041,11 @@ exports[` when few pods passed when metrics max values passed
- foobar-failed + + foobar-failed +
when few pods passed when metrics max values passed
- kube-system + + kube-system +
0 / 0
@@ -1037,7 +1117,11 @@ exports[` when few pods passed when metrics max values passed
- foobar-pending + + foobar-pending +
when few pods passed when metrics max values passed
- default + + default +
0 / 0
@@ -1105,7 +1193,11 @@ exports[` when few pods passed when metrics max values passed
- foobar + + foobar +
when few pods passed when metrics max values passed
- default + + default +
0 / 0
@@ -1175,7 +1271,7 @@ exports[` when few pods passed when metrics max values passed exports[` when few pods passed when metrics max values passed sorts table by name 1`] = `
when few pods passed when metrics max values passed Pods
when few pods passed when metrics max values passed
Ready
@@ -1283,7 +1379,11 @@ exports[` when few pods passed when metrics max values passed
- foobar-pending + + foobar-pending +
when few pods passed when metrics max values passed
- default + + default +
0 / 0
@@ -1351,7 +1455,11 @@ exports[` when few pods passed when metrics max values passed
- foobar-failed + + foobar-failed +
when few pods passed when metrics max values passed
- kube-system + + kube-system +
0 / 0
@@ -1419,7 +1531,11 @@ exports[` when few pods passed when metrics max values passed
- foobar + + foobar +
when few pods passed when metrics max values passed
- default + + default +
0 / 0
diff --git a/src/renderer/components/+workloads-pods/pod-details-list.module.scss b/src/renderer/components/+workloads-pods/pod-details-list.module.scss new file mode 100644 index 0000000000..53ca8839fe --- /dev/null +++ b/src/renderer/components/+workloads-pods/pod-details-list.module.scss @@ -0,0 +1,56 @@ +.PodDetailsList { + @mixin status-colors { + @each $status, $color in $pod-status-color-list { + &:global(.#{$status}) { + color: $color; + } + } + } + + .table { + &:global(.virtual) { + height: 500px; + } + + :global(.TableCell).warning { + @include table-cell-warning; + } + + :global(.TableCell).status { + @include status-colors; + } + } +} + +.table { + margin: 0 (-$margin * 3); +} + +.name { + flex-grow: 2; + margin-left: $margin; +} + +.node { + flex-grow: 2; +} + +.namespace { + flex-grow: 1.2; +} + +.cpu { + align-self: center; + + .LineProgress { + color: var(--blue); + } +} + +.memory { + align-self: center; + + :global(.LineProgress) { + color: var(--magenta); + } +} diff --git a/src/renderer/components/+workloads-pods/pod-details-list.tsx b/src/renderer/components/+workloads-pods/pod-details-list.tsx index 9ff03d992c..8ef40c0ed1 100644 --- a/src/renderer/components/+workloads-pods/pod-details-list.tsx +++ b/src/renderer/components/+workloads-pods/pod-details-list.tsx @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import "./pod-details-list.scss"; +import styles from "./pod-details-list.module.scss"; import { withInjectables } from "@ogre-tools/injectable-react"; import kebabCase from "lodash/kebabCase"; @@ -21,6 +21,7 @@ import { Spinner } from "../spinner"; import { Table, TableCell, TableHead, TableRow } from "../table"; import type { PodStore } from "./store"; import podStoreInjectable from "./store.injectable"; +import { Tooltip, TooltipPosition } from "../tooltip"; enum sortBy { name = "name", @@ -124,16 +125,32 @@ export class NonInjectedPodDetailsList extends React.Component showDetails(pod.selfLink, false))} > - {pod.getName()} - - {pod.getNodeName()} - {pod.getNs()} - + + {pod.getName()} + + {pod.getName()} + + + + {pod.getNodeName()} + + {pod.getNs()} + + {pod.getNs()} + + + {`${pod.getRunningContainers().length} / ${pod.getContainers().length}`} - {this.renderCpuUsage(`cpu-${pod.getId()}`, metrics.cpu)} - {this.renderMemoryUsage(`memory-${pod.getId()}`, metrics.memory)} - {pod.getStatusMessage()} + {this.renderCpuUsage(`cpu-${pod.getId()}`, metrics.cpu)} + {this.renderMemoryUsage(`memory-${pod.getId()}`, metrics.memory)} + {pod.getStatusMessage()} ); } @@ -160,7 +177,7 @@ export class NonInjectedPodDetailsList extends React.Component 20; return ( -
+
Pods this.getTableRow(pod.getId())) )} - className="box grow" + className={styles.table} > - Name - - Node - Namespace - Ready - CPU - Memory - Status + Name + + Node + Namespace + Ready + CPU + Memory + Status