Remove history panel proxy

guerler · guerler · commit 3eafe76e4c48 · 2025-10-13T16:14:13.000+03:00
diff --git a/client/src/components/Collections/BuildFileSetWizard.vue b/client/src/components/Collections/BuildFileSetWizard.vue
@@ -3,9 +3,9 @@ import { BCardGroup } from "bootstrap-vue";
 import { computed, ref } from "vue";
 
 import { GalaxyApi } from "@/api";
+import { buildCollectionFromRules } from "@/components/Collections/common/buildCollectionModal";
 import { attemptCreate, type CollectionCreatorComponent } from "@/components/Collections/common/useCollectionCreator";
 import { useWorkbookDropHandling } from "@/components/Collections/common/useWorkbooks";
-import { buildCollectionFromRules } from "@/components/Collections/common/buildCollectionModal";
 import { rawToTable } from "@/components/Collections/tables";
 import { forBuilder, type ForBuilderResponse } from "@/components/Collections/wizard/fetchWorkbooks";
 import { useWizard } from "@/components/Common/Wizard/useWizard";
diff --git a/client/src/components/Collections/CollectionCreatorIndex.vue b/client/src/components/Collections/CollectionCreatorIndex.vue
@@ -14,7 +14,7 @@ import localize from "@/utils/localization";
 import { orList } from "@/utils/strings";
 import { stateIsTerminal } from "@/utils/utils";
 
-import type { CollectionBuilderType } from "../History/adapters/buildCollectionModal";
+import type { CollectionBuilderType } from "../Collections/common/buildCollectionModal";
 import type { SupportedPairedOrPairedBuilderCollectionTypes } from "./common/useCollectionCreator";
 
 import ListCollectionCreator from "./ListCollectionCreator.vue";
diff --git a/client/src/components/Collections/PairedOrUnpairedListCollectionCreator.vue b/client/src/components/Collections/PairedOrUnpairedListCollectionCreator.vue
@@ -12,7 +12,7 @@ import { useAgGrid } from "@/composables/useAgGrid";
 import { usePairingDatasetTargetsStore } from "@/stores/collectionBuilderItemsStore";
 import localize from "@/utils/localization";
 
