Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace with ResourceType for SSOT #838

Merged
merged 2 commits into from
Nov 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions apps/studio/src/components/PageEditor/ComponentSelector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
VStack,
} from "@chakra-ui/react"
import { Button } from "@opengovsg/design-system-react"
import { ResourceType } from "~prisma/generated/generatedEnums"
import { type IconType } from "react-icons"

import { useEditorDrawerContext } from "~/contexts/EditorDrawerContext"
Expand Down Expand Up @@ -164,22 +165,22 @@ function ComponentSelector() {

const availableBlocks = useMemo(() => {
switch (type) {
case "RootPage":
case ResourceType.RootPage:
return HOMEPAGE_ALLOWED_BLOCKS
case "Page":
case ResourceType.Page:
if (savedPageState.layout === "content") {
return CONTENT_ALLOWED_BLOCKS
} else if (savedPageState.layout === "article") {
return ARTICLE_ALLOWED_BLOCKS
}
throw new Error(`Unsupported page layout: ${savedPageState.layout}`)
case "CollectionPage":
case ResourceType.CollectionPage:
return ARTICLE_ALLOWED_BLOCKS
case "Collection":
case "CollectionLink":
case "IndexPage":
case ResourceType.Collection:
case ResourceType.CollectionLink:
case ResourceType.IndexPage:
return []
case "Folder":
case ResourceType.Folder:
throw new Error(`Unsupported resource type: ${type}`)
default:
const exhaustiveCheck: never = type
Expand Down
11 changes: 6 additions & 5 deletions apps/studio/src/components/ResourceSelector/ResourceItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { Box, HStack, Icon, Skeleton, Text } from "@chakra-ui/react"
import { dataAttr } from "@chakra-ui/utils"
import { Button } from "@opengovsg/design-system-react"
import { QueryErrorResetBoundary } from "@tanstack/react-query"
import { ResourceType } from "~prisma/generated/generatedEnums"
import { ErrorBoundary } from "react-error-boundary"
import { BiData, BiFile, BiFolder, BiLink, BiLockAlt } from "react-icons/bi"

Expand All @@ -27,14 +28,14 @@ const SuspendableResourceItem = ({
}: ResourceItemProps) => {
const icon: IconType = useMemo(() => {
switch (type) {
case "CollectionLink":
case ResourceType.CollectionLink:
return BiLink
case "Folder":
case ResourceType.Folder:
return BiFolder
case "CollectionPage":
case "Page":
case ResourceType.CollectionPage:
case ResourceType.Page:
return BiFile
case "Collection":
case ResourceType.Collection:
return BiData
}
}, [type])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
Text,
} from "@chakra-ui/react"
import { Button, Link } from "@opengovsg/design-system-react"
import { ResourceType } from "~prisma/generated/generatedEnums"
import { BiHomeAlt, BiLeftArrowAlt } from "react-icons/bi"

import { trpc } from "~/utils/trpc"
Expand Down Expand Up @@ -114,7 +115,10 @@ const SuspensableResourceSelector = ({
isSelected={selectedResourceId === child.id}
isDisabled={isDisabled}
onResourceItemSelect={() => {
if (child.type === "Folder" || child.type === "Collection") {
if (
child.type === ResourceType.Folder ||
child.type === ResourceType.Collection
) {
setParentIdStack((prev) => [...prev, child.id])
} else {
onChange(child.id)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,14 @@ import {

const getResourceLabel = (
resourceType: ResourceType,
): Lowercase<Extract<ResourceType, "Page" | "Collection" | "Folder">> => {
): Lowercase<
Extract<
ResourceType,
| typeof ResourceType.Page
| typeof ResourceType.Collection
| typeof ResourceType.Folder
>
> => {
if (!isAllowedToHaveChildren(resourceType)) {
return "page"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Flex } from "@chakra-ui/react"
import { ResourceType } from "~prisma/generated/generatedEnums"

import { DirectorySidebarContent } from "./DirectorySidebarContent"

Expand All @@ -14,7 +15,7 @@ export const DirectorySidebar = ({
<DirectorySidebarContent
siteId={siteId}
resourceId={null}
item={{ permalink: "", type: "RootPage" }}
item={{ permalink: "", type: ResourceType.RootPage }}
defaultIndex={0}
level={0}
subLabel="Home"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { useEffect, useMemo, useState } from "react"
import { Accordion, AccordionItem, AccordionPanel } from "@chakra-ui/react"
import { Button } from "@opengovsg/design-system-react"
import { ResourceType } from "~prisma/generated/generatedEnums"

import type { ResourceType } from "~prisma/generated/generatedEnums"
import { getResourceSubpath } from "~/utils/resource"
import { trpc } from "~/utils/trpc"
import { ICON_MAPPINGS } from "./constants"
Expand Down Expand Up @@ -36,16 +36,16 @@ export const DirectorySidebarContent = ({
const isActive = useIsActive(resourceId, item.type)

const href = useMemo(() => {
if (item.type === "RootPage") {
if (item.type === ResourceType.RootPage) {
return `/sites/${siteId}`
}
return `/sites/${siteId}/${getResourceSubpath(item.type)}/${resourceId}`
}, [siteId, item.type, resourceId])

const isExpandable =
item.type === "Folder" ||
item.type === "Collection" ||
item.type === "RootPage"
item.type === ResourceType.Folder ||
item.type === ResourceType.Collection ||
item.type === ResourceType.RootPage

const isEnabled = expandedIndex === 0 || isActive

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ResourceType } from "~prisma/generated/generatedEnums"
import { z } from "zod"

import type { ResourceType } from "~prisma/generated/generatedEnums"
import { useQueryParse } from "~/hooks/useQueryParse"

const siteSchema = z.object({
Expand All @@ -17,20 +17,20 @@ export const useIsActive = (
const siteProps = useQueryParse(siteSchema)

switch (type) {
case "RootPage":
case ResourceType.RootPage:
return (
currentResourceId === null &&
siteProps.resourceId === undefined &&
siteProps.folderId === undefined
)
case "Page":
case "CollectionPage":
case "IndexPage":
case ResourceType.Page:
case ResourceType.CollectionPage:
case ResourceType.IndexPage:
return siteProps.resourceId === currentResourceId
case "Folder":
case "Collection":
case ResourceType.Folder:
case ResourceType.Collection:
return siteProps.folderId === currentResourceId
case "CollectionLink":
case ResourceType.CollectionLink:
return siteProps.linkId === currentResourceId
default:
const _uncaught: never = type
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export const ResourceTableMenu = ({
<Portal>
<MenuList>
{/* TODO: Open edit modal depending on resource */}
{type === "Page" ? (
{type === ResourceType.Page ? (
<>
<MenuItem
as={NextLink}
Expand Down Expand Up @@ -91,7 +91,7 @@ export const ResourceTableMenu = ({
Edit folder settings
</MenuItem>
)}
{(type === "Page" || type === "Folder") && (
{(type === ResourceType.Page || type === ResourceType.Folder) && (
// TODO: we need to change the resourceid next time when we implement root level permissions
<Can do="move" on={{ parentId }}>
<MenuItem
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { useMemo } from "react"
import NextLink from "next/link"
import { HStack, Icon, Text, VStack } from "@chakra-ui/react"
import { Link } from "@opengovsg/design-system-react"
import { ResourceType } from "~prisma/generated/generatedEnums"
import { BiData, BiFile, BiFolder, BiHome, BiLink } from "react-icons/bi"

import type { ResourceTableData } from "./types"
Expand All @@ -26,18 +27,18 @@ export const TitleCell = ({

const ResourceTypeIcon: IconType = useMemo(() => {
switch (type) {
case "RootPage":
case ResourceType.RootPage:
return BiHome
case "IndexPage":
case "Page":
case ResourceType.IndexPage:
case ResourceType.Page:
return BiFile
case "Folder":
case ResourceType.Folder:
return BiFolder
case "Collection":
case ResourceType.Collection:
return BiData
case "CollectionPage":
case ResourceType.CollectionPage:
return BiFile
case "CollectionLink":
case ResourceType.CollectionLink:
return BiLink
}
}, [type])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ const useCreateCollectionPageWizardContext = ({
onError: (error) => {
if (
error.data?.code === "CONFLICT" &&
values.type === "CollectionPage"
values.type === ResourceType.CollectionPage
) {
formMethods.setError(
"permalink",
Expand All @@ -113,7 +113,7 @@ const useCreateCollectionPageWizardContext = ({
return
} else if (
error.data?.code === "CONFLICT" &&
values.type === "CollectionLink"
values.type === ResourceType.CollectionLink
) {
formMethods.setError(
"title",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type { IsomerSitemap } from "@opengovsg/isomer-components"
import { ResourceType } from "~prisma/generated/generatedEnums"
import { useAtomValue } from "jotai"

import { useQueryParse } from "~/hooks/useQueryParse"
Expand All @@ -25,7 +26,7 @@ export const EditCollectionLinkPreview = (): JSX.Element => {
})

const parentPermalink = permalink.split("/").slice(0, -1).join("/")
const parentTitle = parent?.title || "Collection"
const parentTitle = parent?.title || ResourceType.Collection

const siteMap = {
id: "root",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import { useQueryParse } from "~/hooks/useQueryParse"
import { type NextPageWithLayout } from "~/lib/types"
import { AdminCmsSidebarLayout } from "~/templates/layouts/AdminCmsSidebarLayout"
import { trpc } from "~/utils/trpc"
import { ResourceType } from "../../../../../prisma/generated/generatedEnums"

const sitePageSchema = z.object({
siteId: z.coerce.number(),
Expand Down Expand Up @@ -114,7 +115,7 @@ const CollectionResourceListPage: NextPageWithLayout = () => {
CollectionResourceListPage.getLayout = (page) => {
return (
<PermissionsBoundary
resourceType="Collection"
resourceType={ResourceType.Collection}
page={AdminCmsSidebarLayout(page)}
/>
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
VStack,
} from "@chakra-ui/react"
import { Breadcrumb, Button, Menu } from "@opengovsg/design-system-react"
import { ResourceType } from "~prisma/generated/generatedEnums"
import { useSetAtom } from "jotai"
import { BiFileBlank, BiFolder } from "react-icons/bi"
import { z } from "zod"
Expand Down Expand Up @@ -246,7 +247,7 @@ const FolderPage: NextPageWithLayout = () => {
FolderPage.getLayout = (page) => {
return (
<PermissionsBoundary
resourceType="Folder"
resourceType={ResourceType.Folder}
page={AdminCmsSidebarLayout(page)}
/>
)
Expand Down
3 changes: 2 additions & 1 deletion apps/studio/src/pages/sites/[siteId]/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
VStack,
} from "@chakra-ui/react"
import { Button, Menu } from "@opengovsg/design-system-react"
import { ResourceType } from "~prisma/generated/generatedEnums"
import { BiData, BiFileBlank, BiFolder, BiHomeAlt } from "react-icons/bi"
import { z } from "zod"

Expand Down Expand Up @@ -170,7 +171,7 @@ const SitePage: NextPageWithLayout = () => {
SitePage.getLayout = (page) => {
return (
<PermissionsBoundary
resourceType="RootPage"
resourceType={ResourceType.RootPage}
page={AdminCmsSidebarLayout(page)}
/>
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Grid, GridItem } from "@chakra-ui/react"
import { ResourceType } from "~prisma/generated/generatedEnums"

import type { NextPageWithLayout } from "~/lib/types"
import { PermissionsBoundary } from "~/components/AuthWrappers"
Expand Down Expand Up @@ -60,7 +61,10 @@ const PageEditingView = () => {

EditPage.getLayout = (page) => {
return (
<PermissionsBoundary resourceType="Page" page={PageEditingLayout(page)} />
<PermissionsBoundary
resourceType={ResourceType.Page}
page={PageEditingLayout(page)}
/>
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,10 @@ const PageSettings: NextPageWithLayout = () => {

PageSettings.getLayout = (page) => {
return (
<PermissionsBoundary resourceType="Page" page={PageEditingLayout(page)} />
<PermissionsBoundary
resourceType={ResourceType.Page}
page={PageEditingLayout(page)}
/>
)
}

Expand Down
3 changes: 2 additions & 1 deletion apps/studio/src/pages/sites/[siteId]/settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
Toggle,
useToast,
} from "@opengovsg/design-system-react"
import { ResourceType } from "~prisma/generated/generatedEnums"
import { z } from "zod"

import { PermissionsBoundary } from "~/components/AuthWrappers"
Expand Down Expand Up @@ -222,7 +223,7 @@ const SiteSettingsPage: NextPageWithLayout = () => {
SiteSettingsPage.getLayout = (page) => {
return (
<PermissionsBoundary
resourceType="RootPage"
resourceType={ResourceType.RootPage}
page={AdminSidebarOnlyLayout(page)}
/>
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export const collectionRouter = router({
const resource = await getSiteResourceById({
siteId,
resourceId: String(resourceId),
type: "Collection",
type: ResourceType.Collection,
})
if (!resource) {
throw new TRPCError({
Expand Down
5 changes: 4 additions & 1 deletion apps/studio/src/server/modules/folder/folder.router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,10 @@ export const folderRouter = router({
.updateTable("Resource")
.where("Resource.id", "=", resourceId)
.where("Resource.siteId", "=", Number(siteId))
.where("Resource.type", "in", ["Folder", "Collection"])
.where("Resource.type", "in", [
ResourceType.Folder,
ResourceType.Collection,
])
.set({
permalink,
title,
Expand Down
Loading
Loading