Skip to content
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

HCK-6361: Min and Max Properties fields should only be available for types Map and Object #105

Merged
merged 4 commits into from
Jun 10, 2024
Merged

HCK-6361: Min and Max Properties fields should only be available for types Map and Object #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
408f87d
HCK-6361: fix field level config
Nightlngale Jun 6, 2024
6704b04
HCK-6361: fix typo in localization
Nightlngale Jun 7, 2024
79fbe30
HCK-6361: handle jsonArray case
Nightlngale Jun 10, 2024
cfac368
Merge branch 'develop' into HCK-6361
Nightlngale Jun 10, 2024
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
2 changes: 1 addition & 1 deletion localization/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"TOOLBAR___ADD_ATTRIBUTE": "Add Column",
"TOOLBAR___INSERT_FIELD": "Insert Column",
"TOOLBAR___APPEND_FIELD": "Append Column",
"TOOLBAR___TOGGLE_FIELD_DETAILS": "Toogle field details",
"TOOLBAR___TOGGLE_FIELD_DETAILS": "Toggle field details",
"TOOLBAR___SHOW_FOREIGN_MASTER": "Toggle foreign master",
"TOOLBAR___SHOW_MODEL_VIEW": "Toggle model views",
"TOOLBAR___DISTRIBUTE_ORTHOGONALLY": "Distribute tables orthogonally",
Expand Down
22 changes: 22 additions & 0 deletions polyglot/adapter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,5 +126,27 @@
}
}
]
},
"postConvert": {
"modify": {
"field": [
{
"from": {
"type": "jsonObject"
Nightlngale marked this conversation as resolved.
Show resolved Hide resolved
},
"to": {
"subtype": "object"
}
},
{
"from": {
"type": "jsonArray"
},
"to": {
"subtype": "array"
}
}
]
}
}
}
18 changes: 18 additions & 0 deletions properties_pane/field_level/fieldLevelConfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5425,6 +5425,24 @@ making sure that you maintain a proper JSON format.
"propertyType": "details",
"template": "textarea"
},
{
"propertyName": "Min Properties",
"propertyKeyword": "minProperties",
"propertyType": "numeric",
"dependency": {
"key": "subtype",
"value": "object"
}
},
{
"propertyName": "Max Properties",
"propertyKeyword": "maxProperties",
"propertyType": "numeric",
"dependency": {
"key": "subtype",
"value": "object"
}
},
{
"propertyName": "Array type",
"propertyType": "group",
Expand Down
2 changes: 0 additions & 2 deletions types/geometry.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
"foreignCollection": "",
"foreignField": [],
"dependencies": [],
"minProperties": "",
"maxProperties": "",
"additionalProperties": false,
"enum": []
},
Expand Down