Master backmerge into Develop #3011
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Initial work. * Lil better with loading states. * Using debounce to fetch order number. * Re arranging useEffects. * Updated CSS. * Order search useEffect logic change. * Using onCompleted instead. * Final touchups. * Minor. * Addressed UX review. * Using submit button to search for orders. * Minor. * Minor. * Added orderHistoryPage tests. * Using fragments. * Using fuzzy search. * Added useOrderHistory tests. * Using single query for order and orders data. * Fetch all orders if search text is empty. * Allowing button submit even if the search field is empty to fetch all orders. * Test update.
* Working PoC of moving form context to just wrap search inputs * Add simple pagination logic * - Fix rendering of reset button - Add Load More button and wire up to orders query * Increase page size to UX requirement and remove unnecessary currentPage argument * Add page info label to top of page * Cover changes with tests * - Use token for font size - Make callback optional and document
* Moves getPageSize query to talon default operation Signed-off-by: sirugh <rugh@adobe.com> * Only show search page error if there is no data. Signed-off-by: sirugh <rugh@adobe.com> * Only render errors when error AND no data Signed-off-by: sirugh <rugh@adobe.com> * Update tests Signed-off-by: sirugh <rugh@adobe.com> * Make sure we only do the page reset if there is no data Signed-off-by: sirugh <rugh@adobe.com> * Test page setting effect Signed-off-by: sirugh <rugh@adobe.com> Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com>
* Clear out old 8.0.0 content * Add link references * Add page 1 PR entries * Add page 2 entries * Add page 3 entries * Add page 4 and 5 entries * Add details to highlights * Update compatibility table * Update highlight and known issue * Update Top Community Contributors * Update content based on feedback * Fix capitalization * Add missing entries Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com>
* Add known issue about watcher running out of memory * Add link * Update note about watcher duration
* Remove lodash from create-pwa * Fix bug * Extend fix to venia-concept * Using map instead of set. * Pass sample backends into create script * Fixup * Restore sample backend export * Fix unit test Co-authored-by: Revanth Kumar <revanth0212@gmail.com>
* Create release notes for 9.0.1 * Fix link heading * Add another PR entry Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com>
PWAStudioBot
added
pkg:create-pwa
pkg:extensions
pkg:pagebuilder
pkg:peregrine
pkg:pwa-buildpack
pkg:upward-js
m2-community-project
bot
added
Progress: approved
and removed
Progress: ready for review
labels
tjwiebell
suggested changes
Feb 22, 2021
Comment on lines
29
to
30
| if (loading) return fullPageLoadingIndicator; | ||
| else if (error) { |
There was a problem hiding this comment.
Theses two gates are unreachable now. I think we should have just accepted develop in this resolution, eg.
if (loading && !product) return fullPageLoadingIndicator;
if (error && !product) return <ErrorView />;
if (!product) { // OOS Message }There was a problem hiding this comment.
You are right @tjwiebell. @sirugh what do you think should be the result if there is an error?
In develop we are rendering
<ErrorView />And in master we are rendering
<div>
<FormattedMessage
id={'product.errorFetch'}
defaultMessage={'Data Fetch Error'}
/>
</div>
There was a problem hiding this comment.
I think you should use what is in develop, as @tjwiebell suggested.
m2-community-project
bot
added
Progress: changes requested
and removed
Progress: approved
labels
m2-community-project
bot
added
Progress: review
and removed
Progress: changes requested
labels
tjwiebell
previously approved these changes
Feb 22, 2021
|
@revanth0212 looks good, just unhide these links now #2918 |
@dpatil-magento done 👍 |
tjwiebell
approved these changes
Feb 23, 2021
|
QA Approved. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
❌ DON'T SQUASH MERGE THIS PR ❌
Description
Backmerging
masterbranch intodevelopbranch.Related Issue
Closes PWA-1333
Verification Stakeholders
@jimbo @dpatil-magento
Verification Steps
A smoke test on the deployed app. Nothing should break, everything should fine.
Screenshots / Screen Captures (if appropriate)
Checklist