Merge main into next

vivid-planet · Jun 5, 2024 · f275b7f · f275b7f
2 parents a36bf02 + 16ffa7b
commit f275b7f
Show file tree

Hide file tree

Showing 80 changed files with 1,185 additions and 244 deletions.
diff --git a/.changeset/epic-treasure-search.md b/.changeset/epic-treasure-search.md
@@ -0,0 +1,5 @@
+---
+"@comet/admin-rte": patch
+---
+
+Hide translation button for `FinalFormSearchTextField`
diff --git a/.changeset/few-actors-impress.md b/.changeset/few-actors-impress.md
diff --git a/.changeset/fifty-lies-smell.md b/.changeset/fifty-lies-smell.md
@@ -0,0 +1,32 @@
+---
+"@comet/admin": minor
+---
+
+Add `FinalFormAsyncSelect`, `AsyncSelectField`, and `FinalFormAsyncAutocomplete` components
+
+Thin wrappers to ease using `useAsyncOptionsProps()` with `FinalFormSelect` and `FinalFormAutocomplete`.
+
+**Example**
+
+Previously:
+
+```tsx
+const asyncOptionsProps = useAsyncOptionsProps(async () => {
+    // Load options here
+});
+
+// ...
+
+<Field component={FinalFormAsyncAutocomplete} {...asyncOptionsProps} />;
+```
+
+Now:
+
+```tsx
+<Field
+    component={FinalFormAsyncAutocomplete}
+    loadOptions={async () => {
+        // Load options here
+    }}
+/>
+```
diff --git a/.changeset/green-years-drum.md b/.changeset/green-years-drum.md
@@ -0,0 +1,9 @@
+---
+"@comet/cms-admin": minor
+"@comet/cms-site": minor
+"@comet/cms-api": minor
+---
+
+Add a `DamFileDownloadLinkBlock` that can be used to download a file or open it in a new tab
+
+Also, add new `/dam/files/download/:hash/:fileId/:filename` endpoint for downloading assets.
diff --git a/.changeset/plenty-pillows-jog.md b/.changeset/plenty-pillows-jog.md
diff --git a/.changeset/wild-suns-eat.md b/.changeset/wild-suns-eat.md
@@ -0,0 +1,7 @@
+---
+"@comet/cms-api": minor
+---
+
+Add `DisablePermissionCheck` constant for use in `@RequiredPermission` decorator
+
+You can disable authorization for a resolver or operation by adding the decorator `@RequiredPermission(DisablePermissionCheck)`
diff --git a/.changeset/young-hotels-sparkle.md b/.changeset/young-hotels-sparkle.md
diff --git a/demo/admin/src/common/blocks/LinkBlock.tsx b/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,
+    },
 });
diff --git a/demo/api/block-meta.json b/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",

diff --git a/demo/api/src/common/blocks/linkBlock/link.block.ts b/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 },
+});
diff --git a/demo/site/src/blocks/LinkBlock.tsx b/demo/site/src/blocks/LinkBlock.tsx
@@ -1,5 +1,17 @@
+<<<<<<< HEAD
 "use client";
 import { ExternalLinkBlock, OneOfBlock, PropsWithData, SupportedBlocks, withPreview } from "@comet/cms-site";
+=======
+import {
+    DamFileDownloadLinkBlock,
+    ExternalLinkBlock,
+    InternalLinkBlock,
+    OneOfBlock,
+    PropsWithData,
+    SupportedBlocks,
+    withPreview,
+} from "@comet/cms-site";
+>>>>>>> main
 import { LinkBlockData } from "@src/blocks.generated";
 import { NewsLinkBlock } from "@src/news/blocks/NewsLinkBlock";
 import * as React from "react";
@@ -22,6 +34,11 @@ const supportedBlocks: SupportedBlocks = {
             {children}
         </NewsLinkBlock>
     ),
+    damFileDownload: ({ children, title, ...props }) => (
+        <DamFileDownloadLinkBlock data={props} title={title}>
+            {children}
+        </DamFileDownloadLinkBlock>
+    ),
 };
 
 interface LinkBlockProps extends PropsWithData<LinkBlockData> {