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.

Sign up for GitHub

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

Jump to bottom

Add redirect button to customer page gift cards card #1556

Merged
merged 1 commit into from
Nov 15, 2021
Merged

Add redirect button to customer page gift cards card #1556

merged 1 commit into from
Nov 15, 2021

Conversation

Cloud11PL
Copy link
Member

@Cloud11PL Cloud11PL commented Oct 29, 2021 •
edited
Loading

I want to merge this change because I want to add a redirect button to gift cards card in customer details page.

PR intended to be tested with API branch:

Screenshots

Pull Request Checklist

  1. This code contains UI changes
  2. All visible strings are translated with proper context including data-formatting
  3. Attributes [data-test-id] are added for new elements
  4. Changes are mentioned in the changelog
  5. The changes are tested in different browsers and in light/dark mode

Test environment config

API_URI=https://master.staging.saleor.cloud/graphql/

@patrys
Copy link
Member

patrys commented Oct 29, 2021

Task linked: SALEOR-4611 Add redirecting from customer page to filtered gift card page

@Cloud11PL Cloud11PL changed the base branch from gift-cards-post-post-mvp to gift-cards-post-post-mvp-main-rebase October 29, 2021 11:11
@Cloud11PL Cloud11PL changed the base branch from gift-cards-post-post-mvp-main-rebase to gift-cards-post-post-mvp October 29, 2021 13:09
@Cloud11PL Cloud11PL force-pushed the SALEOR-4611/redirect-to-gift-cards-from-customer-page branch from 808f5d8 to 760392f Compare October 29, 2021 15:22
@github-actions github-actions bot temporarily deployed to saleor-4611-redirect-to-gift-cards-from-customer-page October 29, 2021 15:22 Inactive
@github-actions github-actions bot had a problem deploying to storybook saleor-4611-redirect-to-gift-cards-from-customer-page October 29, 2021 15:22 Failure
@Cloud11PL Cloud11PL changed the title Saleor 4611/redirect to gift cards from customer page Add redirect button to customer page Oct 29, 2021
@Cloud11PL Cloud11PL changed the title Add redirect button to customer page Add redirect button to customer page gift cards card Oct 29, 2021
@github-actions github-actions bot temporarily deployed to saleor-4611-redirect-to-gift-cards-from-customer-page October 29, 2021 15:49 Inactive
@github-actions github-actions bot had a problem deploying to storybook saleor-4611-redirect-to-gift-cards-from-customer-page October 29, 2021 15:49 Failure
@github-actions github-actions bot temporarily deployed to saleor-4611-redirect-to-gift-cards-from-customer-page November 2, 2021 12:05 Inactive
@github-actions github-actions bot had a problem deploying to storybook saleor-4611-redirect-to-gift-cards-from-customer-page November 2, 2021 12:05 Failure
@Cloud11PL Cloud11PL force-pushed the SALEOR-4611/redirect-to-gift-cards-from-customer-page branch from 760392f to 2b39cd3 Compare November 2, 2021 12:13
@github-actions github-actions bot temporarily deployed to saleor-4611-redirect-to-gift-cards-from-customer-page November 2, 2021 12:13 Inactive
@Cloud11PL Cloud11PL requested review from a team, dominik-zeglen and Droniu and removed request for a team November 2, 2021 12:24
@Cloud11PL Cloud11PL marked this pull request as ready for review November 2, 2021 12:24
@Cloud11PL Cloud11PL merged commit c4e0633 into gift-cards-post-post-mvp Nov 15, 2021
@Cloud11PL Cloud11PL deleted the SALEOR-4611/redirect-to-gift-cards-from-customer-page branch November 15, 2021 08:07
Cloud11PL added a commit that referenced this pull request Dec 13, 2021
@Cloud11PL
Add filtered redirect to gift card page from customer details (#1556)
64900c8
Cloud11PL added a commit that referenced this pull request Dec 20, 2021
@Cloud11PL
Add filtered redirect to gift card page from customer details (#1556)
a78e3b8
Cloud11PL added a commit that referenced this pull request Jan 13, 2022
@Cloud11PL
Add filtered redirect to gift card page from customer details (#1556)
39c2545
Cloud11PL added a commit that referenced this pull request Jan 13, 2022
@Cloud11PL
Add filtered redirect to gift card page from customer details (#1556)
e823247
Cloud11PL added a commit that referenced this pull request Jan 13, 2022
@Cloud11PL
Add filtered redirect to gift card page from customer details (#1556)
b7f847d
Cloud11PL added a commit that referenced this pull request Jan 25, 2022
@Cloud11PL
Add filtered redirect to gift card page from customer details (#1556)
f8aa2d7
jwm0 pushed a commit that referenced this pull request Jan 25, 2022
@Cloud11PL @bmigirl
Gift cards post mvp (#1632)
8f9c1ba 
* Add gift bulk create (#1490)

* Add gift card bulk create dialog WIP

* Update schema, add gift card bulk create mutation and types

* Add gift card bulk create modal and mutation

* Fix types and update messages

* Refactor gift card bulk create

* Add closing gift card bulk create dialog after success

* Change gift card list closeDialog prop name to onClose

* Review fixes

* Review fixes

* Add error message to invalid expiryDate (#1518)

* Add error message to invalid expiryDate

* Add default messages

* Replace filter with some

* Add gift card export (#1499)

* wip

* Add exporting gift cards

* Update messages

* Fix types

* Review fixes

* Review fixes

* Refactor passing messages to export settings component

* Refactor

* Update messages

* Gift card customer page (#1520)

* Add gift cards card to customer page (#1456)

* WIP

* WIP

* Extract activate/deactivate logic to a hook

* add optional side action

* Add query for customer's gift cards

* Add component for giftcard status chip

* Graphql run types

* Add gift card card to customer page

* Fix status chip header

* Revert style change

* Unify status chip logic

* Fix naming scheme

* Add currentOpts to act/deactivate gift cards hook

* Add queries to refetch prop

* Simplify gift card list component

* Fix order status chip

* Extract messages to separate file

* Remove unused lines of code

* Tests and messages

* Fix card list rendering

* Type fix

* Code review fixes

* Review changes

* Scripts

* Change variable name

* Fix formatted message

* Check if giftcards exist before rendering collection

* Add loading button to CardMenu component (#1476)

* WIP

* WIP

* Add gift card card to customer page

* Fix status chip header

* Fix naming scheme

* Add currentOpts to act/deactivate gift cards hook

* Remove unused lines of code

* Revert style change

* Tests and messages

* Fix card list rendering

* Type fix

* Code review fixes

* Review changes

* Scripts

* Add loading animation to card menu buttons

* Added default messages

* Change conditional prop checking to filtering

* Issue gift card in customer page (#1468)

* WIP

* WIP

* Replace typed query with make query

* Add customer details context to customer page

* Add context to customer gift cards

* Disable customer select when initial customer is present

* Pass initial customer to create gift card form

* Fixes after cherry-pick

* Code cleanup

* Remove getInitialData function

* Remove unused package

* Remove new line

* Post-rebase fixes

* Code cleanup & extract messages

* Remove unused code

* Create customer details hook

* Minor fixes

* Update default messages

* Update gift card types

* Type fixes

* Change directory of useCustomerDetails hook

* CR Fixes

* Update tests

* Make PageTitleWithStatusChip use ExtendedPageHeader

* Update tests

* Update hook name

* Post-rebase fixes

* Eslint fix

* Fix scrollbar appearing in menu issue (#1539)

* Change displayCode to last4CodeChars (#1573)

* Add filtered redirect to gift card page from customer details (#1556)

* Limit number of channel list items (#1607)

* Add max height to single select field menu items container

* Add storybook case

* Update stories tests

* Fix gift card product changing to preorder on save issue (#1583)

* Variant preorder fix

* Global threshold input should be optional

* update snapshot

* Add displaying logic gift cards list toolbar (#1617)

* add displaying logic for gift card toolbar

* Logic fix

* Handle bulk export after creation (#1544)

* Add gift bulk create (#1490)

* Add gift card bulk create dialog WIP

* Update schema, add gift card bulk create mutation and types

* Add gift card bulk create modal and mutation

* Fix types and update messages

* Refactor gift card bulk create

* Add closing gift card bulk create dialog after success

* Change gift card list closeDialog prop name to onClose

* Review fixes

* Review fixes

* Add gift card export (#1499)

* wip

* Add exporting gift cards

* Update messages

* Fix types

* Review fixes

* Review fixes

* Refactor passing messages to export settings component

* Refactor

* Update messages

* Handle export after bulk gift card creation

* Add default messages

* Create an util function to get correct input for export

* Update component's name

* Change modal's title

* Update messages

Co-authored-by: Magdalena Markusik <magdalena@markusik.com>

* Gift Card List item number change doesn't refetch fix (#1643)

* Fix number of rows change not refetching list

* Add pagination reset

* Update descriptions for gift card messages to be more descriptive (#1648)

* Gift card history timeline  (#1597)

* Update queries and mutations

* Allow title to be a react node

* Show user name if it exists in data object

* Update types

* Refresh queries on note add

* Add gift card history

* type fix

* Update messages

* Fix timeline note

* Add event fragment to form update result

* Update types

* Fix typo

* Update messages

* Disable input if gift card is expired

* Remove unused imports

* CR Fixes

* Change messages location

* Change message to include user in order

* Allow adding notes to expired gift cards

* Fix disabled input showing dropdown issue (#1636)

* On click is disabled when component is disabled

* update tests

* Order filtering for gift cards in Order List View (#1628)

* Add gift card order filter

* Add gift card filter card in orders view

* Bump macaw version

* Update messages

* Update tests

* Code review changes

* update messages

* Change info card message to use only one message

* Fix order gift card filter

* Gift card filter in product list view (#1621)

* Add GiftCard or Normal filter in Product List View

* Fix tests

* Fix type check

* Don't filter if query param is not in enum

* Update messages

* Update tests

* Code cleanup

* Add default messages

* Pass intl rather than initialise it in util

* Post-rebase fixes

* Change product type details messages (#1642)

* Update product type gift card options messages

* update tests

* Add sorting to gift card list (#1569)

* Update queries and types for sorting

* Add optional handleError method to makeQuery

* Add sorting to gift card list

* Sorting hook uses useGiftCardList hook

* Convert to boolean

* Add default sorting field

* format fix

* Add expiry error handling for issuing gift cards (#1634)

* Add expiry error handling for issuing gift cards

* Add expiry error message to gift card bulk issue

* Update Gift Card tag queries to utilise multiple tags (#1685)

* Change displayCode to last4CodeChars (#1573)

* Update types

* WIP

* Update gift card forms to utilise multiple tags

* Code cleanup

* Update gift card event types

* Fixes

* Change column with no click handler behaviour

* Remove an ability to sort by tags

* Remove unused code

* Update tests

* Update timeline events

* Update messages

* change array reduce to join

* Add Y scroll to dialog content

* Bulk create Y scroll fix

* Endless loading fix (#1732)

* Order filtering for gift cards in Order List View (#1628)

* Add gift card order filter

* Add gift card filter card in orders view

* Bump macaw version

* Update messages

* Update tests

* Code review changes

* update messages

* Change info card message to use only one message

* Fix order gift card filter

* Wip

* Extract dialog component outside of gift card create

* Update component's name

* Extract dialog component outside of export component to provider

* Update tests

* Various gift card bugs fixes (#1749)

* Change currency to options field

* Fix hover and font size

* Fix gift card list width

* Fix bulk delete dialog

* Allow balance to be sorted only when currency is filtered

* Sorting by balance after removing currency filter defualts to usedBy

* Fix trash icon

* Add filter dependency

* Fix single deletion with bulk

* Update tests

* Refactor Links used in Gift Cards

* Fix export dialog (#1791)

Co-authored-by: Magdalena Markusik <magdalena@markusik.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dominik-zeglen dominik-zeglen dominik-zeglen approved these changes

@Droniu Droniu Droniu approved these changes

@eCzerniak eCzerniak Awaiting requested review from eCzerniak

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Cloud11PL @patrys @dominik-zeglen @Droniu