15672: Fixes some code styling.
authorLucas Di Pentima <lucas@di-pentima.com.ar>
Fri, 20 Dec 2019 20:15:36 +0000 (17:15 -0300)
committerLucas Di Pentima <lucas@di-pentima.com.ar>
Fri, 20 Dec 2019 20:15:36 +0000 (17:15 -0300)
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@di-pentima.com.ar>

src/store/group-details-panel/group-details-panel-middleware-service.ts
src/store/groups-panel/groups-panel-actions.ts
src/store/groups-panel/groups-panel-middleware-service.ts

index 7e4d6c5168e3d336f216fc5970f77ebe6d2b1e15..94f78a58e75116e32febd2164a6a346508a40fa4 100644 (file)
@@ -20,48 +20,31 @@ export class GroupDetailsPanelMiddlewareService extends DataExplorerMiddlewareSe
     }
 
     async requestItems(api: MiddlewareAPI<Dispatch, RootState>) {
-
         const dataExplorer = getDataExplorer(api.getState().dataExplorer, this.getId());
         const groupUuid = getCurrentGroupDetailsPanelUuid(api.getState().properties);
-
         if (!dataExplorer || !groupUuid) {
-
             api.dispatch(groupsDetailsPanelDataExplorerIsNotSet());
-
         } else {
-
             try {
-
                 const permissions = await this.services.permissionService.list({
-
                     filters: new FilterBuilder()
                         .addEqual('tail_uuid', groupUuid)
                         .addEqual('link_class', LinkClass.PERMISSION)
                         .getFilters()
-
                 });
-
                 api.dispatch(updateResources(permissions.items));
-
                 const users = await this.services.userService.list({
-
                     filters: new FilterBuilder()
                         .addIn('uuid', permissions.items.map(item => item.headUuid))
                         .getFilters()
-
                 });
-
                 api.dispatch(GroupDetailsPanelActions.SET_ITEMS({
                     ...listResultsToDataExplorerItemsMeta(permissions),
                     items: users.items.map(item => item.uuid),
                 }));
-
                 api.dispatch(updateResources(users.items));
-
             } catch (e) {
-
                 api.dispatch(couldNotFetchGroupDetailsContents());
-
             }
         }
     }
index cbeecbd7b788fd41fa7d7177579aa7eb47feee39..35ec413c0ed1378b4671929baaed62d29319a9ba 100644 (file)
@@ -70,24 +70,17 @@ export interface CreateGroupFormData {
 
 export const createGroup = ({ name, users = [] }: CreateGroupFormData) =>
     async (dispatch: Dispatch, _: {}, { groupsService, permissionService }: ServiceRepository) => {
-
         dispatch(startSubmit(CREATE_GROUP_FORM));
-
         try {
-
             const newGroup = await groupsService.create({ name });
-
             for (const user of users) {
-
                 await addGroupMember({
                     user,
                     group: newGroup,
                     dispatch,
                     permissionService,
                 });
-
             }
-
             dispatch(dialogActions.CLOSE_DIALOG({ id: CREATE_GROUP_DIALOG }));
             dispatch(reset(CREATE_GROUP_FORM));
             dispatch(loadGroupsPanel());
@@ -95,18 +88,13 @@ export const createGroup = ({ name, users = [] }: CreateGroupFormData) =>
                 message: `${newGroup.name} group has been created`,
                 kind: SnackbarKind.SUCCESS
             }));
-
             return newGroup;
-
         } catch (e) {
-
             const error = getCommonResourceServiceError(e);
             if (error === CommonResourceServiceError.UNIQUE_NAME_VIOLATION) {
                 dispatch(stopSubmit(CREATE_GROUP_FORM, { name: 'Group with the same name already exists.' } as FormErrors));
             }
-
             return;
-
         }
     };
 
