Skip to content

[portal] az portal dashboard: Refine input json properties deserializing #8730

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

Merged
kairu-ms merged 2 commits into from
May 9, 2025
Merged

[portal] az portal dashboard: Refine input json properties deserializing #8730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1779234
refine json deserializing
cxznmhdcxz May 9, 2025
fde7e22
update version
cxznmhdcxz May 9, 2025
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
5 changes: 5 additions & 0 deletions src/portal/HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
Release History
===============

1.0.0b2
++++++
* Revert maximum name length to 64 characters.
* Refine deserializing for input json properties.

1.0.0b1
++++++
* Migrate to AAZ
Expand Down
1 change: 1 addition & 0 deletions src/portal/azext_portal/aaz/latest/portal/__cmd_group.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#
# Code generated by aaz-dev-tools
# --------------------------------------------------------------------------------------------
# swagger changes: https://github.com/Azure/azure-rest-api-specs/pull/32901

# pylint: skip-file
# flake8: noqa
Expand Down
120 changes: 4 additions & 116 deletions src/portal/azext_portal/aaz/latest/portal/dashboard/_create.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ def _build_arguments_schema(cls, *args, **kwargs):
help="The name of the dashboard.",
required=True,
fmt=AAZStrArgFormat(
pattern="^[a-zA-Z0-9-]{3,24}$",
max_length=64,
min_length=3,
),
Expand Down Expand Up @@ -109,7 +108,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
parts.Element = AAZObjectArg()

_element = cls._args_schema.lenses.Element.parts.Element
_element.metadata = AAZObjectArg(
_element.metadata = AAZFreeFormDictArg(
options=["metadata"],
help="The dashboard part's metadata.",
)
Expand All @@ -119,58 +118,6 @@ def _build_arguments_schema(cls, *args, **kwargs):
required=True,
)

metadata = cls._args_schema.lenses.Element.parts.Element.metadata
metadata.extension_hubs_extension_part_type_markdown_part = AAZObjectArg(
options=["extension-hubs-extension-part-type-markdown-part"],
)

extension_hubs_extension_part_type_markdown_part = cls._args_schema.lenses.Element.parts.Element.metadata.extension_hubs_extension_part_type_markdown_part
extension_hubs_extension_part_type_markdown_part.inputs = AAZListArg(
options=["inputs"],
help="Input to dashboard part.",
)
extension_hubs_extension_part_type_markdown_part.settings = AAZObjectArg(
options=["settings"],
help="Markdown part settings.",
)

inputs = cls._args_schema.lenses.Element.parts.Element.metadata.extension_hubs_extension_part_type_markdown_part.inputs
inputs.Element = AAZFreeFormDictArg()

settings = cls._args_schema.lenses.Element.parts.Element.metadata.extension_hubs_extension_part_type_markdown_part.settings
settings.content = AAZObjectArg(
options=["content"],
help="The content of markdown part.",
)

content = cls._args_schema.lenses.Element.parts.Element.metadata.extension_hubs_extension_part_type_markdown_part.settings.content
content.settings = AAZObjectArg(
options=["settings"],
help="The setting of the content of markdown part.",
)

settings = cls._args_schema.lenses.Element.parts.Element.metadata.extension_hubs_extension_part_type_markdown_part.settings.content.settings
settings.content = AAZStrArg(
options=["content"],
help="The content of the markdown part.",
)
settings.markdown_source = AAZIntArg(
options=["markdown-source"],
help="The source of the content of the markdown part.",
)
settings.markdown_uri = AAZStrArg(
options=["markdown-uri"],
help="The uri of markdown content.",
)
settings.subtitle = AAZStrArg(
options=["subtitle"],
help="The subtitle of the markdown part.",
)
settings.title = AAZStrArg(
options=["title"],
help="The title of the markdown part.",
)

