Merge pull request #2239 from vivid-planet/merge-main-into-next

Merge main into next
vivid-planet · Jul 4, 2024 · 10fadd6 · 10fadd6
2 parents a23d2a7 + 7121032
commit 10fadd6
Show file tree

Hide file tree

Showing 17 changed files with 54 additions and 30 deletions.
diff --git a/.changeset/cyan-chicken-juggle.md b/.changeset/cyan-chicken-juggle.md
@@ -0,0 +1,15 @@
+---
+"@comet/cms-admin": minor
+---
+
+Add `buttonChildren` and `children` props to `UserHeaderItem`
+
+This increases the flexibility of the `UserHeaderItem` component by allowing the `AppHeaderDropdown` label to be passed via `buttonChildren`. More buttons or other list items in the dropdown can be passed via `children`.
+
+**Example:**
+```tsx
+<UserHeaderItem buttonChildren="Some custom label">
+    <Button variant="contained">Some custom button</Button>
+    <Button>Some custom button 2</Button>
+</UserHeaderItem>
+```
diff --git a/.changeset/neat-paws-care.md b/.changeset/neat-paws-care.md
@@ -0,0 +1,5 @@
+---
+"@comet/admin-icons": minor
+---
+
+Add `RteUppercase` icon
diff --git a/.changeset/spotty-rules-brush.md b/.changeset/spotty-rules-brush.md
@@ -0,0 +1,5 @@
+---
+"@comet/cms-api": patch
+---
+
+Add missing `@RequiredPermission` to `createZip` route
diff --git a/.changeset/tiny-mangos-tease.md b/.changeset/tiny-mangos-tease.md
@@ -0,0 +1,5 @@
+---
+"@comet/blocks-admin": patch
+---
+
+Fix a validation error for default values in `YouTubeVideoBlock`
diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml
@@ -23,9 +23,7 @@ jobs:
 
             - uses: actions/checkout@v3
 
-            - uses: pnpm/action-setup@v2
-              with:
-                  version: 8
+            - uses: pnpm/action-setup@v4
 
             - name: Use Node.js 18.x
               uses: actions/setup-node@v3

diff --git a/.github/workflows/i18n.yml b/.github/workflows/i18n.yml
@@ -25,9 +25,7 @@ jobs:
                   token: ${{ secrets.VIVID_PLANET_BOT_TOKEN }}
                   path: "demo/admin/lang/comet-lang"
 
-            - uses: pnpm/action-setup@v2
-              with:
-                  version: 8
+            - uses: pnpm/action-setup@v4
 
             - name: Use Node.js 18.x
               uses: actions/setup-node@v3

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -48,9 +48,7 @@ jobs:
                   test -f demo/site/lang/comet-demo-lang/site/en.json || echo "{}" > demo/site/lang/comet-demo-lang/site/en.json
                   test -f demo/site/lang/comet-demo-lang/site/de.json || echo "{}" > demo/site/lang/comet-demo-lang/site/de.json
 
-            - uses: pnpm/action-setup@v2
-              with:
-                  version: 8
+            - uses: pnpm/action-setup@v4
 
             - name: Use Node.js 18.x
               uses: actions/setup-node@v3

diff --git a/.github/workflows/release-beta.yml b/.github/workflows/release-beta.yml
@@ -34,9 +34,7 @@ jobs:
             - name: Checkout Repo
               uses: actions/checkout@v3
 
-            - uses: pnpm/action-setup@v2
-              with:
-                  version: 8
+            - uses: pnpm/action-setup@v4
 
             - name: Use Node.js 18.x
               uses: actions/setup-node@v3

diff --git a/.github/workflows/release-canary.yml b/.github/workflows/release-canary.yml
@@ -16,9 +16,7 @@ jobs:
             - name: Checkout Repo
               uses: actions/checkout@v3
 
-            - uses: pnpm/action-setup@v2
-              with:
-                  version: 8
+            - uses: pnpm/action-setup@v4
 
             - name: Use Node.js 18.x
               uses: actions/setup-node@v3

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,9 +18,7 @@ jobs:
             - name: Checkout Repo
               uses: actions/checkout@v3
 
-            - uses: pnpm/action-setup@v2
-              with:
-                  version: 8
+            - uses: pnpm/action-setup@v4
 
             - name: Use Node.js 18.x
               uses: actions/setup-node@v3

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -25,9 +25,7 @@ jobs:
                   git config user.name github-actions
                   git config user.email github-actions@github.com
 
-            - uses: pnpm/action-setup@v2
-              with:
-                  version: 8
+            - uses: pnpm/action-setup@v4
 
             - name: Use Node.js 18.x
               uses: actions/setup-node@v3

diff --git a/packages/admin/admin-icons/icons/rte-uppercase.svg b/packages/admin/admin-icons/icons/rte-uppercase.svg
diff --git a/packages/admin/blocks-admin/src/blocks/YouTubeVideoBlock.tsx b/packages/admin/blocks-admin/src/blocks/YouTubeVideoBlock.tsx
@@ -37,7 +37,7 @@ export const YouTubeVideoBlock: BlockInterface<YouTubeVideoBlockData, State, You
 
     displayName: <FormattedMessage id="comet.blocks.youTubeVideo" defaultMessage="Video (YouTube)" />,
 
-    defaultValues: () => ({ youtubeIdentifier: "", autoplay: false, showControls: false, loop: false }),
+    defaultValues: () => ({ autoplay: false, showControls: false, loop: false }),
 
     category: BlockCategory.Media,
 

