Skip to content

fix(MM2-1953): add vendor promotions rule attribute options middleware and update related validation logic #254

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

Open
tomaszburas wants to merge 2 commits into
base: development
Choose a base branch
from
Open

fix(MM2-1953): add vendor promotions rule attribute options middleware and update related validation logic #254

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee0564d
fix(MM2-1953): add vendor promotions rule attribute options middlewar…
tomaszburas Nov 30, 2025
7a5ecbf
refactor(promotions): standardize formatting and improve type definit…
tomaszburas Dec 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/hooks/api/promotions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { HttpTypes } from "@medusajs/types"
import { FetchError } from "@medusajs/js-sdk"
import { HttpTypes } from "@medusajs/types"
import {
QueryKey,
useMutation,
Expand Down
22 changes: 21 additions & 1 deletion ...s/promotions/common/edit-rules/components/rule-value-form-field/rule-value-form-field.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ type RuleValueFormFieldType = {
ruleType: "rules" | "target-rules" | "buy-rules"
}

type VendorPromotionRuleValueParams = HttpTypes.AdminGetPromotionsRuleValueParams & {
promotion_type?: string
application_method_type?: string
}

const buildFilters = (attribute?: string, store?: HttpTypes.AdminStore) => {
if (!attribute || !store) {
return {}
Expand Down Expand Up @@ -49,10 +54,25 @@ export const RuleValueFormField = ({
)

const { store, isLoading: isStoreLoading } = useStore()

const promotionType = useWatch({
control: form.control,
name: "type",
})

const applicationMethodType = useWatch({
control: form.control,
name: "application_method.type",
})

const { values: options = [] } = usePromotionRuleValues(
ruleType,
attribute?.id!,
buildFilters(attribute?.id, store),
{
...buildFilters(attribute?.id, store),
promotion_type: promotionType,
application_method_type: applicationMethodType,
} as VendorPromotionRuleValueParams,
Copy link
Collaborator

@kactok kactok Dec 11, 2025

Choose a reason for hiding this comment

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

Shouldn't we set VendorPromotionRuleValueParams as the type of the query param in usePromotionRuleValues instead of type-casting it here?

Copy link
Collaborator Author

@tomaszburas tomaszburas Dec 11, 2025

Choose a reason for hiding this comment

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

you are right

{
enabled:
!!attribute?.id &&
Expand Down