position = cls._args_schema.lenses.Element.parts.Element.position
position.col_span = AAZIntArg(
options=["col-span"],
Expand Down Expand Up @@ -317,42 +264,12 @@ def content(self):

_elements = _builder.get(".properties.lenses[].parts[]")
if _elements is not None:
_elements.set_prop("metadata", AAZObjectType, ".metadata")
_elements.set_prop("metadata", AAZFreeFormDictType, ".metadata")
_elements.set_prop("position", AAZObjectType, ".position", typ_kwargs={"flags": {"required": True}})

metadata = _builder.get(".properties.lenses[].parts[].metadata")
if metadata is not None:
metadata.set_const("type", "Extension/HubsExtension/PartType/MarkdownPart", AAZStrType, ".extension_hubs_extension_part_type_markdown_part", typ_kwargs={"flags": {"required": True}})
metadata.discriminate_by("type", "Extension/HubsExtension/PartType/MarkdownPart")

disc_extension__hubs_extension__part_type__markdown_part = _builder.get(".properties.lenses[].parts[].metadata{type:Extension/HubsExtension/PartType/MarkdownPart}")
if disc_extension__hubs_extension__part_type__markdown_part is not None:
disc_extension__hubs_extension__part_type__markdown_part.set_prop("inputs", AAZListType, ".extension_hubs_extension_part_type_markdown_part.inputs")
disc_extension__hubs_extension__part_type__markdown_part.set_prop("settings", AAZObjectType, ".extension_hubs_extension_part_type_markdown_part.settings")

inputs = _builder.get(".properties.lenses[].parts[].metadata{type:Extension/HubsExtension/PartType/MarkdownPart}.inputs")
if inputs is not None:
inputs.set_elements(AAZFreeFormDictType, ".")

_elements = _builder.get(".properties.lenses[].parts[].metadata{type:Extension/HubsExtension/PartType/MarkdownPart}.inputs[]")
if _elements is not None:
_elements.set_anytype_elements(".")

settings = _builder.get(".properties.lenses[].parts[].metadata{type:Extension/HubsExtension/PartType/MarkdownPart}.settings")
if settings is not None:
settings.set_prop("content", AAZObjectType, ".content")

content = _builder.get(".properties.lenses[].parts[].metadata{type:Extension/HubsExtension/PartType/MarkdownPart}.settings.content")
if content is not None:
content.set_prop("settings", AAZObjectType, ".settings")

settings = _builder.get(".properties.lenses[].parts[].metadata{type:Extension/HubsExtension/PartType/MarkdownPart}.settings.content.settings")
if settings is not None:
settings.set_prop("content", AAZStrType, ".content")
settings.set_prop("markdownSource", AAZIntType, ".markdown_source")
settings.set_prop("markdownUri", AAZStrType, ".markdown_uri")
settings.set_prop("subtitle", AAZStrType, ".subtitle")
settings.set_prop("title", AAZStrType, ".title")
metadata.set_anytype_elements(".")

position = _builder.get(".properties.lenses[].parts[].position")
if position is not None:
Expand Down Expand Up @@ -437,40 +354,11 @@ def _build_schema_on_200_201(cls):
parts.Element = AAZObjectType()

_element = cls._schema_on_200_201.properties.lenses.Element.parts.Element
_element.metadata = AAZObjectType()
_element.metadata = AAZFreeFormDictType()
_element.position = AAZObjectType(
flags={"required": True},
)

metadata = cls._schema_on_200_201.properties.lenses.Element.parts.Element.metadata
metadata.type = AAZStrType(
flags={"required": True},
)

disc_extension__hubs_extension__part_type__markdown_part = cls._schema_on_200_201.properties.lenses.Element.parts.Element.metadata.discriminate_by("type", "Extension/HubsExtension/PartType/MarkdownPart")
disc_extension__hubs_extension__part_type__markdown_part.inputs = AAZListType()
disc_extension__hubs_extension__part_type__markdown_part.settings = AAZObjectType()

inputs = cls._schema_on_200_201.properties.lenses.Element.parts.Element.metadata.discriminate_by("type", "Extension/HubsExtension/PartType/MarkdownPart").inputs
inputs.Element = AAZFreeFormDictType()

settings = cls._schema_on_200_201.properties.lenses.Element.parts.Element.metadata.discriminate_by("type", "Extension/HubsExtension/PartType/MarkdownPart").settings
settings.content = AAZObjectType()

content = cls._schema_on_200_201.properties.lenses.Element.parts.Element.metadata.discriminate_by("type", "Extension/HubsExtension/PartType/MarkdownPart").settings.content
content.settings = AAZObjectType()

settings = cls._schema_on_200_201.properties.lenses.Element.parts.Element.metadata.discriminate_by("type", "Extension/HubsExtension/PartType/MarkdownPart").settings.content.settings
settings.content = AAZStrType()
settings.markdown_source = AAZIntType(
serialized_name="markdownSource",
)
settings.markdown_uri = AAZStrType(
serialized_name="markdownUri",
)
settings.subtitle = AAZStrType()
settings.title = AAZStrType()

position = cls._schema_on_200_201.properties.lenses.Element.parts.Element.position
position.col_span = AAZIntType(
serialized_name="colSpan",
Expand Down
1 change: 0 additions & 1 deletion src/portal/azext_portal/aaz/latest/portal/dashboard/_delete.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ def _build_arguments_schema(cls, *args, **kwargs):
required=True,
id_part="name",
fmt=AAZStrArgFormat(
pattern="^[a-zA-Z0-9-]{3,24}$",
max_length=64,
min_length=3,
),
Expand Down
62 changes: 2 additions & 60 deletions src/portal/azext_portal/aaz/latest/portal/dashboard/_list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,40 +202,11 @@ def _build_schema_on_200(cls):
parts.Element = AAZObjectType()

_element = cls._schema_on_200.value.Element.properties.lenses.Element.parts.Element
_element.metadata = AAZObjectType()
_element.metadata = AAZFreeFormDictType()
_element.position = AAZObjectType(
flags={"required": True},
)

metadata = cls._schema_on_200.value.Element.properties.lenses.Element.parts.Element.metadata
metadata.type = AAZStrType(
flags={"required": True},
)

disc_extension__hubs_extension__part_type__markdown_part = cls._schema_on_200.value.Element.properties.lenses.Element.parts.Element.metadata.discriminate_by("type", "Extension/HubsExtension/PartType/MarkdownPart")
disc_extension__hubs_extension__part_type__markdown_part.inputs = AAZListType()
disc_extension__hubs_extension__part_type__markdown_part.settings = AAZObjectType()

inputs = cls._schema_on_200.value.Element.properties.lenses.Element.parts.Element.metadata.discriminate_by("type", "Extension/HubsExtension/PartType/MarkdownPart").inputs
inputs.Element = AAZFreeFormDictType()

settings = cls._schema_on_200.value.Element.properties.lenses.Element.parts.Element.metadata.discriminate_by("type", "Extension/HubsExtension/PartType/MarkdownPart").settings
settings.content = AAZObjectType()

content = cls._schema_on_200.value.Element.properties.lenses.Element.parts.Element.metadata.discriminate_by("type", "Extension/HubsExtension/PartType/MarkdownPart").settings.content
content.settings = AAZObjectType()

settings = cls._schema_on_200.value.Element.properties.lenses.Element.parts.Element.metadata.discriminate_by("type", "Extension/HubsExtension/PartType/MarkdownPart").settings.content.settings
settings.content = AAZStrType()
settings.markdown_source = AAZIntType(
serialized_name="markdownSource",
)
settings.markdown_uri = AAZStrType(
serialized_name="markdownUri",
)
settings.subtitle = AAZStrType()
settings.title = AAZStrType()

position = cls._schema_on_200.value.Element.properties.lenses.Element.parts.Element.position
position.col_span = AAZIntType(
serialized_name="colSpan",
Expand Down Expand Up @@ -409,40 +380,11 @@ def _build_schema_on_200(cls):
parts.Element = AAZObjectType()

_element = cls._schema_on_200.value.Element.properties.lenses.Element.parts.Element
_element.metadata = AAZObjectType()
_element.metadata = AAZFreeFormDictType()
_element.position = AAZObjectType(
flags={"required": True},
)

metadata = cls._schema_on_200.value.Element.properties.lenses.Element.parts.Element.metadata
metadata.type = AAZStrType(
flags={"required": True},
)

disc_extension__hubs_extension__part_type__markdown_part = cls._schema_on_200.value.Element.properties.lenses.Element.parts.Element.metadata.discriminate_by("type", "Extension/HubsExtension/PartType/MarkdownPart")
disc_extension__hubs_extension__part_type__markdown_part.inputs = AAZListType()
disc_extension__hubs_extension__part_type__markdown_part.settings = AAZObjectType()

inputs = cls._schema_on_200.value.Element.properties.lenses.Element.parts.Element.metadata.discriminate_by("type", "Extension/HubsExtension/PartType/MarkdownPart").inputs
inputs.Element = AAZFreeFormDictType()

settings = cls._schema_on_200.value.Element.properties.lenses.Element.parts.Element.metadata.discriminate_by("type", "Extension/HubsExtension/PartType/MarkdownPart").settings
settings.content = AAZObjectType()

content = cls._schema_on_200.value.Element.properties.lenses.Element.parts.Element.metadata.discriminate_by("type", "Extension/HubsExtension/PartType/MarkdownPart").settings.content
content.settings = AAZObjectType()

settings = cls._schema_on_200.value.Element.properties.lenses.Element.parts.Element.metadata.discriminate_by("type", "Extension/HubsExtension/PartType/MarkdownPart").settings.content.settings
settings.content = AAZStrType()
settings.markdown_source = AAZIntType(
serialized_name="markdownSource",
)
settings.markdown_uri = AAZStrType(
serialized_name="markdownUri",
)
settings.subtitle = AAZStrType()
settings.title = AAZStrType()

position = cls._schema_on_200.value.Element.properties.lenses.Element.parts.Element.position
position.col_span = AAZIntType(
serialized_name="colSpan",
Expand Down
32 changes: 1 addition & 31 deletions src/portal/azext_portal/aaz/latest/portal/dashboard/_show.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ def _build_arguments_schema(cls, *args, **kwargs):
required=True,
id_part="name",
fmt=AAZStrArgFormat(
pattern="^[a-zA-Z0-9-]{3,24}$",
max_length=64,
min_length=3,
),
Expand Down Expand Up @@ -201,40 +200,11 @@ def _build_schema_on_200(cls):
parts.Element = AAZObjectType()

_element = cls._schema_on_200.properties.lenses.Element.parts.Element
_element.metadata = AAZObjectType()
_element.metadata = AAZFreeFormDictType()
_element.position = AAZObjectType(
flags={"required": True},
)

metadata = cls._schema_on_200.properties.lenses.Element.parts.Element.metadata
metadata.type = AAZStrType(
flags={"required": True},
)

disc_extension__hubs_extension__part_type__markdown_part = cls._schema_on_200.properties.lenses.Element.parts.Element.metadata.discriminate_by("type", "Extension/HubsExtension/PartType/MarkdownPart")
disc_extension__hubs_extension__part_type__markdown_part.inputs = AAZListType()
disc_extension__hubs_extension__part_type__markdown_part.settings = AAZObjectType()

inputs = cls._schema_on_200.properties.lenses.Element.parts.Element.metadata.discriminate_by("type", "Extension/HubsExtension/PartType/MarkdownPart").inputs
inputs.Element = AAZFreeFormDictType()

settings = cls._schema_on_200.properties.lenses.Element.parts.Element.metadata.discriminate_by("type", "Extension/HubsExtension/PartType/MarkdownPart").settings
settings.content = AAZObjectType()

content = cls._schema_on_200.properties.lenses.Element.parts.Element.metadata.discriminate_by("type", "Extension/HubsExtension/PartType/MarkdownPart").settings.content
content.settings = AAZObjectType()

settings = cls._schema_on_200.properties.lenses.Element.parts.Element.metadata.discriminate_by("type", "Extension/HubsExtension/PartType/MarkdownPart").settings.content.settings
settings.content = AAZStrType()
settings.markdown_source = AAZIntType(
serialized_name="markdownSource",
)
settings.markdown_uri = AAZStrType(
serialized_name="markdownUri",
)
settings.subtitle = AAZStrType()
settings.title = AAZStrType()

position = cls._schema_on_200.properties.lenses.Element.parts.Element.position
position.col_span = AAZIntType(
serialized_name="colSpan",
Expand Down
Loading
Loading