fix: fix tabs + required fields (#7892)

packages/admin-next/dashboard/src/i18n/translations/en.json

@@ -1101,6 +1101,11 @@
     "sections": {
       "details": "Promotion Details"
     },
+    "tabs": {
+      "template": "Template",
+      "promotion": "Promotion",
+      "campaign": "Campaign"
+    },
     "fields": {
       "method": "Method",
       "type": "Type",
@@ -1128,6 +1133,9 @@
         }
       }
     },
+    "tooltips": {
+      "campaignType": "Select the currency code in the promotion tab to enable it."
+    },
     "errors": {
       "requiredField": "Required field"
     },

packages/admin-next/dashboard/src/routes/campaigns/campaign-create/components/create-campaign-form/create-campaign-form.tsx

@@ -18,16 +18,11 @@ export const CreateCampaignSchema = zod.object({
   campaign_identifier: zod.string().min(1),
   starts_at: zod.date().optional(),
   ends_at: zod.date().optional(),
-  budget: zod
+  budget: zod.object({
-    .object({
+    limit: zod.number().min(0).nullish(),
-      limit: zod.number().min(0).optional().nullable(),
+    type: zod.enum(["spend", "usage"]),
-      type: zod.enum(["spend", "usage"]),
+    currency_code: zod.string().nullish(),
-      currency_code: zod.string().optional().nullable(),
+  }),
-    })
-    .refine((data) => data.type !== "spend" || data.currency_code, {
-      path: ["currency_code"],
-      message: `required field`,
-    }),
 })
 
 export const defaultCampaignValues = {
@@ -35,7 +30,7 @@ export const defaultCampaignValues = {
   description: "",
   campaign_identifier: "",
   budget: {
-    type: "spend" as CampaignBudgetTypeValues,
+    type: "usage" as CampaignBudgetTypeValues,
     currency_code: null,
     limit: null,
   },

packages/admin-next/dashboard/src/routes/campaigns/common/components/create-campaign-form-fields/create-campaign-form-fields.tsx

@@ -32,6 +32,11 @@ export const CreateCampaignFormFields = ({ form, fieldScope = "" }) => {
     name: `${fieldScope}budget.currency_code`,
   })
 
+  const promotionCurrencyValue = useWatch({
+    control: form.control,
+    name: `application_method.currency_code`,
+  })
+
   const watchPromotionCurrencyCode = useWatch({
     control: form.control,
     name: "application_method.currency_code",
@@ -192,7 +197,15 @@ export const CreateCampaignFormFields = ({ form, fieldScope = "" }) => {
         render={({ field }) => {
           return (
             <Form.Item>
-              <Form.Label>{t("campaigns.budget.fields.type")}</Form.Label>
+              <Form.Label
+                tooltip={
+                  currencyValue
+                    ? undefined
+                    : t("promotions.tooltips.campaignType")
+                }
+              >
+                {t("campaigns.budget.fields.type")}
+              </Form.Label>
 
               <Form.Control>
                 <RadioGroup
@@ -200,17 +213,18 @@ export const CreateCampaignFormFields = ({ form, fieldScope = "" }) => {
                   {...field}
                   onValueChange={field.onChange}
                 >
-                  <RadioGroup.ChoiceBox
-                    value={"spend"}
-                    label={t("campaigns.budget.type.spend.title")}
-                    description={t("campaigns.budget.type.spend.description")}
-                  />
-
                   <RadioGroup.ChoiceBox
                     value={"usage"}
                     label={t("campaigns.budget.type.usage.title")}
                     description={t("campaigns.budget.type.usage.description")}
                   />
+
+                  <RadioGroup.ChoiceBox
+                    value={"spend"}
+                    label={t("campaigns.budget.type.spend.title")}
+                    description={t("campaigns.budget.type.spend.description")}
+                    disabled={!!!(currencyValue || promotionCurrencyValue)}
+                  />
                 </RadioGroup>
               </Form.Control>
               <Form.ErrorMessage />

packages/admin-next/dashboard/src/routes/promotions/common/edit-rules/components/rules-form-field/rules-form-field.tsx

@@ -78,39 +78,30 @@ export const RulesFormField = ({
     }
 
     if (ruleType === "rules" && !fields.length) {
+      form.resetField("rules")
+
       replace(generateRuleAttributes(rules) as any)
     }
 
-    if (ruleType === "rules" && promotionType === "standard") {
+    if (ruleType === "buy-rules" && !fields.length) {
       form.resetField("application_method.buy_rules")
-      form.resetField("application_method.target_rules")
+      const rulesToAppend =
-    }
+        promotion?.id || promotionType === "standard"
-
+          ? rules
-    if (
+          : [...rules, requiredProductRule]
-      ["buy-rules", "target-rules"].includes(ruleType) &&
-      promotionType === "standard"
-    ) {
-      form.resetField(scope)
-      replace([])
-    }
-
-    if (
-      ["buy-rules", "target-rules"].includes(ruleType) &&
-      promotionType === "buyget"
-    ) {
-      form.resetField(scope)
-      const rulesToAppend = promotion?.id
-        ? rules
-        : [...rules, requiredProductRule]
 
       replace(generateRuleAttributes(rulesToAppend) as any)
-
-      return
     }
 
-    form.resetField(scope)
+    if (ruleType === "target-rules" && !fields.length) {
+      form.resetField("application_method.target_rules")
+      const rulesToAppend =
+        promotion?.id || promotionType === "standard"
+          ? rules
+          : [...rules, requiredProductRule]
 
-    replace(generateRuleAttributes(rules) as any)
+      replace(generateRuleAttributes(rulesToAppend) as any)
+    }
   }, [promotionType, isLoading])
 
   return (

packages/admin-next/dashboard/src/routes/promotions/promotion-create/components/create-promotion-form/create-promotion-form.tsx

@@ -322,18 +322,18 @@ export const CreatePromotionForm = () => {
                     value={Tab.TYPE}
                     status={detailsProgress}
                   >
-                    {t("fields.type")}
+                    {t("promotions.tabs.template")}
                   </ProgressTabs.Trigger>
 
                   <ProgressTabs.Trigger
                     className="w-full"
                     value={Tab.PROMOTION}
                   >
-                    {t("fields.details")}
+                    {t("promotions.tabs.promotion")}
                   </ProgressTabs.Trigger>
 
                   <ProgressTabs.Trigger className="w-full" value={Tab.CAMPAIGN}>
-                    {t("promotions.fields.campaign")}
+                    {t("promotions.tabs.campaign")}
                   </ProgressTabs.Trigger>
                 </ProgressTabs.List>
               </div>

packages/core/types/src/promotion/mutations.ts

@@ -87,7 +87,7 @@ export interface CreateCampaignDTO {
   /**
    * The associated campaign budget.
    */
-  budget?: CreateCampaignBudgetDTO
+  budget?: CreateCampaignBudgetDTO | null
 }
 
 /**

packages/medusa/src/api/admin/campaigns/validators.ts

@@ -29,7 +29,7 @@ export const AdminGetCampaignsParams = createFindParams({
 export const CreateCampaignBudget = z
   .object({
     type: z.nativeEnum(CampaignBudgetType),
-    limit: z.number().optional(),
+    limit: z.number().nullish(),
     currency_code: z.string().nullish(),
   })
   .strict()
@@ -52,7 +52,7 @@ export const CreateCampaignBudget = z
 
 export const UpdateCampaignBudget = z
   .object({
-    limit: z.number().optional(),
+    limit: z.number().nullish(),
   })
   .strict()
 
@@ -62,7 +62,7 @@ export const AdminCreateCampaign = z
     name: z.string(),
     campaign_identifier: z.string(),
     description: z.string().nullish(),
-    budget: CreateCampaignBudget.optional(),
+    budget: CreateCampaignBudget.nullish(),
     starts_at: z.coerce.date().nullish(),
     ends_at: z.coerce.date().nullish(),
     promotions: z.array(z.object({ id: z.string() })).optional(),

packages/modules/promotion/src/models/promotion.ts

@@ -51,7 +51,6 @@ export default class Promotion {
     fieldName: "campaign_id",
     nullable: true,
     mapToPk: true,
-    onDelete: "set null",
   })
   campaign_id: string | null = null