[ARVADOS-WORKBENCH2] updated: 2.3.0-42-g705b5cc1
Git user
git at public.arvados.org
Mon Nov 29 01:28:56 UTC 2021
Summary of changes:
.../group-details-panel-actions.ts | 45 ++++++++++++++++++++++
...oup-details-panel-members-middleware-service.ts | 3 ++
src/store/resources/resources-actions.ts | 2 +
src/views-components/data-explorer/renderers.tsx | 39 +++++++++++++++++--
.../group-details-panel/group-details-panel.tsx | 10 ++++-
5 files changed, 95 insertions(+), 4 deletions(-)
via 705b5cc1072bfb178195a90091e6d3dc120d193d (commit)
from 103a2d417eb9dfae62cb72385de5e8d836bb15e9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 705b5cc1072bfb178195a90091e6d3dc120d193d
Author: Stephen Smith <stephen at curii.com>
Date: Sun Nov 28 20:28:41 2021 -0500
18123: Add active toggle to group member list.
Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>
diff --git a/src/store/group-details-panel/group-details-panel-actions.ts b/src/store/group-details-panel/group-details-panel-actions.ts
index 6f594de0..43349fa9 100644
--- a/src/store/group-details-panel/group-details-panel-actions.ts
+++ b/src/store/group-details-panel/group-details-panel-actions.ts
@@ -18,6 +18,8 @@ import { ServiceRepository } from 'services/services';
import { PermissionResource, PermissionLevel } from 'models/permission';
import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions';
import { PermissionSelectValue, parsePermissionLevel, formatPermissionLevel } from 'views-components/sharing-dialog/permission-select';
+import { LinkResource } from 'models/link';
+import { deleteResources } from 'store/resources/resources-actions';
export const GROUP_DETAILS_MEMBERS_PANEL_ID = 'groupDetailsMembersPanel';
export const GROUP_DETAILS_PERMISSIONS_PANEL_ID = 'groupDetailsPermissionsPanel';
@@ -162,3 +164,46 @@ export const removeGroupMember = (uuid: string) =>
}
};
+
+export const setMemberIsHidden = (memberLinkUuid: string, permissionLinkUuid: string, hide: boolean) =>
+ async (dispatch: Dispatch, getState: () => RootState, { permissionService }: ServiceRepository) => {
+ const memberLink = getResource<LinkResource>(memberLinkUuid)(getState().resources);
+
+ if (hide && permissionLinkUuid) {
+ // Remove read permission
+ try {
+ await permissionService.delete(permissionLinkUuid);
+ dispatch<any>(deleteResources([permissionLinkUuid]));
+ dispatch(snackbarActions.OPEN_SNACKBAR({
+ message: 'Removed read permission.',
+ hideDuration: 2000,
+ kind: SnackbarKind.SUCCESS,
+ }));
+ } catch (e) {
+ dispatch(snackbarActions.OPEN_SNACKBAR({
+ message: 'Failed to remove permission',
+ kind: SnackbarKind.ERROR,
+ }));
+ }
+ } else if (!hide && memberLink) {
+ // Create read permission
+ try {
+ await permissionService.create({
+ headUuid: memberLink.tailUuid,
+ tailUuid: memberLink.headUuid,
+ name: PermissionLevel.CAN_READ,
+ });
+ dispatch(snackbarActions.OPEN_SNACKBAR({
+ message: 'Created read permission.',
+ hideDuration: 2000,
+ kind: SnackbarKind.SUCCESS,
+ }));
+ dispatch(GroupPermissionsPanelActions.REQUEST_ITEMS());
+ } catch(e) {
+ dispatch(snackbarActions.OPEN_SNACKBAR({
+ message: 'Failed to create permission',
+ kind: SnackbarKind.ERROR,
+ }));
+ }
+ }
+ };
diff --git a/src/store/group-details-panel/group-details-panel-members-middleware-service.ts b/src/store/group-details-panel/group-details-panel-members-middleware-service.ts
index 36e3c735..e6f18f7f 100644
--- a/src/store/group-details-panel/group-details-panel-members-middleware-service.ts
+++ b/src/store/group-details-panel/group-details-panel-members-middleware-service.ts
@@ -27,6 +27,9 @@ export class GroupDetailsPanelMembersMiddlewareService extends DataExplorerMiddl
api.dispatch(groupsDetailsPanelDataExplorerIsNotSet());
} else {
try {
+ const groupResource = await this.services.groupsService.get(groupUuid);
+ api.dispatch(updateResources([groupResource]));
+
const permissionsIn = await this.services.permissionService.list({
filters: new FilterBuilder()
.addEqual('head_uuid', groupUuid)
diff --git a/src/store/resources/resources-actions.ts b/src/store/resources/resources-actions.ts
index cdb76e0b..6c05da32 100644
--- a/src/store/resources/resources-actions.ts
+++ b/src/store/resources/resources-actions.ts
@@ -18,6 +18,8 @@ export type ResourcesAction = UnionOf<typeof resourcesActions>;
export const updateResources = (resources: Resource[]) => resourcesActions.SET_RESOURCES(resources);
+export const deleteResources = (resources: string[]) => resourcesActions.DELETE_RESOURCES(resources);
+
export const loadResource = (uuid: string, showErrors?: boolean) =>
async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
try {
diff --git a/src/views-components/data-explorer/renderers.tsx b/src/views-components/data-explorer/renderers.tsx
index 61086bd8..44326a85 100644
--- a/src/views-components/data-explorer/renderers.tsx
+++ b/src/views-components/data-explorer/renderers.tsx
@@ -11,7 +11,7 @@ import { formatDate, formatFileSize, formatTime } from 'common/formatters';
import { resourceLabel } from 'common/labels';
import { connect, DispatchProp } from 'react-redux';
import { RootState } from 'store/store';
-import { getResource } from 'store/resources/resources';
+import { getResource, filterResources } from 'store/resources/resources';
import { GroupContentsResource } from 'services/groups-service/groups-service';
import { getProcess, Process, getProcessStatus, getProcessStatusColor, getProcessRuntime } from 'store/processes/process';
import { ArvadosTheme } from 'common/custom-theme';
@@ -22,14 +22,15 @@ import { getUuidPrefix, openRunProcess } from 'store/workflow-panel/workflow-pan
import { openSharingDialog } from 'store/sharing-dialog/sharing-dialog-actions';
import { getUserFullname, getUserDisplayName, User, UserResource } from 'models/user';
import { toggleIsActive, toggleIsAdmin } from 'store/users/users-actions';
-import { LinkResource } from 'models/link';
+import { LinkClass, LinkResource } from 'models/link';
import { navigateTo, navigateToGroupDetails } from 'store/navigation/navigation-action';
import { withResourceData } from 'views-components/data-explorer/with-resources';
import { CollectionResource } from 'models/collection';
import { IllegalNamingWarning } from 'components/warning/warning';
import { loadResource } from 'store/resources/resources-actions';
-import { GroupClass } from 'models/group';
+import { GroupClass, GroupResource } from 'models/group';
import { openRemoveGroupMemberDialog, openEditPermissionLevelDialog } from 'store/group-details-panel/group-details-panel-actions';
+import { setMemberIsHidden } from 'store/group-details-panel/group-details-panel-actions';
import { formatPermissionLevel } from 'views-components/sharing-dialog/permission-select';
import { PermissionLevel } from 'models/permission';
@@ -212,6 +213,38 @@ export const ResourceLinkTailIsActive = connect(
}, { toggleIsActive }
)(renderIsActive);
+const renderIsHidden = (props: { memberLinkUuid: string, permissionLinkUuid: string, hidden: boolean, setMemberIsHidden: (memberLinkUuid: string, permissionLinkUuid: string, hide: boolean) => void }) => {
+ if (props.memberLinkUuid) {
+ return <Checkbox
+ color="primary"
+ checked={props.hidden}
+ onClick={() => props.setMemberIsHidden(props.memberLinkUuid, props.permissionLinkUuid, !props.hidden)} />;
+ } else {
+ return <Typography />;
+ }
+}
+
+export const ResourceLinkTailIsHidden = connect(
+ (state: RootState, props: { uuid: string }) => {
+ const link = getResource<LinkResource>(props.uuid)(state.resources);
+ const member = getResource<Resource>(link?.tailUuid || '')(state.resources);
+ const group = getResource<GroupResource>(link?.headUuid || '')(state.resources);
+ const permissions = filterResources((resource: LinkResource) => {
+ return resource.linkClass === LinkClass.PERMISSION
+ && resource.headUuid === link?.tailUuid
+ && resource.tailUuid === group?.uuid
+ && resource.name === PermissionLevel.CAN_READ;
+ })(state.resources);
+
+ const permissionLinkUuid = permissions.length > 0 ? permissions[0].uuid : '';
+ const isVisible = link && group && permissions.length > 0;
+
+ return member?.kind === ResourceKind.USER
+ ? { memberLinkUuid: link?.uuid, permissionLinkUuid, hidden: !isVisible }
+ : { memberLinkUuid: '', permissionLinkUuid: '', hidden: false};
+ }, { setMemberIsHidden }
+)(renderIsHidden);
+
const renderIsAdmin = (props: { uuid: string, isAdmin: boolean, toggleIsAdmin: (uuid: string) => void }) =>
<Checkbox
color="primary"
diff --git a/src/views/group-details-panel/group-details-panel.tsx b/src/views/group-details-panel/group-details-panel.tsx
index 427f4fb8..7c173b27 100644
--- a/src/views/group-details-panel/group-details-panel.tsx
+++ b/src/views/group-details-panel/group-details-panel.tsx
@@ -7,7 +7,7 @@ import { connect } from 'react-redux';
import { DataExplorer } from "views-components/data-explorer/data-explorer";
import { DataColumns } from 'components/data-table/data-table';
-import { ResourceLinkHeadUuid, ResourceLinkTailUuid, ResourceLinkTailEmail, ResourceLinkTailUsername, ResourceLinkHeadPermissionLevel, ResourceLinkTailPermissionLevel, ResourceLinkHead, ResourceLinkTail, ResourceLinkDelete, ResourceLinkTailIsActive } from 'views-components/data-explorer/renderers';
+import { ResourceLinkHeadUuid, ResourceLinkTailUuid, ResourceLinkTailEmail, ResourceLinkTailUsername, ResourceLinkHeadPermissionLevel, ResourceLinkTailPermissionLevel, ResourceLinkHead, ResourceLinkTail, ResourceLinkDelete, ResourceLinkTailIsActive, ResourceLinkTailIsHidden } from 'views-components/data-explorer/renderers';
import { createTree } from 'models/tree';
import { noop } from 'lodash/fp';
import { RootState } from 'store/store';
@@ -26,6 +26,7 @@ export enum GroupDetailsPanelMembersColumnNames {
USERNAME = "Username",
EMAIL = "Email",
ACTIVE = "User Active",
+ HIDDEN = "Member Hidden",
PERMISSION = "Permission",
UUID = "UUID",
REMOVE = "Remove",
@@ -67,6 +68,13 @@ export const groupDetailsMembersPanelColumns: DataColumns<string> = [
filters: createTree(),
render: uuid => <ResourceLinkTailIsActive uuid={uuid} />
},
+ {
+ name: GroupDetailsPanelMembersColumnNames.HIDDEN,
+ selected: true,
+ configurable: true,
+ filters: createTree(),
+ render: uuid => <ResourceLinkTailIsHidden uuid={uuid} />
+ },
{
name: GroupDetailsPanelMembersColumnNames.PERMISSION,
selected: true,
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list