From 4151b754adecd066dac165b8708ae84b51323b50 Mon Sep 17 00:00:00 2001
From: Alex Andreev <alex.andreev.email@gmail.com>
Date: Tue, 13 Jul 2021 13:24:40 +0300
Subject: [PATCH] Align Badge styles across components

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
---
 .../+apps-releases/release-details.scss       |  8 +------
 .../+apps-releases/release-details.tsx        |  2 +-
 .../+catalog/catalog-entity.store.tsx         |  1 +
 .../+config-autoscalers/hpa-details.scss      |  2 +-
 .../+config-autoscalers/hpa-details.tsx       |  2 +-
 .../components/+config-autoscalers/hpa.scss   |  5 +---
 .../components/+config-autoscalers/hpa.tsx    |  1 +
 .../components/+config-secrets/secrets.tsx    |  2 +-
 .../deployment-details.scss                   | 24 +++++++++----------
 .../deployment-details.tsx                    |  4 ++--
 .../+workloads-pods/pod-details.tsx           |  2 +-
 .../components/+workloads-pods/pods.tsx       |  4 ++--
 src/renderer/components/chart/chart.scss      |  2 +-
 src/renderer/components/chart/chart.tsx       |  3 ++-
 .../components/cluster-show-metrics.tsx       |  3 ++-
 .../components/drawer/drawer-item.scss        |  2 +-
 .../components/hotbar/hotbar-selector.scss    |  2 +-
 .../components/hotbar/hotbar-selector.tsx     |  1 +
 .../components/table/table.mixins.scss        |  4 ----
 19 files changed, 32 insertions(+), 42 deletions(-)

diff --git a/src/renderer/components/+apps-releases/release-details.scss b/src/renderer/components/+apps-releases/release-details.scss
index 3afe13961c..a4bd53610c 100644
--- a/src/renderer/components/+apps-releases/release-details.scss
+++ b/src/renderer/components/+apps-releases/release-details.scss
@@ -27,13 +27,7 @@
   }
 
   .status {
-    .Badge {
-      @include release-status-bgs;
-
-      &:first-child {
-        margin-left: 0;
-      }
-    }
+    @include release-status-bgs;
   }
 
   .chart {
diff --git a/src/renderer/components/+apps-releases/release-details.tsx b/src/renderer/components/+apps-releases/release-details.tsx
index e5bda1f873..fae2e3ba71 100644
--- a/src/renderer/components/+apps-releases/release-details.tsx
+++ b/src/renderer/components/+apps-releases/release-details.tsx
@@ -272,7 +272,7 @@ export class ReleaseDetails extends Component<Props> {
         <DrawerItem name="Status" className="status" labelsOnly>
           <Badge
             label={release.getStatus()}
-            className={cssNames("status", kebabCase(release.getStatus()))}
+            className={kebabCase(release.getStatus())}
           />
         </DrawerItem>
         {this.renderValues()}
diff --git a/src/renderer/components/+catalog/catalog-entity.store.tsx b/src/renderer/components/+catalog/catalog-entity.store.tsx
index fea9e5e6ba..b606d54c1a 100644
--- a/src/renderer/components/+catalog/catalog-entity.store.tsx
+++ b/src/renderer/components/+catalog/catalog-entity.store.tsx
@@ -88,6 +88,7 @@ export class CatalogEntityItem<T extends CatalogEntity> implements ItemObject {
             onClick?.(event);
             event.stopPropagation();
           }}
+          expandable={false}
         />
       ));
   }
