X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8278f352297c404e9200c92d22dce05b20ad12bc..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 9b9a5bb5c3..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,23 +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 { Link } from 'react-router-dom';
-import { NodeResource } from '../../models/node';
-import { NodeInfo } from '~/models/node';
+import { withResourceData } from '~/views-components/data-explorer/with-resources';
+import { extractUuidKind } from '~/models/resource';
 
 const renderName = (item: { name: string; uuid: string, kind: string }) =>
     <Grid container alignItems="center" wrap="nowrap" spacing={16}>
         <Grid item>
-            {renderIcon(item)}
+            {renderIcon(item.kind)}
         </Grid>
         <Grid item>
-            <Typography color="primary" style={{ width: '450px' }}>
+            <Typography color="primary" style={{ width: 'auto' }}>
                 {item.name}
             </Typography>
         </Grid>
         <Grid item>
             <Typography variant="caption">
                 <FavoriteStar resourceUuid={item.uuid} />
+                <PublicFavoriteStar resourceUuid={item.uuid} />
             </Typography>
         </Grid>
     </Grid>;
@@ -52,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 <ProjectIcon />;
         case ResourceKind.COLLECTION:
@@ -74,7 +74,7 @@ const renderDate = (date?: string) => {
 const renderWorkflowName = (item: { name: string; uuid: string, kind: string, ownerUuid: string }) =>
     <Grid container alignItems="center" wrap="nowrap" spacing={16}>
         <Grid item>
-            {renderIcon(item)}
+            {renderIcon(item.kind)}
         </Grid>
         <Grid item>
             <Typography color="primary" style={{ width: '100px' }}>
@@ -83,7 +83,7 @@ const renderWorkflowName = (item: { name: string; uuid: string, kind: string, ow
         </Grid>
     </Grid>;
 
-export const RosurceWorkflowName = connect(
+export const ResourceWorkflowName = connect(
     (state: RootState, props: { uuid: string }) => {
         const resource = getResource<WorkflowResource>(props.uuid)(state.resources);
         return resource || { name: '', uuid: '', kind: '', ownerUuid: '' };
@@ -193,59 +193,75 @@ export const ResourceUsername = connect(
         return resource || { username: '' };
     })(renderUsername);
 
-// Compute Node Resources
-const renderNodeDate = (date?: string) =>
-    <Typography noWrap>{formatDate(date) || '(none)'}</Typography>;
+// Common methods
+const renderCommonData = (data: string) =>
+    <Typography noWrap>{data}</Typography>;
+
+const renderCommonDate = (date: string) =>
+    <Typography noWrap>{formatDate(date)}</Typography>;
+
+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);
 
-const renderNodeData = (property?: string) => 
-    <Typography noWrap>{property || '(none)'}</Typography>;
+export const TokenUserId = withResourceData('userId', renderCommonData);
 
-const renderNodeInfo = (item: { info: NodeInfo }) =>
-    <Typography>
-        {JSON.stringify(item.info, null, 4)}
+// Compute Node Resources
+const renderNodeInfo = (data: string) => {
+    return <Typography>{JSON.stringify(data, null, 4)}</Typography>;
+};
+
+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 <Typography>
+        <div style={{
+            backgroundColor: clusterColors[ci][0],
+            color: clusterColors[ci][1],
+            padding: "2px 7px",
+            borderRadius: 3
+        }}>{clusterId}</div>
     </Typography>;
+};
 
-export const ResourceNodeInfo = connect(
-    (state: RootState, props: { uuid: string }) => {
-        const resource = getResource<NodeResource>(props.uuid)(state.resources);
-        return resource || { info: {} };
-    })(renderNodeInfo);
+export const ComputeNodeInfo = withResourceData('info', renderNodeInfo);
 
-export const ResourceNodeDomain = connect(
-    (state: RootState, props: { uuid: string }) => {
-        const resource = getResource<NodeResource>(props.uuid)(state.resources);
-        return { property: resource ? resource.domain : '' };
-    })((props: { property: string }) => renderNodeData(props.property));
+export const ComputeNodeDomain = withResourceData('domain', renderCommonData);
 
-export const ResourceNodeFirstPingAt = connect(
-    (state: RootState, props: { uuid: string }) => {
-        const resource = getResource<NodeResource>(props.uuid)(state.resources);
-        return { date: resource ? resource.firstPingAt : '' };
-    })((props: { date: string }) => renderNodeDate(props.date));
+export const ComputeNodeFirstPingAt = withResourceData('firstPingAt', renderCommonDate);
 
-export const ResourceNodeHostname = connect(
-    (state: RootState, props: { uuid: string }) => {
-        const resource = getResource<NodeResource>(props.uuid)(state.resources);
-        return { property: resource ? resource.hostname : '' };
-    })((props: { property: string }) => renderNodeData(props.property));
+export const ComputeNodeHostname = withResourceData('hostname', renderCommonData);
 
-export const ResourceNodeIpAddress = connect(
-    (state: RootState, props: { uuid: string }) => {
-        const resource = getResource<NodeResource>(props.uuid)(state.resources);
-        return { property: resource ? resource.ipAddress : '' };
-    })((props: { property: string }) => renderNodeData(props.property));
+export const ComputeNodeIpAddress = withResourceData('ipAddress', renderCommonData);
 
-export const ResourceNodeJobUuid = connect(
-    (state: RootState, props: { uuid: string }) => {
-        const resource = getResource<NodeResource>(props.uuid)(state.resources);
-        return { property: resource ? resource.jobUuid : '' };
-    })((props: { property: string }) => renderNodeData(props.property));
+export const ComputeNodeJobUuid = withResourceData('jobUuid', renderCommonData);
 
-export const ResourceNodeLastPingAt = connect(
-    (state: RootState, props: { uuid: string }) => {
-        const resource = getResource<NodeResource>(props.uuid)(state.resources);
-        return { date: resource ? resource.lastPingAt : '' };
-    })((props: { date: string }) => renderNodeDate(props.date));
+export const ComputeNodeLastPingAt = withResourceData('lastPingAt', renderCommonDate);
 
 // Links Resources
 const renderLinkName = (item: { name: string }) =>
@@ -270,13 +286,13 @@ const renderLinkTail = (dispatch: Dispatch, item: { uuid: string, tailUuid: stri
     const currentLabel = resourceLabel(item.tailKind);
     const isUnknow = currentLabel === "Unknown";
     return (<div>
-        { !isUnknow  ? (
-                renderLink(dispatch, item.tailUuid, currentLabel)
-            ) : (
+        {!isUnknow ? (
+            renderLink(dispatch, item.tailUuid, currentLabel)
+        ) : (
                 <Typography noWrap color="default">
                     {item.tailUuid}
                 </Typography>
-        )}
+            )}
     </div>);
 };