Skip to content

Commit

Permalink
Merge branch 'next' into update-uuid
Browse files Browse the repository at this point in the history
  • Loading branch information
thomasdax98 committed Jan 8, 2025
2 parents b42bd2a + 9a233bd commit 3d5ae27
Show file tree
Hide file tree
Showing 360 changed files with 9,583 additions and 3,269 deletions.
5 changes: 5 additions & 0 deletions .changeset/blue-trains-roll.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@comet/cms-api": patch
---

Fix `notEqual` operation for enum filter
5 changes: 5 additions & 0 deletions .changeset/brown-actors-enjoy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@comet/cms-admin": patch
---

Adapt styling of `ContentScopeSelect` to match the Comet design
8 changes: 8 additions & 0 deletions .changeset/calm-worms-fetch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"@comet/admin": minor
---

Make `GridFilterButton` and `GridColumnsButton` responsive by moving their text to a tooltip on mobile

- This also makes the button's styles consistent with the standard `Button` component
- `GridFilterButton` now supports props to override the default button props
6 changes: 6 additions & 0 deletions .changeset/clever-radios-share.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@comet/cms-admin": patch
"@comet/cms-api": patch
---

Prevent the creation of a second home page
5 changes: 5 additions & 0 deletions .changeset/cool-beers-whisper.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@comet/admin-theme": patch
---

Fix an issue where setting `defaultProps` of `MuiDataGrid` would override the `defaultProps` defined by `createCometTheme()`
5 changes: 5 additions & 0 deletions .changeset/curly-mangos-hug.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@comet/admin": patch
---

Prevent scrolling of `DialogTitle` and `DialogActions` in `EditDialog`
6 changes: 6 additions & 0 deletions .changeset/early-ears-wave.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@comet/admin-theme": patch
"@comet/admin": patch
---

Fix `border-color` of `InputBase` on default and hover state
5 changes: 5 additions & 0 deletions .changeset/fluffy-jars-search.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@comet/admin-theme": minor
---

Enable vertical resizing for `TextAreaField` and other multiline inputs
12 changes: 12 additions & 0 deletions .changeset/four-terms-hope.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
"@comet/admin-theme": minor
---

Add support and styling for full screen dialogs using the `fullScreen` prop

```tsx
<Dialog open fullScreen>
<DialogTitle>Dialog Title</DialogTitle>
<DialogContent>Dialog content</DialogContent>
</Dialog>
```
7 changes: 7 additions & 0 deletions .changeset/fuzzy-dogs-serve.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@comet/admin": patch
---

Prevent the page content from overflowing the window, causing a horizontal scrollbar

This happened when using elements like `Tabs` that are intended to be horizontally scrollable and could, therefore, be wider than the window.
11 changes: 11 additions & 0 deletions .changeset/good-cobras-pretend.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
"@comet/admin": minor
---

Adjust how tooltips are triggered

This is to achieve a more consistent and user-friendly experience by ensuring tooltips are always shown when the user interacts with the underlying element.

- When using the default `hover` trigger, tooltips will now be shown on both `hover` and `focus`. Previously, you had to choose between `hover` and `focus`.
- The `trigger` prop is deprecated and will be removed in a future major version. The combined `hover`/`focus` trigger will be the only supported behavior.
- Tooltips on touch devices will be shown immediately when the user starts interacting with the underlying element.
5 changes: 5 additions & 0 deletions .changeset/long-files-compile.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@comet/cms-admin": patch
---

Enable setting `importSourceId` and `importSourceType` for each individual file in the `useDamFileUpload#uploadFiles` function
5 changes: 5 additions & 0 deletions .changeset/new-cherries-provide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@comet/cms-api": patch
---

Fix input validation for missing child blocks
5 changes: 5 additions & 0 deletions .changeset/nice-bugs-knock.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@comet/admin": patch
---

Fix `onClick` and other props not being passed to the icon version of some button components
5 changes: 5 additions & 0 deletions .changeset/quiet-countries-itch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@comet/cms-admin": minor
---

Update design of the user menu in the header and add information about the impersonated user
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Acceptance criteria

