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.

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

Merge main #532

Merged
merged 9 commits into from
Jul 20, 2022
Merged

Merge main #532

merged 9 commits into from
Jul 20, 2022

Conversation

hein-j
Copy link
Contributor

@hein-j hein-j commented Jul 19, 2022

Description of changes:

  1. Merge down main, resolving merge conflicts
  2. Update functional test for SliderField, which is broken due to update in ui-react

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

SwaySway and others added 8 commits July 14, 2022 12:58
…queries (#519)

* chore: add form-related types (#469)

Co-authored-by: Hein Jeong <heinje@amazon.com>

* chore: add form definition mapper (#470)

Co-authored-by: Hein Jeong <heinje@amazon.com>

* test: update cypress setup (#472)

* chore: update cli setup flow and update react peerDep (#473)

* feat: adding string format types in lib

* feat: add base form to component mapper with updated datastore types

* chore: audit fix and peerDep of datastore

* chore: update deps in lock files

* feat: add base form renderer and amplify form renderer classes

* chore: update form definition mapper (#489)

Co-authored-by: Hein Jeong <heinje@amazon.com>

* feat: string formatter util functions

* feat: view types and string formatting on view config

* fix: optional enum type and nullish handling

* chore: map input and sectional form elements (#493)

Co-authored-by: Hein Jeong <heinje@amazon.com>

* feat: adding types for Slot

* fix: rename Slot to Amplify.Slot

* chore: add util to map datastore schema to generic (#498)

Co-authored-by: Hein Jeong <heinje@amazon.com>

* feat: support slot binding (#499)

Co-authored-by: Hein Jeong <heinje@amazon.com>

* chore: skip field generation for read-only fields (#501)

* chore: skip field generation for read-only fields

* chore: skip field generation for read-only fields

* chore: skip field generation for read-only fields

* chore: skip field generation for read-only fields

* chore: skip field generation for read-only fields

Co-authored-by: Scott Young <scoyou@amazon.com>

* chore: add validation field types for forms (#502)

Co-authored-by: Justin Shih <jushih@amazon.com>

* feat: expand return type of overrideItems (#504)

* chore: clean up form definition mapper (#508)

Co-authored-by: Hein Jeong <heinje@amazon.com>

* chore: add form field validation function and additional validation types (#507)

Co-authored-by: Justin Shih <jushih@amazon.com>

* chore: rev recommended version of ui-react (#513)

Co-authored-by: Hein Jeong <heinje@amazon.com>

* feat: add nested query if data schema is passed down

* chore/main merge (#516)

* chore(release): update package with security issue

* fix: handle auth prop in concat

* chore(release): security issues in dependencies

Co-authored-by: Kevin Pranoto <kpranoto@amazon.com>

* chore: update mocked to use jest.mocked

Co-authored-by: Hein Jeong <73264629+hein-j@users.noreply.github.com>
Co-authored-by: Hein Jeong <heinje@amazon.com>
Co-authored-by: Kevin Pranoto <kpranoto@amazon.com>
Co-authored-by: Scott Young <scott1337@hotmail.com>
Co-authored-by: Scott Young <scoyou@amazon.com>
Co-authored-by: Justin Shih <36183898+Jshhhh@users.noreply.github.com>
Co-authored-by: Justin Shih <jushih@amazon.com>
Co-authored-by: Hein Jeong <heinje@amazon.com>
Co-authored-by: Hein Jeong <heinje@amazon.com>
Co-authored-by: Hein Jeong <heinje@amazon.com>
@hein-j hein-j requested a review from a team as a code owner July 19, 2022 23:59
@codecov-commenter
Copy link

codecov-commenter commented Jul 20, 2022

Codecov Report

Merging #532 (d9a9e06) into tagged-release/forms-and-views (6a8dea1) will increase coverage by 0.83%.
The diff coverage is 76.84%.

Impacted file tree graph

@@                        Coverage Diff                         @@
##           tagged-release/forms-and-views     #532      +/-   ##
==================================================================
+ Coverage                           88.62%   89.46%   +0.83%     
==================================================================
  Files                                  68       73       +5     
  Lines                                2489     2676     +187     
  Branches                              672      749      +77     
==================================================================
+ Hits                                 2206     2394     +188     
+ Misses                                279      270       -9     
- Partials                                4       12       +8     
Impacted Files Coverage Δ
...ui-react/lib/react-required-dependency-provider.ts 100.00% <ø> (ø)
...nerate-form-definition/generate-form-definition.ts 100.00% <ø> (ø)
...ackages/codegen-ui/lib/utils/component-metadata.ts 81.31% <ø> (ø)
.../lib/generate-form-definition/form-to-component.ts 24.13% <25.00%> (-57.35%) ⬇️
...es/codegen-ui/lib/utils/form-component-metadata.ts 25.00% <25.00%> (ø)
.../codegen-ui-react/lib/forms/react-form-renderer.ts 75.55% <75.55%> (ø)
...-react/lib/react-theme-studio-template-renderer.ts 90.14% <94.73%> (+1.67%) ⬆️
.../lib/amplify-ui-renderers/amplify-form-renderer.ts 19.26% <100.00%> (+19.26%) ⬆️
.../codegen-ui-react/lib/amplify-ui-renderers/form.ts 96.42% <100.00%> (+96.42%) ⬆️
...codegen-ui-react/lib/forms/form-renderer-helper.ts 100.00% <100.00%> (ø)
... and 24 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update dd3495f...d9a9e06. Read the comment docs.

Copy link
Contributor

@Jshhhh Jshhhh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@hein-j hein-j merged commit c5f45dc into tagged-release/forms-and-views Jul 20, 2022
@hein-j hein-j deleted the merge-main branch July 20, 2022 18:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants