Unverified Commit 5b730095 authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #20656 from jmchilton/shed_schema_fixes 

[24.2] Fix empty default Optionals for tool_shed_repositories API.
parents 78bb88c2 5db8f138

client/src/api/schema/schema.ts

+3 −3
Original line number Diff line number Diff line
@@ -11807,12 +11807,12 @@ export interface components { 
             * Latest installed revision

             * @description Most recent version available on the tool shed

             */

            latest_installable_revision: string | null;

            latest_installable_revision?: string | null;

            /**

             * Repository deprecated

             * @description Repository has been depreciated on the tool shed

             */

            repository_deprecated: string | null;

            repository_deprecated?: string | null;

            /** Revision Update */

            revision_update: string;

            /** Revision Upgrade */
@@ -11875,7 +11875,7 @@ export interface components { 
             */

            tool_shed: string;

            /** Latest updated status from the tool shed */

            tool_shed_status: components["schemas"]["InstalledRepositoryToolShedStatus"] | null;

            tool_shed_status?: components["schemas"]["InstalledRepositoryToolShedStatus"] | null;

            /** Uninstalled */

            uninstalled: boolean;

        };

lib/galaxy/schema/schema.py

+3 −3
Original line number Diff line number Diff line
@@ -2755,12 +2755,12 @@ class InstalledRepositoryToolShedStatus(Model): 
    # 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"

        None, title="Latest installed revision", description="Most recent version available on the tool shed"

    )

    revision_update: str

    revision_upgrade: Optional[str] = None

    repository_deprecated: Optional[str] = Field(

        title="Repository deprecated", description="Repository has been depreciated on the tool shed"

        None, title="Repository deprecated", description="Repository has been depreciated on the tool shed"

    )
@@ -2792,7 +2792,7 @@ class InstalledToolShedRepository(Model, WithModelClass): 
        title="Changeset revision", description="Changeset revision of the repository - a mercurial commit hash"

    )

    tool_shed_status: Optional[InstalledRepositoryToolShedStatus] = Field(

        title="Latest updated status from the tool shed"

        None, title="Latest updated status from the tool shed"

    )