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

Update from main #1025

Merged
merged 10 commits into from
Jun 19, 2023
Merged

Update from main #1025

merged 10 commits into from
Jun 19, 2023

Conversation

awinberg-aws
Copy link
Contributor

Problem

GraphQL tagged release branch is out of date compared to main and some PR checks are failing.

Solution

merge from main to pick up upstream fixes.

Additional Notes

Links

Ticket

GitHub issue _____

Other links

Verification

Manual tests

Automated tests

  • Unit tests added/updated
  • E2E tests added/updated
  • N/A - branch merge only, no functional changes being made
  • deferred - (provide GitHub issue for tracking)

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

Jshhhh and others added 8 commits May 19, 2023 10:00
Co-authored-by: Justin Shih <jushih@amazon.com>
Co-authored-by: Justin Shih <jushih@amazon.com>
Co-authored-by: Justin Shih <jushih@amazon.com>
Co-authored-by: Justin Shih <jushih@amazon.com>
* fix: add getOverrideProps to StorageManager

* fix: add overrideProps to Field component

* Revert "fix: add overrideProps to Field component"

This reverts commit 6393718.
Co-authored-by: Doesnt Matter <not@used.com>
Co-authored-by: Justin Shih <jushih@amazon.com>
@codecov-commenter
Copy link

Codecov Report

Merging #1025 (ffd54ec) into tagged-release/graphql-support (5315dc4) will increase coverage by 0.01%.
The diff coverage is 100.00%.

❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more.

Impacted file tree graph

@@                        Coverage Diff                         @@
##           tagged-release/graphql-support    #1025      +/-   ##
==================================================================
+ Coverage                           93.65%   93.67%   +0.01%     
==================================================================
  Files                                 123      123              
  Lines                                5564     5581      +17     
  Branches                             1670     1676       +6     
==================================================================
+ Hits                                 5211     5228      +17     
  Misses                                333      333              
  Partials                               20       20              
Impacted Files Coverage Δ
...-react/lib/react-theme-studio-template-renderer.ts 90.90% <ø> (ø)
...act/lib/forms/form-renderer-helper/relationship.ts 88.38% <100.00%> (+0.15%) ⬆️
...eact/lib/forms/form-renderer-helper/type-helper.ts 99.15% <100.00%> (+0.02%) ⬆️
...egen-ui-react/lib/react-component-render-helper.ts 91.87% <100.00%> (+0.18%) ⬆️
...s/codegen-ui-react/lib/react-component-renderer.ts 100.00% <100.00%> (ø)
...gen-ui-react/lib/react-studio-template-renderer.ts 92.01% <100.00%> (+0.01%) ⬆️
...i-react/lib/utils/forms/storage-field-component.ts 96.61% <100.00%> (+0.05%) ⬆️

Continue to review full report in Codecov by Sentry.

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

@awinberg-aws awinberg-aws marked this pull request as ready for review June 19, 2023 16:46
@awinberg-aws awinberg-aws requested a review from a team as a code owner June 19, 2023 16:46
@bombguy bombguy merged commit 5a47a95 into tagged-release/graphql-support Jun 19, 2023
@bombguy bombguy deleted the update-from-main branch June 19, 2023 17:36
letsbelopez added a commit that referenced this pull request Jul 19, 2023
* fix: parse operand value when field is number type (#1013)

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

* chore(release): v2.14.0 (#1014)

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

* fix: fix storage field prop import to storagemanager (#1016)

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

* chore(release): v2.14.1 (#1017)

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

* fix: add getOverrideProps to StorageManager (#1020)

* fix: add getOverrideProps to StorageManager

* fix: add overrideProps to Field component

* Revert "fix: add overrideProps to Field component"

This reverts commit 6393718.

* chore(release): v2.14.2 (#1022)

* fix: return theme declaration file from render func (#1023)

Co-authored-by: Doesnt Matter <not@used.com>

* fix: alias colliding imported model name in hasMany relationship (#1019)

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

* chore: update cli check

---------

Co-authored-by: Justin Shih <36183898+Jshhhh@users.noreply.github.com>
Co-authored-by: Justin Shih <jushih@amazon.com>
Co-authored-by: Charles Shin <charlshi@amazon.com>
Co-authored-by: David Lopez <letsbelopez@gmail.com>
Co-authored-by: Doesnt Matter <not@used.com>
Co-authored-by: Roshane Pascual <rotp@amazon.com>
letsbelopez added a commit that referenced this pull request Jul 19, 2023
* feat: add graphql support for components

* feat: add graphql support for create form (#1008)

* feat: add graphql support for create form with relationships (#1010)

* Update GraphQL API import and refactor GraphQL call expressions (#1012)

* chore: update graphql api import

* chore: refactor graphql call expressions to common function

* chore: use pluralize for graphql list queries

* feat: add graphql support for update form (#1015)

* feat: add graphql support for update form

* fix: update snapshot

* feat: add more assertions to check for graphql support

* fix: removing obselete snapshot

* fix: force update mutation to use id var

* chore: add declaration snapshots (#1018)

* Update from main (#1025)

* fix: parse operand value when field is number type (#1013)

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

* chore(release): v2.14.0 (#1014)

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

* fix: fix storage field prop import to storagemanager (#1016)

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

* chore(release): v2.14.1 (#1017)

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

* fix: add getOverrideProps to StorageManager (#1020)

* fix: add getOverrideProps to StorageManager

* fix: add overrideProps to Field component

* Revert "fix: add overrideProps to Field component"

This reverts commit 6393718.

* chore(release): v2.14.2 (#1022)

* fix: return theme declaration file from render func (#1023)

Co-authored-by: Doesnt Matter <not@used.com>

* fix: alias colliding imported model name in hasMany relationship (#1019)

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

* chore: update cli check

---------

Co-authored-by: Justin Shih <36183898+Jshhhh@users.noreply.github.com>
Co-authored-by: Justin Shih <jushih@amazon.com>
Co-authored-by: Charles Shin <charlshi@amazon.com>
Co-authored-by: David Lopez <letsbelopez@gmail.com>
Co-authored-by: Doesnt Matter <not@used.com>
Co-authored-by: Roshane Pascual <rotp@amazon.com>

* feat: update GraphqlRenderConfig to use separate props for each file path

* feat: graphql support for collections (#1027)

* feat: graphql support for collections

* chore: refactor collection element to helper function and update addMappedImport

* feat: adding graphql support for update forms with relationship (#1030)

* fix: wrapping list graphql result for await (#1032)

* feat: add graphql support for relationship forms with autocomplete field

* fix: autocomplete options prop using incorrect records (#1035)

* feat: add graphql support for relationship forms with autocomplete field

* fix: autocomplete options prop using incorrect records

* feat: add helpers to identify api dependencies

* fix: use related model name instead of field in generating graphql qu… (#1039)

* fix: use related model name instead of field in generating graphql queries

* fix: updating invalid schema in integ test

* feat: exit early in integ test failure

* fix: lowering nyc coverage threshold

---------

Co-authored-by: Albert Winberg <winberga@amazon.com>
Co-authored-by: Roshane Pascual <rtpascual@users.noreply.github.com>
Co-authored-by: Charles Shin <charlshi@amazon.com>
Co-authored-by: awinberg-aws <100880084+awinberg-aws@users.noreply.github.com>
Co-authored-by: Justin Shih <36183898+Jshhhh@users.noreply.github.com>
Co-authored-by: Justin Shih <jushih@amazon.com>
Co-authored-by: David Lopez <lopezbnd@amazon.com>
Co-authored-by: Roshane Pascual <rotp@amazon.com>
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