From e3d98fd2f8d2c9a0def3e6e52f4a389e22fe1243 Mon Sep 17 00:00:00 2001
From: Stanislaw Adaszewski <s.adaszewski@gmail.com>
Date: Tue, 3 Mar 2020 17:17:35 +0100
Subject: [PATCH] Make WBBrowse more concise by using common properties.

---
 frontend/rollup.config.js         |  2 +-
 frontend/src/js/page/wb-browse.js | 51 ++++++++++++-------------------
 2 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/frontend/rollup.config.js b/frontend/rollup.config.js
index 3711d93..206cf0d 100755
--- a/frontend/rollup.config.js
+++ b/frontend/rollup.config.js
@@ -55,7 +55,7 @@ export default {
       'node_modules/papaya-viewer/release/current/standard/papaya.css': 'dist/css/papaya.css',
       verbose: true
     }),
-    buble({jsx: 'h'}),
+    buble({jsx: 'h', objectAssign: 'Object.assign'}),
     resolve({}),
     license({
       banner: 'Copyright (C) F. Hoffmann-La Roche AG, 2020.\nAuthor: stanislaw.adaszewski@roche.com\nAll Rights Reserved.',
diff --git a/frontend/src/js/page/wb-browse.js b/frontend/src/js/page/wb-browse.js
index 490974b..d4c2dc5 100644
--- a/frontend/src/js/page/wb-browse.js
+++ b/frontend/src/js/page/wb-browse.js
@@ -146,6 +146,19 @@ class WBBrowse extends Component {
     objTypeTab, collectionPage, processPage, workflowPage,
     textSearch }, { selected }) {
 
+    const commonProps = {
+      renderRenameLink: (it, cb) => this.renderRenameLink(it, cb),
+      renderDeleteButton: (it, cb) => this.renderDeleteButton(it, cb),
+      renderSelectionCell: it => this.renderSelectionCell(it),
+      renderSharingButton: it => this.renderSharingButton(it),
+      textSearch,
+      app,
+      appState: app.state,
+      arvHost: app.state.arvHost,
+      arvToken: app.state.arvToken,
+      ownerUuid
+    };
+
     return (
       <div>
         <WBRenameDialog app={ app } ref={ this.renameDialogRef } />
@@ -170,19 +183,11 @@ class WBBrowse extends Component {
           copyHere={ () => this.copyHere() } />
 
         <WBProjectListing ref={ this.projectListingRef }
-          app={ app }
-          arvHost={ app.state.arvHost }
-          arvToken={ app.state.arvToken }
           mode={ mode }
-          ownerUuid={ ownerUuid }
           itemsPerPage="5"
           activePage={ Number(activePage || 0) }
           getPageUrl={ i => this.getUrl({ 'activePage': i }) }
-          renderRenameLink={ (it, cb) => this.renderRenameLink(it, cb) }
-          renderDeleteButton={ (it, cb) => this.renderDeleteButton(it, cb) }
-          renderSelectionCell={ it => this.renderSelectionCell(it) }
-          renderSharingButton={ it => this.renderSharingButton(it) }
-          textSearch={ textSearch } />
+          { ...commonProps } />
 
         { (mode !== 'browse') ? null : (
           <WBTabs tabs={ [
@@ -195,41 +200,25 @@ class WBBrowse extends Component {
         {
           (mode !== 'browse') ? null :
           (!objTypeTab || objTypeTab === 'collection') ? (
-            <WBCollectionListing app={ app }
-              ownerUuid={ ownerUuid }
+            <WBCollectionListing
               itemsPerPage="20"
               activePage={ Number(collectionPage || 0) }
               getPageUrl={ i => this.getUrl({ 'collectionPage': i }) }
-              renderRenameLink={ (it, cb) => this.renderRenameLink(it, cb) }
-              renderDeleteButton={ (it, cb) => this.renderDeleteButton(it, cb) }
-              renderSelectionCell={ it => this.renderSelectionCell(it) }
-              renderSharingButton={ it => this.renderSharingButton(it) }
-              textSearch={ textSearch } />
+              { ...commonProps } />
 
           ) : (objTypeTab === 'process') ? (
-            <WBProcessListing app={ app }
-              appState={ app.state }
-              ownerUuid={ ownerUuid }
+            <WBProcessListing
               itemsPerPage="20"
               activePage={ Number(processPage || 0) }
               onPageChanged={ i => this.route({ 'processPage': i }) }
-              renderRenameLink={ (it, cb) => this.renderRenameLink(it, cb) }
-              renderDeleteButton={ (it, cb) => this.renderDeleteButton(it, cb) }
-              renderSelectionCell={ it => this.renderSelectionCell(it) }
-              renderSharingButton={ it => this.renderSharingButton(it) }
-              textSearch={ textSearch } />
+              { ...commonProps } />
 
           ) : (objTypeTab === 'workflow') ? (
-            <WBWorkflowListing app={ app }
-              ownerUuid={ ownerUuid }
+            <WBWorkflowListing
               itemsPerPage="20"
               page={ Number(workflowPage || 0) }
               getPageUrl={ i => this.getUrl({ 'workflowPage': i }) }
-              renderRenameLink={ (it, cb) => this.renderRenameLink(it, cb) }
-              renderDeleteButton={ (it, cb) => this.renderDeleteButton(it, cb) }
-              renderSelectionCell={ it => this.renderSelectionCell(it) }
-              renderSharingButton={ it => this.renderSharingButton(it) }
-              textSearch={ textSearch } />
+              { ...commonProps } />
 
           ) : null
         }