Merge pull request #21037 from guerler/remove_jquery

Remove History Panel proxy

Author: mvdbeek

client/src/bundleEntries.js

@@ -14,10 +14,6 @@
  * tagging_common.mako: show_in_overlay
  */
 
-/* jquery and _ are exposed via expose-loader while several external plugins rely on these */
-import $ from "jquery"; // eslint-disable-line no-unused-vars
-import _ from "underscore"; // eslint-disable-line no-unused-vars
-
 export { getGalaxyInstance, setGalaxyInstance } from "app";
 export { default as LegacyGridView } from "legacy/grid/grid-view";
 export { createTabularDatasetChunkedView } from "mvc/dataset/data";

client/src/components/Collections/BuildFileSetWizard.vue

@@ -3,7 +3,7 @@ import { BCardGroup } from "bootstrap-vue";
 import { computed, ref } from "vue";
 
 import { GalaxyApi } from "@/api";
-import { getGalaxyInstance } from "@/app";
+import { buildCollectionFromRules } from "@/components/Collections/common/buildCollectionModal";
 import { attemptCreate, type CollectionCreatorComponent } from "@/components/Collections/common/useCollectionCreator";
 import { useWorkbookDropHandling } from "@/components/Collections/common/useWorkbooks";
 import { rawToTable } from "@/components/Collections/tables";
@@ -172,9 +172,8 @@ const ruleBuilderElements = computed(() => {
 });
 
 function launchRuleBuilder() {
-    const Galaxy = getGalaxyInstance();
     const entry = ruleBuilderModalEntryProps.value;
-    Galaxy.currHistoryPanel.buildCollectionFromRules(entry, null, true);
+    buildCollectionFromRules(entry, null, true);
 }
 
 function submit() {

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";

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,

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";
 

…History/adapters/buildCollectionModal.ts …llections/common/buildCollectionModal.tsclient/src/components/History/adapters/buildCollectionModal.ts renamed to client/src/components/Collections/common/buildCollectionModal.ts client/src/components/History/adapters/buildCollectionModal.ts renamed to client/src/components/Collections/common/buildCollectionModal.ts

@@ -14,6 +14,8 @@ import jQuery from "jquery";
 import type { HDASummary, HistoryItemSummary } from "@/api";
 import type { CollectionType } from "@/api/datasetCollections";
 import RULE_BASED_COLLECTION_CREATOR from "@/components/Collections/RuleBasedCollectionCreatorModal";
+import { createDatasetCollection } from "@/components/History/model/queries";
+import { useHistoryStore } from "@/stores/historyStore";
 
 // This is type describes builders we know about - not valid "collection type"s
 // as the backend/model layer of Galaxy would understand them. Rules is a collection
@@ -52,6 +54,32 @@ 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,
+) {
+    let selectionContent: any = null;
+    const { loadCurrentHistoryId } = useHistoryStore();
+    historyId = historyId || (await loadCurrentHistoryId());
+
+    if (fromRulesInput) {
+        selectionContent = selection;
+    } else {
+        selectionContent = new Map();
+        selection.models.forEach((obj: any) => {
+            selectionContent.set(obj.id, obj);
+        });
+    }
+    if (historyId) {
+        const modalResult = await buildRuleCollectionModal(selectionContent, historyId, fromRulesInput);
+        if (modalResult) {
+            console.debug("Submitting collection build request.", modalResult);
+            await createDatasetCollection({ id: historyId } as any, modalResult);
+        }
+    }
+}
+
 // stand-in for buildCollection from history-view-edit.js
 export async function buildRuleCollectionModal(
     selectedContent: HistoryItemSummary[],

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],

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";
 

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";

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";