Merge release_23.0 into dev

.github/workflows/api.yaml

@@ -47,6 +47,11 @@ jobs:
       - uses: actions/checkout@v3
         with:
           path: 'galaxy root'
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '18.12.1'
+          cache: 'yarn'
+          cache-dependency-path: 'galaxy root/client/yarn.lock'
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}

.github/workflows/converter_tests.yaml

@@ -31,6 +31,11 @@ jobs:
       - uses: actions/checkout@v3
         with:
           path: 'galaxy root'
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '18.12.1'
+          cache: 'yarn'
+          cache-dependency-path: 'galaxy root/client/yarn.lock'
       - name: Clone galaxyproject/galaxy-test-data
         uses: actions/checkout@v3
         with:

.github/workflows/cwl_conformance.yaml

@@ -38,6 +38,11 @@ jobs:
       - uses: actions/checkout@v3
         with:
           path: 'galaxy root'
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '18.12.1'
+          cache: 'yarn'
+          cache-dependency-path: 'galaxy root/client/yarn.lock'
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}

.github/workflows/first_startup.yaml

@@ -29,6 +29,11 @@ jobs:
       - uses: actions/checkout@v3
         with:
           path: 'galaxy root'
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '18.12.1'
+          cache: 'yarn'
+          cache-dependency-path: 'galaxy root/client/yarn.lock'
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
@@ -48,11 +53,6 @@ jobs:
         with:
           path: .tox
           key: tox-cache-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('galaxy root/requirements.txt') }}-first-startup
-      - uses: actions/setup-node@v3
-        with:
-          node-version: '18.12.1'
-          cache: 'yarn'
-          cache-dependency-path: 'galaxy root/client/yarn.lock'
       - name: Install tox
         run: pip install tox
       - name: run tests

.github/workflows/framework.yaml

@@ -43,6 +43,11 @@ jobs:
       - uses: actions/checkout@v3
         with:
           path: 'galaxy root'
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '18.12.1'
+          cache: 'yarn'
+          cache-dependency-path: 'galaxy root/client/yarn.lock'
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}

.github/workflows/integration.yaml

@@ -71,6 +71,11 @@ jobs:
       - uses: actions/checkout@v3
         with:
           path: 'galaxy root'
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '18.12.1'
+          cache: 'yarn'
+          cache-dependency-path: 'galaxy root/client/yarn.lock'
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}

.github/workflows/osx_startup.yaml

@@ -22,6 +22,11 @@ jobs:
       - uses: actions/checkout@v3
         with:
           path: 'galaxy root'
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '18.12.1'
+          cache: 'yarn'
+          cache-dependency-path: 'galaxy root/client/yarn.lock'
       - name: Get full Python version
         id: full-python-version
         shell: bash

.github/workflows/performance.yaml

@@ -42,6 +42,11 @@ jobs:
       - uses: actions/checkout@v3
         with:
           path: 'galaxy root'
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '18.12.1'
+          cache: 'yarn'
+          cache-dependency-path: 'galaxy root/client/yarn.lock'
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}

.github/workflows/reports_startup.yaml

@@ -26,6 +26,11 @@ jobs:
       - uses: actions/checkout@v3
         with:
           path: 'galaxy root'
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '18.12.1'
+          cache: 'yarn'
+          cache-dependency-path: 'galaxy root/client/yarn.lock'
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
@@ -45,11 +50,6 @@ jobs:
         with:
           path: 'galaxy root/.venv'
           key: gxy-venv-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('galaxy root/requirements.txt') }}-reports-startup
-      - uses: actions/setup-node@v3
-        with:
-          node-version: '18.12.1'
-          cache: 'yarn'
-          cache-dependency-path: 'galaxy root/client/yarn.lock'
       - name: Install tox
         run: pip install tox
       - name: Run tests

.github/workflows/selenium.yaml

