Skip to content

Commit

Permalink
Merge next into feature/refactor-admin-component-theming (#1539)
Browse files Browse the repository at this point in the history
Co-authored-by: Franz Unger <franz.unger@vivid-planet.com>
Co-authored-by: Johannes Obermair <48853629+johnnyomair@users.noreply.github.com>
Co-authored-by: Niko Sams <niko.sams@gmail.com>
Co-authored-by: raphaelblum <44967610+raphaelblum@users.noreply.github.com>
Co-authored-by: Tobias <34998750+Tobi98@users.noreply.github.com>
Co-authored-by: Tobias Kuhn <tobias.kuhn@vivid-planet.com>
Co-authored-by: Thomas Dax <thomas.dax@vivid-planet.com>
Co-authored-by: Niko Sams <ns@vivid-planet.com>
Co-authored-by: Daniel Karnutsch <d.karnutsch@gmail.com>
Co-authored-by: Daniel Karnutsch <dkarnutsch@users.noreply.github.com>
Co-authored-by: Johannes Obermair <johannes.obermair@vivid-planet.com>
Co-authored-by: jennyvivid <148231586+jennyvivid@users.noreply.github.com>
Co-authored-by: Johannes Munker <56400587+jomunker@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions <github-actions@github.com>
Co-authored-by: NataliaVizintini <72875628+NataliaVizintini@users.noreply.github.com>
  • Loading branch information
18 people authored Jan 4, 2024
1 parent b87c3c2 commit 63ae79c
Show file tree
Hide file tree
Showing 544 changed files with 5,555 additions and 2,254 deletions.
5 changes: 5 additions & 0 deletions .changeset/dirty-trees-burn.md
Original file line number Diff line number Diff line change
@@ -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.
7 changes: 7 additions & 0 deletions .changeset/eighty-tools-fail.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@comet/cms-api": minor
---

Add `PublicUploadsService` to public API

The service can be used to programmatically create public uploads, such as when creating fixtures.
5 changes: 0 additions & 5 deletions .changeset/fair-clouds-poke.md

This file was deleted.

22 changes: 22 additions & 0 deletions .changeset/fifty-crabs-love.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
"@comet/cms-site": minor
---

Add `hasRichTextBlockContent` helper

The helper can be used to conditionally render a `RichTextBlock`.

**Example:**

```tsx
import { hasRichTextBlockContent } from "@comet/cms-site";

function TeaserBlock({ data: { image, text } }: PropsWithData<TeaserBlockData>) {
return (
<>
<DamImageBlock data={image} />
{hasRichTextBlockContent(text) && <RichTextBlock data={text} />}
</>
);
}
```
17 changes: 17 additions & 0 deletions .changeset/hungry-hornets-agree.md
Original file line number Diff line number Diff line change
@@ -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`
22 changes: 22 additions & 0 deletions .changeset/odd-paws-speak.md
Original file line number Diff line number Diff line change
@@ -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 });
}}
>
```
5 changes: 5 additions & 0 deletions .changeset/poor-boxes-explain.md
Original file line number Diff line number Diff line change
@@ -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`.
5 changes: 5 additions & 0 deletions .changeset/sharp-readers-tie.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@comet/eslint-config": major
---

Enable `import/newline-after-import`
5 changes: 5 additions & 0 deletions .changeset/six-wolves-help.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@comet/admin": major
---

FinalForm: Don't handle sync submit differently than async submit
16 changes: 16 additions & 0 deletions .changeset/sixty-cobras-brake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
"@comet/cms-api": major
---

Replace ContentScopeModule with UserPermissionsModule

Breaking changes:

- ContentScope-Module has been removed
- canAccessScope has been moved to AccessControlService and renamed to isAllowedContentScope
- 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
23 changes: 23 additions & 0 deletions .changeset/smart-weeks-behave.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
---
"@comet/admin": minor
---

Add `Alert` component

**Example:**

```tsx
import { Alert, OkayButton, SaveButton } from "@comet/admin";

<Alert
severity="warning"
title="Title"
action={
<Button variant="text" startIcon={<ArrowRight />}>
Action Text
</Button>
}
>
Notification Text
</Alert>
```
5 changes: 5 additions & 0 deletions .changeset/tricky-adults-laugh.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@comet/cms-admin": minor
---

Make all DAM license fields optional if `LicenseType` is `ROYALTY_FREE` even if `requireLicense` is true in `DamConfig`
5 changes: 5 additions & 0 deletions .changeset/unlucky-files-compare.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@comet/eslint-config": major
---

Enable no-other-module-relative-import rule by default
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ API_PORT=4000
API_URL=http://localhost:$API_PORT
API_URL_INTERNAL=http://localhost:$API_PORT
CORS_ALLOWED_ORIGINS="^http:\/\/localhost:\d+,^http://192.168.\d+.\d+:80[0-9]{2}"
SITE_PREVIEW_SECRET=uxa4ZBJ4exw8jgq-qrh

# blob storage
BLOB_STORAGE_DRIVER="file"
Expand Down
6 changes: 6 additions & 0 deletions .github/auto_assign.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
addAssignees: author

addReviewers: true

reviewers:
- johnnyomair
1 change: 1 addition & 0 deletions demo/admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"@mui/x-data-grid": "^5.15.2",
"@mui/x-data-grid-pro": "^5.15.2",
"axios": "^0.21.0",
"change-case": "^5.2.0",
"date-fns": "^2.0.0",
"dnd-core": "^10.0.2",
"draft-js": "^0.11.0",
Expand Down
Loading

0 comments on commit 63ae79c

Please sign in to comment.