feat(dashboard,medusa): Promotion Campaign fixes #7337

riqwan · 2024-05-15T08:42:14Z

what:

introduces currency code to promotions
adds validations based on currency
scope currencies by store currencies
scope promotion add to campaign with currency
scope campaigns with correct currency
promotion currency carried over to campaign create
use select instead of combobox for equals operator
resolve type issues
a whole load of fixes

…are inferred (#7292)

* feat: Add support for sendgrid and logger notification providers * fix: changes based on PR review

* chore: add action to automatically label docs * removes the paths param

* configured base paths + added development banner * fix typelist site url * added navbar and sidebar badges * configure algolia filters * remove AI assistant * remove unused imports * change navbar text and badge * lint fixes * fix build error * add to api reference rewrites * fix build error * fix build errors in user-guide * fix feedback component * add parent title to pagination * added breadcrumbs component * remove user-guide links * resolve todos * fix details about authentication * change documentation title * lint content

vercel · 2024-05-15T08:42:18Z

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

Name	Status	Preview	Comments	Updated (UTC)
medusa-dashboard	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	May 23, 2024 1:12pm

3 Ignored Deployments

Name	Status	Preview	Updated (UTC)
api-reference	⬜️ Ignored (Inspect)		May 23, 2024 1:12pm
docs-ui	⬜️ Ignored (Inspect)	Visit Preview	May 23, 2024 1:12pm
medusa-docs	⬜️ Ignored (Inspect)	Visit Preview	May 23, 2024 1:12pm

changeset-bot · 2024-05-15T08:42:19Z

⚠️ No Changeset found

Latest commit: 92cd41d

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

...in-next/dashboard/src/v2-routes/promotions/promotion-add-campaign/promotion-add-campaign.tsx

olivermrbl

I think this is a bit too hard to review as it is composed of many small changes. Therefore, I would rather just have this merged and then review the promotions module all together in the next couple of months.

What do you think?

That said, I left a few comments on things that would be good to have documented for understanding.

olivermrbl · 2024-05-23T10:09:37Z

...utes/campaigns/common/components/create-campaign-form-fields/create-campaign-form-fields.tsx

-            )
-          }}
-        />
+        <div></div>


rm?

Suggested change

<div></div>

This is actually needed to keep the grid spot the same size :D

Ahh I see :smile

olivermrbl · 2024-05-23T10:16:54Z

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

