From e6df9e0eb335a5740162e372a30a6fbeef215812 Mon Sep 17 00:00:00 2001
From: Stanislaw Adaszewski <s.adaszewski@gmail.com>
Date: Wed, 5 Feb 2020 18:43:06 +0100
Subject: [PATCH] Started implementing request ordering.

---
 .../src/js/component/wb-collection-listing.js  | 18 +++++++++++++++---
 frontend/src/js/misc/make-arvados-request.js   | 15 +++++++++++++--
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/frontend/src/js/component/wb-collection-listing.js b/frontend/src/js/component/wb-collection-listing.js
index 90caaf1..a008878 100644
--- a/frontend/src/js/component/wb-collection-listing.js
+++ b/frontend/src/js/component/wb-collection-listing.js
@@ -13,6 +13,7 @@ class WBCollectionListing extends Component {
     super(...args);
     this.state.rows = [];
     this.state.numPages = 0;
+    this.state.orderStream = uuid.v4();
   }
 
   componentDidMount() {
@@ -65,7 +66,8 @@ class WBCollectionListing extends Component {
     let prom = makeArvadosRequest(arvHost, arvToken,
       '/arvados/v1/collections?filters=' + encodeURIComponent(JSON.stringify(filters)) +
       '&limit=' + encodeURIComponent(itemsPerPage) +
-      '&offset=' + encodeURIComponent(itemsPerPage * activePage));
+      '&offset=' + encodeURIComponent(itemsPerPage * activePage),
+      { 'orderStream': this.state.orderStream });
 
     let collections;
     let numPages
@@ -106,8 +108,14 @@ class WBCollectionListing extends Component {
     prom = prom.then(ownerLookup =>
       this.setState({
         'numPages': numPages,
-        'rows': this.prepareRows(collections, ownerLookup)
+        'rows': this.prepareRows(collections, ownerLookup),
+        'error': null
       }));
+
+    prom = prom.catch(() => this.setState({
+      'error': 'An error occured querying the Arvados API',
+      'rows': []
+    }));
   }
 
   componentWillReceiveProps(nextProps, nextState) {
@@ -115,9 +123,13 @@ class WBCollectionListing extends Component {
     this.fetchItems();
   }
 
-  render({ app, ownerUuid, activePage, getPageUrl }, { rows, numPages }) {
+  render({ app, ownerUuid, activePage, getPageUrl }, { rows, numPages, error }) {
     return (
       <div>
+        { error ? (<div class="alert alert-danger" role="alert">
+          { error }
+        </div>) : null }
+
         <WBTable columns={ [ 'Name', 'Description', 'Owner', 'File Count', 'Total Size', 'Actions' ] }
           rows={ rows } />
 
diff --git a/frontend/src/js/misc/make-arvados-request.js b/frontend/src/js/misc/make-arvados-request.js
index 7783872..a285f08 100644
--- a/frontend/src/js/misc/make-arvados-request.js
+++ b/frontend/src/js/misc/make-arvados-request.js
@@ -1,3 +1,4 @@
+const requestOrdering = {};
 
 function makeArvadosRequest(arvHost, arvToken, endpoint, params={}) {
   const defaultParams = {
@@ -6,12 +7,22 @@ function makeArvadosRequest(arvHost, arvToken, endpoint, params={}) {
     'contentType': 'application/json;charset=utf-8',
     'responseType': 'json',
     'useSsl': true,
-    'requireToken': true
+    'requireToken': true,
+    'orderStream': null
   };
 
   Object.keys(defaultParams).map(k => (params[k] =
     (k in params ? params[k] : defaultParams[k])));
-  let { method, data, contentType, responseType, useSsl, requireToken } = params;
+  let { method, data, contentType, responseType, useSsl, requireToken, orderStream } = params;
+
+  let orderId;
+  if (orderStream) {
+    if (!(orderStream in requestOrdering))
+      requestOrdering[orderStream] = { 'counter': 0, 'started': [], 'completed': [] };
+    requestOrdering[orderStream].counter += 1;
+    orderId = requestOrdering[orderStream].counter;
+    requestOrdering[orderStream].started.push(orderId);
+  }
 
   if (!(arvHost && (arvToken || !requireToken)))
     return new Promise((accept, reject) => reject());