diff --git a/packages/admin/cms-admin/src/common/header/UserHeaderItem.tsx b/packages/admin/cms-admin/src/common/header/UserHeaderItem.tsx
@@ -1,5 +1,5 @@
 import { gql, useMutation } from "@apollo/client";
-import { AppHeaderDropdown, Loading } from "@comet/admin";
+import { AppHeaderDropdown, AppHeaderDropdownProps, Loading } from "@comet/admin";
 import { Account, Info, Logout } from "@comet/admin-icons";
 import { Box, Button as MUIButton, useMediaQuery, useTheme } from "@mui/material";
 import { styled } from "@mui/material/styles";
@@ -34,10 +34,12 @@ const signOutMutation = gql`
 
 interface UserHeaderItemProps {
     aboutModalLogo?: React.ReactElement;
+    buttonChildren?: AppHeaderDropdownProps["buttonChildren"];
+    children?: React.ReactNode;
 }
 
 export function UserHeaderItem(props: UserHeaderItemProps): React.ReactElement {
-    const { aboutModalLogo } = props;
+    const { aboutModalLogo, buttonChildren, children } = props;
 
     const theme = useTheme();
     const isMobile = useMediaQuery(theme.breakpoints.down("md"));
@@ -47,7 +49,7 @@ export function UserHeaderItem(props: UserHeaderItemProps): React.ReactElement {
     const [signOut, { loading: isSigningOut }] = useMutation<GQLSignOutMutation>(signOutMutation);
 
     return (
-        <AppHeaderDropdown buttonChildren={isMobile ? <Account /> : user.name} startIcon={isMobile ? undefined : <Account />}>
+        <AppHeaderDropdown buttonChildren={buttonChildren ?? (isMobile ? <Account /> : user.name)} startIcon={isMobile ? undefined : <Account />}>
             <DropdownContent padding={4}>
                 <Button
                     fullWidth={true}
@@ -59,6 +61,7 @@ export function UserHeaderItem(props: UserHeaderItemProps): React.ReactElement {
                 >
                     <FormattedMessage id="comet.about" defaultMessage="About" />
                 </Button>
+                {children}
                 <Separator />
                 {isSigningOut ? (
                     <Loading />

diff --git a/packages/api/cms-api/src/dam/files/folders.controller.ts b/packages/api/cms-api/src/dam/files/folders.controller.ts
@@ -2,6 +2,7 @@ import { Controller, ForbiddenException, Get, Inject, NotFoundException, Param,
 import { Response } from "express";
 
 import { GetCurrentUser } from "../../auth/decorators/get-current-user.decorator";
+import { RequiredPermission } from "../../user-permissions/decorators/required-permission.decorator";
 import { CurrentUser } from "../../user-permissions/dto/current-user";
 import { ACCESS_CONTROL_SERVICE } from "../../user-permissions/user-permissions.constants";
 import { AccessControlServiceInterface } from "../../user-permissions/user-permissions.types";
@@ -14,6 +15,7 @@ export class FoldersController {
         @Inject(ACCESS_CONTROL_SERVICE) private accessControlService: AccessControlServiceInterface,
     ) {}
 
+    @RequiredPermission(["dam"], { skipScopeCheck: true }) // Scope is checked in method
     @Get("/:folderId/zip")
     async createZip(@Param("folderId") folderId: string, @Res() res: Response, @GetCurrentUser() user: CurrentUser): Promise<void> {
         const folder = await this.foldersService.findOneById(folderId);

diff --git a/storybook/package.json b/storybook/package.json
@@ -8,7 +8,7 @@
     ],
     "scripts": {
         "build-storybook": "build-storybook",
-        "storybook": "start-storybook -p 26638",
+        "storybook": "start-storybook -p 26638 --no-version-updates",
         "lint": "run-p lint:eslint lint:tsc",
         "lint:eslint": "eslint --max-warnings 0 src/ package.json",
         "lint:tsc": "tsc --noEmit"

diff --git a/storybook/src/admin/form/DependentAsyncSelects.tsx b/storybook/src/admin/form/DependentAsyncSelects.tsx
@@ -30,7 +30,7 @@ storiesOf("@comet/admin/form", module)
                             <AsyncSelectField
                                 name="manufacturer"
                                 loadOptions={async () => {
-                                    const { data } = await client.query({
+                                    const { data } = await client.query<{ manufacturers: Manufacturer[] }>({
                                         query: gql`
                                             query Manufacturers {
                                                 manufacturers {
@@ -43,14 +43,14 @@ storiesOf("@comet/admin/form", module)
 
                                     return data.manufacturers;
                                 }}
-                                getOptionLabel={(option: Manufacturer) => option.name}
+                                getOptionLabel={(option) => option.name}
                                 label="Manufacturer"
                                 fullWidth
                             />
                             <AsyncSelectField
                                 name="product"
                                 loadOptions={async () => {
-                                    const { data } = await client.query({
+                                    const { data } = await client.query<{ products: Product[] }>({
                                         query: gql`
                                             query Products($manufacturer: ID) {
                                                 products(manufacturer: $manufacturer) {
@@ -64,7 +64,7 @@ storiesOf("@comet/admin/form", module)
 
                                     return data.products;
                                 }}
-                                getOptionLabel={(option: Product) => option.name}
+                                getOptionLabel={(option) => option.name}
                                 label="Product"
                                 fullWidth
                                 disabled={!values.manufacturer}