feat: use type column from db for resource list table

opengovsg · Jul 19, 2024 · 18b87e9 · 18b87e9
1 parent de4412b
commit 18b87e9
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 16 deletions.
diff --git a/apps/studio/src/features/dashboard/components/ResourceTable/ResourceTable.tsx b/apps/studio/src/features/dashboard/components/ResourceTable/ResourceTable.tsx
@@ -27,7 +27,7 @@ const columns = [
       <TitleCell
         title={row.original.title}
         permalink={`/${row.original.permalink}`}
-        type={row.original.mainBlobId ? "page" : "folder"}
+        type={row.original.type}
       />
     ),
   }),
@@ -38,7 +38,7 @@ const columns = [
       <ResourceTableMenu
         title={row.original.title}
         resourceId={row.original.id}
-        type={row.original.mainBlobId ? "page" : "folder"}
+        type={row.original.type}
       />
     ),
     size: 24,

diff --git a/apps/studio/src/features/dashboard/components/ResourceTable/ResourceTableMenu.tsx b/apps/studio/src/features/dashboard/components/ResourceTable/ResourceTableMenu.tsx
@@ -9,13 +9,12 @@ import {
 } from "react-icons/bi"
 
 import type { ResourceTableData } from "./types"
-import type { ResourceType } from "~/utils/resource"
 import { MenuItem } from "~/components/Menu"
 
 interface ResourceTableMenuProps {
   title: ResourceTableData["title"]
   resourceId: ResourceTableData["id"]
-  type: ResourceType
+  type: ResourceTableData["type"]
 }
 
 export const ResourceTableMenu = ({ title, type }: ResourceTableMenuProps) => {
@@ -31,7 +30,7 @@ export const ResourceTableMenu = ({ title, type }: ResourceTableMenuProps) => {
       <Portal>
         <MenuList>
           {/* TODO: Open edit modal depending on resource  */}
-          {type === "page" ? (
+          {type === "Page" ? (
             <>
               <MenuItem icon={<BiCog fontSize="1rem" />}>
                 Edit page settings

diff --git a/apps/studio/src/features/dashboard/components/ResourceTable/TitleCell.tsx b/apps/studio/src/features/dashboard/components/ResourceTable/TitleCell.tsx
@@ -2,13 +2,11 @@ import { HStack, Icon, Text, VStack } from "@chakra-ui/react"
 import { BiFileBlank, BiFolder } from "react-icons/bi"
 
 import type { ResourceTableData } from "./types"
-import type { ResourceType } from "~/utils/resource"
 
-export interface TitleCellProps {
-  title: ResourceTableData["title"]
-  permalink?: ResourceTableData["permalink"]
-  type: ResourceType
-}
+export type TitleCellProps = Pick<
+  ResourceTableData,
+  "title" | "permalink" | "type"
+>
 
 export const TitleCell = ({
   title,
@@ -19,7 +17,7 @@ export const TitleCell = ({
     <HStack align="center" spacing="0.625rem">
       <Icon
         fontSize="1.25rem"
-        as={type === "page" ? BiFileBlank : BiFolder}
+        as={type === "Page" ? BiFileBlank : BiFolder}
         color="base.content.strong"
       />
       <VStack spacing="0.25rem" align="start">

diff --git a/apps/studio/src/server/modules/page/page.router.ts b/apps/studio/src/server/modules/page/page.router.ts
@@ -70,6 +70,7 @@ export const pageRouter = router({
           "Resource.title",
           "Resource.mainBlobId",
           "Resource.draftBlobId",
+          "Resource.type",
         ])
         .execute()
     }),

diff --git a/apps/studio/src/utils/resource.ts b/apps/studio/src/utils/resource.ts
diff --git a/apps/studio/tests/msw/handlers/page.ts b/apps/studio/tests/msw/handlers/page.ts
@@ -15,20 +15,23 @@ const pageListQuery = (wait?: DelayMode | number) => {
         title: "Test page 1",
         mainBlobId: 3,
         draftBlobId: null,
+        type: "Page",
       },
       {
         id: 5,
         permalink: "test-page-2",
         title: "Test page 2",
         mainBlobId: 4,
         draftBlobId: null,
+        type: "Page",
       },
       {
         id: 6,
         permalink: "folder",
         title: "Test folder 1",
         mainBlobId: null,
         draftBlobId: null,
+        type: "Folder",
       },
     ]
   })