[dashboard] fix ws query invalidation (#17348)

Author: svenefftinge

components/dashboard/src/data/workspaces/delete-inactive-workspaces-mutation.ts

@@ -9,13 +9,15 @@ import { useFeatureFlags } from "../../contexts/FeatureFlagContext";
 import { workspacesService } from "../../service/public-api";
 import { getGitpodService } from "../../service/service";
 import { getListWorkspacesQueryKey, ListWorkspacesQueryResult } from "./list-workspaces-query";
+import { useCurrentOrg } from "../organizations/orgs-query";
 
 type DeleteInactiveWorkspacesArgs = {
     workspaceIds: string[];
 };
 export const useDeleteInactiveWorkspacesMutation = () => {
     const queryClient = useQueryClient();
     const { usePublicApiWorkspacesService } = useFeatureFlags();
+    const org = useCurrentOrg();
 
     return useMutation({
         mutationFn: async ({ workspaceIds }: DeleteInactiveWorkspacesArgs) => {
@@ -37,7 +39,7 @@ export const useDeleteInactiveWorkspacesMutation = () => {
             return deletedWorkspaceIds;
         },
         onSuccess: (deletedWorkspaceIds) => {
-            const queryKey = getListWorkspacesQueryKey();
+            const queryKey = getListWorkspacesQueryKey(org.data?.id);
 
             // Remove deleted workspaces from cache so it's reflected right away
             // Using the result of the mutationFn so we only remove workspaces that were delete

components/dashboard/src/data/workspaces/delete-workspace-mutation.ts

@@ -9,6 +9,7 @@ import { useFeatureFlags } from "../../contexts/FeatureFlagContext";
 import { workspacesService } from "../../service/public-api";
 import { getGitpodService } from "../../service/service";
 import { getListWorkspacesQueryKey, ListWorkspacesQueryResult } from "./list-workspaces-query";
+import { useCurrentOrg } from "../organizations/orgs-query";
 
 type DeleteWorkspaceArgs = {
     workspaceId: string;
@@ -17,6 +18,7 @@ type DeleteWorkspaceArgs = {
 export const useDeleteWorkspaceMutation = () => {
     const queryClient = useQueryClient();
     const { usePublicApiWorkspacesService } = useFeatureFlags();
+    const org = useCurrentOrg();
 
     return useMutation({
         mutationFn: async ({ workspaceId }: DeleteWorkspaceArgs) => {
@@ -25,7 +27,7 @@ export const useDeleteWorkspaceMutation = () => {
                 : await getGitpodService().server.deleteWorkspace(workspaceId);
         },
         onSuccess: (_, { workspaceId }) => {
-            const queryKey = getListWorkspacesQueryKey();
+            const queryKey = getListWorkspacesQueryKey(org.data?.id);
 
             // Remove workspace from cache so it's reflected right away
             queryClient.setQueryData<ListWorkspacesQueryResult>(queryKey, (oldWorkspacesData) => {

components/dashboard/src/data/workspaces/list-workspaces-query.ts

@@ -58,4 +58,9 @@ export const useListWorkspacesQuery = ({ limit }: UseListWorkspacesQueryArgs) =>
     });
 };
 
-export const getListWorkspacesQueryKey = (orgId?: string) => ["workspaces", "list", orgId || "noorg"];
+export function getListWorkspacesQueryKey(orgId?: string) {
+    if (!orgId) {
+        return ["workspaces", "list"];
+    }
+    return ["workspaces", "list", orgId];
+}

components/dashboard/src/data/workspaces/toggle-workspace-pinned-mutation.ts

@@ -7,20 +7,22 @@
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { getGitpodService } from "../../service/service";
 import { getListWorkspacesQueryKey, ListWorkspacesQueryResult } from "./list-workspaces-query";
+import { useCurrentOrg } from "../organizations/orgs-query";
 
 type ToggleWorkspacePinnedArgs = {
     workspaceId: string;
 };
 
 export const useToggleWorkspacedPinnedMutation = () => {
     const queryClient = useQueryClient();
+    const org = useCurrentOrg();
 
     return useMutation({
         mutationFn: async ({ workspaceId }: ToggleWorkspacePinnedArgs) => {
             return await getGitpodService().server.updateWorkspaceUserPin(workspaceId, "toggle");
         },
         onSuccess: (_, { workspaceId }) => {
-            const queryKey = getListWorkspacesQueryKey();
+            const queryKey = getListWorkspacesQueryKey(org.data?.id);
 
             // Update workspace.pinned to account for the toggle so it's reflected immediately
             queryClient.setQueryData<ListWorkspacesQueryResult>(queryKey, (oldWorkspaceData) => {

components/dashboard/src/data/workspaces/toggle-workspace-shared-mutation.ts

@@ -8,6 +8,7 @@ import { GitpodServer } from "@gitpod/gitpod-protocol";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { getGitpodService } from "../../service/service";
 import { getListWorkspacesQueryKey, ListWorkspacesQueryResult } from "./list-workspaces-query";
+import { useCurrentOrg } from "../organizations/orgs-query";
 
 type ToggleWorkspaceSharedArgs = {
     workspaceId: string;
@@ -16,13 +17,14 @@ type ToggleWorkspaceSharedArgs = {
 
 export const useToggleWorkspaceSharedMutation = () => {
     const queryClient = useQueryClient();
+    const org = useCurrentOrg();
 
     return useMutation({
         mutationFn: async ({ workspaceId, level }: ToggleWorkspaceSharedArgs) => {
             return await getGitpodService().server.controlAdmission(workspaceId, level);
         },
         onSuccess: (_, { workspaceId, level }) => {
-            const queryKey = getListWorkspacesQueryKey();
+            const queryKey = getListWorkspacesQueryKey(org.data?.id);
 
             // Update workspace.shareable to the level we set so it's reflected immediately
             queryClient.setQueryData<ListWorkspacesQueryResult>(queryKey, (oldWorkspacesData) => {

components/dashboard/src/data/workspaces/update-workspace-description-mutation.ts

@@ -7,20 +7,22 @@
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { getGitpodService } from "../../service/service";
 import { getListWorkspacesQueryKey, ListWorkspacesQueryResult } from "./list-workspaces-query";
+import { useCurrentOrg } from "../organizations/orgs-query";
 
 type UpdateWorkspaceDescriptionArgs = {
     workspaceId: string;
     newDescription: string;
 };
 export const useUpdateWorkspaceDescriptionMutation = () => {
     const queryClient = useQueryClient();
+    const org = useCurrentOrg();
 
     return useMutation({
         mutationFn: async ({ workspaceId, newDescription }: UpdateWorkspaceDescriptionArgs) => {
             return await getGitpodService().server.setWorkspaceDescription(workspaceId, newDescription);
         },
         onSuccess: (_, { workspaceId, newDescription }) => {
-            const queryKey = getListWorkspacesQueryKey();
+            const queryKey = getListWorkspacesQueryKey(org.data?.id);
 
             // pro-actively update workspace description rather than reload all workspaces
             queryClient.setQueryData<ListWorkspacesQueryResult>(queryKey, (oldWorkspacesData) => {