X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/fe815aabd15db10f2f9437db82104c4272bcb38e..6e0c6489bc761bac498ff4a77dc1bcd777594c67:/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 39fc536b..b74e8af1 100644 --- a/src/views-components/data-explorer/renderers.tsx +++ b/src/views-components/data-explorer/renderers.tsx @@ -3,23 +3,31 @@ // SPDX-License-Identifier: AGPL-3.0 import * as React from 'react'; -import { Grid, Typography, withStyles, Tooltip, IconButton } from '@material-ui/core'; +import { Grid, Typography, withStyles, Tooltip, IconButton, Checkbox, Button } from '@material-ui/core'; import { FavoriteStar } from '../favorite-star/favorite-star'; import { ResourceKind, TrashableResource } from '~/models/resource'; import { ProjectIcon, CollectionIcon, ProcessIcon, DefaultIcon, WorkflowIcon, ShareIcon } from '~/components/icon/icon'; import { formatDate, formatFileSize } from '~/common/formatters'; import { resourceLabel } from '~/common/labels'; -import { connect } from 'react-redux'; +import { connect, DispatchProp } from 'react-redux'; import { RootState } from '~/store/store'; import { getResource } from '~/store/resources/resources'; import { GroupContentsResource } from '~/services/groups-service/groups-service'; import { getProcess, Process, getProcessStatus, getProcessStatusColor } from '~/store/processes/process'; import { ArvadosTheme } from '~/common/custom-theme'; -import { compose } from 'redux'; +import { compose, Dispatch } from 'redux'; import { WorkflowResource } from '~/models/workflow'; -import { ResourceStatus } from '~/views/workflow-panel/workflow-panel'; +import { ResourceStatus } from '~/views/workflow-panel/workflow-panel-view'; +import { getUuidPrefix, openRunProcess } from '~/store/workflow-panel/workflow-panel-actions'; +import { getResourceData } from "~/store/resources-data/resources-data"; +import { openSharingDialog } from '~/store/sharing-dialog/sharing-dialog-actions'; +import { UserResource } from '~/models/user'; +import { toggleIsActive, toggleIsAdmin } from '~/store/users/users-actions'; +import { LinkResource } from '~/models/link'; +import { navigateTo } from '~/store/navigation/navigation-action'; +import { withResource, getDataFromResource } from './with-resources'; -export const renderName = (item: { name: string; uuid: string, kind: string }) => +const renderName = (item: { name: string; uuid: string, kind: string }) => {renderIcon(item)} @@ -42,7 +50,7 @@ export const ResourceName = connect( return resource || { name: '', uuid: '', kind: '' }; })(renderName); -export const renderIcon = (item: { kind: string }) => { +const renderIcon = (item: { kind: string }) => { switch (item.kind) { case ResourceKind.PROJECT: return ; @@ -57,13 +65,11 @@ export const renderIcon = (item: { kind: string }) => { } }; -export const renderDate = (date?: string) => { +const renderDate = (date?: string) => { return {formatDate(date)}; }; -export const PublicUuid = 'qr1hi-tpzed-anonymouspublic'; - -export const renderWorkflowName = (item: { name: string; uuid: string, kind: string, ownerUuid: string }) => +const renderWorkflowName = (item: { name: string; uuid: string, kind: string, ownerUuid: string }) => {renderIcon(item)} @@ -81,23 +87,228 @@ export const RosurceWorkflowName = connect( return resource || { name: '', uuid: '', kind: '', ownerUuid: '' }; })(renderWorkflowName); -// do share onClick -export const resourceShare = (props: { ownerUuid: string }) => { - return - undefined}> - {props.ownerUuid === PublicUuid ? : null} - - ; +const getPublicUuid = (uuidPrefix: string) => { + return `${uuidPrefix}-tpzed-anonymouspublic`; +}; + +const resourceShare = (dispatch: Dispatch, uuidPrefix: string, ownerUuid?: string, uuid?: string) => { + const isPublic = ownerUuid === getPublicUuid(uuidPrefix); + return ( +
+ {!isPublic && uuid && + + dispatch(openSharingDialog(uuid))}> + + + + } +
+ ); }; export const ResourceShare = connect( (state: RootState, props: { uuid: string }) => { const resource = getResource(props.uuid)(state.resources); - return resource || { ownerUuid: '' }; - })(resourceShare); + const uuidPrefix = getUuidPrefix(state); + return { + uuid: resource ? resource.uuid : '', + ownerUuid: resource ? resource.ownerUuid : '', + uuidPrefix + }; + })((props: { ownerUuid?: string, uuidPrefix: string, uuid?: string } & DispatchProp) => + resourceShare(props.dispatch, props.uuidPrefix, props.ownerUuid, props.uuid)); + +const renderFirstName = (item: { firstName: string }) => { + return {item.firstName}; +}; + +// User Resources +export const ResourceFirstName = connect( + (state: RootState, props: { uuid: string }) => { + const resource = getResource(props.uuid)(state.resources); + return resource || { firstName: '' }; + })(renderFirstName); + +const renderLastName = (item: { lastName: string }) => + {item.lastName}; + +export const ResourceLastName = connect( + (state: RootState, props: { uuid: string }) => { + const resource = getResource(props.uuid)(state.resources); + return resource || { lastName: '' }; + })(renderLastName); + +const renderUuid = (item: { uuid: string }) => + {item.uuid}; + +export const ResourceUuid = connect( + (state: RootState, props: { uuid: string }) => { + const resource = getResource(props.uuid)(state.resources); + return resource || { uuid: '' }; + })(renderUuid); + +const renderEmail = (item: { email: string }) => + {item.email}; + +export const ResourceEmail = connect( + (state: RootState, props: { uuid: string }) => { + const resource = getResource(props.uuid)(state.resources); + return resource || { email: '' }; + })(renderEmail); + +const renderIsActive = (props: { uuid: string, isActive: boolean, toggleIsActive: (uuid: string) => void }) => + props.toggleIsActive(props.uuid)} />; + +export const ResourceIsActive = connect( + (state: RootState, props: { uuid: string }) => { + const resource = getResource(props.uuid)(state.resources); + return resource || { isActive: false }; + }, { toggleIsActive } +)(renderIsActive); + +const renderIsAdmin = (props: { uuid: string, isAdmin: boolean, toggleIsAdmin: (uuid: string) => void }) => + props.toggleIsAdmin(props.uuid)} />; + +export const ResourceIsAdmin = connect( + (state: RootState, props: { uuid: string }) => { + const resource = getResource(props.uuid)(state.resources); + return resource || { isAdmin: false }; + }, { toggleIsAdmin } +)(renderIsAdmin); + +const renderUsername = (item: { username: string }) => + {item.username}; + +export const ResourceUsername = connect( + (state: RootState, props: { uuid: string }) => { + const resource = getResource(props.uuid)(state.resources); + return resource || { username: '' }; + })(renderUsername); + +// Compute Node Resources +const renderNodeDate = (date: string) => + {formatDate(date)}; + +const renderNodeData = (data: string) => { + return {data}; +}; + +const renderNodeInfo = (data: string) => { + return {JSON.stringify(data, null, 4)}; +}; + +export const ComputeNodeInfo = withResource(({ resource }) => renderNodeInfo(getDataFromResource('info', resource))); -export const renderWorkflowStatus = (ownerUuid?: string) => { - if (ownerUuid === PublicUuid) { +export const ComputeNodeUuid = withResource(({ resource }) => renderNodeData(getDataFromResource('uuid', resource))); + +export const ComputeNodeDomain = withResource(({ resource }) => renderNodeData(getDataFromResource('domain', resource))); + +export const ComputeNodeFirstPingAt = withResource(({ resource }) => renderNodeDate(getDataFromResource('firstPingAt', resource))); + +export const ComputeNodeHostname = withResource(({ resource }) => renderNodeData(getDataFromResource('hostname', resource))); + +export const ComputeNodeIpAddress = withResource(({ resource }) => renderNodeData(getDataFromResource('ipAddress', resource))); + +export const ComputeNodeJobUuid = withResource(({ resource }) => renderNodeData(getDataFromResource('jobUuid', resource))); + +export const ComputeNodeLastPingAt = withResource(({ resource }) => renderNodeDate(getDataFromResource('lastPingAt', resource))); + +// Links Resources +const renderLinkName = (item: { name: string }) => + {item.name || '(none)'}; + +export const ResourceLinkName = connect( + (state: RootState, props: { uuid: string }) => { + const resource = getResource(props.uuid)(state.resources); + return resource || { name: '' }; + })(renderLinkName); + +const renderLinkClass = (item: { linkClass: string }) => + {item.linkClass}; + +export const ResourceLinkClass = connect( + (state: RootState, props: { uuid: string }) => { + const resource = getResource(props.uuid)(state.resources); + return resource || { linkClass: '' }; + })(renderLinkClass); + +const renderLinkTail = (dispatch: Dispatch, item: { uuid: string, tailUuid: string, tailKind: string }) => { + const currentLabel = resourceLabel(item.tailKind); + const isUnknow = currentLabel === "Unknown"; + return (
+ { !isUnknow ? ( + renderLink(dispatch, item.tailUuid, currentLabel) + ) : ( + + {item.tailUuid} + + )} +
); +}; + +const renderLink = (dispatch: Dispatch, uuid: string, label: string) => + dispatch(navigateTo(uuid))}> + {label}: {uuid} + ; + +export const ResourceLinkTail = connect( + (state: RootState, props: { uuid: string }) => { + const resource = getResource(props.uuid)(state.resources); + return { + item: resource || { uuid: '', tailUuid: '', tailKind: ResourceKind.NONE } + }; + })((props: { item: any } & DispatchProp) => + renderLinkTail(props.dispatch, props.item)); + +const renderLinkHead = (dispatch: Dispatch, item: { uuid: string, headUuid: string, headKind: ResourceKind }) => + renderLink(dispatch, item.headUuid, resourceLabel(item.headKind)); + +export const ResourceLinkHead = connect( + (state: RootState, props: { uuid: string }) => { + const resource = getResource(props.uuid)(state.resources); + return { + item: resource || { uuid: '', headUuid: '', headKind: ResourceKind.NONE } + }; + })((props: { item: any } & DispatchProp) => + renderLinkHead(props.dispatch, props.item)); + +export const ResourceLinkUuid = connect( + (state: RootState, props: { uuid: string }) => { + const resource = getResource(props.uuid)(state.resources); + return resource || { uuid: '' }; + })(renderUuid); + +// Process Resources +const resourceRunProcess = (dispatch: Dispatch, uuid: string) => { + return ( +
+ {uuid && + + dispatch(openRunProcess(uuid))}> + + + } +
+ ); +}; + +export const ResourceRunProcess = connect( + (state: RootState, props: { uuid: string }) => { + const resource = getResource(props.uuid)(state.resources); + return { + uuid: resource ? resource.uuid : '' + }; + })((props: { uuid: string } & DispatchProp) => + resourceRunProcess(props.dispatch, props.uuid)); + +const renderWorkflowStatus = (uuidPrefix: string, ownerUuid?: string) => { + if (ownerUuid === getPublicUuid(uuidPrefix)) { return renderStatus(ResourceStatus.PUBLIC); } else { return renderStatus(ResourceStatus.PRIVATE); @@ -110,8 +321,12 @@ const renderStatus = (status: string) => export const ResourceWorkflowStatus = connect( (state: RootState, props: { uuid: string }) => { const resource = getResource(props.uuid)(state.resources); - return { ownerUuid: resource ? resource.ownerUuid : '' }; - })((props: { ownerUuid?: string }) => renderWorkflowStatus(props.ownerUuid)); + const uuidPrefix = getUuidPrefix(state); + return { + ownerUuid: resource ? resource.ownerUuid : '', + uuidPrefix + }; + })((props: { ownerUuid?: string, uuidPrefix: string }) => renderWorkflowStatus(props.uuidPrefix, props.ownerUuid)); export const ResourceLastModifiedDate = connect( (state: RootState, props: { uuid: string }) => { @@ -138,11 +353,11 @@ export const renderFileSize = (fileSize?: number) => export const ResourceFileSize = connect( (state: RootState, props: { uuid: string }) => { - const resource = getResource(props.uuid)(state.resources); - return {}; + const resource = getResourceData(props.uuid)(state.resourcesData); + return { fileSize: resource ? resource.fileSize : 0 }; })((props: { fileSize?: number }) => renderFileSize(props.fileSize)); -export const renderOwner = (owner: string) => +const renderOwner = (owner: string) => {owner} ; @@ -153,7 +368,7 @@ export const ResourceOwner = connect( return { owner: resource ? resource.ownerUuid : '' }; })((props: { owner: string }) => renderOwner(props.owner)); -export const renderType = (type: string) => +const renderType = (type: string) => {resourceLabel(type)} ;