@@ -4,6 +4,7 @@ export type AdminGetPromotionRulesRes = {
  attribute_label: string
  field_type?: string
  operator: string
+  hydrate: boolean


thought: Could I get you to write a brief doc on how all of these properties tie together and their function, specifically hydrate and disguised? I lost track of that over the past months 😅

Yes will do, I think most of these can now be removed as we don't use them anymore. Will do a cleanup after all the kinks are sorted. 🤞🏻

olivermrbl · 2024-05-23T10:17:31Z

packages/medusa/src/api/admin/promotions/utils/rule-attributes-map.ts

@@ -1,6 +1,7 @@
 export enum DisguisedRule {


Same for this. Please include this attributes map in the doc 🙏

olivermrbl · 2024-05-23T10:17:39Z

packages/medusa/src/api/admin/promotions/utils/rule-query-configuration.ts

@@ -4,9 +4,9 @@ export const ruleQueryConfigurations = {
    labelAttr: "name",


And this :D

kodiakhq · 2024-05-23T12:10:40Z

This PR currently has a merge conflict. Please resolve this and then re-add the automerge label.

… for UI extensions (#7383) * intial work * update lock * add routes and fix HMR of configs * cleanup * rm imports * rm debug from plugin * address feedback * address feedback

riqwan and others added 13 commits May 10, 2024 15:23

chore(medusa): strict zod versions in workspace

3fd882a

feat(dashboard): add campaign create to promotion UI

bc2bec6

wip

da0f773

fix(medusa): Missing middlewares export (#7289)

d80d04d

fix(docblock-generator): fix how type names created from Zod objects …

ea753dd

…are inferred (#7292)

feat(api-ref): show schema of a tag (#7297)

6b12c35

feat: Add support for sendgrid and logger notification providers (#7290)

a7bd799

* feat: Add support for sendgrid and logger notification providers * fix: changes based on PR review

chore: add action to automatically label docs (#7284)

01e6b4a

* chore: add action to automatically label docs * removes the paths param

chore: fix bug with form reset

0e8d6ee

chore: address reviews

f519052

chore: fix specs

cdb82ea

chore: loads of FE fixes + BE adds

25efb7f

Base automatically changed from feat/campaign-create to develop May 15, 2024 08:43

vercel bot deployed to Preview – medusa-dashboard May 15, 2024 08:44 View deployment

chore: merge with latest

7cccfe4

github-actions bot added the team: medusa label May 15, 2024

vercel bot deployed to Preview – medusa-dashboard May 15, 2024 08:49 View deployment

chore: add more polishes + reorg files

c92ac0e

vercel bot deployed to Preview – medusa-dashboard May 15, 2024 11:27 View deployment

chore: fixes to promotions modal

38a6ea5

vercel bot had a problem deploying to Preview – medusa-dashboard May 15, 2024 13:27 Failure

riqwan added 2 commits May 15, 2024 15:35

chore: cleanup

3a539b4

chore: cleanup

b8a02a4

vercel bot deployed to Preview – medusa-dashboard May 15, 2024 13:38 View deployment

chore: fix build

0968b1b

vercel bot deployed to Preview – medusa-dashboard May 15, 2024 13:43 View deployment

riqwan changed the title ~~Feat/promotion campaigns~~ feat(dashboard,medusa): Promotion Campaign fixes May 15, 2024

riqwan commented May 22, 2024

View reviewed changes

...in-next/dashboard/src/v2-routes/promotions/promotion-add-campaign/promotion-add-campaign.tsx Outdated Show resolved Hide resolved

riqwan added 2 commits May 22, 2024 12:23

remove console logs

1a69dd0

Merge branch 'develop' into feat/promotion-campaigns

a312a88

vercel bot deployed to Preview – medusa-dashboard May 22, 2024 10:25 View deployment

Merge branch 'develop' into feat/promotion-campaigns

295edd6

vercel bot deployed to Preview – medusa-dashboard May 22, 2024 20:04 View deployment

Merge branch 'develop' into feat/promotion-campaigns

19b8f07

vercel bot deployed to Preview – medusa-dashboard May 23, 2024 08:14 View deployment

chore: add translations + update keys

d1b1fd8

vercel bot deployed to Preview – medusa-dashboard May 23, 2024 09:59 View deployment

olivermrbl approved these changes May 23, 2024

View reviewed changes

vercel bot had a problem deploying to Preview – medusa-dashboard May 23, 2024 11:05 Failure

riqwan force-pushed the feat/promotion-campaigns branch from 314517a to d1b1fd8 Compare May 23, 2024 11:32

riqwan added 2 commits May 23, 2024 13:36

Merge branch 'develop' into feat/promotion-campaigns

b5bbf17

chore: move over filesfrom v2 to routes

68e3c4a

vercel bot deployed to Preview – medusa-dashboard May 23, 2024 11:50 View deployment

Merge branch 'develop' into feat/promotion-campaigns

8e1e18f

riqwan added the automerge label May 23, 2024

vercel bot deployed to Preview – medusa-dashboard May 23, 2024 11:52 View deployment

kodiakhq bot removed the automerge label May 23, 2024

kasperkristensen added 2 commits May 23, 2024 14:56

chore(dashboard): Delete old translation files (#7423)

b059732

feat(dashboard,admin-sdk,admin-shared,admin-vite-plugin): Add support…

dba7900

… for UI extensions (#7383) * intial work * update lock * add routes and fix HMR of configs * cleanup * rm imports * rm debug from plugin * address feedback * address feedback

riqwan requested a review from a team as a code owner May 23, 2024 12:56

riqwan added 3 commits May 23, 2024 14:57

chore: merge latest

8967505

temp skip specs

681188e

Merge branch 'develop' into feat/promotion-campaigns

92cd41d

vercel bot deployed to Preview – medusa-dashboard May 23, 2024 13:12 View deployment

riqwan merged commit d1d23f1 into develop May 23, 2024
17 checks passed

riqwan deleted the feat/promotion-campaigns branch May 23, 2024 13:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(dashboard,medusa): Promotion Campaign fixes #7337

feat(dashboard,medusa): Promotion Campaign fixes #7337

riqwan commented May 15, 2024 •

edited

Loading

vercel bot commented May 15, 2024 •

edited

Loading

changeset-bot bot commented May 15, 2024 •

edited

Loading

olivermrbl left a comment

olivermrbl May 23, 2024

riqwan May 23, 2024

olivermrbl May 23, 2024

olivermrbl May 23, 2024

riqwan May 23, 2024

olivermrbl May 23, 2024

olivermrbl May 23, 2024

olivermrbl May 23, 2024

kodiakhq bot commented May 23, 2024

		@@ -4,9 +4,9 @@ export const ruleQueryConfigurations = {
		labelAttr: "name",

feat(dashboard,medusa): Promotion Campaign fixes #7337

feat(dashboard,medusa): Promotion Campaign fixes #7337

Conversation

riqwan commented May 15, 2024 • edited Loading

vercel bot commented May 15, 2024 • edited Loading

changeset-bot bot commented May 15, 2024 • edited Loading

⚠️ No Changeset found

olivermrbl left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kodiakhq bot commented May 23, 2024

riqwan commented May 15, 2024 •

edited

Loading

vercel bot commented May 15, 2024 •

edited

Loading

changeset-bot bot commented May 15, 2024 •

edited

Loading