Ensure quota and user store stay in sync after updates

Improves consistency between user and quota usage data by having the user store trigger refreshes of the quota usage store after relevant user updates. Adds logic to detect when a user update should prompt a quota refresh and ensures both stores are updated atomically. Refactors user state management for clarity and correctness, adding methods for explicit user and quota syncing, and updating related helpers and test utilities to use new store methods.

Author: davelopez

client/src/api/index.ts

@@ -275,6 +275,13 @@ export interface AnonymousUser extends AnonymousUserModel {
 /** Represents any user, including anonymous users or session-less (null) users.**/
 export type AnyUser = RegisteredUser | AnonymousUser | null;
 
+export function toAnyUser(user: UserModel): AnyUser {
+    if ("email" in user) {
+        return { ...user, isAnonymous: false } as RegisteredUser;
+    }
+    return { ...user, isAnonymous: true } as AnonymousUser;
+}
+
 export function isRegisteredUser(user: AnyUser | UserModel): user is RegisteredUser {
     return user !== null && "email" in user;
 }

client/src/stores/userStore.ts

@@ -5,6 +5,7 @@ import { type AnyUser, isAdminUser, isAnonymousUser, isRegisteredUser, type Regi
 import { useHashedUserId } from "@/composables/hashedUserId";
 import { useUserLocalStorageFromHashId } from "@/composables/userLocalStorageFromHashedId";
 import { useHistoryStore } from "@/stores/historyStore";
+import { useQuotaUsageStore } from "@/stores/quotaUsageStore";
 import {
     addFavoriteToolQuery,
     getCurrentUser,
@@ -47,6 +48,25 @@ export const useUserStore = defineStore("userStore", () => {
 
     let loadPromise: Promise<void> | null = null;
 
+    function requestQuotaRefreshForLoadedQuotaStore() {
+        const quotaUsageStore = useQuotaUsageStore();
+        if (quotaUsageStore.isLoaded) {
+            quotaUsageStore.requestRefreshDebounced();
+        }
+    }
+
+    function shouldRefreshQuotaAfterUserUpdate(previousUser: AnyUser, nextUser: RegisteredUser) {
+        if (!isRegisteredUser(previousUser)) {
+            return true;
+        }
+
+        return (
+            previousUser.total_disk_usage !== nextUser.total_disk_usage ||
+            previousUser.quota_percent !== nextUser.quota_percent ||
+            previousUser.quota !== nextUser.quota
+        );
+    }
+
     function $reset() {
         currentUser.value = null;
         currentPreferences.value = null;
@@ -84,21 +104,38 @@ export const useUserStore = defineStore("userStore", () => {
         currentUser.value = user;
     }
 
+    function setUserState(user: AnyUser) {
+        const previousUser = currentUser.value;
+
+        if (isRegisteredUser(user)) {
+            currentUser.value = user;
+            currentPreferences.value = processUserPreferences(user);
+            if (shouldRefreshQuotaAfterUserUpdate(previousUser, user)) {
+                requestQuotaRefreshForLoadedQuotaStore();
+            }
+        } else if (isAnonymousUser(user)) {
+            currentUser.value = user;
+        } else if (user === null) {
+            currentUser.value = null;
+        }
+    }
+
+    function syncCurrentUser(user: AnyUser) {
+        setUserState(user);
+    }
+
+    function refreshUser(includeHistories = false) {
+        loadPromise = null;
+        return loadUser(includeHistories);
+    }
+
     function loadUser(includeHistories = true) {
         if (!loadPromise) {
             loadPromise = new Promise<void>((resolve, reject) => {
                 (async () => {
                     try {
                         const user = await getCurrentUser();
-
-                        if (isRegisteredUser(user)) {
-                            currentUser.value = user;
-                            currentPreferences.value = processUserPreferences(user);
-                        } else if (isAnonymousUser(user)) {
-                            currentUser.value = user;
-                        } else if (user === null) {
-                            currentUser.value = null;
-                        }
+                        setUserState(user);
                         if (includeHistories) {
                             const historyStore = useHistoryStore();
                             await historyStore.loadHistories();
@@ -190,6 +227,8 @@ export const useUserStore = defineStore("userStore", () => {
         historyPanelWidth,
         recentTools,
         loadUser,
+        refreshUser,
+        syncCurrentUser,
         matchesCurrentUsername,
         setCurrentUser,
         setCurrentTheme,

client/src/stores/users/queries.ts

@@ -1,15 +1,15 @@
-import { GalaxyApi } from "@/api";
+import { type AnyUser, GalaxyApi, toAnyUser } from "@/api";
 import { rethrowSimple } from "@/utils/simple-error";
 
-export async function getCurrentUser() {
+export async function getCurrentUser(): Promise<AnyUser> {
     const { data, error } = await GalaxyApi().GET("/api/users/{user_id}", {
         params: { path: { user_id: "current" } },
     });
 
     if (error) {
         rethrowSimple(error);
     }
-    return data;
+    return toAnyUser(data);
 }
 
 export async function addFavoriteToolQuery(userId: string, toolId: string) {

client/src/watch/watchHistory.js

@@ -11,6 +11,7 @@ import { useCollectionElementsStore } from "@/stores/collectionElementsStore";
 import { useDatasetStore } from "@/stores/datasetStore";
 import { useHistoryItemsStore } from "@/stores/historyItemsStore";
 import { useHistoryStore } from "@/stores/historyStore";
+import { useUserStore } from "@/stores/userStore";
 import { loadSet } from "@/utils/setCache";
 import { urlData } from "@/utils/url";
 
@@ -97,7 +98,9 @@ async function _fetchHistoryAndChangedItems(app, { force }) {
     historyItemsStore.saveHistoryItems(historyId, payload);
     collectionElementsStore.saveCollections(payload);
     if (app) {
-        app.user.loadFromApi(app.user.id || "current");
+        await app.user.loadFromApi(app.user.id || "current");
+        const userStore = useUserStore();
+        userStore.syncCurrentUser(app.user.attributes ?? null);
     }
 }