Consistently use encoded types in visualizations schema

galaxyproject · Nov 15, 2023 · 49c9be6 · 49c9be6
1 parent 3314e14
commit 49c9be6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/client/src/api/schema/schema.ts b/client/src/api/schema/schema.ts
@@ -1538,7 +1538,7 @@ export interface paths {
     };
     "/api/visualizations/{id}/sharing": {
         /**
-         * Get the current sharing status of the given Page.
+         * Get the current sharing status of the given Visualization.
          * @description Return the sharing status of the item.
          */
         get: operations["sharing_api_visualizations__id__sharing_get"];
@@ -17940,10 +17940,10 @@ export interface operations {
     index_api_visualizations_get: {
         /** Returns visualizations for the current user. */
         parameters?: {
-            /** @description Whether to include deleted pages in the result. */
+            /** @description Whether to include deleted visualizations in the result. */
             /** @description The maximum number of items to return. */
             /** @description Starts at the beginning skip the first ( offset - 1 ) items and begin returning at the Nth item */
-            /** @description Sort page index by this specified attribute on the page model */
+            /** @description Sort visualization index by this specified attribute on the visualization model */
             /** @description Sort in descending order? */
             /**
              * @description A mix of free text and GitHub-style tags used to filter the index operation.
@@ -17965,16 +17965,16 @@ export interface operations {
              * ## GitHub-style Tags Available
              *
              * `title`
-             * : The page's title.
+             * : The visualization's title.
              *
              * `slug`
-             * : The page's slug. (The tag `s` can be used a short hand alias for this tag to filter on this attribute.)
+             * : The visualization's slug. (The tag `s` can be used a short hand alias for this tag to filter on this attribute.)
              *
              * `tag`
-             * : The page's tags. (The tag `t` can be used a short hand alias for this tag to filter on this attribute.)
+             * : The visualization's tags. (The tag `t` can be used a short hand alias for this tag to filter on this attribute.)
              *
              * `user`
-             * : The page's owner's username. (The tag `u` can be used a short hand alias for this tag to filter on this attribute.)
+             * : The visualization's owner's username. (The tag `u` can be used a short hand alias for this tag to filter on this attribute.)
              *
              * ## Free Text
              *
@@ -18140,7 +18140,7 @@ export interface operations {
     };
     sharing_api_visualizations__id__sharing_get: {
         /**
-         * Get the current sharing status of the given Page.
+         * Get the current sharing status of the given Visualization.
          * @description Return the sharing status of the item.
          */
         parameters: {

diff --git a/lib/galaxy/schema/visualization.py b/lib/galaxy/schema/visualization.py
@@ -26,7 +26,7 @@ class VisualizationIndexQueryPayload(Model):
     show_own: Optional[bool] = None
     show_published: Optional[bool] = None
     show_shared: Optional[bool] = None
-    user_id: Optional[DecodedDatabaseIdField] = None
+    user_id: Optional[EncodedDatabaseIdField] = None
     sort_by: VisualizationSortByEnum = Field(
         "update_time", title="Sort By", description="Sort pages by this attribute."
     )

diff --git a/lib/galaxy/webapps/galaxy/services/visualizations.py b/lib/galaxy/webapps/galaxy/services/visualizations.py
@@ -57,7 +57,6 @@ def index(
 
         entries, total_matches = self.manager.index_query(trans, payload, include_total_count)
         return (
-                VisualizationSummaryList(__root__=[entry.to_dict() for entry in entries])
-            ),
+            VisualizationSummaryList(__root__=[entry.to_dict() for entry in entries]),
             total_matches,
         )