Access queryKeyIndex variables properly

yeatmanlab · May 24, 2024 · a31ea0d · a31ea0d
1 parent 40e36f8
commit a31ea0d
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/src/components/ListOrgs.vue b/src/components/ListOrgs.vue
@@ -99,9 +99,10 @@ const schoolPlaceholder = computed(() => {
 
 // Authstore and Sidebar
 const authStore = useAuthStore();
+const { roarfirekit, userQueryKeyIndex } = storeToRefs(authStore);
 
 const { isLoading: isLoadingClaims, data: userClaims } = useQuery({
-  queryKey: ['userClaims', authStore.uid, authStore.userQueryKeyIndex],
+  queryKey: ['userClaims', authStore.uid, userQueryKeyIndex],
   queryFn: () => fetchDocById('userClaims', authStore.uid),
   keepPreviousData: true,
   enabled: initialized,
@@ -255,8 +256,6 @@ const initTable = () => {
   initialized.value = true;
 };
 
-const { roarfirekit } = storeToRefs(authStore);
-
 unsubscribe = authStore.$subscribe(async (mutation, state) => {
   if (state.roarfirekit.restConfig) initTable();
 });

diff --git a/src/pages/HomeAdministrator.vue b/src/pages/HomeAdministrator.vue
@@ -128,10 +128,10 @@ const isLevante = import.meta.env.MODE === 'LEVANTE';
 
 const authStore = useAuthStore();
 
-const { roarfirekit, administrationQueryKeyIndex } = storeToRefs(authStore);
+const { roarfirekit, administrationQueryKeyIndex, userClaimsQueryKeyIndex } = storeToRefs(authStore);
 
 const { isLoading: isLoadingClaims, data: userClaims } = useQuery({
-  queryKey: ['userClaims', authStore.uid, authStore.userClaimsQueryKeyIndex],
+  queryKey: ['userClaims', authStore.uid, userClaimsQueryKeyIndex],
   queryFn: () => fetchDocById('userClaims', authStore.uid),
   keepPreviousData: true,
   enabled: initialized,

diff --git a/src/pages/HomeParticipant.vue b/src/pages/HomeParticipant.vue
@@ -102,7 +102,7 @@ const init = () => {
 };
 
 const authStore = useAuthStore();
-const { roarfirekit, consentSpinner, userQueryKeyIndex } = storeToRefs(authStore);
+const { roarfirekit, consentSpinner, userQueryKeyIndex, assignmentQueryKeyIndex } = storeToRefs(authStore);
 
 unsubscribe = authStore.$subscribe(async (mutation, state) => {
   if (state.roarfirekit.restConfig) init();
@@ -134,7 +134,7 @@ const {
   isFetching: isFetchingAssignments,
   data: assignmentInfo,
 } = useQuery({
-  queryKey: ['assignments', authStore.uid, authStore.assignmentQueryKeyIndex],
+  queryKey: ['assignments', authStore.uid, assignmentQueryKeyIndex],
   queryFn: () => getUserAssignments(authStore.uid),
   keepPreviousData: true,
   enabled: initialized,

diff --git a/src/pages/ProgressReport.vue b/src/pages/ProgressReport.vue
@@ -169,6 +169,8 @@ import { setBarChartData, setBarChartOptions } from '@/helpers/plotting';
 
 const authStore = useAuthStore();
 
+const { roarfirekit, userQueryKeyIndex } = storeToRefs(authStore);
+
 const props = defineProps({
   administrationId: {
     type: String,
@@ -233,7 +235,7 @@ const pageLimit = ref(10);
 
 // User Claims
 const { isLoading: isLoadingClaims, data: userClaims } = useQuery({
-  queryKey: ['userClaims', authStore.uid, authStore.userQueryKeyIndex],
+  queryKey: ['userClaims', authStore.uid, userQueryKeyIndex],
   queryFn: () => fetchDocById('userClaims', authStore.uid),
   keepPreviousData: true,
   enabled: initialized,
@@ -553,7 +555,7 @@ const refresh = () => {
 unsubscribe = authStore.$subscribe(async (mutation, state) => {
   if (state.roarfirekit.restConfig) refresh();
 });
-const { roarfirekit } = storeToRefs(authStore);
+
 onMounted(async () => {
   if (roarfirekit.value.restConfig) refresh();
 });

diff --git a/src/pages/ScoreReport.vue b/src/pages/ScoreReport.vue
@@ -330,7 +330,7 @@ let TaskReport, DistributionChartOverview, NextSteps;
 
 const authStore = useAuthStore();
 
-const { roarfirekit } = storeToRefs(authStore);
+const { roarfirekit, userQueryKeyIndex } = storeToRefs(authStore);
 
 const props = defineProps({
   administrationId: {
@@ -453,7 +453,7 @@ const pageLimit = ref(10);
 
 // User Claims
 const { isLoading: isLoadingClaims, data: userClaims } = useQuery({
-  queryKey: ['userClaims', authStore.uid, authStore.userQueryKeyIndex],
+  queryKey: ['userClaims', authStore.uid, userQueryKeyIndex],
   queryFn: () => fetchDocById('userClaims', authStore.uid),
   keepPreviousData: true,
   enabled: initialized,