change code after CR, clean code and add vm to nav action

Feature #14512_admin_links

Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki@contractors.roche.com>

diff --git a/src/common/labels.ts b/src/common/labels.ts
index 133a0e45cfed26d8dfc8a4a2e86e7c4c6a0966f0..c3c4fcd02733ac465bb2a4b27f63503a14bac9ee 100644 (file)
--- a/src/common/labels.ts
+++ b/src/common/labels.ts
@@ -16,6 +16,8 @@ export const resourceLabel = (type: string) => {
             return "User";
         case ResourceKind.GROUP:
             return "Group";
+        case ResourceKind.VIRTUAL_MACHINE:
+            return "Virtual Machine";
         default:
             return "Unknown";
     }

diff --git a/src/store/navigation/navigation-action.ts b/src/store/navigation/navigation-action.ts
index cbd983a68fe4bce3f6676068f44b59ccc3786b29..92443c02dc1cf90800a50418d167c72f253d92b5 100644 (file)
--- a/src/store/navigation/navigation-action.ts
+++ b/src/store/navigation/navigation-action.ts
@@ -21,6 +21,8 @@ export const navigateTo = (uuid: string) =>
             dispatch<any>(navigateToCollection(uuid));
         } else if (kind === ResourceKind.CONTAINER_REQUEST) {
             dispatch<any>(navigateToProcess(uuid));
+        } else if (kind === ResourceKind.VIRTUAL_MACHINE) {
+            dispatch<any>(navigateToAdminVirtualMachines);
         }
         if (uuid === SidePanelTreeCategory.FAVORITES) {
             dispatch<any>(navigateToFavorites);

diff --git a/src/views-components/data-explorer/renderers.tsx b/src/views-components/data-explorer/renderers.tsx
index 1be47be7093695dad9d7a33026ac813fff6e6a5d..a4713c8dc2337a8df20bb27d2094beff6fab32c5 100644 (file)
--- a/src/views-components/data-explorer/renderers.tsx
+++ b/src/views-components/data-explorer/renderers.tsx
@@ -210,9 +210,23 @@ export const ResourceLinkClass = connect(
         return resource || { linkClass: '' };
     })(renderLinkClass);
 
-const renderLinkTail = (dispatch: Dispatch, item: { uuid: string, tailUuid: string, tailKind: string }) =>
-    <Typography noWrap color="primary" onClick={() => dispatch<any>(navigateTo(item.uuid))}>
-        {resourceLabel(item.tailKind)}: {item.tailUuid}
+const renderLinkTail = (dispatch: Dispatch, item: { uuid: string, tailUuid: string, tailKind: string }) => {
+    const currentLabel = resourceLabel(item.tailKind);
+    const isUnknow = currentLabel === "Unknown";
+    return (<div>
+        { !isUnknow  ? (
+                renderLink(dispatch, item.tailUuid, currentLabel)
+            ) : (
+                <Typography noWrap color="default">
+                    {item.tailUuid}
+                </Typography>
+        )}
+    </div>);
+};
+
+const renderLink = (dispatch: Dispatch, uuid: string, label: string) =>
+    <Typography noWrap color="primary" style={{ 'cursor': 'pointer' }} onClick={() => dispatch<any>(navigateTo(uuid))}>
+        {label}: {uuid}
     </Typography>;
 
 export const ResourceLinkTail = connect(
@@ -225,9 +239,7 @@ export const ResourceLinkTail = connect(
         renderLinkTail(props.dispatch, props.item));
 
 const renderLinkHead = (dispatch: Dispatch, item: { uuid: string, headUuid: string, headKind: ResourceKind }) =>
-    <Typography noWrap color="primary" onClick={() => dispatch<any>(navigateTo(item.uuid))}>
-        {resourceLabel(item.headKind)}: {item.headUuid}
-    </Typography>;
+    renderLink(dispatch, item.headUuid, resourceLabel(item.headKind));
 
 export const ResourceLinkHead = connect(
     (state: RootState, props: { uuid: string }) => {

diff --git a/src/views/link-panel/link-panel-root.tsx b/src/views/link-panel/link-panel-root.tsx
index 73b53fc1e8ed3e05e4c8a8f79f91e63dc0b85785..d5ba79b335a1bde9c19f8e7cf28f6047eee223b2 100644 (file)
--- a/src/views/link-panel/link-panel-root.tsx
+++ b/src/views/link-panel/link-panel-root.tsx
@@ -37,7 +37,6 @@ export const linkPanelColumns: DataColumns<string> = [
         name: LinkPanelColumnNames.LINK_CLASS,
         selected: true,
         configurable: true,
-        // sortDirection: SortDirection.NONE,
         filters: createTree(),
         render: uuid => <ResourceLinkClass uuid={uuid} />
     },
@@ -45,7 +44,6 @@ export const linkPanelColumns: DataColumns<string> = [
         name: LinkPanelColumnNames.TAIL,
         selected: true,
         configurable: true,
-        // sortDirection: SortDirection.NONE,
         filters: createTree(),
         render: uuid => <ResourceLinkTail uuid={uuid} />
     },
@@ -53,7 +51,6 @@ export const linkPanelColumns: DataColumns<string> = [
         name: LinkPanelColumnNames.HEAD,
         selected: true,
         configurable: true,
-        // sortDirection: SortDirection.NONE,
         filters: createTree(),
         render: uuid => <ResourceLinkHead uuid={uuid} />
     },
@@ -61,7 +58,6 @@ export const linkPanelColumns: DataColumns<string> = [
         name: LinkPanelColumnNames.UUID,
         selected: true,
         configurable: true,
-        // sortDirection: SortDirection.NONE,
         filters: createTree(),
         render: uuid => <ResourceLinkUuid uuid={uuid} />
     }