Clean up go back row
authorMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Tue, 26 Jun 2018 13:36:16 +0000 (15:36 +0200)
committerMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Tue, 26 Jun 2018 13:36:16 +0000 (15:36 +0200)
Feature #13683

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>

src/common/formatters.ts
src/components/data-explorer/data-explorer.test.tsx
src/models/resource.ts
src/views/project-panel/project-panel-selectors.ts

index 1d9a52012445b1478c9dc3b4d37197dd9237bc74..fe7df14c9d12670a3a9c2f88480b6d6e519a902a 100644 (file)
@@ -4,7 +4,8 @@
 
 export const formatDate = (isoDate: string) => {
     const date = new Date(isoDate);
-    return date.toLocaleString();
+    const text = date.toLocaleString();
+    return text === 'Invalid Date' ? "" : text;
 };
 
 export const formatFileSize = (size?: number) => {
index d2ca7f7b7cee2f2dfb489778c49c4dc3b7a8cc3b..94c7be6dab933ff6991edda0a56ebf4b1edc0d2d 100644 (file)
@@ -27,7 +27,8 @@ describe("<DataExplorer />", () => {
             columns={[{ name: "Column 1", render: jest.fn(), selected: true }]} />);
         expect(dataExplorer.find(ContextMenu).prop("actions")).toEqual([]);
         dataExplorer.find(DataTable).prop("onRowContextMenu")({
-            preventDefault: jest.fn()
+            preventDefault: jest.fn(),
+            stopPropagation: jest.fn()
         }, "Item 1");
         dataExplorer.find(ContextMenu).prop("onActionClick")({ name: "Action 1", icon: "" });
         expect(onContextAction).toHaveBeenCalledWith({ name: "Action 1", icon: "" }, "Item 1");
index 28bb349d82761c08a630b6fd1a8d752908434d04..0f5fbc28f68cbd151857c31a59d9b634626a59a2 100644 (file)
@@ -16,7 +16,7 @@ export enum ResourceKind {
     PROJECT = "project",
     COLLECTION = "collection",
     PIPELINE = "pipeline",
-    LEVEL_UP = "levelup",
+    LEVEL_UP = "",
     UNKNOWN = "unknown"
 }
 
index c798ec3db2976396685bddd5bb60c63ba7312258..83bfd603898700502884c20529f7da671e031118 100644 (file)
@@ -19,9 +19,9 @@ export const projectExplorerItems = (projects: Array<TreeItem<Project>>, treeIte
             name: "..",
             url: getResourceUrl(treeItem.data),
             kind: ResourceKind.LEVEL_UP,
-            owner: treeItem.data.ownerUuid,
+            owner: "",
             uuid: treeItem.data.uuid,
-            lastModified: treeItem.data.modifiedAt
+            lastModified: ""
         });
 
         if (treeItem.items) {