@things-factory/resource-base 5.0.0-alpha.52 → 5.0.0-alpha.56
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist-server/service/entity/entity-query.js +7 -2
- package/dist-server/service/entity/entity-query.js.map +1 -1
- package/dist-server/service/entity-column/entity-column-query.js +7 -2
- package/dist-server/service/entity-column/entity-column-query.js.map +1 -1
- package/package.json +3 -3
- package/server/service/entity/entity-query.ts +9 -3
- package/server/service/entity-column/entity-column-query.ts +9 -3
|
@@ -30,8 +30,13 @@ let EntityQuery = class EntityQuery {
|
|
|
30
30
|
}
|
|
31
31
|
async entities(params, context) {
|
|
32
32
|
const { domain } = context.state;
|
|
33
|
-
const
|
|
34
|
-
|
|
33
|
+
const queryBuilder = (0, shell_1.getQueryBuilderFromListParams)({
|
|
34
|
+
repository: (0, typeorm_1.getRepository)(entity_1.Entity),
|
|
35
|
+
params,
|
|
36
|
+
domain,
|
|
37
|
+
searchables: ['name', 'description']
|
|
38
|
+
});
|
|
39
|
+
const [items, total] = await queryBuilder.getManyAndCount();
|
|
35
40
|
return { items, total };
|
|
36
41
|
}
|
|
37
42
|
async master(entity) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity-query.js","sourceRoot":"","sources":["../../../server/service/entity/entity-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAAmF;AACnF,qCAAuC;AAEvC,yDAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"entity-query.js","sourceRoot":"","sources":["../../../server/service/entity/entity-query.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,8 +30,13 @@ let EntityColumnQuery = class EntityColumnQuery {
|
|
|
30
30
|
}
|
|
31
31
|
async entityColumns(params, context) {
|
|
32
32
|
const { domain } = context.state;
|
|
33
|
-
const
|
|
34
|
-
|
|
33
|
+
const queryBuilder = (0, shell_1.getQueryBuilderFromListParams)({
|
|
34
|
+
repository: (0, typeorm_1.getRepository)(entity_column_1.EntityColumn),
|
|
35
|
+
params,
|
|
36
|
+
domain,
|
|
37
|
+
searchables: ['name', 'description']
|
|
38
|
+
});
|
|
39
|
+
const [items, total] = await queryBuilder.getManyAndCount();
|
|
35
40
|
return { items, total };
|
|
36
41
|
}
|
|
37
42
|
async entity(entityColumn) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity-column-query.js","sourceRoot":"","sources":["../../../server/service/entity-column/entity-column-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAAmF;AACnF,qCAAuC;AAEvC,yDAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"entity-column-query.js","sourceRoot":"","sources":["../../../server/service/entity-column/entity-column-query.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/resource-base",
|
|
3
|
-
"version": "5.0.0-alpha.
|
|
3
|
+
"version": "5.0.0-alpha.56",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@things-factory/auth-base": "^5.0.0-alpha.
|
|
27
|
+
"@things-factory/auth-base": "^5.0.0-alpha.56"
|
|
28
28
|
},
|
|
29
|
-
"gitHead": "
|
|
29
|
+
"gitHead": "105413a014a3cacefc97550b8f23e46789465219"
|
|
30
30
|
}
|
|
@@ -2,7 +2,7 @@ import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graph
|
|
|
2
2
|
import { getRepository } from 'typeorm'
|
|
3
3
|
|
|
4
4
|
import { User } from '@things-factory/auth-base'
|
|
5
|
-
import {
|
|
5
|
+
import { Domain, getQueryBuilderFromListParams, ListParam } from '@things-factory/shell'
|
|
6
6
|
|
|
7
7
|
import { EntityColumn } from '../entity-column/entity-column'
|
|
8
8
|
import { Entity } from './entity'
|
|
@@ -23,8 +23,14 @@ export class EntityQuery {
|
|
|
23
23
|
async entities(@Args() params: ListParam, @Ctx() context: any): Promise<EntityList> {
|
|
24
24
|
const { domain } = context.state
|
|
25
25
|
|
|
26
|
-
const
|
|
27
|
-
|
|
26
|
+
const queryBuilder = getQueryBuilderFromListParams({
|
|
27
|
+
repository: getRepository(Entity),
|
|
28
|
+
params,
|
|
29
|
+
domain,
|
|
30
|
+
searchables: ['name', 'description']
|
|
31
|
+
})
|
|
32
|
+
|
|
33
|
+
const [items, total] = await queryBuilder.getManyAndCount()
|
|
28
34
|
|
|
29
35
|
return { items, total }
|
|
30
36
|
}
|
|
@@ -2,7 +2,7 @@ import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graph
|
|
|
2
2
|
import { getRepository } from 'typeorm'
|
|
3
3
|
|
|
4
4
|
import { User } from '@things-factory/auth-base'
|
|
5
|
-
import {
|
|
5
|
+
import { Domain, getQueryBuilderFromListParams, ListParam } from '@things-factory/shell'
|
|
6
6
|
|
|
7
7
|
import { Entity } from '../entity/entity'
|
|
8
8
|
import { EntityColumn } from './entity-column'
|
|
@@ -23,8 +23,14 @@ export class EntityColumnQuery {
|
|
|
23
23
|
async entityColumns(@Args() params: ListParam, @Ctx() context: any): Promise<EntityColumnList> {
|
|
24
24
|
const { domain } = context.state
|
|
25
25
|
|
|
26
|
-
const
|
|
27
|
-
|
|
26
|
+
const queryBuilder = getQueryBuilderFromListParams({
|
|
27
|
+
repository: getRepository(EntityColumn),
|
|
28
|
+
params,
|
|
29
|
+
domain,
|
|
30
|
+
searchables: ['name', 'description']
|
|
31
|
+
})
|
|
32
|
+
|
|
33
|
+
const [items, total] = await queryBuilder.getManyAndCount()
|
|
28
34
|
|
|
29
35
|
return { items, total }
|
|
30
36
|
}
|