Merge branch 'master' into 14614-outputs-option-does-not-work-from-more-options

[arvados.git] / 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 b74e8af19ed3c0d3dc32b903669d7c275ec4afcd..ce4d430fd18597a0c4af04925eb31fa9a636dd77 100644 (file)
--- a/src/views-components/data-explorer/renderers.tsx
+++ b/src/views-components/data-explorer/renderers.tsx
@@ -25,7 +25,7 @@ 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';
+import { withResource, getDataFromResource, withResourceData } from '~/views-components/data-explorer/with-resources';
 
 const renderName = (item: { name: string; uuid: string, kind: string }) =>
     <Grid container alignItems="center" wrap="nowrap" spacing={16}>
@@ -203,21 +203,21 @@ const renderNodeInfo = (data: string) => {
     return <Typography>{JSON.stringify(data, null, 4)}</Typography>;
 };
 
-export const ComputeNodeInfo = withResource(({ resource }) => renderNodeInfo(getDataFromResource('info', resource)));
+export const ComputeNodeInfo = withResourceData('info', renderNodeInfo);
 
-export const ComputeNodeUuid = withResource(({ resource }) => renderNodeData(getDataFromResource('uuid', resource)));
+export const ComputeNodeUuid = withResourceData('uuid', renderNodeData);
 
-export const ComputeNodeDomain = withResource(({ resource }) => renderNodeData(getDataFromResource('domain', resource)));
+export const ComputeNodeDomain = withResourceData('domain', renderNodeData);
 
-export const ComputeNodeFirstPingAt = withResource(({ resource }) => renderNodeDate(getDataFromResource('firstPingAt', resource)));
+export const ComputeNodeFirstPingAt = withResourceData('firstPingAt', renderNodeDate);
 
-export const ComputeNodeHostname = withResource(({ resource }) => renderNodeData(getDataFromResource('hostname', resource)));
+export const ComputeNodeHostname = withResourceData('hostname', renderNodeData);
 
-export const ComputeNodeIpAddress = withResource(({ resource }) => renderNodeData(getDataFromResource('ipAddress', resource)));
+export const ComputeNodeIpAddress = withResourceData('ipAddress', renderNodeData);
 
-export const ComputeNodeJobUuid = withResource(({ resource }) => renderNodeData(getDataFromResource('jobUuid', resource)));
+export const ComputeNodeJobUuid = withResourceData('jobUuid', renderNodeData);
 
-export const ComputeNodeLastPingAt = withResource(({ resource }) => renderNodeDate(getDataFromResource('lastPingAt', resource)));
+export const ComputeNodeLastPingAt = withResourceData('lastPingAt', renderNodeDate);
 
 // Links Resources
 const renderLinkName = (item: { name: string }) =>