scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in fix/book-453-linkconnection (pull request #2972)

Browse Source 
fix(BOOK-453): avoid linkConnection invalid

* fix(BOOK-453): avoid linkConnection invalid

* test

* test

* test

* Merge master
This commit is contained in:
Linus Flood
2025-10-22 12:39:17 +00:00
parent 03f17acbbe
commit acdc3dcec1
17 changed files with 79 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/trpc/lib/routers/contentstack/schemas/blocks/content.ts
View File

@@ -3,8 +3,8 @@ import { z } from "zod"
import { BlocksEnums } from "../../../../types/blocksEnum"
import { ContentEnum } from "../../../../types/content"
import {
linkRefsUnionSchema,
linkUnionSchema,
rawLinkRefsUnionSchema,
rawLinkUnionSchema,
transformPageLink,
} from "../pageLinks"
import {
@@ -30,7 +30,7 @@ export const contentSchema = z.object({
.discriminatedUnion("__typename", [
imageContainerSchema,
sysAssetSchema,
...linkUnionSchema.options,
...rawLinkUnionSchema.options,
])
.transform((data) => {
const link = transformPageLink(data)
@@ -62,7 +62,7 @@ export const contentRefsSchema = z.object({
node: z.discriminatedUnion("__typename", [
sysAssetRefsSchema,
imageContainerRefsSchema,
...linkRefsUnionSchema.options,
...rawLinkRefsUnionSchema.options,
]),
})
),

10
packages/trpc/lib/routers/contentstack/schemas/blocks/textCols.ts
View File

@@ -3,12 +3,14 @@ import { z } from "zod"
import { BlocksEnums } from "../../../../types/blocksEnum"
import { ContentEnum } from "../../../../types/content"
import {
linkRefsUnionSchema,
linkUnionSchema,
rawLinkRefsUnionSchema,
rawLinkUnionSchema,
transformPageLink,
} from "../pageLinks"
import { sysAssetRefsSchema, sysAssetSchema } from "./sysAsset"
import type { linkUnionSchema } from "../pageLinks"
export const textColsSchema = z.object({
typename: z
.literal(BlocksEnums.block.TextCols)
@@ -26,7 +28,7 @@ export const textColsSchema = z.object({
node: z
.discriminatedUnion("__typename", [
sysAssetSchema,
...linkUnionSchema.options,
...rawLinkUnionSchema.options,
])
.transform((data) => {
const link = transformPageLink(data)
@@ -59,7 +61,7 @@ export const textColsRefsSchema = z.object({
z.object({
node: z.discriminatedUnion("__typename", [
sysAssetRefsSchema,
...linkRefsUnionSchema.options,
...rawLinkRefsUnionSchema.options,
]),
})
),

2
packages/trpc/lib/routers/contentstack/schemas/blocks/utils/linkConnection.ts
View File

@@ -17,5 +17,5 @@ export const linkConnectionRefsSchema = z
return null
}
return data.linkConnection.edges[0].node.system
return data.linkConnection.edges[0].node?.system
})