- [ ] I have verified if my change requires [an example](https://github.com/vivid-planet/comet/blob/HEAD/CONTRIBUTING.md#example): <!-- Unit test | Demo | Development story | No example needed --->
- [ ] I have verified if my change requires [an example](https://github.com/vivid-planet/comet/blob/HEAD/CONTRIBUTING.md#example)
- [ ] I have verified if my change requires [a changeset](https://github.com/vivid-planet/comet/blob/HEAD/CONTRIBUTING.md#changeset)
- [ ] I have verified if my change requires [screenshots/screencasts](https://github.com/vivid-planet/comet/blob/HEAD/CONTRIBUTING.md#screenshotsscreencasts)

Expand Down
38 changes: 38 additions & 0 deletions .github/workflows/sonar-qube.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: SonarCloud Code Analysis

on:
pull_request:
types:
- opened
- synchronize
- reopened
push:
branches:
- main
- next

jobs:
sonarqube:
name: SonarQube
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0

- uses: pnpm/action-setup@v4

- name: Use Node.js 22.x
uses: actions/setup-node@v4
with:
node-version: 22
registry-url: "https://registry.npmjs.org"
cache: "pnpm"

- run: pnpm install --frozen-lockfile

- name: SonarQube Scan
uses: SonarSource/sonarqube-scan-action@v4
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
3 changes: 1 addition & 2 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ The versions of the project that are currently supported with security updates.
| 7.x | :white_check_mark: |
| 6.x | :white_check_mark: (until 2025-07-31) |
| 5.x | :white_check_mark: (until 2025-01-30) |
| 4.x | :white_check_mark: (until 2024-11-21) |
| < 4.x | :x: |
| < 5.x | :x: |

## Reporting a vulnerability

Expand Down
4 changes: 0 additions & 4 deletions demo/admin/crud-generator-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,4 @@ export default [
target: "src/products/generated",
entityName: "Product",
},
{
target: "src/news/generated",
entityName: "News",
},
] satisfies CrudGeneratorConfig[];
12 changes: 6 additions & 6 deletions demo/admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"lint:eslint": "eslint --max-warnings 0 --config ./.eslintrc.cli.js --ext .ts,.tsx,.js,.jsx,.json,.md src/ package.json",
"lint:prettier": "npx prettier --check './**/*.{js,json,md,yml,yaml}'",
"lint:tsc": "tsc --project .",
"lint:generated-files-not-modified": "$npm_execpath admin-generator && git diff --exit-code HEAD --",
"lint:generated-files-not-modified": "$npm_execpath admin-generator && git diff --exit-code HEAD -- src/**/generated",
"start": "run-s intl:compile && run-p gql:types generate-block-types && dotenv -e .env.site-configs -- chokidar --initial -s \"../../packages/admin/*/src/**\" -c \"kill-port $ADMIN_PORT && vite --force\""
},
"dependencies": {
Expand All @@ -35,8 +35,8 @@
"@fontsource-variable/roboto-flex": "^5.0.14",
"@mui/material": "^6.3.0",
"@mui/system": "^6.3.0",
"@mui/x-data-grid": "^7.23.3",
"@mui/x-data-grid-pro": "^7.23.3",
"@mui/x-data-grid": "^7.23.5",
"@mui/x-data-grid-pro": "^7.23.5",
"change-case": "^5.2.0",
"dnd-core": "^16.0.0",
"final-form": "^4.20.10",
Expand Down Expand Up @@ -73,11 +73,11 @@
"@types/node": "^22.0.0",
"@types/react": "^17.0.0",
"@types/react-dom": "^17.0.0",
"@types/react-router": "^5.0.0",
"@types/react-router": "^5.1.20",
"@types/react-router-dom": "^5.0.0",
"@vitejs/plugin-react-swc": "^3.6.0",
"chokidar-cli": "^2.0.0",
"dotenv-cli": "^4.0.0",
"chokidar-cli": "^3.0.0",
"dotenv-cli": "^4.1.1",
"eslint": "^8.0.0",
"eslint-plugin-graphql": "^4.0.0",
"kill-port": "^2.0.1",
Expand Down
Loading

0 comments on commit 3d5ae27

Please sign in to comment.