From 4130c3ce91e2d203676701c1135fe71014c305c5 Mon Sep 17 00:00:00 2001
From: Alex Andreev <alex.andreev.email@gmail.com>
Date: Tue, 13 Jul 2021 13:52:16 +0300
Subject: [PATCH] Cleaning up

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
---
 .../+custom-resources/crd-details.scss        | 19 ++-----------------
 .../+custom-resources/crd-details.tsx         |  4 ++--
 .../crd-resource-details.scss                 | 10 +++-------
 .../crd-resource-details.tsx                  |  3 ++-
 .../+custom-resources/crd.mixins.scss         |  2 +-
 .../components/+nodes/node-details.scss       |  5 +----
 .../components/+nodes/nodes-mixins.scss       |  2 +-
 .../+workloads-cronjobs/cronjob-details.scss  |  4 +---
 .../+workloads-jobs/job-details.scss          |  4 +---
 .../pod-details-container.scss                |  4 ----
 .../+workloads/workloads-mixins.scss          |  2 +-
 src/renderer/components/chart/pie-chart.scss  |  2 +-
 src/renderer/components/dock/info-panel.scss  |  4 ----
 .../item-object-list/page-filters-list.tsx    |  2 +-
 14 files changed, 17 insertions(+), 50 deletions(-)

diff --git a/src/renderer/components/+custom-resources/crd-details.scss b/src/renderer/components/+custom-resources/crd-details.scss
index e5d016bb30..8e969a580b 100644
--- a/src/renderer/components/+custom-resources/crd-details.scss
+++ b/src/renderer/components/+custom-resources/crd-details.scss
@@ -23,11 +23,9 @@
 
 .CRDDetails {
   .conditions {
-    .Badge {
-      @include crd-condition-bgc;
-    }
+    @include crd-condition-bgc;
   }
-  
+
   .Table {
     margin-left: -$margin * 2;
     margin-right: -$margin * 2;
@@ -41,21 +39,8 @@
         flex: 0.5;
       }
 
-      .description {
-        flex: 1.5;
-
-        .Badge {
-          background: transparent;
-        }
-      }
-
       .json-path {
         flex: 3;
-
-        .Badge {
-          white-space: pre-line;
-          text-overflow: initial;
-        }
       }
     }
   }
diff --git a/src/renderer/components/+custom-resources/crd-details.tsx b/src/renderer/components/+custom-resources/crd-details.tsx
index 146c299884..bef1dc6f67 100644
--- a/src/renderer/components/+custom-resources/crd-details.tsx
+++ b/src/renderer/components/+custom-resources/crd-details.tsx
@@ -25,7 +25,6 @@ import React from "react";
 import { Link } from "react-router-dom";
 import { observer } from "mobx-react";
 import type { CustomResourceDefinition } from "../../api/endpoints/crd.api";
-import { cssNames } from "../../utils";
 import { AceEditor } from "../ace-editor";
 import { Badge } from "../badge";
 import { DrawerItem, DrawerTitle } from "../drawer";
