Skip to content

fix: accept scalar values in v2 visibility rules #293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Maroutis wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: accept scalar values in v2 visibility rules #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/erc7730/model/input/v2/display.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ class InputVisibilityConditions(Model):
Complex visibility conditions for field display rules.
"""

ifNotIn: list[str] | None = Field(
ifNotIn: list[ScalarType | None] | None = Field(
None,
title="If Not In",
description="Display this field only if its value is NOT in this list.",
)

mustBe: list[str] | None = Field(
mustBe: list[ScalarType | None] | None = Field(
None,
title="Must Be",
description="Skip displaying this field but its value MUST match one of these values.",
Expand Down
4 changes: 2 additions & 2 deletions src/erc7730/model/resolved/v2/display.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ class ResolvedVisibilityConditions(Model):
Complex visibility conditions for field display rules (resolved).
"""

ifNotIn: list[str] | None = Field(
ifNotIn: list[ScalarType | None] | None = Field(
None,
title="If Not In",
description="Display this field only if its value is NOT in this list.",
)

mustBe: list[str] | None = Field(
mustBe: list[ScalarType | None] | None = Field(
None,
title="Must Be",
description="Skip displaying this field but its value MUST match one of these values.",
Expand Down
18 changes: 18 additions & 0 deletions tests/v2/convert/resolved/data/field_with_visibility_conditions_input.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,24 @@
"0x0000000000000000000000000000000000000000"
]
}
},
{
"path": "destinationChainId",
"label": "Destination Chain",
"visible": {
"mustBe": [
100
]
}
},
{
"path": "hasSourceSwaps",
"label": "Has Source Swaps",
"visible": {
"mustBe": [
true
]
}
}
]
}
Expand Down
18 changes: 18 additions & 0 deletions tests/v2/convert/resolved/data/field_with_visibility_conditions_resolved.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,24 @@
"0x0000000000000000000000000000000000000000"
]
}
},
{
"label": "Destination Chain",
"path": "#.destinationChainId",
"visible": {
"mustBe": [
100
]
}
},
{
"label": "Has Source Swaps",
"path": "#.hasSourceSwaps",
"visible": {
"mustBe": [
true
]
}
}
]
}
Expand Down
Loading