-
Notifications
You must be signed in to change notification settings - Fork 57
feat(print-properties): Adding dorContainer
in each component and pageTemplate
in FormContainer and new print specific components
#1567
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.
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
base: dev
Are you sure you want to change the base?
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## dev #1567 +/- ##
============================================
- Coverage 82.32% 82.22% -0.11%
- Complexity 1000 1008 +8
============================================
Files 108 108
Lines 2603 2633 +30
Branches 370 377 +7
============================================
+ Hits 2143 2165 +22
- Misses 272 278 +6
- Partials 188 190 +2 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
dorContainer
in each component and pageTemplate
in FormContainer and new print specific componentsdorContainer
in each component and pageTemplate
in FormContainer and new print specific components
dorContainer
in each component and pageTemplate
in FormContainer and new print specific componentsdorContainer
in each component and pageTemplate
in FormContainer and new print specific components
Lighthouse scores (desktop)
|
Lighthouse scores (mobile)
|
Accessibility Violations Found
|
Accessibility Violations Found
|
1 similar comment
Accessibility Violations Found
|
Lighthouse scores (mobile)
|
Lighthouse scores (desktop)
|
Accessibility Violations Found
|
Accessibility Violations Found
|
1 similar comment
Accessibility Violations Found
|
@@ -0,0 +1,21 @@ | |||
/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add these interfaces in a different package inside form
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
Lighthouse scores (desktop)
|
Lighthouse scores (mobile)
|
Accessibility Violations Found
|
1 similar comment
Accessibility Violations Found
|
Accessibility Violations Found
|
@JsonIgnore | ||
public Map<String, Object> getDorContainer() { | ||
if (resource != null) { | ||
Resource dorContainerResource = resource.getChild("fd:dorContainer"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@rismehta : Here I am assuming dorContainer
node will be named as fd:dorContainer
in JCR, keeping it in consistency with fd:rules
and 'fd:events
. I hope it is okay.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
take this in spec review meeting
return customDorProperties; | ||
} | ||
|
||
private Map<String, Object> getPageTemplate() { | ||
if (resource != null) { | ||
Resource pageTemplateResource = resource.getChild("fd:pagetemplate"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@rismehta : pageTemplate
node is assumed to be persisted with name fd:pageTemplate
. I hope it is fine.
@@ -126,14 +128,14 @@ public static void testSchemaValidation(@NotNull Object model) { | |||
// create an instance of the JsonSchemaFactory using version flag | |||
JsonSchemaFactory schemaFactory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V7); | |||
try { | |||
InputStream schemaStream = Utils.class.getResourceAsStream("/schema/0.14.2/adaptive-form.schema.json"); | |||
InputStream schemaStream = Utils.class.getResourceAsStream("/schema/0.15.1/adaptive-form.schema.json"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@rismehta : Have added new schema files versioned 0.15.1. Also, have updated version number here in schema validation. Please let me know if anything else needs to be done w.r.t. new schema
@@ -52,6 +52,6 @@ | |||
"grammar": "json-formula-1.0.0", | |||
"version": "1.0.0" | |||
}, | |||
"adaptiveform": "0.14.2", | |||
"adaptiveform": "0.15.1", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@rismehta :
Updating version number here in test baseline files is breaking a PR check. What is the right way to update this files?
Lighthouse scores (mobile)
|
Lighthouse scores (desktop)
|
…ot in separate PrintContainer
…ormComponent inetrface
0f90aa9
to
e6fcb2b
Compare
Accessibility Violations Found
|
1 similar comment
Accessibility Violations Found
|
I have one doubt regarding the dorContainer. I thought the dorContainer properties will come with different View (not author/publish) ? I do not see that change here ? |
I have added I took the inspiration from getDorProperties method: https://github.com/adobe/aem-core-forms-components/pull/1567/files#diff-83ed79b144226c70d6b93ceaa9b25d5d243edacab1730e932f106c5e02a2df0cL73 |
Sorry. Missed that. Looks okay to me. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. Ensure
- the tests pass before merging
- use squash and merge rather than adding these 571 commits to the repo.
Accessibility Violations Found
|
1 similar comment
Accessibility Violations Found
|
Description
pageTemplate
in FormContainer to describe master page related properties for DoR.dorContainer
in each Component to describe print related properties for DoR.Related Issue
Motivation and Context
It will enable the support for print related properties in CRISPR json(mainly layout and style related properties).
How Has This Been Tested?
UTs have been added.
Screenshots (if appropriate):
Types of changes
Checklist: