Skip to content

Fix loading spinner positioning in admin grid #21564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dannon wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Fix loading spinner positioning in admin grid #21564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa06273
Fix loading spinner positioning in admin grid
dannon Jan 12, 2026
15a3513
Update gridlist test for galaxy-style loading spinner
dannon Jan 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/src/components/Grid/GridList.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ describe("GridList", () => {
});
const findInput = wrapper.find("[data-description='filter text input']");
expect(findInput.attributes().placeholder).toBe("search tests");
expect(wrapper.find(".loading-message").text()).toBe("Loading...");
expect(wrapper.find(".grid-initial-loading .text-muted").text()).toBe("Loading...");
const findAction = wrapper.find("[data-description='grid action test']");
expect(findAction.text()).toBe("test");
await findAction.trigger("click");
Expand Down
268 changes: 151 additions & 117 deletions client/src/components/Grid/GridList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { faCaretDown, faCaretUp, faShieldAlt } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
import { useDebounceFn, useEventBus } from "@vueuse/core";
import { BAlert, BButton, BCard, BFormCheckbox, BOverlay, BPagination } from "bootstrap-vue";
import { BAlert, BButton, BCard, BFormCheckbox, BPagination } from "bootstrap-vue";
import { computed, nextTick, onMounted, onUnmounted, ref, watch } from "vue";
import { useRouter } from "vue-router/composables";

Expand All @@ -18,8 +18,8 @@ import GridText from "./GridElements/GridText.vue";
import GButton from "@/components/BaseComponents/GButton.vue";
import FilterMenu from "@/components/Common/FilterMenu.vue";
import Heading from "@/components/Common/Heading.vue";
import GalaxyLoader from "@/components/GalaxyLoader.vue";
import SharingIndicators from "@/components/Indices/SharingIndicators.vue";
import LoadingSpan from "@/components/LoadingSpan.vue";
import StatelessTags from "@/components/TagsMultiselect/StatelessTags.vue";
import UtcDate from "@/components/UtcDate.vue";

