From 9c388dc49927d8e1ec1b82a22c2718f90dd1fdeb Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Tue, 12 Apr 2022 14:49:37 -0400
Subject: [PATCH] fix namespace-select.tsx

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 .../+namespaces/namespace-select.tsx          | 28 ++++++++++---------
 .../+role-bindings/dialog.tsx                 |  2 +-
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/renderer/components/+namespaces/namespace-select.tsx b/src/renderer/components/+namespaces/namespace-select.tsx
index e1a4f1b083..4fde4104c4 100644
--- a/src/renderer/components/+namespaces/namespace-select.tsx
+++ b/src/renderer/components/+namespaces/namespace-select.tsx
@@ -18,25 +18,16 @@ import namespaceStoreInjectable from "./namespace-store/namespace-store.injectab
 
 export type NamespaceSelectSort = (left: string, right: string) => number;
 
-export interface NamespaceSelectProps<IsMulti extends boolean> extends SelectProps<string, IsMulti> {
+export interface NamespaceSelectProps<IsMulti extends boolean> extends Omit<SelectProps<{ namespace: string }, IsMulti>, "options" | "value"> {
   showIcons?: boolean;
   sort?: NamespaceSelectSort;
-  options?: undefined;
+  value: string | null;
 }
 
 interface Dependencies {
   namespaceStore: NamespaceStore;
 }
 
-export function formatNamespaceOptionWithIcon(namespace: string) {
-  return (
-    <>
-      <Icon small material="layers" />
-      {namespace}
-    </>
-  );
-}
-
 function getOptions(namespaceStore: NamespaceStore, sort: NamespaceSelectSort | undefined) {
   return computed(() => {
     const baseOptions = namespaceStore.items.map(ns => ns.getName());
@@ -45,7 +36,7 @@ function getOptions(namespaceStore: NamespaceStore, sort: NamespaceSelectSort |
       baseOptions.sort(sort);
     }
 
-    return baseOptions;
+    return baseOptions.map(namespace => ({ namespace }));
   });
 }
 
@@ -55,6 +46,7 @@ const NonInjectedNamespaceSelect = observer(({
   formatOptionLabel,
   sort,
   className,
+  value,
   ...selectProps
 }: Dependencies & NamespaceSelectProps<boolean>) => {
   const [baseOptions, setBaseOptions] = useState(getOptions(namespaceStore, sort));
@@ -65,7 +57,17 @@ const NonInjectedNamespaceSelect = observer(({
     <Select
       className={cssNames("NamespaceSelect", className)}
       menuClass="NamespaceSelectMenu"
-      formatOptionLabel={showIcons ? formatNamespaceOptionWithIcon : undefined}
+      formatOptionLabel={showIcons
+        ? ({ namespace }) => (
+          <>
+            <Icon small material="layers" />
+            {namespace}
+          </>
+        )
+        : undefined
+      }
+      getOptionLabel={({ namespace }) => namespace}
+      value={value ? ({ namespace: value }) : null}
       options={baseOptions.get()}
       {...selectProps}
     />
diff --git a/src/renderer/components/+user-management/+role-bindings/dialog.tsx b/src/renderer/components/+user-management/+role-bindings/dialog.tsx
index 17f4153f44..8adf52b136 100644
--- a/src/renderer/components/+user-management/+role-bindings/dialog.tsx
+++ b/src/renderer/components/+user-management/+role-bindings/dialog.tsx
@@ -182,7 +182,7 @@ export class RoleBindingDialog extends React.Component<RoleBindingDialogProps> {
           isDisabled={this.isEditing}
           value={this.bindingNamespace}
           autoFocus={!this.isEditing}
-          onChange={namespace => this.bindingNamespace = namespace}
+          onChange={opt => this.bindingNamespace = opt ? opt.namespace : null}
         />
 
         <SubTitle title="Role Reference" />