Improved cache invalidation

Author: niemyjski

src/Exceptionless.Web/ClientApp/src/lib/features/events/api.svelte.ts

@@ -17,16 +17,14 @@ export async function invalidatePersistentEventQueries(queryClient: QueryClient,
     }
 
     if (!id && !stack_id) {
-        await queryClient.invalidateQueries({ queryKey: queryKeys.all });
+        await queryClient.invalidateQueries({ queryKey: queryKeys.type });
     }
 }
 
 export const queryKeys = {
-    all: ['PersistentEvent'] as const,
-    allWithFilters: (filters: string) => [...queryKeys.all, { filters }] as const,
-    id: (id: string | undefined) => [...queryKeys.all, id] as const,
-    stacks: (id: string | undefined) => [...queryKeys.all, 'stacks', id] as const,
-    stackWithFilters: (id: string | undefined, filters: string) => [...queryKeys.stacks(id), { filters }] as const
+    id: (id: string | undefined) => [...queryKeys.type, id] as const,
+    stacks: (id: string | undefined) => [...queryKeys.type, 'stacks', id] as const,
+    type: ['PersistentEvent'] as const
 };
 
 export interface GetEventByIdProps {

src/Exceptionless.Web/ClientApp/src/lib/features/organizations/api.svelte.ts

@@ -11,15 +11,18 @@ export async function invalidateOrganizationQueries(queryClient: QueryClient, me
     const { id } = message;
     if (id) {
         await queryClient.invalidateQueries({ queryKey: queryKeys.id(id) });
+
+        // Invalidate regardless of mode
+        await queryClient.invalidateQueries({ queryKey: queryKeys.list(undefined) });
     } else {
-        await queryClient.invalidateQueries({ queryKey: queryKeys.all });
+        await queryClient.invalidateQueries({ queryKey: queryKeys.type });
     }
 }
 
 export const queryKeys = {
-    all: ['Organization'] as const,
-    allWithMode: (mode: 'stats' | undefined) => [...queryKeys.all, { mode }] as const,
-    id: (id: string | undefined) => [...queryKeys.all, id] as const
+    id: (id: string | undefined) => [...queryKeys.type, id] as const,
+    list: (mode: 'stats' | undefined) => (mode ? ([...queryKeys.type, 'list', { mode }] as const) : ([...queryKeys.type, 'list'] as const)),
+    type: ['Organization'] as const
 };
 
 export interface GetOrganizationsProps {
@@ -48,6 +51,6 @@ export function getOrganizationQuery(props: GetOrganizationsProps) {
 
             return response.data!;
         },
-        queryKey: props.mode ? queryKeys.allWithMode(props.mode) : queryKeys.all
+        queryKey: queryKeys.list(props.mode ?? undefined)
     }));
 }

src/Exceptionless.Web/ClientApp/src/lib/features/projects/api.svelte.ts

@@ -17,16 +17,14 @@ export async function invalidateProjectQueries(queryClient: QueryClient, message
     }
 
     if (!id && !organization_id) {
-        await queryClient.invalidateQueries({ queryKey: queryKeys.all });
+        await queryClient.invalidateQueries({ queryKey: queryKeys.type });
     }
 }
 
 export const queryKeys = {
-    all: ['Project'] as const,
-    allWithFilters: (filters: string) => [...queryKeys.all, { filters }] as const,
-    id: (id: string | undefined) => [...queryKeys.all, id] as const,
-    organization: (id: string | undefined) => [...queryKeys.all, 'organization', id] as const,
-    organizationWithFilters: (id: string | undefined, filters: string) => [...queryKeys.organization(id), { filters }] as const
+    id: (id: string | undefined) => [...queryKeys.type, id] as const,
+    organization: (id: string | undefined) => [...queryKeys.type, 'organization', id] as const,
+    type: ['Project'] as const
 };
 
 export interface DemoteProjectTabProps {

src/Exceptionless.Web/ClientApp/src/lib/features/stacks/api.svelte.ts

@@ -12,14 +12,13 @@ export async function invalidateStackQueries(queryClient: QueryClient, message:
     if (id) {
         await queryClient.invalidateQueries({ queryKey: queryKeys.id(id) });
     } else {
-        await queryClient.invalidateQueries({ queryKey: queryKeys.all });
+        await queryClient.invalidateQueries({ queryKey: queryKeys.type });
     }
 }
 
 export const queryKeys = {
-    all: ['Stack'] as const,
-    allWithFilters: (filters: string) => [...queryKeys.all, { filters }] as const,
-    id: (id: string | undefined) => [...queryKeys.all, id] as const
+    id: (id: string | undefined) => [...queryKeys.type, id] as const,
+    type: ['Stack'] as const
 };
 
 export interface GetStackByIdProps {

src/Exceptionless.Web/ClientApp/src/lib/features/users/api.svelte.ts

@@ -16,15 +16,15 @@ export async function invalidateUserQueries(queryClient: QueryClient, message: W
             queryClient.invalidateQueries({ queryKey: queryKeys.me() });
         }
     } else {
-        await queryClient.invalidateQueries({ queryKey: queryKeys.all });
+        await queryClient.invalidateQueries({ queryKey: queryKeys.type });
     }
 }
 
 export const queryKeys = {
-    all: ['User'] as const,
-    id: (id: string | undefined) => [...queryKeys.all, id] as const,
+    id: (id: string | undefined) => [...queryKeys.type, id] as const,
     idEmailAddress: (id?: string) => [...queryKeys.id(id), 'email-address'] as const,
-    me: () => [...queryKeys.all, 'me'] as const
+    me: () => [...queryKeys.type, 'me'] as const,
+    type: ['User'] as const
 };
 
 export interface UpdateEmailAddressProps {