Commit graph

178 commits

Author SHA1 Message Date
dependabot-preview[bot]
2645f69d30
[Security] Bump ws from 5.2.2 to 5.2.3 (#1159)
Bumps [ws](https://github.com/websockets/ws) from 5.2.2 to 5.2.3. **This update includes a security fix.**
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/5.2.2...5.2.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-10-06 11:14:51 +02:00
Karolina Rakoczy
2407ae6f76
gift cards in checkout (#1376)
* gift cards in checkout

* complete checkout after trying to add gift card

* fix gift cards tests

* fix gift cards

* update snapshots

* fix tests

* fix gift cards in checkout

* delete created channels
2021-09-29 15:24:47 +02:00
Karolina Rakoczy
2c64a966cc
Saleor 4437 refactor tests (#1389)
* reference type cypress working

* refactor

* remove screenshots

* add reference

* add slash marker

* run tests based on shop version

* fix run tests based on shop version

* fix run tests based on shop version

* change base url to localhost

* fix plugins

* fix plugins

* fix plugins

* fix plugins

* fix plugins

* fix plugins

* fix yml

* fix yml

* chage file names

* fix files names

* fix broken imports add checking for errors in grpah responses

* fix broken imports add checking for errors in grpah responses

* update jest

* fix snapshot
2021-09-27 12:04:21 +02:00
Piotr Grundas
ebe56da583
Add swatch attributes (#1301)
* Initial work

* #

* Base color logic

* Handle file urls

* Improvements, fix snapshots

* Add messages

* Update changelog

* Update storybook

* Improvements

* Messages

* Review corrections

* Bugfixes
2021-09-21 15:16:21 +02:00
Dominik Żegleń
51e204076f
Fix initial list settings (#1401)
* Allow ocalStorage values to be initialized by cb

* Initialize list settings if not found

* Fix settings merging

* Refactor types
2021-09-17 11:59:28 +02:00
Kamil Pastuszka
4fcc3eec5e
Add Demo Banner (#1416) 2021-09-17 10:09:45 +02:00
Karolina Rakoczy
19e9b0ffc2
Saleor 4033 tests for plugins (#1317)
* tests for plugins

* tests for plugins

* add default country to create channel mutation

* change data-test-ids

* update snapshots
2021-09-10 11:03:42 +02:00
Jakub Majorek
d5a36e47fc
Add channel picker product details (#1355)
* Add channel picker product details (#1353)

* Enable channel picker on product details page

* Add channel picker to product details

* Simplify category details page

* Update snapshots and translations

* Update types

* Update testId, bump macaw-ui

* Update snapshots, types and schema
2021-09-03 14:27:34 +02:00
Paweł Kucharski
386a2488e7
Click & Collect (#1268)
* Add initial form of c&c related properties for warehouse

* Add Typography & styling to RadioButtons, drop duplicated state

* Add fields for warehouse fixtures + cleanup

* Add order collectionPointName field + handle click&collect display in order

* Fix review issues + add snapshots

* Modify choices in WarehouseZones with filter

* Rename WarehouseZones to WarehouseSettings

* Add translations messages

* Update schema

* Fix review issues pt.2

* Fix review issues pt.3

* Fix review issues

* Align defaultMessages.json to messages refactor

* Rename interface WarehouseInfo -> WarehouseSettings

* Add pickup annotation to shipping address in order details

* Introduce fragment matcher + small change in deliveryMethod query

* Fixes after rebase

* Add resolve fulfillment option for local warehouse

* Align types after rebase

* Update snapshots

* Repair weird union behaviour

* Add entry to CHANGELOG.md
2021-08-27 10:10:41 +02:00
SektorDV
3194654bf1
Disable shipping dialog confirm button when no items selected (#1304) 2021-08-23 11:16:35 +02:00
Jakub Majorek
ab4c897b2a
Add dashboard extensions (#1292)
* Fix app embed

* initial setup

* Create ButtonWithSelect component

* Use context

* Use dialog

* Handle app-bridge actions

* Code adjustments, bump packages

* Fix tests

* Fix schema formatting

* Send response

* Use latest package versions
2021-08-20 15:58:53 +02:00
SektorDV
a94a611949
Horizontal scroll fix on tables (#1306) (#1313)
* restore horizontal overflows to responsive tables

* regenerate package-lock
2021-08-20 14:16:19 +02:00
Jakub Majorek
f50e3bdde1
Bump master to 3.1.0-a.0 (#1296) 2021-08-16 16:01:04 +02:00
Karolina Rakoczy
283e714202
tests for pages (#1222)
* tests for pages

* fix tests

* fix imports

* tests for pages

* add wait

* tests for pages

* fix weight recalculate
2021-07-27 10:57:17 +02:00
Dominik Żegleń
62817568a7
Use MacawUI (#1229)
* Replace withStyleswith useStyles (#1100)

* Replace withStyleswith useStyles

* Update messages

* Use rem as a spacing unit (#1101)

* Use rems as spacing units

* Fix visual bugs

* Update stories

* Use macaw-ui as theme provider (#1108)

* Use macaw ui as a theme provider

* Add react-dom to aliases

* Fix jest module resolution

* Update useTheme hook usage

* Fix test wrapper

* Use macaw from git repo

* Fix CI

* Update stories

* Fix aliasing

* Extract savebar to macaw ui (#1146)

* wip

* Use savebar from macaw

* Use confirm button from macaw

* Improve file structure

* Use sidebar context from macaw

* Update macaw

* Update macaw version

* Remove savebar from storybook

* Update stories

* Use alerts and notifications from macaw (#1166)

* Use alerts from macaw

* Add notifications from macaw

* Update stories

* Pin macaw version

* Encapsulate limit reached in one component

* Remove unused imports

* Use backlinks from macaw (#1183)

* Use backlink from macaw

* Update macaw version

* Use macaw sidebar (#1148)

* Use sidebar from macaw

* Use shipped logo

* Use lowercase

* Update stories

* Use user chip from macaw (#1191)

* Use user chip from macaw

* Use dedicated components for menu items

* Simplify code

* Bump version and fix types (#1210)

* Rename onBack to onClick

* Rename UserChip to UserChipMenu

* Rename IMenuItem to SidebarMenuItem

* Update macaw version

* Fix tables after changes in macaw (#1220)

* Update macaw version

* Update changelog

* Update stories

* Fix after rebase

* Update to macaw 0.2.0

* Lint files

* Update macaw to 0.2.2
2021-07-21 10:59:52 +02:00
Dawid Tarasiuk
909e08f2af
Fix duplicated labels in column picker (#1197)
* Fix duplicated labels in column picker

* Update changelog

* Refactor column picker scroll fetch

* Migrate react-infinite-scroller to react-infinite-scroll-component

* Remove unneeded keys

* Align dialog items to top
2021-07-01 10:21:41 +02:00
Karolina Rakoczy
7df850bcb1
Saleor 3391 tests for staff members (#1122)
* invite staff

* staff members

* all tests for staff members

* remove unused import

* update snap

* remove /dashboard/

* uptade test.yml
2021-06-07 13:35:53 +02:00
Michał Ociepka
fbfe3c8d7c
Add embed plugin to editorjs (#1114)
* SALEOR-3354 add Editor.js embed dependency

* SALEOR-3354 add embed to EditorJS tools

* SALEOR-3354 update change log
2021-05-18 15:21:33 +02:00
Karolina Rakoczy
9f71106f32
Saleor 3038 tests for payments by adyen (#1086)
* add tests for puchase by type

* add expect for isShippingRequired

* tests for adyen

* tests for adyen

* tests for adyen

* tests for adyen

* adyen

* adyen

* adyen

* adyen

* adyen

* warehouses in chcekout

* rm warehouses in chcekout

* adyen payments

* adyen
2021-05-16 13:38:53 +02:00
Dominik Żegleń
935a6f4542
Reduce bundle size (#1103)
* Add analysis tools

* Use deep imports to reduce bundle size

* Remove tslint config

* Remove unused packages

* Remove lodash-es references

* Use root level mui imports

* Remove mui from restricted imports
2021-05-14 10:15:15 +02:00
Dawid Tarasiuk
5a439176b7
SALEOR 3115 Fix EditorJS inline formatting (#1096)
* Fix EditorJS inline formatting

* Update changelog
2021-05-07 10:06:08 +02:00
Piotr Grundas
2a21609eae
Numeric attributes (#1065)
* Update schema, types

* Add numeric unit control

* Improvements, tests

* Cleanup

* Add messages

* Small fixes

* Add test id's

* Improve useForm, logic

* Use short names

* Review corrections

* Small improvements
2021-04-29 10:58:03 +02:00
Dominik Żegleń
d220914085
Add service worker (#1073)
* Add service worker

* Update messages

* Update changelog

* Remove debug code

* Refactor code and add interval config

* Clear interval

* Reload all pages simultaneously

* Update copy
2021-04-26 12:10:47 +02:00
Karolina Rakoczy
b89e3533d6
Saleor 2690 tests for sorting products (#1033)
* tests for sorting

* tests for sorting

* sort products

* sort products

* sort products

* sort products

* tests for sorting

* fix imports

* tests for sorting
2021-04-21 09:51:10 +02:00
Jakub Majorek
e5df1b2dbf
Add shipping method description (#1058)
* Add shipping method description - WIP

* Wire up logic

* Handle more editorjs issues

* Fix minor issues

Co-authored-by: Dawid Tarasiuk <tarasiukdawid@gmail.com>
2021-04-16 14:33:14 +02:00
Jakub Majorek
80cb7c0404
Optimize product list view queries (#1016)
* Skip unused queries on product list

* Further optimize queries

* Fix product type details search on product create page

* Fix test fixtures

* Update query for product type details in product create page

* Update cypress test for product list

* Update package.lock

Co-authored-by: Dawid Tarasiuk <tarasiukdawid@gmail.com>
2021-04-08 18:14:15 +02:00
Tomasz Szymanski
af4368e853 Merge branch 'master' of github.com:mirumee/saleor-dashboard into feature/unconfirmed-order-line-manipulation 2021-04-06 14:03:01 +02:00
Krzysztof Wolski
f18f2a6ca6
Add missing bumper pkg (#1048) 2021-04-02 16:30:39 +02:00
Karolina
588175df30
Saleor 1737 tests for shipping methods (#1013)
* remove classes in shipping & products utils

* remove classes

* add tests plans

* add const

* tests for shipping methods

* test for shipping

* test for shipping

* tests for shipping

* install eslint-plugin-chai-friendly

* update stories

* add missing imports
2021-04-02 13:01:38 +02:00
Tomasz Szymanski
e5fdef53df Merge branch 'master' of github.com:mirumee/saleor-dashboard into feature/unconfirmed-order-line-manipulation 2021-03-31 12:38:10 +02:00
Jakub Majorek
5416c9f865
Ignore EditorJS errors (#1036)
* Ignore EditorJS error

* Update messages
2021-03-30 16:31:38 +02:00
Krzysztof Wolski
9b486d6682
Add release-it script (#1034) 2021-03-30 14:37:12 +02:00
Tomasz Szymanski
b4a7c9f471 Merge branch 'master' of github.com:mirumee/saleor-dashboard into feature/unconfirmed-order-line-manipulation 2021-03-23 08:52:27 +01:00
Jakub Majorek
7bc4bc6696
Define node requirements, ts cleanup (#1008)
* Define node requirements, ts cleanup

* Update snapshot

* fix tests
2021-03-19 13:06:17 +01:00
Tomasz Szymanski
17e01508a6 Merge branch 'master' of github.com:mirumee/saleor-dashboard into feature/unconfirmed-order-line-manipulation 2021-03-16 11:11:47 +01:00
Jakub Majorek
a7736e2bf9
Attach permission variables to all queries (#1000)
* [SALEOR-2190] Attach permission variables to all queries

* Fix TS linter issues

* Update package-lock
2021-03-09 09:44:09 +01:00
mmarkusik
2cd4ea9529
Saleor 1856/implement discount modal 2 (#978)
* Add currency to orderline unitprice and update hella lots of types

* wip

* Add diiscount modal component

* Refactor action dialog - move buttons to separate component so they can be reused

* Add discount provider to keep logic of discounts separated and wrap proper components

* Add discount ccalculator util class, and make draft details summary use it, along with discounts data, modal etc

* UUpdate lots of types, fragments, schema etc

* Update quries and mutations

* ARename OrderLineDiscountModal -> OrderDiscountCommonModal, add types etc

* Add order line discount provider + consumer, same for order discount

* Fix ts wip

* Update schema and types

* Update order discount provider

* Add nnetto price to order details fragment and update lots of types

* Adjust fixtures to order details containing net total

* Move both order and order line provider to same dir to make types and utils more accessible

* Update schema to match master

* Update schema and types

* Update order history, add some related components, add events etc.

* Fix types

* Fix schema to match master

* Update messages

* Update changelog

* Retrigger build

* Add stories and update common modal to display floats properly

* Add and update stories and tests

* Add optional displaying of reason in case it's empty

* Make user name label for history events return email if last name and first name are absent

* Update schema, types, and mutations to properly refresh

* Remove unnecessary imports

* Add discounts decorator to draft details page storybook

* Fixs after review

* Update messages

* Small fixes to timeline events

* Update types for order shipping price to use net as well, fix labels in draft summary and add colors to theme palette

* Updaste tests, messages

* Fixs after review

* Add theme highlighted active and inactive color text, add valuue conversion to discount modal when changing calculation mode

* Add change to changelog

* Add extra options to select employee display name for order event when some data is missing. Also add filtering null elements in event header when data missing alltogether and element is null

* Refactor selecting employee name in utils

* Add conditional to extended timeline event when orderline is null
2021-03-05 15:52:02 +01:00
Karolina Rakoczy
30e3fd9320 tests for variants 2021-03-01 13:37:31 +01:00
Karolina Rakoczy
5f413d16fc merge with tests for products 2021-02-18 21:08:06 +01:00
Karolina Rakoczy
ecca49608a merge all changes 2021-02-11 15:31:36 +01:00
Karolina Rakoczy
221756a70e merge changes 2021-02-11 15:17:00 +01:00
Karolina
7bb3efa65d
Saleor 1736 configuration channels (#966)
* Cypress tests for channels

Co-authored-by: Marcin Gębala <maarcin.gebala@gmail.com>
Co-authored-by: Krzysztof Wolski <krzysztof.k.wolski@gmail.com>
2021-02-11 14:58:05 +01:00
Karolina
68eb5309ef
Merge branch 'master' into SALEOR-1738-Tests-for-home-page 2021-02-11 13:53:29 +01:00
Karolina Rakoczy
d738c515c0 install faker 2021-02-11 13:48:24 +01:00
Karolina Rakoczy
e1bd4b28e9 add test for several variants 2021-02-11 10:20:39 +01:00
Karolina Rakoczy
322c5cc13c update packages 2021-02-10 15:21:58 +01:00
Jakub Majorek
383055a2de
SALEOR-2064 Add generic error tracker with Sentry adapter (#956)
* Add generic error tracker with Sentry extension

* Add Sentry webpack plugin

* Update variable names and README

* Update deploy-staging template

* Update changelog
2021-01-22 15:05:26 +01:00
Jakub Majorek
77ed12664d
Fix rare editorjs race condition (#953) 2021-01-21 09:54:53 +01:00
Dawid Tarasiuk
eb351b396a
Refunds (#870)
* 1721 - add refunds miscellaneous view (#860)

* Create new page for Miscellaneous Refunds

* Replace refund order dialog with dedicated page

* Add data test ids

* Update order details view for refunds (#874)

* 1719 - add refund entry to order history (#875)

* Add refund order history entry

* Update refund event with the right query

* 1722 - add refunds product view (#873)

* Create new page for Miscellaneous Refunds

* Replace refund order dialog with dedicated page

* Add data test ids

* Create refund products table

* Implement refund products view

* Update refund mutation with product lines input

* Fix products quantities on refund page

* Fix order refund submission

* Fix products refund submission input variables

* Filter out fulfillments on refund page

* Update refund page in storybook

* Fix test snapshots after wrong refunds rebase

* Set max refund as captured amount

* Refund queries adjustments

* Display refund values with nullish coalescing operator

* Update test snapshots with refunds

* Refactor order refund values calculation

* Create and use refund order line fragment

* Use old simple refund mutation for miscellaneous refund

* Submit for refund only lines with non-zero quantity set

* Fix showing refund error

* Fix refund details on order details page (#879)

* Update order details view for refunds (#874)

* 1719 - add refund entry to order history (#875)

* Add refund order history entry

* Update refund event with the right query

* 1722 - add refunds product view (#873)

* Create new page for Miscellaneous Refunds

* Replace refund order dialog with dedicated page

* Add data test ids

* Create refund products table

* Implement refund products view

* Update refund mutation with product lines input

* Fix products quantities on refund page

* Fix order refund submission

* Fix products refund submission input variables

* Filter out fulfillments on refund page

* Update refund page in storybook

* Fix test snapshots after wrong refunds rebase

* Set max refund as captured amount

* Refund queries adjustments

* Display refund values with nullish coalescing operator

* Update test snapshots with refunds

* Refactor order refund values calculation

* Create and use refund order line fragment

* Use old simple refund mutation for miscellaneous refund

* Submit for refund only lines with non-zero quantity set

* Fix showing refund error

* Add missing refund amount to order history

* Merge repeated order lines in fulfillment lines

* Update order history events types and test snapshots

* Update changelog with refunds changes
2020-12-01 14:13:05 +01:00
Krzysztof Wolski
6762e7bf3f
[chore] Update dependencies, fix warnings during tests (#845)
* Fix attr name typo

* Use proper string serialization

* Use proper image URL

* Remove unused draft component

* Fix classname for invoice card

* Update deps

* Remove unused testcafe

* Resolve issue with missing intl in one of the stories, bump intl package version

* Update packages

* Update commit hooks

* Bump ts to last pre4.0 version

* Center metadata image

* Unused property

* Bump enzyme

* Revert

* Fix logo on login screen

* Fix console errors on entering translations pages

* Fix styles for invoice card
2020-11-27 17:32:12 +01:00