@forestadmin/agent 1.0.0-beta.6 → 1.0.0-beta.60
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/agent/forestadmin-http-driver.d.ts +5 -27
- package/dist/agent/forestadmin-http-driver.js +17 -47
- package/dist/agent/routes/access/api-chart.d.ts +16 -0
- package/dist/agent/routes/access/api-chart.js +47 -0
- package/dist/agent/routes/access/chart.d.ts +1 -0
- package/dist/agent/routes/access/chart.js +26 -11
- package/dist/agent/routes/access/count-related.js +13 -6
- package/dist/agent/routes/access/count.js +14 -7
- package/dist/agent/routes/access/csv-related.js +3 -3
- package/dist/agent/routes/access/csv.js +4 -3
- package/dist/agent/routes/access/get.js +3 -2
- package/dist/agent/routes/access/list-related.js +2 -3
- package/dist/agent/routes/access/list.js +2 -3
- package/dist/agent/routes/base-route.d.ts +0 -1
- package/dist/agent/routes/base-route.js +1 -4
- package/dist/agent/routes/index.js +20 -2
- package/dist/agent/routes/modification/action.d.ts +0 -1
- package/dist/agent/routes/modification/action.js +14 -13
- package/dist/agent/routes/modification/associate-related.d.ts +3 -3
- package/dist/agent/routes/modification/associate-related.js +13 -11
- package/dist/agent/routes/modification/create.js +14 -12
- package/dist/agent/routes/modification/delete.js +3 -2
- package/dist/agent/routes/modification/dissociate-delete-related.js +19 -18
- package/dist/agent/routes/modification/update-field.d.ts +9 -0
- package/dist/agent/routes/modification/update-field.js +39 -0
- package/dist/agent/routes/modification/update-relation.js +19 -13
- package/dist/agent/routes/modification/update.js +5 -3
- package/dist/agent/routes/security/authentication.d.ts +1 -3
- package/dist/agent/routes/security/authentication.js +9 -21
- package/dist/agent/routes/system/error-handling.d.ts +2 -0
- package/dist/agent/routes/system/error-handling.js +28 -9
- package/dist/agent/routes/system/logger.js +4 -5
- package/dist/agent/services/index.js +2 -2
- package/dist/agent/services/permissions.js +8 -2
- package/dist/agent/services/serializer.d.ts +0 -5
- package/dist/agent/services/serializer.js +4 -4
- package/dist/agent/types.d.ts +2 -1
- package/dist/agent/types.js +2 -1
- package/dist/agent/utils/condition-tree-parser.d.ts +11 -0
- package/dist/agent/utils/condition-tree-parser.js +53 -0
- package/dist/agent/utils/context-filter-factory.js +1 -2
- package/dist/agent/utils/csv-generator.d.ts +2 -2
- package/dist/agent/utils/csv-generator.js +3 -3
- package/dist/agent/utils/forest-http-api.d.ts +4 -2
- package/dist/agent/utils/forest-http-api.js +60 -53
- package/dist/agent/utils/forest-schema/action-values.d.ts +2 -2
- package/dist/agent/utils/forest-schema/action-values.js +2 -2
- package/dist/agent/utils/forest-schema/emitter.d.ts +1 -1
- package/dist/agent/utils/forest-schema/emitter.js +4 -4
- package/dist/agent/utils/forest-schema/generator-actions.d.ts +1 -1
- package/dist/agent/utils/forest-schema/generator-actions.js +4 -4
- package/dist/agent/utils/forest-schema/generator-collection.d.ts +1 -1
- package/dist/agent/utils/forest-schema/generator-collection.js +9 -4
- package/dist/agent/utils/forest-schema/generator-fields.d.ts +1 -0
- package/dist/agent/utils/forest-schema/generator-fields.js +56 -27
- package/dist/agent/utils/forest-schema/types.d.ts +10 -4
- package/dist/agent/utils/forest-schema/types.js +1 -1
- package/dist/agent/utils/forest-schema/validation.d.ts +1 -1
- package/dist/agent/utils/forest-schema/validation.js +9 -7
- package/dist/agent/utils/query-string.d.ts +2 -2
- package/dist/agent/utils/query-string.js +8 -4
- package/dist/builder/agent.d.ts +33 -43
- package/dist/builder/agent.js +59 -58
- package/dist/builder/collection.d.ts +161 -53
- package/dist/builder/collection.js +233 -61
- package/dist/builder/decorators-stack.d.ts +25 -0
- package/dist/builder/decorators-stack.js +40 -0
- package/dist/builder/framework-mounter.d.ts +43 -0
- package/dist/builder/framework-mounter.js +157 -0
- package/dist/builder/types.d.ts +15 -2
- package/dist/{agent/utils/http-driver-options.d.ts → builder/utils/options-validator.d.ts} +4 -4
- package/dist/builder/utils/options-validator.js +92 -0
- package/dist/builder/utils/typing-generator.d.ts +15 -0
- package/dist/builder/utils/typing-generator.js +125 -0
- package/dist/index.d.ts +5 -2
- package/dist/index.js +14 -6
- package/dist/types.d.ts +5 -10
- package/dist/types.js +1 -9
- package/package.json +15 -5
- package/CHANGELOG.md +0 -435
- package/dist/agent/utils/http-driver-options.js +0 -86
|
@@ -10,7 +10,7 @@ class CsvGenerator {
|
|
|
10
10
|
* - backpressure is properly applied without needing to extend Readable (for slow clients)
|
|
11
11
|
* - we stop making queries to the database if the client closes the connection.
|
|
12
12
|
*/
|
|
13
|
-
static async *generate(projection, header, filter, collection, list) {
|
|
13
|
+
static async *generate(caller, projection, header, filter, collection, list) {
|
|
14
14
|
yield (0, format_1.writeToString)([header.split(',')], { headers: true, includeEndRowDelimiter: true });
|
|
15
15
|
const limit = filter.page?.limit;
|
|
16
16
|
let skip = filter.page?.skip || 0;
|
|
@@ -25,7 +25,7 @@ class CsvGenerator {
|
|
|
25
25
|
copiedFilter.sort = datasource_toolkit_1.SortFactory.byPrimaryKeys(collection);
|
|
26
26
|
}
|
|
27
27
|
// eslint-disable-next-line no-await-in-loop
|
|
28
|
-
const records = await list(new datasource_toolkit_1.PaginatedFilter(copiedFilter), projection);
|
|
28
|
+
const records = await list(caller, new datasource_toolkit_1.PaginatedFilter(copiedFilter), projection);
|
|
29
29
|
yield CsvGenerator.convert(records, projection);
|
|
30
30
|
areAllRecordsFetched = records.length < exports.CHUNK_SIZE;
|
|
31
31
|
skip += currentPageSize;
|
|
@@ -36,4 +36,4 @@ class CsvGenerator {
|
|
|
36
36
|
}
|
|
37
37
|
}
|
|
38
38
|
exports.default = CsvGenerator;
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
39
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3N2LWdlbmVyYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hZ2VudC91dGlscy9jc3YtZ2VuZXJhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHdFQVN5QztBQUN6Qyw2Q0FBaUQ7QUFFcEMsUUFBQSxVQUFVLEdBQUcsSUFBSSxDQUFDO0FBRS9CLE1BQXFCLFlBQVk7SUFDL0I7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxRQUFRLENBQ3BCLE1BQWMsRUFDZCxVQUFzQixFQUN0QixNQUFjLEVBQ2QsTUFBdUIsRUFDdkIsVUFBc0IsRUFDdEIsSUFBd0I7UUFFeEIsTUFBTSxJQUFBLHNCQUFhLEVBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLHNCQUFzQixFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7UUFFMUYsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLElBQUksRUFBRSxLQUFLLENBQUM7UUFDakMsSUFBSSxJQUFJLEdBQUcsTUFBTSxDQUFDLElBQUksRUFBRSxJQUFJLElBQUksQ0FBQyxDQUFDO1FBRWxDLElBQUksb0JBQW9CLEdBQUcsS0FBSyxDQUFDO1FBQ2pDLE1BQU0sWUFBWSxHQUFHLEVBQUUsR0FBRyxNQUFNLEVBQUUsQ0FBQztRQUVuQyxPQUFPLENBQUMsb0JBQW9CLEVBQUU7WUFDNUIsSUFBSSxlQUFlLEdBQUcsa0JBQVUsQ0FBQztZQUNqQyxJQUFJLEtBQUssR0FBRyxJQUFJO2dCQUFFLGVBQWUsR0FBRyxJQUFJLEdBQUcsS0FBSyxDQUFDO1lBRWpELFlBQVksQ0FBQyxJQUFJLEdBQUcsSUFBSSx5QkFBSSxDQUFDLElBQUksRUFBRSxlQUFlLENBQUMsQ0FBQztZQUVwRCxJQUFJLENBQUMsWUFBWSxDQUFDLElBQUksSUFBSSxZQUFZLENBQUMsSUFBSSxDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUU7Z0JBQ3hELFlBQVksQ0FBQyxJQUFJLEdBQUcsZ0NBQVcsQ0FBQyxhQUFhLENBQUMsVUFBVSxDQUFDLENBQUM7YUFDM0Q7WUFFRCw0Q0FBNEM7WUFDNUMsTUFBTSxPQUFPLEdBQUcsTUFBTSxJQUFJLENBQUMsTUFBTSxFQUFFLElBQUksb0NBQWUsQ0FBQyxZQUFZLENBQUMsRUFBRSxVQUFVLENBQUMsQ0FBQztZQUVsRixNQUFNLFlBQVksQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLFVBQVUsQ0FBQyxDQUFDO1lBRWhELG9CQUFvQixHQUFHLE9BQU8sQ0FBQyxNQUFNLEdBQUcsa0JBQVUsQ0FBQztZQUNuRCxJQUFJLElBQUksZUFBZSxDQUFDO1NBQ3pCO0lBQ0gsQ0FBQztJQUVPLE1BQU0sQ0FBQyxPQUFPLENBQUMsT0FBcUIsRUFBRSxVQUFzQjtRQUNsRSxPQUFPLElBQUEsc0JBQWEsRUFDbEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxnQ0FBVyxDQUFDLGFBQWEsQ0FBQyxNQUFNLEVBQUUsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUN6RixDQUFDO0lBQ0osQ0FBQztDQUNGO0FBL0NELCtCQStDQyJ9
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { ConditionTree } from '@forestadmin/datasource-toolkit';
|
|
2
1
|
import { IssuerMetadata } from 'openid-client';
|
|
3
2
|
import { JSONAPIDocument } from 'json-api-serializer';
|
|
3
|
+
import { PlainConditionTree } from '@forestadmin/datasource-toolkit';
|
|
4
4
|
import { AgentOptions } from '../../types';
|
|
5
5
|
export declare type IpWhitelistConfiguration = {
|
|
6
6
|
isFeatureEnabled: boolean;
|
|
@@ -23,6 +23,7 @@ export declare type UserInfo = {
|
|
|
23
23
|
tags: {
|
|
24
24
|
[key: string]: string;
|
|
25
25
|
};
|
|
26
|
+
permissionLevel: string;
|
|
26
27
|
};
|
|
27
28
|
export declare type RenderingPermissions = {
|
|
28
29
|
actions: Set<string>;
|
|
@@ -31,7 +32,7 @@ export declare type RenderingPermissions = {
|
|
|
31
32
|
};
|
|
32
33
|
scopes: {
|
|
33
34
|
[collectionName: string]: {
|
|
34
|
-
conditionTree:
|
|
35
|
+
conditionTree: PlainConditionTree;
|
|
35
36
|
dynamicScopeValues: {
|
|
36
37
|
[userId: number]: {
|
|
37
38
|
[replacementKey: string]: unknown;
|
|
@@ -58,6 +59,7 @@ export default class ForestHttpApi {
|
|
|
58
59
|
private static decodeActionPermissions;
|
|
59
60
|
/** Helper to format permissions into something easy to validate against */
|
|
60
61
|
private static decodeScopePermissions;
|
|
62
|
+
private static handleResponseError;
|
|
61
63
|
}
|
|
62
64
|
export {};
|
|
63
65
|
//# sourceMappingURL=forest-http-api.d.ts.map
|
|
@@ -3,8 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
7
|
-
const datasource_toolkit_1 = require("@forestadmin/datasource-toolkit");
|
|
8
6
|
const object_hash_1 = __importDefault(require("object-hash"));
|
|
9
7
|
const superagent_1 = __importDefault(require("superagent"));
|
|
10
8
|
class ForestHttpApi {
|
|
@@ -16,8 +14,8 @@ class ForestHttpApi {
|
|
|
16
14
|
const { attributes } = response.body.data;
|
|
17
15
|
return { isFeatureEnabled: attributes.use_ip_whitelist, ipRules: attributes.rules };
|
|
18
16
|
}
|
|
19
|
-
catch {
|
|
20
|
-
|
|
17
|
+
catch (e) {
|
|
18
|
+
this.handleResponseError(e);
|
|
21
19
|
}
|
|
22
20
|
}
|
|
23
21
|
static async getOpenIdIssuerMetadata(options) {
|
|
@@ -27,8 +25,8 @@ class ForestHttpApi {
|
|
|
27
25
|
.set('forest-secret-key', options.envSecret);
|
|
28
26
|
return response.body;
|
|
29
27
|
}
|
|
30
|
-
catch {
|
|
31
|
-
|
|
28
|
+
catch (e) {
|
|
29
|
+
this.handleResponseError(e);
|
|
32
30
|
}
|
|
33
31
|
}
|
|
34
32
|
static async getUserInformation(options, renderingId, accessToken) {
|
|
@@ -48,18 +46,24 @@ class ForestHttpApi {
|
|
|
48
46
|
role: attributes.role,
|
|
49
47
|
tags: attributes.tags?.reduce((memo, { key, value }) => ({ ...memo, [key]: value }), {}),
|
|
50
48
|
renderingId,
|
|
49
|
+
permissionLevel: attributes.permission_level,
|
|
51
50
|
};
|
|
52
51
|
}
|
|
53
|
-
catch {
|
|
54
|
-
|
|
52
|
+
catch (e) {
|
|
53
|
+
this.handleResponseError(e);
|
|
55
54
|
}
|
|
56
55
|
}
|
|
57
56
|
static async hasSchema(options, hash) {
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
57
|
+
try {
|
|
58
|
+
const response = await superagent_1.default
|
|
59
|
+
.post(new URL('/forest/apimaps/hashcheck', options.forestServerUrl).toString())
|
|
60
|
+
.send({ schemaFileHash: hash })
|
|
61
|
+
.set('forest-secret-key', options.envSecret);
|
|
62
|
+
return !response?.body?.sendSchema;
|
|
63
|
+
}
|
|
64
|
+
catch (e) {
|
|
65
|
+
this.handleResponseError(e);
|
|
66
|
+
}
|
|
63
67
|
}
|
|
64
68
|
static async uploadSchema(options, apimap) {
|
|
65
69
|
try {
|
|
@@ -69,48 +73,31 @@ class ForestHttpApi {
|
|
|
69
73
|
.set('forest-secret-key', options.envSecret);
|
|
70
74
|
}
|
|
71
75
|
catch (e) {
|
|
72
|
-
|
|
73
|
-
let message;
|
|
74
|
-
switch (e.response?.status) {
|
|
75
|
-
case 0:
|
|
76
|
-
message = 'Cannot send the apimap to Forest. Are you online?';
|
|
77
|
-
break;
|
|
78
|
-
case 404:
|
|
79
|
-
message =
|
|
80
|
-
'Cannot find the project related to the envSecret you configured. ' +
|
|
81
|
-
'Can you check on Forest that you copied it properly in the Forest initialization?';
|
|
82
|
-
break;
|
|
83
|
-
case 503:
|
|
84
|
-
message =
|
|
85
|
-
'Forest is in maintenance for a few minutes. ' +
|
|
86
|
-
'We are upgrading your experience in the forest. ' +
|
|
87
|
-
'We just need a few more minutes to get it right.';
|
|
88
|
-
break;
|
|
89
|
-
default:
|
|
90
|
-
message =
|
|
91
|
-
'An error occured with the apimap sent to Forest. ' +
|
|
92
|
-
'Please contact support@forestadmin.com for further investigations.';
|
|
93
|
-
}
|
|
94
|
-
throw new Error(message);
|
|
76
|
+
this.handleResponseError(e);
|
|
95
77
|
}
|
|
96
78
|
}
|
|
97
79
|
static async getPermissions(options, renderingId) {
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
80
|
+
try {
|
|
81
|
+
const { body } = await superagent_1.default
|
|
82
|
+
.get(`${options.forestServerUrl}/liana/v3/permissions`)
|
|
83
|
+
.set('forest-secret-key', options.envSecret)
|
|
84
|
+
.query(`renderingId=${renderingId}`);
|
|
85
|
+
if (!body.meta?.rolesACLActivated) {
|
|
86
|
+
throw new Error('Roles V2 are unsupported');
|
|
87
|
+
}
|
|
88
|
+
const actions = new Set();
|
|
89
|
+
const actionsByUser = {};
|
|
90
|
+
ForestHttpApi.decodeChartPermissions(body?.stats ?? {}, actions);
|
|
91
|
+
ForestHttpApi.decodeActionPermissions(body?.data?.collections ?? {}, actions, actionsByUser);
|
|
92
|
+
return {
|
|
93
|
+
actions,
|
|
94
|
+
actionsByUser,
|
|
95
|
+
scopes: ForestHttpApi.decodeScopePermissions(body?.data?.renderings?.[renderingId] ?? {}),
|
|
96
|
+
};
|
|
97
|
+
}
|
|
98
|
+
catch (e) {
|
|
99
|
+
this.handleResponseError(e);
|
|
104
100
|
}
|
|
105
|
-
const actions = new Set();
|
|
106
|
-
const actionsByUser = {};
|
|
107
|
-
ForestHttpApi.decodeChartPermissions(body?.stats ?? {}, actions);
|
|
108
|
-
ForestHttpApi.decodeActionPermissions(body?.data?.collections ?? {}, actions, actionsByUser);
|
|
109
|
-
return {
|
|
110
|
-
actions,
|
|
111
|
-
actionsByUser,
|
|
112
|
-
scopes: ForestHttpApi.decodeScopePermissions(body?.data?.renderings?.[renderingId] ?? {}),
|
|
113
|
-
};
|
|
114
101
|
}
|
|
115
102
|
/** Helper to format permissions into something easy to validate against */
|
|
116
103
|
static decodeChartPermissions(chartsByType, actions) {
|
|
@@ -162,12 +149,32 @@ class ForestHttpApi {
|
|
|
162
149
|
const scopes = {};
|
|
163
150
|
for (const [name, { scope }] of Object.entries(rendering)) {
|
|
164
151
|
scopes[name] = scope && {
|
|
165
|
-
conditionTree:
|
|
152
|
+
conditionTree: scope.filter,
|
|
166
153
|
dynamicScopeValues: scope.dynamicScopesValues?.users ?? {},
|
|
167
154
|
};
|
|
168
155
|
}
|
|
169
156
|
return scopes;
|
|
170
157
|
}
|
|
158
|
+
static handleResponseError(e) {
|
|
159
|
+
if (/certificate/i.test(e.message))
|
|
160
|
+
throw new Error('ForestAdmin server TLS certificate cannot be verified. ' +
|
|
161
|
+
'Please check that your system time is set properly.');
|
|
162
|
+
if (e.response) {
|
|
163
|
+
const status = e?.response?.status;
|
|
164
|
+
// 0 == offline, 502 == bad gateway from proxy
|
|
165
|
+
if (status === 0 || status === 502)
|
|
166
|
+
throw new Error('Failed to reach ForestAdmin server. Are you online?');
|
|
167
|
+
if (status === 404)
|
|
168
|
+
throw new Error('ForestAdmin server failed to find the project related to the envSecret you configured.' +
|
|
169
|
+
' Can you check that you copied it properly in the Forest initialization?');
|
|
170
|
+
if (status === 503)
|
|
171
|
+
throw new Error('Forest is in maintenance for a few minutes. We are upgrading your experience in ' +
|
|
172
|
+
'the forest. We just need a few more minutes to get it right.');
|
|
173
|
+
throw new Error('An unexpected error occured while contacting the ForestAdmin server. ' +
|
|
174
|
+
'Please contact support@forestadmin.com for further investigations.');
|
|
175
|
+
}
|
|
176
|
+
throw e;
|
|
177
|
+
}
|
|
171
178
|
}
|
|
172
179
|
exports.default = ForestHttpApi;
|
|
173
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
180
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"forest-http-api.js","sourceRoot":"","sources":["../../../src/agent/utils/forest-http-api.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,11 +2,11 @@ import { ActionField, DataSource } from '@forestadmin/datasource-toolkit';
|
|
|
2
2
|
declare type FormData = Record<string, unknown>;
|
|
3
3
|
/**
|
|
4
4
|
* This utility class converts form values from our internal format to the format that is
|
|
5
|
-
* used in the frontend for
|
|
5
|
+
* used in the frontend for action forms.
|
|
6
6
|
*/
|
|
7
7
|
export default class ForestValueConverter {
|
|
8
8
|
/**
|
|
9
|
-
* Proper form data parser which converts data from
|
|
9
|
+
* Proper form data parser which converts data from an action form result to the format
|
|
10
10
|
* that is internally used in datasources.
|
|
11
11
|
*/
|
|
12
12
|
static makeFormData(dataSource: DataSource, rawData: FormData, fields: ActionField[]): FormData;
|
|
@@ -7,11 +7,11 @@ const id_1 = __importDefault(require("../id"));
|
|
|
7
7
|
const generator_actions_1 = __importDefault(require("./generator-actions"));
|
|
8
8
|
/**
|
|
9
9
|
* This utility class converts form values from our internal format to the format that is
|
|
10
|
-
* used in the frontend for
|
|
10
|
+
* used in the frontend for action forms.
|
|
11
11
|
*/
|
|
12
12
|
class ForestValueConverter {
|
|
13
13
|
/**
|
|
14
|
-
* Proper form data parser which converts data from
|
|
14
|
+
* Proper form data parser which converts data from an action form result to the format
|
|
15
15
|
* that is internally used in datasources.
|
|
16
16
|
*/
|
|
17
17
|
static makeFormData(dataSource, rawData, fields) {
|
|
@@ -5,7 +5,7 @@ declare type SerializedSchema = {
|
|
|
5
5
|
schemaFileHash: string;
|
|
6
6
|
};
|
|
7
7
|
};
|
|
8
|
-
declare type Options = Pick<AgentOptions, 'isProduction' | '
|
|
8
|
+
declare type Options = Pick<AgentOptions, 'isProduction' | 'schemaPath'>;
|
|
9
9
|
/**
|
|
10
10
|
* Generate and dispatch dataSource schema on agent start.
|
|
11
11
|
*/
|
|
@@ -18,7 +18,7 @@ class SchemaEmitter {
|
|
|
18
18
|
static async getSerializedSchema(options, dataSource) {
|
|
19
19
|
const schema = options.isProduction
|
|
20
20
|
? await SchemaEmitter.loadFromDisk(options.schemaPath)
|
|
21
|
-
: await SchemaEmitter.generate(
|
|
21
|
+
: await SchemaEmitter.generate(dataSource);
|
|
22
22
|
if (!options.isProduction) {
|
|
23
23
|
const pretty = (0, json_stringify_pretty_compact_1.default)(schema, { maxLength: 80 });
|
|
24
24
|
await (0, promises_1.writeFile)(options.schemaPath, pretty, { encoding: 'utf-8' });
|
|
@@ -35,9 +35,9 @@ class SchemaEmitter {
|
|
|
35
35
|
throw new Error(`Cannot load ${schemaPath}. Providing a schema is mandatory in production mode.`);
|
|
36
36
|
}
|
|
37
37
|
}
|
|
38
|
-
static async generate(
|
|
38
|
+
static async generate(dataSource) {
|
|
39
39
|
const allCollectionSchemas = [];
|
|
40
|
-
const dataSourceCollectionSchemas = dataSource.collections.map(collection => generator_collection_1.default.buildSchema(
|
|
40
|
+
const dataSourceCollectionSchemas = dataSource.collections.map(collection => generator_collection_1.default.buildSchema(collection));
|
|
41
41
|
allCollectionSchemas.push(...dataSourceCollectionSchemas);
|
|
42
42
|
return Promise.all(allCollectionSchemas);
|
|
43
43
|
}
|
|
@@ -67,4 +67,4 @@ SchemaEmitter.meta = {
|
|
|
67
67
|
engine_version: process.versions && process.versions.node,
|
|
68
68
|
},
|
|
69
69
|
};
|
|
70
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
70
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW1pdHRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9hZ2VudC91dGlscy9mb3Jlc3Qtc2NoZW1hL2VtaXR0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFDQSwwQ0FBa0Q7QUFDbEQsOEVBQW9EO0FBQ3BELG9EQUE0QjtBQUM1QixrR0FBc0Q7QUFJdEQsa0ZBQStEO0FBTS9ELDRDQUE0QztBQUM1Qyw4REFBOEQ7QUFDOUQsTUFBTSxFQUFFLE9BQU8sRUFBRSxHQUFHLE9BQU8sQ0FBQywwQkFBMEIsQ0FBQyxDQUFDO0FBRXhEOztHQUVHO0FBQ0gsTUFBcUIsYUFBYTtJQVVoQyxNQUFNLENBQUMsS0FBSyxDQUFDLG1CQUFtQixDQUM5QixPQUFnQixFQUNoQixVQUFzQjtRQUV0QixNQUFNLE1BQU0sR0FBYyxPQUFPLENBQUMsWUFBWTtZQUM1QyxDQUFDLENBQUMsTUFBTSxhQUFhLENBQUMsWUFBWSxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUM7WUFDdEQsQ0FBQyxDQUFDLE1BQU0sYUFBYSxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUU3QyxJQUFJLENBQUMsT0FBTyxDQUFDLFlBQVksRUFBRTtZQUN6QixNQUFNLE1BQU0sR0FBRyxJQUFBLHVDQUFTLEVBQUMsTUFBTSxFQUFFLEVBQUUsU0FBUyxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUM7WUFDcEQsTUFBTSxJQUFBLG9CQUFTLEVBQUMsT0FBTyxDQUFDLFVBQVUsRUFBRSxNQUFNLEVBQUUsRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQztTQUNwRTtRQUVELE1BQU0sSUFBSSxHQUFHLGdCQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBRXBGLE9BQU8sYUFBYSxDQUFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDL0MsQ0FBQztJQUVPLE1BQU0sQ0FBQyxLQUFLLENBQUMsWUFBWSxDQUFDLFVBQWtCO1FBQ2xELElBQUk7WUFDRixNQUFNLFdBQVcsR0FBRyxNQUFNLElBQUEsbUJBQVEsRUFBQyxVQUFVLEVBQUUsRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQztZQUV0RSxPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsV0FBVyxDQUFDLENBQUM7U0FDaEM7UUFBQyxPQUFPLENBQUMsRUFBRTtZQUNWLE1BQU0sSUFBSSxLQUFLLENBQ2IsZUFBZSxVQUFVLHVEQUF1RCxDQUNqRixDQUFDO1NBQ0g7SUFDSCxDQUFDO0lBRU8sTUFBTSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsVUFBc0I7UUFDbEQsTUFBTSxvQkFBb0IsR0FBRyxFQUFFLENBQUM7UUFFaEMsTUFBTSwyQkFBMkIsR0FBRyxVQUFVLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUMxRSw4QkFBeUIsQ0FBQyxXQUFXLENBQUMsVUFBVSxDQUFDLENBQ2xELENBQUM7UUFDRixvQkFBb0IsQ0FBQyxJQUFJLENBQUMsR0FBRywyQkFBMkIsQ0FBQyxDQUFDO1FBRTFELE9BQU8sT0FBTyxDQUFDLEdBQUcsQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO0lBQzNDLENBQUM7SUFFTyxNQUFNLENBQUMsU0FBUyxDQUFDLE1BQWlCLEVBQUUsSUFBWTtRQUN0RCxtQkFBbUI7UUFDbkIsTUFBTSxVQUFVLEdBQUcsSUFBSSw2QkFBaUIsRUFBRSxDQUFDO1FBRTNDLFVBQVUsQ0FBQyxRQUFRLENBQUMsYUFBYSxFQUFFO1lBQ2pDLHFEQUFxRDtZQUNyRCxZQUFZLEVBQUUsQ0FBQyxTQUFrQixFQUFFLEVBQUUsQ0FBQyxTQUFTO1lBQy9DLGFBQWEsRUFBRTtnQkFDYixRQUFRLEVBQUUsRUFBRSxJQUFJLEVBQUUsVUFBVSxFQUFFO2dCQUM5QixPQUFPLEVBQUUsRUFBRSxJQUFJLEVBQUUsU0FBUyxFQUFFO2FBQzdCO1NBQ0YsQ0FBQyxDQUFDO1FBQ0gsVUFBVSxDQUFDLFFBQVEsQ0FBQyxVQUFVLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDcEMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxTQUFTLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFFbkMsWUFBWTtRQUNaLE9BQU8sVUFBVSxDQUFDLFNBQVMsQ0FDekIsYUFBYSxFQUNiLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQyxJQUFJLEVBQUUsR0FBRyxDQUFDLEVBQUUsQ0FBQyxDQUFDLEVBQ3ZDLEVBQUUsR0FBRyxhQUFhLENBQUMsSUFBSSxFQUFFLGNBQWMsRUFBRSxJQUFJLEVBQUUsQ0FDNUIsQ0FBQztJQUN4QixDQUFDOztBQXhFSCxnQ0F5RUM7QUF4RXlCLGtCQUFJLEdBQUc7SUFDN0IsS0FBSyxFQUFFLHFCQUFxQjtJQUM1QixhQUFhLEVBQUUsT0FBTztJQUN0QixLQUFLLEVBQUU7UUFDTCxNQUFNLEVBQUUsUUFBUTtRQUNoQixjQUFjLEVBQUUsT0FBTyxDQUFDLFFBQVEsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLElBQUk7S0FDMUQ7Q0FDRixDQUFDIn0=
|
|
@@ -6,7 +6,7 @@ export default class SchemaGeneratorActions {
|
|
|
6
6
|
* This works around a bug in frontend which won't call the server if no fields are defined.
|
|
7
7
|
*/
|
|
8
8
|
static defaultFields: ForestServerActionField[];
|
|
9
|
-
static buildSchema(
|
|
9
|
+
static buildSchema(collection: Collection, name: string): Promise<ForestServerAction>;
|
|
10
10
|
/** Build schema for given field */
|
|
11
11
|
static buildFieldSchema(dataSource: DataSource, field: ActionField): ForestServerActionField;
|
|
12
12
|
private static buildFields;
|
|
@@ -7,7 +7,7 @@ const datasource_toolkit_1 = require("@forestadmin/datasource-toolkit");
|
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
8
|
const action_values_1 = __importDefault(require("./action-values"));
|
|
9
9
|
class SchemaGeneratorActions {
|
|
10
|
-
static async buildSchema(
|
|
10
|
+
static async buildSchema(collection, name) {
|
|
11
11
|
const schema = collection.schema.actions[name];
|
|
12
12
|
const actionIndex = Object.keys(collection.schema.actions).indexOf(name);
|
|
13
13
|
// Generate url-safe friendly name (which won't be unique, but that's OK).
|
|
@@ -18,7 +18,7 @@ class SchemaGeneratorActions {
|
|
|
18
18
|
name,
|
|
19
19
|
type: schema.scope.toLowerCase(),
|
|
20
20
|
baseUrl: null,
|
|
21
|
-
endpoint: path_1.default.join('/
|
|
21
|
+
endpoint: path_1.default.posix.join('/forest/_actions', collection.name, String(actionIndex), slug),
|
|
22
22
|
httpMethod: 'POST',
|
|
23
23
|
redirect: null,
|
|
24
24
|
download: Boolean(schema.generateFile),
|
|
@@ -62,7 +62,7 @@ class SchemaGeneratorActions {
|
|
|
62
62
|
return SchemaGeneratorActions.defaultFields;
|
|
63
63
|
}
|
|
64
64
|
// Ask the action to generate a form
|
|
65
|
-
const fields = await collection.getForm(name);
|
|
65
|
+
const fields = await collection.getForm(null, name);
|
|
66
66
|
if (fields) {
|
|
67
67
|
// When sending to server, we need to rename 'value' into 'defaultValue'
|
|
68
68
|
// otherwise, it does not gets applied 🤷♂️
|
|
@@ -96,4 +96,4 @@ SchemaGeneratorActions.defaultFields = [
|
|
|
96
96
|
widget: null,
|
|
97
97
|
},
|
|
98
98
|
];
|
|
99
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
99
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2VuZXJhdG9yLWFjdGlvbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvYWdlbnQvdXRpbHMvZm9yZXN0LXNjaGVtYS9nZW5lcmF0b3ItYWN0aW9ucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLHdFQVF5QztBQUN6QyxnREFBd0I7QUFHeEIsb0VBQW1EO0FBRW5ELE1BQXFCLHNCQUFzQjtJQXFCekMsTUFBTSxDQUFDLEtBQUssQ0FBQyxXQUFXLENBQUMsVUFBc0IsRUFBRSxJQUFZO1FBQzNELE1BQU0sTUFBTSxHQUFHLFVBQVUsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQy9DLE1BQU0sV0FBVyxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7UUFFekUsMEVBQTBFO1FBQzFFLE1BQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxpQkFBaUIsRUFBRSxDQUFDLE9BQU8sQ0FBQyxjQUFjLEVBQUUsR0FBRyxDQUFDLENBQUM7UUFDbkUsTUFBTSxNQUFNLEdBQUcsTUFBTSxzQkFBc0IsQ0FBQyxXQUFXLENBQUMsVUFBVSxFQUFFLElBQUksRUFBRSxNQUFNLENBQUMsQ0FBQztRQUVsRixPQUFPO1lBQ0wsRUFBRSxFQUFFLEdBQUcsVUFBVSxDQUFDLElBQUksSUFBSSxXQUFXLElBQUksSUFBSSxFQUFFO1lBQy9DLElBQUk7WUFDSixJQUFJLEVBQUUsTUFBTSxDQUFDLEtBQUssQ0FBQyxXQUFXLEVBQWtDO1lBQ2hFLE9BQU8sRUFBRSxJQUFJO1lBQ2IsUUFBUSxFQUFFLGNBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLGtCQUFrQixFQUFFLFVBQVUsQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFDLFdBQVcsQ0FBQyxFQUFFLElBQUksQ0FBQztZQUN6RixVQUFVLEVBQUUsTUFB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
|
|
@@ -2,6 +2,6 @@ import { Collection } from '@forestadmin/datasource-toolkit';
|
|
|
2
2
|
import { ForestServerCollection } from './types';
|
|
3
3
|
export default class SchemaGeneratorCollection {
|
|
4
4
|
/** Build forest-server schema for a collection */
|
|
5
|
-
static buildSchema(
|
|
5
|
+
static buildSchema(collection: Collection): Promise<ForestServerCollection>;
|
|
6
6
|
}
|
|
7
7
|
//# sourceMappingURL=generator-collection.d.ts.map
|
|
@@ -9,11 +9,14 @@ const generator_fields_1 = __importDefault(require("./generator-fields"));
|
|
|
9
9
|
const generator_segments_1 = __importDefault(require("./generator-segments"));
|
|
10
10
|
class SchemaGeneratorCollection {
|
|
11
11
|
/** Build forest-server schema for a collection */
|
|
12
|
-
static async buildSchema(
|
|
12
|
+
static async buildSchema(collection) {
|
|
13
13
|
return {
|
|
14
|
-
actions: await Promise.all(Object.keys(collection.schema.actions)
|
|
14
|
+
actions: await Promise.all(Object.keys(collection.schema.actions)
|
|
15
|
+
.sort()
|
|
16
|
+
.map(name => generator_actions_1.default.buildSchema(collection, name))),
|
|
15
17
|
fields: Object.keys(collection.schema.fields)
|
|
16
18
|
.filter(name => !datasource_toolkit_1.SchemaUtils.isForeignKey(collection.schema, name))
|
|
19
|
+
.sort()
|
|
17
20
|
.map(name => generator_fields_1.default.buildSchema(collection, name)),
|
|
18
21
|
icon: null,
|
|
19
22
|
integration: null,
|
|
@@ -23,9 +26,11 @@ class SchemaGeneratorCollection {
|
|
|
23
26
|
name: collection.name,
|
|
24
27
|
onlyForRelationships: false,
|
|
25
28
|
paginationType: 'page',
|
|
26
|
-
segments: collection.schema.segments
|
|
29
|
+
segments: collection.schema.segments
|
|
30
|
+
.sort()
|
|
31
|
+
.map(name => generator_segments_1.default.buildSchema(collection, name)),
|
|
27
32
|
};
|
|
28
33
|
}
|
|
29
34
|
}
|
|
30
35
|
exports.default = SchemaGeneratorCollection;
|
|
31
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
36
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2VuZXJhdG9yLWNvbGxlY3Rpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvYWdlbnQvdXRpbHMvZm9yZXN0LXNjaGVtYS9nZW5lcmF0b3ItY29sbGVjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLHdFQUEwRTtBQUUxRSw0RUFBeUQ7QUFDekQsMEVBQXVEO0FBQ3ZELDhFQUEyRDtBQUUzRCxNQUFxQix5QkFBeUI7SUFDNUMsa0RBQWtEO0lBQ2xELE1BQU0sQ0FBQyxLQUFLLENBQUMsV0FBVyxDQUFDLFVBQXNCO1FBQzdDLE9BQU87WUFDTCxPQUFPLEVBQUUsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUN4QixNQUFNLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDO2lCQUNuQyxJQUFJLEVBQUU7aUJBQ04sR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsMkJBQXNCLENBQUMsV0FBVyxDQUFDLFVBQVUsRUFBRSxJQUFJLENBQUMsQ0FBQyxDQUNyRTtZQUNELE1BQU0sRUFBRSxNQUFNLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDO2lCQUMxQyxNQUFNLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLGdDQUFXLENBQUMsWUFBWSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsSUFBSSxDQUFDLENBQUM7aUJBQ2xFLElBQUksRUFBRTtpQkFDTixHQUFHLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQywwQkFBcUIsQ0FBQyxXQUFXLENBQUMsVUFBVSxFQUFFLElBQUksQ0FBQyxDQUFDO1lBQ25FLElBQUksRUFBRSxJQUFJO1lBQ1YsV0FBVyxFQUFFLElBQUk7WUFDakIsVUFBVSxFQUFFLE1BQU0sQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQyxLQUFLLENBQ3ZELEtBQUssQ0FBQyxFQUFFLENBQUMsS0FBSyxDQUFDLElBQUksS0FBSyxRQUFRLElBQUksS0FBSyxDQUFDLFVBQVUsQ0FDckQ7WUFDRCxZQUFZLEVBQUUsVUFBVSxDQUFDLE1BQU0sQ0FBQyxVQUFVO1lBQzFDLFNBQVMsRUFBRSxLQUFLO1lBQ2hCLElBQUksRUFBRSxVQUFVLENBQUMsSUFBSTtZQUNyQixvQkFBb0IsRUFBRSxLQUFLO1lBQzNCLGNBQWMsRUFBRSxNQUFNO1lBQ3RCLFFBQVEsRUFBRSxVQUFVLENBQUMsTUFBTSxDQUFDLFFBQVE7aUJBQ2pDLElBQUksRUFBRTtpQkFDTixHQUFHLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyw0QkFBdUIsQ0FBQyxXQUFXLENBQUMsVUFBVSxFQUFFLElBQUksQ0FBQyxDQUFDO1NBQ3RFLENBQUM7SUFDSixDQUFDO0NBQ0Y7QUE1QkQsNENBNEJDIn0=
|
|
@@ -4,6 +4,7 @@ export default class SchemaGeneratorFields {
|
|
|
4
4
|
private static relationMap;
|
|
5
5
|
static buildSchema(collection: Collection, name: string): ForestServerField;
|
|
6
6
|
private static buildColumnSchema;
|
|
7
|
+
private static convertColumnType;
|
|
7
8
|
private static buildToManyRelationSchema;
|
|
8
9
|
private static isForeignCollectionFilterable;
|
|
9
10
|
private static buildOneToOneSchema;
|
|
@@ -45,57 +45,87 @@ class SchemaGeneratorFields {
|
|
|
45
45
|
isSortable: Boolean(column.isSortable),
|
|
46
46
|
isVirtual: false,
|
|
47
47
|
reference: null,
|
|
48
|
-
type: column.columnType,
|
|
48
|
+
type: this.convertColumnType(column.columnType),
|
|
49
49
|
validations: validation_1.default.convertValidationList(column.validation),
|
|
50
50
|
};
|
|
51
51
|
}
|
|
52
|
-
static
|
|
53
|
-
|
|
54
|
-
|
|
52
|
+
static convertColumnType(type) {
|
|
53
|
+
if (typeof type === 'string')
|
|
54
|
+
return type;
|
|
55
|
+
if (Array.isArray(type)) {
|
|
56
|
+
return [this.convertColumnType(type[0])];
|
|
57
|
+
}
|
|
58
|
+
return {
|
|
59
|
+
fields: Object.entries(type).map(([key, subType]) => ({
|
|
60
|
+
field: key,
|
|
61
|
+
type: this.convertColumnType(subType),
|
|
62
|
+
})),
|
|
63
|
+
};
|
|
64
|
+
}
|
|
65
|
+
static buildToManyRelationSchema(relation, collection, foreignCollection, baseSchema) {
|
|
66
|
+
let targetName;
|
|
67
|
+
let targetField;
|
|
68
|
+
let isReadOnly;
|
|
69
|
+
if (relation.type === 'OneToMany') {
|
|
70
|
+
targetName = relation.originKeyTarget;
|
|
71
|
+
targetField = collection.schema.fields[targetName];
|
|
72
|
+
const originKey = foreignCollection.schema.fields[relation.originKey];
|
|
73
|
+
isReadOnly = originKey.isReadOnly;
|
|
74
|
+
}
|
|
75
|
+
else {
|
|
76
|
+
targetName = relation.foreignKeyTarget;
|
|
77
|
+
targetField = foreignCollection.schema.fields[targetName];
|
|
78
|
+
const throughSchema = collection.dataSource.getCollection(relation.throughCollection).schema;
|
|
79
|
+
const foreignKey = throughSchema.fields[relation.foreignKey];
|
|
80
|
+
const originKey = throughSchema.fields[relation.originKey];
|
|
81
|
+
isReadOnly = originKey.isReadOnly || foreignKey.isReadOnly;
|
|
82
|
+
}
|
|
55
83
|
return {
|
|
56
|
-
|
|
84
|
+
...baseSchema,
|
|
85
|
+
type: [targetField.columnType],
|
|
57
86
|
defaultValue: null,
|
|
58
87
|
isFilterable: false,
|
|
59
88
|
isPrimaryKey: false,
|
|
60
89
|
isRequired: false,
|
|
90
|
+
isReadOnly: Boolean(isReadOnly),
|
|
61
91
|
isSortable: false,
|
|
62
92
|
validations: [],
|
|
63
|
-
reference: `${foreignCollection.name}.${
|
|
64
|
-
...baseSchema,
|
|
93
|
+
reference: `${foreignCollection.name}.${targetName}`,
|
|
65
94
|
};
|
|
66
95
|
}
|
|
67
96
|
static isForeignCollectionFilterable(foreignCollection) {
|
|
68
97
|
return Object.values(foreignCollection.schema.fields).some(field => field.type === 'Column' &&
|
|
69
98
|
filterable_1.default.isFilterable(field.columnType, field.filterOperators));
|
|
70
99
|
}
|
|
71
|
-
static buildOneToOneSchema(relation, foreignCollection, baseSchema) {
|
|
72
|
-
const
|
|
73
|
-
const
|
|
100
|
+
static buildOneToOneSchema(relation, collection, foreignCollection, baseSchema) {
|
|
101
|
+
const targetField = collection.schema.fields[relation.originKeyTarget];
|
|
102
|
+
const keyField = foreignCollection.schema.fields[relation.originKey];
|
|
74
103
|
return {
|
|
75
|
-
|
|
104
|
+
...baseSchema,
|
|
105
|
+
type: keyField.columnType,
|
|
76
106
|
defaultValue: null,
|
|
77
107
|
isFilterable: SchemaGeneratorFields.isForeignCollectionFilterable(foreignCollection),
|
|
78
108
|
isPrimaryKey: false,
|
|
79
109
|
isRequired: false,
|
|
80
|
-
|
|
110
|
+
isReadOnly: Boolean(keyField.isReadOnly),
|
|
111
|
+
isSortable: Boolean(targetField.isSortable),
|
|
81
112
|
validations: [],
|
|
82
|
-
reference: `${foreignCollection.name}.${
|
|
83
|
-
...baseSchema,
|
|
113
|
+
reference: `${foreignCollection.name}.${relation.originKeyTarget}`,
|
|
84
114
|
};
|
|
85
115
|
}
|
|
86
116
|
static buildManyToOneSchema(relation, collection, foreignCollection, baseSchema) {
|
|
87
|
-
const
|
|
88
|
-
const keySchema = collection.schema.fields[key];
|
|
117
|
+
const keyField = collection.schema.fields[relation.foreignKey];
|
|
89
118
|
return {
|
|
90
|
-
|
|
91
|
-
|
|
119
|
+
...baseSchema,
|
|
120
|
+
type: keyField.columnType,
|
|
121
|
+
defaultValue: keyField.defaultValue ?? null,
|
|
92
122
|
isFilterable: SchemaGeneratorFields.isForeignCollectionFilterable(foreignCollection),
|
|
93
|
-
isPrimaryKey: Boolean(
|
|
94
|
-
isRequired:
|
|
95
|
-
|
|
96
|
-
|
|
123
|
+
isPrimaryKey: Boolean(keyField.isPrimaryKey),
|
|
124
|
+
isRequired: keyField.validation?.some(v => v.operator === 'Present') ?? false,
|
|
125
|
+
isReadOnly: Boolean(keyField.isReadOnly),
|
|
126
|
+
isSortable: Boolean(keyField.isSortable),
|
|
127
|
+
validations: validation_1.default.convertValidationList(keyField.validation),
|
|
97
128
|
reference: `${foreignCollection.name}.${relation.foreignKeyTarget}`,
|
|
98
|
-
...baseSchema,
|
|
99
129
|
};
|
|
100
130
|
}
|
|
101
131
|
static buildRelationSchema(collection, name) {
|
|
@@ -105,7 +135,6 @@ class SchemaGeneratorFields {
|
|
|
105
135
|
field: name,
|
|
106
136
|
enums: null,
|
|
107
137
|
integration: null,
|
|
108
|
-
isReadOnly: false,
|
|
109
138
|
isVirtual: false,
|
|
110
139
|
inverseOf: datasource_toolkit_1.CollectionUtils.getInverseRelation(collection, name),
|
|
111
140
|
relationship: SchemaGeneratorFields.relationMap[relation.type],
|
|
@@ -113,9 +142,9 @@ class SchemaGeneratorFields {
|
|
|
113
142
|
switch (relation.type) {
|
|
114
143
|
case 'ManyToMany':
|
|
115
144
|
case 'OneToMany':
|
|
116
|
-
return SchemaGeneratorFields.buildToManyRelationSchema(relation, foreignCollection, relationSchema);
|
|
145
|
+
return SchemaGeneratorFields.buildToManyRelationSchema(relation, collection, foreignCollection, relationSchema);
|
|
117
146
|
case 'OneToOne':
|
|
118
|
-
return SchemaGeneratorFields.buildOneToOneSchema(relation, foreignCollection, relationSchema);
|
|
147
|
+
return SchemaGeneratorFields.buildOneToOneSchema(relation, collection, foreignCollection, relationSchema);
|
|
119
148
|
default:
|
|
120
149
|
return SchemaGeneratorFields.buildManyToOneSchema(relation, collection, foreignCollection, relationSchema);
|
|
121
150
|
}
|
|
@@ -128,4 +157,4 @@ SchemaGeneratorFields.relationMap = {
|
|
|
128
157
|
OneToMany: 'HasMany',
|
|
129
158
|
OneToOne: 'HasOne',
|
|
130
159
|
};
|
|
131
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
160
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2VuZXJhdG9yLWZpZWxkcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9hZ2VudC91dGlscy9mb3Jlc3Qtc2NoZW1hL2dlbmVyYXRvci1maWVsZHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSx3RUFZeUM7QUFFekMsOERBQW1EO0FBQ25ELDhEQUFtRDtBQUVuRCxNQUFxQixxQkFBcUI7SUFReEMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxVQUFzQixFQUFFLElBQVk7UUFDckQsTUFBTSxFQUFFLElBQUksRUFBRSxHQUFHLFVBQVUsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBRWhELElBQUksTUFBeUIsQ0FBQztRQUU5QixRQUFRLElBQUksRUFBRTtZQUNaLEtBQUssUUFBUTtnQkFDWCxNQUFNLEdBQUcscUJBQXFCLENBQUMsaUJBQWlCLENBQUMsVUFBVSxFQUFFLElBQUksQ0FBQyxDQUFDO2dCQUNuRSxNQUFNO1lBRVIsS0FBSyxXQUFXLENBQUM7WUFDakIsS0FBSyxXQUFXLENBQUM7WUFDakIsS0FBSyxZQUFZLENBQUM7WUFDbEIsS0FBSyxVQUFVO2dCQUNiLE1BQU0sR0FBRyxxQkFBcUIsQ0FBQyxtQkFBbUIsQ0FBQyxVQUFVLEVBQUUsSUFBSSxDQUFDLENBQUM7Z0JBQ3JFLE1BQU07WUFFUjtnQkFDRSxNQUFNLElBQUksS0FBSyxDQUFDLG9CQUFvQixDQUFDLENBQUM7U0FDekM7UUFFRCxPQUFPLE1BQU0sQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDO2FBQzFCLElBQUksRUFBRTthQUNOLE1BQU0sQ0FBQyxDQUFDLFlBQVksRUFBRSxDQUFDLEdBQUcsRUFBRSxLQUFLLENBQUMsRUFBRSxFQUFFO1lBQ3JDLFlBQVksQ0FBQyxHQUFHLENBQUMsR0FBRyxLQUFLLENBQUM7WUFFMUIsT0FBTyxZQUFZLENBQUM7UUFDdEIsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQ1gs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
|