diff --git a/components/Blocks/index.tsx b/components/Blocks/index.tsx
index 1c6d0bcbc..efd0f2bcb 100644
--- a/components/Blocks/index.tsx
+++ b/components/Blocks/index.tsx
@@ -5,6 +5,8 @@ import TextCols from "@/components/Blocks/TextCols"
import UspGrid from "@/components/Blocks/UspGrid"
import JsonToHtml from "@/components/JsonToHtml"
+import Table from "../Table"
+
import type { BlocksProps } from "@/types/components/blocks"
import { BlocksEnums } from "@/types/enums/blocks"
@@ -47,6 +49,8 @@ export default function Blocks({ blocks }: BlocksProps) {
title={block.shortcuts.title}
/>
)
+ case BlocksEnums.block.Table:
+ return
case BlocksEnums.block.TextCols:
return
case BlocksEnums.block.TextContent:
diff --git a/lib/graphql/Fragments/Blocks/Table.graphql b/lib/graphql/Fragments/Blocks/Table.graphql
new file mode 100644
index 000000000..bb824f07e
--- /dev/null
+++ b/lib/graphql/Fragments/Blocks/Table.graphql
@@ -0,0 +1,7 @@
+fragment Table_ContentPage on ContentPageBlocksTable {
+ __typename
+ table {
+ column_widths
+ table
+ }
+}
diff --git a/lib/graphql/Query/ContentPage/ContentPage.graphql b/lib/graphql/Query/ContentPage/ContentPage.graphql
index c1e4decc5..2bed1d02d 100644
--- a/lib/graphql/Query/ContentPage/ContentPage.graphql
+++ b/lib/graphql/Query/ContentPage/ContentPage.graphql
@@ -4,6 +4,7 @@
#import "../../Fragments/Blocks/Content.graphql"
#import "../../Fragments/Blocks/DynamicContent.graphql"
#import "../../Fragments/Blocks/Shortcuts.graphql"
+#import "../../Fragments/Blocks/Table.graphql"
#import "../../Fragments/Blocks/TextCols.graphql"
#import "../../Fragments/Blocks/UspGrid.graphql"
@@ -28,6 +29,7 @@ query GetContentPage($locale: String!, $uid: String!) {
...Content_ContentPage
...DynamicContent_ContentPage
...Shortcuts_ContentPage
+ ...Table_ContentPage
...TextCols_ContentPage
...UspGrid_ContentPage
}
diff --git a/server/routers/contentstack/contentPage/output.ts b/server/routers/contentstack/contentPage/output.ts
index d4b02d33e..48ebb0f40 100644
--- a/server/routers/contentstack/contentPage/output.ts
+++ b/server/routers/contentstack/contentPage/output.ts
@@ -18,6 +18,7 @@ import {
shortcutsRefsSchema,
shortcutsSchema,
} from "../schemas/blocks/shortcuts"
+import { tableSchema } from "../schemas/blocks/table"
import { textColsRefsSchema, textColsSchema } from "../schemas/blocks/textCols"
import { uspGridRefsSchema, uspGridSchema } from "../schemas/blocks/uspGrid"
import { tempImageVaultAssetSchema } from "../schemas/imageVault"
@@ -75,11 +76,18 @@ export const contentPageUspGrid = z
})
.merge(uspGridSchema)
+export const contentPageTable = z
+ .object({
+ __typename: z.literal(ContentPageEnum.ContentStack.blocks.Table),
+ })
+ .merge(tableSchema)
+
export const blocksSchema = z.discriminatedUnion("__typename", [
contentPageCards,
contentPageContent,
contentPageDynamicContent,
contentPageShortcuts,
+ contentPageTable,
contentPageTextCols,
contentPageUspGrid,
])
diff --git a/server/routers/contentstack/schemas/blocks/table.ts b/server/routers/contentstack/schemas/blocks/table.ts
new file mode 100644
index 000000000..74f144608
--- /dev/null
+++ b/server/routers/contentstack/schemas/blocks/table.ts
@@ -0,0 +1,51 @@
+import { z } from "zod"
+
+import { BlocksEnums } from "@/types/enums/blocks"
+
+export const tableSchema = z.object({
+ typename: z
+ .literal(BlocksEnums.block.Table)
+ .optional()
+ .default(BlocksEnums.block.Table),
+ table: z
+ .object({
+ column_widths: z.array(z.number()),
+ table: z.object({
+ tableState: z.object({
+ columns: z.array(
+ z.object({
+ id: z.string(),
+ label: z.string().default(""),
+ accessor: z.string(),
+ dataType: z.string(),
+ })
+ ),
+ data: z.array(z.object({}).catchall(z.string())),
+ skipReset: z.boolean(),
+ tableActionEnabled: z.boolean(),
+ headerRowAdded: z.boolean(),
+ }),
+ }),
+ })
+ .transform((data) => {
+ const columns = data.table.tableState.columns.map((col, idx) => ({
+ id: col.id,
+ Header: col.label || "",
+ accessor: col.accessor,
+ columnWidth: data.column_widths[idx] || 0,
+ }))
+
+ const rows = data.table.tableState.data.map((rowData) => {
+ const transformedRow: Record = {}
+ columns.forEach((col) => {
+ transformedRow[col.accessor] = rowData[col.accessor] || ""
+ })
+ return transformedRow
+ })
+
+ return {
+ columns,
+ rows,
+ }
+ }),
+})
diff --git a/types/enums/blocks.ts b/types/enums/blocks.ts
index b91989b2e..81a088bd1 100644
--- a/types/enums/blocks.ts
+++ b/types/enums/blocks.ts
@@ -4,6 +4,7 @@ export namespace BlocksEnums {
Content = "Content",
DynamicContent = "DynamicContent",
Shortcuts = "Shortcuts",
+ Table = "Table",
TextCols = "TextCols",
TextContent = "TextContent",
UspGrid = "UspGrid",
diff --git a/types/enums/contentPage.ts b/types/enums/contentPage.ts
index 99dd48911..df5dab28e 100644
--- a/types/enums/contentPage.ts
+++ b/types/enums/contentPage.ts
@@ -7,6 +7,7 @@ export namespace ContentPageEnum {
Shortcuts = "ContentPageBlocksShortcuts",
TextCols = "ContentPageBlocksTextCols",
UspGrid = "ContentPageBlocksUspGrid",
+ Table = "ContentPageBlocksTable",
}
export const enum sidebar {
diff --git a/types/trpc/routers/contentstack/blocks.ts b/types/trpc/routers/contentstack/blocks.ts
index 6bffdfc90..e1ff7e923 100644
--- a/types/trpc/routers/contentstack/blocks.ts
+++ b/types/trpc/routers/contentstack/blocks.ts
@@ -4,6 +4,7 @@ import { cardsGridSchema } from "@/server/routers/contentstack/schemas/blocks/ca
import { contentSchema } from "@/server/routers/contentstack/schemas/blocks/content"
import { dynamicContentSchema } from "@/server/routers/contentstack/schemas/blocks/dynamicContent"
import { shortcutsSchema } from "@/server/routers/contentstack/schemas/blocks/shortcuts"
+import { tableSchema } from "@/server/routers/contentstack/schemas/blocks/table"
import { textColsSchema } from "@/server/routers/contentstack/schemas/blocks/textCols"
import { uspGridSchema } from "@/server/routers/contentstack/schemas/blocks/uspGrid"
@@ -12,5 +13,7 @@ export interface Content extends z.output {}
export interface DynamicContent extends z.output {}
export interface Shortcuts extends z.output {}
export type Shortcut = Shortcuts["shortcuts"]
+export interface TableBlock extends z.output {}
+export type Table = TableBlock["table"]
export interface TextCols extends z.output {}
export interface UspGrid extends z.output {}