Skip to content

add loading spinner in all messages list page #2400

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

Merged
merged 2 commits into from
May 7, 2025
Merged

add loading spinner in all messages list page #2400

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4980fc6
add loading spinner in all messages
soujay May 6, 2025
0217225
Only display main spinner on first load
johnsimons May 6, 2025
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
14 changes: 8 additions & 6 deletions src/Frontend/src/components/audit/AuditList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { onBeforeMount, onUnmounted, ref, watch } from "vue";
import RefreshConfig from "../RefreshConfig.vue";
import useAutoRefresh from "@/composables/autoRefresh.ts";
import throttle from "lodash/throttle";
import LoadingSpinner from "@/components/LoadingSpinner.vue";

const store = useAuditStore();
const { messages, totalCount, sortBy, messageFilterString, selectedEndpointName, itemsPerPage, dateRange } = storeToRefs(store);
Expand Down Expand Up @@ -87,16 +88,16 @@ function navigateToMessage(message: Message) {
});
}

let firstLoad = true;
const firstLoad = ref(true);

onBeforeMount(() => {
setQuery();

//without setTimeout, this happens before the store is properly initialised, and therefore the query route values aren't applied to the refresh
//TODO: is there a better way to achieve this?
setTimeout(async () => await Promise.all([dataRetriever.executeAndResetTimer(), store.loadEndpoints()]), 0);

firstLoad = false;
setTimeout(async () => {
await Promise.all([dataRetriever.executeAndResetTimer(), store.loadEndpoints()]);
firstLoad.value = false;
}, 0);
});

watch(
Expand All @@ -109,7 +110,7 @@ watch(
);

const watchHandle = watch([() => route.query, itemsPerPage, sortBy, messageFilterString, selectedEndpointName, dateRange], async () => {
if (firstLoad) {
if (firstLoad.value) {
return;
}

Expand Down Expand Up @@ -164,6 +165,7 @@ watch(autoRefreshValue, (newValue) => dataRetriever.updateTimeout(newValue));
</div>
</div>
<div class="row results-table">
<LoadingSpinner v-if="firstLoad" />
<template v-for="message in messages" :key="message.id">
<div class="item" @click="navigateToMessage(message)">
<div class="status">
Expand Down