From bed31a9f8f025011039f77e5c46cec2172197797 Mon Sep 17 00:00:00 2001
From: guerler <aysam.guerler@gmail.com>
Date: Mon, 7 Feb 2022 20:52:05 -0500
Subject: [PATCH] Fix tests for history revision

---
 .../History/ContentItem/Dataset/DatasetUI.vue  |  1 +
 .../ContentItem/DatasetCollection/DscUI.vue    |  1 +
 .../History/ContentItem/Subdataset.vue         |  2 +-
 .../components/History/ContentOperations.vue   |  6 ++++--
 .../History/CurrentCollection/Panel.vue        |  4 ++--
 client/src/components/History/History.vue      |  2 +-
 client/src/components/History/index.js         |  4 ----
 .../providers/DatasetCollectionProvider.js     |  3 +++
 .../providers/SingleQueryProvider.js           |  9 +++++----
 client/src/utils/promise-queue.js              |  4 ++--
 .../selenium/test_collection_builders.py       | 18 +++++-------------
 .../selenium/test_collection_edit.py           |  9 ++++-----
 .../selenium/test_history_panel_collections.py | 10 ++++------
 13 files changed, 33 insertions(+), 40 deletions(-)

diff --git a/client/src/components/History/ContentItem/Dataset/DatasetUI.vue b/client/src/components/History/ContentItem/Dataset/DatasetUI.vue
index d485504b441..1b413f099d0 100644
--- a/client/src/components/History/ContentItem/Dataset/DatasetUI.vue
+++ b/client/src/components/History/ContentItem/Dataset/DatasetUI.vue
@@ -10,6 +10,7 @@ either through the props, and make updates through the events -->
         class="dataset history-content"
         :id="typeId"
         :class="{ expanded, collapsed, selected }"
+        :data-hid="dataset.hid"
         :data-state="dataset.state"
         @keydown.arrow-left.self.stop="$emit('update:expanded', false)"
         @keydown.arrow-right.self.stop="$emit('update:expanded', true)"
diff --git a/client/src/components/History/ContentItem/DatasetCollection/DscUI.vue b/client/src/components/History/ContentItem/DatasetCollection/DscUI.vue
index 547b3b8e35c..97e46b62492 100644
--- a/client/src/components/History/ContentItem/DatasetCollection/DscUI.vue
+++ b/client/src/components/History/ContentItem/DatasetCollection/DscUI.vue
@@ -6,6 +6,7 @@
         class="dataset dataset-collection collapsed"
         :class="{ selected }"
         :id="typedId"
+        :data-hid="dsc.hid"
         :data-state="dsc.state"
         @keydown.arrow-right.self.stop="$emit('viewCollection')"
         @keydown.space.self.stop.prevent="$emit('update:selected', !selected)">
diff --git a/client/src/components/History/ContentItem/Subdataset.vue b/client/src/components/History/ContentItem/Subdataset.vue
index b1ad64889eb..f43d347a9e9 100644
--- a/client/src/components/History/ContentItem/Subdataset.vue
+++ b/client/src/components/History/ContentItem/Subdataset.vue
@@ -44,7 +44,7 @@ export default {
             this.$emit("update:expand", val);
         },
         async loadDetails() {
-            await getContentDetails(this.item);
+            const loadedDataset = await getContentDetails(this.item);
             this.localItem = loadedDataset;
         },
     },
diff --git a/client/src/components/History/ContentOperations.vue b/client/src/components/History/ContentOperations.vue
index 326289fe3d9..4fe692ec80d 100644
--- a/client/src/components/History/ContentOperations.vue
+++ b/client/src/components/History/ContentOperations.vue
@@ -4,6 +4,7 @@
             <b-button-group>
                 <IconButton
                     title="Select Items"
+                    class="show-history-content-selectors-btn"
                     icon="check-square"
                     :disabled="!hasMatches"
                     :pressed="showSelection"
@@ -280,11 +281,12 @@ export default {
         },
         async buildNewCollection(collectionTypeCode) {
             const modalResult = await buildCollectionModal(collectionTypeCode, this.history.id, this.contentSelection);
-            const newCollection = await createDatasetCollection(this.history, modalResult);
+            await createDatasetCollection(this.history, modalResult);
 
             // have to hide the source items if that was requested
             if (modalResult.hide_source_items) {
-                this.$emit("resetSelection");
+                this.$emit("hide-selection", this.contentSelection);
+                this.$emit("reset-selection");
             }
         },
     },
diff --git a/client/src/components/History/CurrentCollection/Panel.vue b/client/src/components/History/CurrentCollection/Panel.vue
index fc64db7143c..679c6476b83 100644
--- a/client/src/components/History/CurrentCollection/Panel.vue
+++ b/client/src/components/History/CurrentCollection/Panel.vue
@@ -1,7 +1,7 @@
 <!-- When a dataset collection is being viewed, this panel shows the contents of that collection -->
 
 <template>
