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

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

diff --cc src/views-components/details-panel/collection-details.tsx
index f2b7c131e9ac5c823625c92a158fc1d42478d915,625d8405f0d2f34748b8cd6ffcc4e681fb25c23b..d2457559e4d8207189df0c0818a9b698e60643c1
--- 1/src/views-components/details-panel/collection-details.tsx
--- 2/src/views-components/details-panel/collection-details.tsx
+++ b/src/views-components/details-panel/collection-details.tsx
@@@ -14,26 -14,7 +14,26 @@@ export class CollectionDetails extends 
          return <CollectionIcon className={className} />;
      }
  
 -    getDetails() {
 -        return <CollectionDetailsAttributes item={this.item} twoCol={false} />;
 +    getTabLabels() {
 +        return ['Details', 'Versions'];
 +    }
 +
 +    getDetails(tabNumber: number) {
 +        switch (tabNumber) {
 +            case 0:
 +                return this.getCollectionInfo();
 +            case 1:
 +                return this.getVersionBrowser();
 +            default:
 +                return <div />;
 +        }
 +    }
 +
 +    private getCollectionInfo() {
-         return <CollectionDetailsAttributes item={this.item} />;
++        return <CollectionDetailsAttributes twoCol={false} item={this.item} />;
 +    }
 +
 +    private getVersionBrowser() {
 +        return <div />;
      }
  }

diff --cc src/views/collection-panel/collection-panel.tsx
Simple merge