Create permission service, create public access and sharing management actions
authorMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Mon, 29 Oct 2018 21:56:03 +0000 (22:56 +0100)
committerMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Mon, 29 Oct 2018 21:56:03 +0000 (22:56 +0100)
Feature #14365

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>

src/services/permission-service/permission-service.ts
src/store/sharing-dialog/sharing-dialog-actions.ts
src/store/sharing-dialog/sharing-dialog-types.ts
src/store/workflow-panel/workflow-panel-actions.ts
src/views-components/context-menu/action-sets/collection-action-set.ts
src/views-components/context-menu/action-sets/project-action-set.ts
src/views-components/sharing-dialog/sharing-dialog.tsx

index 95666de0b8c22f7cac38e99325e6ee29ec1ca822..0f8804544016875f1716f382047ed551d2dfc769 100644 (file)
@@ -4,20 +4,20 @@
 
 import { LinkService } from "~/services/link-service/link-service";
 import { PermissionResource } from "~/models/permission";
-import { ListArguments, ListResults } from '~/services/common-service/common-resource-service';
+import { ListArguments, ListResults, CommonResourceService } from '~/services/common-service/common-resource-service';
 import { joinFilters, FilterBuilder } from '../api/filter-builder';
 import { LinkClass } from '../../models/link';
 
 export class PermissionService extends LinkService<PermissionResource> {
 
-    list(args: ListArguments = {}): Promise<ListResults<PermissionResource>> {
-        const { filters, ...other } = args;
-        const classFilter = new FilterBuilder().addEqual('class', LinkClass.PERMISSION).getFilters();
-        const newArgs = {
-            ...other,
-            filters: joinFilters(filters, classFilter),
-        };
-        return super.list(newArgs);
+    permissionListService = new CommonResourceService(this.serverApi, 'permissions', this.actions);
+    create(data?: Partial<PermissionResource>) {
+        return super.create({ ...data, linkClass: LinkClass.PERMISSION });
+    }
+
+    listResourcePermissions(uuid: string, args: ListArguments = {}): Promise<ListResults<PermissionResource>> {
+        const service = new CommonResourceService<PermissionResource>(this.serverApi, `permissions/${uuid}`, this.actions);
+        return service.list(args);
     }
 
 }
index 10518bdac1feac9af39f3ef0a4145b3d1e7dd41e..76d54e17d21cbaefea78aafa8f41db2c70617f72 100644 (file)
 
 import { dialogActions } from "~/store/dialog/dialog-actions";
 import { withDialog } from "~/store/dialog/with-dialog";
-import { SHARING_DIALOG_NAME } from "./sharing-dialog-types";
+import { SHARING_DIALOG_NAME, SharingPublicAccessFormData, SHARING_PUBLIC_ACCESS_FORM_NAME, SHARING_INVITATION_FORM_NAME, SharingManagementFormData, SharingInvitationFormData } from './sharing-dialog-types';
+import { Dispatch } from 'redux';
+import { ServiceRepository } from "~/services/services";
+import { FilterBuilder } from '~/services/api/filter-builder';
+import { initialize, getFormValues, isDirty, reset } from 'redux-form';
+import { SHARING_MANAGEMENT_FORM_NAME } from '~/store/sharing-dialog/sharing-dialog-types';
+import { RootState } from '~/store/store';
+import { getDialog } from '~/store/dialog/dialog-reducer';
+import { PermissionLevel } from '../../models/permission';
+import { getPublicGroupUuid } from "~/store/workflow-panel/workflow-panel-actions";
 
 export const openSharingDialog = (resourceUuid: string) =>
-    dialogActions.OPEN_DIALOG({ id: SHARING_DIALOG_NAME, data: resourceUuid });
+    async (dispatch: Dispatch, getState: () => RootState, { permissionService }: ServiceRepository) => {
+
+        dispatch(dialogActions.OPEN_DIALOG({ id: SHARING_DIALOG_NAME, data: resourceUuid }));
+
+        const state = getState();
+        const { items } = await permissionService.listResourcePermissions(resourceUuid);
+
+        const managementFormData: SharingManagementFormData = {
+            permissions: items
+                .filter(item =>
+                    item.tailUuid !== getPublicGroupUuid(state))
+                .map(({ tailUuid, name }) => ({
+                    email: tailUuid,
+                    permissions: name as PermissionLevel,
+                }))
+        };
+
+        dispatch(initialize(SHARING_MANAGEMENT_FORM_NAME, managementFormData));
+
+        const [publicPermission] = items.filter(item => item.tailUuid === getPublicGroupUuid(state));
+        if (publicPermission) {
+            const publicAccessFormData: SharingPublicAccessFormData = {
+                enabled: publicPermission.name !== PermissionLevel.NONE,
+                permissions: publicPermission.name as PermissionLevel,
+            };
+
+            dispatch(initialize(SHARING_PUBLIC_ACCESS_FORM_NAME, publicAccessFormData));
+        } else {
+            dispatch(reset(SHARING_PUBLIC_ACCESS_FORM_NAME));
+        }
+    };
 
 export const closeSharingDialog = () =>
     dialogActions.CLOSE_DIALOG({ id: SHARING_DIALOG_NAME });
 
 export const connectSharingDialog = withDialog(SHARING_DIALOG_NAME);
+
+export const saveSharingDialogChanges = async (dispatch: Dispatch) => {
+    dispatch<any>(savePublicPermissionChanges);
+    dispatch<any>(sendInvitations);
+};
+
+const savePublicPermissionChanges = async (dispatch: Dispatch, getState: () => RootState, { permissionService }: ServiceRepository) => {
+    const state = getState();
+    const { user } = state.auth;
+    const dialog = getDialog<string>(state.dialog, SHARING_DIALOG_NAME);
+    if (dialog && user) {
+        const publicAccess = getFormValues(SHARING_PUBLIC_ACCESS_FORM_NAME)(state) as SharingPublicAccessFormData;
+
+        const filters = new FilterBuilder()
+            .addEqual('headUuid', dialog.data)
+            .getFilters();
+
+        const { items } = await permissionService.list({ filters });
+
+        const [publicPermission] = items.filter(item => item.tailUuid === getPublicGroupUuid(state));
+
+        if (publicPermission) {
+
+            await permissionService.update(publicPermission.uuid, {
+                name: publicAccess.enabled ? publicAccess.permissions : PermissionLevel.NONE
+            });
+
+        } else {
+
+            await permissionService.create({
+                ownerUuid: user.uuid,
+                headUuid: dialog.data,
+                tailUuid: getPublicGroupUuid(state),
+                name: publicAccess.enabled ? publicAccess.permissions : PermissionLevel.NONE
+            });
+        }
+    }
+};
+
+const sendInvitations = async (dispatch: Dispatch, getState: () => RootState, { permissionService }: 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 promises = invitations.invitedPeople
+            .map(person => ({
+                ownerUuid: user.uuid,
+                headUuid: dialog.data,
+                tailUuid: person.uuid,
+                name: invitations.permissions
+            }))
+            .map(data => permissionService.create(data));
+
+        await Promise.all(promises);
+    }
+};
+
+export const hasChanges = (state: RootState) =>
+    isDirty(SHARING_PUBLIC_ACCESS_FORM_NAME)(state) ||
+    isDirty(SHARING_MANAGEMENT_FORM_NAME)(state) ||
+    isDirty(SHARING_INVITATION_FORM_NAME)(state);
index e8f0794861ad2d168b04b5cbc634ba76e9d745a7..634e9758ede5bdf9a66e627dbe6759bb06648d09 100644 (file)
@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { PermissionLevel } from '~/models/permission';
-import { SharingManagementForm } from '../../views-components/sharing-dialog/sharing-management-form';
 
 export const SHARING_DIALOG_NAME = 'SHARING_DIALOG_NAME';
 export const SHARING_PUBLIC_ACCESS_FORM_NAME = 'SHARING_PUBLIC_ACCESS_FORM_NAME';
