From a00fed947e1f0121e13ce666046ac0566d0f80af Mon Sep 17 00:00:00 2001
From: Alireza Heidari <itisalirh@gmail.com>
Date: Mon, 3 Jun 2024 16:54:58 +0200
Subject: [PATCH 01/11] =?UTF-8?q?=F0=9F=8E=A8:=20add=20`word-break`=20styl?=
 =?UTF-8?q?e=20to=20modal=20title=20globally?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/style/scss/overrides.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/src/style/scss/overrides.scss b/client/src/style/scss/overrides.scss
index 06ddc5668c6a..42fa1bdf876c 100644
--- a/client/src/style/scss/overrides.scss
+++ b/client/src/style/scss/overrides.scss
@@ -99,6 +99,10 @@ button {
     overflow: auto;
 }
 
+.modal-title {
+    word-break: break-all;
+}
+
 // Tabs -- border color is hardcoded in navs.scss, change to $btnBorder here
 
 .nav-tabs {

From 502009ade35a4a2e265488c527d100ba89d6f670 Mon Sep 17 00:00:00 2001
From: Alireza Heidari <itisalirh@gmail.com>
Date: Mon, 3 Jun 2024 17:56:19 +0200
Subject: [PATCH 02/11] =?UTF-8?q?=F0=9F=8E=A8:=20add=20`word-break`=20styl?=
 =?UTF-8?q?e=20to=20`EditableUrl`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/components/Sharing/EditableUrl.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/client/src/components/Sharing/EditableUrl.vue b/client/src/components/Sharing/EditableUrl.vue
index 255f014df7b3..8fb285eac866 100644
--- a/client/src/components/Sharing/EditableUrl.vue
+++ b/client/src/components/Sharing/EditableUrl.vue
@@ -103,11 +103,9 @@ function onCopyOut() {
 @import "theme/blue.scss";
 
 .editable-url {
-    height: 1.5rem;
-    display: flex;
-    align-items: center;
-    gap: 0.25rem;
+    word-break: break-all;
 }
+
 .inline-icon-button:disabled:hover {
     background-color: $brand-secondary;
     color: unset;

From 0dafe164a2d8c6733116dfef57dd8200db489047 Mon Sep 17 00:00:00 2001
From: Alireza Heidari <itisalirh@gmail.com>
Date: Mon, 3 Jun 2024 18:02:15 +0200
Subject: [PATCH 03/11] =?UTF-8?q?=F0=9F=8E=A8:=20add=20`word-break`=20styl?=
 =?UTF-8?q?e=20to=20Heading=20component?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/components/Common/Heading.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/src/components/Common/Heading.vue b/client/src/components/Common/Heading.vue
index d31d0d033ce4..2ef53352d818 100644
--- a/client/src/components/Common/Heading.vue
+++ b/client/src/components/Common/Heading.vue
@@ -96,6 +96,10 @@ const element = computed(() => {
 <style lang="scss" scoped>
 @import "scss/theme/blue.scss";
 
+.heading {
+    word-break: break-all;
+}
+
 .heading:deep(svg) {
     font-size: 0.75em;
 }

From 4eed454934f19af504d86ba7c832d75c9d49ba87 Mon Sep 17 00:00:00 2001
From: Alireza Heidari <itisalirh@gmail.com>
Date: Mon, 3 Jun 2024 18:03:09 +0200
Subject: [PATCH 04/11] =?UTF-8?q?=F0=9F=8E=A8:=20add=20`word-break`=20styl?=
 =?UTF-8?q?e=20to=20`FormElement`=20component=20on=20`ui-form-title-text`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/components/Form/_form-elements.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/src/components/Form/_form-elements.scss b/client/src/components/Form/_form-elements.scss
index 17aeb65b914e..6a244b4a998b 100644
--- a/client/src/components/Form/_form-elements.scss
+++ b/client/src/components/Form/_form-elements.scss
@@ -11,6 +11,10 @@
         word-wrap: break-word;
         font-weight: bold;
 
+        .ui-form-title-text {
+            word-break: break-all;
+        }
+
         .ui-form-title-message {
             font-size: $font-size-base * 0.7;
             font-weight: 300;

From 6af4138547f15c9438ba13c073bc8e1fad3cd63d Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Tue, 4 Jun 2024 18:01:02 +0200
Subject: [PATCH 05/11] Skip new history creation of user is anonymous and
 login is required

Most straightforward fix for
https://github.com/galaxyproject/galaxy/issues/18317. I have not been
able to reproduce the issue itself though, only a single history is
being created in my testing.
---
 lib/galaxy/webapps/base/webapp.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/galaxy/webapps/base/webapp.py b/lib/galaxy/webapps/base/webapp.py
index b9430a3774c0..b9bd9eb717ce 100644
--- a/lib/galaxy/webapps/base/webapp.py
+++ b/lib/galaxy/webapps/base/webapp.py
@@ -932,6 +932,10 @@ def get_or_create_default_history(self):
                     self.set_history(history)
                     return history
 
+        # Don't create new history if login required and user is anonymous
+        if self.app.config.require_login and not self.user:
+            return None
+
         # No suitable history found, create a new one.
         return self.new_history()
 

From f3ed25045c5b6ff81bd0db9ff18b1fbf577f0632 Mon Sep 17 00:00:00 2001
From: Ahmed Awan <qe66653@umbc.edu>
Date: Tue, 4 Jun 2024 14:12:29 -0500
Subject: [PATCH 06/11] [24.1] Disable state filter for collections in
 `HistoryFilters`

Adds a `disablesFilters` property to the `ValidFilter` class which allows for the functionality of disabling other filters given certain values for a given filter.

Note: This only works for ranged, input-field and dropdown type filters in the `FilterMenu`

Fixes https://github.com/galaxyproject/galaxy/issues/18264
---
 client/src/components/Common/FilterMenu.vue   | 24 ++++++++++++++++++-
 .../components/Common/FilterMenuDropdown.vue  |  6 ++++-
 .../src/components/Common/FilterMenuInput.vue | 11 +++++++--
 .../components/Common/FilterMenuRanged.vue    |  7 ++++--
 .../History/Content/model/StatesInfo.vue      |  2 ++
 .../History/CurrentHistory/HistoryPanel.vue   |  1 +
 .../src/components/History/HistoryFilters.js  |  2 ++
 client/src/utils/filtering.ts                 |  6 +++++
 8 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/client/src/components/Common/FilterMenu.vue b/client/src/components/Common/FilterMenu.vue
index 0f0596e2f422..bec385b5454a 100644
--- a/client/src/components/Common/FilterMenu.vue
+++ b/client/src/components/Common/FilterMenu.vue
@@ -4,7 +4,7 @@ import { faAngleDoubleUp, faQuestion, faSearch } from "@fortawesome/free-solid-s
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import { BButton, BModal, BPopover } from "bootstrap-vue";
 import { kebabCase } from "lodash";
-import { computed, ref } from "vue";
+import { computed, ref, set, watch } from "vue";
 
 import type Filtering from "@/utils/filtering";
 import { type Alias, type ErrorType, getOperatorForAlias, type ValidFilter } from "@/utils/filtering";
@@ -91,6 +91,8 @@ const toggleMenuButton = computed(() => {
 // Boolean for showing the help modal for the whole filter menu (if provided)
 const showHelp = ref(false);
 
+const isDisabled = ref<Record<string, boolean>>({});
+
 const formattedSearchError = computed<ErrorType | null>(() => {
     if (props.searchError) {
         const { column, col, operation, op, value, val, err_msg, ValueError } = props.searchError;
@@ -144,6 +146,8 @@ function getValidFilter(filter: string): ValidFilter<any> {
 function onOption(filter: string, value: any) {
     filters.value[filter] = value;
 
+    setDisabled(filter, value);
+
     // for the compact view, we want to immediately search
     if (props.view === "compact") {
         onSearch();
@@ -177,6 +181,21 @@ function onToggle() {
     emit("update:show-advanced", !props.showAdvanced);
 }
 
+function setDisabled(filter: string, newVal: any) {
+    const disablesFilters = validFilters.value[filter]?.disablesFilters;
+    const type = validFilters.value[filter]?.type;
+    if (disablesFilters && type !== Boolean) {
+        for (const [disabledFilter, disablingValues] of Object.entries(disablesFilters)) {
+            if (newVal && (disablingValues === null || disablingValues.includes(newVal))) {
+                set(isDisabled.value, disabledFilter, true);
+                filters.value[disabledFilter] = undefined;
+            } else {
+                set(isDisabled.value, disabledFilter, false);
+            }
+        }
+    }
+}
+
 function updateFilterText(newFilterText: string) {
     emit("update:filter-text", newFilterText);
 }
@@ -243,6 +262,7 @@ function updateFilterText(newFilterText: string) {
                             :filters="filters"
                             :error="formattedSearchError || undefined"
                             :identifier="identifier"
+                            :disabled="isDisabled[filter] || false"
                             @change="onOption"
                             @on-enter="onSearch"
                             @on-esc="onToggle" />
@@ -269,6 +289,7 @@ function updateFilterText(newFilterText: string) {
                             :filter="getValidFilter(filter)"
                             :filters="filters"
                             :identifier="identifier"
+                            :disabled="isDisabled[filter] || false"
                             @change="onOption" />
                         <FilterMenuInput
                             v-else-if="validFilters[filter]?.type !== Boolean"
@@ -277,6 +298,7 @@ function updateFilterText(newFilterText: string) {
                             :filters="filters"
                             :error="errorForField(filter) || undefined"
                             :identifier="identifier"
+                            :disabled="isDisabled[filter] || false"
                             @change="onOption"
                             @on-enter="onSearch"
                             @on-esc="onToggle" />
diff --git a/client/src/components/Common/FilterMenuDropdown.vue b/client/src/components/Common/FilterMenuDropdown.vue
index cdcfd41c4c5b..b86b5ca5663e 100644
--- a/client/src/components/Common/FilterMenuDropdown.vue
+++ b/client/src/components/Common/FilterMenuDropdown.vue
@@ -31,6 +31,7 @@ interface Props {
         [k: string]: FilterValue;
     };
     identifier: string;
+    disabled?: boolean;
 }
 
 const props = defineProps<Props>();
@@ -76,7 +77,9 @@ const helpToggle = ref(false);
 const modalTitle = `${capitalize(props.filter.placeholder)} Help`;
 function onHelp(_: string, value: string) {
     helpToggle.value = false;
-    localValue.value = value;
+    if (!props.disabled) {
+        localValue.value = value;
+    }
 }
 
 // Quota Source refs and operations
@@ -140,6 +143,7 @@ function setValue(val: string | QuotaUsage | undefined) {
                 menu-class="w-100"
                 size="sm"
                 boundary="window"
+                :disabled="props.disabled"
                 :toggle-class="props.error ? 'text-danger' : ''">
                 <BDropdownItem href="#" @click="setValue(undefined)"><i>(any)</i></BDropdownItem>
 
diff --git a/client/src/components/Common/FilterMenuInput.vue b/client/src/components/Common/FilterMenuInput.vue
index 011e12a73ae0..71e6e496bf78 100644
--- a/client/src/components/Common/FilterMenuInput.vue
+++ b/client/src/components/Common/FilterMenuInput.vue
@@ -28,6 +28,7 @@ interface Props {
     filters: {
         [k: string]: FilterType;
     };
+    disabled?: boolean;
 }
 
 const props = defineProps<Props>();
@@ -47,14 +48,18 @@ const modalTitle = `${capitalize(props.filter.placeholder)} Help`;
 
 function onHelp(_: string, value: string) {
     helpToggle.value = false;
-    localValue.value = value;
+
+    if (!props.disabled) {
+        localValue.value = value;
+    }
 }
 
 watch(
     () => localValue.value,
     (newFilter) => {
         emit("change", props.name, newFilter);
-    }
+    },
+    { immediate: true }
 );
 
 watch(
@@ -79,6 +84,7 @@ watch(
                 size="sm"
                 :state="props.error ? false : null"
                 :placeholder="`any ${props.filter.placeholder}`"
+                :disabled="props.disabled"
                 :list="props.filter.datalist ? `${identifier}-${props.name}-selectList` : null"
                 @keyup.enter="emit('on-enter')"
                 @keyup.esc="emit('on-esc')" />
@@ -99,6 +105,7 @@ watch(
                     v-model="localValue"
                     reset-button
                     button-only
+                    :disabled="props.disabled"
                     size="sm" />
             </BInputGroupAppend>
         </BInputGroup>
diff --git a/client/src/components/Common/FilterMenuRanged.vue b/client/src/components/Common/FilterMenuRanged.vue
index 91e362bad359..72f013212dc5 100644
--- a/client/src/components/Common/FilterMenuRanged.vue
+++ b/client/src/components/Common/FilterMenuRanged.vue
@@ -14,6 +14,7 @@ interface Props {
     filters: {
         [k: string]: FilterType;
     };
+    disabled?: boolean;
 }
 
 const props = defineProps<Props>();
@@ -93,11 +94,12 @@ watch(
                 size="sm"
                 :state="hasError(localNameGt) ? false : null"
                 :placeholder="localPlaceholder('gt')"
+                :disabled="props.disabled"
                 @keyup.enter="emit('on-enter')"
                 @keyup.esc="emit('on-esc')" />
 
             <BInputGroupAppend v-if="isDateType">
-                <BFormDatepicker v-model="localValueGt" reset-button button-only size="sm" />
+                <BFormDatepicker v-model="localValueGt" reset-button button-only size="sm" :disabled="props.disabled" />
             </BInputGroupAppend>
             <!--------------------------------------------------------------------->
 
@@ -109,11 +111,12 @@ watch(
                 size="sm"
                 :state="hasError(localNameLt) ? false : null"
                 :placeholder="localPlaceholder('lt')"
+                :disabled="props.disabled"
                 @keyup.enter="emit('on-enter')"
                 @keyup.esc="emit('on-esc')" />
 
             <BInputGroupAppend v-if="isDateType">
-                <BFormDatepicker v-model="localValueLt" reset-button button-only size="sm" />
+                <BFormDatepicker v-model="localValueLt" reset-button button-only size="sm" :disabled="props.disabled" />
             </BInputGroupAppend>
             <!--------------------------------------------------------------------->
         </BInputGroup>
diff --git a/client/src/components/History/Content/model/StatesInfo.vue b/client/src/components/History/Content/model/StatesInfo.vue
index 2cd7ab525f1a..14d2267e5c7a 100644
--- a/client/src/components/History/Content/model/StatesInfo.vue
+++ b/client/src/components/History/Content/model/StatesInfo.vue
@@ -39,6 +39,8 @@ function onFilter(value: string) {
                 (Note that the colors for each state correspond to content item state colors in the history, and if it
                 exists, hovering over the icon on a history item will display the state message.)
             </i>
+            <br />
+            <b>You cannot filter a history for collections given a state.</b>
         </p>
         <dl v-for="(state, key, index) in states" :key="index">
             <div :class="['alert', 'content-item', 'alert-' + state.status]" :data-state="dataState(key)">
diff --git a/client/src/components/History/CurrentHistory/HistoryPanel.vue b/client/src/components/History/CurrentHistory/HistoryPanel.vue
index f1e94fd4ea68..ca6738f303dd 100644
--- a/client/src/components/History/CurrentHistory/HistoryPanel.vue
+++ b/client/src/components/History/CurrentHistory/HistoryPanel.vue
@@ -509,6 +509,7 @@ function setItemDragstart(
 
                 <FilterMenu
                     v-if="filterable"
+                    :key="props.history.id"
                     class="content-operations-filters mx-3"
                     name="History Items"
                     placeholder="search datasets"
diff --git a/client/src/components/History/HistoryFilters.js b/client/src/components/History/HistoryFilters.js
index 1bfcaad32cc8..9d977e065f38 100644
--- a/client/src/components/History/HistoryFilters.js
+++ b/client/src/components/History/HistoryFilters.js
@@ -26,6 +26,7 @@ const validFilters = {
             { value: "dataset_collection", text: "Collections Only" },
         ],
         menuItem: true,
+        disablesFilters: { state: ["dataset_collection"] },
     },
     tag: { placeholder: "tag", type: String, handler: contains("tags", "tag", expandNameTag), menuItem: true },
     state: {
@@ -35,6 +36,7 @@ const validFilters = {
         datalist: states,
         helpInfo: StatesInfo,
         menuItem: true,
+        disablesFilters: { history_content_type: null },
     },
     genome_build: { placeholder: "database", type: String, handler: contains("genome_build"), menuItem: true },
     genome_build_eq: { handler: equals("genome_build"), menuItem: false },
diff --git a/client/src/utils/filtering.ts b/client/src/utils/filtering.ts
index 686aa8f7f4f2..480eec597b9d 100644
--- a/client/src/utils/filtering.ts
+++ b/client/src/utils/filtering.ts
@@ -85,6 +85,12 @@ export type ValidFilter<T> = {
     helpInfo?: DefineComponent | string;
     /** A default value (will make this a default filter for an empty `filterText`) */
     default?: T;
+    /** A dict of filters and corresponding values for this filter that disable them.
+     * Note: if value is null, the filter is disabled for any value of this filter.
+     */
+    disablesFilters?: {
+        [filter: string]: T[] | null;
+    };
 };
 
 /** Converts user input to backend compatible date

From 5b8e9021e14059939dd0f1e2e60726e38f9fe477 Mon Sep 17 00:00:00 2001
From: Ahmed Awan <qe66653@umbc.edu>
Date: Tue, 4 Jun 2024 18:15:30 -0500
Subject: [PATCH 07/11] remove unused `watch` import

---
 client/src/components/Common/FilterMenu.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/Common/FilterMenu.vue b/client/src/components/Common/FilterMenu.vue
index bec385b5454a..66a5e4c823f4 100644
--- a/client/src/components/Common/FilterMenu.vue
+++ b/client/src/components/Common/FilterMenu.vue
@@ -4,7 +4,7 @@ import { faAngleDoubleUp, faQuestion, faSearch } from "@fortawesome/free-solid-s
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import { BButton, BModal, BPopover } from "bootstrap-vue";
 import { kebabCase } from "lodash";
-import { computed, ref, set, watch } from "vue";
+import { computed, ref, set } from "vue";
 
 import type Filtering from "@/utils/filtering";
 import { type Alias, type ErrorType, getOperatorForAlias, type ValidFilter } from "@/utils/filtering";

From 57f524706063b5d093da5b5581360f9003bb6e2d Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Wed, 5 Jun 2024 14:42:07 +0200
Subject: [PATCH 08/11] Add integration tests for exposing user information

---
 test/integration/test_users.py | 91 ++++++++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 test/integration/test_users.py

diff --git a/test/integration/test_users.py b/test/integration/test_users.py
new file mode 100644
index 000000000000..1b3b6714984c
--- /dev/null
+++ b/test/integration/test_users.py
@@ -0,0 +1,91 @@
+from typing import ClassVar
+
+from galaxy_test.driver import integration_util
+
+USER_SUMMARY_KEYS = set(["model_class", "id", "email", "username", "deleted", "active", "last_password_change"])
+
+
+class UsersIntegrationTestCase(integration_util.IntegrationTestCase):
+    expose_user_name: ClassVar[bool]
+    expose_user_email: ClassVar[bool]
+    expected_regular_user_list_count: ClassVar[int]
+    expected_limited_user_keys: ClassVar[set]
+
+    @classmethod
+    def handle_galaxy_config_kwds(cls, config):
+        super().handle_galaxy_config_kwds(config)
+        config["expose_user_name"] = cls.expose_user_name
+        config["expose_user_email"] = cls.expose_user_email
+
+    def setUp(self):
+        super().setUp()
+        self._setup_users()
+
+    def _setup_users(self):
+        self.user = self._get("users/current").json()
+        self.user2 = self._setup_user("user02@test.gx")
+        self.user3 = self._setup_user("user03@test.gx")
+
+    def test_admin_index(self):
+        all_users_response = self._get("users", admin=True)
+        self._assert_status_code_is(all_users_response, 200)
+        all_users = all_users_response.json()
+        assert len(all_users) == 3
+        for user in all_users:
+            self._assert_has_keys(user, *USER_SUMMARY_KEYS)
+
+    def test_user_index(self):
+        requesting_user_id = self.user["id"]
+        all_users_response = self._get("users")
+        self._assert_status_code_is(all_users_response, 200)
+        all_users = all_users_response.json()
+        assert len(all_users) == self.expected_regular_user_list_count
+
+        unexpected_user_keys = USER_SUMMARY_KEYS - self.expected_limited_user_keys
+        for user in all_users:
+            if user["id"] == requesting_user_id:
+                # Requesting users should be able to see their own information.
+                self._assert_has_keys(user, *USER_SUMMARY_KEYS)
+                continue
+            # The user should be able to see other users information depending on the configuration.
+            self._assert_has_keys(user, *self.expected_limited_user_keys)
+            self._assert_not_has_keys(user, *unexpected_user_keys)
+
+
+class TestExposeUsersIntegration(UsersIntegrationTestCase):
+    expose_user_name = True
+    expose_user_email = True
+
+    # Since we allow to expose user information, all users are returned.
+    expected_limited_user_keys = set(["id", "username", "email"])
+    expected_regular_user_list_count = 3
+
+
+class TestExposeOnlyUserNameIntegration(UsersIntegrationTestCase):
+    expose_user_name = True
+    expose_user_email = False
+
+    # When only username is exposed, only that field is returned in the user list.
+    # Since we are exposing user information, all users are returned.
+    expected_limited_user_keys = set(["id", "username"])
+    expected_regular_user_list_count = 3
+
+
+class TestExposeOnlyUserEmailIntegration(UsersIntegrationTestCase):
+    expose_user_name = False
+    expose_user_email = True
+
+    # When only email is exposed, only that field is returned in the user list.
+    # Since we are exposing user information, all users are returned.
+    expected_limited_user_keys = set(["id", "email"])
+    expected_regular_user_list_count = 3
+
+
+class TestUnexposedUsersIntegration(UsersIntegrationTestCase):
+    expose_user_name = False
+    expose_user_email = False
+
+    # Since no user information is exposed, only the current user should be returned.
+    # And the current user has all fields, so no limited fields.
+    expected_limited_user_keys = set()
+    expected_regular_user_list_count = 1

From 408aa064c98529be74adf666e75780460be28de4 Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Wed, 5 Jun 2024 14:59:51 +0200
Subject: [PATCH 09/11] Fix user model serialization when listing users

---
 lib/galaxy/schema/schema.py                 |  3 +++
 lib/galaxy/webapps/galaxy/api/users.py      |  7 +++----
 lib/galaxy/webapps/galaxy/services/users.py | 23 +++++++++++----------
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/lib/galaxy/schema/schema.py b/lib/galaxy/schema/schema.py
index 2e3ef4b5f9fc..c624bab55df5 100644
--- a/lib/galaxy/schema/schema.py
+++ b/lib/galaxy/schema/schema.py
@@ -349,6 +349,9 @@ class LimitedUserModel(Model):
     email: Optional[str] = None
 
 
+MaybeLimitedUserModel = Union[UserModel, LimitedUserModel]
+
+
 class DiskUsageUserModel(Model):
     total_disk_usage: float = TotalDiskUsageField
     nice_total_disk_usage: str = NiceTotalDiskUsageField
diff --git a/lib/galaxy/webapps/galaxy/api/users.py b/lib/galaxy/webapps/galaxy/api/users.py
index 91102757c751..f3139f93c9bb 100644
--- a/lib/galaxy/webapps/galaxy/api/users.py
+++ b/lib/galaxy/webapps/galaxy/api/users.py
@@ -55,12 +55,11 @@
     FavoriteObjectsSummary,
     FavoriteObjectType,
     FlexibleUserIdType,
-    LimitedUserModel,
+    MaybeLimitedUserModel,
     RemoteUserCreationPayload,
     UserBeaconSetting,
     UserCreationPayload,
     UserDeletionPayload,
-    UserModel,
 )
 from galaxy.security.validate_user_input import (
     validate_email,
@@ -202,7 +201,7 @@ def index_deleted(
         f_email: Optional[str] = FilterEmailQueryParam,
         f_name: Optional[str] = FilterNameQueryParam,
         f_any: Optional[str] = FilterAnyQueryParam,
-    ) -> List[Union[UserModel, LimitedUserModel]]:
+    ) -> List[MaybeLimitedUserModel]:
         return self.service.get_index(trans=trans, deleted=True, f_email=f_email, f_name=f_name, f_any=f_any)
 
     @router.post(
@@ -634,7 +633,7 @@ def index(
         f_email: Optional[str] = FilterEmailQueryParam,
         f_name: Optional[str] = FilterNameQueryParam,
         f_any: Optional[str] = FilterAnyQueryParam,
-    ) -> List[Union[UserModel, LimitedUserModel]]:
+    ) -> List[MaybeLimitedUserModel]:
         return self.service.get_index(trans=trans, deleted=deleted, f_email=f_email, f_name=f_name, f_any=f_any)
 
     @router.get(
diff --git a/lib/galaxy/webapps/galaxy/services/users.py b/lib/galaxy/webapps/galaxy/services/users.py
index 909a9898f193..0317af35cacc 100644
--- a/lib/galaxy/webapps/galaxy/services/users.py
+++ b/lib/galaxy/webapps/galaxy/services/users.py
@@ -35,6 +35,7 @@
     DetailedUserModel,
     FlexibleUserIdType,
     LimitedUserModel,
+    MaybeLimitedUserModel,
     UserModel,
 )
 from galaxy.security.idencoding import IdEncodingHelper
@@ -204,8 +205,8 @@ def get_index(
         f_email: Optional[str],
         f_name: Optional[str],
         f_any: Optional[str],
-    ) -> List[Union[UserModel, LimitedUserModel]]:
-        rval = []
+    ) -> List[MaybeLimitedUserModel]:
+        rval: List[MaybeLimitedUserModel] = []
         stmt = select(User)
 
         if f_email and (trans.user_is_admin or trans.app.config.expose_user_email):
@@ -240,13 +241,12 @@ def get_index(
                 and not trans.app.config.expose_user_email
             ):
                 if trans.user:
-                    item = trans.user.to_dict()
-                    return [item]
+                    return [UserModel(**trans.user.to_dict())]
                 else:
                     return []
             stmt = stmt.filter(User.deleted == false())
         for user in trans.sa_session.scalars(stmt).all():
-            item = user.to_dict()
+            user_dict = user.to_dict()
             # If NOT configured to expose_email, do not expose email UNLESS the user is self, or
             # the user is an admin
             if user is not trans.user and not trans.user_is_admin:
@@ -255,12 +255,13 @@ def get_index(
                     expose_keys.append("username")
                 if trans.app.config.expose_user_email:
                     expose_keys.append("email")
-                new_item = {}
-                for key, value in item.items():
+                limited_user = {}
+                for key, value in user_dict.items():
                     if key in expose_keys:
-                        new_item[key] = value
-                item = new_item
+                        limited_user[key] = value
+                user = LimitedUserModel(**limited_user)
+            else:
+                user = UserModel(**user_dict)
 
-            # TODO: move into api_values
-            rval.append(item)
+            rval.append(user)
         return rval

From 62049e3803f355d61b62f7e8274862686a58be0f Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Wed, 5 Jun 2024 15:30:26 +0200
Subject: [PATCH 10/11] Rename integration test base class

To make the `check_test_class_names` linter happy
---
 test/integration/test_users.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/integration/test_users.py b/test/integration/test_users.py
index 1b3b6714984c..d47110bc96c1 100644
--- a/test/integration/test_users.py
+++ b/test/integration/test_users.py
@@ -5,7 +5,7 @@
 USER_SUMMARY_KEYS = set(["model_class", "id", "email", "username", "deleted", "active", "last_password_change"])
 
 
-class UsersIntegrationTestCase(integration_util.IntegrationTestCase):
+class UsersIntegrationCase(integration_util.IntegrationTestCase):
     expose_user_name: ClassVar[bool]
     expose_user_email: ClassVar[bool]
     expected_regular_user_list_count: ClassVar[int]
@@ -52,7 +52,7 @@ def test_user_index(self):
             self._assert_not_has_keys(user, *unexpected_user_keys)
 
 
-class TestExposeUsersIntegration(UsersIntegrationTestCase):
+class TestExposeUsersIntegration(UsersIntegrationCase):
     expose_user_name = True
     expose_user_email = True
 
@@ -61,7 +61,7 @@ class TestExposeUsersIntegration(UsersIntegrationTestCase):
     expected_regular_user_list_count = 3
 
 
-class TestExposeOnlyUserNameIntegration(UsersIntegrationTestCase):
+class TestExposeOnlyUserNameIntegration(UsersIntegrationCase):
     expose_user_name = True
     expose_user_email = False
 
@@ -71,7 +71,7 @@ class TestExposeOnlyUserNameIntegration(UsersIntegrationTestCase):
     expected_regular_user_list_count = 3
 
 
-class TestExposeOnlyUserEmailIntegration(UsersIntegrationTestCase):
+class TestExposeOnlyUserEmailIntegration(UsersIntegrationCase):
     expose_user_name = False
     expose_user_email = True
 
@@ -81,7 +81,7 @@ class TestExposeOnlyUserEmailIntegration(UsersIntegrationTestCase):
     expected_regular_user_list_count = 3
 
 
-class TestUnexposedUsersIntegration(UsersIntegrationTestCase):
+class TestUnexposedUsersIntegration(UsersIntegrationCase):
     expose_user_name = False
     expose_user_email = False
 

From 7669eff2631be77bb6fcb520cd25e8848a1ade38 Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Wed, 5 Jun 2024 16:23:35 +0200
Subject: [PATCH 11/11] Downgrade doi fetch error to debug

There's nothing an admin can do about, and it doesn't impact tool
functionality.
---
 lib/galaxy/managers/citations.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/galaxy/managers/citations.py b/lib/galaxy/managers/citations.py
index 958617289ebb..8ae9c8c64ad7 100644
--- a/lib/galaxy/managers/citations.py
+++ b/lib/galaxy/managers/citations.py
@@ -150,7 +150,7 @@ def to_bibtex(self):
             try:
                 self.raw_bibtex = self.doi_cache.get_bibtex(self.__doi)
             except Exception:
-                log.exception("Failed to fetch bibtex for DOI %s", self.__doi)
+                log.debug("Failed to fetch bibtex for DOI %s", self.__doi)
 
         if self.raw_bibtex is DoiCitation.BIBTEX_UNSET:
             return f"""@MISC{{{self.__doi},