@@ -46,6 +46,11 @@ jobs:
       - uses: actions/checkout@v3
         with:
           path: 'galaxy root'
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '18.12.1'
+          cache: 'yarn'
+          cache-dependency-path: 'galaxy root/client/yarn.lock'
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
@@ -63,11 +68,6 @@ jobs:
         with:
           path: 'galaxy root/.venv'
           key: gxy-venv-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('galaxy root/requirements.txt') }}-selenium
-      - uses: actions/setup-node@v3
-        with:
-          node-version: '18.12.1'
-          cache: 'yarn'
-          cache-dependency-path: 'galaxy root/client/yarn.lock'
       - uses: nanasess/setup-chromedriver@v1
       - name: Run tests
         run: ./run_tests.sh --coverage -selenium lib/galaxy_test/selenium -- --num-shards=3 --shard-id=${{ matrix.chunk }}

.github/workflows/unit-postgres.yaml

@@ -36,6 +36,11 @@ jobs:
       - uses: actions/checkout@v3
         with:
           path: 'galaxy root'
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '18.12.1'
+          cache: 'yarn'
+          cache-dependency-path: 'galaxy root/client/yarn.lock'
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}

.github/workflows/unit.yaml

@@ -28,6 +28,11 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '18.12.1'
+          cache: 'yarn'
+          cache-dependency-path: 'galaxy root/client/yarn.lock'
       - name: Get full Python version
         id: full-python-version
         shell: bash

client/package.json

@@ -34,7 +34,6 @@
     "@handsontable/vue": "^2.0.0",
     "@hirez_io/observer-spy": "^2.1.2",
     "@johmun/vue-tags-input": "^2.1.0",
-    "@pinia/testing": "^0.0.14",
     "@popperjs/core": "^2.11.5",
     "@sentry/browser": "^6.17.4",
     "@vueuse/core": "^9.10.0",
@@ -77,7 +76,7 @@
     "object-hash": "^3.0.0",
     "openapi-typescript": "^6.1.0",
     "openapi-typescript-fetch": "^1.1.3",
-    "pinia": "^2.0.23",
+    "pinia": "^2.0.36",
     "pinia-plugin-persistedstate": "^2.4.0",
     "popper.js": "^1.16.1",
     "pretty-bytes": "^6.0.0",
@@ -140,6 +139,7 @@
     "@babel/preset-env": "^7.20.2",
     "@babel/preset-typescript": "^7.18.6",
     "@cerner/duplicate-package-checker-webpack-plugin": "^2.3.0",
+    "@pinia/testing": "0.1.0",
     "@testing-library/jest-dom": "^5.16.4",
     "@types/d3": "^7.4.0",
     "@types/jquery": "^3.5.16",

client/src/components/History/Content/GenericItem.vue

@@ -3,37 +3,39 @@
         <loading-span v-if="loading" message="Loading dataset" />
         <div v-else>
             <ContentItem
-                :id="item.hid"
+                :id="item.hid ?? item.element_index + 1"
                 add-highlight-btn
                 is-history-item
-                :item="item"
-                :name="item.name"
+                :item="item?.object || item"
+                :name="item.name || item.element_identifier"
                 :expand-dataset="expandDataset"
-                :is-dataset="item.history_content_type == 'dataset'"
+                :is-dataset="item.history_content_type == 'dataset' || item.element_type == 'hda'"
                 @update:expand-dataset="expandDataset = $event"
                 @view-collection="viewCollection = !viewCollection"
                 @delete="onDelete(item)"
                 @toggleHighlights="onHighlight(item)"
                 @undelete="onUndelete(item)"
                 @unhide="onUnhide(item)" />
             <div v-if="viewCollection">
-                <GenericElement :dsc="item" />
+                <GenericElement :dsc="item?.object || item" />
             </div>
         </div>
     </component>
 </template>
 
 <script>
 import LoadingSpan from "components/LoadingSpan";
