Unverified Commit 7922648e authored by mvdbeek's avatar mvdbeek
Browse files

Use API route to download metadata files

parent 0441b456

client/src/components/History/Content/Dataset/DatasetDownload.test.js

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ describe("DatasetDownload", () => { 
        await wrapper.trigger("click");

        const emitted = wrapper.emitted()["on-download"];

        expect(emitted[0][0]).toBe(`/api/datasets/item_id/display?to_ext=ext`);

        expect(emitted[1][0]).toBe(`/dataset/get_metadata_file?hda_id=item_id&metadata_name=a`);

        expect(emitted[2][0]).toBe(`/dataset/get_metadata_file?hda_id=item_id&metadata_name=b`);

        expect(emitted[1][0]).toBe(`/api/datasets/item_id/metadata_file?metadata_file=a`);

        expect(emitted[2][0]).toBe(`/api/datasets/item_id/metadata_file?metadata_file=b`);

        expect(emitted[3][0]).toBe(`/api/datasets/item_id/display?to_ext=ext`);

    });

});

client/src/components/History/Content/Dataset/DatasetDownload.vue

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ export default { 
            return this.metaFiles && this.metaFiles.length > 0;

        },

        metaDownloadUrl() {

            return prependPath(`dataset/get_metadata_file?hda_id=${this.item.id}&metadata_name=`);

            return prependPath(`api/datasets/${this.item.id}/metadata_file?metadata_file=`);

        },

        metaFiles() {

            return this.item.meta_files;

lib/galaxy/webapps/galaxy/api/datasets.py

+9 −1
Original line number Diff line number Diff line
@@ -263,10 +263,18 @@ class FastAPIDatasets: 
        tags=["histories"],

        response_class=FileResponse,

    )

    @router.get(

        "/api/datasets/{history_content_id}/metadata_file",

        summary="Returns the metadata file associated with this history item.",

        response_class=FileResponse,

    )

    def get_metadata_file(

        self,

        trans=DependsOnTrans,

        history_id: EncodedDatabaseIdField = HistoryIDPathParam,

        history_id: Optional[EncodedDatabaseIdField] = Query(

            default=None,

            description="The encoded database identifier of the History.",

        ),

        history_content_id: EncodedDatabaseIdField = DatasetIDPathParam,

        metadata_file: str = Query(

            ...,