From: Stephen Smith <stephen@curii.com>
Date: Fri, 13 May 2022 18:25:15 +0000 (-0400)
Subject: 19049: Only show active users in add login participant select
X-Git-Tag: 2.4.1~1^2~4^2
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/63539b816f355df818e4205d5da0b7b7416c9966

19049: Only show active users in add login participant select

Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen@curii.com>
---

diff --git a/src/views-components/sharing-dialog/participant-select.tsx b/src/views-components/sharing-dialog/participant-select.tsx
index eb7e8d10..a826fcd5 100644
--- a/src/views-components/sharing-dialog/participant-select.tsx
+++ b/src/views-components/sharing-dialog/participant-select.tsx
@@ -28,6 +28,7 @@ interface ParticipantSelectProps {
     label?: string;
     autofocus?: boolean;
     onlyPeople?: boolean;
+    onlyActive?: boolean;
     disabled?: boolean;
 
     onBlur?: (event: React.FocusEvent<HTMLInputElement>) => void;
@@ -133,6 +134,7 @@ export const ParticipantSelect = connect()(
 
             const filterUsers = new FilterBuilder()
                 .addILike('any', value)
+                .addEqual('is_active', this.props.onlyActive || undefined)
                 .addNotIn('uuid', this.props.excludedParticipants)
                 .getFilters();
             const userItems: ListResults<any> = await userService.list({ filters: filterUsers, limit, count: "none" });
diff --git a/src/views-components/virtual-machines-dialog/add-login-dialog.tsx b/src/views-components/virtual-machines-dialog/add-login-dialog.tsx
index 93fe8485..1654452b 100644
--- a/src/views-components/virtual-machines-dialog/add-login-dialog.tsx
+++ b/src/views-components/virtual-machines-dialog/add-login-dialog.tsx
@@ -55,6 +55,7 @@ const ParticipantField = Field as new () => GenericField<UserFieldProps>;
 const UserSelect = (props) =>
     <ParticipantSelect
         onlyPeople
+        onlyActive
         label='Search for user to grant login permission'
         items={props.input.value ? [props.input.value] : []}
         excludedParticipants={props.excludedParticipants}
@@ -64,6 +65,7 @@ const UserSelect = (props) =>
 const ReadOnlyUserSelect = (props) =>
         <ParticipantSelect
             onlyPeople
+            onlyActive
             label='User'
             items={props.input.value ? [props.input.value] : []}
             disabled={true} />;