13494: Merge branch 'master' into 13494-collection-version-browser

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@di-pentima.com.ar>

diff --combined src/components/collection-panel-files/collection-panel-files.tsx
index 6a9f0f4068506869ea019e8eade5424cd56cb403,a89c3a92c89425c7dac55759f63715d3513ffee6..bf551b9ffab15834d07c0052a70b193b3a95afc5
--- 1/src/components/collection-panel-files/collection-panel-files.tsx
--- 2/src/components/collection-panel-files/collection-panel-files.tsx
+++ b/src/components/collection-panel-files/collection-panel-files.tsx
@@@ -84,7 -84,6 +84,7 @@@ export const CollectionPanelFilesCompon
                      <span className={classes.cardHeaderContentTitle}>Files</span>
                      <SearchInput
                          value={searchValue}
 +                        label='Search files'
                          onSearch={setSearchValue} />
                  </div>
              }
@@@ -129,8 -128,7 +129,7 @@@
                      : <div style={{ height: 'calc(100% - 60px)' }}>
                          <FileTree
                              onMenuOpen={(ev, item) => onItemMenuOpen(ev, item, isWritable)}
-                             {...treeProps}
-                             items={treeProps.items} /></div>}
+                             {...treeProps} /></div>}
              </>
          }
      </Card>);