From c88a8217923852c2789fcbf7de260ec9a9daf3f9 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Mon, 27 Jun 2022 14:43:38 -0400
Subject: [PATCH] Refactor the options

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 .../namespace-select-filter-model.tsx         | 37 +++++++++----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/renderer/components/+namespaces/namespace-select-filter-model/namespace-select-filter-model.tsx b/src/renderer/components/+namespaces/namespace-select-filter-model/namespace-select-filter-model.tsx
index 838653407f..a3d850cdcd 100644
--- a/src/renderer/components/+namespaces/namespace-select-filter-model/namespace-select-filter-model.tsx
+++ b/src/renderer/components/+namespaces/namespace-select-filter-model/namespace-select-filter-model.tsx
@@ -60,7 +60,7 @@ export function namespaceSelectFilterModelFor(dependencies: Dependencies): Names
     equals: comparer.structural,
   });
   const optionsSortingSelected = observable.set(selectedNames.get());
-  const sortNamespacesByIfTheyAreSelected = (left: string, right: string) => {
+  const sortNamespacesByIfTheyHaveBeenSelected = (left: string, right: string) => {
     const isLeftSelected = optionsSortingSelected.has(left);
     const isRightSelected = optionsSortingSelected.has(right);
 
@@ -68,27 +68,26 @@ export function namespaceSelectFilterModelFor(dependencies: Dependencies): Names
       return 0;
     }
 
-    return isLeftSelected
+    return isRightSelected
       ? 1
       : -1;
   };
-
-  const options = computed((): readonly NamespaceSelectFilterOption[] => {
-    return [
-      {
-        value: selectAllNamespaces,
-        label: "All Namespaces",
-      },
-      ...namespaceStore
-        .items
-        .map(ns => ns.getName())
-        .sort(sortNamespacesByIfTheyAreSelected)
-        .map(namespace => ({
-          value: namespace,
-          label: namespace,
-        })),
-    ];
-  });
+  const options = computed((): readonly NamespaceSelectFilterOption[] => [
+    {
+      value: selectAllNamespaces,
+      label: "All Namespaces",
+      id: "all-namespaces",
+    },
+    ...namespaceStore
+      .items
+      .map(ns => ns.getName())
+      .sort(sortNamespacesByIfTheyHaveBeenSelected)
+      .map(namespace => ({
+        value: namespace,
+        label: namespace,
+        id: namespace,
+      })),
+  ]);
   const menuIsOpen = computed(() => menuState.get() === SelectMenuState.Open);
   const isOptionSelected: NamespaceSelectFilterModel["isOptionSelected"] = (option) => {
     if (option.value === selectAllNamespaces) {