Merge next into main for v6 Release

.changeset/dirty-trees-burn.md

@@ -0,0 +1,5 @@
+---
+"@comet/cms-admin": minor
+---
+
+Add `MasterMenu` and `MasterMenuRoutes` components which both take a single data structure to define menu and routes.

.changeset/hungry-hornets-agree.md

@@ -0,0 +1,17 @@
+---
+"@comet/cms-admin": major
+"@comet/cms-api": major
+---
+
+Enhance CronJob module
+
+-   Show latest job run on `CronJobsPage`
+-   Add option to manually trigger cron jobs to `CronJobsPage`
+-   Add subpage to `CronJobsPage` that shows all job runs
+
+Warning: Only include this module if all your users should be able to trigger cron jobs manually or you have sufficient access control in place.
+
+Includes the following breaking changes:
+
+-   Rename `JobStatus` to `KubernetesJobStatus` to avoid naming conflicts
+-   Rename `BuildRuntime` to `JobRuntime`

.changeset/odd-paws-speak.md

@@ -0,0 +1,22 @@
+---
+"@comet/admin": major
+---
+
+FinalForm: remove default `onAfterSubmit` implementation
+
+In most cases the default implementation is not needed anymore. When upgrading, an empty
+function override of `onAfterSubmit` can be removed as it is not necessary any longer.
+
+To get back the old behavior use the following in application code:
+
+```
+const stackApi = React.useContext(StackApiContext);
+const editDialog = React.useContext(EditDialogApiContext);
+....
+    <FinalForm
+        onAfterSubmit={() => {
+            stackApi?.goBack();
+            editDialog?.closeDialog({ delay: true });
+        }}
+    >
+```

.changeset/poor-boxes-explain.md

@@ -0,0 +1,5 @@
+---
+"@comet/admin-icons": major
+---
+
+Remove deprecated icons `Betrieb`, `Logische Filter`, `Pool`, `Pool 2`, `State Green`, `State Green Ring`, `State Orange`, `State Orange Ring`, `State Red`, `State Red Ring`, `Vignette 1` and `Vignette 2`.

.changeset/rich-crews-smell.md

@@ -0,0 +1,43 @@
+---
+"@comet/cms-admin": major
+---
+
+Make sites config generic
+
+The sites config was previously assumed to be `Record<string, SiteConfg>`.
+However, as the sites config is solely used in application code, it could be of any shape.
+Therefore, the `SitesConfigProvider` and `useSitesConfig` are made generic.
+The following changes have to be made in the application:
+
+1.  Define the type of your sites config
+
+    Preferably this should be done in `config.ts`:
+
+    ```diff
+    export function createConfig() {
+        // ...
+
+        return {
+            ...cometConfig,
+            apiUrl: environmentVariables.API_URL,
+            adminUrl: environmentVariables.ADMIN_URL,
+    +       sitesConfig: JSON.parse(environmentVariables.SITES_CONFIG) as SitesConfig,
+        };
+    }
+
+    + export type SitesConfig = Record<string, SiteConfig>;
+    ```
+
+2.  Use the type when using `useSitesConfig`
+
+    ```diff
+    - const sitesConfig = useSitesConfig();
+    + const sitesConfig = useSitesConfig<SitesConfig>();
+    ```
+
+3.  Optional: Remove type annotation from `ContentScopeProvider#resolveSiteConfigForScope` (as it's now inferred)
+
+    ```diff
+    - resolveSiteConfigForScope: (configs: Record<string, SiteConfig>, scope: ContentScope) => configs[scope.domain],
+    + resolveSiteConfigForScope: (configs, scope: ContentScope) => configs[scope.domain],
+    ```

.changeset/sharp-readers-tie.md

@@ -0,0 +1,5 @@
+---
+"@comet/eslint-config": major
+---
+
+Enable `import/newline-after-import`

.changeset/six-wolves-help.md

@@ -0,0 +1,5 @@
+---
+"@comet/admin": major
+---
+
+FinalForm: Don't handle sync submit differently than async submit

.changeset/sixty-cobras-brake.md

@@ -0,0 +1,17 @@
+---
+"@comet/cms-api": major
+---
+
+Replace ContentScopeModule with UserPermissionsModule
+
+Breaking changes:
+
+-   ContentScope-Module has been removed
+-   canAccessScope has been moved to AccessControlService and refactored into isAllowed
+-   contentScopes- and permissions-fields have been added to CurrentUser-Object
+-   role- and rights-fields has been removed from CurrentUser-Object
+-   AllowForRole-decorator has been removed
+-   Rename decorator SubjectEntity to AffectedEntity
+-   Add RequiredPermission-decorator and make it mandatory when using UserPermissionsModule
+
+Upgrade-Guide: tbd

.changeset/stale-wombats-reply.md

@@ -0,0 +1,30 @@
+---
+"@comet/admin": major
+---
+
+Change the signatures of `shouldScrollToField`, `shouldShowFieldError` and `shouldShowFieldWarning` in `FinalFormContext` to match the corresponding methods in `Field`
+
+The API in `FinalFormContext` was changed from 
+
+```tsx
+// ❌
+export interface FinalFormContext {
+    shouldScrollToField: ({ fieldMeta }: { fieldMeta: FieldMetaState<any> }) => boolean;
+    shouldShowFieldError: ({ fieldMeta }: { fieldMeta: FieldMetaState<any> }) => boolean;
+    shouldShowFieldWarning: ({ fieldMeta }: { fieldMeta: FieldMetaState<any> }) => boolean;
+}
+```
+
+to
+
+```tsx
+// ✅
+export interface FinalFormContext {
+    shouldScrollToField: (fieldMeta: FieldMetaState<any>) => boolean;
+    shouldShowFieldError: (fieldMeta: FieldMetaState<any>) => boolean;
+    shouldShowFieldWarning: (fieldMeta: FieldMetaState<any>) => boolean;
+}
+```
+
+Now the corresponding methods in `Field` and `FinalFormContext` have the same signature.
+

.changeset/unlucky-files-compare.md

@@ -0,0 +1,5 @@
+---
+"@comet/eslint-config": major
+---
+
+Enable no-other-module-relative-import rule by default

copy-schema-files.js

@@ -11,7 +11,7 @@ const fs = require("fs");
         fs.promises.copyFile("demo/api/block-meta.json", "demo/site/block-meta.json"),
         fs.promises.copyFile("demo/api/schema.gql", "demo/admin/schema.gql"),
         fs.promises.copyFile("demo/api/schema.gql", "demo/site/schema.gql"),
-        fs.promises.copyFile("demo/api/comet-config.json", "demo/site/comet-config.json"),
-        fs.promises.copyFile("demo/api/comet-config.json", "demo/admin/comet-config.json"),
+        fs.promises.copyFile("demo/api/src/comet-config.json", "demo/site/src/comet-config.json"),
+        fs.promises.copyFile("demo/api/src/comet-config.json", "demo/admin/src/comet-config.json"),
     ]);
 })();

demo/admin/.gitignore

@@ -12,5 +12,5 @@ lang-compiled
 graphql.generated.ts
 block-meta.json
 src/blocks.generated.ts
-comet-config.json
+src/comet-config.json
 src/**/*.generated.ts