Fix dropdowns not being searchable for ClusterRoleBindingDialog and RoleBindingDialog (#4272)

* Fix dropdowns not being searchable for ClusterRoleBindingDialog and RoleBindingDialog

- Added some tests

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Fix unit test

Signed-off-by: Sebastian Malton <sebastian@malton.name>

src/renderer/components/+user-management/+cluster-role-bindings/__tests__/dialog.test.tsx

@@ -19,31 +19,44 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+import { render } from "@testing-library/react";
 import React from "react";
-import type { ServiceAccount } from "../../../common/k8s-api/endpoints";
+import { ClusterRoleBindingDialog } from "../dialog";
-import type { KubeObject } from "../../../common/k8s-api/kube-object";
+import { clusterRolesStore } from "../../+cluster-roles/store";
-import { Icon } from "../icon";
+import { ClusterRole } from "../../../../../common/k8s-api/endpoints";
-import type { SelectOption } from "../select";
+import userEvent from "@testing-library/user-event";
-import { TooltipPosition } from "../tooltip";
 
-export type ServiceAccountOption = SelectOption<string> & { account: ServiceAccount };
+jest.mock("../../+cluster-roles/store");
 
-export function getRoleRefSelectOption<T extends KubeObject>(item: T): SelectOption<T> {
+describe("ClusterRoleBindingDialog tests", () => {
-  return {
+  beforeEach(() => {
-    value: item,
+    (clusterRolesStore as any).items = [new ClusterRole({
-    label: (
+      apiVersion: "rbac.authorization.k8s.io/v1",
-      <>
+      kind: "ClusterRole",
-        <Icon
+      metadata: {
-          small
+        name: "foobar",
-          material={item.kind === "Role" ? "person" : "people"}
+        resourceVersion: "1",
-          tooltip={{
+        uid: "1",
-            preferredPositions: TooltipPosition.LEFT,
+      },
-            children: item.kind,
+    })];
-          }}
+  });
-        />
+
-        {" "}
+  afterEach(() => {
-        {item.getName()}
+    ClusterRoleBindingDialog.close();
-      </>
+    jest.resetAllMocks();
-    ),
+  });
-  };
+
-}
+  it("should render without any errors", () => {
+    const { container } = render(<ClusterRoleBindingDialog />);
+
+    expect(container).toBeInstanceOf(HTMLElement);
+  });
+
+  it("clusterrole select should be searchable", async () => {
+    ClusterRoleBindingDialog.open();
+    const res = render(<ClusterRoleBindingDialog />);
+
+    userEvent.keyboard("a");
+    await res.findAllByText("foobar");
+  });
+});

src/renderer/components/+user-management/+cluster-role-bindings/dialog.tsx

@@ -37,9 +37,9 @@ import { Select, SelectOption } from "../../select";
 import { Wizard, WizardStep } from "../../wizard";
 import { clusterRoleBindingsStore } from "./store";
 import { clusterRolesStore } from "../+cluster-roles/store";
-import { getRoleRefSelectOption, ServiceAccountOption } from "../select-options";
 import { ObservableHashSet, nFircate } from "../../../utils";
 import { Input } from "../../input";
+import { TooltipPosition } from "../../tooltip";
 
 interface Props extends Partial<DialogProps> {
 }
@@ -114,24 +114,21 @@ export class ClusterRoleBindingDialog extends React.Component<Props> {
   }
 
   @computed get clusterRoleRefoptions(): SelectOption<ClusterRole>[] {
-    return clusterRolesStore.items.map(getRoleRefSelectOption);
+    return clusterRolesStore.items.map(value => ({
+      value,
+      label: value.getName(),
+    }));
   }
 
-  @computed get serviceAccountOptions(): ServiceAccountOption[] {
+  @computed get serviceAccountOptions(): SelectOption<ServiceAccount>[] {
-    return serviceAccountsStore.items.map(account => {
+    return serviceAccountsStore.items.map(account => ({
-      const name = account.getName();
+      value: account,
-      const namespace = account.getNs();
+      label: `${account.getName()} (${account.getNs()})`,
-
+    }));
-      return {
-        value: `${account.getName()}%${account.getNs()}`,
-        account,
-        label: <><Icon small material="account_box" /> {name} ({namespace})</>,
-      };
-    });
   }
 
-  @computed get selectedServiceAccountOptions(): ServiceAccountOption[] {
+  @computed get selectedServiceAccountOptions(): SelectOption<ServiceAccount>[] {
-    return this.serviceAccountOptions.filter(({ account }) => this.selectedAccounts.has(account));
+    return this.serviceAccountOptions.filter(({ value }) => this.selectedAccounts.has(value));
   }
 
   @action
@@ -198,6 +195,21 @@ export class ClusterRoleBindingDialog extends React.Component<Props> {
           isDisabled={this.isEditing}
           options={this.clusterRoleRefoptions}
           value={this.selectedRoleRef}
+          autoFocus={!this.isEditing}
+          formatOptionLabel={({ value }: SelectOption<ClusterRole>) => (
+            <>
+              <Icon
+                small
+                material={value.kind === "Role" ? "person" : "people"}
+                tooltip={{
+                  preferredPositions: TooltipPosition.LEFT,
+                  children: value.kind,
+                }}
+              />
+              {" "}
+              {value.getName()}
+            </>
+          )}
           onChange={({ value }: SelectOption<ClusterRole> ) => {
             if (!this.selectedRoleRef || this.bindingName === this.selectedRoleRef.getName()) {
               this.bindingName = value.getName();
@@ -241,9 +253,12 @@ export class ClusterRoleBindingDialog extends React.Component<Props> {
           autoConvertOptions={false}
           options={this.serviceAccountOptions}
           value={this.selectedServiceAccountOptions}
-          onChange={(selected: ServiceAccountOption[] | null) => {
+          formatOptionLabel={({ value }: SelectOption<ServiceAccount>) => (
+            <><Icon small material="account_box" /> {value.getName()} ({value.getNs()})</>
+          )}
+          onChange={(selected: SelectOption<ServiceAccount>[] | null) => {
             if (selected) {
-              this.selectedAccounts.replace(selected.map(opt => opt.account));
+              this.selectedAccounts.replace(selected.map(opt => opt.value));
             } else {
               this.selectedAccounts.clear();
             }

src/renderer/components/+user-management/+role-bindings/__tests__/dialog.test.tsx

@@ -0,0 +1,65 @@
+/**
+ * Copyright (c) 2021 OpenLens Authors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+import { render } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import React from "react";
+import { clusterRolesStore } from "../../+cluster-roles/store";
+import { ClusterRole } from "../../../../../common/k8s-api/endpoints";
+import { RoleBindingDialog } from "../dialog";
+
+jest.mock("../../+cluster-roles/store");
+
+describe("RoleBindingDialog tests", () => {
+  beforeEach(() => {
+    (clusterRolesStore as any).items = [new ClusterRole({
+      apiVersion: "rbac.authorization.k8s.io/v1",
+      kind: "ClusterRole",
+      metadata: {
+        name: "foobar",
+        resourceVersion: "1",
+        uid: "1",
+      },
+    })];
+  });
+
+  afterEach(() => {
+    RoleBindingDialog.close();
+    jest.resetAllMocks();
+  });
+
+  it("should render without any errors", () => {
+    const { container } = render(<RoleBindingDialog />);
+
+    expect(container).toBeInstanceOf(HTMLElement);
+  });
+
+  it("role select should be searchable", async () => {
+    RoleBindingDialog.open();
+    const res = render(<RoleBindingDialog />);
+
+    userEvent.click(await res.findByText("Select role", { exact: false }));
+
+    await res.findAllByText("foobar", {
+      exact: false,
+    });
+  });
+});

src/renderer/components/+user-management/+role-bindings/dialog.tsx

@@ -40,7 +40,6 @@ import { Wizard, WizardStep } from "../../wizard";
 import { roleBindingsStore } from "./store";
 import { clusterRolesStore } from "../+cluster-roles/store";
 import { Input } from "../../input";
-import { getRoleRefSelectOption, ServiceAccountOption } from "../select-options";
 import { ObservableHashSet, nFircate } from "../../../utils";
 
 interface Props extends Partial<DialogProps> {
@@ -112,9 +111,9 @@ export class RoleBindingDialog extends React.Component<Props> {
   @computed get roleRefOptions(): SelectOption<Role | ClusterRole>[] {
     const roles = rolesStore.items
       .filter(role => role.getNs() === this.bindingNamespace)
-      .map(getRoleRefSelectOption);
+      .map(value => ({ value, label: value.getName() }));
     const clusterRoles = clusterRolesStore.items
-      .map(getRoleRefSelectOption);
+      .map(value => ({ value, label: value.getName() }));
 
     return [
       ...roles,
@@ -122,21 +121,15 @@ export class RoleBindingDialog extends React.Component<Props> {
     ];
   }
 
-  @computed get serviceAccountOptions(): ServiceAccountOption[] {
+  @computed get serviceAccountOptions(): SelectOption<ServiceAccount>[] {
-    return serviceAccountsStore.items.map(account => {
+    return serviceAccountsStore.items.map(account => ({
-      const name = account.getName();
+      value: account,
-      const namespace = account.getNs();
+      label: `${account.getName()} (${account.getNs()})`,
-
+    }));
-      return {
-        value: `${account.getName()}%${account.getNs()}`,
-        account,
-        label: <><Icon small material="account_box" /> {name} ({namespace})</>,
-      };
-    });
   }
 
-  @computed get selectedServiceAccountOptions(): ServiceAccountOption[] {
+  @computed get selectedServiceAccountOptions(): SelectOption<ServiceAccount>[] {
-    return this.serviceAccountOptions.filter(({ account }) => this.selectedAccounts.has(account));
+    return this.serviceAccountOptions.filter(({ value }) => this.selectedAccounts.has(value));
   }
 
   @action
@@ -204,6 +197,7 @@ export class RoleBindingDialog extends React.Component<Props> {
           themeName="light"
           isDisabled={this.isEditing}
           value={this.bindingNamespace}
+          autoFocus={!this.isEditing}
           onChange={({ value }) => this.bindingNamespace = value}
         />
 
@@ -256,9 +250,12 @@ export class RoleBindingDialog extends React.Component<Props> {
           autoConvertOptions={false}
           options={this.serviceAccountOptions}
           value={this.selectedServiceAccountOptions}
-          onChange={(selected: ServiceAccountOption[] | null) => {
+          formatOptionLabel={({ value }: SelectOption<ServiceAccount>) => (
+            <><Icon small material="account_box" /> {value.getName()} ({value.getNs()})</>
+          )}
+          onChange={(selected: SelectOption<ServiceAccount>[] | null) => {
             if (selected) {
-              this.selectedAccounts.replace(selected.map(opt => opt.account));
+              this.selectedAccounts.replace(selected.map(opt => opt.value));
             } else {
               this.selectedAccounts.clear();
             }