Revert "chore: add check for immediate children (#1300)" (#1314)

This reverts commit 21a3c21.

Author: seaerchin

apps/studio/src/server/modules/resource/resource.service.ts

@@ -17,7 +17,7 @@ import type {
 import type { SearchResultResource } from "./resource.types"
 import type { ResourceItemContent } from "~/schemas/resource"
 import { INDEX_PAGE_PERMALINK } from "~/constants/sitemap"
-import { CHILD_PAGE_RESOURCE_TYPES, getSitemapTree } from "~/utils/sitemap"
+import { getSitemapTree } from "~/utils/sitemap"
 import { logPublishEvent } from "../audit/audit.service"
 import { publishSite } from "../aws/codebuild.service"
 import { db, jsonb, ResourceType, sql } from "../database"
@@ -362,7 +362,7 @@ export const getLocalisedSitemap = async (
         .leftJoin("Blob as published", "Version.blobId", "published.id")
         .select(() => [headerSql, thumbnailSql, ...defaultResourceSelect]),
     )
-    .with("childCousinPages", (eb) => {
+    .with("childCousinIndexPages", (eb) => {
       return eb
         .selectFrom("Resource")
         .where("parentId", "in", (qb) =>
@@ -374,7 +374,7 @@ export const getLocalisedSitemap = async (
               ResourceType.Folder,
             ]),
         )
-        .where("type", "in", CHILD_PAGE_RESOURCE_TYPES)
+        .where("type", "=", ResourceType.IndexPage)
         .where("state", "=", "Published")
         .leftJoin("Version", "Version.id", "publishedVersionId")
         .leftJoin("Blob as published", "Version.blobId", "published.id")
@@ -390,7 +390,7 @@ export const getLocalisedSitemap = async (
     )
     .union((eb) =>
       eb
-        .selectFrom("childCousinPages as Resource")
+        .selectFrom("childCousinIndexPages as Resource")
         .select(["summary", "thumbnail", ...defaultResourceSelect]),
     )
     .orderBy("title asc")

apps/studio/src/utils/sitemap.ts

@@ -2,13 +2,8 @@ import type { IsomerSitemap } from "@opengovsg/isomer-components"
 import { ResourceType } from "~prisma/generated/generatedEnums"
 
 import type { Resource } from "~prisma/generated/selectableTypes"
+import { INDEX_PAGE_PERMALINK } from "~/constants/sitemap"
 
-export const CHILD_PAGE_RESOURCE_TYPES = [
-  ResourceType.Page,
-  ResourceType.CollectionPage,
-  ResourceType.CollectionLink,
-  ResourceType.IndexPage,
-] as const
 type ResourceDto = Omit<
   Resource,
   "id" | "parentId" | "publishedVersionId" | "draftBlobId"
@@ -19,63 +14,35 @@ type ResourceDto = Omit<
   thumbnail?: string
 }
 
-const getResourcesWithFullPermalink = (
-  resources: ResourceDto[],
-  parent: ResourceDto,
-): ResourceDto[] => {
-  const children = resources
-    .filter((resources) => {
-      return parent.type === ResourceType.RootPage
-        ? resources.parentId === null &&
-            resources.type !== ResourceType.RootPage
-        : resources.parentId === parent.id
-    })
-    .map((child) => {
-      return {
-        ...child,
-        permalink: `${parent.type === ResourceType.RootPage ? "" : parent.permalink}/${child.permalink}`,
-      }
-    })
-
-  return [
-    ...children,
-    ...children.flatMap((child) =>
-      getResourcesWithFullPermalink(resources, child),
-    ),
-  ]
-}
-
 const getSitemapTreeFromArray = (
   resources: ResourceDto[],
   parentId: string | null,
+  path: string,
 ): IsomerSitemap[] | undefined => {
   if (resources.length === 0) {
     return undefined
   }
 
   // Get the immediate children of the resource with the given parent ID
-  const children = resources
-    .filter((resource) => {
-      const hasPageDescendants = resources.some((possibleChild) => {
-        return (
-          possibleChild.permalink.startsWith(resource.permalink) &&
-          CHILD_PAGE_RESOURCE_TYPES.find((t) => t === possibleChild.type)
-        )
-      })
+  const children = resources.filter((resource) => {
+    if (parentId === null) {
       return (
-        CHILD_PAGE_RESOURCE_TYPES.find((t) => t === resource.type) ||
-        hasPageDescendants
+        resource.parentId === null &&
+        resource.type !== ResourceType.RootPage &&
+        resource.type !== ResourceType.FolderMeta &&
+        resource.type !== ResourceType.CollectionMeta
       )
-    })
-    .filter((resource) => {
-      return (
-        resource.parentId === parentId &&
-        resource.type !== ResourceType.IndexPage
-      )
-    })
+    }
+    return (
+      resource.parentId === parentId &&
+      resource.permalink !== INDEX_PAGE_PERMALINK
+    )
+  })
 
   // TODO: Sort the children by the page ordering if the FolderMeta resource exists
   return children.map((resource) => {
+    const permalink = `${path}${resource.permalink}`
+
     if (
       resource.type === ResourceType.Page ||
       resource.type === ResourceType.CollectionPage
@@ -85,8 +52,9 @@ const getSitemapTreeFromArray = (
         layout: "content", // Note: We are not using the layout field in our sitemap for preview
         title: resource.title,
         summary: resource.summary ?? "",
-        lastModified: resource.updatedAt.toISOString(),
-        permalink: resource.permalink,
+        lastModified: new Date() // TODO: Update this to the updated_at field in DB
+          .toISOString(),
+        permalink,
         image: {
           src: resource.thumbnail ?? "",
           alt: "",
@@ -97,36 +65,30 @@ const getSitemapTreeFromArray = (
     const indexPage = resources.find(
       (child) =>
         // NOTE: This child is the index page of this resource
-        child.type === ResourceType.IndexPage && child.parentId === resource.id,
+        child.permalink === INDEX_PAGE_PERMALINK &&
+        child.parentId === resource.id,
     )
 
-    if (!!indexPage) {
-      return {
-        id: String(resource.id),
-        layout: "content", // Note: We are not using the layout field in our previews
-        title: indexPage.title,
-        summary: indexPage.summary ?? `Pages in ${resource.title}`,
-        lastModified: new Date() // TODO: Update this to the updated_at field in DB
-          .toISOString(),
-        // NOTE: This permalink is unused in the preview
-        permalink: resource.permalink,
-        image: !!indexPage.thumbnail
-          ? { src: indexPage.thumbnail, alt: "" }
-          : undefined,
-        children: getSitemapTreeFromArray(resources, resource.id),
-      }
-    }
+    const titleOfPage = indexPage?.title
+    const summaryOfPage = indexPage?.summary
 
     return {
       id: String(resource.id),
       layout: "content", // Note: We are not using the layout field in our previews
-      title: resource.title,
-      summary: `Pages in ${resource.title}`,
+      title: titleOfPage || resource.title,
+      summary: summaryOfPage ?? `Pages in ${resource.title}`,
       lastModified: new Date() // TODO: Update this to the updated_at field in DB
         .toISOString(),
       // NOTE: This permalink is unused in the preview
-      permalink: resource.permalink,
-      children: getSitemapTreeFromArray(resources, resource.id),
+      permalink,
+      image: !!indexPage?.thumbnail
+        ? { src: indexPage.thumbnail, alt: "" }
+        : undefined,
+      children: getSitemapTreeFromArray(
+        resources,
+        resource.id,
+        `${permalink}/`,
+      ),
     }
   })
 }
@@ -136,11 +98,6 @@ export const getSitemapTree = (
   rootResource: ResourceDto,
   resources: ResourceDto[],
 ): IsomerSitemap => {
-  const resourcesWithFullPermalink = getResourcesWithFullPermalink(
-    resources,
-    rootResource,
-  )
-
   return {
     id: String(rootResource.id),
     layout: "homepage", // Note: We are not using the layout field in our previews
@@ -150,6 +107,6 @@ export const getSitemapTree = (
       .toISOString(),
     // NOTE: This permalink is unused in the preview
     permalink: "/",
-    children: getSitemapTreeFromArray(resourcesWithFullPermalink, null),
+    children: getSitemapTreeFromArray(resources, null, "/"),
   }
 }