@@ -12,7 +11,7 @@ export const SHARING_INVITATION_FORM_NAME = 'SHARING_INVITATION_FORM_NAME';
 
 export interface SharingPublicAccessFormData {
     enabled: boolean;
-    permission: PermissionLevel;
+    permissions: PermissionLevel;
 }
 
 export interface SharingManagementFormData {
@@ -21,7 +20,7 @@ export interface SharingManagementFormData {
 
 export interface SharingManagementFormDataRow {
     email: string;
-    permission: PermissionLevel;
+    permissions: PermissionLevel;
 }
 
 export interface SharingInvitationFormData {
index ca72e5a51a474fc8134d7f7aa6d144bb5a28bd9c..cc2469d779375342f581d427a4c3322bfee958fa 100644 (file)
@@ -10,6 +10,7 @@ import { propertiesActions } from '~/store/properties/properties-actions';
 import { getResource } from '../resources/resources';
 import { getProperty } from '~/store/properties/properties';
 import { WorkflowResource } from '../../models/workflow';
+import { ResourceObjectType } from '~/models/resource';
 
 export const WORKFLOW_PANEL_ID = "workflowPanel";
 const UUID_PREFIX_PROPERTY_NAME = 'uuidPrefix';
@@ -28,6 +29,15 @@ export const getUuidPrefix = (state: RootState) => {
     return state.properties.uuidPrefix;
 };
 
+export const getPublicUserUuid = (state: RootState) => {
+    const prefix = getProperty<string>(UUID_PREFIX_PROPERTY_NAME)(state.properties);
+    return `${prefix}-tpzed-anonymouspublic`;
+};
+export const getPublicGroupUuid = (state: RootState) => {
+    const prefix = getProperty<string>(UUID_PREFIX_PROPERTY_NAME)(state.properties);
+    return `${prefix}-j7d0g-anonymouspublic`;
+};
+
 export const showWorkflowDetails = (uuid: string) =>
     propertiesActions.SET_PROPERTY({ key: WORKFLOW_PANEL_DETAILS_UUID, value: uuid });
 
index 80b5effeef17597cf80a4dd62c529412308dfbd0..e3ccb2dd9139cbbce5981e81261019699ff1686c 100644 (file)
@@ -27,7 +27,7 @@ export const collectionActionSet: ContextMenuActionSet = [[
         icon: ShareIcon,
         name: "Share",
         execute: (dispatch, { uuid }) => {
-            dispatch(openSharingDialog(uuid));
+            dispatch<any>(openSharingDialog(uuid));
         }
     },
     {
index 85848a2d6b3e9ec4ed09b258b0128b7b9167b96a..63ea3b559a1919d7433526434230b6d47e86f017 100644 (file)
@@ -13,6 +13,8 @@ import { openProjectUpdateDialog } from '~/store/projects/project-update-actions
 import { ToggleTrashAction } from "~/views-components/context-menu/actions/trash-action";
 import { toggleProjectTrashed } from "~/store/trash/trash-actions";
 import { detailsPanelActions } from '~/store/details-panel/details-panel-action';
+import { ShareIcon } from '~/components/icon/icon';
+import { openSharingDialog } from "~/store/sharing-dialog/sharing-dialog-actions";
 
 export const projectActionSet: ContextMenuActionSet = [[
     {
@@ -29,6 +31,13 @@ export const projectActionSet: ContextMenuActionSet = [[
             dispatch<any>(openProjectUpdateDialog(resource));
         }
     },
+    {
+        icon: ShareIcon,
+        name: "Share",
+        execute: (dispatch, { uuid }) => {
+            dispatch<any>(openSharingDialog(uuid));
+        }
+    },
     {
         component: ToggleFavoriteAction,
         execute: (dispatch, resource) => {
index b6c956e3fa777ef6aa9e899c8193bf374b0453df..b50c74c755fc7a67ef62c72fea2054f642a59d60 100644 (file)
@@ -6,29 +6,28 @@ import { compose, Dispatch } from 'redux';
 import { connect } from 'react-redux';
 
 import * as React from 'react';
-import { connectSharingDialog } from '~/store/sharing-dialog/sharing-dialog-actions';
+import { connectSharingDialog, saveSharingDialogChanges, hasChanges } from '~/store/sharing-dialog/sharing-dialog-actions';
 import { WithDialogProps } from '~/store/dialog/with-dialog';
 import { RootState } from '~/store/store';
 
 import SharingDialogComponent, { SharingDialogDataProps, SharingDialogActionProps } from './sharing-dialog-component';
 import { SharingDialogContent } from './sharing-dialog-content';
 import { connectAdvancedViewSwitch, AdvancedViewSwitchInjectedProps } from './advanced-view-switch';
-import { isDirty } from 'redux-form';
 
 const mapStateToProps = (state: RootState, { advancedViewOpen, ...props }: WithDialogProps<string> & AdvancedViewSwitchInjectedProps): SharingDialogDataProps => ({
     ...props,
-    saveEnabled: isDirty('SHARING_PUBLIC_ACCESS_FORM')(state) ||
-        isDirty('SHARING_MANAGEMENT_FORM')(state) ||
-        isDirty('SHARING_INVITATION_FORM')(state),
+    saveEnabled: hasChanges(state),
     advancedEnabled: !advancedViewOpen,
     children: <SharingDialogContent {...{ advancedViewOpen }} />,
 });
 
-const mapDispatchToProps = (_: Dispatch, { toggleAdvancedView, ...props }: WithDialogProps<string> & AdvancedViewSwitchInjectedProps): SharingDialogActionProps => ({
+const mapDispatchToProps = (dispatch: Dispatch, { toggleAdvancedView, ...props }: WithDialogProps<string> & AdvancedViewSwitchInjectedProps): SharingDialogActionProps => ({
     ...props,
     onClose: props.closeDialog,
     onExited: toggleAdvancedView,
-    onSave: () => { console.log('save'); },
+    onSave: () => {
+        dispatch<any>(saveSharingDialogChanges);
+    },
     onAdvanced: toggleAdvancedView,
 });