-    <UrlDataProvider v-if="dsc" :url="getUrl(selectedCollection)" :auto-refresh="false" v-slot="{ result: payload }">
+    <UrlDataProvider v-if="dsc" :url="getUrl(selectedCollection)" v-slot="{ result: payload }">
         <ExpandedItems
             :scope-key="selectedCollection.id"
             :get-item-key="(item) => item.element_index"
@@ -54,7 +54,7 @@ import { updateContentFields } from "../model/queries";
 import ExpandedItems from "../ExpandedItems";
 import Layout from "../Layout";
 import TopNav from "./TopNav";
-import CollectionOperations from "./CollectionOperations.vue";
+import CollectionOperations from "./CollectionOperations";
 import Details from "./Details";
 import { CollectionContentItem } from "../ContentItem";
 import HistoryListing from "components/History/HistoryListing";
diff --git a/client/src/components/History/History.vue b/client/src/components/History/History.vue
index 0553b98a763..8b8946e7064 100644
--- a/client/src/components/History/History.vue
+++ b/client/src/components/History/History.vue
@@ -1,5 +1,5 @@
 <template>
-    <UrlDataProvider :url="dataUrl" :auto-refresh="true" v-slot="{ loading, result: payload }">
+    <UrlDataProvider :url="dataUrl" auto-refresh v-slot="{ loading, result: payload }">
         <ExpandedItems
             :scope-key="history.id"
             :get-item-key="(item) => item.type_id"
diff --git a/client/src/components/History/index.js b/client/src/components/History/index.js
index 55b124ab919..87aaf7fc379 100644
--- a/client/src/components/History/index.js
+++ b/client/src/components/History/index.js
@@ -4,7 +4,3 @@ export { default as CurrentHistoryPanel } from "./CurrentHistoryPanel";
 
 // Adapter: backbone view that mounts HistoryPanel
 export { default as HistoryPanelProxy } from "./adapters/HistoryPanelProxy";
