Skip to content

Commit

Permalink
🚸 [#4969] Organize configuration fields on base tab in fieldsets
Browse files Browse the repository at this point in the history
In an attempt to declutter, related fields are now grouped in fieldsets
and especially fields that are optional are collapsed by default.

The fieldsets report a status where relevant to get a quick overview,
e.g. showing that no auth is configured or that the form is indeed
currently active (without being in maintenance mode).
  • Loading branch information
sergei-maertens committed Jan 2, 2025
1 parent a29de95 commit 442a63e
Show file tree
Hide file tree
Showing 8 changed files with 650 additions and 251 deletions.
14 changes: 14 additions & 0 deletions src/openforms/forms/tests/e2e_tests/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,20 @@ def phase(desc: str):
yield


async def open_fieldset(page: Page, title: str) -> None:
"""
Toggle a fieldset from collapsed to open state.
:arg page: The playwright page to find elements in.
:arg title: The heading/title of the fieldset displayed on the page, without the
'Show' string.
"""
toggle_link = page.get_by_role("heading", level=2, name=title).get_by_role(
"link", name="Show"
)
await toggle_link.click()


async def open_component_options_modal(page: Page, label: str, exact: bool = False):
"""
Find the component in the builder with the given label and click the edit icon
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
)

from ..factories import FormFactory
from .helpers import close_modal
from .helpers import close_modal, open_fieldset
from .test_form_designer import drag_and_drop_component


Expand Down Expand Up @@ -146,6 +146,7 @@ def setUpTestData():
# Check that there is no warning
await expect(warning_node).not_to_be_visible()

await open_fieldset(page, "Authentication")
await page.get_by_role("checkbox", name="DigiD", checked=True).click()

# Check that the warning has appeared
Expand Down
72 changes: 72 additions & 0 deletions src/openforms/js/compiled-lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -2939,6 +2939,12 @@
"value": "Number of years. Empty values are ignored."
}
],
"PtFAWx": [
{
"type": 0,
"value": "Presentation / appearance"
}
],
"PtZ96W": [
{
"type": 0,
Expand Down Expand Up @@ -3395,6 +3401,30 @@
"value": "Variables Mapping"
}
],
"U3g0MU": [
{
"type": 0,
"value": "Authentication "
},
{
"options": {
"false": {
"value": [
{
"type": 0,
"value": "(status: none configured)"
}
]
},
"other": {
"value": [
]
}
},
"type": 5,
"value": "hasAuth"
}
],
"UCGSib": [
{
"type": 0,
Expand Down Expand Up @@ -3623,6 +3653,12 @@
"value": "Date/time"
}
],
"WHxJpx": [
{
"type": 0,
"value": "The configuration options here control if the user can submit the form on the overview page and what the requirements are to do so."
}
],
"WNPDeM": [
{
"type": 0,
Expand Down Expand Up @@ -4523,6 +4559,12 @@
"value": "Advanced options"
}
],
"eNSJ0f": [
{
"type": 0,
"value": "Features"
}
],
"eO6MNT": [
{
"type": 0,
Expand Down Expand Up @@ -5177,6 +5219,30 @@
"value": "Folder path"
}
],
"jtJACV": [
{
"type": 0,
"value": "Availability "
},
{
"options": {
"other": {
"value": [
]
},
"true": {
"value": [
{
"type": 0,
"value": "(status: publicly available)"
}
]
}
},
"type": 5,
"value": "isAvailable"
}
],
"jtWzSW": [
{
"type": 0,
Expand Down Expand Up @@ -6785,6 +6851,12 @@
"value": "Plugin configuration: Ogone legacy"
}
],
"zqnTBZ": [
{
"type": 0,
"value": "Submission settings"
}
],
"zwOwrD": [
{
"type": 0,
Expand Down
72 changes: 72 additions & 0 deletions src/openforms/js/compiled-lang/nl.json
Original file line number Diff line number Diff line change
Expand Up @@ -2956,6 +2956,12 @@
"value": "Aantal jaren. Lege waarden worden genegeerd."
}
],
"PtFAWx": [
{
"type": 0,
"value": "Weergave/layout"
}
],
"PtZ96W": [
{
"type": 0,
Expand Down Expand Up @@ -3408,6 +3414,30 @@
"value": "Variabelekoppelingen"
}
],
"U3g0MU": [
{
"type": 0,
"value": "Inloggen "
},
{
"options": {
"false": {
"value": [
{
"type": 0,
"value": "(status: geen methoden ingesteld)"
}
]
},
"other": {
"value": [
]
}
},
"type": 5,
"value": "hasAuth"
}
],
"UCGSib": [
{
"type": 0,
Expand Down Expand Up @@ -3636,6 +3666,12 @@
"value": "Datum/tijd"
}
],
"WHxJpx": [
{
"type": 0,
"value": "Deze instellingen bepalen of een gebruiker op de overzichtspagina de inzending kan bevestigen en wat ervoor nodig is om dit te kunnen doen."
}
],
"WNPDeM": [
{
"type": 0,
Expand Down Expand Up @@ -4541,6 +4577,12 @@
"value": "Geavanceerde opties"
}
],
"eNSJ0f": [
{
"type": 0,
"value": "Functionaliteiten"
}
],
"eO6MNT": [
{
"type": 0,
Expand Down Expand Up @@ -5195,6 +5237,30 @@
"value": "Maplocatie"
}
],
"jtJACV": [
{
"type": 0,
"value": "Beschikbaarheid "
},
{
"options": {
"other": {
"value": [
]
},
"true": {
"value": [
{
"type": 0,
"value": "(status: publiek benaderbaar)"
}
]
}
},
"type": 5,
"value": "isAvailable"
}
],
"jtWzSW": [
{
"type": 0,
Expand Down Expand Up @@ -6803,6 +6869,12 @@
"value": "Plugin-instellingen: Ogone legacy"
}
],
"zqnTBZ": [
{
"type": 0,
"value": "Inzending-instellingen"
}
],
"zwOwrD": [
{
"type": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ const AuthPluginField = ({availableAuthPlugins, selectedAuthPlugins, onChange, e
/>
}
errors={errors}
required
>
<div>{authCheckboxes}</div>
</Field>
Expand Down
Loading

0 comments on commit 442a63e

Please sign in to comment.