diff --git a/src/renderer/components/+config-autoscalers/hpa-details.scss b/src/renderer/components/+config-autoscalers/hpa-details.scss
index ef9506976f..c1c6e930fc 100644
--- a/src/renderer/components/+config-autoscalers/hpa-details.scss
+++ b/src/renderer/components/+config-autoscalers/hpa-details.scss
@@ -22,7 +22,7 @@
 @import "autoscaler.mixins";
 
 .HpaDetails {
-  .Badge {
+  .status {
     @include hpa-status-bgc;
   }
 
diff --git a/src/renderer/components/+config-autoscalers/hpa-details.tsx b/src/renderer/components/+config-autoscalers/hpa-details.tsx
index 1a6db54e78..cf56b2c35c 100644
--- a/src/renderer/components/+config-autoscalers/hpa-details.tsx
+++ b/src/renderer/components/+config-autoscalers/hpa-details.tsx
@@ -125,7 +125,7 @@ export class HpaDetails extends React.Component<Props> {
           {hpa.getReplicas()}
         </DrawerItem>
 
-        <DrawerItem name="Status" labelsOnly>
+        <DrawerItem name="Status" className="status" labelsOnly>
           {hpa.getConditions().map(({ type, tooltip, isReady }) => {
             if (!isReady) return null;
 
diff --git a/src/renderer/components/+config-autoscalers/hpa.scss b/src/renderer/components/+config-autoscalers/hpa.scss
index 41fa3f6d08..dc79016fcf 100644
--- a/src/renderer/components/+config-autoscalers/hpa.scss
+++ b/src/renderer/components/+config-autoscalers/hpa.scss
@@ -38,10 +38,7 @@
     &.status {
       flex: 1.5;
       @include table-cell-labels-offsets;
-
-      .Badge {
-        @include hpa-status-bgc;
-      }
+      @include hpa-status-bgc;
     }
 
     &.age {
diff --git a/src/renderer/components/+config-autoscalers/hpa.tsx b/src/renderer/components/+config-autoscalers/hpa.tsx
index eca60e8c63..539bbb18d7 100644
--- a/src/renderer/components/+config-autoscalers/hpa.tsx
+++ b/src/renderer/components/+config-autoscalers/hpa.tsx
@@ -104,6 +104,7 @@ export class HorizontalPodAutoscalers extends React.Component<Props> {
                 label={type}
                 tooltip={tooltip}
                 className={cssNames(type.toLowerCase())}
+                expandable={false}
               />
             );
           })
diff --git a/src/renderer/components/+config-secrets/secrets.tsx b/src/renderer/components/+config-secrets/secrets.tsx
index d74305a499..3bfeada163 100644
--- a/src/renderer/components/+config-secrets/secrets.tsx
+++ b/src/renderer/components/+config-secrets/secrets.tsx
@@ -79,7 +79,7 @@ export class Secrets extends React.Component<Props> {
             secret.getName(),
             <KubeObjectStatusIcon key="icon" object={secret} />,
             secret.getNs(),
-            secret.getLabels().map(label => <Badge key={label} label={label}/>),
+            secret.getLabels().map(label => <Badge key={label} label={label} expandable={false}/>),
             secret.getKeys().join(", "),
             secret.type,
             secret.getAge(),
diff --git a/src/renderer/components/+workloads-deployments/deployment-details.scss b/src/renderer/components/+workloads-deployments/deployment-details.scss
index 75ff19bbd4..490edf169f 100644
--- a/src/renderer/components/+workloads-deployments/deployment-details.scss
+++ b/src/renderer/components/+workloads-deployments/deployment-details.scss
@@ -21,21 +21,19 @@
 
 .DeploymentDetails {
   .conditions {
-    .Badge {
-      &.available {
-        color: white;
-        background-color: $deployment-available;
-      }
+    .available {
+      color: white;
+      background-color: $deployment-available;
+    }
 
-      &.progressing {
-        color: white;
-        background-color: $deployment-progressing;
-      }
+    .progressing {
+      color: white;
+      background-color: $deployment-progressing;
+    }
 
-      &.replica-failure {
-        color: white;
-        background-color: $deployment-replicafailure;
-      }
+    .replica-failure {
+      color: white;
+      background-color: $deployment-replicafailure;
     }
   }
 }
\ No newline at end of file
diff --git a/src/renderer/components/+workloads-deployments/deployment-details.tsx b/src/renderer/components/+workloads-deployments/deployment-details.tsx
index acd514749f..87f4e08378 100644
--- a/src/renderer/components/+workloads-deployments/deployment-details.tsx
+++ b/src/renderer/components/+workloads-deployments/deployment-details.tsx
@@ -27,7 +27,6 @@ import { disposeOnUnmount, observer } from "mobx-react";
 import { DrawerItem } from "../drawer";
 import { Badge } from "../badge";
 import type { Deployment } from "../../api/endpoints";
-import { cssNames } from "../../utils";
 import { PodDetailsTolerations } from "../+workloads-pods/pod-details-tolerations";
 import { PodDetailsAffinities } from "../+workloads-pods/pod-details-affinities";
 import { podsStore } from "../+workloads-pods/pods.store";
@@ -118,7 +117,8 @@ export class DeploymentDetails extends React.Component<Props> {
                 <Badge
                   key={type}
                   label={type}
-                  className={cssNames({ disabled: status === "False" }, kebabCase(type))}
+                  disabled={status === "False"}
+                  className={kebabCase(type)}
                   tooltip={(
                     <>
                       <p>{message}</p>
diff --git a/src/renderer/components/+workloads-pods/pod-details.tsx b/src/renderer/components/+workloads-pods/pod-details.tsx
index 2a7516b816..2bb08deeff 100644
--- a/src/renderer/components/+workloads-pods/pod-details.tsx
+++ b/src/renderer/components/+workloads-pods/pod-details.tsx
@@ -142,7 +142,7 @@ export class PodDetails extends React.Component<Props> {
                 <Badge
                   key={type}
                   label={type}
-                  className={cssNames({ disabled: status === "False" })}
+                  disabled={status === "False"}
                   tooltip={`Last transition time: ${lastTransitionTime}`}
                 />
               );
diff --git a/src/renderer/components/+workloads-pods/pods.tsx b/src/renderer/components/+workloads-pods/pods.tsx
index 807d531b20..d7ef7175e8 100644
--- a/src/renderer/components/+workloads-pods/pods.tsx
+++ b/src/renderer/components/+workloads-pods/pods.tsx
@@ -127,7 +127,7 @@ export class Pods extends React.Component<Props> {
           { title: "Status", className: "status", sortBy: columnId.status, id: columnId.status },
         ]}
         renderTableContents={(pod: Pod) => [
-          <Badge flat key="name" label={pod.getName()} tooltip={pod.getName()} />,
+          <Badge flat key="name" label={pod.getName()} tooltip={pod.getName()} expandable={false} />,
           <KubeObjectStatusIcon key="icon" object={pod} />,
           pod.getNs(),
           this.renderContainersStatus(pod),
@@ -145,7 +145,7 @@ export class Pods extends React.Component<Props> {
             );
           }),
           pod.getNodeName() ?
-            <Badge flat key="node" className="node" tooltip={pod.getNodeName()}>
+            <Badge flat key="node" className="node" tooltip={pod.getNodeName()} expandable={false}>
               <Link to={getDetailsUrl(nodesApi.getUrl({ name: pod.getNodeName() }))} onClick={stopPropagation}>
                 {pod.getNodeName()}
               </Link>
diff --git a/src/renderer/components/chart/chart.scss b/src/renderer/components/chart/chart.scss
index 3429b251f9..554d62b883 100644
--- a/src/renderer/components/chart/chart.scss
+++ b/src/renderer/components/chart/chart.scss
@@ -29,7 +29,7 @@
   }
 
   .legend {
-    .Badge {
+    .LegendBadge {
       background: transparent;
       transition: background-color 250ms;
       white-space: normal;
diff --git a/src/renderer/components/chart/chart.tsx b/src/renderer/components/chart/chart.tsx
index b68ece5523..d456c397d1 100644
--- a/src/renderer/components/chart/chart.tsx
+++ b/src/renderer/components/chart/chart.tsx
@@ -169,7 +169,7 @@ export class Chart extends React.Component<ChartProps> {
     const labelElem = (title: string, color: string, tooltip?: string) => (
       <Badge
         key={title}
-        className="flex gaps align-center"
+        className="LegendBadge flex gaps align-center"
         label={(
           <div>
             <StatusBrick style={{ backgroundColor: color }}/>
@@ -177,6 +177,7 @@ export class Chart extends React.Component<ChartProps> {
           </div>
         )}
         tooltip={tooltip}
+        expandable={false}
       />
     );
 
diff --git a/src/renderer/components/cluster-settings/components/cluster-show-metrics.tsx b/src/renderer/components/cluster-settings/components/cluster-show-metrics.tsx
index 6544f2325b..effdc16160 100644
--- a/src/renderer/components/cluster-settings/components/cluster-show-metrics.tsx
+++ b/src/renderer/components/cluster-settings/components/cluster-show-metrics.tsx
@@ -69,13 +69,14 @@ export class ShowMetricsSetting extends React.Component<Props> {
         const tooltipId = `${name}`;
 
         return (
-          <Badge key={name} flat>
+          <Badge key={name} flat expandable={false}>
             <span id={tooltipId}>{name}</span>
             <Icon
               smallest
               material="clear"
               onClick={() => this.removeMetric(name)}
               tooltip="Remove"
+              className="mx-3"
             />
           </Badge>
         );
diff --git a/src/renderer/components/drawer/drawer-item.scss b/src/renderer/components/drawer/drawer-item.scss
index a884be9576..37ea87947b 100644
--- a/src/renderer/components/drawer/drawer-item.scss
+++ b/src/renderer/components/drawer/drawer-item.scss
@@ -67,7 +67,7 @@
         margin: 0;
       }
 
-      .Badge {
+      > div {
         float: left;
         margin: $spacing;
 
diff --git a/src/renderer/components/hotbar/hotbar-selector.scss b/src/renderer/components/hotbar/hotbar-selector.scss
index 4db5ae9900..d0fe3fa57c 100644
--- a/src/renderer/components/hotbar/hotbar-selector.scss
+++ b/src/renderer/components/hotbar/hotbar-selector.scss
@@ -33,7 +33,7 @@
     top: -20px;
   }
 
-  .Badge {
+  .SelectorIndex {
     cursor: pointer;
     background: var(--secondaryBackground);
     width: 100%;
diff --git a/src/renderer/components/hotbar/hotbar-selector.tsx b/src/renderer/components/hotbar/hotbar-selector.tsx
index f0ca39d834..3bac4475fe 100644
--- a/src/renderer/components/hotbar/hotbar-selector.tsx
+++ b/src/renderer/components/hotbar/hotbar-selector.tsx
@@ -49,6 +49,7 @@ export function HotbarSelector({ hotbar }: Props) {
             preferredPositions: [TooltipPosition.TOP, TooltipPosition.TOP_LEFT],
             children: hotbar.name
           }}
+          className="SelectorIndex"
         />
       </div>
       <Icon material="play_arrow" className="next box" onClick={() => store.switchToNext()} />
diff --git a/src/renderer/components/table/table.mixins.scss b/src/renderer/components/table/table.mixins.scss
index 3f7a021aff..12e009631d 100644
--- a/src/renderer/components/table/table.mixins.scss
+++ b/src/renderer/components/table/table.mixins.scss
@@ -49,8 +49,4 @@
 @mixin table-cell-labels-offsets {
   padding-top: $padding / 2;
   padding-bottom: 0;
-
-  .Badge + .Badge {
-    margin-left: $padding / 2;
-  }
 }
\ No newline at end of file