@@ -124,14 +112,12 @@ interface AddGroupMemberArgs {
  * [Permission model docs](https://doc.arvados.org/api/permission-model.html)
  */
 export const addGroupMember = async ({ user, group, ...args }: AddGroupMemberArgs) => {
-
     await createPermission({
         head: { ...user },
         tail: { ...group },
         permissionLevel: PermissionLevel.CAN_READ,
         ...args,
     });
-
 };
 
 interface CreatePermissionLinkArgs {
@@ -143,24 +129,18 @@ interface CreatePermissionLinkArgs {
 }
 
 const createPermission = async ({ head, tail, permissionLevel, dispatch, permissionService }: CreatePermissionLinkArgs) => {
-
     try {
-
         await permissionService.create({
             tailUuid: tail.uuid,
             headUuid: head.uuid,
             name: permissionLevel,
         });
-
     } catch (e) {
-
         dispatch(snackbarActions.OPEN_SNACKBAR({
             message: `Could not add ${tail.name} -> ${head.name} relation`,
             kind: SnackbarKind.ERROR,
         }));
-
     }
-
 };
 
 interface DeleteGroupMemberArgs {
@@ -171,13 +151,11 @@ interface DeleteGroupMemberArgs {
 }
 
 export const deleteGroupMember = async ({ user, group, ...args }: DeleteGroupMemberArgs) => {
-
     await deletePermission({
         tail: group,
         head: user,
         ...args,
     });
-
 };
 
 interface DeletePermissionLinkArgs {
@@ -188,38 +166,23 @@ interface DeletePermissionLinkArgs {
 }
 
 export const deletePermission = async ({ head, tail, dispatch, permissionService }: DeletePermissionLinkArgs) => {
-
     try {
-
         const permissionsResponse = await permissionService.list({
-
             filters: new FilterBuilder()
                 .addEqual('tail_uuid', tail.uuid)
                 .addEqual('head_uuid', head.uuid)
                 .getFilters()
-
         });
-
         const [permission] = permissionsResponse.items;
-
         if (permission) {
-
             await permissionService.delete(permission.uuid);
-
         } else {
-
             throw new Error('Permission not found');
-
         }
-
-
     } catch (e) {
-
         dispatch(snackbarActions.OPEN_SNACKBAR({
             message: `Could not delete ${tail.name} -> ${head.name} relation`,
             kind: SnackbarKind.ERROR,
         }));
-
     }
-
 };
\ No newline at end of file
index 3c707eed22072ca1d8f0252b635e0badf05c08d1..f1576a23bdffdf26c43538ba151b6f3b1b278619 100644 (file)
@@ -17,23 +17,15 @@ import { SortDirection } from '~/components/data-table/data-column';
 import { GroupsPanelColumnNames } from '~/views/groups-panel/groups-panel';
 
 export class GroupsPanelMiddlewareService extends DataExplorerMiddlewareService {
-
     constructor(private services: ServiceRepository, id: string) {
         super(id);
     }
-
     async requestItems(api: MiddlewareAPI<Dispatch, RootState>) {
-
         const dataExplorer = getDataExplorer(api.getState().dataExplorer, this.getId());
-
         if (!dataExplorer) {
-
             api.dispatch(groupsPanelDataExplorerIsNotSet());
-
         } else {
-
             try {
-
                 const order = new OrderBuilder<GroupResource>();
                 const sortColumn = getSortColumn(dataExplorer);
                 if (sortColumn) {
@@ -41,44 +33,31 @@ export class GroupsPanelMiddlewareService extends DataExplorerMiddlewareService
                         sortColumn.sortDirection === SortDirection.ASC && sortColumn.name === GroupsPanelColumnNames.GROUP
                             ? OrderDirection.ASC
                             : OrderDirection.DESC;
-
                     order.addOrder(direction, 'name');
                 }
-
                 const filters = new FilterBuilder()
                     .addNotIn('group_class', [GroupClass.PROJECT])
                     .addILike('name', dataExplorer.searchValue)
                     .getFilters();
-
                 const response = await this.services.groupsService
                     .list({
                         ...dataExplorerToListParams(dataExplorer),
                         filters,
                         order: order.getOrder(),
                     });
-
                 api.dispatch(updateResources(response.items));
-
                 api.dispatch(GroupsPanelActions.SET_ITEMS({
                     ...listResultsToDataExplorerItemsMeta(response),
                     items: response.items.map(item => item.uuid),
                 }));
-
                 const permissions = await this.services.permissionService.list({
-
                     filters: new FilterBuilder()
                         .addIn('tail_uuid', response.items.map(item => item.uuid))
                         .getFilters()
-
                 });
-
                 api.dispatch(updateResources(permissions.items));
-
-
             } catch (e) {
-
                 api.dispatch(couldNotFetchFavoritesContents());
-
             }
         }
     }