Discount catalog with promotion api #4476
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
temporarily deployed
to
pr-4232-discount-catalog-api
github-actions
bot
temporarily deployed
to
storybook pr-4232-discount-catalog-api
github-actions
bot
temporarily deployed
to
storybook pr-4232-discount-catalog-api
github-actions
bot
temporarily deployed
to
pr-4232-discount-catalog-api
github-actions
bot
temporarily deployed
to
storybook pr-4232-discount-catalog-api
github-actions
bot
temporarily deployed
to
pr-4232-discount-catalog-api
andrzejewsky
previously approved these changes
Dec 18, 2023
Droniu
previously approved these changes
Dec 18, 2023
src/discounts/components/DiscountRules/componenets/RuleForm/RuleForm.tsx
Show resolved
Hide resolved
...mponents/DiscountRules/componenets/RuleForm/components/RuleConditionRow/RuleConditionRow.tsx
Outdated
Show resolved
Hide resolved
| condition.type ? typeToFetchMap[condition.type] : undefined | ||
| } | ||
| isConditionTypeSelected={isConditionTypeSelected} | ||
| key={condition.type || conditionIndex} |
There was a problem hiding this comment.
question if I understand this correctly it's possible to have multiple rule conditions of same types? If so this is gonna result in duplicated keys
There was a problem hiding this comment.
Nope, you can't have multiple rule conditions with same type
...s/components/DiscountRules/componenets/RuleForm/components/RuleConditions/RuleConditions.tsx
Outdated
Show resolved
Hide resolved
...nents/DiscountRules/componenets/RuleForm/components/RuleConditions/hooks/useProductSearch.ts
Outdated
Show resolved
Hide resolved
...scounts/components/DiscountRules/componenets/RuleForm/components/RuleSummary/RuleSummary.tsx
Outdated
Show resolved
Hide resolved
...scounts/components/DiscountRules/componenets/RuleForm/components/RuleSummary/RuleSummary.tsx
Outdated
Show resolved
Hide resolved
github-actions
bot
temporarily deployed
to
storybook pr-4232-discount-catalog-api
github-actions
bot
temporarily deployed
to
pr-4232-discount-catalog-api
Droniu
approved these changes
Dec 18, 2023
poulch
added a commit
that referenced
this pull request
Dec 19, 2023
* Generate flag * Init new discounts create and details view * Update params types * Discount page components * Add discount rules and metadata * Add react-hook-form * Update types * Handle form using RHF * Selecting channel and showing currency code * Connect rules conditon to rhf * Rename Inputs to CreateDiscoutFormData * DiscountDetailsPage and handle submit and edit rule * Bump macaw ui * Improve structure and typing * Add changeset * Add stories * Extract messages * Fix CR comments * createPromotin mutation and types * Create promotion and display details * Fix loading description text * Fetch condition row * Handle fetch more and fix fetch with query * Send coditions during create * Handle display condition in details * Refactor create promotion handler * Fix some types * Introduct RuleDTO * Add variant search * Category type fix * Fetch condition options labels names * Add fetch condition option in discount detail * Handle promotion details update * Handle submit rules update/create using single button submit * Fix some ts strict null * Move condition fetch options to component * Extract messages * Add changeset * Improve condition option fetch * Fix input bg color on rule and showing when selected channels * Handle disable state, fix description in rule * Set percantage reward type when no currency * Show rule name when rule not collapsed * Bump macaw ui * Fix discount switch to use value * Error handling * Introduce RuleSummary * Improve fetch conditions options details * Remove rules, show rules list summaries * RuleModal, show rule on create page in modal * Handle edit/add rule inside modal on details promotion page * Two column rules grid * Handle delete rule * Show text when no channels selected * Client side rule form validation * Adjust size of reward * Introduce rule edit button * Fix showing ids instead of labels * Always show reward, handle loading during rule deletion * Fix ruleRewardValue number, move option fetch higher, fix fetch labels for selected options * Single channel, fetch option labels when promotion change * Fetch condition option only when channel * Improve validation schema * Name and channel in one row * Fix rule index conditions, fix hasEndDate checkbox change handling * Fix clearing conditions on channel change * Improve rule summary conditions values disply * Temp fix rule modal overflow * Fix clear values when change condition type * Fix tests * Fix ts errors * Update tests * Fix theme colors vars * Bump macaw version * DiscountRules tests * Improve rule summary colors and add button * Test RuleModal * Improve summary chips colors * Fix scroll issue * Fix multiple conditions * Restore usePreviousValue * Improve types * Update changeset to patch * Use sparate urls for discounts * Refactor dto into view models * Fix tests with empty rule during rule creation * Form refactor * Test DiscountRules, update props * Update index type from string to number * Validation schema for discount form * Fix description in init form values * Update mocks and fixures * Add mocks to storybook * Update test * Update description type * Add fromFormValues methods to Rule and Conditon * Fix rule delete and update handlers * CR fixes * Fix zod import * Remove any types * Fix is translation
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
closes #4232
To switch on/off feature flag, run this code in browser console
Screenshots
Pull Request Checklist
data-test-idare added for new elementsTest 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.
CONTAINERS=2