X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b3e7292409401b24f2455fde3d323eabf1e955cc..98d1b780b15d9995ec5ef6cae25c0663702ede4f:/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 2f102a997c..52760cb404 100644 --- a/src/views-components/data-explorer/renderers.tsx +++ b/src/views-components/data-explorer/renderers.tsx @@ -3,8 +3,8 @@ // SPDX-License-Identifier: AGPL-3.0 import * as React from 'react'; -import { Grid, Typography, withStyles, Tooltip, IconButton, Checkbox, Button } from '@material-ui/core'; -import { FavoriteStar } from '../favorite-star/favorite-star'; +import { Grid, Typography, withStyles, Tooltip, IconButton, Checkbox } from '@material-ui/core'; +import { FavoriteStar, PublicFavoriteStar } 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'; @@ -25,21 +25,23 @@ 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, withResourceData } from '~/views-components/data-explorer/with-resources'; +import { withResourceData } from '~/views-components/data-explorer/with-resources'; +import { extractUuidKind } from '~/models/resource'; const renderName = (item: { name: string; uuid: string, kind: string }) => - {renderIcon(item)} + {renderIcon(item.kind)} - + {item.name} + ; @@ -50,8 +52,8 @@ export const ResourceName = connect( return resource || { name: '', uuid: '', kind: '' }; })(renderName); -const renderIcon = (item: { kind: string }) => { - switch (item.kind) { +const renderIcon = (kind: string) => { + switch (kind) { case ResourceKind.PROJECT: return ; case ResourceKind.COLLECTION: @@ -72,7 +74,7 @@ const renderDate = (date?: string) => { const renderWorkflowName = (item: { name: string; uuid: string, kind: string, ownerUuid: string }) => - {renderIcon(item)} + {renderIcon(item.kind)} @@ -191,33 +193,75 @@ export const ResourceUsername = connect( return resource || { username: '' }; })(renderUsername); -// Compute Node Resources -const renderNodeDate = (date: string) => +// Common methods +const renderCommonData = (data: string) => + {data}; + +const renderCommonDate = (date: string) => {formatDate(date)}; -const renderNodeData = (data: string) => { - return {data}; -}; +export const CommonUuid = withResourceData('uuid', renderCommonData); + +// Api Client Authorizations +export const TokenApiClientId = withResourceData('apiClientId', renderCommonData); + +export const TokenApiToken = withResourceData('apiToken', renderCommonData); + +export const TokenCreatedByIpAddress = withResourceData('createdByIpAddress', renderCommonDate); + +export const TokenDefaultOwnerUuid = withResourceData('defaultOwnerUuid', renderCommonData); + +export const TokenExpiresAt = withResourceData('expiresAt', renderCommonDate); + +export const TokenLastUsedAt = withResourceData('lastUsedAt', renderCommonDate); +export const TokenLastUsedByIpAddress = withResourceData('lastUsedByIpAddress', renderCommonData); + +export const TokenScopes = withResourceData('scopes', renderCommonData); + +export const TokenUserId = withResourceData('userId', renderCommonData); + +// Compute Node Resources const renderNodeInfo = (data: string) => { return {JSON.stringify(data, null, 4)}; }; -export const ComputeNodeInfo = withResourceData('info', renderNodeInfo); +const clusterColors = [ + ['#f44336', '#fff'], + ['#2196f3', '#fff'], + ['#009688', '#fff'], + ['#cddc39', '#fff'], + ['#ff9800', '#fff'] +]; + +export const ResourceCluster = (props: { uuid: string }) => { + const CLUSTER_ID_LENGTH = 5; + const pos = props.uuid.indexOf('-'); + const clusterId = pos >= CLUSTER_ID_LENGTH ? props.uuid.substr(0, pos) : ''; + const ci = pos >= CLUSTER_ID_LENGTH ? (props.uuid.charCodeAt(0) + props.uuid.charCodeAt(1)) % clusterColors.length : 0; + return +
{clusterId}
+
; +}; -export const ComputeNodeUuid = withResourceData('uuid', renderNodeData); +export const ComputeNodeInfo = withResourceData('info', renderNodeInfo); -export const ComputeNodeDomain = withResourceData('domain', renderNodeData); +export const ComputeNodeDomain = withResourceData('domain', renderCommonData); -export const ComputeNodeFirstPingAt = withResourceData('firstPingAt', renderNodeDate); +export const ComputeNodeFirstPingAt = withResourceData('firstPingAt', renderCommonDate); -export const ComputeNodeHostname = withResourceData('hostname', renderNodeData); +export const ComputeNodeHostname = withResourceData('hostname', renderCommonData); -export const ComputeNodeIpAddress = withResourceData('ipAddress', renderNodeData); +export const ComputeNodeIpAddress = withResourceData('ipAddress', renderCommonData); -export const ComputeNodeJobUuid = withResourceData('jobUuid', renderNodeData); +export const ComputeNodeJobUuid = withResourceData('jobUuid', renderCommonData); -export const ComputeNodeLastPingAt = withResourceData('lastPingAt', renderNodeDate); +export const ComputeNodeLastPingAt = withResourceData('lastPingAt', renderCommonDate); // Links Resources const renderLinkName = (item: { name: string }) => @@ -242,13 +286,13 @@ const renderLinkTail = (dispatch: Dispatch, item: { uuid: string, tailUuid: stri const currentLabel = resourceLabel(item.tailKind); const isUnknow = currentLabel === "Unknown"; return (
- { !isUnknow ? ( - renderLink(dispatch, item.tailUuid, currentLabel) - ) : ( + {!isUnknow ? ( + renderLink(dispatch, item.tailUuid, currentLabel) + ) : ( {item.tailUuid} - )} + )}
); };