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

Improvments for discount catalog #4565

Merged
merged 36 commits into from
Jan 4, 2024
Merged

Conversation

poulch
Copy link
Member

@poulch poulch commented Dec 21, 2023

closes #...

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. The changes are tested in Chrome/Firefox/Safari browsers and in light/dark mode
  5. Your code works with the latest stable version of the core
  6. I added changesets file (instructions in contribution guide

Test environment config

API_URI=https://automation-dashboard.staging.saleor.cloud/graphql/
APPS_MARKETPLACE_API_URI=https://apps.staging.saleor.io/api/v2/saleor-apps

Do you want to run more stable tests?

To run all tests, just select the stable checkbox. To speed up tests, increase the number of containers. Tests will be re-run only when the "run e2e" label is added.

  1. stable
  2. app
  3. attribute
  4. category
  5. collection
  6. customer
  7. giftCard
  8. homePage
  9. login
  10. menuNavigation
  11. navigation
  12. orders
  13. pages
  14. payments
  15. permissions
  16. plugins
  17. productType
  18. products
  19. sales
  20. shipping
  21. translations
  22. variants
  23. vouchers

CONTAINERS=2

Copy link

changeset-bot bot commented Dec 21, 2023

🦋 Changeset detected

Latest commit: 57f4d2b

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
Name Type
saleor-dashboard Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@github-actions github-actions bot temporarily deployed to pr-discount-catalog-optimistic-uptades December 21, 2023 11:06 Destroyed
@github-actions github-actions bot temporarily deployed to storybook pr-discount-catalog-optimistic-uptades December 21, 2023 11:06 Destroyed
@github-actions github-actions bot temporarily deployed to storybook pr-discount-catalog-optimistic-uptades December 21, 2023 14:03 Destroyed
@github-actions github-actions bot temporarily deployed to pr-discount-catalog-optimistic-uptades December 21, 2023 14:03 Destroyed
@github-actions github-actions bot temporarily deployed to pr-discount-catalog-optimistic-uptades December 21, 2023 15:53 Destroyed
@github-actions github-actions bot temporarily deployed to storybook pr-discount-catalog-optimistic-uptades December 21, 2023 15:53 Destroyed
@poulch poulch marked this pull request as ready for review December 21, 2023 15:54
@poulch poulch requested a review from a team as a code owner December 21, 2023 15:54
@github-actions github-actions bot temporarily deployed to storybook pr-discount-catalog-optimistic-uptades January 2, 2024 22:01 Destroyed
@github-actions github-actions bot temporarily deployed to storybook pr-discount-catalog-optimistic-uptades January 3, 2024 12:32 Destroyed
@github-actions github-actions bot temporarily deployed to pr-discount-catalog-optimistic-uptades January 3, 2024 12:32 Destroyed
@github-actions github-actions bot temporarily deployed to storybook pr-discount-catalog-optimistic-uptades January 3, 2024 14:13 Destroyed
@github-actions github-actions bot temporarily deployed to pr-discount-catalog-optimistic-uptades January 3, 2024 14:13 Destroyed
@github-actions github-actions bot temporarily deployed to storybook pr-discount-catalog-optimistic-uptades January 3, 2024 14:14 Destroyed
@github-actions github-actions bot temporarily deployed to pr-discount-catalog-optimistic-uptades January 3, 2024 14:14 Destroyed
Droniu
Droniu previously approved these changes Jan 3, 2024
Copy link
Member

@Droniu Droniu left a comment

Choose a reason for hiding this comment

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

lgtm

@poulch poulch dismissed stale reviews from Droniu and andrzejewsky via 32ea135 January 3, 2024 20:47
@github-actions github-actions bot temporarily deployed to pr-discount-catalog-optimistic-uptades January 3, 2024 20:48 Destroyed
@github-actions github-actions bot temporarily deployed to storybook pr-discount-catalog-optimistic-uptades January 3, 2024 20:48 Destroyed
@poulch poulch merged commit dc64404 into main Jan 4, 2024
17 checks passed
@poulch poulch deleted the discount-catalog-optimistic-uptades branch January 4, 2024 09:13
andrzejewsky pushed a commit that referenced this pull request Jan 12, 2024
* Add empty column to datagrid

* Fix loading of rules

* Update rule validation

* Show rule summary when no conditions

* Handle labels on rule update

* Improve loading rules

* Handle show selected labels

* Fix rules tests

* Update labels on rule add

* Improve adding condtions

* Move reward value to left

* Remove optional from description

* Fix show channel error

* Add changeset

* Update test

* Bump macaw

* Sort rule by name

* Improve details form submission

* Prevent refetch, write data into cache

* Improve rule sorting and update mutations

* Fix loading issue

* Fix ts issues

* Refactor to separate hooks

* Fix richtext

* Refactor useRulesHandlers to get rid of rules state and get data from api

* Show only initial loading

* Refactor and improve loading conditions options

* Fix jumpy condition multiselect

* Fix input heigh equal

* Change discount type switch height

* After CR improvments

* Fix ts issues
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: ✅ Done
Development

Successfully merging this pull request may close these issues.

3 participants