Skip to content

Commit 9bcb421

Browse files
committed
Merge branch 'seven' into widgetsDefinitions
* seven: Update README with the Plone Aurora Seven querystringWidget (#8017) [Seven] Add `renderEmptyState` to `Table` component (#8308) Recurrence widget (#7200)
2 parents 45b61a2 + 2036cbd commit 9bcb421

46 files changed

Lines changed: 3468 additions & 32 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.md

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Seven
1+
# @plone/aurora
22

33
[![Unit Tests](https://github.com/plone/volto/actions/workflows/unit.yml/badge.svg?branch=seven)](https://github.com/plone/volto/actions/workflows/unit.yml)
44
[![Acceptance Tests](https://github.com/plone/volto/actions/workflows/acceptance.yml/badge.svg?branch=seven)](https://github.com/plone/volto/actions/workflows/acceptance.yml)
@@ -7,29 +7,25 @@
77

88
## Introduction
99

10-
[Volto](https://github.com/plone/volto) is a ReactJS-based frontend for the [Plone](https://plone.org) Content Management System.
11-
It is the default frontend starting with the Plone 6 release.
10+
[Plone Aurora](https://github.com/plone/volto) is a ReactJS-based frontend for the [Plone](https://plone.org) Content Management System compatible with the `plone.restapi` specification.
1211

13-
[Plone](https://plone.org) is a CMS built on Python with more than 20 years of history and experience.
12+
[Plone](https://plone.org) is a CMS built on Python with more than 25 years of history and experience.
1413

1514
Plone has features that appeal to developers and users alike, such as an intuitive editing interface, customizable content types, hierarchical organization, and a sophisticated permissions model.
1615
This allows you to build anything from simple websites to enterprise-grade intranets.
1716

18-
Volto exposes all these features and communicates with Plone via its [REST API](https://github.com/plone/plone.restapi).
17+
Plone Aurora exposes all these features and communicates with Plone via its [REST API](https://github.com/plone/plone.restapi).
1918

20-
Volto features the Pastanaga editor, a modern block-based content layout editor.
19+
Plone Aurora features the Somersault editor, a modern block-based content layout editor based on Plate.js.
2120
It is extensible and customizable, so you can adapt the provided default blocks to meet your requirements, or build new ones.
2221

23-
Volto is extensible using add-ons.
24-
You can build your own or choose from the community released ones:
25-
26-
- [Volto Add-ons in NPM](https://www.npmjs.com/search?q=keywords%3Avolto-addon%2Cvolto)
27-
- [Volto Awesome](https://github.com/collective/awesome-volto)
22+
Plone Aurora is extensible using add-ons.
2823

24+
Plone Aurora is the successor and natural evolution to the Plone Volto frontend.
2925

3026
## Demo
3127

32-
You can try a Volto online demo at [https://demo.plone.org/](https://demo.plone.org/).
28+
You can try a Plone Aurora online demo at [https://aurora.demo.plone.org/](https://aurora.demo.plone.org/).
3329

3430

3531
## Monorepo structure
@@ -41,11 +37,20 @@ This allows the code to be shared effectively, and unifies tracking of changes a
4137

4238
| Package | Location |
4339
|---|---|
44-
| [`@plone/client`](https://www.npmjs.com/package/@plone/client) | [`packages/client`](https://github.com/plone/volto/tree/seven/packages/client#readme) |
45-
| [`@plone/components`](https://www.npmjs.com/package/@plone/components) | [`packages/components`](https://github.com/plone/volto/tree/main/packages/components#readme) |
46-
| [`@plone/registry`](https://www.npmjs.com/package/@plone/registry) | [`packages/registry`](https://github.com/plone/volto/tree/main/packages/registry#readme) |
47-
| [`@plone/scripts`](https://www.npmjs.com/package/@plone/scripts) | [`packages/scripts`](https://github.com/plone/volto/tree/main/packages/scripts#readme) |
48-
| [`@plone/types`](https://www.npmjs.com/package/@plone/types) | [`packages/types`](https://github.com/plone/volto/tree/main/packages/types#readme) |
40+
| [`@plone/client`](https://www.npmjs.com/package/@plone/client) | [`packages/client`](https://github.com/plone/aurora/tree/main/packages/client#readme) |
41+
| [`@plone/components`](https://www.npmjs.com/package/@plone/components) | [`packages/components`](https://github.com/plone/aurora/tree/main/packages/components#readme) |
42+
| [`@plone/registry`](https://www.npmjs.com/package/@plone/registry) | [`packages/registry`](https://github.com/plone/aurora/tree/main/packages/registry#readme) |
43+
| [`@plone/types`](https://www.npmjs.com/package/@plone/types) | [`packages/types`](https://github.com/plone/aurora/tree/main/packages/types#readme) |
44+
| [`@plone/helpers`](https://www.npmjs.com/package/@plone/helpers) | [`packages/helpers`](https://github.com/plone/aurora/tree/main/packages/helpers#readme) |
45+
| [`@plone/react-router`](https://www.npmjs.com/package/@plone/react-router) | [`packages/react-router`](https://github.com/plone/aurora/tree/main/packages/react-router#readme) |
46+
| [`@plone/blocks`](https://www.npmjs.com/package/@plone/blocks) | [`packages/blocks`](https://github.com/plone/aurora/tree/main/packages/blocks#readme) |
47+
| [`@plone/layout`](https://www.npmjs.com/package/@plone/layout) | [`packages/layout`](https://github.com/plone/aurora/tree/main/packages/layout#readme) |
48+
| [`@plone/publicui`](https://www.npmjs.com/package/@plone/publicui) | [`packages/publicui`](https://github.com/plone/aurora/tree/main/packages/publicui#readme) |
49+
| [`@plone/cmsui`](https://www.npmjs.com/package/@plone/cmsui) | [`packages/cmsui`](https://github.com/plone/aurora/tree/main/packages/cmsui#readme) |
50+
| [`@plone/contents`](https://www.npmjs.com/package/@plone/contents) | [`packages/contents`](https://github.com/plone/aurora/tree/main/packages/contents#readme) |
51+
| [`@plone/plate`](https://www.npmjs.com/package/@plone/plate) | [`packages/plate`](https://github.com/plone/aurora/tree/main/packages/plate#readme) |
52+
| [`@plone/agave`](https://www.npmjs.com/package/@plone/agave) | [`packages/agave`](https://github.com/plone/aurora/tree/main/packages/agave#readme) |
53+
4954

5055
See also [Monorepo structure](https://6.docs.plone.org/volto/contributing/developing-core.html#monorepo-structure).
5156

@@ -56,9 +61,9 @@ The frontend's modular architecture in Plone is documented with Storybook.
5661
You can find it at https://plone-storybook.readthedocs.io/?path=/docs/introduction--docs.
5762

5863

59-
## Create a Seven frontend-only project
64+
## Create a Plone Aurora frontend-only project
6065

61-
To create a project with a frontend-only scaffold using Seven, follow the [Plone installation documentation](https://volto.readthedocs.io/seven/get-started/create-package.html).
66+
To create a project with a frontend-only scaffold using Plone Aurora, follow the [Plone installation documentation](https://volto.readthedocs.io/seven/get-started/create-package.html).
6267

6368

6469
## Documentation
@@ -85,16 +90,14 @@ See [Supported browsers](https://volto.readthedocs.io/seven/contributing/version
8590

8691
## Contributing
8792

88-
To contribute to the Volto project by writing code, documentation, translations, and so on, please read [Contributing to Plone](https://6.docs.plone.org/contributing/index.html) and [Contributing to Volto](https://volto.readthedocs.io/seven/contributing/index.html).
89-
90-
For newcomers to Volto, Plone, or open source software, you must read and follow [First-time contributors](https://6.docs.plone.org/contributing/first-time.html).
93+
To contribute to the Plone Aurora project by writing code, documentation, translations, and so on, please read [Contributing to Plone](https://6.docs.plone.org/contributing/index.html) and [Contributing to Volto](https://volto.readthedocs.io/seven/contributing/index.html).
9194

92-
Since December 2023, this repository has a monorepo structure.
95+
For newcomers to Plone Aurora, Plone, or open source software, you must read and follow [First-time contributors](https://6.docs.plone.org/contributing/first-time.html).
9396

9497
## Contributors
9598

96-
<a href="https://github.com/plone/volto/graphs/contributors">
97-
<img src="https://contrib.rocks/image?repo=plone/volto" />
99+
<a href="https://github.com/plone/aurora/graphs/contributors">
100+
<img src="https://contrib.rocks/image?repo=plone/aurora" />
98101
</a>
99102

100103

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Added recurrence widget. @sabrina-bongiovanni

packages/cmsui/components/Form/Field.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ const getWidgetDefault = (): React.ComponentType<any> =>
6060
* Get widget by field's `id` attribute
6161
*/
6262
const getWidgetByFieldId = (
63-
id: FieldProps['id'],
63+
id: FieldProps['name'],
6464
): React.ComponentType<any> | null =>
6565
typeof id === 'string' ? (config.getWidget(id) ?? null) : null;
6666

@@ -172,7 +172,9 @@ const renderFieldWidget = ({
172172
onFieldBlur: () => void;
173173
}) => {
174174
const Widget =
175-
getWidgetByFieldId(fieldProps.id) ||
175+
getWidgetByFieldId(
176+
(fieldProps.id ?? fieldProps.name) as FieldProps['name'],
177+
) ||
176178
getWidgetFromTaggedValues(fieldProps.widgetOptions) ||
177179
getWidgetByName(fieldProps.widget) ||
178180
getWidgetByChoices(fieldProps) ||

packages/cmsui/components/Form/Form.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { createFormHookContexts, createFormHook } from '@tanstack/react-form';
22
import Quanta from './Field';
33

44
// export useFieldContext for use in your custom components
5-
export const { fieldContext, formContext, useFieldContext } =
5+
export const { fieldContext, formContext, useFieldContext, useFormContext } =
66
createFormHookContexts();
77

88
export const { useAppForm } = createFormHook({

0 commit comments

Comments
 (0)