Expand Down Expand Up @@ -355,7 +355,10 @@ watch(operationMessage, () => {
:show-advanced.sync="showAdvanced"
view="compact" />
</div>
<LoadingSpan v-if="initDataLoading" />
<div v-if="initDataLoading" class="grid-initial-loading">
<GalaxyLoader />
<div class="mt-2 text-muted">Loading...</div>
</div>
<span v-else-if="!isAvailable || hasInvalidFilters">
<BAlert v-if="!hasInvalidFilters" variant="info" show>
<span v-if="filterText">
Expand Down Expand Up @@ -386,123 +389,130 @@ watch(operationMessage, () => {
</a>
</BAlert>
</span>
<BOverlay v-else :show="resultsLoading" rounded="sm">
<table class="grid-table">
<thead>
<th v-if="!!gridConfig.batch">
<BFormCheckbox
class="m-2"
:checked="selectedAll"
:indeterminate="selectedIndeterminate"
@change="onSelectAll" />
</th>
<th
v-for="(fieldEntry, fieldIndex) in gridConfig.fields"
:key="fieldIndex"
class="text-nowrap px-2"
:data-description="`grid header ${fieldIndex}`">
<span v-if="gridConfig.sortKeys.includes(fieldEntry.key)">
<BButton
variant="link"
class="text-nowrap font-weight-bold p-0"
:data-description="`grid sort key ${fieldEntry.key}`"
@click="onSort(fieldEntry.key)">
<span>{{ fieldTitle(fieldEntry) }}</span>
<span v-if="sortBy === fieldEntry.key">
<FontAwesomeIcon
v-if="sortDesc"
:icon="faCaretDown"
data-description="grid sort desc" />
<FontAwesomeIcon v-else :icon="faCaretUp" data-description="grid sort asc" />
</span>
</BButton>
</span>
<span v-else-if="fieldTitle(fieldEntry)">{{ fieldTitle(fieldEntry) }}</span>
</th>
</thead>
<tbody v-for="(rowData, rowIndex) in gridData" :key="rowIndex" data-description="grid item">
<tr :class="{ 'grid-dark-row': rowIndex % 2 }">
<td v-if="!!gridConfig.batch">
<template v-else>
<div class="position-relative">
<div v-if="resultsLoading" class="grid-loading-shade">
<div class="grid-loading-spinner">
<GalaxyLoader />
</div>
</div>
<table class="grid-table">
<thead>
<th v-if="!!gridConfig.batch">
<BFormCheckbox
:checked="selected.has(rowData)"
class="m-2 cursor-pointer"
data-description="grid selected"
@change="onSelect(rowData)" />
</td>
<td
class="m-2"
:checked="selectedAll"
:indeterminate="selectedIndeterminate"
@change="onSelectAll" />
</th>
<th
v-for="(fieldEntry, fieldIndex) in gridConfig.fields"
:key="fieldIndex"
class="px-2 py-3"
:style="{ width: `${fieldEntry.width}%` }">
<div
v-if="!fieldEntry.condition || fieldEntry.condition(rowData)"
:data-description="`grid cell ${rowIndex}-${fieldIndex}`">
<GridOperations
v-if="fieldEntry.type == 'operations' && fieldEntry.operations"
:operations="fieldEntry.operations"
:row-data="rowData"
:title="rowData[fieldEntry.key]"
@execute="onOperation($event, rowData)" />
<GridExpand
v-else-if="fieldEntry.type == 'expand'"
:details-showing="expanded.has(rowData)"
@show-details="(s) => showDetails(rowData, s)" />
<GridBoolean
v-else-if="fieldEntry.type == 'boolean'"
:value="rowData[fieldEntry.key]" />
<GridText
v-else-if="fieldEntry.type == 'text'"
:text="fieldText(fieldEntry, rowData)" />
<GridLink
v-else-if="fieldEntry.type == 'link'"
:text="fieldText(fieldEntry, rowData)"
@click="fieldEntry.handler && fieldEntry.handler(rowData)" />
<GButton
v-else-if="fieldEntry.type == 'button'"
color="blue"
@click="fieldEntry.handler && fieldEntry.handler(rowData)">
<FontAwesomeIcon v-if="fieldEntry.icon" :icon="fieldEntry.icon" />
<span v-if="fieldText(fieldEntry, rowData)" v-localize>{{
fieldText(fieldEntry, rowData)
}}</span>
</GButton>
<SwitchToHistoryLink
v-else-if="fieldEntry.type == 'history'"
:history-id="rowData[fieldEntry.key]" />
<HelpText
v-else-if="fieldEntry.type == 'helptext' && fieldEntry.converter"
:uri="fieldEntry.converter(rowData)"
:text="rowData[fieldEntry.key]" />
<SharingIndicators
v-else-if="fieldEntry.type == 'sharing'"
:object="rowData"
@filter="onFilter($event)" />
<UtcDate
v-else-if="fieldEntry.type == 'date'"
:date="rowData[fieldEntry.key]"
mode="elapsed" />
<StatelessTags
v-else-if="fieldEntry.type == 'tags'"
clickable
:value="rowData[fieldEntry.key]"
:disabled="fieldEntry.disabled"
@input="onTagInput(rowData, $event, fieldEntry.handler)"
@tag-click="applyFilter('tag', $event, true)" />
<span v-else v-localize> Not available. </span>
</div>
<FontAwesomeIcon v-else :icon="faShieldAlt" />
</td>
</tr>
<tr v-if="expanded.has(rowData)" data-description="grid expanded row">
<td :colspan="gridConfig.fields.length + 2">
<BCard class="p-2">
<slot name="expanded" :row-data="rowData" />
</BCard>
</td>
</tr>
</tbody>
</table>
</BOverlay>
class="text-nowrap px-2"
:data-description="`grid header ${fieldIndex}`">
<span v-if="gridConfig.sortKeys.includes(fieldEntry.key)">
<BButton
variant="link"
class="text-nowrap font-weight-bold p-0"
:data-description="`grid sort key ${fieldEntry.key}`"
@click="onSort(fieldEntry.key)">
<span>{{ fieldTitle(fieldEntry) }}</span>
<span v-if="sortBy === fieldEntry.key">
<FontAwesomeIcon
v-if="sortDesc"
:icon="faCaretDown"
data-description="grid sort desc" />
<FontAwesomeIcon v-else :icon="faCaretUp" data-description="grid sort asc" />
</span>
</BButton>
</span>
<span v-else-if="fieldTitle(fieldEntry)">{{ fieldTitle(fieldEntry) }}</span>
</th>
</thead>
<tbody v-for="(rowData, rowIndex) in gridData" :key="rowIndex" data-description="grid item">
<tr :class="{ 'grid-dark-row': rowIndex % 2 }">
<td v-if="!!gridConfig.batch">
<BFormCheckbox
:checked="selected.has(rowData)"
class="m-2 cursor-pointer"
data-description="grid selected"
@change="onSelect(rowData)" />
</td>
<td
v-for="(fieldEntry, fieldIndex) in gridConfig.fields"
:key="fieldIndex"
class="px-2 py-3"
:style="{ width: `${fieldEntry.width}%` }">
<div
v-if="!fieldEntry.condition || fieldEntry.condition(rowData)"
:data-description="`grid cell ${rowIndex}-${fieldIndex}`">
<GridOperations
v-if="fieldEntry.type == 'operations' && fieldEntry.operations"
:operations="fieldEntry.operations"
:row-data="rowData"
:title="rowData[fieldEntry.key]"
@execute="onOperation($event, rowData)" />
<GridExpand
v-else-if="fieldEntry.type == 'expand'"
:details-showing="expanded.has(rowData)"
@show-details="(s) => showDetails(rowData, s)" />
<GridBoolean
v-else-if="fieldEntry.type == 'boolean'"
:value="rowData[fieldEntry.key]" />
<GridText
v-else-if="fieldEntry.type == 'text'"
:text="fieldText(fieldEntry, rowData)" />
<GridLink
v-else-if="fieldEntry.type == 'link'"
:text="fieldText(fieldEntry, rowData)"
@click="fieldEntry.handler && fieldEntry.handler(rowData)" />
<GButton
v-else-if="fieldEntry.type == 'button'"
color="blue"
@click="fieldEntry.handler && fieldEntry.handler(rowData)">
<FontAwesomeIcon v-if="fieldEntry.icon" :icon="fieldEntry.icon" />
<span v-if="fieldText(fieldEntry, rowData)" v-localize>{{
fieldText(fieldEntry, rowData)
}}</span>
</GButton>
<SwitchToHistoryLink
v-else-if="fieldEntry.type == 'history'"
:history-id="rowData[fieldEntry.key]" />
<HelpText
v-else-if="fieldEntry.type == 'helptext' && fieldEntry.converter"
:uri="fieldEntry.converter(rowData)"
:text="rowData[fieldEntry.key]" />
<SharingIndicators
v-else-if="fieldEntry.type == 'sharing'"
:object="rowData"
@filter="onFilter($event)" />
<UtcDate
v-else-if="fieldEntry.type == 'date'"
:date="rowData[fieldEntry.key]"
mode="elapsed" />
<StatelessTags
v-else-if="fieldEntry.type == 'tags'"
clickable
:value="rowData[fieldEntry.key]"
:disabled="fieldEntry.disabled"
@input="onTagInput(rowData, $event, fieldEntry.handler)"
@tag-click="applyFilter('tag', $event, true)" />
<span v-else v-localize> Not available. </span>
</div>
<FontAwesomeIcon v-else :icon="faShieldAlt" />
</td>
</tr>
<tr v-if="expanded.has(rowData)" data-description="grid expanded row">
<td :colspan="gridConfig.fields.length + 2">
<BCard class="p-2">
<slot name="expanded" :row-data="rowData" />
</BCard>
</td>
</tr>
</tbody>
</table>
</div>
</template>
<div class="flex-grow-1 h-100" />
<div class="grid-footer">
<div v-if="isAvailable" class="d-flex justify-content-between pt-3">
Expand Down Expand Up @@ -561,4 +571,28 @@ watch(operationMessage, () => {
.grid-dark-row {
background: $gray-200;
}
.grid-loading-shade {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
background: rgba(255, 255, 255, 0.85);
z-index: 10;
border-radius: 0.2rem;
}
.grid-loading-spinner {
position: sticky;
top: 50%;
display: flex;
justify-content: center;
transform: translateY(-50%);
}
.grid-initial-loading {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
padding: 3rem;
}
</style>
Loading