@things-factory/shell 5.0.0-alpha.28 → 5.0.0-alpha.30
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.
|
@@ -26,11 +26,11 @@ const OPERATION_FUNCTION_MAP = {
|
|
|
26
26
|
is_empty_num_id: () => (0, typeorm_1.Raw)(alias => `${alias} IS EMPTY NUMERIC ID`),
|
|
27
27
|
between: value => (0, typeorm_1.Between)(value[0], value[1])
|
|
28
28
|
};
|
|
29
|
-
function getOperatorFunction({ operator,
|
|
29
|
+
function getOperatorFunction({ operator, value }) {
|
|
30
30
|
return OPERATION_FUNCTION_MAP[operator](value);
|
|
31
31
|
}
|
|
32
32
|
function makePaginationParams(pagination) {
|
|
33
|
-
var
|
|
33
|
+
var result = {};
|
|
34
34
|
if (pagination) {
|
|
35
35
|
var { page = 0, limit = 0 } = pagination;
|
|
36
36
|
var skip = 0;
|
|
@@ -38,26 +38,26 @@ function makePaginationParams(pagination) {
|
|
|
38
38
|
if (limit > 0) {
|
|
39
39
|
skip = Math.max(page - 1, 0) * limit;
|
|
40
40
|
take = limit;
|
|
41
|
-
Object.assign(
|
|
41
|
+
Object.assign(result, {
|
|
42
42
|
skip,
|
|
43
43
|
take
|
|
44
44
|
});
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
|
-
return
|
|
47
|
+
return result;
|
|
48
48
|
}
|
|
49
49
|
function makeSortingParams(sortings) {
|
|
50
|
-
var
|
|
50
|
+
var result = {};
|
|
51
51
|
if (sortings) {
|
|
52
52
|
var order = {};
|
|
53
53
|
sortings.forEach(s => {
|
|
54
54
|
order[s.name] = s.desc ? 'DESC' : 'ASC';
|
|
55
55
|
});
|
|
56
|
-
Object.assign(
|
|
56
|
+
Object.assign(result, {
|
|
57
57
|
order
|
|
58
58
|
});
|
|
59
59
|
}
|
|
60
|
-
return
|
|
60
|
+
return result;
|
|
61
61
|
}
|
|
62
62
|
function makeFilterParams(filters) {
|
|
63
63
|
/* for where AND clauses */
|
|
@@ -82,7 +82,7 @@ function makeFilterParams(filters) {
|
|
|
82
82
|
}
|
|
83
83
|
function convertListParams(params, domain) {
|
|
84
84
|
var { pagination, filters = [], sortings } = params;
|
|
85
|
-
var
|
|
85
|
+
var result = {};
|
|
86
86
|
if (domain) {
|
|
87
87
|
filters.push({
|
|
88
88
|
name: 'domain',
|
|
@@ -91,12 +91,12 @@ function convertListParams(params, domain) {
|
|
|
91
91
|
});
|
|
92
92
|
}
|
|
93
93
|
if (pagination)
|
|
94
|
-
Object.assign(
|
|
94
|
+
Object.assign(result, makePaginationParams(pagination));
|
|
95
95
|
if (sortings)
|
|
96
|
-
Object.assign(
|
|
96
|
+
Object.assign(result, makeSortingParams(sortings));
|
|
97
97
|
if (filters)
|
|
98
|
-
Object.assign(
|
|
99
|
-
return
|
|
98
|
+
Object.assign(result, makeFilterParams(filters));
|
|
99
|
+
return result;
|
|
100
100
|
}
|
|
101
101
|
exports.convertListParams = convertListParams;
|
|
102
102
|
//# sourceMappingURL=list-params-converter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-params-converter.js","sourceRoot":"","sources":["../../server/utils/list-params-converter.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"list-params-converter.js","sourceRoot":"","sources":["../../server/utils/list-params-converter.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/shell",
|
|
3
|
-
"version": "5.0.0-alpha.
|
|
3
|
+
"version": "5.0.0-alpha.30",
|
|
4
4
|
"description": "Core module for framework",
|
|
5
5
|
"bin": {
|
|
6
6
|
"things-factory": "bin/things-factory",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"@graphql-tools/schema": "^8.3.2",
|
|
37
37
|
"@graphql-tools/utils": "^8.6.2",
|
|
38
38
|
"@hatiolab/koa-webpack": "^6.0.0",
|
|
39
|
-
"@hatiolab/things-scene": "^2.
|
|
39
|
+
"@hatiolab/things-scene": "^2.8.1",
|
|
40
40
|
"@koa/cors": "^3.1.0",
|
|
41
41
|
"@material/mwc-button": "^0.25.3",
|
|
42
42
|
"@material/mwc-fab": "^0.25.3",
|
|
@@ -44,16 +44,16 @@
|
|
|
44
44
|
"@material/mwc-icon-button": "^0.25.3",
|
|
45
45
|
"@material/mwc-slider": "^0.25.3",
|
|
46
46
|
"@material/mwc-textfield": "^0.25.3",
|
|
47
|
-
"@operato/board": "1.0.0-
|
|
48
|
-
"@operato/graphql": "1.0.0-
|
|
49
|
-
"@operato/help": "1.0.0-
|
|
50
|
-
"@operato/layout": "1.0.0-
|
|
51
|
-
"@operato/shell": "1.0.0-
|
|
52
|
-
"@operato/utils": "1.0.0-
|
|
53
|
-
"@things-factory/ejs-remote": "^5.0.0-alpha.
|
|
54
|
-
"@things-factory/env": "^5.0.0-alpha.
|
|
55
|
-
"@things-factory/styles": "^5.0.0-alpha.
|
|
56
|
-
"@things-factory/utils": "^5.0.0-alpha.
|
|
47
|
+
"@operato/board": "1.0.0-beta.0",
|
|
48
|
+
"@operato/graphql": "1.0.0-beta.0",
|
|
49
|
+
"@operato/help": "1.0.0-beta.0",
|
|
50
|
+
"@operato/layout": "1.0.0-beta.0",
|
|
51
|
+
"@operato/shell": "1.0.0-beta.0",
|
|
52
|
+
"@operato/utils": "1.0.0-beta.0",
|
|
53
|
+
"@things-factory/ejs-remote": "^5.0.0-alpha.30",
|
|
54
|
+
"@things-factory/env": "^5.0.0-alpha.30",
|
|
55
|
+
"@things-factory/styles": "^5.0.0-alpha.30",
|
|
56
|
+
"@things-factory/utils": "^5.0.0-alpha.30",
|
|
57
57
|
"@webcomponents/webcomponentsjs": "^2.6.0",
|
|
58
58
|
"@webpack-contrib/schema-utils": "^1.0.0-beta.0",
|
|
59
59
|
"apollo-server-core": "^3.6.4",
|
|
@@ -129,5 +129,5 @@
|
|
|
129
129
|
"resolutions": {
|
|
130
130
|
"core-js": "^3.16.0"
|
|
131
131
|
},
|
|
132
|
-
"gitHead": "
|
|
132
|
+
"gitHead": "352de3c888d68121aef99da33b31b966d0123328"
|
|
133
133
|
}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { Between, Equal, ILike, In, IsNull, Like, Not, Raw } from 'typeorm'
|
|
1
|
+
import { Between, Equal, FindOperator, ILike, In, IsNull, Like, Not, Raw } from 'typeorm'
|
|
2
2
|
|
|
3
|
-
import { ListParam } from '../service/common-types'
|
|
3
|
+
import { Filter, ListParam, Pagination, Sorting } from '../service/common-types'
|
|
4
4
|
|
|
5
|
-
const OPERATION_FUNCTION_MAP = {
|
|
5
|
+
const OPERATION_FUNCTION_MAP: { [operator: string]: (value: any) => FindOperator<any> } = {
|
|
6
6
|
search: value => ILike(value),
|
|
7
7
|
eq: value => Equal(value),
|
|
8
8
|
noteq: value => Not(Equal(value)),
|
|
@@ -27,12 +27,12 @@ const OPERATION_FUNCTION_MAP = {
|
|
|
27
27
|
between: value => Between(value[0], value[1])
|
|
28
28
|
}
|
|
29
29
|
|
|
30
|
-
function getOperatorFunction({ operator,
|
|
30
|
+
function getOperatorFunction({ operator, value }: { operator: string; value: any }): FindOperator<any> {
|
|
31
31
|
return OPERATION_FUNCTION_MAP[operator](value)
|
|
32
32
|
}
|
|
33
33
|
|
|
34
|
-
function makePaginationParams(pagination) {
|
|
35
|
-
var
|
|
34
|
+
function makePaginationParams(pagination: Pagination) {
|
|
35
|
+
var result = {} as { skip?: number; take?: number }
|
|
36
36
|
if (pagination) {
|
|
37
37
|
var { page = 0, limit = 0 } = pagination
|
|
38
38
|
var skip = 0
|
|
@@ -41,39 +41,39 @@ function makePaginationParams(pagination) {
|
|
|
41
41
|
if (limit > 0) {
|
|
42
42
|
skip = Math.max(page - 1, 0) * limit
|
|
43
43
|
take = limit
|
|
44
|
-
Object.assign(
|
|
44
|
+
Object.assign(result, {
|
|
45
45
|
skip,
|
|
46
46
|
take
|
|
47
47
|
})
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
50
|
|
|
51
|
-
return
|
|
51
|
+
return result
|
|
52
52
|
}
|
|
53
53
|
|
|
54
|
-
function makeSortingParams(sortings) {
|
|
55
|
-
var
|
|
54
|
+
function makeSortingParams(sortings: Sorting[]) {
|
|
55
|
+
var result = {} as { order?: { [name: string]: 'DESC' | 'ASC' } }
|
|
56
56
|
if (sortings) {
|
|
57
|
-
var order = {}
|
|
57
|
+
var order = {} as { [name: string]: 'DESC' | 'ASC' }
|
|
58
58
|
sortings.forEach(s => {
|
|
59
59
|
order[s.name] = s.desc ? 'DESC' : 'ASC'
|
|
60
60
|
})
|
|
61
61
|
|
|
62
|
-
Object.assign(
|
|
62
|
+
Object.assign(result, {
|
|
63
63
|
order
|
|
64
64
|
})
|
|
65
65
|
}
|
|
66
66
|
|
|
67
|
-
return
|
|
67
|
+
return result
|
|
68
68
|
}
|
|
69
69
|
|
|
70
|
-
function makeFilterParams(filters) {
|
|
70
|
+
function makeFilterParams(filters: Filter[]) {
|
|
71
71
|
/* for where AND clauses */
|
|
72
72
|
const columnFilters = filters.filter(filter => filter.operator !== 'search')
|
|
73
73
|
const columnWhere = columnFilters.reduce((where, f) => {
|
|
74
74
|
where[f.name] = getOperatorFunction(f)
|
|
75
75
|
return where
|
|
76
|
-
}, {})
|
|
76
|
+
}, {} as { [name: string]: FindOperator<any> })
|
|
77
77
|
|
|
78
78
|
const searchFilters = filters.filter(filter => filter.operator === 'search')
|
|
79
79
|
if (searchFilters.length === 0) {
|
|
@@ -95,9 +95,19 @@ function makeFilterParams(filters) {
|
|
|
95
95
|
}
|
|
96
96
|
}
|
|
97
97
|
|
|
98
|
-
export function convertListParams(
|
|
99
|
-
|
|
100
|
-
|
|
98
|
+
export function convertListParams(
|
|
99
|
+
params: ListParam,
|
|
100
|
+
domain?: String
|
|
101
|
+
): {
|
|
102
|
+
where?: { [name: string]: FindOperator<any> }
|
|
103
|
+
order?: {
|
|
104
|
+
[name: string]: 'DESC' | 'ASC'
|
|
105
|
+
}
|
|
106
|
+
skip?: number
|
|
107
|
+
take?: number
|
|
108
|
+
} {
|
|
109
|
+
var { pagination, filters = [], sortings } = params
|
|
110
|
+
var result = {}
|
|
101
111
|
|
|
102
112
|
if (domain) {
|
|
103
113
|
filters.push({
|
|
@@ -107,9 +117,9 @@ export function convertListParams(params: typeof ListParam, domain?: String) {
|
|
|
107
117
|
})
|
|
108
118
|
}
|
|
109
119
|
|
|
110
|
-
if (pagination) Object.assign(
|
|
111
|
-
if (sortings) Object.assign(
|
|
112
|
-
if (filters) Object.assign(
|
|
120
|
+
if (pagination) Object.assign(result, makePaginationParams(pagination))
|
|
121
|
+
if (sortings) Object.assign(result, makeSortingParams(sortings))
|
|
122
|
+
if (filters) Object.assign(result, makeFilterParams(filters))
|
|
113
123
|
|
|
114
|
-
return
|
|
124
|
+
return result
|
|
115
125
|
}
|
package/db.test.sqlite
DELETED
|
Binary file
|