-
-// rxjs debugging panel
-// import { initSpy } from "utils/observable/rxjsDebugging";
-// initSpy();
diff --git a/client/src/components/providers/DatasetCollectionProvider.js b/client/src/components/providers/DatasetCollectionProvider.js
index b498750f325..4823e05c57c 100644
--- a/client/src/components/providers/DatasetCollectionProvider.js
+++ b/client/src/components/providers/DatasetCollectionProvider.js
@@ -1,3 +1,6 @@
+import axios from "axios";
+import { getAppRoot } from "onload/loadConfig";
+import { rethrowSimple } from "utils/simple-error";
 import { SingleQueryProvider } from "components/providers/SingleQueryProvider";
 
 async function getDatasetCollection({ id }) {
diff --git a/client/src/components/providers/SingleQueryProvider.js b/client/src/components/providers/SingleQueryProvider.js
index 0e4c5f7ab72..e01483442ef 100644
--- a/client/src/components/providers/SingleQueryProvider.js
+++ b/client/src/components/providers/SingleQueryProvider.js
@@ -9,10 +9,8 @@ import { LastQueue } from "utils/promise-queue";
  *                              whose properties are the attributes assigned to the provider component
  * @return  {VueComponentOptions} Vue component options definition
  */
-const throttlePeriod = 100;
 export const SingleQueryProvider = (lookup) => {
     const promiseCache = new Map();
-    const queue = new LastQueue(throttlePeriod);
     return {
         props: {
             useCache: {
@@ -25,7 +23,7 @@ export const SingleQueryProvider = (lookup) => {
             },
             autoTime: {
                 type: Number,
-                default: throttlePeriod,
+                default: 500,
             },
         },
         data() {
@@ -34,6 +32,9 @@ export const SingleQueryProvider = (lookup) => {
                 error: null,
             };
         },
+        created() {
+            this.queue = new LastQueue(this.autoTime);
+        },
         computed: {
             loading() {
                 return this.result === null;
@@ -72,7 +73,7 @@ export const SingleQueryProvider = (lookup) => {
                         promiseCache.set(this.cacheKey, lookupPromise);
                     }
                 } else {
-                    lookupPromise = queue.enqueue(lookup, this.$attrs);
+                    lookupPromise = this.queue.enqueue(lookup, this.$attrs);
                 }
                 lookupPromise.then(
                     (result) => {
diff --git a/client/src/utils/promise-queue.js b/client/src/utils/promise-queue.js
index 01a7e36db4d..bd6d9bcfff8 100644
--- a/client/src/utils/promise-queue.js
+++ b/client/src/utils/promise-queue.js
@@ -11,7 +11,7 @@ export class LastQueue {
         this.pendingPromise = false;
     }
 
-    async enqueue(action, ...args) {
+    async enqueue(action, args) {
         return new Promise((resolve, reject) => {
             this.nextPromise = { action, args, resolve, reject };
             this.dequeue();
@@ -24,7 +24,7 @@ export class LastQueue {
             this.nextPromise = null;
             this.pendingPromise = true;
             try {
-                const payload = await item.action(...item.args);
+                const payload = await item.action(item.args);
                 item.resolve(payload);
             } catch (e) {
                 item.reject(e);
diff --git a/lib/galaxy_test/selenium/test_collection_builders.py b/lib/galaxy_test/selenium/test_collection_builders.py
index f72ee720b28..84cceb3bae0 100644
--- a/lib/galaxy_test/selenium/test_collection_builders.py
+++ b/lib/galaxy_test/selenium/test_collection_builders.py
@@ -185,19 +185,11 @@ class CollectionBuildersTestCase(SeleniumTestCase):
         depending on how fast the upload goes compared to the history polling updates, it might just
         skip to the end for a really fast upload
         """
-
-        if self.is_beta_history():
-            for hid in hids:
-                timeout = self.wait_length(self.wait_types.JOB_COMPLETION)
-                row_selector = self.content_item_by_attributes(hid=hid, state="ok")
-                row = self.wait_for_present(row_selector, timeout=timeout)
-                row.send_keys(" ")
-        else:
-            for hid in hids:
-                self.history_panel_wait_for_hid_ok(hid)
-            self.history_panel_multi_operations_show()
-            for hid in hids:
-                self.history_panel_muli_operation_select_hid(hid)
+        for hid in hids:
+            self.history_panel_wait_for_hid_ok(hid)
+        self.history_panel_multi_operations_show()
+        for hid in hids:
+            self.history_panel_muli_operation_select_hid(hid)
 
     def _show_hidden_content(self):
         """Switches the beta hidden filter toggle on"""
diff --git a/lib/galaxy_test/selenium/test_collection_edit.py b/lib/galaxy_test/selenium/test_collection_edit.py
index 08106a04848..fcc2e934b7c 100644
--- a/lib/galaxy_test/selenium/test_collection_edit.py
+++ b/lib/galaxy_test/selenium/test_collection_edit.py
@@ -58,12 +58,11 @@ class CollectionEditTestCase(SeleniumTestCase):
         depending on how fast the upload goes compared to the history polling updates, it might just
         skip to the end for a really fast upload
         """
-
         for hid in hids:
-            timeout = self.wait_length(self.wait_types.JOB_COMPLETION)
-            row_selector = self.content_item_by_attributes(hid=hid, state="ok")
-            row = self.wait_for_present(row_selector, timeout=timeout)
-            row.send_keys(" ")
+            self.history_panel_wait_for_hid_ok(hid)
+        self.history_panel_multi_operations_show()
+        for hid in hids:
+            self.history_panel_muli_operation_select_hid(hid)
 
     def _collection_dropdown(self, option_description):
         return self.use_bootstrap_dropdown(option=option_description, menu="selected content menu")
diff --git a/lib/galaxy_test/selenium/test_history_panel_collections.py b/lib/galaxy_test/selenium/test_history_panel_collections.py
index e7efa96b4ee..bf1726214c7 100644
--- a/lib/galaxy_test/selenium/test_history_panel_collections.py
+++ b/lib/galaxy_test/selenium/test_history_panel_collections.py
@@ -36,11 +36,8 @@ class HistoryPanelCollectionsTestCase(SeleniumTestCase):
         )
         ok_hid = ok_response["implicit_collections"][0]["hid"]
 
-        if not self.is_beta_history():
-            # sleep really shouldn't be needed :(
-            time.sleep(1)
-
-            self.home()
+        # sleep really shouldn't be needed :(
+        self.home()
 
         self.history_panel_wait_for_hid_state(input_hid, "ok")
         self.history_panel_wait_for_hid_state(failed_hid, "error")
@@ -222,12 +219,13 @@ class HistoryPanelCollectionsTestCase(SeleniumTestCase):
 
         if self.is_beta_history():
             self.sleep_for(WAIT_TYPES.HISTORY_POLL)
-            dataset_elements = self.content_item_by_attributes().all()
+            dataset_elements = collection_view.list_items_beta.all()
         else:
             dataset_elements = collection_view.list_items.all()
 
         assert len(dataset_elements) == 2, dataset_elements
         titles = [de.find_element_by_css_selector(".title .name").text for de in dataset_elements]
+        titles.sort()
         assert titles == ["forward", "reverse"]
         self.screenshot("history_panel_collection_view_paired")