Merge main into next

.changeset/blue-cups-nail.md

@@ -0,0 +1,5 @@
+---
+"@comet/cms-api": patch
+---
+
+API Generator: Don't generate an update input for the single generator

.changeset/chatty-spoons-help.md

@@ -0,0 +1,5 @@
+---
+"@comet/admin-theme": minor
+---
+
+Rework `GridFilterPanel` to match the updated Comet CI

.changeset/clever-jobs-invite.md

@@ -0,0 +1,8 @@
+---
+"@comet/admin-theme": minor
+---
+
+Adapt `Chip` styling to align with Comet DXP design
+
+-   Fix hover styling
+-   Add new styling for `<Chip variant="filled" color="info">`

.changeset/crafty-cats-copy.md

@@ -0,0 +1,7 @@
+---
+"@comet/cms-admin": minor
+---
+
+Add support for passing title and alt text to `useDamFileUpload`
+
+This can be useful when importing files from an external DAM.

.changeset/curvy-bulldogs-boil.md

@@ -0,0 +1,21 @@
+---
+"@comet/admin": minor
+---
+
+Add new custom `Dialog`
+
+The component extends the MUI `Dialog` component to enable common use cases:
+
+-   The `title` prop can be used to set the dialog title
+-   A close button is shown when the `onClose` is used
+
+**Example**
+
+```tsx
+<Dialog
+    title="Dialog Title"
+    onClose={() => {
+        // Handle dialog closing here
+    }}
+/>
+```

.changeset/fuzzy-mugs-beg.md

@@ -0,0 +1,5 @@
+---
+"@comet/cms-admin": patch
+---
+
+Remove vertical and horizontal scroll bars from block preview iframe

.changeset/honest-vans-grow.md

@@ -0,0 +1,5 @@
+---
+"@comet/admin": patch
+---
+
+Prevent unintended layout shift after the initial render of `FieldContainer` when using the `horizontal` variant

.changeset/long-trainers-join.md

@@ -0,0 +1,7 @@
+---
+"@comet/admin": minor
+---
+
+Add a `forceVerticalContainerSize` prop to `FieldContainer`
+
+Use it to define below which container size the `vertical` styling is applied when using the `horizontal` variant.

.changeset/nine-rings-check.md

@@ -0,0 +1,5 @@
+---
+"@comet/admin": patch
+---
+
+Fix alignment of `Alert` icon with the title

.changeset/poor-kings-live.md

@@ -0,0 +1,5 @@
+---
+"@comet/admin-theme": patch
+---
+
+Adapt size of arrow in `Select` and `Autocomplete` fields according to Comet DXP design

.github/pull_request_template.md

@@ -1,15 +1,12 @@
 <!--
-
 PLEASE MAKE SURE TO KEEP THE PR SIZE AT A MINIMUM!
 Smaller PRs are easier to review and tend to get merged faster.
 Unrelated changes, refactorings, fixes etc. should be made in separate PRs.
-
---->
+-->
 
 ## Description
 
 <!--
-
 The description should describe the change you're making.
 It will be used as the commit message for the squashed commit once the PR gets merged.
 Therefore, make sure to keep the description up-to-date as the PR changes.
@@ -22,49 +19,39 @@ Your description should include:
 -   The problem you're facing
 -   Your solution to the problem
 -   An example usage of your change
-
---->
+-->
 
 <!--
-
 Everything below this is intended to help ease reviewing this PR.
 Remove all unrelated sections.
-
 -->
 
 ## Example
 
 <!--
-
 Make sure to provide an example of your change if your change includes a new API.
-
 This can be either:
 -   The implementation in Demo
 -   A dev story in Storybook
 -   A unit test
-
---->
+-->
 
 -   [ ] I have verified if my change requires an example
 
 ## Screenshots/screencasts
 
 <!--
-
 When making a visual change, please provide either screenshots or screencasts.
-
 Hint: For before/after views, you can use a table:
 
-| Before   | After   |
-| -------- | ------- |
-| Link     | Link    |
-
+| Before | After |
+| --- | --- |
+| Link | Link |
 -->
 
 ## Changeset
 
 <!--
