[arvados-workbench2] updated: 2.4.0-189-g792a7570

git repository hosting git at public.arvados.org
Thu Aug 11 07:32:48 UTC 2022


Summary of changes:
 src/views-components/side-panel-tree/side-panel-tree.tsx | 4 ++--
 src/views-components/tree-picker/tree-picker.ts          | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

       via  792a75702b6208c328d67c39b0f107e9dff0417e (commit)
      from  a23cfd6defb8dab9ac9afe13034f7b667f07acca (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 792a75702b6208c328d67c39b0f107e9dff0417e
Author: Daniel Kutyła <daniel.kutyla at contractors.roche.com>
Date:   Thu Aug 11 09:32:22 2022 +0200

    18692: Fixed failing collection tests
    
    Arvados-DCO-1.1-Signed-off-by: Daniel Kutyła <daniel.kutyla at contractors.roche.com>

diff --git a/src/views-components/side-panel-tree/side-panel-tree.tsx b/src/views-components/side-panel-tree/side-panel-tree.tsx
index 7f5b8d73..c7e33767 100644
--- a/src/views-components/side-panel-tree/side-panel-tree.tsx
+++ b/src/views-components/side-panel-tree/side-panel-tree.tsx
@@ -40,9 +40,9 @@ const mapDispatchToProps = (dispatch: Dispatch, props: SidePanelTreeProps): Side
 
 export const SidePanelTree = connect(undefined, mapDispatchToProps)(
     (props: SidePanelTreeActionProps) =>
-        <span data-cy="side-panel-tree">
+        <div data-cy="side-panel-tree">
             <TreePicker {...props} render={renderSidePanelItem} pickerId={SIDE_PANEL_TREE} />
-        </span>);
+        </div>);
 
 const renderSidePanelItem = (item: TreeItem<ProjectResource>) => {
     const name = typeof item.data === 'string' ? item.data : item.data.name;
diff --git a/src/views-components/tree-picker/tree-picker.ts b/src/views-components/tree-picker/tree-picker.ts
index 712875b5..68a0a414 100644
--- a/src/views-components/tree-picker/tree-picker.ts
+++ b/src/views-components/tree-picker/tree-picker.ts
@@ -68,9 +68,10 @@ const treePickerToTreeItems = (tree: Ttree<any>, resources: ResourcesState) =>
         const node = getNode(id)(tree) || initTreeNode({ id: '', value: 'InvalidNode' });
         const items = getNodeChildrenIds(node.id)(tree)
             .map(treePickerToTreeItems(tree, resources));
+        const resource = resources[node.id];
         return {
             active: node.active,
-            data: resources[node.id] || node.value,
+            data: resource ? { ...resource, name: node.value.name || node.value } : undefined || node.value,
             id: node.id,
             items: items.length > 0 ? items : undefined,
             open: node.expanded,

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list