Merge branch '15256-removing-files-during-upload'

[arvados-workbench2.git] / src / store / sharing-dialog / sharing-dialog-actions.ts

diff --git a/src/store/sharing-dialog/sharing-dialog-actions.ts b/src/store/sharing-dialog/sharing-dialog-actions.ts
index 37de6f8c2e9ab19e8a1c28c05ad4a20a8fb7013c..671c10fc3088ba8dc4630f93c83afcd55066709d 100644 (file)
--- a/src/store/sharing-dialog/sharing-dialog-actions.ts
+++ b/src/store/sharing-dialog/sharing-dialog-actions.ts
@@ -19,6 +19,7 @@ import { differenceWith } from "lodash";
 import { withProgress } from "~/store/progress-indicator/with-progress";
 import { progressIndicatorActions } from '~/store/progress-indicator/progress-indicator-actions.ts';
 import { snackbarActions, SnackbarKind } from "../snackbar/snackbar-actions";
+import { extractUuidKind, ResourceKind } from "~/models/resource";
 
 export const openSharingDialog = (resourceUuid: string) =>
     (dispatch: Dispatch) => {
@@ -72,19 +73,23 @@ const loadSharingDialog = async (dispatch: Dispatch, getState: () => RootState,
 };
 
 const initializeManagementForm = (permissionLinks: PermissionResource[]) =>
-    async (dispatch: Dispatch, getState: () => RootState, { userService }: ServiceRepository) => {
+    async (dispatch: Dispatch, getState: () => RootState, { userService, groupsService }: ServiceRepository) => {
 
         const filters = new FilterBuilder()
             .addIn('uuid', permissionLinks.map(({ tailUuid }) => tailUuid))
             .getFilters();
 
         const { items: users } = await userService.list({ filters });
+        const { items: groups} = await groupsService.list({ filters });
 
         const getEmail = (tailUuid: string) => {
             const user = users.find(({ uuid }) => uuid === tailUuid);
+            const group = groups.find(({ uuid }) => uuid === tailUuid);
             return user
                 ? user.email
-                : tailUuid;
+                : group
+                    ? group.name
+                    : tailUuid;
         };
 
         const managementPermissions = permissionLinks
@@ -189,15 +194,17 @@ const saveManagementChanges = async (_: Dispatch, getState: () => RootState, { p
     }
 };
 
-const sendInvitations = async (_: Dispatch, getState: () => RootState, { permissionService }: ServiceRepository) => {
+const sendInvitations = async (_: Dispatch, getState: () => RootState, { permissionService, userService }: ServiceRepository) => {
     const state = getState();
     const { user } = state.auth;
     const dialog = getDialog<string>(state.dialog, SHARING_DIALOG_NAME);
     if (dialog && user) {
-
         const invitations = getFormValues(SHARING_INVITATION_FORM_NAME)(state) as SharingInvitationFormData;
 
-        const invitationData = invitations.invitedPeople
+        const getGroupsFromForm = invitations.invitedPeople.filter((invitation) => extractUuidKind(invitation.uuid) === ResourceKind.GROUP);
+        const getUsersFromForm = invitations.invitedPeople.filter((invitation) => extractUuidKind(invitation.uuid) === ResourceKind.USER);
+
+        const invitationDataUsers = getUsersFromForm
             .map(person => ({
                 ownerUuid: user.uuid,
                 headUuid: dialog.data,
@@ -205,9 +212,19 @@ const sendInvitations = async (_: Dispatch, getState: () => RootState, { permiss
                 name: invitations.permissions
             }));
 
-        for (const invitation of invitationData) {
+        const invitationsDataGroups = getGroupsFromForm.map(
+            group => ({
+                ownerUuid: user.uuid,
+                headUuid: dialog.data,
+                tailUuid: group.uuid,
+                name: invitations.permissions
+            })
+        );
+
+        const data = invitationDataUsers.concat(invitationsDataGroups);
+
+        for (const invitation of data) {
             await permissionService.create(invitation);
         }
-
     }
 };