refactor: limit moves to same types

opengovsg · Jan 20, 2025 · 75ddd55 · 75ddd55
1 parent f66a21b
commit 75ddd55
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 41 deletions.
diff --git a/apps/studio/src/features/dashboard/components/ResourceTable/ResourceTableMenu.tsx b/apps/studio/src/features/dashboard/components/ResourceTable/ResourceTableMenu.tsx
@@ -12,7 +12,10 @@ import {
 
 import type { ResourceTableData } from "./types"
 import { MenuItem } from "~/components/Menu"
-import { moveResourceAtom } from "~/features/editing-experience/atoms"
+import {
+  moveResourceAtom,
+  moveTypesAtom,
+} from "~/features/editing-experience/atoms"
 import { Can } from "~/features/permissions"
 import {
   deleteResourceModalAtom,
@@ -38,8 +41,11 @@ export const ResourceTableMenu = ({
   parentId,
 }: ResourceTableMenuProps) => {
   const setMoveResource = useSetAtom(moveResourceAtom)
-  const handleMoveResourceClick = () =>
+  const setMoveResourceTypes = useSetAtom(moveTypesAtom)
+  const handleMoveResourceClick = () => {
     setMoveResource({ resourceId, title, permalink, parentId })
+    setMoveResourceTypes([ResourceType.RootPage, ResourceType.Folder])
+  }
   const setResourceModalState = useSetAtom(deleteResourceModalAtom)
   const setFolderSettingsModalState = useSetAtom(folderSettingsModalAtom)
   const setPageSettingsModalState = useSetAtom(pageSettingsModalAtom)

diff --git a/apps/studio/src/features/editing-experience/atoms.ts b/apps/studio/src/features/editing-experience/atoms.ts
@@ -1,9 +1,11 @@
+import { ResourceType } from "~prisma/generated/generatedEnums"
 import { format } from "date-fns"
 import { atom } from "jotai"
 
 import type { PendingMoveResource } from "./types"
 
 export const moveResourceAtom = atom<null | PendingMoveResource>(null)
+export const moveTypesAtom = atom<keyof typeof ResourceType>([])
 
 export interface CollectionLinkProps {
   ref: string

diff --git a/...studio/src/features/editing-experience/components/MoveResourceModal/MoveResourceModal.tsx b/...studio/src/features/editing-experience/components/MoveResourceModal/MoveResourceModal.tsx
@@ -27,7 +27,7 @@ import { withSuspense } from "~/hocs/withSuspense"
 import { useQueryParse } from "~/hooks/useQueryParse"
 import { sitePageSchema } from "~/pages/sites/[siteId]"
 import { trpc } from "~/utils/trpc"
-import { moveResourceAtom } from "../../atoms"
+import { moveResourceAtom, moveTypesAtom } from "../../atoms"
 import { MoveItem } from "./MoveItem"
 
 const generatePermalinkPrefix = (parents: PendingMoveResource[]) => {
@@ -60,6 +60,7 @@ const MoveResourceContent = withSuspense(
     const [resourceStack, setResourceStack] = useState<PendingMoveResource[]>(
       [],
     )
+    const allowedMoveTypes = useAtomValue(moveTypesAtom)
     const [isResourceHighlighted, setIsResourceHighlighted] =
       useState<boolean>(true)
     const { siteId } = useQueryParse(sitePageSchema)
@@ -101,6 +102,7 @@ const MoveResourceContent = withSuspense(
         setMovedItem(null)
       },
       onSuccess: async () => {
+        await utils.collection.list.invalidate()
         await utils.page.readPageAndBlob.invalidate()
         await utils.resource.getParentOf.invalidate()
         await utils.resource.getChildrenOf.invalidate()
@@ -204,46 +206,50 @@ const MoveResourceContent = withSuspense(
                 </Flex>
               )}
               {data?.pages.map(({ items }) =>
-                items.map((item) => {
-                  const isItemDisabled: boolean =
-                    item.id === movedItem?.resourceId
-                  const isItemHighlighted: boolean =
-                    isResourceHighlighted && item.id === curResourceId
+                items
+                  .filter(({ type }) => {
+                    return allowedMoveTypes.includes(type)
+                  })
+                  .map((item) => {
+                    const isItemDisabled: boolean =
+                      item.id === movedItem?.resourceId
+                    const isItemHighlighted: boolean =
+                      isResourceHighlighted && item.id === curResourceId
 
-                  return (
-                    <MoveItem
-                      {...item}
-                      key={item.id}
-                      isDisabled={isItemDisabled}
-                      isHighlighted={isItemHighlighted}
-                      handleOnClick={() => {
-                        if (isItemDisabled) {
-                          return
-                        }
+                    return (
+                      <MoveItem
+                        {...item}
+                        key={item.id}
+                        isDisabled={isItemDisabled}
+                        isHighlighted={isItemHighlighted}
+                        handleOnClick={() => {
+                          if (isItemDisabled) {
+                            return
+                          }
 
-                        if (isItemHighlighted) {
-                          setIsResourceHighlighted(false)
-                          return
-                        }
+                          if (isItemHighlighted) {
+                            setIsResourceHighlighted(false)
+                            return
+                          }
 
-                        const newResource = {
-                          ...item,
-                          parentId: parentDest?.resourceId ?? null,
-                          resourceId: item.id,
-                        }
-                        if (isResourceHighlighted) {
-                          setResourceStack((prev) => [
-                            ...prev.slice(0, -1),
-                            newResource,
-                          ])
-                        } else {
-                          setIsResourceHighlighted(true)
-                          setResourceStack((prev) => [...prev, newResource])
-                        }
-                      }}
-                    />
-                  )
-                }),
+                          const newResource = {
+                            ...item,
+                            parentId: parentDest?.resourceId ?? null,
+                            resourceId: item.id,
+                          }
+                          if (isResourceHighlighted) {
+                            setResourceStack((prev) => [
+                              ...prev.slice(0, -1),
+                              newResource,
+                            ])
+                          } else {
+                            setIsResourceHighlighted(true)
+                            setResourceStack((prev) => [...prev, newResource])
+                          }
+                        }}
+                      />
+                    )
+                  }),
               )}
               {hasNextPage && (
                 <Button

diff --git a/apps/studio/src/server/modules/resource/resource.router.ts b/apps/studio/src/server/modules/resource/resource.router.ts
@@ -291,8 +291,8 @@ export const resourceRouter = router({
               .where("id", "=", String(movedResourceId))
               .where("Resource.type", "in", [
                 ResourceType.Page,
+                ResourceType.CollectionPage,
                 ResourceType.Folder,
-                ResourceType.Collection,
               ])
               .set({
                 parentId: !!destinationResourceId

diff --git a/package-lock.json b/package-lock.json