chore: rename fragment to not include fragment twice

Author: tristandubbeld

packages/app/src/app/graphql/types.ts

@@ -4636,7 +4636,7 @@ export type JoinEligibleWorkspaceMutation = {
   joinEligibleWorkspace: { __typename?: 'Team'; id: any };
 };
 
-export type RecentlyDeletedTeamSandboxesFragmentFragment = {
+export type RecentlyDeletedTeamSandboxesFragment = {
   __typename?: 'Sandbox';
   id: string;
   alias: string | null;

packages/app/src/app/overmind/effects/gql/dashboard/queries.ts

@@ -61,7 +61,7 @@ import {
 } from './fragments';
 
 const RECENTLY_DELETED_TEAM_SANDBOXES_FRAGMENT = gql`
-fragment recentlyDeletedTeamSandboxesFragment on Sandbox {
+fragment recentlyDeletedTeamSandboxes on Sandbox {
   id
 
   alias
@@ -90,7 +90,7 @@ export const deletedTeamSandboxes: Query<
           showDeleted: true
           orderBy: { field: "updated_at", direction: DESC }
         ) {
-          ...recentlyDeletedTeamSandboxesFragment
+          ...recentlyDeletedTeamSandboxes
         }
       }
     }

packages/app/src/app/overmind/namespaces/dashboard/state.ts

@@ -6,7 +6,7 @@ import {
   BranchFragment as Branch,
   ProjectFragment as Repository,
   ProjectWithBranchesFragment as RepositoryWithBranches,
-  RecentlyDeletedTeamSandboxesFragmentFragment,
+  RecentlyDeletedTeamSandboxesFragment,
 } from 'app/graphql/types';
 import isSameWeek from 'date-fns/isSameWeek';
 import { sortBy } from 'lodash-es';
@@ -18,7 +18,7 @@ import { DELETE_ME_COLLECTION, OrderBy } from './types';
 export type DashboardSandboxStructure = {
   DRAFTS: Sandbox[] | null;
   TEMPLATES: Template[] | null;
-  DELETED: RecentlyDeletedTeamSandboxesFragmentFragment[] | null;
+  DELETED: RecentlyDeletedTeamSandboxesFragment[] | null;
   RECENT_SANDBOXES: Sandbox[] | null;
   RECENT_BRANCHES: Branch[] | null;
   SEARCH: Sandbox[] | null;
@@ -51,8 +51,8 @@ export type State = {
     sandboxes: Array<Sandbox | Repo | Template['sandbox']>
   ) => Sandbox[];
   deletedSandboxesByTime: {
-    week: RecentlyDeletedTeamSandboxesFragmentFragment[];
-    older: RecentlyDeletedTeamSandboxesFragmentFragment[];
+    week: RecentlyDeletedTeamSandboxesFragment[];
+    older: RecentlyDeletedTeamSandboxesFragment[];
   };
   contributions: Branch[] | null;
   /**

packages/app/src/app/pages/Dashboard/Content/routes/Deleted/index.tsx

@@ -6,7 +6,7 @@ import { Header } from 'app/pages/Dashboard/Components/Header';
 import { VariableGrid } from 'app/pages/Dashboard/Components/VariableGrid';
 import { SelectionProvider } from 'app/pages/Dashboard/Components/Selection';
 import { DashboardGridItem, PageTypes } from 'app/pages/Dashboard/types';
-import { RecentlyDeletedTeamSandboxesFragmentFragment } from 'app/graphql/types';
+import { SandboxFragmentDashboardFragment } from 'app/graphql/types';
 import { EmptyPage } from 'app/pages/Dashboard/Components/EmptyPage';
 import { Loading } from '@codesandbox/components';
 
@@ -16,7 +16,7 @@ const DESCRIPTION =
 export const Deleted = () => {
   const {
     activeTeam,
-    dashboard: { deletedSandboxesByTime, sandboxes },
+    dashboard: { deletedSandboxesByTime, getFilteredSandboxes, sandboxes },
   } = useAppState();
   const {
     dashboard: { getPage },
@@ -29,7 +29,7 @@ export const Deleted = () => {
 
   const getSection = (
     title: string,
-    deletedSandboxes: RecentlyDeletedTeamSandboxesFragmentFragment[]
+    deletedSandboxes: SandboxFragmentDashboardFragment[]
   ): DashboardGridItem[] => {
     if (!deletedSandboxes.length) return [];
 
@@ -46,11 +46,11 @@ export const Deleted = () => {
     ? [
         ...getSection(
           'Deleted this week',
-          deletedSandboxesByTime.week
+          getFilteredSandboxes(deletedSandboxesByTime.week)
         ),
         ...getSection(
           'Deleted earlier',
-          deletedSandboxesByTime.older
+          getFilteredSandboxes(deletedSandboxesByTime.older)
         ),
       ]
     : null;

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

@@ -4,7 +4,7 @@ import {
   RepoFragmentDashboardFragment,
   BranchFragment as Branch,
   ProjectFragment as Repository,
-  RecentlyDeletedTeamSandboxesFragmentFragment,
+  RecentlyDeletedTeamSandboxesFragment,
 } from 'app/graphql/types';
 import { Context } from 'app/overmind';
 import {
@@ -27,7 +27,7 @@ export type DashboardSandbox = {
         prNumber?: number;
         originalGit?: RepoFragmentDashboardFragment['originalGit'];
       })
-    | RecentlyDeletedTeamSandboxesFragmentFragment;
+    | RecentlyDeletedTeamSandboxesFragment;
   noDrag?: boolean;
 };