-
 When making a notable change, make sure to add a changeset.
 See [CONTRIBUTING.md](https://github.com/vivid-planet/comet/blob/HEAD/CONTRIBUTING.md) for more information.
 
@@ -81,38 +68,30 @@ Changeset writing guidelines:
 -   Provide additional information in the description
 -   Use backticks to highlight code: Add new `Alert` component
 -   Use bold formatting for "headlines" in the description: **Example**
-
---->
+-->
 
 -   [ ] I have verified if my change requires a changeset
 
 ## Related tasks and documents
 
 <!--
-
 Link to related tasks and documents, for instance, https://vivid-planet.atlassian.net/browse/COM-XXX.
-
 MAKE SURE THAT EVERYTHING REQUIRED TO UNDERSTAND YOUR CHANGE IS IN THE PR DESCRIPTION.
 Reviewers shouldn't need to review tasks, JIRA conversations etc. to understand what you're doing.
-
 -->
 
 ## Open TODOs/questions
 
 <!--
-
 -   [ ] Need to validate that this actually works
 -   [ ] Merge parent PR
-
 -->
 
 ## Further information
 
 <!--
-
 Further information that helps reviewing the PR, for instance:
 -   Alternative solutions you have considered
 -   Dependent PRs
 -   Links to relevant documentation, blog posts etc.
-
 -->

demo/admin/src/products/ProductForm.gql.ts

@@ -37,6 +37,7 @@ export const productFormFragment = gql`
             min
             max
         }
+        lastCheckedAt
         dimensions {
             width
             height

demo/admin/src/products/ProductForm.tsx

@@ -15,7 +15,7 @@ import {
     useFormApiRef,
     useStackSwitchApi,
 } from "@comet/admin";
-import { DateField } from "@comet/admin-date-time";
+import { DateField, DateTimeField } from "@comet/admin-date-time";
 import { BlockState, createFinalFormBlock } from "@comet/blocks-admin";
 import {
     DamImageBlock,
@@ -111,6 +111,7 @@ export function ProductForm({ id, width }: FormProps) {
                       id: filteredData.manufacturerCountry?.addressAsEmbeddable.country,
                   }
                 : undefined,
+            lastCheckedAt: filteredData.lastCheckedAt ? new Date(filteredData.lastCheckedAt) : null,
         };
     }, [data, width]);
 
@@ -140,6 +141,7 @@ export function ProductForm({ id, width }: FormProps) {
             priceList: formValues.priceList ? formValues.priceList.id : null,
             datasheets: formValues.datasheets?.map(({ id }) => id),
             manufacturer: formValues.manufacturer?.id,
+            lastCheckedAt: formValues.lastCheckedAt ? formValues.lastCheckedAt.toISOString() : null,
         };
 
         if (mode === "edit") {
@@ -357,6 +359,11 @@ export function ProductForm({ id, width }: FormProps) {
                         fullWidth
                         layout="grid"
                     />
+                    <DateTimeField
+                        label={<FormattedMessage id="product.lastCheckedAt" defaultMessage="Last checked at" />}
+                        name="lastCheckedAt"
+                        fullWidth
+                    />
                 </>
             )}
         </FinalForm>

demo/admin/src/products/ProductsPage.tsx

@@ -136,7 +136,11 @@ const ProductsPage = () => {
                 <StackPage name="add" title={intl.formatMessage({ id: "products.addProduct", defaultMessage: "Add product" })}>
                     <SaveBoundary>
                         <FormToolbar />
-                        <ProductForm />
+                        <StackMainContent>
+                            <FieldSet>
+                                <ProductForm />
+                            </FieldSet>
+                        </StackMainContent>
                     </SaveBoundary>
                 </StackPage>
             </StackSwitch>

demo/api/src/footer/generated/dto/footer.input.ts

@@ -1,6 +1,11 @@
 // This file has been generated by comet api-generator.
 // You may choose to use this file as scaffold by moving this file out of generated folder and removing this comment.
+<<<<<<< HEAD
 import { BlockInputInterface, isBlockInputInterface, PartialType, RootBlockInputScalar } from "@comet/cms-api";
+=======
+import { BlockInputInterface, isBlockInputInterface } from "@comet/blocks-api";
+import { RootBlockInputScalar } from "@comet/cms-api";
+>>>>>>> main
 import { Field, InputType } from "@nestjs/graphql";
 import { Transform } from "class-transformer";
 import { IsNotEmpty, ValidateNested } from "class-validator";
@@ -15,6 +20,3 @@ export class FooterInput {
     @ValidateNested()
     content: BlockInputInterface;
 }
-
-@InputType()
-export class FooterUpdateInput extends PartialType(FooterInput) {}

packages/admin/admin-theme/src/componentsTheme/MuiAutocomplete.tsx

@@ -27,6 +27,9 @@ export const getMuiAutocomplete: GetMuiComponentTheme<"MuiAutocomplete"> = (comp
             "&:hover": {
                 backgroundColor: "transparent",
             },
+            "& .MuiSvgIcon-root": {
+                fontSize: "12px",
+            },
         },
     }),
 });

packages/admin/admin-theme/src/componentsTheme/MuiChip.tsx

@@ -1,5 +1,4 @@
 import { Clear } from "@comet/admin-icons";
-import { chipClasses } from "@mui/material";
 
 import { mergeOverrideStyles } from "../utils/mergeOverrideStyles";
 import { GetMuiComponentTheme } from "./getComponentsTheme";
@@ -98,18 +97,23 @@ export const getMuiChip: GetMuiComponentTheme<"MuiChip"> = (component, { palette
         },
         filledDefault: {
             backgroundColor: palette.grey["100"],
+            "&.MuiChip-clickable": {
+                "&:hover": {
+                    backgroundColor: palette.grey["200"],
+                },
+            },
+        },
+        filledInfo: {
+            backgroundColor: "#fff",
+            "&.MuiChip-clickable": {
+                "&:hover": {
+                    backgroundColor: palette.grey["50"],
+                },
+            },
         },
         outlinedDefault: {
             borderColor: palette.grey["100"],
         },
-        clickableColorDefault: {
-            [`&.${chipClasses.filled}:hover`]: {
-                backgroundColor: palette.grey["200"],
-            },
-            [`&.${chipClasses.outlined}:hover`]: {
-                backgroundColor: palette.grey["50"],
-            },
-        },
     }),
     defaultProps: {
         deleteIcon: <Clear />,