Unverified Commit 3da17fc8 authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #20928 from mvdbeek/fix_sort_order_extended_metadata 

[25.0] Fix collection element sorting in extended_metadata
parents c254d6cb e76e2f66

client/src/api/schema/schema.ts

+5 −0
Original line number Diff line number Diff line
@@ -10656,6 +10656,11 @@ export interface components { 
             * @enum {string}

             */

            sort_key: "filename" | "name" | "designation" | "dbkey";

            /**

             * Sort Reverse

             * @default false

             */

            sort_reverse: boolean;

            /** Visible */

            visible: boolean;

        };

lib/galaxy/tool_util/parser/output_collection_def.py

+20 −13
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ class FilePatternDatasetCollectionDescription(DatasetCollectionDescription): 
    discover_via = "pattern"

    sort_key: SortKeyT

    sort_comp: SortCompT

    sort_reverse: bool

    pattern: str



    def __init__(self, **kwargs):
@@ -169,6 +170,11 @@ class FilePatternDatasetCollectionDescription(DatasetCollectionDescription): 
        if pattern in NAMED_PATTERNS:

            pattern = NAMED_PATTERNS[pattern]

        self.pattern = pattern

        if "sort_by" not in kwargs and "sort_key" in kwargs and "sort_comp" in kwargs and "sort_reverse" in kwargs:

            self.sort_reverse = kwargs["sort_reverse"]

            self.sort_comp = kwargs["sort_comp"]

            self.sort_key = kwargs["sort_key"]

        else:

            self.sort_by = sort_by = kwargs.get("sort_by", DEFAULT_SORT_BY)

            if sort_by.startswith("reverse_"):

                self.sort_reverse = True
@@ -198,6 +204,7 @@ class FilePatternDatasetCollectionDescription(DatasetCollectionDescription): 
            sort_comp=self.sort_comp,

            pattern=self.pattern,

            sort_by=self.sort_by,

            sort_reverse=self.sort_reverse,

        )



    @property

lib/galaxy/tool_util_models/tool_outputs.py

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ class FilePatternDatasetCollectionDescription(DatasetCollectionDescription): 
    discover_via: Literal["pattern"]

    sort_key: SortKeyT

    sort_comp: SortCompT

    sort_reverse: bool = False

    pattern: str

lib/tool_shed/webapp/frontend/src/schema/schema.ts

+5 −0
Original line number Diff line number Diff line
@@ -1649,6 +1649,11 @@ export interface components { 
             * @enum {string}

             */

            sort_key: "filename" | "name" | "designation" | "dbkey"

            /**

             * Sort Reverse

             * @default false

             */

            sort_reverse: boolean

            /** Visible */

            visible: boolean

        }

test/integration/test_extended_metadata.py

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ TEST_TOOL_IDS = [ 
    "implicit_conversion",

    "environment_variables",

    "all_output_types",

    "discover_sort_by",

]