From 76c0f985fbbf2e4feba818420d75c59b21f4b60f Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Mon, 27 Feb 2023 09:25:44 -0500
Subject: [PATCH 1/8] Pydantic the new object store API.

---
 client/src/schema/schema.ts                   | 66 ++++++++++++++---
 lib/galaxy/objectstore/__init__.py            | 72 ++++++++++++++++---
 lib/galaxy/webapps/galaxy/api/object_store.py | 36 +++++-----
 3 files changed, 138 insertions(+), 36 deletions(-)

diff --git a/client/src/schema/schema.ts b/client/src/schema/schema.ts
index 1723cc3a1271..dbfdf897cdf6 100644
--- a/client/src/schema/schema.ts
+++ b/client/src/schema/schema.ts
@@ -890,11 +890,11 @@ export interface paths {
         post: operations["create_api_metrics_post"];
     };
     "/api/object_store": {
-        /** Index */
+        /** Get a list of (currently only concrete) object stores configured with this Galaxy instance. */
         get: operations["index_api_object_store_get"];
     };
     "/api/object_store/{object_store_id}": {
-        /** Return boolean to indicate if Galaxy's default object store allows selection. */
+        /** Get information about a concrete object store configured with Galaxy. */
         get: operations["show_info_api_object_store__object_store_id__get"];
     };
     "/api/pages": {
@@ -1432,6 +1432,34 @@ export interface components {
             /** Queue of task being done derived from Celery AsyncResult */
             queue?: string;
         };
+        /** BadgeDict */
+        BadgeDict: {
+            /** Message */
+            message: string;
+            /**
+             * Source
+             * @enum {string}
+             */
+            source: "admin" | "galaxy";
+            /**
+             * Type
+             * @enum {string}
+             */
+            type:
+                | "faster"
+                | "slower"
+                | "short_term"
+                | "cloud"
+                | "backed_up"
+                | "not_backed_up"
+                | "more_secure"
+                | "less_secure"
+                | "more_stable"
+                | "less_stable"
+                | "quota"
+                | "no_quota"
+                | "restricted";
+        };
         /**
          * BasicRoleModel
          * @description Base model definition with common configuration used by all derived models.
@@ -1718,6 +1746,20 @@ export interface components {
              */
             hash_function?: components["schemas"]["HashFunctionNameEnum"];
         };
+        /** ConcreteObjectStoreModel */
+        ConcreteObjectStoreModel: {
+            /** Badges */
+            badges: components["schemas"]["BadgeDict"][];
+            /** Description */
+            description?: string;
+            /** Name */
+            name?: string;
+            /** Object Store Id */
+            object_store_id?: string;
+            /** Private */
+            private: boolean;
+            quota: components["schemas"]["QuotaModel"];
+        };
         /** ContentsObject */
         ContentsObject: {
             /**
@@ -6243,6 +6285,13 @@ export interface components {
              */
             users?: components["schemas"]["UserQuota"][];
         };
