X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/96fdc9e2e344e86378dd156593d8166f309ea1af..89a2555cc00f750dfa07dc57a2908059fc52c935:/src/views-components/data-explorer/renderers.tsx
diff --git a/src/views-components/data-explorer/renderers.tsx b/src/views-components/data-explorer/renderers.tsx
index 3edce4f8..7822bdc6 100644
--- a/src/views-components/data-explorer/renderers.tsx
+++ b/src/views-components/data-explorer/renderers.tsx
@@ -184,22 +184,22 @@ export const ResourceLastName = connect(
return resource || { lastName: '' };
})(renderLastName);
-const renderFullName = (dispatch: Dispatch ,item: { uuid: string, firstName: string, lastName: string }, link?: boolean) => {
+const renderFullName = (dispatch: Dispatch, item: { uuid: string, firstName: string, lastName: string }, link?: boolean) => {
const displayName = (item.firstName + " " + item.lastName).trim() || item.uuid;
return link ? dispatch(navigateToUserProfile(item.uuid))}>
- {displayName}
+ {displayName}
:
- {displayName};
+ {displayName};
}
export const UserResourceFullName = connect(
(state: RootState, props: { uuid: string, link?: boolean }) => {
const resource = getResource(props.uuid)(state.resources);
- return {item: resource || { uuid: '', firstName: '', lastName: '' }, link: props.link};
- })((props: {item: {uuid: string, firstName: string, lastName: string}, link?: boolean} & DispatchProp) => renderFullName(props.dispatch, props.item, props.link));
+ return { item: resource || { uuid: '', firstName: '', lastName: '' }, link: props.link };
+ })((props: { item: { uuid: string, firstName: string, lastName: string }, link?: boolean } & DispatchProp) => renderFullName(props.dispatch, props.item, props.link));
const renderUuid = (item: { uuid: string }) =>
@@ -208,8 +208,8 @@ const renderUuid = (item: { uuid: string }) =>
;
export const ResourceUuid = connect((state: RootState, props: { uuid: string }) => (
- getResource(props.uuid)(state.resources) || { uuid: '' }
- ))(renderUuid);
+ getResource(props.uuid)(state.resources) || { uuid: '' }
+))(renderUuid);
const renderEmail = (item: { email: string }) =>
{item.email};
@@ -227,17 +227,17 @@ enum UserAccountStatus {
UNKNOWN = ''
}
-const renderAccountStatus = (props: {status: UserAccountStatus}) =>
+const renderAccountStatus = (props: { status: UserAccountStatus }) =>
{(() => {
- switch(props.status) {
+ switch (props.status) {
case UserAccountStatus.ACTIVE:
- return ;
+ return ;
case UserAccountStatus.SETUP:
- return ;
+ return ;
case UserAccountStatus.INACTIVE:
- return ;
+ return ;
default:
return <>>;
}
@@ -262,37 +262,37 @@ const getUserAccountStatus = (state: RootState, props: { uuid: string }) => {
)(state.resources);
if (user) {
- return user.isActive ? {status: UserAccountStatus.ACTIVE} : permissions.length > 0 ? {status: UserAccountStatus.SETUP} : {status: UserAccountStatus.INACTIVE};
+ return user.isActive ? { status: UserAccountStatus.ACTIVE } : permissions.length > 0 ? { status: UserAccountStatus.SETUP } : { status: UserAccountStatus.INACTIVE };
} else {
- return {status: UserAccountStatus.UNKNOWN};
+ return { status: UserAccountStatus.UNKNOWN };
}
}
export const ResourceLinkTailAccountStatus = connect(
(state: RootState, props: { uuid: string }) => {
const link = getResource(props.uuid)(state.resources);
- return link && link.tailKind === ResourceKind.USER ? getUserAccountStatus(state, {uuid: link.tailUuid}) : {status: UserAccountStatus.UNKNOWN};
+ return link && link.tailKind === ResourceKind.USER ? getUserAccountStatus(state, { uuid: link.tailUuid }) : { status: UserAccountStatus.UNKNOWN };
})(renderAccountStatus);
export const UserResourceAccountStatus = connect(getUserAccountStatus)(renderAccountStatus);
const renderIsHidden = (props: {
- memberLinkUuid: string,
- permissionLinkUuid: string,
- visible: boolean,
- canManage: boolean,
- setMemberIsHidden: (memberLinkUuid: string, permissionLinkUuid: string, hide: boolean) => void
- }) => {
+ memberLinkUuid: string,
+ permissionLinkUuid: string,
+ visible: boolean,
+ canManage: boolean,
+ setMemberIsHidden: (memberLinkUuid: string, permissionLinkUuid: string, hide: boolean) => void
+}) => {
if (props.memberLinkUuid) {
return {
- e.stopPropagation();
- props.setMemberIsHidden(props.memberLinkUuid, props.permissionLinkUuid, !props.visible);
- }} />;
+ data-cy="user-visible-checkbox"
+ color="primary"
+ checked={props.visible}
+ disabled={!props.canManage}
+ onClick={(e) => {
+ e.stopPropagation();
+ props.setMemberIsHidden(props.memberLinkUuid, props.permissionLinkUuid, !props.visible);
+ }} />;
} else {
return ;
}
@@ -357,7 +357,7 @@ export const VirtualMachineHostname = connect(
return resource || { hostname: '' };
})(renderHostname);
-const renderVirtualMachineLogin = (login: {user: string}) =>
+const renderVirtualMachineLogin = (login: { user: string }) =>
{login.user}
export const VirtualMachineLogin = connect(
@@ -365,7 +365,7 @@ export const VirtualMachineLogin = connect(
const permission = getResource(props.linkUuid)(state.resources);
const user = getResource(permission?.tailUuid || '')(state.resources);
- return {user: user?.username || permission?.tailUuid || ''};
+ return { user: user?.username || permission?.tailUuid || '' };
})(renderVirtualMachineLogin);
// Common methods
@@ -442,7 +442,7 @@ export const ResourceLinkClass = connect(
const getResourceDisplayName = (resource: Resource): string => {
if ((resource as UserResource).kind === ResourceKind.USER
- && typeof (resource as UserResource).firstName !== 'undefined') {
+ && typeof (resource as UserResource).firstName !== 'undefined') {
// We can be sure the resource is UserResource
return getUserDisplayName(resource as UserResource);
} else {
@@ -516,7 +516,7 @@ const renderLinkDelete = (dispatch: Dispatch, item: LinkResource, canManage: boo
;
} else {
- return ;
+ return ;
}
}
@@ -530,7 +530,7 @@ export const ResourceLinkDelete = connect(
canManage: link && getResourceLinkCanManage(state, link) && !isBuiltin,
};
})((props: { item: LinkResource, canManage: boolean } & DispatchProp) =>
- renderLinkDelete(props.dispatch, props.item, props.canManage));
+ renderLinkDelete(props.dispatch, props.item, props.canManage));
export const ResourceLinkTailEmail = connect(
(state: RootState, props: { uuid: string }) => {
@@ -713,7 +713,7 @@ const userFromID =
return { uuid: props.uuid, userFullname };
});
-const ownerFromResourceId =
+const ownerFromResourceId =
compose(
connect((state: RootState, props: { uuid: string }) => {
const childResource = getResource(props.uuid)(state.resources);
@@ -722,10 +722,8 @@ const ownerFromResourceId =
userFromID
);
-export const ResourceOwnerWithName =
- compose(
- ownerFromResourceId,
- withStyles({}, { withTheme: true }))
+const _resourceWithName =
+ withStyles({}, { withTheme: true })
((props: { uuid: string, userFullname: string, dispatch: Dispatch, theme: ArvadosTheme }) => {
const { uuid, userFullname, dispatch, theme } = props;
@@ -741,6 +739,10 @@ export const ResourceOwnerWithName =
;
});
+export const ResourceOwnerWithName = ownerFromResourceId(_resourceWithName);
+
+export const ResourceWithName = userFromID(_resourceWithName);
+
export const UserNameFromID =
compose(userFromID)(
(props: { uuid: string, userFullname: string, dispatch: Dispatch }) => {
@@ -807,7 +809,7 @@ export const ResponsiblePerson =
return
{responsiblePersonName} ({uuid})
- ;
+ ;
});
const renderType = (type: string, subtype: string) =>
@@ -844,18 +846,18 @@ export const ProcessStatus = compose(
withStyles({}, { withTheme: true }))
((props: { process?: Process, theme: ArvadosTheme }) =>
props.process
- ?
- : -
+ ?
+ : -
);
export const ProcessStartDate = connect(