Skip to content
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

chore: upgrade to mikro orm 6 #10655

Draft
wants to merge 39 commits into
base: develop
Choose a base branch
from
Draft

chore: upgrade to mikro orm 6 #10655

Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
a79d148
initial commit
carlos-r-l-rodrigues Dec 16, 2024
70e7fb1
Merge branch 'develop' of https://github.com/medusajs/medusa into cho…
carlos-r-l-rodrigues Dec 17, 2024
66f48d0
cart service
carlos-r-l-rodrigues Dec 17, 2024
666f219
order module
carlos-r-l-rodrigues Dec 17, 2024
4808b37
utils unit test
carlos-r-l-rodrigues Dec 17, 2024
c4d93dc
index engine
carlos-r-l-rodrigues Dec 18, 2024
e934d21
changeset
carlos-r-l-rodrigues Dec 18, 2024
ee26f2b
Merge branch 'develop' of https://github.com/medusajs/medusa into cho…
carlos-r-l-rodrigues Dec 18, 2024
1c55990
merge
carlos-r-l-rodrigues Dec 18, 2024
d4e2afc
fix hasOne with fk
carlos-r-l-rodrigues Dec 18, 2024
986dd45
update
carlos-r-l-rodrigues Dec 18, 2024
4c8235c
Merge branch 'develop' of https://github.com/medusajs/medusa into cho…
carlos-r-l-rodrigues Dec 19, 2024
cd75aa0
free text filter per entity
carlos-r-l-rodrigues Dec 19, 2024
40f6a2b
tests
carlos-r-l-rodrigues Dec 19, 2024
30ebace
Merge branch 'develop' into chore/mikro-orm-6
carlos-r-l-rodrigues Dec 19, 2024
63fcdf5
prod category
carlos-r-l-rodrigues Dec 19, 2024
1a18a43
property string many to many
carlos-r-l-rodrigues Dec 19, 2024
27111f7
fix big number
carlos-r-l-rodrigues Dec 19, 2024
65be12d
link modules migration set names
carlos-r-l-rodrigues Dec 20, 2024
a38bf25
Merge branch 'develop' of https://github.com/medusajs/medusa into cho…
carlos-r-l-rodrigues Dec 20, 2024
1e203d0
merge
carlos-r-l-rodrigues Dec 20, 2024
a623e68
shipping option rules
carlos-r-l-rodrigues Dec 20, 2024
ca2cacf
serializer
carlos-r-l-rodrigues Dec 20, 2024
7a784e6
unit test
carlos-r-l-rodrigues Dec 20, 2024
2f43720
fix test mikro orm init
adrien2p Dec 20, 2024
024bea6
Merge branch 'chore/mikro-orm-6' of github.com:medusajs/medusa into c…
adrien2p Dec 20, 2024
eabe606
fix test mikro orm init
adrien2p Dec 20, 2024
6c6caac
Maintain merge object properties
adrien2p Dec 20, 2024
2568185
fix test mikro orm init
adrien2p Dec 20, 2024
e827a9f
prevent unit test from connecting to db
adrien2p Dec 20, 2024
a842d14
fix test
carlos-r-l-rodrigues Dec 20, 2024
88dcd49
fix test
carlos-r-l-rodrigues Dec 20, 2024
0548870
link test
carlos-r-l-rodrigues Dec 20, 2024
261d723
auto increment
carlos-r-l-rodrigues Dec 20, 2024
f5c5f17
Merge branch 'develop' into chore/mikro-orm-6
carlos-r-l-rodrigues Dec 20, 2024
deef4af
Merge branch 'develop' of https://github.com/medusajs/medusa into cho…
carlos-r-l-rodrigues Jan 6, 2025
18549f9
orm version
carlos-r-l-rodrigues Jan 6, 2025
8ae22b7
Merge branch 'chore/mikro-orm-6' of https://github.com/medusajs/medus…
carlos-r-l-rodrigues Jan 6, 2025
2862b97
Merge branch 'develop' into chore/mikro-orm-6
carlos-r-l-rodrigues Jan 6, 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
Prev Previous commit
Next Next commit
prod category
  • Loading branch information
@carlos-r-l-rodrigues
carlos-r-l-rodrigues committed Dec 19, 2024
commit 63fcdf5f3c75c064bc570cc362782a245a013ac6
6 changes: 3 additions & 3 deletions packages/modules/product/src/services/product-category.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
ProductTypes,
} from "@medusajs/framework/types"
import {
FreeTextSearchFilterKey,
FreeTextSearchFilterKeyPrefix,
InjectManager,
InjectTransactionManager,
isDefined,
Expand Down Expand Up @@ -87,7 +87,7 @@ export default class ProductCategoryService {
// Apply free text search filter
if (isDefined(filters?.q)) {
config.filters ??= {}
config.filters[FreeTextSearchFilterKey] = {
config.filters[FreeTextSearchFilterKeyPrefix + ProductCategory.name] = {
value: filters.q,
fromEntity: ProductCategory.name,
}
Expand Down Expand Up @@ -121,7 +121,7 @@ export default class ProductCategoryService {
// Apply free text search filter
if (isDefined(filters?.q)) {
config.filters ??= {}
config.filters[FreeTextSearchFilterKey] = {
config.filters[FreeTextSearchFilterKeyPrefix + ProductCategory.name] = {
value: filters.q,
fromEntity: ProductCategory.name,
}
Expand Down
Loading