Merge main into next

.changeset/clean-insects-happen.md

@@ -0,0 +1,10 @@
+---
+"@comet/cms-api": major
+---
+
+`FilesService#createFileDownloadUrl` now expects an options object as second parameter
+
+```diff
+- this.filesService.createFileDownloadUrl(file, previewDamUrls)
++ this.filesService.createFileDownloadUrl(file, { previewDamUrls, relativeDamUrls })
+```

demo/admin/src/App.tsx

@@ -25,7 +25,7 @@ import { additionalPageTreeNodeFieldsFragment } from "@src/common/EditPageNode";
 import { createConfig } from "@src/config";
 import { ImportFromUnsplash } from "@src/dam/ImportFromUnsplash";
 import { pageTreeCategories } from "@src/pageTree/pageTreeCategories";
-import theme from "@src/theme";
+import { theme } from "@src/theme";
 import * as React from "react";
 import { DndProvider } from "react-dnd";
 import { HTML5Backend } from "react-dnd-html5-backend";

demo/admin/src/common/blocks/LinkBlock.tsx

@@ -1,6 +1,11 @@
-import { createLinkBlock, ExternalLinkBlock, InternalLinkBlock } from "@comet/cms-admin";
+import { createLinkBlock, DamFileDownloadLinkBlock, ExternalLinkBlock, InternalLinkBlock } from "@comet/cms-admin";
 import { NewsLinkBlock } from "@src/news/blocks/NewsLinkBlock";
 
 export const LinkBlock = createLinkBlock({
-    supportedBlocks: { internal: InternalLinkBlock, external: ExternalLinkBlock, news: NewsLinkBlock },
+    supportedBlocks: {
+        internal: InternalLinkBlock,
+        external: ExternalLinkBlock,
+        news: NewsLinkBlock,
+        damFileDownload: DamFileDownloadLinkBlock,
+    },
 });

demo/admin/src/theme.ts

@@ -1,4 +1,4 @@
 import { createCometTheme } from "@comet/admin-theme";
 import type {} from "@mui/lab/themeAugmentation";
 
-export default createCometTheme();
+export const theme = createCometTheme();

demo/api/block-meta.json

@@ -160,6 +160,60 @@
             }
         ]
     },
+    {
+        "name": "DamFileDownloadLink",
+        "fields": [
+            {
+                "name": "file",
+                "kind": "NestedObject",
+                "object": {
+                    "fields": [
+                        {
+                            "name": "id",
+                            "kind": "String",
+                            "nullable": false
+                        },
+                        {
+                            "name": "name",
+                            "kind": "String",
+                            "nullable": false
+                        },
+                        {
+                            "name": "fileUrl",
+                            "kind": "String",
+                            "nullable": false
+                        }
+                    ]
+                },
+                "nullable": true
+            },
+            {
+                "name": "openFileType",
+                "kind": "Enum",
+                "enum": [
+                    "NewTab",
+                    "Download"
+                ],
+                "nullable": false
+            }
+        ],
+        "inputFields": [
+            {
+                "name": "fileId",
+                "kind": "String",
+                "nullable": true
+            },
+            {
+                "name": "openFileType",
+                "kind": "Enum",
+                "enum": [
+                    "NewTab",
+                    "Download"
+                ],
+                "nullable": false
+            }
+        ]
+    },
     {
         "name": "DamImage",
         "fields": [
@@ -746,7 +800,8 @@
                             "blocks": {
                                 "internal": "InternalLink",
                                 "external": "ExternalLink",
-                                "news": "NewsLink"
+                                "news": "NewsLink",
+                                "damFileDownload": "DamFileDownloadLink"
                             },
                             "nullable": false
                         }
@@ -775,7 +830,8 @@
                             "blocks": {
                                 "internal": "InternalLink",
                                 "external": "ExternalLink",
-                                "news": "NewsLink"
+                                "news": "NewsLink",
+                                "damFileDownload": "DamFileDownloadLink"
                             },
                             "nullable": false
                         }
@@ -2085,7 +2141,7 @@
             {
                 "name": "youtubeIdentifier",
                 "kind": "String",
-                "nullable": false
+                "nullable": true
             },
             {
                 "name": "aspectRatio",
@@ -2116,7 +2172,7 @@
             {
                 "name": "youtubeIdentifier",
                 "kind": "String",
-                "nullable": false
+                "nullable": true
             },
             {
                 "name": "aspectRatio",

demo/api/src/common/blocks/linkBlock/link.block.ts

@@ -1,5 +1,7 @@
 import { ExternalLinkBlock } from "@comet/blocks-api";
-import { createLinkBlock, InternalLinkBlock } from "@comet/cms-api";
+import { createLinkBlock, DamFileDownloadLinkBlock, InternalLinkBlock } from "@comet/cms-api";
 import { NewsLinkBlock } from "@src/news/blocks/news-link.block";
 
-export const LinkBlock = createLinkBlock({ supportedBlocks: { internal: InternalLinkBlock, external: ExternalLinkBlock, news: NewsLinkBlock } });
+export const LinkBlock = createLinkBlock({
+    supportedBlocks: { internal: InternalLinkBlock, external: ExternalLinkBlock, news: NewsLinkBlock, damFileDownload: DamFileDownloadLinkBlock },
+});

demo/api/src/footer/generated/footer.resolver.ts

@@ -39,6 +39,7 @@ export class FooterResolver {
         if (!footer) {
             footer = this.repository.create({
                 ...input,
+                content: input.content.transformToBlockData(),
                 scope,
             });
         }

demo/site/next-env.d.ts

@@ -1,6 +1,5 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-/// <reference types="next/navigation-types/compat/navigation" />
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/basic-features/typescript for more information.

demo/site/src/blocks/LinkBlock.tsx

@@ -1,5 +1,5 @@
 "use client";
-import { ExternalLinkBlock, OneOfBlock, PropsWithData, SupportedBlocks, withPreview } from "@comet/cms-site";
+import { DamFileDownloadLinkBlock, ExternalLinkBlock, OneOfBlock, PropsWithData, SupportedBlocks, withPreview } from "@comet/cms-site";
 import { LinkBlockData } from "@src/blocks.generated";
 import { NewsLinkBlock } from "@src/news/blocks/NewsLinkBlock";
 import * as React from "react";
@@ -22,6 +22,11 @@ const supportedBlocks: SupportedBlocks = {
             {children}
         </NewsLinkBlock>
     ),
+    damFileDownload: ({ children, title, ...props }) => (
+        <DamFileDownloadLinkBlock data={props} title={title}>
+            {children}
+        </DamFileDownloadLinkBlock>
+    ),
 };
 
 interface LinkBlockProps extends PropsWithData<LinkBlockData> {