From 5b066be9058dac784b1ca8e61b0559f126ee89ab Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Fri, 5 Mar 2021 15:53:13 -0500
Subject: [PATCH] fix spelling in cluster and webpack.renderer

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 src/main/cluster.ts                           |  2 +-
 src/main/helm/helm-service.ts                 | 36 +++++++++----------
 src/renderer/api/endpoints/helm-charts.api.ts | 10 +++---
 webpack.renderer.ts                           |  4 +--
 4 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/src/main/cluster.ts b/src/main/cluster.ts
index 198d24c2f9..9fadf5d8a7 100644
--- a/src/main/cluster.ts
+++ b/src/main/cluster.ts
@@ -86,7 +86,7 @@ export class Cluster implements ClusterModel, ClusterState {
   whenReady = when(() => this.ready);
 
   /**
-   * Is cluster object initializinng on-going
+   * Is cluster object initializing on-going
    *
    * @observable
    */
diff --git a/src/main/helm/helm-service.ts b/src/main/helm/helm-service.ts
index f7445cebd4..32977df1c4 100644
--- a/src/main/helm/helm-service.ts
+++ b/src/main/helm/helm-service.ts
@@ -6,6 +6,13 @@ import { HelmChartManager } from "./helm-chart-manager";
 import { releaseManager } from "./helm-release-manager";
 import { HelmChartList, RepoHelmChartList } from "../../renderer/api/endpoints/helm-charts.api";
 
+function sortValues<T>(src: Record<string | number | symbol, T[]>, compare: (left: T, right: T) => number): Record<string | number | symbol, T[]> {
+  return Object.fromEntries(
+    Object.entries(src)
+      .map(([key, values]) => [key, values.sort(compare)])
+  );
+}
+
 class HelmService {
   public async installChart(cluster: Cluster, data: { chart: string; values: {}; name: string; namespace: string; version: string }) {
     return await releaseManager.installChart(data.chart, data.values, data.name, data.namespace, data.version, cluster.getProxyKubeconfigPath());
@@ -95,28 +102,19 @@ class HelmService {
   }
 
   private excludeDeprecatedChartGroups(chartGroups: RepoHelmChartList) {
-    const groups = new Map(Object.entries(chartGroups));
-
-    for (const [chartName, charts] of groups) {
-      if (charts[0].deprecated) {
-        groups.delete(chartName);
-      }
-    }
-
-    return Object.fromEntries(groups);
+    return Object.fromEntries(
+      Object.entries(chartGroups)
+        .filter(([, [chart]]) => !chart.deprecated)
+    );
   }
 
   private sortChartsByVersion(chartGroups: RepoHelmChartList) {
-    for (const key in chartGroups) {
-      chartGroups[key] = chartGroups[key].sort((first, second) => {
-        const firstVersion = semver.coerce(first.version || 0);
-        const secondVersion = semver.coerce(second.version || 0);
-
-        return semver.compare(secondVersion, firstVersion);
-      });
-    }
-
-    return chartGroups;
+    return sortValues(chartGroups, ({version: left}, {version: right}) => (
+      semver.compare(
+        semver.coerce(right || 0),
+        semver.coerce(left || 0),
+      )
+    ));
   }
 }
 
diff --git a/src/renderer/api/endpoints/helm-charts.api.ts b/src/renderer/api/endpoints/helm-charts.api.ts
index 02b5b0dbee..bde2fa638c 100644
--- a/src/renderer/api/endpoints/helm-charts.api.ts
+++ b/src/renderer/api/endpoints/helm-charts.api.ts
@@ -20,12 +20,12 @@ export const helmChartsApi = {
   list() {
     return apiBase
       .get<HelmChartList>(endpoint())
-      .then(data => {
-        return Object
+      .then(data => (
+        Object
           .values(data)
-          .reduce((allCharts, repoCharts) => allCharts.concat(Object.values(repoCharts)), [])
-          .map(([chart]) => HelmChart.create(chart));
-      });
+          .flatMap(byRepo => Object.values(byRepo))
+          .map(([chart]) => (console.log(chart), HelmChart.create(chart)))
+      ));
   },
 
   get(repo: string, name: string, readmeVersion?: string) {
diff --git a/webpack.renderer.ts b/webpack.renderer.ts
index c0169bb3a0..46bf5cfbb6 100755
--- a/webpack.renderer.ts
+++ b/webpack.renderer.ts
@@ -27,7 +27,7 @@ export function webpackLensRenderer({ showVars = true } = {}): webpack.Configura
       port: webpackDevServerPort,
       host: "localhost",
       hot: true,
-      // to avoid cors errors when requests is from iframes
+      // to avoid CORS errors when requests is from iframes
       disableHostCheck: true,
       headers: { "Access-Control-Allow-Origin": "*" },
     },
@@ -97,7 +97,7 @@ export function webpackLensRenderer({ showVars = true } = {}): webpack.Configura
             loader: "file-loader",
             options: {
               name: "images/[name]-[hash:6].[ext]",
-              esModule: false, // handle media imports in <template>, e.g <img src="../assets/logo.svg"> (vue/react?)
+              esModule: false, // handle media imports in <template>, e.g <img src="../assets/logo.svg"> (react)
             }
           }
         },