From 23953aeb6197ee83a94a8833fb7d2f8a1a8f1ae4 Mon Sep 17 00:00:00 2001
From: Erik Tiekstra <erik.tiekstra@scandichotels.com>
Date: Tue, 8 Oct 2024 11:06:33 +0200
Subject: [PATCH] feat(SW-216): Added heading and preamble text to table block

---
 components/Blocks/Table/index.tsx             | 104 ++++++++++--------
 .../TempDesignSystem/ScrollWrapper/index.tsx  |   4 +-
 components/TempDesignSystem/Table/index.tsx   |   3 +-
 lib/graphql/Fragments/Blocks/Table.graphql    |   2 +
 .../contentstack/schemas/blocks/table.ts      |   4 +
 5 files changed, 67 insertions(+), 50 deletions(-)

diff --git a/components/Blocks/Table/index.tsx b/components/Blocks/Table/index.tsx
index cb41f674e..7d7d0c457 100644
--- a/components/Blocks/Table/index.tsx
+++ b/components/Blocks/Table/index.tsx
@@ -8,6 +8,8 @@ import {
 } from "@tanstack/react-table"
 import { useState } from "react"
 
+import SectionContainer from "@/components/Section/Container"
+import SectionHeader from "@/components/Section/Header"
 import ScrollWrapper from "@/components/TempDesignSystem/ScrollWrapper"
 import ShowMoreButton from "@/components/TempDesignSystem/ShowMoreButton"
 import Table from "@/components/TempDesignSystem/Table"