+        /** QuotaModel */
+        QuotaModel: {
+            /** Enabled */
+            enabled: boolean;
+            /** Source */
+            source?: string;
+        };
         /**
          * QuotaOperation
          * @description An enumeration.
@@ -12568,9 +12617,9 @@ export interface operations {
         };
     };
     index_api_object_store_get: {
-        /** Index */
+        /** Get a list of (currently only concrete) object stores configured with this Galaxy instance. */
         parameters?: {
-            /** @description Restrict index query to user selectable object stores. */
+            /** @description Restrict index query to user selectable object stores, the current implementation requires this to be true. */
             query?: {
                 selectable?: boolean;
             };
@@ -12580,9 +12629,10 @@ export interface operations {
             };
         };
         responses: {
+            /** @description A list of the configured object stores. */
             200: {
                 content: {
-                    "application/json": Record<string, never>[];
+                    "application/json": components["schemas"]["ConcreteObjectStoreModel"][];
                 };
             };
             /** @description Validation Error */
@@ -12594,7 +12644,7 @@ export interface operations {
         };
     };
     show_info_api_object_store__object_store_id__get: {
-        /** Return boolean to indicate if Galaxy's default object store allows selection. */
+        /** Get information about a concrete object store configured with Galaxy. */
         parameters: {
             /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
             header?: {
@@ -12606,10 +12656,10 @@ export interface operations {
             };
         };
         responses: {
-            /** @description A list with details about the remote files available to the user. */
+            /** @description Successful Response */
             200: {
                 content: {
-                    "application/json": Record<string, never>;
+                    "application/json": components["schemas"]["ConcreteObjectStoreModel"];
                 };
             };
             /** @description Validation Error */
diff --git a/lib/galaxy/objectstore/__init__.py b/lib/galaxy/objectstore/__init__.py
index 45793c187f92..d0b0e35b4c05 100644
--- a/lib/galaxy/objectstore/__init__.py
+++ b/lib/galaxy/objectstore/__init__.py
@@ -24,6 +24,11 @@
 )
 
 import yaml
+from pydantic import BaseModel
+from typing_extensions import (
+    Literal,
+    TypedDict,
+)
 
 from galaxy.exceptions import (
     ObjectInvalid,
@@ -52,6 +57,22 @@
 
 log = logging.getLogger(__name__)
 
+BadgeSourceT = Literal["admin", "galaxy"]
+BadgeT = Literal[
+    "faster",
+    "slower",
+    "short_term",
+    "cloud",
+    "backed_up",
+    "not_backed_up",
+    "more_secure",
+    "less_secure",
+    "more_stable",
+    "less_stable",
+    "quota",
+    "no_quota",
+    "restricted",
+]
 
 BADGE_SPECIFICATION = [
     {"type": "faster", "conflicts": ["slower"]},
@@ -69,6 +90,12 @@
 BADGE_SPECIFCATION_BY_TYPE = {s["type"]: s for s in BADGE_SPECIFICATION}
 
 
+class BadgeDict(TypedDict):
+    type: BadgeT
+    message: Optional[str]
+    source: BadgeSourceT
+
+
 class ObjectStore(metaclass=abc.ABCMeta):
 
     """ObjectStore interface.
@@ -270,7 +297,7 @@ def get_concrete_store_description_markdown(self, obj):
         """
 
     @abc.abstractmethod
-    def get_concrete_store_badges(self, obj):
+    def get_concrete_store_badges(self, obj) -> List[BadgeDict]:
         """Return a list of dictified badges summarizing the object store configuration."""
 
     @abc.abstractmethod
@@ -443,7 +470,7 @@ def get_concrete_store_name(self, obj):
     def get_concrete_store_description_markdown(self, obj):
         return self._invoke("get_concrete_store_description_markdown", obj)
 
-    def get_concrete_store_badges(self, obj) -> List[Dict[str, Any]]:
+    def get_concrete_store_badges(self, obj) -> List[BadgeDict]:
         return self._invoke("get_concrete_store_badges", obj)
 
     def get_store_usage_percent(self):
@@ -549,14 +576,27 @@ def to_dict(self):
         rval["badges"] = self._get_concrete_store_badges(None)
         return rval
 
-    def _get_concrete_store_badges(self, obj) -> List[Dict[str, Any]]:
-        badge_dicts: List[Dict[str, Any]] = []
+    def to_model(self, object_store_id: str) -> "ConcreteObjectStoreModel":
+        return ConcreteObjectStoreModel(
+            object_store_id=object_store_id,
+            private=self.private,
+            name=self.name,
+            description=self.description,
+            quota=QuotaModel(source=self.quota_source, enabled=self.quota_enabled),
+            badges=self._get_concrete_store_badges(None),
+        )
+
+    def _get_concrete_store_badges(self, obj) -> List[BadgeDict]:
+        badge_dicts: List[BadgeDict] = []
         for badge in self.badges:
-            badge_dict = badge.copy()
-            badge_dict["source"] = "admin"
+            badge_dict: BadgeDict = {
+                "source": "admin",
+                "type": badge["type"],
+                "message": badge["message"],
+            }
             badge_dicts.append(badge_dict)
 
-        quota_badge_dict: Dict[str, Any]
+        quota_badge_dict: BadgeDict
         if self.galaxy_enable_quotas and self.quota_enabled:
             quota_badge_dict = {
                 "type": "quota",
@@ -571,7 +611,7 @@ def _get_concrete_store_badges(self, obj) -> List[Dict[str, Any]]:
             }
         badge_dicts.append(quota_badge_dict)
         if self.private:
-            restricted_badge_dict = {
+            restricted_badge_dict: BadgeDict = {
                 "type": "restricted",
                 "message": None,
                 "source": "galaxy",
@@ -981,7 +1021,7 @@ def _get_concrete_store_name(self, obj):
     def _get_concrete_store_description_markdown(self, obj):
         return self._call_method("_get_concrete_store_description_markdown", obj, None, False)
 
-    def _get_concrete_store_badges(self, obj):
+    def _get_concrete_store_badges(self, obj) -> List[BadgeDict]:
         return self._call_method("_get_concrete_store_badges", obj, [], False)
 
     def _is_private(self, obj):
@@ -1348,6 +1388,20 @@ def get_quota_source_map(self):
         return quota_source_map
 
 
+class QuotaModel(BaseModel):
+    source: Optional[str]
+    enabled: bool
+
+
+class ConcreteObjectStoreModel(BaseModel):
+    object_store_id: Optional[str]
+    private: bool
+    name: Optional[str]
+    description: Optional[str]
+    quota: QuotaModel
+    badges: List[BadgeDict]
+
+
 def type_to_object_store_class(store: str, fsmon: bool = False) -> Tuple[Type[BaseObjectStore], Dict[str, Any]]:
     objectstore_class: Type[BaseObjectStore]
     objectstore_constructor_kwds = {}
diff --git a/lib/galaxy/webapps/galaxy/api/object_store.py b/lib/galaxy/webapps/galaxy/api/object_store.py
index f53e267339a2..3e3a81442d04 100644
--- a/lib/galaxy/webapps/galaxy/api/object_store.py
+++ b/lib/galaxy/webapps/galaxy/api/object_store.py
@@ -2,11 +2,7 @@
 API operations on Galaxy's object store.
 """
 import logging
-from typing import (
-    Any,
-    Dict,
-    List,
-)
+from typing import List
 
 from fastapi import (
     Path,
@@ -18,7 +14,10 @@
     RequestParameterInvalidException,
 )
 from galaxy.managers.context import ProvidesUserContext
-from galaxy.objectstore import BaseObjectStore
+from galaxy.objectstore import (
+    BaseObjectStore,
+    ConcreteObjectStoreModel,
+)
 from . import (
     depends,
     DependsOnTrans,
@@ -34,7 +33,9 @@
 )
 
 SelectableQueryParam: bool = Query(
-    default=False, title="Selectable", description="Restrict index query to user selectable object stores."
+    default=False,
+    title="Selectable",
+    description="Restrict index query to user selectable object stores, the current implementation requires this to be true.",
 )
 
 
@@ -44,37 +45,34 @@ class FastAPIObjectStore:
 
     @router.get(
         "/api/object_store",
-        summary="",
-        response_description="",
+        summary="Get a list of (currently only concrete) object stores configured with this Galaxy instance.",
+        response_description="A list of the configured object stores.",
     )
     def index(
         self,
         trans: ProvidesUserContext = DependsOnTrans,
         selectable: bool = SelectableQueryParam,
-    ) -> List[Dict[str, Any]]:
+    ) -> List[ConcreteObjectStoreModel]:
         if not selectable:
             raise RequestParameterInvalidException(
                 "The object store index query currently needs to be called with selectable=true"
             )
         selectable_ids = self.object_store.object_store_ids_allowing_selection()
-        return [self._dict_for(selectable_id) for selectable_id in selectable_ids]
+        return [self._model_for(selectable_id) for selectable_id in selectable_ids]
 
     @router.get(
         "/api/object_store/{object_store_id}",
-        summary="Return boolean to indicate if Galaxy's default object store allows selection.",
-        response_description="A list with details about the remote files available to the user.",
+        summary="Get information about a concrete object store configured with Galaxy.",
     )
     def show_info(
         self,
         trans: ProvidesUserContext = DependsOnTrans,
         object_store_id: str = ConcreteObjectStoreIdPathParam,
-    ) -> Dict[str, Any]:
-        return self._dict_for(object_store_id)
+    ) -> ConcreteObjectStoreModel:
+        return self._model_for(object_store_id)
 
-    def _dict_for(self, object_store_id: str) -> Dict[str, Any]:
+    def _model_for(self, object_store_id: str) -> ConcreteObjectStoreModel:
         concrete_object_store = self.object_store.get_concrete_store_by_object_store_id(object_store_id)
         if concrete_object_store is None:
             raise ObjectNotFound()
-        as_dict = concrete_object_store.to_dict()
-        as_dict["object_store_id"] = object_store_id
-        return as_dict
+        return concrete_object_store.to_model(object_store_id)

From 5462b7a3a214bacd0469de8dc10204363dce6457 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Mon, 27 Feb 2023 10:01:00 -0500
Subject: [PATCH 2/8] Convert SelectObjectStore to fetcher pattern.

---
 client/src/components/ObjectStore/SelectObjectStore.vue | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/client/src/components/ObjectStore/SelectObjectStore.vue b/client/src/components/ObjectStore/SelectObjectStore.vue
index 2d3096f4b04c..1cd0aa5a2a04 100644
--- a/client/src/components/ObjectStore/SelectObjectStore.vue
+++ b/client/src/components/ObjectStore/SelectObjectStore.vue
@@ -57,8 +57,7 @@
 </template>
 
 <script>
-import axios from "axios";
-import { prependPath } from "utils/redirect";
+import { fetcher } from "schema/fetcher";
 import LoadingSpan from "components/LoadingSpan";
 import DescribeObjectStore from "components/ObjectStore/DescribeObjectStore";
 import { errorMessageAsString } from "utils/simple-error";
@@ -122,9 +121,9 @@ is not stored in the correct place, contact your Galaxy adminstrator for more in
         },
     },
     async mounted() {
-        const url = prependPath("api/object_store?selectable=true");
+        const get = fetcher.path("/api/object_store").method("get").create();
         try {
-            const { data } = await axios.get(url);
+            const { data } = await get({ selectable: true });
             this.objectStores = data;
             this.loading = false;
         } catch (e) {

From dabdb95c92c6222f9f229251ad5c97deaf567188 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Mon, 27 Feb 2023 10:17:13 -0500
Subject: [PATCH 3/8] Migrate new user quota usage APIs to FastAPI.

---
 lib/galaxy/webapps/galaxy/api/users.py | 139 ++++++++++++++-----------
 lib/galaxy/webapps/galaxy/buildapp.py  |   6 --
 2 files changed, 79 insertions(+), 66 deletions(-)

diff --git a/lib/galaxy/webapps/galaxy/api/users.py b/lib/galaxy/webapps/galaxy/api/users.py
index 016faee817c9..0b0556680d4e 100644
--- a/lib/galaxy/webapps/galaxy/api/users.py
+++ b/lib/galaxy/webapps/galaxy/api/users.py
@@ -5,7 +5,8 @@
 import json
 import logging
 import re
-from typing import Optional
+from typing import Any, Dict, List, Optional
+
 
 from fastapi import (
     Body,
@@ -74,11 +75,18 @@
 
 UserIdPathParam: DecodedDatabaseIdField = Path(..., title="User ID", description="The ID of the user to get.")
 APIKeyPathParam: str = Path(..., title="API Key", description="The API key of the user.")
+FlexibleUserIdPathParam: str = Path(..., title="User ID", description="The ID of the user to get or __current__.")
+QuotaSourceLabelPathParam: str = Path(
+    ...,
+    title="Quota Source Label",
+    description="The label corresponding to the quota source to fetch usage information about.",
+)
 
 
 @router.cbv
 class FastAPIUsers:
     service: UsersService = depends(UsersService)
+    user_serializer: users.UserSerializer = depends(users.UserSerializer)
 
     @router.put(
         "/api/users/recalculate_disk_usage",
@@ -141,6 +149,44 @@ def delete_api_key(
         self.service.delete_api_key(trans, user_id)
         return Response(status_code=status.HTTP_204_NO_CONTENT)
 
+    @router.get(
+        "/api/users/{user_id}/usage",
+        name="get_user_usage",
+        summary="Return the user's quota usage summary broken down by quota source",
+    )
+    def usage(
+        self,
+        trans: ProvidesUserContext = DependsOnTrans,
+        user_id: str = FlexibleUserIdPathParam,
+    ) -> List[Dict[str, Any]]:
+        user = get_user_full(trans, user_id, False)
+        if user:
+            rval = self.user_serializer.serialize_disk_usage(user)
+            return rval
+        else:
+            return []
+
+    @router.get(
+        "/api/users/{user_id}/usage/{label}",
+        name="get_user_usage_for_label",
+        summary="Return the user's quota usage summary for a given quota source label",
+    )
+    def usage_for(
+        self,
+        trans: ProvidesUserContext = DependsOnTrans,
+        user_id: str = FlexibleUserIdPathParam,
+        label: str = QuotaSourceLabelPathParam,
+    ) -> Optional[Dict[str, Any]]:
+        user = get_user_full(trans, user_id, False)
+        effective_label: Optional[str] = label
+        if label == "__null__":
+            effective_label = None
+        if user:
+            rval = self.user_serializer.serialize_disk_usage_for(user, effective_label)
+            return rval
+        else:
+            return None
+
     @router.get(
         "/api/users/{user_id}/beacon",
         summary="Returns information about beacon share settings",
@@ -287,65 +333,7 @@ def _get_user_full(self, trans, user_id, **kwd):
         """Return referenced user or None if anonymous user is referenced."""
         deleted = kwd.get("deleted", "False")
         deleted = util.string_as_bool(deleted)
-        try:
-            # user is requesting data about themselves
-            if user_id == "current":
-                # ...and is anonymous - return usage and quota (if any)
-                if not trans.user:
-                    return None
-
-                # ...and is logged in - return full
-                else:
-                    user = trans.user
-            else:
-                return managers_base.get_object(
-                    trans,
-                    user_id,
-                    "User",
-                    deleted=deleted,
-                )
-            # check that the user is requesting themselves (and they aren't del'd) unless admin
-            if not trans.user_is_admin:
-                if trans.user != user or user.deleted:
-                    raise exceptions.InsufficientPermissionsException(
-                        "You are not allowed to perform action on that user", id=user_id
-                    )
-            return user
-        except exceptions.MessageException:
-            raise
-        except Exception:
-            raise exceptions.RequestParameterInvalidException("Invalid user id specified", id=user_id)
-
-    @expose_api
-    def usage(self, trans, user_id: str, **kwd):
-        """
-        GET /api/users/{user_id}/usage
-
-        Get user's disk usage broken down by quota source.
-        """
-        user = self._get_user_full(trans, user_id, **kwd)
-        if user:
-            rval = self.user_serializer.serialize_disk_usage(user)
-            return rval
-        else:
-            return []
-
-    @expose_api
-    def usage_for(self, trans, user_id: str, label: str, **kwd):
-        """
-        GET /api/users/{user_id}/usage/{label}
-
-        Get user's disk usage for supplied quota source label.
-        """
-        user = self._get_user_full(trans, user_id, **kwd)
-        effective_label: Optional[str] = label
-        if label == "__null__":
-            effective_label = None
-        if user:
-            rval = self.user_serializer.serialize_disk_usage_for(user, effective_label)
-            return rval
-        else:
-            return None
+        return get_user_full(trans, user_id, deleted)
 
     @expose_api
     def create(self, trans: GalaxyWebTransaction, payload: dict, **kwd):
@@ -1153,3 +1141,34 @@ def _get_user(self, trans, id):
         if user != trans.user and not trans.user_is_admin:
             raise exceptions.InsufficientPermissionsException("Access denied.")
         return user
+
+
+def get_user_full(trans: ProvidesUserContext, user_id: str, deleted: bool) -> Optional[User]:
+    try:
+        # user is requesting data about themselves
+        if user_id == "current":
+            # ...and is anonymous - return usage and quota (if any)
+            if not trans.user:
+                return None
+
+            # ...and is logged in - return full
+            else:
+                user = trans.user
+        else:
+            return managers_base.get_object(
+                trans,
+                user_id,
+                "User",
+                deleted=deleted,
+            )
+        # check that the user is requesting themselves (and they aren't del'd) unless admin
+        if not trans.user_is_admin:
+            if trans.user != user or user.deleted:
+                raise exceptions.InsufficientPermissionsException(
+                    "You are not allowed to perform action on that user", id=user_id
+                )
+        return user
+    except exceptions.MessageException:
+        raise
+    except Exception:
+        raise exceptions.RequestParameterInvalidException("Invalid user id specified", id=user_id)
diff --git a/lib/galaxy/webapps/galaxy/buildapp.py b/lib/galaxy/webapps/galaxy/buildapp.py
index 79c2e9098ba9..a9bcaba11314 100644
--- a/lib/galaxy/webapps/galaxy/buildapp.py
+++ b/lib/galaxy/webapps/galaxy/buildapp.py
@@ -583,12 +583,6 @@ def populate_api_routes(webapp, app):
         conditions=dict(method=["POST"]),
     )
 
-    webapp.mapper.connect(
-        "/api/users/{user_id}/usage", action="usage", controller="users", conditions=dict(method=["GET"])
-    )
-    webapp.mapper.connect(
-        "/api/users/{user_id}/usage/{label}", action="usage_for", controller="users", conditions=dict(method=["GET"])
-    )
     webapp.mapper.resource_with_deleted("user", "users", path_prefix="/api")
     webapp.mapper.resource("visualization", "visualizations", path_prefix="/api")
     webapp.mapper.resource("plugins", "plugins", path_prefix="/api")

From d1b759418f861a9a7721f348f261689287806891 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Mon, 27 Feb 2023 15:56:14 -0500
Subject: [PATCH 4/8] pydantic the new user quota usage APIs

---
 client/src/schema/schema.ts            | 77 ++++++++++++++++++++++++++
 lib/galaxy/managers/users.py           | 43 +++++++++-----
 lib/galaxy/model/__init__.py           | 70 +++++++++++++----------
 lib/galaxy/quota/__init__.py           | 23 +++++---
 lib/galaxy/webapps/galaxy/api/users.py | 11 ++--
 test/unit/data/test_quota.py           | 52 ++++++++---------
 6 files changed, 197 insertions(+), 79 deletions(-)

diff --git a/client/src/schema/schema.ts b/client/src/schema/schema.ts
index dbfdf897cdf6..1f37909e345b 100644
--- a/client/src/schema/schema.ts
+++ b/client/src/schema/schema.ts
@@ -1189,6 +1189,14 @@ export interface paths {
          */
         post: operations["set_beacon_api_users__user_id__beacon_post"];
     };
+    "/api/users/{user_id}/usage": {
+        /** Return the user's quota usage summary broken down by quota source */
+        get: operations["get_user_usage_api_users__user_id__usage_get"];
+    };
+    "/api/users/{user_id}/usage/{label}": {
+        /** Return the user's quota usage summary for a given quota source label */
+        get: operations["get_user_usage_for_label_api_users__user_id__usage__label__get"];
+    };
     "/api/version": {
         /**
          * Return Galaxy version information: major/minor version, optional extra info
@@ -7386,6 +7394,19 @@ export interface components {
              */
             user: components["schemas"]["UserModel"];
         };
+        /** UserQuotaUsage */
+        UserQuotaUsage: {
+            /** Quota */
+            quota?: string;
+            /** Quota Bytes */
+            quota_bytes?: number;
+            /** Quota Percent */
+            quota_percent?: number;
+            /** Quota Source Label */
+            quota_source_label?: string;
+            /** Total Disk Usage */
+            total_disk_usage: number;
+        };
         /** ValidationError */
         ValidationError: {
             /** Location */
@@ -14149,6 +14170,62 @@ export interface operations {
             };
         };
     };
+    get_user_usage_api_users__user_id__usage_get: {
+        /** Return the user's quota usage summary broken down by quota source */
+        parameters: {
+            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
+            header?: {
+                "run-as"?: string;
+            };
+            /** @description The ID of the user to get or __current__. */
+            path: {
+                user_id: string;
+            };
+        };
+        responses: {
+            /** @description Successful Response */
+            200: {
+                content: {
+                    "application/json": components["schemas"]["UserQuotaUsage"][];
+                };
+            };
+            /** @description Validation Error */
+            422: {
+                content: {
+                    "application/json": components["schemas"]["HTTPValidationError"];
+                };
+            };
+        };
+    };
+    get_user_usage_for_label_api_users__user_id__usage__label__get: {
+        /** Return the user's quota usage summary for a given quota source label */
+        parameters: {
+            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
+            header?: {
+                "run-as"?: string;
+            };
+            /** @description The ID of the user to get or __current__. */
+            /** @description The label corresponding to the quota source to fetch usage information about. */
+            path: {
+                user_id: string;
+                label: string;
+            };
+        };
+        responses: {
+            /** @description Successful Response */
+            200: {
+                content: {
+                    "application/json": components["schemas"]["UserQuotaUsage"];
+                };
+            };
+            /** @description Validation Error */
+            422: {
+                content: {
+                    "application/json": components["schemas"]["HTTPValidationError"];
+                };
+            };
+        };
+    };
     version_api_version_get: {
         /**
          * Return Galaxy version information: major/minor version, optional extra info
diff --git a/lib/galaxy/managers/users.py b/lib/galaxy/managers/users.py
index 7e3c6c3c589d..2c58dd7e1052 100644
--- a/lib/galaxy/managers/users.py
+++ b/lib/galaxy/managers/users.py
@@ -34,6 +34,7 @@
     base,
     deletable,
 )
+from galaxy.model import UserQuotaUsage
 from galaxy.security.validate_user_input import (
     VALID_EMAIL_RE,
     validate_email,
@@ -650,22 +651,38 @@ def add_serializers(self):
             }
         )
 
-    def serialize_disk_usage(self, user: model.User) -> List[Dict[str, Any]]:
-        rval = user.dictify_usage(self.app.object_store)
-        for usage in rval:
-            quota_source_label = usage["quota_source_label"]
-            usage["quota_percent"] = self.user_manager.quota(user, quota_source_label=quota_source_label)
-            usage["quota"] = self.user_manager.quota(user, total=True, quota_source_label=quota_source_label)
-            usage["quota_bytes"] = self.user_manager.quota_bytes(user, quota_source_label=quota_source_label)
+    def serialize_disk_usage(self, user: model.User) -> List[UserQuotaUsage]:
+        usages = user.dictify_usage(self.app.object_store)
+        rval: List[UserQuotaUsage] = []
+        for usage in usages:
+            quota_source_label = usage.quota_source_label
+            quota_percent = self.user_manager.quota(user, quota_source_label=quota_source_label)
+            quota = self.user_manager.quota(user, total=True, quota_source_label=quota_source_label)
+            quota_bytes = self.user_manager.quota_bytes(user, quota_source_label=quota_source_label)
+            rval.append(
+                UserQuotaUsage(
+                    quota_source_label=quota_source_label,
+                    total_disk_usage=usage.total_disk_usage,
+                    quota_percent=quota_percent,
+                    quota=quota,
+                    quota_bytes=quota_bytes,
+                )
+            )
         return rval
 
-    def serialize_disk_usage_for(self, user: model.User, label: Optional[str]) -> Dict[str, Any]:
+    def serialize_disk_usage_for(self, user: model.User, label: Optional[str]) -> UserQuotaUsage:
         usage = user.dictify_usage_for(label)
-        quota_source_label = usage["quota_source_label"]
-        usage["quota_percent"] = self.user_manager.quota(user, quota_source_label=quota_source_label)
-        usage["quota"] = self.user_manager.quota(user, total=True, quota_source_label=quota_source_label)
-        usage["quota_bytes"] = self.user_manager.quota_bytes(user, quota_source_label=quota_source_label)
-        return usage
+        quota_source_label = usage.quota_source_label
+        quota_percent = self.user_manager.quota(user, quota_source_label=quota_source_label)
+        quota = self.user_manager.quota(user, total=True, quota_source_label=quota_source_label)
+        quota_bytes = self.user_manager.quota_bytes(user, quota_source_label=quota_source_label)
+        return UserQuotaUsage(
+            quota_source_label=quota_source_label,
+            total_disk_usage=usage.total_disk_usage,
+            quota_percent=quota_percent,
+            quota=quota,
+            quota_bytes=quota_bytes,
+        )
 
 
 class UserDeserializer(base.ModelDeserializer):
diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py
index 7513e6ebf734..c60127d8f28e 100644
--- a/lib/galaxy/model/__init__.py
+++ b/lib/galaxy/model/__init__.py
@@ -40,6 +40,7 @@
 
 import sqlalchemy
 from boltons.iterutils import remap
+from pydantic import BaseModel
 from social_core.storage import (
     AssociationMixin,
     CodeMixin,
@@ -634,6 +635,19 @@ def calculate_user_disk_usage_statements(user_id, quota_source_map, for_sqlite=F
     return statements
 
 
+# move these to galaxy.schema.schema once galaxy-data depends on
+# galaxy-schema.
+class UserQuotaBasicUsage(BaseModel):
+    quota_source_label: Optional[str]
+    total_disk_usage: float
+
+
+class UserQuotaUsage(UserQuotaBasicUsage):
+    quota_percent: Optional[float]
+    quota_bytes: Optional[int]
+    quota: Optional[str]
+
+
 class User(Base, Dictifiable, RepresentById):
     """
     Data for a Galaxy user or admin and relations to their
@@ -1025,23 +1039,23 @@ def attempt_create_private_role(self):
         session.add(assoc)
         session.flush()
 
-    def dictify_usage(self, object_store=None) -> List[Dict[str, Any]]:
+    def dictify_usage(self, object_store=None) -> List[UserQuotaBasicUsage]:
         """Include object_store to include empty/unused usage info."""
         used_labels: Set[Union[str, None]] = set()
-        rval: List[Dict[str, Any]] = [
-            {
-                "quota_source_label": None,
-                "total_disk_usage": float(self.disk_usage or 0),
-            }
+        rval: List[UserQuotaBasicUsage] = [
+            UserQuotaBasicUsage(
+                quota_source_label=None,
+                total_disk_usage=float(self.disk_usage or 0),
+            )
         ]
         used_labels.add(None)
         for quota_source_usage in self.quota_source_usages:
             label = quota_source_usage.quota_source_label
             rval.append(
-                {
-                    "quota_source_label": label,
-                    "total_disk_usage": float(quota_source_usage.disk_usage),
-                }
+                UserQuotaBasicUsage(
+                    quota_source_label=label,
+                    total_disk_usage=float(quota_source_usage.disk_usage),
+                )
             )
             used_labels.add(label)
 
@@ -1049,33 +1063,33 @@ def dictify_usage(self, object_store=None) -> List[Dict[str, Any]]:
             for label in object_store.get_quota_source_map().ids_per_quota_source().keys():
                 if label not in used_labels:
                     rval.append(
-                        {
-                            "quota_source_label": label,
-                            "total_disk_usage": 0.0,
-                        }
+                        UserQuotaBasicUsage(
+                            quota_source_label=label,
+                            total_disk_usage=0.0,
+                        )
                     )
 
         return rval
 
-    def dictify_usage_for(self, quota_source_label: Optional[str]) -> Dict[str, Any]:
-        rval: Dict[str, Any]
+    def dictify_usage_for(self, quota_source_label: Optional[str]) -> UserQuotaBasicUsage:
+        rval: UserQuotaBasicUsage
         if quota_source_label is None:
-            rval = {
-                "quota_source_label": None,
-                "total_disk_usage": float(self.disk_usage or 0),
-            }
+            rval = UserQuotaBasicUsage(
+                quota_source_label=None,
+                total_disk_usage=float(self.disk_usage or 0),
+            )
         else:
             quota_source_usage = self.quota_source_usage_for(quota_source_label)
             if quota_source_usage is None:
-                rval = {
-                    "quota_source_label": quota_source_label,
-                    "total_disk_usage": 0.0,
-                }
+                rval = UserQuotaBasicUsage(
+                    quota_source_label=quota_source_label,
+                    total_disk_usage=0.0,
+                )
             else:
-                rval = {
-                    "quota_source_label": quota_source_label,
-                    "total_disk_usage": float(quota_source_usage.disk_usage),
-                }
+                rval = UserQuotaBasicUsage(
+                    quota_source_label=quota_source_label,
+                    total_disk_usage=float(quota_source_usage.disk_usage),
+                )
 
         return rval
 
diff --git a/lib/galaxy/quota/__init__.py b/lib/galaxy/quota/__init__.py
index b01cf47d5ae6..5102f263cd95 100644
--- a/lib/galaxy/quota/__init__.py
+++ b/lib/galaxy/quota/__init__.py
@@ -1,5 +1,6 @@
 """Galaxy Quotas"""
 import logging
+from typing import Optional
 
 from sqlalchemy.sql import text
 
@@ -23,10 +24,10 @@ class QuotaAgent:  # metaclass=abc.ABCMeta
     """
 
     # TODO: make abstractmethod after they work better with mypy
-    def get_quota(self, user, quota_source_label=None):
+    def get_quota(self, user, quota_source_label=None) -> Optional[int]:
         """Return quota in bytes or None if no quota is set."""
 
-    def get_quota_nice_size(self, user, quota_source_label=None):
+    def get_quota_nice_size(self, user, quota_source_label=None) -> Optional[str]:
         """Return quota as a human-readable string or 'unlimited' if no quota is set."""
         quota_bytes = self.get_quota(user, quota_source_label=quota_source_label)
         if quota_bytes is not None:
@@ -36,10 +37,12 @@ def get_quota_nice_size(self, user, quota_source_label=None):
         return quota_str
 
     # TODO: make abstractmethod after they work better with mypy
-    def get_percent(self, trans=None, user=False, history=False, usage=False, quota=False, quota_source_label=None):
+    def get_percent(
+        self, trans=None, user=False, history=False, usage=False, quota=False, quota_source_label=None
+    ) -> Optional[int]:
         """Return the percentage of any storage quota applicable to the user/transaction."""
 
-    def get_usage(self, trans=None, user=False, history=False, quota_source_label=None):
+    def get_usage(self, trans=None, user=False, history=False, quota_source_label=None) -> Optional[float]:
         if trans:
             user = trans.user
             history = trans.history
@@ -73,14 +76,16 @@ class NoQuotaAgent(QuotaAgent):
     def __init__(self):
         pass
 
-    def get_quota(self, user, quota_source_label=None):
+    def get_quota(self, user, quota_source_label=None) -> Optional[int]:
         return None
 
     @property
     def default_quota(self):
         return None
 
-    def get_percent(self, trans=None, user=False, history=False, usage=False, quota=False, quota_source_label=None):
+    def get_percent(
+        self, trans=None, user=False, history=False, usage=False, quota=False, quota_source_label=None
+    ) -> Optional[int]:
         return None
 
     def is_over_quota(self, app, job, job_destination):
@@ -94,7 +99,7 @@ def __init__(self, model):
         self.model = model
         self.sa_session = model.context
 
-    def get_quota(self, user, quota_source_label=None):
+    def get_quota(self, user, quota_source_label=None) -> Optional[int]:
         """
         Calculated like so:
 
@@ -220,7 +225,9 @@ def set_default_quota(self, default_type, quota):
         self.sa_session.add(target_default)
         self.sa_session.flush()
 
-    def get_percent(self, trans=None, user=False, history=False, usage=False, quota=False, quota_source_label=None):
+    def get_percent(
+        self, trans=None, user=False, history=False, usage=False, quota=False, quota_source_label=None
+    ) -> Optional[int]:
         """
         Return the percentage of any storage quota applicable to the user/transaction.
         """
diff --git a/lib/galaxy/webapps/galaxy/api/users.py b/lib/galaxy/webapps/galaxy/api/users.py
index 0b0556680d4e..82a1a75e5561 100644
--- a/lib/galaxy/webapps/galaxy/api/users.py
+++ b/lib/galaxy/webapps/galaxy/api/users.py
@@ -5,8 +5,10 @@
 import json
 import logging
 import re
-from typing import Any, Dict, List, Optional
-
+from typing import (
+    List,
+    Optional,
+)
 
 from fastapi import (
     Body,
@@ -35,6 +37,7 @@
 from galaxy.model import (
     User,
     UserAddress,
+    UserQuotaUsage,
 )
 from galaxy.schema import APIKeyModel
 from galaxy.schema.fields import DecodedDatabaseIdField
@@ -158,7 +161,7 @@ def usage(
         self,
         trans: ProvidesUserContext = DependsOnTrans,
         user_id: str = FlexibleUserIdPathParam,
-    ) -> List[Dict[str, Any]]:
+    ) -> List[UserQuotaUsage]:
         user = get_user_full(trans, user_id, False)
         if user:
             rval = self.user_serializer.serialize_disk_usage(user)
@@ -176,7 +179,7 @@ def usage_for(
         trans: ProvidesUserContext = DependsOnTrans,
         user_id: str = FlexibleUserIdPathParam,
         label: str = QuotaSourceLabelPathParam,
-    ) -> Optional[Dict[str, Any]]:
+    ) -> Optional[UserQuotaUsage]:
         user = get_user_full(trans, user_id, False)
         effective_label: Optional[str] = label
         if label == "__null__":
diff --git a/test/unit/data/test_quota.py b/test/unit/data/test_quota.py
index ebdc256c5b65..508476c47c12 100644
--- a/test/unit/data/test_quota.py
+++ b/test/unit/data/test_quota.py
@@ -60,8 +60,8 @@ def test_calculate_usage_per_source(self):
 
         usages = self.u.dictify_usage()
         assert len(usages) == 2
-        assert usages[1]["quota_source_label"] == "myquotalabel"
-        assert usages[1]["total_disk_usage"] == 114
+        assert usages[1].quota_source_label == "myquotalabel"
+        assert usages[1].total_disk_usage == 114
 
 
 class TestCalculateUsage(BaseModelTestCase):
@@ -144,23 +144,23 @@ def test_calculate_usage_alt_quota(self):
         model.context.refresh(u)
         usages = u.dictify_usage(object_store)
         assert len(usages) == 2
-        assert usages[0]["quota_source_label"] is None
-        assert usages[0]["total_disk_usage"] == 10
+        assert usages[0].quota_source_label is None
+        assert usages[0].total_disk_usage == 10
 
-        assert usages[1]["quota_source_label"] == "alt_source"
-        assert usages[1]["total_disk_usage"] == 15
+        assert usages[1].quota_source_label == "alt_source"
+        assert usages[1].total_disk_usage == 15
 
         usage = u.dictify_usage_for(None)
-        assert usage["quota_source_label"] is None
-        assert usage["total_disk_usage"] == 10
+        assert usage.quota_source_label is None
+        assert usage.total_disk_usage == 10
 
         usage = u.dictify_usage_for("alt_source")
-        assert usage["quota_source_label"] == "alt_source"
-        assert usage["total_disk_usage"] == 15
+        assert usage.quota_source_label == "alt_source"
+        assert usage.total_disk_usage == 15
 
         usage = u.dictify_usage_for("unused_source")
-        assert usage["quota_source_label"] == "unused_source"
-        assert usage["total_disk_usage"] == 0
+        assert usage.quota_source_label == "unused_source"
+        assert usage.total_disk_usage == 0
 
     def test_calculate_usage_removes_unused_quota_labels(self):
         model = self.model
@@ -180,22 +180,22 @@ def test_calculate_usage_removes_unused_quota_labels(self):
         model.context.refresh(u)
         usages = u.dictify_usage()
         assert len(usages) == 2
-        assert usages[0]["quota_source_label"] is None
-        assert usages[0]["total_disk_usage"] == 10
+        assert usages[0].quota_source_label is None
+        assert usages[0].total_disk_usage == 10
 
-        assert usages[1]["quota_source_label"] == "alt_source"
-        assert usages[1]["total_disk_usage"] == 15
+        assert usages[1].quota_source_label == "alt_source"
+        assert usages[1].total_disk_usage == 15
 
         alt_source.default_quota_source = "new_alt_source"
         u.calculate_and_set_disk_usage(object_store)
         model.context.refresh(u)
         usages = u.dictify_usage()
         assert len(usages) == 2
-        assert usages[0]["quota_source_label"] is None
-        assert usages[0]["total_disk_usage"] == 10
+        assert usages[0].quota_source_label is None
+        assert usages[0].total_disk_usage == 10
 
-        assert usages[1]["quota_source_label"] == "new_alt_source"
-        assert usages[1]["total_disk_usage"] == 15
+        assert usages[1].quota_source_label == "new_alt_source"
+        assert usages[1].total_disk_usage == 15
 
     def test_dictify_usage_unused_quota_labels(self):
         model = self.model
@@ -236,11 +236,11 @@ def test_calculate_usage_default_storage_disabled(self):
         model.context.refresh(u)
         usages = u.dictify_usage(object_store)
         assert len(usages) == 2
-        assert usages[0]["quota_source_label"] is None
-        assert usages[0]["total_disk_usage"] == 0
+        assert usages[0].quota_source_label is None
+        assert usages[0].total_disk_usage == 0
 
-        assert usages[1]["quota_source_label"] == "alt_source"
-        assert usages[1]["total_disk_usage"] == 15
+        assert usages[1].quota_source_label == "alt_source"
+        assert usages[1].total_disk_usage == 15
 
 
 class TestQuota(BaseModelTestCase):
@@ -377,5 +377,5 @@ def test_labeled_usage(self):
 
         usages = u.dictify_usage()
         assert len(usages) == 2
-        assert usages[1]["quota_source_label"] == "foobar"
-        assert usages[1]["total_disk_usage"] == 247
+        assert usages[1].quota_source_label == "foobar"
+        assert usages[1].total_disk_usage == 247

From d92d606c18d68e476d7a48f5cca7edfa89b47fac Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Wed, 1 Mar 2023 13:36:21 -0500
Subject: [PATCH 5/8] Rework object store selection jest tests for fetcher
 pattern.

---
 .../SelectPreferredStore.test.js               | 18 +++++++++---------
 .../ObjectStore/SelectObjectStore.vue          |  5 ++---
 .../src/components/ObjectStore/mockServices.ts | 12 ++++++++++++
 client/src/components/ObjectStore/services.ts  |  8 ++++++++
 .../User/UserPreferredObjectStore.test.js      | 16 +++++++---------
 5 files changed, 38 insertions(+), 21 deletions(-)
 create mode 100644 client/src/components/ObjectStore/mockServices.ts
 create mode 100644 client/src/components/ObjectStore/services.ts

diff --git a/client/src/components/History/CurrentHistory/SelectPreferredStore.test.js b/client/src/components/History/CurrentHistory/SelectPreferredStore.test.js
index 14f50f81ba67..0e9a627293e0 100644
--- a/client/src/components/History/CurrentHistory/SelectPreferredStore.test.js
+++ b/client/src/components/History/CurrentHistory/SelectPreferredStore.test.js
@@ -1,10 +1,14 @@
 import { mount } from "@vue/test-utils";
 import { getLocalVue } from "tests/jest/helpers";
-import SelectPreferredStore from "./SelectPreferredStore";
+import { setupSelectableMock } from "../../ObjectStore/mockServices";
+setupSelectableMock();
+
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
 import flushPromises from "flush-promises";
 
+import SelectPreferredStore from "./SelectPreferredStore.vue";
+
 const localVue = getLocalVue(true);
 
 const TEST_HISTORY_ID = "myTestHistoryId";
@@ -22,19 +26,15 @@ function mountComponent() {
     return wrapper;
 }
 
-import { ROOT_COMPONENT } from "utils/navigation";
+import { ROOT_COMPONENT } from "@/utils/navigation";
 
-const OBJECT_STORES = [
-    { object_store_id: "object_store_1", badges: [], quota: { enabled: false } },
-    { object_store_id: "object_store_2", badges: [], quota: { enabled: false } },
-];
+const PREFERENCES = ROOT_COMPONENT.preferences;
 
 describe("SelectPreferredStore.vue", () => {
     let axiosMock;
 
     beforeEach(async () => {
         axiosMock = new MockAdapter(axios);
-        axiosMock.onGet("/api/object_store?selectable=true").reply(200, OBJECT_STORES);
     });
 
     afterEach(async () => {
@@ -44,10 +44,10 @@ describe("SelectPreferredStore.vue", () => {
     it("updates object store to default on selection null", async () => {
         const wrapper = mountComponent();
         await flushPromises();
-        const els = wrapper.findAll(ROOT_COMPONENT.preferences.object_store_selection.option_buttons.selector);
+        const els = wrapper.findAll(PREFERENCES.object_store_selection.option_buttons.selector);
         expect(els.length).toBe(3);
         const galaxyDefaultOption = wrapper.find(
-            ROOT_COMPONENT.preferences.object_store_selection.option_button({ object_store_id: "__null__" }).selector
+            PREFERENCES.object_store_selection.option_button({ object_store_id: "__null__" }).selector
         );
         expect(galaxyDefaultOption.exists()).toBeTruthy();
         axiosMock
diff --git a/client/src/components/ObjectStore/SelectObjectStore.vue b/client/src/components/ObjectStore/SelectObjectStore.vue
index 1cd0aa5a2a04..073bbd8a280d 100644
--- a/client/src/components/ObjectStore/SelectObjectStore.vue
+++ b/client/src/components/ObjectStore/SelectObjectStore.vue
@@ -57,12 +57,12 @@
 </template>
 
 <script>
-import { fetcher } from "schema/fetcher";
 import LoadingSpan from "components/LoadingSpan";
 import DescribeObjectStore from "components/ObjectStore/DescribeObjectStore";
 import { errorMessageAsString } from "utils/simple-error";
 import ObjectStoreBadges from "components/ObjectStore/ObjectStoreBadges";
 import ProvidedQuotaSourceUsageBar from "components/User/DiskUsage/Quota/ProvidedQuotaSourceUsageBar";
+import { getSelectableObjectStores } from "./services";
 
 export default {
     components: {
@@ -121,9 +121,8 @@ is not stored in the correct place, contact your Galaxy adminstrator for more in
         },
     },
     async mounted() {
-        const get = fetcher.path("/api/object_store").method("get").create();
         try {
-            const { data } = await get({ selectable: true });
+            const data = await getSelectableObjectStores();
             this.objectStores = data;
             this.loading = false;
         } catch (e) {
diff --git a/client/src/components/ObjectStore/mockServices.ts b/client/src/components/ObjectStore/mockServices.ts
new file mode 100644
index 000000000000..bd9e0f80c4e8
--- /dev/null
+++ b/client/src/components/ObjectStore/mockServices.ts
@@ -0,0 +1,12 @@
+import { getSelectableObjectStores } from "./services";
+jest.mock("./services");
+
+const OBJECT_STORES = [
+    { object_store_id: "object_store_1", badges: [], quota: { enabled: false }, private: false },
+    { object_store_id: "object_store_2", badges: [], quota: { enabled: false }, private: false },
+];
+
+export function setupSelectableMock() {
+    const mockGetObjectStores = getSelectableObjectStores as jest.MockedFunction<typeof getSelectableObjectStores>;
+    mockGetObjectStores.mockResolvedValue(OBJECT_STORES);
+}
diff --git a/client/src/components/ObjectStore/services.ts b/client/src/components/ObjectStore/services.ts
new file mode 100644
index 000000000000..418526f17818
--- /dev/null
+++ b/client/src/components/ObjectStore/services.ts
@@ -0,0 +1,8 @@
+import { fetcher } from "@/schema/fetcher";
+
+const getObjectStores = fetcher.path("/api/object_store").method("get").create();
+
+export async function getSelectableObjectStores() {
+    const { data } = await getObjectStores({ selectable: true });
+    return data;
+}
diff --git a/client/src/components/User/UserPreferredObjectStore.test.js b/client/src/components/User/UserPreferredObjectStore.test.js
index 36eaeb7e09c5..4889ee8e1370 100644
--- a/client/src/components/User/UserPreferredObjectStore.test.js
+++ b/client/src/components/User/UserPreferredObjectStore.test.js
@@ -1,9 +1,12 @@
+import { setupSelectableMock } from "../ObjectStore/mockServices";
+setupSelectableMock();
+
 import { mount } from "@vue/test-utils";
 import { getLocalVue } from "tests/jest/helpers";
-import UserPreferredObjectStore from "./UserPreferredObjectStore";
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
 import flushPromises from "flush-promises";
+import UserPreferredObjectStore from "./UserPreferredObjectStore.vue";
 
 const localVue = getLocalVue(true);
 
@@ -18,19 +21,13 @@ function mountComponent() {
     return wrapper;
 }
 
-import { ROOT_COMPONENT } from "utils/navigation";
-
-const OBJECT_STORES = [
-    { object_store_id: "object_store_1", badges: [], quota: { enabled: false } },
-    { object_store_id: "object_store_2", badges: [], quota: { enabled: false } },
-];
+import { ROOT_COMPONENT } from "@/utils/navigation";
 
 describe("UserPreferredObjectStore.vue", () => {
     let axiosMock;
 
     beforeEach(async () => {
         axiosMock = new MockAdapter(axios);
-        axiosMock.onGet("/api/object_store?selectable=true").reply(200, OBJECT_STORES);
     });
 
     afterEach(async () => {
@@ -50,6 +47,7 @@ describe("UserPreferredObjectStore.vue", () => {
         const wrapper = mountComponent();
         const el = await wrapper.find(ROOT_COMPONENT.preferences.object_store.selector);
         await el.trigger("click");
+        await flushPromises();
         const els = wrapper.findAll(ROOT_COMPONENT.preferences.object_store_selection.option_buttons.selector);
         expect(els.length).toBe(3);
         const galaxyDefaultOption = wrapper.find(
@@ -63,7 +61,7 @@ describe("UserPreferredObjectStore.vue", () => {
         expect(errorEl.exists()).toBeFalsy();
     });
 
-    it("updates object store to default on selection null", async () => {
+    it("updates object store to default on actual selection", async () => {
         const wrapper = mountComponent();
         const el = await wrapper.find(ROOT_COMPONENT.preferences.object_store.selector);
         await el.trigger("click");

From fcd616d4f7095d26892af5cfd4d594db9c699cf5 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Thu, 2 Mar 2023 15:03:00 -0500
Subject: [PATCH 6/8] Migrate SelectObjectStore to composition API.

---
 .../CurrentHistory/SelectPreferredStore.vue   |  16 +-
 .../ObjectStore/SelectObjectStore.vue         | 178 +++++++++---------
 2 files changed, 94 insertions(+), 100 deletions(-)

diff --git a/client/src/components/History/CurrentHistory/SelectPreferredStore.vue b/client/src/components/History/CurrentHistory/SelectPreferredStore.vue
index 6cf49f4f0801..0fd3195918f4 100644
--- a/client/src/components/History/CurrentHistory/SelectPreferredStore.vue
+++ b/client/src/components/History/CurrentHistory/SelectPreferredStore.vue
@@ -35,27 +35,27 @@ export default {
             selectedObjectStoreId: selectedObjectStoreId,
             newDatasetsDescription: "New dataset outputs from tools and workflows executed in this history",
             popoverPlacement: "left",
-            galaxySelectionDefalutTitle: "Use Galaxy Defaults",
-            galaxySelectionDefalutDescription:
+            galaxySelectionDefaultTitle: "Use Galaxy Defaults",
+            galaxySelectionDefaultDescription:
                 "Selecting this will reset Galaxy to default behaviors configured by your Galaxy administrator.",
-            userSelectionDefalutTitle: "Use Your User Preference Defaults",
-            userSelectionDefalutDescription:
+            userSelectionDefaultTitle: "Use Your User Preference Defaults",
+            userSelectionDefaultDescription:
                 "Selecting this will cause the history to not set a default and to fallback to your user preference defined default.",
         };
     },
     computed: {
         defaultOptionTitle() {
             if (this.userPreferredObjectStoreId) {
-                return this.userSelectionDefalutTitle;
+                return this.userSelectionDefaultTitle;
             } else {
-                return this.galaxySelectionDefalutTitle;
+                return this.galaxySelectionDefaultTitle;
             }
         },
         defaultOptionDescription() {
             if (this.userPreferredObjectStoreId) {
-                return this.userSelectionDefalutDescription;
+                return this.userSelectionDefaultDescription;
             } else {
-                return this.galaxySelectionDefalutDescription;
+                return this.galaxySelectionDefaultDescription;
             }
         },
     },
diff --git a/client/src/components/ObjectStore/SelectObjectStore.vue b/client/src/components/ObjectStore/SelectObjectStore.vue
index 073bbd8a280d..0ce3cb152923 100644
--- a/client/src/components/ObjectStore/SelectObjectStore.vue
+++ b/client/src/components/ObjectStore/SelectObjectStore.vue
@@ -1,3 +1,89 @@
+<script lang="ts" setup>
+import { ref, watch, onMounted } from "vue";
+import LoadingSpan from "@/components/LoadingSpan.vue";
+import DescribeObjectStore from "@/components/ObjectStore/DescribeObjectStore.vue";
+import { errorMessageAsString } from "@/utils/simple-error";
+import ObjectStoreBadges from "@/components/ObjectStore/ObjectStoreBadges.vue";
+import ProvidedQuotaSourceUsageBar from "@/components/User/DiskUsage/Quota/ProvidedQuotaSourceUsageBar.vue";
+import { getSelectableObjectStores } from "./services";
+
+const props = defineProps({
+    selectedObjectStoreId: {
+        type: String,
+        default: null,
+    },
+    defaultOptionTitle: {
+        // "Use Your User Preference Defaults"
+        type: String,
+        required: true,
+    },
+    defaultOptionDescription: {
+        // "Selecting this will cause the history to not set a default and to fallback to your user preference defined default."
+        type: String,
+        required: true,
+    },
+    forWhat: {
+        type: String,
+        required: true,
+    },
+    parentError: {
+        type: String,
+        default: null,
+    },
+});
+
+const loading = ref(true);
+const error = ref(props.parentError);
+const popoverPlacement = "left";
+const objectStores = ref<Array<object>>([]);
+
+const loadingObjectStoreInfoMessage = ref("Loading object store information");
+const whyIsSelectionPreferredText = ref(`
+Selecting this will reset Galaxy to default behaviors configured by your Galaxy administrator.
+Select a preferred object store for new datasets. This is should be thought of as a preferred
+object store because depending the job and workflow configuration execution configuration of
+this Galaxy instance - a different object store may be selected. After a dataset is created,
+click on the info icon in the history panel to view information about where it is stored. If it
+is not stored in the correct place, contact your Galaxy administrator for more information.
+`);
+
+watch(
+    () => props.parentError,
+    () => {
+        error.value = props.parentError;
+    }
+);
+
+function handleError(e: unknown) {
+    const errorMessage = errorMessageAsString(e);
+    error.value = errorMessage;
+}
+
+onMounted(async () => {
+    try {
+        const data = await getSelectableObjectStores();
+        objectStores.value = data;
+        loading.value = false;
+    } catch (e) {
+        handleError(e);
+    }
+});
+
+function variant(objectStoreId: string) {
+    if (props.selectedObjectStoreId == objectStoreId) {
+        return "outline-primary";
+    } else {
+        return "outline-info";
+    }
+}
+
+const emit = defineEmits(["onSubmit"]);
+
+async function handleSubmit(preferredObjectStoreId: string) {
+    emit("onSubmit", preferredObjectStoreId);
+}
+</script>
+
 <template>
     <div>
         <loading-span v-if="loading" :message="loadingObjectStoreInfoMessage" />
@@ -55,95 +141,3 @@
         </div>
     </div>
 </template>
-
-<script>
-import LoadingSpan from "components/LoadingSpan";
-import DescribeObjectStore from "components/ObjectStore/DescribeObjectStore";
-import { errorMessageAsString } from "utils/simple-error";
-import ObjectStoreBadges from "components/ObjectStore/ObjectStoreBadges";
-import ProvidedQuotaSourceUsageBar from "components/User/DiskUsage/Quota/ProvidedQuotaSourceUsageBar";
-import { getSelectableObjectStores } from "./services";
-
-export default {
-    components: {
-        LoadingSpan,
-        DescribeObjectStore,
-        ObjectStoreBadges,
-        ProvidedQuotaSourceUsageBar,
-    },
-    props: {
-        selectedObjectStoreId: {
-            type: String,
-            default: null,
-        },
-        defaultOptionTitle: {
-            // "Use Your User Preference Defaults"
-            type: String,
-            required: true,
-        },
-        defaultOptionDescription: {
-            // "Selecting this will cause the history to not set a default and to fallback to your user preference defined default."
-            type: String,
-            required: true,
-        },
-        forWhat: {
-            type: String,
-            required: true,
-        },
-        parentError: {
-            type: String,
-            default: null,
-        },
-    },
-    data() {
-        return {
-            loading: true,
-            error: this.parentError,
-            popoverPlacement: "left",
-            objectStores: [],
-            loadingObjectStoreInfoMessage: "Loading object store information",
-            galaxySelectionDefalutTitle: "Use Galaxy Defaults",
-            galaxySelectionDefalutDescription:
-                "Selecting this will reset Galaxy to default behaviors configured by your Galaxy administrator.",
-            whyIsSelectionPreferredText: `
-Selecting this will reset Galaxy to default behaviors configured by your Galaxy administrator.
-Select a preferred object store for new datasets. This is should be thought of as a preferred
-object store because depending the job and workflow configuration execution configuration of
-this Galaxy instance - a different object store may be selected. After a dataset is created,
-click on the info icon in the history panel to view information about where it is stored. If it
-is not stored in the correct place, contact your Galaxy adminstrator for more information.
-`,
-        };
-    },
-    watch: {
-        parentError() {
-            this.error = this.parentError;
-        },
-    },
-    async mounted() {
-        try {
-            const data = await getSelectableObjectStores();
-            this.objectStores = data;
-            this.loading = false;
-        } catch (e) {
-            this.handleError(e);
-        }
-    },
-    methods: {
-        handleError(e) {
-            const errorMessage = errorMessageAsString(e);
-            this.error = errorMessage;
-        },
-        variant(objectStoreId) {
-            if (this.selectedObjectStoreId == objectStoreId) {
-                return "outline-primary";
-            } else {
-                return "outline-info";
-            }
-        },
-        async handleSubmit(preferredObjectStoreId) {
-            this.$emit("onSubmit", preferredObjectStoreId);
-        },
-    },
-};
-</script>

From c40672ac19eef9c47b39f930b34930b30f8c706e Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Thu, 2 Mar 2023 15:32:42 -0500
Subject: [PATCH 7/8] Only show objectstore selection in the GUI if actual
 selection makes sense

---
 .../History/CurrentHistory/HistoryCounter.vue | 34 ++++++++++++-------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/client/src/components/History/CurrentHistory/HistoryCounter.vue b/client/src/components/History/CurrentHistory/HistoryCounter.vue
index 30ef239cf236..0c41424f55f0 100644
--- a/client/src/components/History/CurrentHistory/HistoryCounter.vue
+++ b/client/src/components/History/CurrentHistory/HistoryCounter.vue
@@ -12,19 +12,25 @@
                 <span>{{ historySize | niceFileSize }}</span>
             </b-button>
             <b-button-group>
-                <b-button
-                    :id="`history-storage-${history.id}`"
-                    variant="link"
-                    size="sm"
-                    class="rounded-0 text-decoration-none"
-                    @click="showPreferredObjectStoreModal = true">
-                    <icon icon="hdd" />
-                </b-button>
-                <PreferredStorePopover
-                    :history-id="history.id"
-                    :history-preferred-object-store-id="historyPreferredObjectStoreId"
-                    :user="user">
-                </PreferredStorePopover>
+                <ConfigProvider v-slot="{ config }">
+                    <b-button
+                        v-if="config && config.object_store_allows_id_selection"
+                        :id="`history-storage-${history.id}`"
+                        variant="link"
+                        size="sm"
+                        class="rounded-0 text-decoration-none"
+                        @click="showPreferredObjectStoreModal = true">
+                        <icon icon="hdd" />
+                    </b-button>
+                </ConfigProvider>
+                <ConfigProvider v-slot="{ config }">
+                    <PreferredStorePopover
+                        v-if="config && config.object_store_allows_id_selection"
+                        :history-id="history.id"
+                        :history-preferred-object-store-id="historyPreferredObjectStoreId"
+                        :user="user">
+                    </PreferredStorePopover>
+                </ConfigProvider>
                 <b-button-group>
                     <b-button
                         v-b-tooltip.hover
@@ -90,11 +96,13 @@ import prettyBytes from "pretty-bytes";
 import { formatDistanceToNowStrict } from "date-fns";
 import { usesDetailedHistoryMixin } from "./usesDetailedHistoryMixin.js";
 import CurrentUser from "components/providers/CurrentUser";
+import ConfigProvider from "components/providers/ConfigProvider";
 import PreferredStorePopover from "./PreferredStorePopover";
 import SelectPreferredStore from "./SelectPreferredStore";
 
 export default {
     components: {
+        ConfigProvider,
         CurrentUser,
         PreferredStorePopover,
         SelectPreferredStore,

From 9964d4dc4818ea01aefd5ee2aed6a8eadc303acc Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Thu, 2 Mar 2023 15:58:22 -0500
Subject: [PATCH 8/8] More consistent icon for object store selection.

I had started by using fa-database everywhere but then I implemented the user selection piece and that icon was already used for custom DB keys and then David implemented the storage management functionality and so that icon couldn't be used in the history either. This I think switches everything else over to the now more consitent fa-hdd.
---
 client/src/components/Tool/ToolCard.vue                       | 2 +-
 .../components/Workflow/Run/WorkflowStorageConfiguration.vue  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/src/components/Tool/ToolCard.vue b/client/src/components/Tool/ToolCard.vue
index f877b14af41c..72100d6c6e84 100644
--- a/client/src/components/Tool/ToolCard.vue
+++ b/client/src/components/Tool/ToolCard.vue
@@ -130,7 +130,7 @@ function onUpdatePreferredObjectStoreId(selectedToolPreferredObjectStoreId) {
                             size="sm"
                             class="float-right"
                             @click="onShowObjectStoreSelect">
-                            <span class="fa fa-database" />
+                            <span class="fa fa-hdd" />
                         </b-button>
                         <ToolTargetPreferredObjectStorePopover
                             v-if="allowObjectStoreSelection"
diff --git a/client/src/components/Workflow/Run/WorkflowStorageConfiguration.vue b/client/src/components/Workflow/Run/WorkflowStorageConfiguration.vue
index b5bc04252618..3d5a62022754 100644
--- a/client/src/components/Workflow/Run/WorkflowStorageConfiguration.vue
+++ b/client/src/components/Workflow/Run/WorkflowStorageConfiguration.vue
@@ -5,7 +5,7 @@
             class="workflow-storage-indicator workflow-storage-indicator-primary"
             v-bind="buttonProps"
             @click="showPreferredObjectStoreModal = true">
-            <span class="fa fa-database" />
+            <span class="fa fa-hdd" />
         </b-button>
         <WorkflowTargetPreferredObjectStorePopover
             target="workflow-storage-indicator-primary"
@@ -26,7 +26,7 @@
             v-bind="buttonProps"
             class="workflow-storage-indicator workflow-storage-indicator-intermediate"
             @click="showIntermediatePreferredObjectStoreModal = true">
-            <span class="fa fa-database" />
+            <span class="fa fa-hdd" />
         </b-button>
         <WorkflowTargetPreferredObjectStorePopover
             v-if="splitObjectStore"