-import { DatasetCollectionProvider, DatasetProvider } from "components/providers";
-import { deleteContent, updateContentFields } from "components/History/model/queries";
+import { DatasetCollectionProvider, DatasetProvider } from "@/components/providers";
+import { DatasetCollectionElementProvider } from "@/components/providers/storeProviders";
+import { deleteContent, updateContentFields } from "@/components/History/model/queries";
 import ContentItem from "./ContentItem";
 import GenericElement from "./GenericElement";
 import { mapActions } from "pinia";
 import { useHistoryStore } from "@/stores/historyStore";
 
 export default {
     components: {
+        DatasetCollectionElementProvider,
         ContentItem,
         GenericElement,
         DatasetProvider,
@@ -58,7 +60,16 @@ export default {
     },
     computed: {
         providerComponent() {
-            return this.itemSrc == "hda" ? "DatasetProvider" : "DatasetCollectionProvider";
+            switch (this.itemSrc) {
+                case "hda":
+                    return "DatasetProvider";
+                case "hdca":
+                    return "DatasetCollectionProvider";
+                case "dce":
+                    return "DatasetCollectionElementProvider";
+                default:
+                    throw Error(`Unknown element src ${this.itemSrc}`);
+            }
         },
     },
     methods: {

client/src/components/History/CurrentHistory/HistoryOperations/SelectionOperations.vue

@@ -343,8 +343,8 @@ export default {
             // have to hide the source items if that was requested
             if (modalResult.hide_source_items) {
                 this.$emit("hide-selection", this.contentSelection);
-                this.$emit("reset-selection");
             }
+            this.$emit("reset-selection");
         },
     },
 };

client/src/components/History/Export/HistoryExport.test.ts

@@ -11,6 +11,9 @@ import type { components } from "@/schema";
 import { getLocalVue } from "@tests/jest/helpers";
 import HistoryExport from "./HistoryExport.vue";
 import { getExportRecords } from "./services";
+import { setActivePinia } from "pinia";
+import { createTestingPinia } from "@pinia/testing";
+import { useHistoryStore, type HistorySummary } from "@/stores/historyStore";
 
 const localVue = getLocalVue(true);
 
@@ -19,6 +22,11 @@ const mockGetExportRecords = getExportRecords as jest.MockedFunction<typeof getE
 mockGetExportRecords.mockResolvedValue([]);
 
 const FAKE_HISTORY_ID = "fake-history-id";
+const FAKE_HISTORY = {
+    id: FAKE_HISTORY_ID,
+    name: "fake-history-name",
+};
+
 const REMOTE_FILES_API_ENDPOINT = new RegExp("/api/remote_files/plugins");
 
 type FilesSourcePluginList = components["schemas"]["FilesSourcePlugin"][];
@@ -36,9 +44,20 @@ const REMOTE_FILES_API_RESPONSE: FilesSourcePluginList = [
 ];
 
 async function mountHistoryExport() {
+    const pinia = createTestingPinia();
+    setActivePinia(pinia);
+    const historyStore = useHistoryStore(pinia);
+
+    // the mocking method described in the pinia docs does not work in vue2
+    // this is a work-around
+    jest.spyOn(historyStore, "getHistoryById").mockImplementation(
+        (_history_id: string) => FAKE_HISTORY as HistorySummary
+    );
+
     const wrapper = shallowMount(HistoryExport, {
         propsData: { historyId: FAKE_HISTORY_ID },
         localVue,
+        pinia,
     });
     await flushPromises();
     return wrapper;
@@ -56,6 +75,12 @@ describe("HistoryExport.vue", () => {
         axiosMock.restore();
     });
 
+    it("should render the history name", async () => {
+        const wrapper = await mountHistoryExport();
+
+        expect(wrapper.find("#history-name").text()).toBe(FAKE_HISTORY.name);
+    });
+
     it("should render export options", async () => {
         const wrapper = await mountHistoryExport();