From d1d67df497f902bdc191b3b9134e12d8f95cbf02 Mon Sep 17 00:00:00 2001 From: wildone Date: Mon, 15 Jul 2024 23:42:12 +1000 Subject: [PATCH] update dialogs to add missing tabs. --- .../components/dialog/tabs/aria/.content.json | 18 +++++++++++++++++ .../forms/checkbox/dialog/.content.json | 4 ++++ .../forms/composite/dialog/.content.json | 4 ++++ .../forms/fields/button/dialog/.content.json | 4 ++++ .../fields/checkbox/dialog/.content.json | 16 +++++++++++++++ .../fields/composite/dialog/.content.json | 4 ++++ .../fields/fileupload/dialog/.content.json | 12 +++++++++-- .../forms/fields/input/dialog/.content.json | 4 ++++ .../forms/fields/radio/dialog/.content.json | 16 +++++++++++++++ .../forms/fields/select/dialog/.content.json | 20 ++++++++----------- .../fields/textarea/dialog/.content.json | 20 +++++++++---------- .../forms/fileupload/dialog/.content.json | 4 ++++ .../forms/form/dialog/.content.json | 4 ++++ .../forms/input/dialog/.content.json | 4 ++++ .../forms/radio/dialog/.content.json | 4 ++++ .../forms/select/dialog/.content.json | 4 ++++ .../forms/textarea/dialog/.content.json | 4 ++++ .../stix/forms/fields/composite/.content.json | 2 +- .../stix/forms/fields/input/.content.json | 3 ++- .../stix/forms/fields/select/.content.json | 2 +- 20 files changed, 126 insertions(+), 27 deletions(-) diff --git a/application/backend/src/main/resources/apps/typerefinery/components/dialog/tabs/aria/.content.json b/application/backend/src/main/resources/apps/typerefinery/components/dialog/tabs/aria/.content.json index e8375d396..074d0cf34 100644 --- a/application/backend/src/main/resources/apps/typerefinery/components/dialog/tabs/aria/.content.json +++ b/application/backend/src/main/resources/apps/typerefinery/components/dialog/tabs/aria/.content.json @@ -1,6 +1,24 @@ { "sling:resourceType": "wcm/dialogs/components/tab", "label": "Aria", + "warning": { + "sling:resourceType": "typerefinery/components/dialog/label", + "ws:disallowedContext": ["edit:dialog"], + "appearance": "error", + "iconLabel": "Open Dialog", + "title": "Some fields are not editable in side-panel.", + "secondaryText": "", + "placement": "bottom-start" + }, + "info": { + "sling:resourceType": "typerefinery/components/dialog/label", + "ws:disallowedContext": ["edit:panel"], + "appearance": "info", + "iconLabel": "Info", + "title": "Add relevant Aria Attributes as required", + "secondaryText": "", + "placement": "bottom-start" + }, "roleOther": { "sling:resourceType": "wcm/dialogs/components/textfield", "name": "roleOther", diff --git a/application/backend/src/main/resources/apps/typerefinery/components/forms/checkbox/dialog/.content.json b/application/backend/src/main/resources/apps/typerefinery/components/forms/checkbox/dialog/.content.json index 27c484a99..1b939b2ca 100644 --- a/application/backend/src/main/resources/apps/typerefinery/components/forms/checkbox/dialog/.content.json +++ b/application/backend/src/main/resources/apps/typerefinery/components/forms/checkbox/dialog/.content.json @@ -9,6 +9,10 @@ "alignmentTab": { "sling:resourceType": "wcm/dialogs/components/include", "path": "/apps/typerefinery/components/dialog/tabs/alignment" + }, + "styleTab": { + "sling:resourceType": "wcm/dialogs/components/include", + "path": "/apps/typerefinery/components/dialog/tabs/style" } } } diff --git a/application/backend/src/main/resources/apps/typerefinery/components/forms/composite/dialog/.content.json b/application/backend/src/main/resources/apps/typerefinery/components/forms/composite/dialog/.content.json index 27c484a99..1b939b2ca 100644 --- a/application/backend/src/main/resources/apps/typerefinery/components/forms/composite/dialog/.content.json +++ b/application/backend/src/main/resources/apps/typerefinery/components/forms/composite/dialog/.content.json @@ -9,6 +9,10 @@ "alignmentTab": { "sling:resourceType": "wcm/dialogs/components/include", "path": "/apps/typerefinery/components/dialog/tabs/alignment" + }, + "styleTab": { + "sling:resourceType": "wcm/dialogs/components/include", + "path": "/apps/typerefinery/components/dialog/tabs/style" } } } diff --git a/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/button/dialog/.content.json b/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/button/dialog/.content.json index d5e4e2db9..2b06ddd8f 100644 --- a/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/button/dialog/.content.json +++ b/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/button/dialog/.content.json @@ -423,6 +423,10 @@ "gridTab": { "sling:resourceType": "wcm/dialogs/components/include", "path": "/apps/typerefinery/components/dialog/tabs/grid" + }, + "ariaTab": { + "sling:resourceType": "wcm/dialogs/components/include", + "path": "/apps/typerefinery/components/dialog/tabs/aria" } } } diff --git a/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/checkbox/dialog/.content.json b/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/checkbox/dialog/.content.json index 37c817d5e..7837ff49d 100644 --- a/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/checkbox/dialog/.content.json +++ b/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/checkbox/dialog/.content.json @@ -13,6 +13,22 @@ "sling:resourceType": "wcm/dialogs/components/include", "path": "/apps/typerefinery/components/forms/form/common/fieldValue" } + }, + "validationTab": { + "sling:resourceType": "wcm/dialogs/components/include", + "path": "/apps/typerefinery/components/dialog/tabs/validation" + }, + "gridTab": { + "sling:resourceType": "wcm/dialogs/components/include", + "path": "/apps/typerefinery/components/dialog/tabs/grid" + }, + "styleTab": { + "sling:resourceType": "wcm/dialogs/components/include", + "path": "/apps/typerefinery/components/dialog/tabs/style" + }, + "ariaTab": { + "sling:resourceType": "wcm/dialogs/components/include", + "path": "/apps/typerefinery/components/dialog/tabs/aria" } } } diff --git a/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/composite/dialog/.content.json b/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/composite/dialog/.content.json index 26f811f89..2c3ccaff9 100644 --- a/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/composite/dialog/.content.json +++ b/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/composite/dialog/.content.json @@ -103,6 +103,10 @@ "styleTab": { "sling:resourceType": "wcm/dialogs/components/include", "path": "/apps/typerefinery/components/dialog/tabs/style" + }, + "ariaTab": { + "sling:resourceType": "wcm/dialogs/components/include", + "path": "/apps/typerefinery/components/dialog/tabs/aria" } } } diff --git a/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/fileupload/dialog/.content.json b/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/fileupload/dialog/.content.json index e7676134b..ba8934611 100644 --- a/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/fileupload/dialog/.content.json +++ b/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/fileupload/dialog/.content.json @@ -22,13 +22,21 @@ "description": "Allow multiple file upload" } }, - "styleTab": { + "validationTab": { "sling:resourceType": "wcm/dialogs/components/include", - "path": "/apps/typerefinery/components/dialog/tabs/style" + "path": "/apps/typerefinery/components/dialog/tabs/validation" }, "gridTab": { "sling:resourceType": "wcm/dialogs/components/include", "path": "/apps/typerefinery/components/dialog/tabs/grid" + }, + "styleTab": { + "sling:resourceType": "wcm/dialogs/components/include", + "path": "/apps/typerefinery/components/dialog/tabs/style" + }, + "ariaTab": { + "sling:resourceType": "wcm/dialogs/components/include", + "path": "/apps/typerefinery/components/dialog/tabs/aria" } } } \ No newline at end of file diff --git a/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/input/dialog/.content.json b/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/input/dialog/.content.json index efa7ace67..4be70f277 100644 --- a/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/input/dialog/.content.json +++ b/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/input/dialog/.content.json @@ -79,6 +79,10 @@ "styleTab": { "sling:resourceType": "wcm/dialogs/components/include", "path": "/apps/typerefinery/components/dialog/tabs/style" + }, + "ariaTab": { + "sling:resourceType": "wcm/dialogs/components/include", + "path": "/apps/typerefinery/components/dialog/tabs/aria" } } } \ No newline at end of file diff --git a/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/radio/dialog/.content.json b/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/radio/dialog/.content.json index 37c817d5e..7837ff49d 100644 --- a/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/radio/dialog/.content.json +++ b/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/radio/dialog/.content.json @@ -13,6 +13,22 @@ "sling:resourceType": "wcm/dialogs/components/include", "path": "/apps/typerefinery/components/forms/form/common/fieldValue" } + }, + "validationTab": { + "sling:resourceType": "wcm/dialogs/components/include", + "path": "/apps/typerefinery/components/dialog/tabs/validation" + }, + "gridTab": { + "sling:resourceType": "wcm/dialogs/components/include", + "path": "/apps/typerefinery/components/dialog/tabs/grid" + }, + "styleTab": { + "sling:resourceType": "wcm/dialogs/components/include", + "path": "/apps/typerefinery/components/dialog/tabs/style" + }, + "ariaTab": { + "sling:resourceType": "wcm/dialogs/components/include", + "path": "/apps/typerefinery/components/dialog/tabs/aria" } } } diff --git a/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/select/dialog/.content.json b/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/select/dialog/.content.json index e784fdc5d..e80d06323 100644 --- a/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/select/dialog/.content.json +++ b/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/select/dialog/.content.json @@ -42,18 +42,6 @@ } }, - "validationTab": { - "sling:resourceType": "wcm/dialogs/components/tab", - "label": "Validation", - "validationRequired": { - "sling:resourceType": "wcm/dialogs/components/include", - "path": "/apps/typerefinery/components/dialog/tabs/validation/validationRequired" - }, - "disabled": { - "sling:resourceType": "wcm/dialogs/components/include", - "path": "/apps/typerefinery/components/dialog/tabs/validation/disabled" - } - }, "optionsTab": { "sling:resourceType": "wcm/dialogs/components/tab", "label": "Options", @@ -100,6 +88,10 @@ "description": "Comma separated list of values to be selected by default" } }, + "validationTab": { + "sling:resourceType": "wcm/dialogs/components/include", + "path": "/apps/typerefinery/components/dialog/tabs/validation" + }, "gridTab": { "sling:resourceType": "wcm/dialogs/components/include", "path": "/apps/typerefinery/components/dialog/tabs/grid" @@ -107,6 +99,10 @@ "styleTab": { "sling:resourceType": "wcm/dialogs/components/include", "path": "/apps/typerefinery/components/dialog/tabs/style" + }, + "ariaTab": { + "sling:resourceType": "wcm/dialogs/components/include", + "path": "/apps/typerefinery/components/dialog/tabs/aria" } } } diff --git a/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/textarea/dialog/.content.json b/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/textarea/dialog/.content.json index 56cfdd597..52446021c 100644 --- a/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/textarea/dialog/.content.json +++ b/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/textarea/dialog/.content.json @@ -29,20 +29,20 @@ } }, "validationTab": { - "sling:resourceType": "wcm/dialogs/components/tab", - "label": "Validation", - "validationRequired": { - "sling:resourceType": "wcm/dialogs/components/include", - "path": "/apps/typerefinery/components/dialog/tabs/validation/validationRequired" - }, - "disabled": { - "sling:resourceType": "wcm/dialogs/components/include", - "path": "/apps/typerefinery/components/dialog/tabs/validation/disabled" - } + "sling:resourceType": "wcm/dialogs/components/include", + "path": "/apps/typerefinery/components/dialog/tabs/validation" }, "gridTab": { "sling:resourceType": "wcm/dialogs/components/include", "path": "/apps/typerefinery/components/dialog/tabs/grid" + }, + "styleTab": { + "sling:resourceType": "wcm/dialogs/components/include", + "path": "/apps/typerefinery/components/dialog/tabs/style" + }, + "ariaTab": { + "sling:resourceType": "wcm/dialogs/components/include", + "path": "/apps/typerefinery/components/dialog/tabs/aria" } } } \ No newline at end of file diff --git a/application/backend/src/main/resources/apps/typerefinery/components/forms/fileupload/dialog/.content.json b/application/backend/src/main/resources/apps/typerefinery/components/forms/fileupload/dialog/.content.json index 3e3b8c380..63454b799 100644 --- a/application/backend/src/main/resources/apps/typerefinery/components/forms/fileupload/dialog/.content.json +++ b/application/backend/src/main/resources/apps/typerefinery/components/forms/fileupload/dialog/.content.json @@ -15,6 +15,10 @@ "label": "Arrange children in same line", "description": "Components arranged in Horizontal Direction" } + }, + "styleTab": { + "sling:resourceType": "wcm/dialogs/components/include", + "path": "/apps/typerefinery/components/dialog/tabs/style" } } } \ No newline at end of file diff --git a/application/backend/src/main/resources/apps/typerefinery/components/forms/form/dialog/.content.json b/application/backend/src/main/resources/apps/typerefinery/components/forms/form/dialog/.content.json index e6cc5adf7..110e4905e 100644 --- a/application/backend/src/main/resources/apps/typerefinery/components/forms/form/dialog/.content.json +++ b/application/backend/src/main/resources/apps/typerefinery/components/forms/form/dialog/.content.json @@ -70,6 +70,10 @@ "sling:resourceType": "wcm/dialogs/components/include", "path": "/apps/typerefinery/components/dialog/tabs/alignment" }, + "ariaTab": { + "sling:resourceType": "wcm/dialogs/components/include", + "path": "/apps/typerefinery/components/dialog/tabs/aria" + }, "writeTab": { "sling:resourceType": "wcm/dialogs/components/tab", "label": "Write", diff --git a/application/backend/src/main/resources/apps/typerefinery/components/forms/input/dialog/.content.json b/application/backend/src/main/resources/apps/typerefinery/components/forms/input/dialog/.content.json index 3e3b8c380..63454b799 100644 --- a/application/backend/src/main/resources/apps/typerefinery/components/forms/input/dialog/.content.json +++ b/application/backend/src/main/resources/apps/typerefinery/components/forms/input/dialog/.content.json @@ -15,6 +15,10 @@ "label": "Arrange children in same line", "description": "Components arranged in Horizontal Direction" } + }, + "styleTab": { + "sling:resourceType": "wcm/dialogs/components/include", + "path": "/apps/typerefinery/components/dialog/tabs/style" } } } \ No newline at end of file diff --git a/application/backend/src/main/resources/apps/typerefinery/components/forms/radio/dialog/.content.json b/application/backend/src/main/resources/apps/typerefinery/components/forms/radio/dialog/.content.json index 27c484a99..1b939b2ca 100644 --- a/application/backend/src/main/resources/apps/typerefinery/components/forms/radio/dialog/.content.json +++ b/application/backend/src/main/resources/apps/typerefinery/components/forms/radio/dialog/.content.json @@ -9,6 +9,10 @@ "alignmentTab": { "sling:resourceType": "wcm/dialogs/components/include", "path": "/apps/typerefinery/components/dialog/tabs/alignment" + }, + "styleTab": { + "sling:resourceType": "wcm/dialogs/components/include", + "path": "/apps/typerefinery/components/dialog/tabs/style" } } } diff --git a/application/backend/src/main/resources/apps/typerefinery/components/forms/select/dialog/.content.json b/application/backend/src/main/resources/apps/typerefinery/components/forms/select/dialog/.content.json index 27c484a99..1b939b2ca 100644 --- a/application/backend/src/main/resources/apps/typerefinery/components/forms/select/dialog/.content.json +++ b/application/backend/src/main/resources/apps/typerefinery/components/forms/select/dialog/.content.json @@ -9,6 +9,10 @@ "alignmentTab": { "sling:resourceType": "wcm/dialogs/components/include", "path": "/apps/typerefinery/components/dialog/tabs/alignment" + }, + "styleTab": { + "sling:resourceType": "wcm/dialogs/components/include", + "path": "/apps/typerefinery/components/dialog/tabs/style" } } } diff --git a/application/backend/src/main/resources/apps/typerefinery/components/forms/textarea/dialog/.content.json b/application/backend/src/main/resources/apps/typerefinery/components/forms/textarea/dialog/.content.json index 27c484a99..1b939b2ca 100644 --- a/application/backend/src/main/resources/apps/typerefinery/components/forms/textarea/dialog/.content.json +++ b/application/backend/src/main/resources/apps/typerefinery/components/forms/textarea/dialog/.content.json @@ -9,6 +9,10 @@ "alignmentTab": { "sling:resourceType": "wcm/dialogs/components/include", "path": "/apps/typerefinery/components/dialog/tabs/alignment" + }, + "styleTab": { + "sling:resourceType": "wcm/dialogs/components/include", + "path": "/apps/typerefinery/components/dialog/tabs/style" } } } diff --git a/application/backend/src/main/resources/apps/typerefinery/components/stix/forms/fields/composite/.content.json b/application/backend/src/main/resources/apps/typerefinery/components/stix/forms/fields/composite/.content.json index 7d130996e..9f6e429bc 100644 --- a/application/backend/src/main/resources/apps/typerefinery/components/stix/forms/fields/composite/.content.json +++ b/application/backend/src/main/resources/apps/typerefinery/components/stix/forms/fields/composite/.content.json @@ -3,5 +3,5 @@ "group": ".hidden", "sling:resourceType": "ws:Component", "description": "This is Composite field returning JSON of its values", - "title": "Composite" + "title": "Composite Stix" } diff --git a/application/backend/src/main/resources/apps/typerefinery/components/stix/forms/fields/input/.content.json b/application/backend/src/main/resources/apps/typerefinery/components/stix/forms/fields/input/.content.json index 004bac991..05b6513e4 100644 --- a/application/backend/src/main/resources/apps/typerefinery/components/stix/forms/fields/input/.content.json +++ b/application/backend/src/main/resources/apps/typerefinery/components/stix/forms/fields/input/.content.json @@ -2,5 +2,6 @@ "group": ".hidden", "sling:resourceType": "ws:Component", "description": "Basic form input field.", - "title": "Input" + "title": "Input Stix", + "sling:resourceSuperType": "typerefinery/components/forms/fields/input" } diff --git a/application/backend/src/main/resources/apps/typerefinery/components/stix/forms/fields/select/.content.json b/application/backend/src/main/resources/apps/typerefinery/components/stix/forms/fields/select/.content.json index 5407710bc..714177102 100644 --- a/application/backend/src/main/resources/apps/typerefinery/components/stix/forms/fields/select/.content.json +++ b/application/backend/src/main/resources/apps/typerefinery/components/stix/forms/fields/select/.content.json @@ -2,5 +2,5 @@ "group": ".hidden", "sling:resourceType": "ws:Component", "description": "This is Select component for Typerefinery", - "title": "Select" + "title": "Select Stix" }