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';
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 { openRemoveGroupMemberDialog, openEditPermissionLevelDialog } from 'store/group-details-panel/group-details-panel-actions';
+import { GroupClass, GroupResource } from 'models/group';
+import { openRemoveGroupMemberDialog } 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';
+import { openPermissionEditContextMenu } from 'store/context-menu/context-menu-actions';
+import { getUserUuid } from 'common/getuser';
const renderName = (dispatch: Dispatch, item: GroupContentsResource) => {
}, { 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"
</Typography>;
};
-const renderResource = (dispatch: Dispatch, item: Resource) => {
- var displayName = getResourceDisplayName(item);
-
- return <Typography variant='body2'>
- {resourceLabel(item.kind)}: {displayName || item.uuid}
- </Typography>;
-};
-
export const ResourceLinkTail = connect(
(state: RootState, props: { uuid: string }) => {
const resource = getResource<LinkResource>(props.uuid)(state.resources);
return tailResource || { uuid: '' };
})(renderUuid);
-const renderLinkDelete = (dispatch: Dispatch, item: LinkResource) => {
+const renderLinkDelete = (dispatch: Dispatch, item: LinkResource, canManage: boolean) => {
if (item.uuid) {
- return <Typography noWrap>
- <IconButton data-cy="resource-delete-button" onClick={() => dispatch<any>(openRemoveGroupMemberDialog(item.uuid))}>
- <RemoveIcon />
- </IconButton>
- </Typography>;
+ return canManage ?
+ <Typography noWrap>
+ <IconButton data-cy="resource-delete-button" onClick={() => dispatch<any>(openRemoveGroupMemberDialog(item.uuid))}>
+ <RemoveIcon />
+ </IconButton>
+ </Typography> :
+ <Typography noWrap>
+ <IconButton disabled data-cy="resource-delete-button">
+ <RemoveIcon />
+ </IconButton>
+ </Typography>;
} else {
return <Typography noWrap></Typography>;
}
(state: RootState, props: { uuid: string }) => {
const link = getResource<LinkResource>(props.uuid)(state.resources);
return {
- item: link || { uuid: '', kind: ResourceKind.NONE }
+ item: link || { uuid: '', kind: ResourceKind.NONE },
+ canManage: link && getResourceLinkCanManage(state, link),
};
- })((props: { item: LinkResource } & DispatchProp<any>) =>
- renderLinkDelete(props.dispatch, props.item));
+ })((props: { item: LinkResource
, canManage: boolean } & DispatchProp<any>) =>
+ renderLinkDelete(props.dispatch, props.item, props.canManage));
export const ResourceLinkTailEmail = connect(
(state: RootState, props: { uuid: string }) => {
return resource || { username: '' };
})(renderUsername);
-const renderPermissionLevel = (dispatch: Dispatch, link: LinkResource, resource: Resource) => {
+const renderPermissionLevel = (dispatch: Dispatch, link: LinkResource, canManage: boolean) => {
return <Typography noWrap>
{formatPermissionLevel(link.name as PermissionLevel)}
- <IconButton onClick={() => dispatch<any>(openEditPermissionLevelDialog(link.uuid, resource.uuid))}>
- <RenameIcon />
- </IconButton>
+ {canManage ?
+ <IconButton onClick={(event) => dispatch<any>(openPermissionEditContextMenu(event, link))}>
+ <RenameIcon />
+ </IconButton> :
+ ''
+ }
</Typography>;
}
export const ResourceLinkHeadPermissionLevel = connect(
(state: RootState, props: { uuid: string }) => {
const link = getResource<LinkResource>(props.uuid)(state.resources);
- const resource = getResource<Resource>(link?.headUuid || '')(state.resources);
return {
link: link || { uuid: '', name: '', kind: ResourceKind.NONE },
- resource: resource || { uuid: '', kind: ResourceKind.NONE }
+ canManage: link && getResourceLinkCanManage(state, link),
};
- })((props: { link: LinkResource,
resource: Resource } & DispatchProp<any>) =>
- renderPermissionLevel(props.dispatch, props.link, props.resource));
+ })((props: { link: LinkResource,
canManage: boolean } & DispatchProp<any>) =>
+ renderPermissionLevel(props.dispatch, props.link, props.canManage));
export const ResourceLinkTailPermissionLevel = connect(
(state: RootState, props: { uuid: string }) => {
const link = getResource<LinkResource>(props.uuid)(state.resources);
- const resource = getResource<Resource>(link?.tailUuid || '')(state.resources);
return {
link: link || { uuid: '', name: '', kind: ResourceKind.NONE },
- resource: resource || { uuid: '', kind: ResourceKind.NONE }
+ canManage: link && getResourceLinkCanManage(state, link),
};
- })((props: { link: LinkResource,
resource: Resource } & DispatchProp<any>) =>
- renderPermissionLevel(props.dispatch, props.link, props.resource));
+ })((props: { link: LinkResource,
canManage: boolean } & DispatchProp<any>) =>
+ renderPermissionLevel(props.dispatch, props.link, props.canManage));
-// Displays resource type and display name without link
-export const ResourceLabel = connect(
- (state: RootState, props: { uuid: string }) => {
- const resource = getResource<Resource>(props.uuid)(state.resources);
- return {
- item: resource || { uuid: '', kind: ResourceKind.NONE }
- };
- })((props: { item: Resource } & DispatchProp<any>) =>
- renderResource(props.dispatch, props.item));
+const getResourceLinkCanManage = (state: RootState, link: LinkResource) => {
+ const headResource = getResource<Resource>(link.headUuid)(state.resources);
+ // const tailResource = getResource<Resource>(link.tailUuid)(state.resources);
+ const userUuid = getUserUuid(state);
+
+ if (headResource && headResource.kind === ResourceKind.GROUP) {
+ return userUuid ? (headResource as GroupResource).writableBy?.includes(userUuid) : false;
+ } else {
+ // true for now
+ return true;
+ }
+}
// Process Resources
const resourceRunProcess = (dispatch: Dispatch, uuid: string) => {
projects / arvados-workbench2.git / blobdiff