isom-1659 internal links for folders

apps/studio/public/assets/css/preview-tw.css

@@ -1418,10 +1418,6 @@ video {
   -webkit-line-clamp: 3;
 }
 
-.\!block {
-  display: block !important;
-}
-
 .block {
   display: block;
 }
@@ -3156,11 +3152,6 @@ video {
   color: rgb(26 86 229 / var(--tw-text-opacity));
 }
 
-.text-link-hover {
-  --tw-text-opacity: 1;
-  color: rgb(21 71 190 / var(--tw-text-opacity));
-}
-
 .text-site-secondary {
   --tw-text-opacity: 1;
   color: rgb(78 69 65 / var(--tw-text-opacity));
@@ -5510,12 +5501,6 @@ video {
   margin-top: 2.25rem;
 }
 
-.\[\&\:not\(\:first-child\)\]\:first-of-type\:mt-7:first-of-type:not(
-    :first-child
-  ) {
-  margin-top: 1.75rem;
-}
-
 .\[\&\:not\(\:last-child\)\]\:mb-0:not(:last-child) {
   margin-bottom: 0px;
 }

apps/studio/src/components/PageEditor/LinkEditorModal.tsx

@@ -8,7 +8,6 @@ import {
   ModalFooter,
   ModalHeader,
   ModalOverlay,
-  Text,
 } from "@chakra-ui/react"
 import {
   Button,
@@ -29,7 +28,6 @@ import {
 import { useQueryParse } from "~/hooks/useQueryParse"
 import { useZodForm } from "~/lib/form"
 import { getReferenceLink, getResourceIdFromReferenceLink } from "~/utils/link"
-import { trpc } from "~/utils/trpc"
 import { ResourceSelector } from "../ResourceSelector"
 import { FileAttachment } from "./FileAttachment"
 
@@ -44,31 +42,16 @@ interface PageLinkElementProps {
 
 const PageLinkElement = ({ value, onChange }: PageLinkElementProps) => {
   const { siteId } = useQueryParse(editSiteSchema)
-
-  const selectedResourceId = getResourceIdFromReferenceLink(value)
-
-  const { data: resource } = trpc.resource.getWithFullPermalink.useQuery({
-    resourceId: selectedResourceId,
-  })
-
   return (
-    <>
-      <ResourceSelector
-        siteId={String(siteId)}
-        onChange={(resourceId) =>
-          onChange(getReferenceLink({ siteId: String(siteId), resourceId }))
-        }
-        selectedResourceId={selectedResourceId}
-      />
-
-      {!!resource && (
-        <Box bg="utility.feedback.info-subtle" p="0.75rem" w="full" mt="0.5rem">
-          <Text textStyle="caption-1">
-            You selected /{resource.fullPermalink}
-          </Text>
-        </Box>
-      )}
-    </>
+    <ResourceSelector
+      interactionType="link"
+      siteId={siteId}
+      onChange={(resourceId) =>
+        onChange(getReferenceLink({ siteId: String(siteId), resourceId }))
+      }
+      selectedResourceId={getResourceIdFromReferenceLink(value)}
+      fileExplorerHeight={12}
+    />
   )
 }
 

apps/studio/src/components/ResourceSelector/ResourceItem.tsx

@@ -1,108 +1,77 @@
-import type { IconType } from "react-icons"
-import { Suspense, useMemo } from "react"
-import { Box, HStack, Icon, Skeleton, Text } from "@chakra-ui/react"
+import type { ButtonProps } from "@opengovsg/design-system-react"
+import { Icon, Skeleton, Text, VStack } 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"
 
-import type { RouterOutput } from "~/utils/trpc"
+import type { ResourceItemContent } from "~/schemas/resource"
+import { getIcon } from "~/utils/resources"
 
-type ResourceItemProps = Pick<
-  RouterOutput["resource"]["getChildrenOf"]["items"][number],
-  "permalink" | "type"
-> & {
-  isSelected: boolean
-  isDisabled: boolean
-  onResourceItemSelect: () => void
+interface ResourceItemProps {
+  item: ResourceItemContent
+  isDisabled?: boolean
+  isHighlighted?: boolean
+  handleOnClick?: () => void
+  hasAdditionalLeftPadding?: boolean
+  isLoading?: boolean
 }
 
-const SuspendableResourceItem = ({
-  permalink,
-  type,
-  isSelected,
-  isDisabled,
-  onResourceItemSelect,
-}: ResourceItemProps) => {
-  const icon: IconType = useMemo(() => {
-    switch (type) {
-      case ResourceType.CollectionLink:
-        return BiLink
-      case ResourceType.Folder:
-        return BiFolder
-      case ResourceType.CollectionPage:
-      case ResourceType.Page:
-        return BiFile
-      case ResourceType.Collection:
-        return BiData
-    }
-  }, [type])
-
+const ResourceItemContainer = (props: ButtonProps) => {
   return (
     <Button
       variant="clear"
       w="full"
       justifyContent="flex-start"
-      color="base.content.default"
-      isDisabled={isDisabled}
-      data-selected={dataAttr(isSelected)}
+      color={"base.content.default"}
+      height="fit-content"
+      alignItems="flex-start"
+      gap="0.25rem"
+      {...props}
+    />
+  )
+}
+
+export const ResourceItemSkeleton = () => {
+  return (
+    <ResourceItemContainer isDisabled>
+      <VStack alignItems="flex-start" textAlign="left" gap="0.25rem">
+        <Skeleton width="12rem" height="1.125rem" variant="pulse" />
+        <Skeleton width="18rem" height="1.125rem" variant="pulse" />
+      </VStack>
+    </ResourceItemContainer>
+  )
+}
+
+export const ResourceItem = ({
+  item,
+  isDisabled,
+  isHighlighted = false,
+  handleOnClick,
+  hasAdditionalLeftPadding = false,
+}: ResourceItemProps) => {
+  return (
+    <ResourceItemContainer
+      data-selected={dataAttr(isHighlighted)}
       _selected={{
         color: "interaction.main.default",
-        bgColor: "interaction.muted.main.active",
-        _hover: {
-          bgColor: "unset",
-        },
-      }}
-      _active={{
-        bgColor: "interaction.tinted.main.active",
-      }}
-      _disabled={{
-        color: "interaction.support.disabled-content",
-        bgColor: "unset",
-        cursor: "not-allowed",
+        bg: "interaction.muted.main.active",
         _hover: {
-          bgColor: "unset",
+          color: "interaction.main.default",
+          bg: "interaction.muted.main.active",
         },
       }}
-      _hover={{
-        bgColor: "interaction.muted.main.hover",
-      }}
-      pl="2.25rem"
-      py="0.375rem"
-      borderRadius="0.25rem"
-      onClick={onResourceItemSelect}
-      leftIcon={<Icon as={icon} />}
+      {...(hasAdditionalLeftPadding && { pl: "2.25rem" })}
+      onClick={handleOnClick}
+      leftIcon={<Icon as={getIcon(item.type)} />}
+      isDisabled={isDisabled}
     >
-      <HStack align="start" w="full" justify="space-between">
-        <Text textStyle="caption-1" noOfLines={1}>
-          /{permalink}
+      <VStack alignItems="flex-start" textAlign="left" gap="0.25rem">
+        <Text noOfLines={1} textStyle="caption-1">
+          {item.title}
         </Text>
-        {isDisabled && <Icon as={BiLockAlt} fontSize="0.75rem" />}
-      </HStack>
-    </Button>
-  )
-}
-
-export const ResourceItem = (props: ResourceItemProps) => {
-  return (
-    <QueryErrorResetBoundary>
-      {({ reset }) => (
-        <ErrorBoundary
-          onReset={reset}
-          fallbackRender={({ resetErrorBoundary }) => (
-            <Box>
-              There was an error!
-              <Button onClick={() => resetErrorBoundary()}>Try again</Button>
-            </Box>
-          )}
-        >
-          <Suspense fallback={<Skeleton />}>
-            <SuspendableResourceItem {...props} />
-          </Suspense>
-        </ErrorBoundary>
-      )}
-    </QueryErrorResetBoundary>
+        <Text noOfLines={1} textStyle="caption-2">
+          {`/${item.permalink}`}
+        </Text>
+      </VStack>
+    </ResourceItemContainer>
   )
 }