@@ -86,7 +85,8 @@ export class CRDDetails extends React.Component<Props> {
                 <Badge
                   key={type}
                   label={type}
-                  className={cssNames({ disabled: status === "False" }, type)}
+                  disabled={status === "False"}
+                  className={type}
                   tooltip={(
                     <>
                       <p>{message}</p>
diff --git a/src/renderer/components/+custom-resources/crd-resource-details.scss b/src/renderer/components/+custom-resources/crd-resource-details.scss
index af2c36ef2c..b7e57a0295 100644
--- a/src/renderer/components/+custom-resources/crd-resource-details.scss
+++ b/src/renderer/components/+custom-resources/crd-resource-details.scss
@@ -21,13 +21,9 @@
 
 .CrdResourceDetails {
   .status {
-    .value {
-      .Badge {
-        &.ready {
-          color: white;
-          background-color: $colorOk;
-        }
-      }
+    .ready {
+      color: white;
+      background-color: $colorOk;
     }
   }
 }
\ No newline at end of file
diff --git a/src/renderer/components/+custom-resources/crd-resource-details.tsx b/src/renderer/components/+custom-resources/crd-resource-details.tsx
index f7305788eb..dc6181c63c 100644
--- a/src/renderer/components/+custom-resources/crd-resource-details.tsx
+++ b/src/renderer/components/+custom-resources/crd-resource-details.tsx
@@ -90,7 +90,8 @@ export class CrdResourceDetails extends React.Component<Props> {
       .map(({ kind, message, status }, index) => (
         <Badge
           key={kind + index} label={kind}
-          className={cssNames({ disabled: status === "False" }, kind.toLowerCase())}
+          disabled={status === "False"}
+          className={kind.toLowerCase()}
           tooltip={message}
         />
       ));
diff --git a/src/renderer/components/+custom-resources/crd.mixins.scss b/src/renderer/components/+custom-resources/crd.mixins.scss
index 62a160b1ff..89c7c86acc 100644
--- a/src/renderer/components/+custom-resources/crd.mixins.scss
+++ b/src/renderer/components/+custom-resources/crd.mixins.scss
@@ -30,7 +30,7 @@ $crd-condition-colors: (
 
 @mixin crd-condition-bgc {
   @each $status, $color in $crd-condition-colors {
-    &.#{$status} {
+    .#{$status} {
       background: $color;
       color: white;
     }
diff --git a/src/renderer/components/+nodes/node-details.scss b/src/renderer/components/+nodes/node-details.scss
index 895fdadfee..8d7672fde5 100644
--- a/src/renderer/components/+nodes/node-details.scss
+++ b/src/renderer/components/+nodes/node-details.scss
@@ -24,9 +24,6 @@
   --status-default-bg: #{$colorError};
 
   .conditions {
-    .Badge {
-      cursor: default;
-      @include node-status-bgs;
-    }
+    @include node-status-bgs;
   }
 }
\ No newline at end of file
diff --git a/src/renderer/components/+nodes/nodes-mixins.scss b/src/renderer/components/+nodes/nodes-mixins.scss
index 5ac0e4400a..74979c7a9f 100644
--- a/src/renderer/components/+nodes/nodes-mixins.scss
+++ b/src/renderer/components/+nodes/nodes-mixins.scss
@@ -33,7 +33,7 @@ $node-status-color-list: (
 
 @mixin node-status-bgs {
   @each $status, $color in $node-status-color-list {
-    &.#{$status} {
+    .#{$status} {
       background: $color;
       color: white;
     }
diff --git a/src/renderer/components/+workloads-cronjobs/cronjob-details.scss b/src/renderer/components/+workloads-cronjobs/cronjob-details.scss
index 513afd4273..f5e3c76ec8 100644
--- a/src/renderer/components/+workloads-cronjobs/cronjob-details.scss
+++ b/src/renderer/components/+workloads-cronjobs/cronjob-details.scss
@@ -33,8 +33,6 @@
   }
 
   .conditions {
-    .Badge {
-      @include job-condition-bgs;
-    }
+    @include job-condition-bgs;
   }
 }
\ No newline at end of file
diff --git a/src/renderer/components/+workloads-jobs/job-details.scss b/src/renderer/components/+workloads-jobs/job-details.scss
index ffd78bc791..8ac3a66a93 100644
--- a/src/renderer/components/+workloads-jobs/job-details.scss
+++ b/src/renderer/components/+workloads-jobs/job-details.scss
@@ -22,8 +22,6 @@
 
 .JobDetails {
   .conditions {
-    .Badge {
-      @include job-condition-bgs;
-    }
+    @include job-condition-bgs;
   }
 }
\ No newline at end of file
diff --git a/src/renderer/components/+workloads-pods/pod-details-container.scss b/src/renderer/components/+workloads-pods/pod-details-container.scss
index dc670c4c09..fca42c9433 100644
--- a/src/renderer/components/+workloads-pods/pod-details-container.scss
+++ b/src/renderer/components/+workloads-pods/pod-details-container.scss
@@ -58,8 +58,4 @@
 
     @include pod-status-colors;
   }
-
-  .Badge {
-    white-space: normal;
-  }
 }
\ No newline at end of file
diff --git a/src/renderer/components/+workloads/workloads-mixins.scss b/src/renderer/components/+workloads/workloads-mixins.scss
index 61a56f03f8..03c05c2d48 100644
--- a/src/renderer/components/+workloads/workloads-mixins.scss
+++ b/src/renderer/components/+workloads/workloads-mixins.scss
@@ -98,7 +98,7 @@ $cronjob-condition-color-list: (
 
 @mixin job-condition-bgs {
   @each $condition, $color in $job-condition-color-list {
-    &.#{$condition} {
+    .#{$condition} {
       color: white;
       background: $color;
     }
diff --git a/src/renderer/components/chart/pie-chart.scss b/src/renderer/components/chart/pie-chart.scss
index 7034ee28a1..76c098e39d 100644
--- a/src/renderer/components/chart/pie-chart.scss
+++ b/src/renderer/components/chart/pie-chart.scss
@@ -30,7 +30,7 @@
     flex-direction: column;
 
     > * {
-      &.Badge:hover {
+      &.LegendBadge:hover {
         background-color: transparent;
       }
 
diff --git a/src/renderer/components/dock/info-panel.scss b/src/renderer/components/dock/info-panel.scss
index 24b727f5d8..0933b236c1 100644
--- a/src/renderer/components/dock/info-panel.scss
+++ b/src/renderer/components/dock/info-panel.scss
@@ -30,10 +30,6 @@
     margin-right: var(--padding);
   }
 
-  .Badge {
-    background-color: var(--dockBadgeBackground);
-  }
-
   > .controls {
     white-space: nowrap;
     flex: 1 1;
diff --git a/src/renderer/components/item-object-list/page-filters-list.tsx b/src/renderer/components/item-object-list/page-filters-list.tsx
index 1bee3be8ba..6620350b01 100644
--- a/src/renderer/components/item-object-list/page-filters-list.tsx
+++ b/src/renderer/components/item-object-list/page-filters-list.tsx
@@ -70,7 +70,7 @@ export class PageFiltersList extends React.Component<Props> {
               <Badge
                 key={`${type}-${value}`}
                 title={type}
-                className={cssNames("flex gaps filter align-center", type)}
+                className={cssNames("Badge flex gaps filter align-center", type)}
                 label={(
                   <>
                     <FilterIcon type={type}/>