From 25563b7741f400409381447a1760541c4bd7545c Mon Sep 17 00:00:00 2001 From: davelopez <46503462+davelopez@users.noreply.github.com> Date: Wed, 20 Mar 2024 10:13:09 +0100 Subject: [PATCH] Reorder model union from less to more specific --- client/src/api/schema/schema.ts | 56 ++++++++++++++++----------------- lib/galaxy/schema/schema.py | 2 +- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/client/src/api/schema/schema.ts b/client/src/api/schema/schema.ts index 2085c92b7c86..ec6f14b6018f 100644 --- a/client/src/api/schema/schema.ts +++ b/client/src/api/schema/schema.ts @@ -6968,12 +6968,12 @@ export interface components { * Can contain different views and kinds of items. */ HistoryContentsResult: ( + | components["schemas"]["CustomHistoryHDA"] + | components["schemas"]["CustomHistoryHDCA"] | components["schemas"]["HDADetailed"] | components["schemas"]["HDASummary"] | components["schemas"]["HDCADetailed"] | components["schemas"]["HDCASummary"] - | components["schemas"]["CustomHistoryHDA"] - | components["schemas"]["CustomHistoryHDCA"] )[]; /** * HistoryContentsWithStatsResult @@ -6985,12 +6985,12 @@ export interface components { * @description The items matching the search query. Only the items fitting in the current page limit will be returned. */ contents: ( + | components["schemas"]["CustomHistoryHDA"] + | components["schemas"]["CustomHistoryHDCA"] | components["schemas"]["HDADetailed"] | components["schemas"]["HDASummary"] | components["schemas"]["HDCADetailed"] | components["schemas"]["HDCASummary"] - | components["schemas"]["CustomHistoryHDA"] - | components["schemas"]["CustomHistoryHDCA"] )[]; /** * Stats @@ -13577,12 +13577,12 @@ export interface operations { 200: { content: { "application/json": ( + | components["schemas"]["CustomHistoryHDA"] + | components["schemas"]["CustomHistoryHDCA"] | components["schemas"]["HDADetailed"] | components["schemas"]["HDASummary"] | components["schemas"]["HDCADetailed"] | components["schemas"]["HDCASummary"] - | components["schemas"]["CustomHistoryHDA"] - | components["schemas"]["CustomHistoryHDCA"] )[]; }; }; @@ -16505,19 +16505,19 @@ export interface operations { 200: { content: { "application/json": + | components["schemas"]["CustomHistoryHDA"] + | components["schemas"]["CustomHistoryHDCA"] | components["schemas"]["HDADetailed"] | components["schemas"]["HDASummary"] | components["schemas"]["HDCADetailed"] | components["schemas"]["HDCASummary"] - | components["schemas"]["CustomHistoryHDA"] - | components["schemas"]["CustomHistoryHDCA"] | ( + | components["schemas"]["CustomHistoryHDA"] + | components["schemas"]["CustomHistoryHDCA"] | components["schemas"]["HDADetailed"] | components["schemas"]["HDASummary"] | components["schemas"]["HDCADetailed"] | components["schemas"]["HDCASummary"] - | components["schemas"]["CustomHistoryHDA"] - | components["schemas"]["CustomHistoryHDCA"] )[]; }; }; @@ -17096,12 +17096,12 @@ export interface operations { 200: { content: { "application/json": + | components["schemas"]["CustomHistoryHDA"] + | components["schemas"]["CustomHistoryHDCA"] | components["schemas"]["HDADetailed"] | components["schemas"]["HDASummary"] | components["schemas"]["HDCADetailed"] - | components["schemas"]["HDCASummary"] - | components["schemas"]["CustomHistoryHDA"] - | components["schemas"]["CustomHistoryHDCA"]; + | components["schemas"]["HDCASummary"]; }; }; /** @description Validation Error */ @@ -17148,12 +17148,12 @@ export interface operations { 200: { content: { "application/json": + | components["schemas"]["CustomHistoryHDA"] + | components["schemas"]["CustomHistoryHDCA"] | components["schemas"]["HDADetailed"] | components["schemas"]["HDASummary"] | components["schemas"]["HDCADetailed"] - | components["schemas"]["HDCASummary"] - | components["schemas"]["CustomHistoryHDA"] - | components["schemas"]["CustomHistoryHDCA"]; + | components["schemas"]["HDCASummary"]; }; }; /** @description Validation Error */ @@ -17381,19 +17381,19 @@ export interface operations { 200: { content: { "application/json": + | components["schemas"]["CustomHistoryHDA"] + | components["schemas"]["CustomHistoryHDCA"] | components["schemas"]["HDADetailed"] | components["schemas"]["HDASummary"] | components["schemas"]["HDCADetailed"] | components["schemas"]["HDCASummary"] - | components["schemas"]["CustomHistoryHDA"] - | components["schemas"]["CustomHistoryHDCA"] | ( + | components["schemas"]["CustomHistoryHDA"] + | components["schemas"]["CustomHistoryHDCA"] | components["schemas"]["HDADetailed"] | components["schemas"]["HDASummary"] | components["schemas"]["HDCADetailed"] | components["schemas"]["HDCASummary"] - | components["schemas"]["CustomHistoryHDA"] - | components["schemas"]["CustomHistoryHDCA"] )[]; }; }; @@ -17439,12 +17439,12 @@ export interface operations { 200: { content: { "application/json": + | components["schemas"]["CustomHistoryHDA"] + | components["schemas"]["CustomHistoryHDCA"] | components["schemas"]["HDADetailed"] | components["schemas"]["HDASummary"] | components["schemas"]["HDCADetailed"] - | components["schemas"]["HDCASummary"] - | components["schemas"]["CustomHistoryHDA"] - | components["schemas"]["CustomHistoryHDCA"]; + | components["schemas"]["HDCASummary"]; }; }; /** @description Validation Error */ @@ -17490,12 +17490,12 @@ export interface operations { 200: { content: { "application/json": + | components["schemas"]["CustomHistoryHDA"] + | components["schemas"]["CustomHistoryHDCA"] | components["schemas"]["HDADetailed"] | components["schemas"]["HDASummary"] | components["schemas"]["HDCADetailed"] - | components["schemas"]["HDCASummary"] - | components["schemas"]["CustomHistoryHDA"] - | components["schemas"]["CustomHistoryHDCA"]; + | components["schemas"]["HDCASummary"]; }; }; /** @description Validation Error */ @@ -17722,12 +17722,12 @@ export interface operations { 200: { content: { "application/json": ( + | components["schemas"]["CustomHistoryHDA"] + | components["schemas"]["CustomHistoryHDCA"] | components["schemas"]["HDADetailed"] | components["schemas"]["HDASummary"] | components["schemas"]["HDCADetailed"] | components["schemas"]["HDCASummary"] - | components["schemas"]["CustomHistoryHDA"] - | components["schemas"]["CustomHistoryHDCA"] )[]; }; }; diff --git a/lib/galaxy/schema/schema.py b/lib/galaxy/schema/schema.py index 74bee50600e3..b1744da86007 100644 --- a/lib/galaxy/schema/schema.py +++ b/lib/galaxy/schema/schema.py @@ -3216,9 +3216,9 @@ class CustomHistoryHDCA(HDCADetailed): AnyHDCA = Union[HDCADetailed, HDCASummary] AnyHistoryContentItem = Annotated[ Union[ + AnyCustomHistoryItem, AnyHDA, AnyHDCA, - AnyCustomHistoryItem, ], Field(union_mode="left_to_right"), ]