From c9109317ea1380ec3aaad6f7cc7dd78a67161c88 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Tue, 23 May 2023 11:22:35 -0400 Subject: [PATCH] Fix optional fields being validated as missing. Fixes https://github.com/galaxyproject/galaxy/issues/16135 --- client/src/schema/schema.ts | 4 ++-- lib/galaxy/schema/schema.py | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/client/src/schema/schema.ts b/client/src/schema/schema.ts index 8f1f59a6641..bc40054490e 100644 --- a/client/src/schema/schema.ts +++ b/client/src/schema/schema.ts @@ -4539,12 +4539,12 @@ export interface components { * Latest installed revision * @description Most recent version available on the tool shed */ - latest_installable_revision: string; + latest_installable_revision?: string; /** * Repository deprecated * @description Repository has been depreciated on the tool shed */ - repository_deprecated: string; + repository_deprecated?: string; /** Revision Update */ revision_update: string; /** Revision Upgrade */ diff --git a/lib/galaxy/schema/schema.py b/lib/galaxy/schema/schema.py index 92ee2a5125e..16ee3ddc639 100644 --- a/lib/galaxy/schema/schema.py +++ b/lib/galaxy/schema/schema.py @@ -2306,13 +2306,14 @@ class ToolShedRepositoryChangeset(ToolShedRepository): class InstalledRepositoryToolShedStatus(Model): - # See https://github.com/galaxyproject/galaxy/issues/10453 - latest_installable_revision: str = Field( + # See https://github.com/galaxyproject/galaxy/issues/10453 , bad booleans + # See https://github.com/galaxyproject/galaxy/issues/16135 , optional fields + latest_installable_revision: Optional[str] = Field( title="Latest installed revision", description="Most recent version available on the tool shed" ) revision_update: str revision_upgrade: Optional[str] - repository_deprecated: str = Field( + repository_deprecated: Optional[str] = Field( title="Repository deprecated", description="Repository has been depreciated on the tool shed" )