Merge pull request #18315 from davelopez/24.1_fix_pinia_in_manually_m…

…ounted_components [24.1] Fix pinia in manually mounted components
galaxyproject · Jun 4, 2024 · c681c0c · c681c0c
2 parents c052641 + 67dd190
commit c681c0c
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 69 deletions.
diff --git a/client/src/utils/mountVueComponent.js b/client/src/utils/mountVueComponent.js
@@ -4,7 +4,7 @@
 
 import BootstrapVue from "bootstrap-vue";
 import { iconPlugin, localizationPlugin, vueRxShortcutPlugin } from "components/plugins";
-import { createPinia, PiniaVuePlugin } from "pinia";
+import { getActivePinia, PiniaVuePlugin } from "pinia";
 import Vue from "vue";
 
 // Load Pinia
@@ -22,18 +22,17 @@ Vue.use(vueRxShortcutPlugin);
 // font-awesome svg icon registration/loading
 Vue.use(iconPlugin);
 
-// Create Pinia
-const pinia = createPinia();
-
 export const mountVueComponent = (ComponentDefinition) => {
     const component = Vue.extend(ComponentDefinition);
+    const pinia = getActivePinia();
     return (propsData, el) => new component({ propsData, el, pinia });
 };
 
 export const replaceChildrenWithComponent = (el, ComponentDefinition, propsData = {}) => {
     const container = document.createElement("div");
     el.replaceChildren(container);
     const component = Vue.extend(ComponentDefinition);
+    const pinia = getActivePinia();
     const mountFn = (propsData, el) => new component({ propsData, el, pinia });
     return mountFn(propsData, container);
 };
diff --git a/config/plugins/webhooks/demo/tour_generator/script.js b/config/plugins/webhooks/demo/tour_generator/script.js
diff --git a/config/plugins/webhooks/demo/tour_generator/tour_generator.js b/config/plugins/webhooks/demo/tour_generator/tour_generator.js
@@ -13,7 +13,8 @@ window.TourGenerator = Backbone.View.extend({
         $("#execute").attr("tour_id", "execute");
         Toastr.info("Tour generation might take some time.");
         $.getJSON(
-            `${Galaxy.root}api/webhooks/tour_generator/data/`, {
+            `${Galaxy.root}api/webhooks/tour_generator/data/`,
+            {
                 tool_id: toolId,
                 tool_version: toolVersion,
             },
@@ -31,7 +32,7 @@ window.TourGenerator = Backbone.View.extend({
             }
         );
     },
-    _getData: function(obj, attempts = 20, delay = 1000) {
+    _getData: function (obj, attempts = 20, delay = 1000) {
         let datasets = [];
         _.each(obj.data.hids, (hid) => {
             Galaxy.currHistoryPanel.collection.each((dataset) => {
@@ -49,8 +50,8 @@ window.TourGenerator = Backbone.View.extend({
             console.error("Some of the test datasets cannot be found in the history.");
         }
     },
-    _generateTour: function (data) {
-        const tour = window.bundleEntries.runTour("auto.generated", data);
+    _generateTour: async function (data) {
+        const tour = await window.bundleEntries.runTour("auto.generated", data);
         // Force ending the tour when pressing the Execute button
         $("#execute").on("mousedown", () => {
             if (tour) {