[ARVADOS-WORKBENCH2] updated: 1.1.4-155-g37eb0fb

Git user git at public.curoverse.com
Tue Jun 26 09:36:31 EDT 2018


Summary of changes:
 src/common/formatters.ts                            | 3 ++-
 src/components/data-explorer/data-explorer.test.tsx | 3 ++-
 src/models/resource.ts                              | 2 +-
 src/views/project-panel/project-panel-selectors.ts  | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

       via  37eb0fb5a3f6c36b484fce5c2f6dacb3ce95eef5 (commit)
      from  95bc64c72fa9e7ede2cc235ee668ee2e8aa6a1f0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 37eb0fb5a3f6c36b484fce5c2f6dacb3ce95eef5
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Tue Jun 26 15:36:16 2018 +0200

    Clean up go back row
    
    Feature #13683
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --git a/src/common/formatters.ts b/src/common/formatters.ts
index 1d9a520..fe7df14 100644
--- a/src/common/formatters.ts
+++ b/src/common/formatters.ts
@@ -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) => {
diff --git a/src/components/data-explorer/data-explorer.test.tsx b/src/components/data-explorer/data-explorer.test.tsx
index d2ca7f7..94c7be6 100644
--- a/src/components/data-explorer/data-explorer.test.tsx
+++ b/src/components/data-explorer/data-explorer.test.tsx
@@ -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");
diff --git a/src/models/resource.ts b/src/models/resource.ts
index 28bb349..0f5fbc2 100644
--- a/src/models/resource.ts
+++ b/src/models/resource.ts
@@ -16,7 +16,7 @@ export enum ResourceKind {
     PROJECT = "project",
     COLLECTION = "collection",
     PIPELINE = "pipeline",
-    LEVEL_UP = "levelup",
+    LEVEL_UP = "",
     UNKNOWN = "unknown"
 }
 
diff --git a/src/views/project-panel/project-panel-selectors.ts b/src/views/project-panel/project-panel-selectors.ts
index c798ec3..83bfd60 100644
--- a/src/views/project-panel/project-panel-selectors.ts
+++ b/src/views/project-panel/project-panel-selectors.ts
@@ -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) {

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list