-
Notifications
You must be signed in to change notification settings - Fork 685
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
[PWA-893] My Account: Order History - Remove @client directive #2786
Conversation
export const GET_PRODUCT_THUMBNAILS_BY_SKU = gql` | ||
query GetProductThumbnailsBySku($skus: [String!]!) { | ||
products(filter: { sku: { in: $skus } }) { | ||
export const GET_PRODUCT_THUMBNAILS_BY_URL_KEY = gql` |
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.
Had to change this over to query by URL Key, since the product_sku returned by orders was variant skus which will return no results from the backend. Issue was escalated to GraphQL team, and they will be adding new fields in 2.4.2 so we shouldn't need to make a secondary query to get this data.
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.
which will return no results from the backend.
Is this because of our sample data or is it by design of the API?
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.
That is by design; configurable variants all have Visibility = Not Visible Individually, so GraphQL is correct in not returning them. Couple JIRA tickets were created to address this though; this one so we don't even need to do a second query for images, and this one so parent sku is returned (which is also a blocker to doing re-orders).
|
packages/peregrine/lib/talons/OrderHistoryPage/useOrderHistoryPage.js
Outdated
Show resolved
Hide resolved
* Updated FormattedMessage component mock. * div -> mock-FormattedMessage * div -> mock-FormattedMessage * Resetting price mock. * Price component snap rollback.
@magento import pr to magento-commerce/pwa-studio |
@tjwiebell the pull request successfully imported. |
- Add context for providing product url suffix that is missing from graphql response
# Conflicts: # packages/venia-ui/lib/components/OrderHistoryPage/OrderDetails/__tests__/__snapshots__/item.spec.js.snap # packages/venia-ui/lib/components/OrderHistoryPage/OrderDetails/billingInformation.js # packages/venia-ui/lib/components/OrderHistoryPage/OrderDetails/paymentMethod.js # packages/venia-ui/lib/components/OrderHistoryPage/OrderDetails/shippingInformation.js # packages/venia-ui/lib/components/OrderHistoryPage/orderHistoryPage.js
This looks good @tjwiebell . Thanks. UX Approved. |
packages/peregrine/lib/talons/OrderHistoryPage/orderHistoryContext.js
Outdated
Show resolved
Hide resolved
I have already updated about these findings to @tjwiebell , posting here just for reference -
|
Initially reviewed with UX, @schensley approved. Might be worth double checking if we'd like to move config options to the third column to keep things in consistent columns, but not a blocker.
Fixed in 1c1a478
Created MC-38927 and MC-38928; neither were possible with existing coverage.
Left as plain strings and fixed up label to adhere to suggestion from UX in JIRA comment about expected rendering. We can address linkage in the ticket you created about the Luma view that we've broken for tracking shipments.
Somehow there is an order without a shipping address on this account. Since this is something we do not support currently, I think we can ignore. |
@tjwiebell what would a solution to fix the order with no shipping address look like? This is something we will need rather soon (I'd imagine PWA Studio for Commerce too as otherwise one couldn't for example order just a virtual gift card). |
We have an upcoming epic to work on additional product types and I imagine that work would get handled there or sooner. To start, I'm curious if the UI has any way to "know" that there won't be a shipping address. It's not like we query for "required checkout steps" and I'm not sure there's even an API for that. Might have to do some UI logic and check if all items are virtual/don't need shipping. |
@tjwiebell Some more observations -
|
This is a fair point, and a solution so simple we might as well handle now. While it has grown quite large, the intention here wasn't to mess with the existing implementation of components, but given some changes were necessary with live data, I can take on this scope. A bigger point to address is that we're all following our schemas correctly; myself included, I expect data even though non-required fields are nullable, and our designs and implementations don't account for this. |
|
Thanks @tjwiebell almost there, some minor ones - |
|
You're seeing stale data because we render from cache. Once the store code is changed using the switcher, we refresh the page and re-query with the new store code in the appropriate header. After refresh, but before the new query returns, you will see cached data. That's just how it works with any query on reload when configured to use |
QA Approved. |
* [PWA-893] My Account: Order History - Remove @client directive (magento#2786) * Remove client directive and work through errors from using live data * Fixup region display so its not rendering ids * Fix payment method display and remove extra comma in addresses * Additional tweaks from UX feedback * Fixup failing tests * Fix couple tests failing after gql move * Fix bug where tracking information doesn't exist for shipped order * Updated Intl FormattedMessage component mock. (magento#2792) * Updated FormattedMessage component mock. * div -> mock-FormattedMessage * div -> mock-FormattedMessage * Resetting price mock. * Price component snap rollback. * - Adjust item grid based on UX feedback - Add context for providing product url suffix that is missing from graphql response * Fixup failing tests * Address PR feedback * Cover new context with tests * Address QA feedback * Fixup tests and hide incomplete features * Address additional edges found in QA * Dependently render discount row * Update snaps with new mock * Allow empty string as quantity value to support backspace Co-authored-by: Revanth Kumar Annavarapu <35203638+revanth0212@users.noreply.github.com> * fix: Service Worker caching for home page routes w/ store code (magento#2856) * Fix regex for html file type. Previous regex matched incorrect * Use available store views in SW home route check Signed-off-by: sirugh <rugh@adobe.com> * Update tests Signed-off-by: sirugh <rugh@adobe.com> Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com> * issue-2743-function-retreiveAvailableShippingMethods-spelling-change- changed the function name in both the occurences (magento#2807) Co-authored-by: Stephen <sirugh@users.noreply.github.com> * Update index.md (magento#2865) Co-authored-by: Stephen <sirugh@users.noreply.github.com> * [docs]: Add info about RAIL model (magento#2761) * Update index.md * Update pwa-devdocs/src/technologies/overview/index.md Co-authored-by: Stephen <sirugh@users.noreply.github.com> Co-authored-by: Stephen <sirugh@users.noreply.github.com> Co-authored-by: James Calcaben <jcalcaben@users.noreply.github.com> * [Doc] extensibility framework overview (magento#2863) * Add TOC entry * Add new topic file and outline * Add how it works section * Add interceptor pattern section and image * Add content for Targets section * Add content for Intercept files * Finish Declare file content * Add content for Targets in PWA Studio packages * Add list of extension examples * Add extensibility overview diagram * Apply suggestions from code review Co-authored-by: Andy Terranova <13182778+supernova-at@users.noreply.github.com> * Fix links * Fix linting issues * Add example intercept file content Co-authored-by: Andy Terranova <13182778+supernova-at@users.noreply.github.com> Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com> * [feature]: Display "no payment method available" message if no allowed or configured payment methods are present (magento#2855) * Filtered payment method radios. Filtered payment method radios array because it was coming like [undefined, undefined] * Showing "No Payment method available." message Showing "No Payment method available." message when there are no supported payment methods available. * Created class to add padding to no payment method message Created class to add padding to no payment method message * Fixed formatting using prettier * Formatted with prettier * Fixed typo suggested by @sirugh * Added plain string to i18n * Added string to translations * Fixed Typo * Fixed typo * Update packages/venia-ui/lib/components/CheckoutPage/PaymentInformation/paymentMethods.js Co-authored-by: Stephen <sirugh@users.noreply.github.com> * Update packages/venia-ui/i18n/en_US.json Co-authored-by: Stephen <sirugh@users.noreply.github.com> * Fixed suggested changes given by sirugh * Added missing dep react-intl * Updated error messages and added global error color to it. * Added error test. Co-authored-by: Stephen <sirugh@users.noreply.github.com> Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com> Co-authored-by: Revanth Kumar <revanth0212@gmail.com> * [PWA-633] My Account: Address Book: Main View (magento#2857) * Stub out address card functionality based on new mocks * - Address some missed AC and hide dead links - Cover changes in tests * Update snaps and cleanup * - Sort addresses so default comes first - Add full page loading indicator on cold cache render - Add phone number - Add full country name display * Use country data from backend until DisplayNames is more widely supported Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com> * Move product detail GraphQl fields to fragment (magento#2868) * move product detail graphql fields to fragment * move gql from venia-ui to peregrine * update test case * Use ApolloClient for MagentoRoute (magento#2859) * Use Apollo for MagentoRoute * Move queries to the talon * Adjust category page loading * Refactor to avoid repeat calls * Fixup * Remove getRouteComponent * Start tests * Rewrite unit tests * Lift state up to context * @brendanfalkowski * Remove old query * Inline response objects * Update snapshots * Update category snapshots Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com> * Fix apiBase URL in resolveUnknownRoute.js (magento#2877) * Fix apiBase URL in resolveUnknownRoute.js Fix URL used by `resolveUnknownRoute.js` so it takes `apiBase` into account when constructing URL to GraphQL server * Add test for store base Signed-off-by: sirugh <rugh@adobe.com> Co-authored-by: sirugh <rugh@adobe.com> Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com> * Use async version of act() (magento#2880) * Added feature to pick from multiple sample backends. (magento#2853) * Initial work * Added magento backend validation. * Updated intercept to fetch backends. * Fetching sample backends while creating a pwa app. * Minor. * Added try catches. * Updated docs. * Minor. * Added node-fetch peer dep. * Minor pretty print stuff. * Added lodash and node-fetch deps. * Updated extension desc. * Updated tests. * Minor. * Updated remaining tests. * Added runEnvValidators.js tests. * Fixed linter issues. * Minor. * Added intercept tests. * Using debug instead of console.error. * Moving backend related code to run after configureWebpack. * Updated the skipped test. * Update ENV error reporting message. * Minor. * Minor. * Updated error snapshot test. * Minor. * Minor. * Added or condition for path variable in tests. * Minor. * Updated tests to use snapshots. * Mock everything, lets get this working. * Removed unecessary mocks. * Updated tests. * Using try catch to avoid prj creations. * Reporting different message if otherBackends is empty. * Updated tests. * Prettier fix. * Added console warning for production deployment. * Updated production launch checklist docs. Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com> * [PWA-1128] fix(buildpack): Stop apicache from overriding good cache headers. (magento#2870) * fix(buildpack): Stop apicache from overriding good cache headers. Fixes PWA-1128. * fix(venia-ui): add cache headers to upward.yml staticFromRoot resolver * fix: add simple max-age behavior to upward DirectoryResolver Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com> * magento/magento2-page-builder/magento#637: Form field/field group viewport scope (magento#2881) - collect only desktop styles Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com> * [doc] update cloud deployment topic (magento#2871) * Add new sections in the beginning * Revise steps and adding required extensions step * Add section about setting environment variables * Remove optional and unneeded steps * Add build, commit, and deploy sections * Add more details on finding the correct UPWARD path value * Update based on feedback * Minor content update * Changes based on review feedback * Clarify env variables section * Minor fixes Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com> * Handle array of paths as route pattern (magento#2893) * Handle array of paths as route pattern * JSON.parse route pattern when applying to Route path prop * Add tests to makeRoutesTarget * Fix missing projectConfig in create-custom-origin (magento#2897) * Fix missing projectConfig in create-custom-origin * Update examples in docs Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com> * Improve RootComponents talons test coverage (magento#2896) * Refactor useCategory tests * Refactor useCategory test file * Add test to useCategory.spec.js * Add location search filter test to useCategory.spec.js * Add test for error on useCategory.spec.js * Finish test coverage for useCategory * Write tests for useNoProductsFound() talon * Add tests for useCategoryContent() talon Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com> * Address Book - Add & Edit (magento#2879) * Initial layout of add / edit form * Adds unit tests * Adding address full flow. Stubs out edit address. * Country field to use country_code * Properly formats FormErrors * Absolute imports * Seeds and sets the form properly * Implements edit flow end to end * Disable dialog buttons while saving * Updates unit tests and snapshots * Implements default address checkbox * Smoothing out edges around default addresses * Attempt to fix broken test * Determinant sorting for default addresses * Update packages/venia-ui/lib/components/AddressBookPage/addressBookPage.js Co-authored-by: Jimmy Sanford <jimbo@users.noreply.github.com> * Remove auto-defaulting of addresses * Remove query result fields from add mutation * Adds query result fields to upadte mutation * Adds AddEditDialog classes to propTypes * Simplify passing parameter to edit callback function * Adds address fragments * Wait for refetchQueries to complete before finishing mutation * Waits for refetchQueries before closing dialog. Renames props. * Updates unit tests based on prop rename * Binds edit address function at creation time * Updates unit tests * Adds middle name to AddressCard display * Dialog to properly unmount on hide * Updates unit tests * Fixes new address bug * Simplifies seeding the form in useAddressBookPage talon * Adds JSDocs Co-authored-by: Jimmy Sanford <jimbo@users.noreply.github.com> Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com> * [feature] Use root category id from gql (magento#2902) * Use storeConfig query to obtain root category id instead of hardcoding. * Update tests * Lint Signed-off-by: sirugh <rugh@adobe.com> * Set the root category once it resolves Signed-off-by: sirugh <rugh@adobe.com> * prettier Signed-off-by: sirugh <rugh@adobe.com> * Query for root category id for fallback on cms * Protect against null id * fix tests Signed-off-by: sirugh <rugh@adobe.com> * Use id in storeConfig query Signed-off-by: sirugh <rugh@adobe.com> * magento#2797. Re-factor Edit Product to use Dialog (magento#2824) * Re-factor Edit Product to use Dialog (magento#2797) * Re-factor Edit Product to use Dialog - CR fixes * Fixed QTY update on cart editing Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com> * [PWA-458] Checkout - Sign In View (magento#2889) * Remove sign-in link from CartPage * Apply new style and positioning to sign in container * - Implement view switcher similar to how the account menu works - Tweak some styles in mobile view * - Order imports consistently - Add/remove changes to language file * - Reset view state when you return to checkout - Add heading to Create Account form - Made cancel buttons low priority per UX guidance - Fixed button layout of Create Account form so it uses rows on mobile - Move SignIn container above Guest Checkout header on mobile * Update existing tests * Cover new component with tests * Add propTypes to new component * Make callback optional and remove noop function prop Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com> * Allow self signed certs for backend validation and only attach to scaffold sample (magento#2891) * Allow self signed certs for backend validation Signed-off-by: sirugh <rugh@adobe.com> * remove log Signed-off-by: sirugh <rugh@adobe.com> * Only copy the extension to scaffolded apps Signed-off-by: sirugh <rugh@adobe.com> * Only include sample backend validator if scaffold selection is sample Signed-off-by: sirugh <rugh@adobe.com> * Add lodash as dependency to venia-concept Signed-off-by: sirugh <rugh@adobe.com> * update lockfile Signed-off-by: sirugh <rugh@adobe.com> * Make createProjectFromVenia async Signed-off-by: sirugh <rugh@adobe.com> * Update test Signed-off-by: sirugh <rugh@adobe.com> Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com> * Wait to render confirmation until details return (magento#2850) * Add Adobe client data layer (magento#2852) * Add Adobe client data layer * Clean up * Update package description Co-authored-by: deloreyj <deloreyjmi@gmail.com> * Move definition to the effect * Don't parse acdl minified code * Include react as peerDep * Bump peregrine peerdep to a caret * Revert eb59d1c Revert to tilde. Release script doesn't handle carets well, and this isn't significant. Co-authored-by: deloreyj <deloreyjmi@gmail.com> Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com> Co-authored-by: Dev Patil <depatil@adobe.com> * Saved payment methods main view. (magento#2882) * Enabled saved payments link. * Added payment skeleton. * Moved stuff around. * Snapshot update. * Added other card types. * Cleaned up some css. * Using INTL. * Minor. * Minor css change. * Changed name of payments target to checkoutPagePaymentTypes. * Added savedPaymentTypes target. * Updated target docs. * Minor. * Hide delete text in mobile view. * Address PR feedback * Snapshot updates. * Updated snapshots. * Updated tests. * Added new tests. * Minor * Hiding delete button till PWA-638 comes in. * Added new tests. * Minor. * Rendering no payments message. * Clear CustomerPaymentTokens on signout. * Rendering fullpageindicator when data is loading. * Snapshot update. * Removing unnecessary piece of code. Co-authored-by: Tommy Wiebell <twiebell@adobe.com> Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com> * [Doc] Refactor tutorials section (magento#2907) * Archive css modules topic in tutorials * Archived Using Component Props topic * Archive Manage State topic * Archive Work with GraphQL topic * Remove links to archived pages in overview topic * Archive Hello UPWARD tutorials * Various updates * Add Next Steps to project structure Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com> * Add props to nav query to render root category links (magento#2911) Signed-off-by: sirugh <rugh@adobe.com> Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com> * Relative import for local custom loader (magento#2912) Signed-off-by: sirugh <rugh@adobe.com> Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com> * Delete Address from Address Book (magento#2888) * Initial delete implementation * * Binds delete function * Waits to dismiss overlay * Cancel button is low priority styled * * Stabilizes sorting * Consistent spacing between confirm buttons * Updates unit tests and snapshots * Fixes confirmation button spacing for mobile * Remove max-width on confirmation buttons * Responsive delete confirm buttons * Updates unit tests to include new output properties * Address UX feedback * Added addressCard tests. * Added addressBookPage tests. Co-authored-by: Revanth Kumar <revanth0212@gmail.com> Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com> * Hide links (magento#2918) * v9.0.0-alpha.1 * v9.0.0-alpha.2 * Order History Page Search (magento#2916) * 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. * [PWA-887] My Account: Order History - Pagination (magento#2928) * 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 * [fix] offline cached search and category pages (magento#2929) * 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> * v9.0.0-beta.1 * [doc] release notes 9.0.0 (magento#2935) * 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> * Bump hastily dependency (magento#2963) * v9.0.0-beta.2 * v9.0.0-rc.1 * Add known issue about watcher running out of memory (magento#2977) * Add known issue about watcher running out of memory * Add link * Update note about watcher duration * v9.0.0 * Remove lodash from create-pwa * Fix bug * Extend fix to venia-concept * Using map instead of set. Co-authored-by: Tommy Wiebell <twiebell@adobe.com> Co-authored-by: Stephen <sirugh@users.noreply.github.com> Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com> Co-authored-by: Sathiya Prakash <50226394+sathiyaaa@users.noreply.github.com> Co-authored-by: Hiren Patel <hirenpatelmail@gmail.com> Co-authored-by: Abrar Pathan <abrarkhan@krishtechnolabs.com> Co-authored-by: James Calcaben <jcalcaben@users.noreply.github.com> Co-authored-by: Andy Terranova <13182778+supernova-at@users.noreply.github.com> Co-authored-by: Ankur Raiyani <ankurvr7003@gmail.com> Co-authored-by: Huy Kon <huykon225@gmail.com> Co-authored-by: Jimmy Sanford <jimbo@users.noreply.github.com> Co-authored-by: Sergey Kolodyazhnyy <sergey.kolodyazhnyy@gmail.com> Co-authored-by: sirugh <rugh@adobe.com> Co-authored-by: James Zetlen <jzetlen@adobe.com> Co-authored-by: Oleksandr Miroshnichenko <miroshni@adobe.com> Co-authored-by: Papilion Dániel <papiliond.94@gmail.com> Co-authored-by: Kristof, Fooman <kristof@fooman.co.nz> Co-authored-by: Marcin Kwiatkowski <contact@frodigo.com> Co-authored-by: deloreyj <deloreyjmi@gmail.com> Co-authored-by: Dev Patil <depatil@adobe.com> Co-authored-by: devops-pwa-codebuild <magento-devops-github-pwa-int@adobe.com>
Description
This feature is being included in PWA v8, and to support 2.4.0, it was developed with mock data and uses the @client directive so it doesn't hit the actual backend for data. Once all of our backing instances have been upgraded to 2.4.1, our support matrix for the next release (v9) will shift to 2.4.1-2.4.2, and this @client directive can safely be removed.
This should go smoothly, but a full round of QA will need to happen now that Devagouda Patil can test against live data.
Acceptance Criteria
@client directive removed
MOCK_ORDERS and CUSTOM_TYPES are removed, and useTypePolices call in useOrderHistoryPage is removed
Configurable product images should load with real data.
Related Issue
Acceptance
Verification Stakeholders
Specification
Verification Steps
Screenshots / Screen Captures (if appropriate)
Checklist