fix(create-site): update scripts for creating site + publishing (#991)

* fix: update site name in script * chore: remove siteName * chore: updaet to use siteName * chore: fix test
opengovsg · Jan 27, 2025 · d9682a0 · d9682a0
1 parent b8f909a
commit d9682a0
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/apps/studio/prisma/scripts/createSite.ts b/apps/studio/prisma/scripts/createSite.ts
@@ -159,7 +159,7 @@ export const createSite = async ({ siteName }: CreateSiteProps) => {
         }),
         config: jsonb({
           theme: "isomer-next",
-          siteName: "MTI",
+          siteName,
           logoUrl: "https://www.isomer.gov.sg/images/isomer-logo.svg",
           search: undefined,
           isGovernment: true,

diff --git a/apps/studio/src/features/dashboard/SiteList.tsx b/apps/studio/src/features/dashboard/SiteList.tsx
@@ -135,7 +135,7 @@ const SuspendableSiteList = (): JSX.Element => {
       {sites.map((site) => (
         <Site
           siteId={site.id}
-          siteName={site.name}
+          siteName={site.config.siteName}
           siteLogoUrl={generateAssetUrl(site.config.logoUrl)}
         />
       ))}

diff --git a/apps/studio/src/server/modules/site/__tests__/site.router.test.ts b/apps/studio/src/server/modules/site/__tests__/site.router.test.ts
@@ -65,7 +65,6 @@ describe("site.router", async () => {
       expect(result).toEqual([
         {
           id: site.id,
-          name: site.name,
           config: site.config,
         },
       ])
@@ -87,7 +86,6 @@ describe("site.router", async () => {
       expect(result).toEqual([
         {
           id: site1.id,
-          name: site1.name,
           config: site1.config,
         },
       ])
@@ -123,7 +121,6 @@ describe("site.router", async () => {
       expect(result).toEqual([
         {
           id: site1.id,
-          name: site1.name,
           config: site1.config,
         },
       ])

diff --git a/apps/studio/src/server/modules/site/site.router.ts b/apps/studio/src/server/modules/site/site.router.ts
@@ -30,8 +30,8 @@ export const siteRouter = router({
       .innerJoin("ResourcePermission", "Site.id", "ResourcePermission.siteId")
       .where("ResourcePermission.deletedAt", "is", null)
       .where("ResourcePermission.userId", "=", ctx.user.id)
-      .select(["Site.id", "Site.name", "Site.config"])
-      .groupBy(["Site.id", "Site.name", "Site.config"])
+      .select(["Site.id", "Site.config"])
+      .groupBy(["Site.id", "Site.config"])
       .execute()
   }),
   getSiteName: protectedProcedure
@@ -43,11 +43,13 @@ export const siteRouter = router({
         action: "read",
       })
 
-      return db
+      const { config } = await db
         .selectFrom("Site")
         .where("Site.id", "=", siteId)
-        .select("name")
+        .select("config")
         .executeTakeFirstOrThrow()
+
+      return { name: config.siteName }
     }),
   getConfig: protectedProcedure
     .input(getConfigSchema)

diff --git a/apps/studio/tests/integration/helpers/seed/index.ts b/apps/studio/tests/integration/helpers/seed/index.ts
@@ -52,16 +52,18 @@ export const setupSite = async (siteId?: number, fetch?: boolean) => {
       return { site, navbar, footer }
     })
   }
+
+  const name = `Ministry of Testing and Development ${nanoid()}`
   return await db.transaction().execute(async (tx) => {
     const site = await tx
       .insertInto("Site")
       .values({
-        name: `Ministry of Testing and Development ${nanoid()}`,
+        name,
         // @ts-expect-error not using the specific config for tests, no need to populate
         config: {
           theme: "isomer-next",
           logoUrl: "",
-          siteName: "TST",
+          siteName: name,
           isGovernment: true,
         },
         id: siteId,

diff --git a/tooling/build/scripts/publishing/index.ts b/tooling/build/scripts/publishing/index.ts
@@ -491,7 +491,6 @@ async function fetchAndWriteSiteData(client: Client) {
       const config = {
         site: {
           ...configResult.rows[0].config,
-          siteName: configResult.rows[0].name,
         },
         ...configResult.rows[0].theme,
       }