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

feat(admin-ui): Filter reservations #4115

Merged
merged 35 commits into from
Jun 8, 2023
Merged

Conversation

pKorsholm
Copy link
Contributor

@pKorsholm pKorsholm commented May 16, 2023

What

  • Introduce reservation filters in admin

Fixes CORE-1387

@changeset-bot
Copy link

changeset-bot bot commented May 16, 2023

🦋 Changeset detected

Latest commit: a189831

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

This PR includes changesets to release 11 packages
Name Type
@medusajs/medusa Patch
@medusajs/admin-ui Minor
medusa-react Patch
@medusajs/admin Patch
@medusajs/medusa-js Patch
medusa-payment-paypal Patch
medusa-payment-stripe Patch
medusa-plugin-mailchimp Patch
medusa-plugin-restock-notification Patch
@medusajs/medusa-oas-cli Patch
@medusajs/oas-github-ci 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

@vercel
Copy link

vercel bot commented May 16, 2023

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
medusa-docs ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jun 8, 2023 3:39pm
1 Ignored Deployment
Name Status Preview Comments Updated (UTC)
medusa-api-ref ⬜️ Ignored (Inspect) Jun 8, 2023 3:39pm

@pKorsholm pKorsholm changed the base branch from develop to feat/reservations-management May 16, 2023 13:39
@pKorsholm pKorsholm changed the base branch from feat/reservations-management to develop May 16, 2023 13:40
@pKorsholm pKorsholm force-pushed the feat/filter-reservations branch from 9fdff25 to 5289fa0 Compare May 16, 2023 13:41
@pKorsholm pKorsholm changed the base branch from develop to feat/reservations-management May 16, 2023 13:41
@pKorsholm pKorsholm marked this pull request as ready for review May 17, 2023 06:58
@pKorsholm pKorsholm requested a review from a team as a code owner May 17, 2023 06:58
@pKorsholm pKorsholm force-pushed the feat/reservations-management branch from 8c76592 to d480350 Compare May 19, 2023 08:34
Copy link
Member

@adrien2p adrien2p left a comment

Choose a reason for hiding this comment

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

I ve only reviewed the backenmd for now

@pKorsholm pKorsholm changed the base branch from feat/reservations-management to develop May 22, 2023 13:59
@pKorsholm pKorsholm changed the base branch from develop to feat/reservations-management May 22, 2023 13:59
@pKorsholm pKorsholm force-pushed the feat/filter-reservations branch from fe21bce to 550b6db Compare May 22, 2023 14:02
@pKorsholm pKorsholm changed the title Feat/filter reservations Feat(admin-ui): Filter reservations May 22, 2023
@pKorsholm
Copy link
Contributor Author

@adrien2p I addressed your feedback in #4081 as that's got to do with the backend and this should only be the admin ui. I think updating the other branch pushed a bunch of unrelated changes to the files, but your comments are fixed in the other pr.

@pKorsholm pKorsholm requested a review from adrien2p May 23, 2023 03:27
@olivermrbl olivermrbl changed the title Feat(admin-ui): Filter reservations feat(admin-ui): Filter reservations May 23, 2023
@adrien2p
Copy link
Member

@adrien2p I addressed your feedback in #4081 as that's got to do with the backend and this should only be the admin ui. I think updating the other branch pushed a bunch of unrelated changes to the files, but your comments are fixed in the other pr.

sounds good 🚀

@pKorsholm pKorsholm requested a review from olivermrbl May 24, 2023 09:20
@pKorsholm pKorsholm changed the base branch from feat/reservations-management to develop May 30, 2023 09:25
@pKorsholm pKorsholm changed the base branch from develop to feat/reservations-management May 30, 2023 09:25
@pKorsholm pKorsholm force-pushed the feat/filter-reservations branch from 550b6db to a5efef7 Compare May 30, 2023 09:31
@pKorsholm pKorsholm requested a review from a team as a code owner May 30, 2023 09:31
@pKorsholm pKorsholm changed the base branch from feat/reservations-management to develop May 30, 2023 09:31
@pKorsholm pKorsholm force-pushed the feat/filter-reservations branch from 897f4b5 to 857d6fa Compare June 5, 2023 13:27
@pKorsholm pKorsholm force-pushed the feat/filter-reservations branch from c1eb845 to 1ecf324 Compare June 6, 2023 08:06
@pKorsholm pKorsholm force-pushed the feat/filter-reservations branch from 62e9de7 to f3a5bf7 Compare June 6, 2023 11:28
Copy link
Contributor

@olivermrbl olivermrbl left a comment

Choose a reason for hiding this comment

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

epic work @pKorsholm !! 🚀

only minuscule todos

Copy link
Contributor

@olivermrbl olivermrbl left a comment

Choose a reason for hiding this comment

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

epic work @pKorsholm !! 🚀

only minuscule todos

@olivermrbl
Copy link
Contributor

Also, missing a changeset :)

@pKorsholm pKorsholm requested a review from olivermrbl June 7, 2023 06:08
Copy link
Contributor

@olivermrbl olivermrbl left a comment

Choose a reason for hiding this comment

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

lgtm - love it!

@olivermrbl
Copy link
Contributor

@adrien2p will you check if your requested changes have been addressed?

Copy link
Member

@adrien2p adrien2p left a comment

Choose a reason for hiding this comment

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

LGTM for me, the bnackend comments have been addressed in another pr 💪

@pKorsholm pKorsholm merged commit 79cca2a into develop Jun 8, 2023
@github-actions github-actions bot mentioned this pull request Jun 8, 2023
olivermrbl added a commit that referenced this pull request Jun 14, 2023
* initial filter

* clenaup

* reser filters correctly

* filter reservations

* ensure reset works

* update types

* add adjustment icon

* pr prep

* update filtering with proper description handling

* location filter updates and search removal

* removed greyed out dates + add created_by filtering

* update filtering with proper ordering

* filter out selected users

* fix array issues

* update spacing for searchable queries

* fix deselection bug for inventory item search

* update date filter;

* rename const a to initialFilters

* fix re-render issue

* ui updates

* update inventory filter to remove selected items

* fix width

* fix truncation for button text if desired

* add span classes

* add "go to reservations" popover

* add tooltip if location text is truncated

* fix long items

* typing

* minor fix for select value

* fix reservation quantity field updates

* add pb

* Update packages/admin-ui/ui/src/components/templates/reservations-table/index.tsx

Co-authored-by: Oliver Windall Juhl <[email protected]>

* feedback

* add changeset

---------

Co-authored-by: Oliver Windall Juhl <[email protected]>
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.

3 participants