@@ -17,7 +19,7 @@ import styles from "./table.module.css"
 import type { TableBlockProps } from "@/types/components/blocks/table"
 
 export default function TableBlock({ data }: TableBlockProps) {
-  const { columns, rows, totalWidth } = data
+  const { columns, rows, totalWidth, heading, preamble } = data
   const initialPageSize = 5
   const [pageSize, setPageSize] = useState(initialPageSize)
   const showMoreVisible = rows.length > initialPageSize
@@ -46,52 +48,60 @@ export default function TableBlock({ data }: TableBlockProps) {
   }
 
   return (
-    <div className={styles.tableWrapper}>
-      <ScrollWrapper>
-        <Table
-          width={`${totalWidth}%`}
-          variant="content"
-          intent="striped"
-          layout="fixed"
-          borderRadius="none"
-        >
-          <Table.THead>
-            {table.getHeaderGroups().map((headerGroup) => (
-              <Table.TR key={headerGroup.id}>
-                {headerGroup.headers.map((header) => (
-                  <Table.TH
-                    key={header.id}
-                    width={`${header.column.columnDef.size}%`}
-                  >
-                    {flexRender(
-                      header.column.columnDef.header,
-                      header.getContext()
-                    )}
-                  </Table.TH>
-                ))}
-              </Table.TR>
-            ))}
-          </Table.THead>
-          <Table.TBody>
-            {table.getRowModel().rows.map((row) => (
-              <Table.TR key={row.id}>
-                {row.getVisibleCells().map((cell) => (
-                  <Table.TD key={cell.id}>
-                    {flexRender(cell.column.columnDef.cell, cell.getContext())}
-                  </Table.TD>
-                ))}
-              </Table.TR>
-            ))}
-          </Table.TBody>
-        </Table>
-      </ScrollWrapper>
-      {showMoreVisible ? (
-        <ShowMoreButton
-          loadMoreData={handleShowMore}
-          showLess={showLessVisible}
-          intent="table"
-        />
+    <SectionContainer>
+      {heading ? (
+        <SectionHeader preamble={data.preamble} title={heading} />
       ) : null}
-    </div>
+      <div className={styles.tableWrapper}>
+        <ScrollWrapper>
+          <Table
+            width={`${totalWidth}%`}
+            variant="content"
+            intent="striped"
+            layout="fixed"
+            borderRadius="none"
+          >
+            <Table.THead>
+              {table.getHeaderGroups().map((headerGroup) => (
+                <Table.TR key={headerGroup.id}>
+                  {headerGroup.headers.map((header) => (
+                    <Table.TH
+                      key={header.id}
+                      width={`${header.column.columnDef.size}%`}
+                    >
+                      {flexRender(
+                        header.column.columnDef.header,
+                        header.getContext()
+                      )}
+                    </Table.TH>
+                  ))}
+                </Table.TR>
+              ))}
+            </Table.THead>
+            <Table.TBody>
+              {table.getRowModel().rows.map((row) => (
+                <Table.TR key={row.id}>
+                  {row.getVisibleCells().map((cell) => (
+                    <Table.TD key={cell.id}>
+                      {flexRender(
+                        cell.column.columnDef.cell,
+                        cell.getContext()
+                      )}
+                    </Table.TD>
+                  ))}
+                </Table.TR>
+              ))}
+            </Table.TBody>
+          </Table>
+        </ScrollWrapper>
+        {showMoreVisible ? (
+          <ShowMoreButton
+            loadMoreData={handleShowMore}
+            showLess={showLessVisible}
+            intent="table"
+          />
+        ) : null}
+      </div>
+    </SectionContainer>
   )
 }
diff --git a/components/TempDesignSystem/ScrollWrapper/index.tsx b/components/TempDesignSystem/ScrollWrapper/index.tsx
index 15b4bf845..529836f20 100644
--- a/components/TempDesignSystem/ScrollWrapper/index.tsx
+++ b/components/TempDesignSystem/ScrollWrapper/index.tsx
@@ -4,10 +4,10 @@ import { useMemo } from "react"
 
 import useScrollShadows from "@/hooks/useScrollShadows"
 
-import { ScrollWrapperProps } from "./scrollWrapper"
-
 import styles from "./scrollWrapper.module.css"
 
+import type { ScrollWrapperProps } from "./scrollWrapper"
+
 export default function ScrollWrapper({
   className,
   children,
diff --git a/components/TempDesignSystem/Table/index.tsx b/components/TempDesignSystem/Table/index.tsx
index fb5c4fde6..87f50326a 100644
--- a/components/TempDesignSystem/Table/index.tsx
+++ b/components/TempDesignSystem/Table/index.tsx
@@ -1,4 +1,3 @@
-import { TableProps } from "./table"
 import TBody from "./TBody"
 import TD from "./TD"
 import TH from "./TH"
@@ -6,6 +5,8 @@ import THead from "./THead"
 import TR from "./TR"
 import { tableVariants } from "./variants"
 
+import type { TableProps } from "./table"
+
 function Table({
   className,
   intent,
diff --git a/lib/graphql/Fragments/Blocks/Table.graphql b/lib/graphql/Fragments/Blocks/Table.graphql
index bb824f07e..66736296b 100644
--- a/lib/graphql/Fragments/Blocks/Table.graphql
+++ b/lib/graphql/Fragments/Blocks/Table.graphql
@@ -1,6 +1,8 @@
 fragment Table_ContentPage on ContentPageBlocksTable {
   __typename
   table {
+    heading
+    preamble
     column_widths
     table
   }
diff --git a/server/routers/contentstack/schemas/blocks/table.ts b/server/routers/contentstack/schemas/blocks/table.ts
index fc694d71f..905c20603 100644
--- a/server/routers/contentstack/schemas/blocks/table.ts
+++ b/server/routers/contentstack/schemas/blocks/table.ts
@@ -9,6 +9,8 @@ export const tableSchema = z.object({
     .default(BlocksEnums.block.Table),
   table: z
     .object({
+      heading: z.string().optional(),
+      preamble: z.string().optional().default(""),
       column_widths: z.array(z.number()),
       table: z.object({
         tableState: z.object({
@@ -46,6 +48,8 @@ export const tableSchema = z.object({
       )
 
       return {
+        heading: data.heading,
+        preamble: data.preamble,
         columns,
         rows,
         totalWidth,