X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/a37c2265b5f60351bc1f50c22e74650a79110319..6b562ae2431132439e488f509d698800ee8ebe7d:/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..ca79bba4 100644 --- a/src/views-components/data-explorer/renderers.tsx +++ b/src/views-components/data-explorer/renderers.tsx @@ -9,15 +9,18 @@ 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'; export const renderName = (item: { name: string; uuid: string, kind: string }) => @@ -61,8 +64,6 @@ export 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 }) => @@ -81,23 +82,61 @@ 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`; +}; + +export 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)); + +export const resourceRunProcess = (dispatch: Dispatch, uuid: string) => { + return ( +
+ {uuid && + + dispatch(openRunProcess(uuid))}> + + + } +
+ ); +}; -export const renderWorkflowStatus = (ownerUuid?: string) => { - if (ownerUuid === PublicUuid) { +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)); + +export const renderWorkflowStatus = (uuidPrefix: string, ownerUuid?: string) => { + if (ownerUuid === getPublicUuid(uuidPrefix)) { return renderStatus(ResourceStatus.PUBLIC); } else { return renderStatus(ResourceStatus.PRIVATE); @@ -110,8 +149,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,8 +181,8 @@ 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) =>