Skip to content

Commit fea549c

Browse files
committed
chore: fix merging issues
1 parent fe38042 commit fea549c

File tree

5 files changed

+4
-45
lines changed

5 files changed

+4
-45
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@adminjs/typeorm",
3-
"version": "1.5.0",
3+
"version": "2.0.0",
44
"description": "TypeORM adapter for AdminJS",
55
"keywords": [
66
"typeorm",

src/utils/convertFilter.ts

-41
This file was deleted.

src/utils/filter/custom-filter.parser.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { FilterParser } from './filter.types'
22

33
/**
4-
* It wasn't possible to pass raw filters to adapters with admin-bro
4+
* It wasn't possible to pass raw filters to adapters with AdminJS
55
* This solution allows you to pass custom filters to typeorm adapter modyfing list handler
66
*
77
* In your custom list handler modify creating filters in this way:

src/utils/filter/filter.converter.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Filter } from 'admin-bro'
1+
import { Filter } from 'adminjs'
22
import { BaseEntity, FindConditions } from 'typeorm'
33
import { DefaultParser } from './default-filter.parser'
44
import { parsers } from './filter.utils'

src/utils/filter/filter.types.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { FilterElement } from 'admin-bro'
1+
import { FilterElement } from 'adminjs'
22
import { FindManyOptions } from 'typeorm'
33

44
export type FilterParser = {

0 commit comments

Comments
 (0)