Skip to content
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

Jump to bottom

WIP: Login query improvements #604

Merged
merged 5 commits into from
May 24, 2024
Merged

WIP: Login query improvements #604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b344fcb
Add function to refresh query keys
kellyel May 23, 2024
a7c177e
Refresh all keys on consent
kellyel May 23, 2024
e1cf543
Grab key from storeToRefs directly
kellyel May 23, 2024
364cd49
Access queryKeyIndex variables properly
kellyel May 24, 2024
60d0c31
Grab UID from storeToRefs rather than direct reference
kellyel May 24, 2024
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
4 changes: 2 additions & 2 deletions src/components/CardAdministration.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ import { setBarChartData, setBarChartOptions } from '@/helpers/plotting';
const router = useRouter();

const authStore = useAuthStore();
const { roarfirekit, administrationQueryKeyIndex } = storeToRefs(authStore);
const { roarfirekit, administrationQueryKeyIndex, uid } = storeToRefs(authStore);

const props = defineProps({
id: { type: String, required: true },
Expand Down Expand Up @@ -390,7 +390,7 @@ const fetchTreeOrgs = async () => {
};

const { data: orgs, isLoading: loadingDsgfOrgs } = useQuery({
queryKey: ['dsgfOrgs', authStore.uid, props.id],
queryKey: ['dsgfOrgs', uid, props.id],
queryFn: () => fetchTreeOrgs(),
keepPreviousData: true,
staleTime: 5 * 60 * 1000, // 5 minutes
Expand Down
6 changes: 3 additions & 3 deletions src/components/CreateOrgs.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ const isTestData = ref(false);
const isDemoData = ref(false);
const toast = useToast();
const authStore = useAuthStore();
const { roarfirekit } = storeToRefs(authStore);
const { roarfirekit, uid } = storeToRefs(authStore);
const isLevante = import.meta.env.MODE === 'LEVANTE';

const state = reactive({
Expand Down Expand Up @@ -245,8 +245,8 @@ onMounted(() => {
});

const { isLoading: isLoadingClaims, data: userClaims } = useQuery({
queryKey: ['userClaims', authStore.uid],
queryFn: () => fetchDocById('userClaims', authStore.uid),
queryKey: ['userClaims', uid],
queryFn: () => fetchDocById('userClaims', uid.value),
keepPreviousData: true,
enabled: initialized,
staleTime: 5 * 60 * 1000, // 5 minutes
Expand Down
13 changes: 6 additions & 7 deletions src/components/ListOrgs.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,11 @@ const schoolPlaceholder = computed(() => {

// Authstore and Sidebar
const authStore = useAuthStore();
const { roarfirekit, uid, userQueryKeyIndex } = storeToRefs(authStore);

const { isLoading: isLoadingClaims, data: userClaims } = useQuery({
queryKey: ['userClaims', authStore.uid, authStore.userQueryKeyIndex],
queryFn: () => fetchDocById('userClaims', authStore.uid),
queryKey: ['userClaims', uid, userQueryKeyIndex],
queryFn: () => fetchDocById('userClaims', uid.value),
keepPreviousData: true,
enabled: initialized,
staleTime: 5 * 60 * 1000, // 5 minutes
Expand Down Expand Up @@ -148,7 +149,7 @@ const activeOrgType = computed(() => {
const claimsLoaded = computed(() => !isLoadingClaims.value);

const { isLoading: isLoadingDistricts, data: allDistricts } = useQuery({
queryKey: ['districts', authStore.uid, orgsQueryKeyIndex],
queryKey: ['districts', uid, orgsQueryKeyIndex],
queryFn: () => orgFetcher('districts', undefined, isSuperAdmin, adminOrgs),
keepPreviousData: true,
enabled: claimsLoaded,
Expand All @@ -160,7 +161,7 @@ const schoolQueryEnabled = computed(() => {
});

const { isLoading: isLoadingSchools, data: allSchools } = useQuery({
queryKey: ['schools', authStore.uid, selectedDistrict, orgsQueryKeyIndex],
queryKey: ['schools', uid, selectedDistrict, orgsQueryKeyIndex],
queryFn: () => orgFetcher('schools', selectedDistrict, isSuperAdmin, adminOrgs),
keepPreviousData: true,
enabled: schoolQueryEnabled,
Expand All @@ -172,7 +173,7 @@ const {
isFetching,
data: orgData,
} = useQuery({
queryKey: ['orgsPage', authStore.uid, activeOrgType, selectedDistrict, selectedSchool, orderBy, orgsQueryKeyIndex],
queryKey: ['orgsPage', uid, activeOrgType, selectedDistrict, selectedSchool, orderBy, orgsQueryKeyIndex],
queryFn: () =>
orgPageFetcher(
activeOrgType,
Expand Down Expand Up @@ -255,8 +256,6 @@ const initTable = () => {
initialized.value = true;
};

const { roarfirekit } = storeToRefs(authStore);

unsubscribe = authStore.$subscribe(async (mutation, state) => {
if (state.roarfirekit.restConfig) initTable();
});
Expand Down
4 changes: 2 additions & 2 deletions src/components/ListUsers.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ import { singularizeFirestoreCollection } from '@/helpers';

const authStore = useAuthStore();

const { roarfirekit } = storeToRefs(authStore);
const { roarfirekit, uid } = storeToRefs(authStore);
const initialized = ref(false);

const page = ref(0);
Expand All @@ -80,7 +80,7 @@ const {
isFetching,
data: users,
} = useQuery({
queryKey: ['usersByOrgPage', authStore.uid, props.orgType, props.orgId, page, orderBy],
queryKey: ['usersByOrgPage', uid, props.orgType, props.orgId, page, orderBy],
queryFn: () => fetchUsersByOrg(props.orgType, props.orgId, ref(1000000), page, orderBy),
keepPreviousData: true,
enabled: initialized,
Expand Down
6 changes: 3 additions & 3 deletions src/components/NavBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ import LanguageSelector from './LanguageSelector.vue';

const router = useRouter();
const authStore = useAuthStore();
const { roarfirekit } = storeToRefs(authStore);
const { roarfirekit, uid } = storeToRefs(authStore);
const initialized = ref(false);
const menu = ref();
const screenWidth = ref(window.innerWidth);
Expand Down Expand Up @@ -88,8 +88,8 @@ onUnmounted(() => {
// ---------------------------------------------------------------

const { data: userClaims, isLoading: userClaimsLoading } = useQuery({
queryKey: ['userClaims', authStore.uid],
queryFn: () => fetchDocById('userClaims', authStore.uid),
queryKey: ['userClaims', uid],
queryFn: () => fetchDocById('userClaims', uid.value),
keepPreviousData: true,
enabled: initialized,
staleTime: 5 * 60 * 1000, // 5 minutes
Expand Down
7 changes: 3 additions & 4 deletions src/components/OrgPicker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ import { fetchDocById, orderByDefault } from '@/helpers/query/utils';

const initialized = ref(false);
const authStore = useAuthStore();
const { roarfirekit, uid } = storeToRefs(authStore);

const selectedDistrict = ref(undefined);
const selectedSchool = ref(undefined);
Expand Down Expand Up @@ -141,8 +142,8 @@ watch(
);

const { isLoading: isLoadingClaims, data: userClaims } = useQuery({
queryKey: ['userClaims', authStore.uid],
queryFn: () => fetchDocById('userClaims', authStore.uid),
queryKey: ['userClaims', uid],
queryFn: () => fetchDocById('userClaims', uid.value),
keepPreviousData: true,
enabled: initialized,
staleTime: 5 * 60 * 1000, // 5 minutes
Expand Down Expand Up @@ -252,8 +253,6 @@ const init = () => {
initialized.value = true;
};

const { roarfirekit } = storeToRefs(authStore);

unsubscribe = authStore.$subscribe(async (mutation, state) => {
if (state.roarfirekit.restConfig) init();
});
Expand Down
14 changes: 7 additions & 7 deletions src/components/auth/AuthEmailLink.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ import { fetchDocById } from '@/helpers/query/utils';

const router = useRouter();
const authStore = useAuthStore();
const { roarfirekit } = storeToRefs(authStore);
const { roarfirekit, uid } = storeToRefs(authStore);
const success = ref(false);

authStore.$subscribe(async () => {
if (authStore.uid) {
const userData = await fetchDocById('users', authStore.uid);
const userClaims = await fetchDocById('userClaims', authStore.uid);
if (uid.value) {
const userData = await fetchDocById('users', uid.value);
const userClaims = await fetchDocById('userClaims', uid.value);
authStore.userData = userData;
authStore.userClaims = userClaims;
success.value = true;
Expand Down Expand Up @@ -79,9 +79,9 @@ const loginFromEmailLink = async (email) => {
}
})
.then(async () => {
if (authStore.uid) {
const userData = await fetchDocById('users', authStore.uid);
const userClaims = await fetchDocById('userClaims', authStore.uid);
if (uid) {
const userData = await fetchDocById('users', uid.value);
const userClaims = await fetchDocById('userClaims', uid.value);
authStore.userData = userData;
authStore.userClaims = userClaims;
success.value = true;
Expand Down
6 changes: 3 additions & 3 deletions src/components/tasks/TaskCrowding.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const router = useRouter();
const gameStarted = ref(false);
const authStore = useAuthStore();
const gameStore = useGameStore();
const { isFirekitInit, roarfirekit } = storeToRefs(authStore);
const { isFirekitInit, roarfirekit, uid } = storeToRefs(authStore);

const initialized = ref(false);
let unsubscribe;
Expand All @@ -46,8 +46,8 @@ unsubscribe = authStore.$subscribe(async (mutation, state) => {
});

const { isLoading: isLoadingUserData, data: userData } = useQuery({
queryKey: ['userData', authStore.uid, 'studentData'],
queryFn: () => fetchDocById('users', authStore.uid, ['studentData']),
queryKey: ['userData', uid, 'studentData'],
queryFn: () => fetchDocById('users', uid.value, ['studentData']),
keepPreviousData: true,
enabled: initialized,
staleTime: 5 * 60 * 1000, // 5 minutes
Expand Down
6 changes: 3 additions & 3 deletions src/components/tasks/TaskFluency.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const router = useRouter();
const gameStarted = ref(false);
const authStore = useAuthStore();
const gameStore = useGameStore();
const { isFirekitInit, roarfirekit } = storeToRefs(authStore);
const { isFirekitInit, roarfirekit, uid } = storeToRefs(authStore);

const initialized = ref(false);
let unsubscribe;
Expand All @@ -46,8 +46,8 @@ unsubscribe = authStore.$subscribe(async (mutation, state) => {
});

const { isLoading: isLoadingUserData, data: userData } = useQuery({
queryKey: ['userData', authStore.uid, 'studentData'],
queryFn: () => fetchDocById('users', authStore.uid, ['studentData']),
queryKey: ['userData', uid, 'studentData'],
queryFn: () => fetchDocById('users', uid.value, ['studentData']),
keepPreviousData: true,
enabled: initialized,
staleTime: 5 * 60 * 1000, // 5 minutes
Expand Down
6 changes: 3 additions & 3 deletions src/components/tasks/TaskLetter.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const router = useRouter();
const gameStarted = ref(false);
const authStore = useAuthStore();
const gameStore = useGameStore();
const { isFirekitInit, roarfirekit } = storeToRefs(authStore);
const { isFirekitInit, roarfirekit, uid } = storeToRefs(authStore);

const initialized = ref(false);
let unsubscribe;
Expand All @@ -46,8 +46,8 @@ unsubscribe = authStore.$subscribe(async (mutation, state) => {
});

const { isLoading: isLoadingUserData, data: userData } = useQuery({
queryKey: ['userData', authStore.uid, 'studentData'],
queryFn: () => fetchDocById('users', authStore.uid, ['studentData']),
queryKey: ['userData', uid, 'studentData'],
queryFn: () => fetchDocById('users', uid.value, ['studentData']),
keepPreviousData: true,
enabled: initialized,
staleTime: 5 * 60 * 1000, // 5 minutes
Expand Down
6 changes: 3 additions & 3 deletions src/components/tasks/TaskLevante.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const router = useRouter();
const gameStarted = ref(false);
const authStore = useAuthStore();
const gameStore = useGameStore();
const { isFirekitInit, roarfirekit } = storeToRefs(authStore);
const { isFirekitInit, roarfirekit, uid } = storeToRefs(authStore);

const initialized = ref(false);
let unsubscribe;
Expand All @@ -46,8 +46,8 @@ unsubscribe = authStore.$subscribe(async (mutation, state) => {
});

const { isLoading: isLoadingUserData, data: userData } = useQuery({
queryKey: ['userData', authStore.uid, 'studentData'],
queryFn: () => fetchDocById('users', authStore.uid, ['studentData']),
queryKey: ['userData', uid, 'studentData'],
queryFn: () => fetchDocById('users', uid.value, ['studentData']),
keepPreviousData: true,
enabled: initialized,
staleTime: 5 * 60 * 1000, // 5 minutes
Expand Down
6 changes: 3 additions & 3 deletions src/components/tasks/TaskMultichoice.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const router = useRouter();
const gameStarted = ref(false);
const authStore = useAuthStore();
const gameStore = useGameStore();
const { isFirekitInit, roarfirekit } = storeToRefs(authStore);
const { isFirekitInit, roarfirekit, uid } = storeToRefs(authStore);

const initialized = ref(false);
let unsubscribe;
Expand All @@ -46,8 +46,8 @@ unsubscribe = authStore.$subscribe(async (mutation, state) => {
});

const { isLoading: isLoadingUserData, data: userData } = useQuery({
queryKey: ['userData', authStore.uid, 'studentData'],
queryFn: () => fetchDocById('users', authStore.uid, ['studentData']),
queryKey: ['userData', uid, 'studentData'],
queryFn: () => fetchDocById('users', uid.value, ['studentData']),
keepPreviousData: true,
enabled: initialized,
staleTime: 5 * 60 * 1000, // 5 minutes
Expand Down
6 changes: 3 additions & 3 deletions src/components/tasks/TaskPA.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const router = useRouter();
const gameStarted = ref(false);
const authStore = useAuthStore();
const gameStore = useGameStore();
const { isFirekitInit, roarfirekit } = storeToRefs(authStore);
const { isFirekitInit, roarfirekit, uid } = storeToRefs(authStore);

const initialized = ref(false);
let unsubscribe;
Expand All @@ -46,8 +46,8 @@ unsubscribe = authStore.$subscribe(async (mutation, state) => {
});

const { isLoading: isLoadingUserData, data: userData } = useQuery({
queryKey: ['userData', authStore.uid, 'studentData'],
queryFn: () => fetchDocById('users', authStore.uid, ['studentData']),
queryKey: ['userData', uid, 'studentData'],
queryFn: () => fetchDocById('users', uid.value, ['studentData']),
keepPreviousData: true,
enabled: initialized,
staleTime: 5 * 60 * 1000, // 5 minutes
Expand Down
6 changes: 3 additions & 3 deletions src/components/tasks/TaskRan.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const router = useRouter();
const gameStarted = ref(false);
const authStore = useAuthStore();
const gameStore = useGameStore();
const { isFirekitInit, roarfirekit } = storeToRefs(authStore);
const { isFirekitInit, roarfirekit, uid } = storeToRefs(authStore);

const initialized = ref(false);
let unsubscribe;
Expand All @@ -46,8 +46,8 @@ unsubscribe = authStore.$subscribe(async (mutation, state) => {
});

const { isLoading: isLoadingUserData, data: userData } = useQuery({
queryKey: ['userData', authStore.uid, 'studentData'],
queryFn: () => fetchDocById('users', authStore.uid, ['studentData']),
queryKey: ['userData', uid, 'studentData'],
queryFn: () => fetchDocById('users', uid.value, ['studentData']),
keepPreviousData: true,
enabled: initialized,
staleTime: 5 * 60 * 1000, // 5 minutes
Expand Down
6 changes: 3 additions & 3 deletions src/components/tasks/TaskSRE.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const router = useRouter();
const gameStarted = ref(false);
const authStore = useAuthStore();
const gameStore = useGameStore();
const { isFirekitInit, roarfirekit } = storeToRefs(authStore);
const { isFirekitInit, roarfirekit, uid } = storeToRefs(authStore);

const initialized = ref(false);
let unsubscribe;
Expand All @@ -46,8 +46,8 @@ unsubscribe = authStore.$subscribe(async (mutation, state) => {
});

const { isLoading: isLoadingUserData, data: userData } = useQuery({
queryKey: ['userData', authStore.uid, 'studentData'],
queryFn: () => fetchDocById('users', authStore.uid, ['studentData']),
queryKey: ['userData', uid, 'studentData'],
queryFn: () => fetchDocById('users', uid.value, ['studentData']),
keepPreviousData: true,
enabled: initialized,
staleTime: 5 * 60 * 1000, // 5 minutes
Expand Down
6 changes: 3 additions & 3 deletions src/components/tasks/TaskSWR.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const router = useRouter();
const gameStarted = ref(false);
const authStore = useAuthStore();
const gameStore = useGameStore();
const { isFirekitInit, roarfirekit } = storeToRefs(authStore);
const { isFirekitInit, roarfirekit, uid } = storeToRefs(authStore);

const initialized = ref(false);
let unsubscribe;
Expand All @@ -46,8 +46,8 @@ unsubscribe = authStore.$subscribe(async (mutation, state) => {
});

const { isLoading: isLoadingUserData, data: userData } = useQuery({
queryKey: ['userData', authStore.uid, 'studentData'],
queryFn: () => fetchDocById('users', authStore.uid, ['studentData']),
queryKey: ['userData', uid, 'studentData'],
queryFn: () => fetchDocById('users', uid.value, ['studentData']),
keepPreviousData: true,
enabled: initialized,
staleTime: 5 * 60 * 1000, // 5 minutes
Expand Down
6 changes: 3 additions & 3 deletions src/components/tasks/TaskVocab.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const router = useRouter();
const gameStarted = ref(false);
const authStore = useAuthStore();
const gameStore = useGameStore();
const { isFirekitInit, roarfirekit } = storeToRefs(authStore);
const { isFirekitInit, roarfirekit, uid } = storeToRefs(authStore);

const initialized = ref(false);
let unsubscribe;
Expand All @@ -46,8 +46,8 @@ unsubscribe = authStore.$subscribe(async (mutation, state) => {
});

const { isLoading: isLoadingUserData, data: userData } = useQuery({
queryKey: ['userData', authStore.uid, 'studentData'],
queryFn: () => fetchDocById('users', authStore.uid, ['studentData']),
queryKey: ['userData', uid, 'studentData'],
queryFn: () => fetchDocById('users', uid.value, ['studentData']),
keepPreviousData: true,
enabled: initialized,
staleTime: 5 * 60 * 1000, // 5 minutes
Expand Down
Loading
Loading