Fix permanently deleting sandboxes

Author: CompuIves

packages/app/src/app/pages/Dashboard/Content/routes/DeletedSandboxes/index.js

@@ -33,9 +33,15 @@ const DeletedSandboxes = () => (
             const orderedSandboxes = state.dashboard.getFilteredSandboxes(
               sandboxes
             );
-            actions.dashboard.setTrashSandboxes({
-              sandboxIds: orderedSandboxes.map(i => i.id),
-            });
+            const trashSandboxIds = orderedSandboxes.map(i => i.id);
+            if (
+              JSON.stringify(state.dashboard.trashSandboxIds) !==
+              JSON.stringify(trashSandboxIds)
+            ) {
+              actions.dashboard.setTrashSandboxes({
+                sandboxIds: trashSandboxIds,
+              });
+            }
 
             return (
               <Sandboxes

packages/app/src/app/pages/Dashboard/queries.ts

@@ -194,10 +194,9 @@ export const RENAME_SANDBOX_MUTATION = gql`
 export const PERMANENTLY_DELETE_SANDBOXES_MUTATION = gql`
   mutation PermanentlyDeleteSandboxes($sandboxIds: [ID]!) {
     permanentlyDeleteSandboxes(sandboxIds: $sandboxIds) {
-      ...Sandbox
+      id
     }
   }
-  ${SANDBOX_FRAGMENT}
 `;
 
 export const PATHED_SANDBOXES_CONTENT_QUERY = gql`
@@ -311,16 +310,14 @@ export function undeleteSandboxes(selectedSandboxes) {
   });
 }
 
-export function permanentlyDeleteSandboxes(selectedSandboxes) {
-  client.mutate<
+export function permanentlyDeleteSandboxes(selectedSandboxes: string[]) {
+  return client.mutate<
     PermanentlyDeleteSandboxesMutation,
     PermanentlyDeleteSandboxesMutationVariables
   >({
     mutation: PERMANENTLY_DELETE_SANDBOXES_MUTATION,
     variables: {
-      sandboxIds: selectedSandboxes.toJS
-        ? selectedSandboxes.toJS()
-        : selectedSandboxes,
+      sandboxIds: selectedSandboxes,
     },
     update: cache => {
       try {
@@ -335,12 +332,9 @@ export function permanentlyDeleteSandboxes(selectedSandboxes) {
           ...oldDeleteCache,
           me: {
             ...(oldDeleteCache && oldDeleteCache.me ? oldDeleteCache.me : null),
-            sandboxes: (
-              (oldDeleteCache &&
-                oldDeleteCache.me &&
-                oldDeleteCache.me.sandboxes) ||
-              ([] as any)
-            ).sandboxes.filter(x => !selectedSandboxes.includes(x.id)),
+            sandboxes: (oldDeleteCache?.me?.sandboxes || []).filter(
+              x => !selectedSandboxes.includes(x.id)
+            ),
           },
         };