-import type { GenericPair } from "../History/adapters/buildCollectionModal";
+import type { GenericPair } from "../Collections/common/buildCollectionModal";
 import { stripExtension, useUpdateIdentifiersForRemoveExtensions } from "./common/stripExtension";
 import {
     type SupportedPairedOrPairedBuilderCollectionTypes,
diff --git a/client/src/components/Collections/common/CollectionCreator.vue b/client/src/components/Collections/common/CollectionCreator.vue
@@ -5,7 +5,7 @@ import { BTab, BTabs } from "bootstrap-vue";
 import { computed, ref, watch } from "vue";
 
 import type { HDASummary } from "@/api";
-import { COLLECTION_TYPE_TO_LABEL } from "@/components/History/adapters/buildCollectionModal";
+import { COLLECTION_TYPE_TO_LABEL } from "@/components/Collections/common/buildCollectionModal";
 import { useUploadConfigurations } from "@/composables/uploadConfigurations";
 import localize from "@/utils/localization";
 
diff --git a/client/src/components/Collections/common/buildCollectionModal.ts b/client/src/components/Collections/common/buildCollectionModal.ts
@@ -54,10 +54,14 @@ export const COLLECTION_TYPE_TO_LABEL: Record<string, string> = {
 
 export type DatasetPair = GenericPair<HDASummary>;
 
-export async function buildCollectionFromRules(selection: any, historyId : string | null = null, fromRulesInput = false) {
+export async function buildCollectionFromRules(
+    selection: any,
+    historyId: string | null = null,
+    fromRulesInput = false,
+) {
     let selectionContent: any = null;
     const { loadCurrentHistoryId } = useHistoryStore();
-    historyId = historyId || await loadCurrentHistoryId();
+    historyId = historyId || (await loadCurrentHistoryId());
 
     if (fromRulesInput) {
         selectionContent = selection;
diff --git a/client/src/components/Collections/pairing.ts b/client/src/components/Collections/pairing.ts
@@ -1,4 +1,4 @@
-import type { GenericPair } from "@/components/History/adapters/buildCollectionModal";
+import type { GenericPair } from "@/components/Collections/common/buildCollectionModal";
 
 export const COMMON_FILTERS = {
     illumina: ["_1", "_2"] as [string, string],
diff --git a/client/src/components/Collections/usePairing.ts b/client/src/components/Collections/usePairing.ts
@@ -1,6 +1,6 @@
 import { ref } from "vue";
 
-import type { GenericPair } from "@/components/History/adapters/buildCollectionModal";
+import type { GenericPair } from "@/components/Collections/common/buildCollectionModal";
 
 import { autoPairWithCommonFilters, type HasName } from "./pairing";
 
diff --git a/client/src/components/Form/Elements/FormData/FormData.vue b/client/src/components/Form/Elements/FormData/FormData.vue
@@ -20,7 +20,7 @@ import { getGalaxyInstance } from "@/app";
 import {
     COLLECTION_TYPE_TO_LABEL,
     type CollectionBuilderType,
-} from "@/components/History/adapters/buildCollectionModal";
+} from "@/components/Collections/common/buildCollectionModal";
 import { useDatatypesMapper } from "@/composables/datatypesMapper";
 import { useUid } from "@/composables/utils/uid";
 import { type EventData, useEventStore } from "@/stores/eventStore";
diff --git a/client/src/components/Form/Elements/FormData/FormDataContextButtons.vue b/client/src/components/Form/Elements/FormData/FormDataContextButtons.vue
@@ -9,7 +9,7 @@ import type { CollectionType } from "@/api/datasetCollections";
 import {
     COLLECTION_TYPE_TO_LABEL,
     type CollectionBuilderType,
-} from "@/components/History/adapters/buildCollectionModal";
+} from "@/components/Collections/common/buildCollectionModal";
 import { capitalizeFirstLetter } from "@/utils/strings";
 
 import { buildersForCollectionTypes, unconstrainedCollectionTypeBuilders } from "./collections";
diff --git a/client/src/components/Form/Elements/FormData/FormDataWorkflowRunTabs.vue b/client/src/components/Form/Elements/FormData/FormDataWorkflowRunTabs.vue
@@ -5,7 +5,7 @@ import { storeToRefs } from "pinia";
 import { computed, nextTick, ref, watch } from "vue";
 
 import type { HDCASummary } from "@/api";
-import type { CollectionBuilderType } from "@/components/History/adapters/buildCollectionModal";
+import type { CollectionBuilderType } from "@/components/Collections/common/buildCollectionModal";
 import { useUploadConfigurations } from "@/composables/uploadConfigurations";
 import { useHistoryStore } from "@/stores/historyStore";
 
diff --git a/client/src/components/Form/Elements/FormData/collections.ts b/client/src/components/Form/Elements/FormData/collections.ts
@@ -1,5 +1,5 @@
 import type { CollectionType } from "@/api/datasetCollections";
-import type { CollectionBuilderType } from "@/components/History/adapters/buildCollectionModal";
+import type { CollectionBuilderType } from "@/components/Collections/common/buildCollectionModal";
 
 export const unconstrainedCollectionTypeBuilders: CollectionBuilderType[] = ["list", "list:paired", "paired"];
 
diff --git a/client/src/components/History/adapters/HistoryPanelProxy.js b/client/src/components/History/adapters/HistoryPanelProxy.js
diff --git a/client/src/components/History/adapters/buildCollectionModal.ts b/client/src/components/History/adapters/buildCollectionModal.ts
diff --git a/client/src/components/Libraries/LibraryFolder/TopToolbar/FolderTopBar.vue b/client/src/components/Libraries/LibraryFolder/TopToolbar/FolderTopBar.vue
@@ -14,7 +14,7 @@ import {
 import { computed, reactive, ref } from "vue";
 
 import { GalaxyApi } from "@/api";
-import type { CollectionBuilderType } from "@/components/History/adapters/buildCollectionModal";
+import type { CollectionBuilderType } from "@/components/Collections/common/buildCollectionModal";
 import { Services } from "@/components/Libraries/LibraryFolder/services";
 import { deleteSelectedItems } from "@/components/Libraries/LibraryFolder/TopToolbar/delete-selected";
 import download from "@/components/Libraries/LibraryFolder/TopToolbar/download";
diff --git a/client/src/components/Libraries/LibraryFolder/TopToolbar/import-to-history/import-collection.js b/client/src/components/Libraries/LibraryFolder/TopToolbar/import-to-history/import-collection.js
@@ -1,11 +1,11 @@
 import { getGalaxyInstance } from "app";
 import axios from "axios";
 import Backbone from "backbone";
+import { buildCollectionFromRules } from "components/Collections/common/buildCollectionModal";
 import { Toast } from "composables/toast";
 import { getAppRoot } from "onload/loadConfig";
 import { useHistoryStore } from "stores/historyStore";
 import _ from "underscore";
-import { buildCollectionFromRules } from "components/Collections/common/buildCollectionModal";
 
 import mod_library_model from "../library-model";
 
diff --git a/client/src/components/Upload/DefaultBox.vue b/client/src/components/Upload/DefaultBox.vue
@@ -5,7 +5,7 @@ import Vue, { computed, type Ref, ref } from "vue";
 import { useRouter } from "vue-router/composables";
 
 import type { HDASummary } from "@/api";
-import type { CollectionBuilderType } from "@/components/History/adapters/buildCollectionModal";
+import type { CollectionBuilderType } from "@/components/Collections/common/buildCollectionModal";
 import type { SelectionItem } from "@/components/SelectionDialog/selectionTypes";
 import { monitorUploadedHistoryItems } from "@/composables/monitorUploadedHistoryItems";
 import type { DbKey, ExtensionDetails } from "@/composables/uploadConfigurations";
diff --git a/client/src/entry/analysis/App.vue b/client/src/entry/analysis/App.vue
@@ -49,7 +49,6 @@
 <script>
 import { getGalaxyInstance } from "app";
 import ConfirmDialog from "components/ConfirmDialog";
-import { HistoryPanelProxy } from "components/History/adapters/HistoryPanelProxy";
 import Toast from "components/Toast";
 import { setConfirmDialogComponentRef } from "composables/confirmDialog";
 import { setGlobalUploadModal } from "composables/globalUploadModal";
@@ -197,7 +196,6 @@ export default {
     mounted() {
         if (!this.embedded) {
             this.Galaxy = getGalaxyInstance();
-            this.Galaxy.currHistoryPanel = new HistoryPanelProxy();
             this.Galaxy.modal = new Modal.View();
             this.Galaxy.frame = this.windowManager;
             if (this.Galaxy.config.interactivetools_enable) {
diff --git a/client/src/stores/historyStore.ts b/client/src/stores/historyStore.ts
@@ -298,7 +298,7 @@ export const useHistoryStore = defineStore("historyStore", () => {
         }
     }
 
-    async function loadCurrentHistoryId() : Promise<string | null> {
+    async function loadCurrentHistoryId(): Promise<string | null> {
         if (!currentHistoryId.value) {
             await loadCurrentHistory();
         }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { GenericPair } from "@/components/History/adapters/buildCollectionModal";`
	`1`	`+import type { GenericPair } from "@/components/Collections/common/buildCollectionModal";`
`2`	`2`
`3`	`3`	`export const COMMON_FILTERS = {`
`4`	`4`	`illumina: ["_1", "_2"] as [string, string],`