Merge branch '19836-upload-binary-mode' into main

[arvados-workbench2.git] / src / store / virtual-machines / virtual-machines-actions.ts

diff --git a/src/store/virtual-machines/virtual-machines-actions.ts b/src/store/virtual-machines/virtual-machines-actions.ts
index a7abf096b480e476577f946d0025dcca052db11c..bd07efb6409f3f09368b10eaf60c479234257bdb 100644 (file)
--- a/src/store/virtual-machines/virtual-machines-actions.ts
+++ b/src/store/virtual-machines/virtual-machines-actions.ts
@@ -18,7 +18,7 @@ import { PermissionLevel } from "models/permission";
 import { deleteResources, updateResources } from 'store/resources/resources-actions';
 import { Participant } from "views-components/sharing-dialog/participant-select";
 import { initialize, reset } from "redux-form";
-import { getUserDisplayName } from "models/user";
+import { getUserDisplayName, UserResource } from "models/user";
 
 export const virtualMachinesActions = unionize({
     SET_REQUESTED_DATE: ofType<string>(),
@@ -83,7 +83,8 @@ export const loadVirtualMachinesAdminData = () =>
             filters: new FilterBuilder()
             .addIn('head_uuid', virtualMachines.items.map(item => item.uuid))
             .addEqual('name', PermissionLevel.CAN_LOGIN)
-            .getFilters()
+            .getFilters(),
+            limit: 1000
         });
         dispatch(updateResources(logins.items));
         dispatch(virtualMachinesActions.SET_LINKS(logins));
@@ -92,7 +93,8 @@ export const loadVirtualMachinesAdminData = () =>
             filters: new FilterBuilder()
             .addIn('uuid', logins.items.map(item => item.tailUuid))
             .getFilters(),
-            count: "none"
+            count: "none", // Necessary for federated queries
+            limit: 1000
         });
         dispatch(updateResources(users.items));
 
@@ -103,11 +105,13 @@ export const loadVirtualMachinesAdminData = () =>
 export const loadVirtualMachinesUserData = () =>
     async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
         dispatch<any>(loadRequestedDate());
+        const user = getState().auth.user;
         const virtualMachines = await services.virtualMachineService.list();
         const virtualMachinesUuids = virtualMachines.items.map(it => it.uuid);
         const links = await services.linkService.list({
             filters: new FilterBuilder()
                 .addIn("head_uuid", virtualMachinesUuids)
+                .addEqual("tail_uuid", user?.uuid)
                 .getFilters()
         });
         dispatch(virtualMachinesActions.SET_VIRTUAL_MACHINES(virtualMachines));
@@ -156,10 +160,15 @@ export interface AddLoginFormData {
 
 export const addUpdateVirtualMachineLogin = ({uuid, vmUuid, user, groups}: AddLoginFormData) =>
     async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+        let userResource: UserResource | undefined = undefined;
         try {
             // Get user
-            const userResource = await services.userService.get(user.uuid);
-
+            userResource = await services.userService.get(user.uuid, false);
+        } catch (e) {
+                dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Failed to get user details.", hideDuration: 2000, kind: SnackbarKind.ERROR }));
+                return;
+        }
+        try {
             if (uuid) {
                 const permission = await services.permissionService.update(uuid, {
                     tailUuid: userResource.uuid,