@forestadmin/agent 1.1.0-alpha.1 → 1.1.0-alpha.2
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.
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import { Context } from 'koa';
|
|
3
3
|
import Router from '@koa/router';
|
|
4
4
|
import CollectionRoute from '../collection-route';
|
|
5
|
-
export default class
|
|
5
|
+
export default class ChartRoute extends CollectionRoute {
|
|
6
6
|
private static readonly formats;
|
|
7
7
|
setupRoutes(router: Router): void;
|
|
8
8
|
handleChart(context: Context): Promise<void>;
|
|
@@ -6,18 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const datasource_toolkit_1 = require("@forestadmin/datasource-toolkit");
|
|
7
7
|
const luxon_1 = require("luxon");
|
|
8
8
|
const uuid_1 = require("uuid");
|
|
9
|
+
const forestadmin_client_1 = require("@forestadmin/forestadmin-client");
|
|
9
10
|
const collection_route_1 = __importDefault(require("../collection-route"));
|
|
10
11
|
const context_filter_factory_1 = __importDefault(require("../../utils/context-filter-factory"));
|
|
11
12
|
const query_string_1 = __importDefault(require("../../utils/query-string"));
|
|
12
|
-
|
|
13
|
-
(function (ChartType) {
|
|
14
|
-
ChartType["Value"] = "Value";
|
|
15
|
-
ChartType["Objective"] = "Objective";
|
|
16
|
-
ChartType["Pie"] = "Pie";
|
|
17
|
-
ChartType["Line"] = "Line";
|
|
18
|
-
ChartType["Leaderboard"] = "Leaderboard";
|
|
19
|
-
})(ChartType || (ChartType = {}));
|
|
20
|
-
class Chart extends collection_route_1.default {
|
|
13
|
+
class ChartRoute extends collection_route_1.default {
|
|
21
14
|
setupRoutes(router) {
|
|
22
15
|
router.post(`/stats/${this.collection.name}`, this.handleChart.bind(this));
|
|
23
16
|
}
|
|
@@ -32,20 +25,20 @@ class Chart extends collection_route_1.default {
|
|
|
32
25
|
};
|
|
33
26
|
}
|
|
34
27
|
async makeChart(context) {
|
|
35
|
-
const {
|
|
36
|
-
switch (
|
|
37
|
-
case ChartType.Value:
|
|
28
|
+
const { type } = context.request.body;
|
|
29
|
+
switch (type) {
|
|
30
|
+
case forestadmin_client_1.ChartType.Value:
|
|
38
31
|
return this.makeValueChart(context);
|
|
39
|
-
case ChartType.Leaderboard:
|
|
32
|
+
case forestadmin_client_1.ChartType.Leaderboard:
|
|
40
33
|
return this.makeLeaderboardChart(context);
|
|
41
|
-
case ChartType.Objective:
|
|
34
|
+
case forestadmin_client_1.ChartType.Objective:
|
|
42
35
|
return this.makeObjectiveChart(context);
|
|
43
|
-
case ChartType.Pie:
|
|
36
|
+
case forestadmin_client_1.ChartType.Pie:
|
|
44
37
|
return this.makePieChart(context);
|
|
45
|
-
case ChartType.Line:
|
|
38
|
+
case forestadmin_client_1.ChartType.Line:
|
|
46
39
|
return this.makeLineChart(context);
|
|
47
40
|
default:
|
|
48
|
-
throw new datasource_toolkit_1.ValidationError(`Invalid Chart type "${
|
|
41
|
+
throw new datasource_toolkit_1.ValidationError(`Invalid Chart type "${type}"`);
|
|
49
42
|
}
|
|
50
43
|
}
|
|
51
44
|
async makeValueChart(context) {
|
|
@@ -66,9 +59,9 @@ class Chart extends collection_route_1.default {
|
|
|
66
59
|
return { value: await this.computeValue(context, await this.getFilter(context)) };
|
|
67
60
|
}
|
|
68
61
|
async makePieChart(context) {
|
|
69
|
-
const {
|
|
62
|
+
const { groupByFieldName: groupByField, aggregator, aggregateFieldName: aggregateField, } = context.request.body;
|
|
70
63
|
const rows = await this.collection.aggregate(query_string_1.default.parseCaller(context), await this.getFilter(context), new datasource_toolkit_1.Aggregation({
|
|
71
|
-
operation:
|
|
64
|
+
operation: aggregator,
|
|
72
65
|
field: aggregateField,
|
|
73
66
|
groups: [{ field: groupByField }],
|
|
74
67
|
}));
|
|
@@ -78,9 +71,9 @@ class Chart extends collection_route_1.default {
|
|
|
78
71
|
}));
|
|
79
72
|
}
|
|
80
73
|
async makeLineChart(context) {
|
|
81
|
-
const {
|
|
74
|
+
const { aggregator, aggregateFieldName: aggregateField, groupByFieldName: groupByDateField, timeRange, } = context.request.body;
|
|
82
75
|
const rows = await this.collection.aggregate(query_string_1.default.parseCaller(context), await this.getFilter(context), new datasource_toolkit_1.Aggregation({
|
|
83
|
-
operation:
|
|
76
|
+
operation: aggregator,
|
|
84
77
|
field: aggregateField,
|
|
85
78
|
groups: [{ field: groupByDateField, operation: timeRange }],
|
|
86
79
|
}));
|
|
@@ -91,7 +84,7 @@ class Chart extends collection_route_1.default {
|
|
|
91
84
|
const dates = Object.keys(values).sort((dateA, dateB) => dateA.localeCompare(dateB));
|
|
92
85
|
const last = luxon_1.DateTime.fromISO(dates[dates.length - 1]);
|
|
93
86
|
const dataPoints = [];
|
|
94
|
-
const format =
|
|
87
|
+
const format = ChartRoute.formats[timeRange];
|
|
95
88
|
for (let current = luxon_1.DateTime.fromISO(dates[0]); current <= last; current = current.plus({ [timeRange]: 1 })) {
|
|
96
89
|
const label = current.toFormat(format);
|
|
97
90
|
const value = values[current.toISODate()] ?? 0;
|
|
@@ -100,33 +93,33 @@ class Chart extends collection_route_1.default {
|
|
|
100
93
|
return dataPoints;
|
|
101
94
|
}
|
|
102
95
|
async makeLeaderboardChart(context) {
|
|
103
|
-
const
|
|
104
|
-
const field = this.collection.schema.fields[body.
|
|
96
|
+
const body = context.request.body;
|
|
97
|
+
const field = this.collection.schema.fields[body.relationshipFieldName];
|
|
105
98
|
let collection;
|
|
106
99
|
let filter;
|
|
107
100
|
let aggregation;
|
|
108
101
|
if (field?.type === 'OneToMany') {
|
|
109
|
-
const inverse = datasource_toolkit_1.CollectionUtils.getInverseRelation(this.collection, body.
|
|
102
|
+
const inverse = datasource_toolkit_1.CollectionUtils.getInverseRelation(this.collection, body.relationshipFieldName);
|
|
110
103
|
if (inverse) {
|
|
111
104
|
collection = field.foreignCollection;
|
|
112
105
|
filter = (await this.getFilter(context)).nest(inverse);
|
|
113
106
|
aggregation = new datasource_toolkit_1.Aggregation({
|
|
114
|
-
operation: body.
|
|
115
|
-
field: body.
|
|
116
|
-
groups: [{ field: `${inverse}:${body.
|
|
107
|
+
operation: body.aggregator,
|
|
108
|
+
field: body.aggregateFieldName,
|
|
109
|
+
groups: [{ field: `${inverse}:${body.labelFieldName}` }],
|
|
117
110
|
});
|
|
118
111
|
}
|
|
119
112
|
}
|
|
120
113
|
if (field?.type === 'ManyToMany') {
|
|
121
|
-
const origin = datasource_toolkit_1.CollectionUtils.getThroughOrigin(this.collection, body.
|
|
122
|
-
const target = datasource_toolkit_1.CollectionUtils.getThroughTarget(this.collection, body.
|
|
114
|
+
const origin = datasource_toolkit_1.CollectionUtils.getThroughOrigin(this.collection, body.relationshipFieldName);
|
|
115
|
+
const target = datasource_toolkit_1.CollectionUtils.getThroughTarget(this.collection, body.relationshipFieldName);
|
|
123
116
|
if (origin && target) {
|
|
124
117
|
collection = field.throughCollection;
|
|
125
118
|
filter = (await this.getFilter(context)).nest(origin);
|
|
126
119
|
aggregation = new datasource_toolkit_1.Aggregation({
|
|
127
|
-
operation: body.
|
|
128
|
-
field: body.
|
|
129
|
-
groups: [{ field: `${origin}:${body.
|
|
120
|
+
operation: body.aggregator,
|
|
121
|
+
field: body.aggregateFieldName ? `${target}:${body.aggregateFieldName}` : null,
|
|
122
|
+
groups: [{ field: `${origin}:${body.labelFieldName}` }],
|
|
130
123
|
});
|
|
131
124
|
}
|
|
132
125
|
}
|
|
@@ -142,8 +135,8 @@ class Chart extends collection_route_1.default {
|
|
|
142
135
|
throw new datasource_toolkit_1.ValidationError(`Failed to generate leaderboard chart: parameters do not match pre-requisites`);
|
|
143
136
|
}
|
|
144
137
|
async computeValue(context, filter) {
|
|
145
|
-
const {
|
|
146
|
-
const aggregation = new datasource_toolkit_1.Aggregation({ operation:
|
|
138
|
+
const { aggregator, aggregateFieldName: aggregateField } = (context.request.body);
|
|
139
|
+
const aggregation = new datasource_toolkit_1.Aggregation({ operation: aggregator, field: aggregateField });
|
|
147
140
|
const rows = await this.collection.aggregate(query_string_1.default.parseCaller(context), filter, aggregation);
|
|
148
141
|
return rows.length ? rows[0].value : 0;
|
|
149
142
|
}
|
|
@@ -152,11 +145,11 @@ class Chart extends collection_route_1.default {
|
|
|
152
145
|
return context_filter_factory_1.default.build(this.collection, context, scope);
|
|
153
146
|
}
|
|
154
147
|
}
|
|
155
|
-
exports.default =
|
|
156
|
-
|
|
148
|
+
exports.default = ChartRoute;
|
|
149
|
+
ChartRoute.formats = {
|
|
157
150
|
Day: 'dd/MM/yyyy',
|
|
158
151
|
Week: "'W'W-yyyy",
|
|
159
152
|
Month: 'MMM yy',
|
|
160
153
|
Year: 'yyyy',
|
|
161
154
|
};
|
|
162
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
155
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"chart.js","sourceRoot":"","sources":["../../../src/routes/access/chart.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,8 @@ export default class ErrorHandling extends BaseRoute {
|
|
|
8
8
|
private errorHandler;
|
|
9
9
|
private getErrorStatus;
|
|
10
10
|
private getErrorMessage;
|
|
11
|
+
private getErrorName;
|
|
12
|
+
private getErrorPayload;
|
|
11
13
|
private debugLogError;
|
|
12
14
|
}
|
|
13
15
|
//# sourceMappingURL=error-handling.d.ts.map
|
|
@@ -20,8 +20,19 @@ class ErrorHandling extends base_route_1.default {
|
|
|
20
20
|
await next();
|
|
21
21
|
}
|
|
22
22
|
catch (e) {
|
|
23
|
-
|
|
24
|
-
|
|
23
|
+
const status = this.getErrorStatus(e);
|
|
24
|
+
const data = this.getErrorPayload(e);
|
|
25
|
+
context.response.status = status;
|
|
26
|
+
context.response.body = {
|
|
27
|
+
errors: [
|
|
28
|
+
{
|
|
29
|
+
name: this.getErrorName(e),
|
|
30
|
+
detail: this.getErrorMessage(e),
|
|
31
|
+
status,
|
|
32
|
+
...(data ? { data } : {}),
|
|
33
|
+
},
|
|
34
|
+
],
|
|
35
|
+
};
|
|
25
36
|
if (!this.options.isProduction) {
|
|
26
37
|
process.nextTick(() => this.debugLogError(context, e));
|
|
27
38
|
}
|
|
@@ -52,6 +63,12 @@ class ErrorHandling extends base_route_1.default {
|
|
|
52
63
|
}
|
|
53
64
|
return 'Unexpected error';
|
|
54
65
|
}
|
|
66
|
+
getErrorName(error) {
|
|
67
|
+
return error.constructor.name;
|
|
68
|
+
}
|
|
69
|
+
getErrorPayload(error) {
|
|
70
|
+
return error.data;
|
|
71
|
+
}
|
|
55
72
|
debugLogError(context, error) {
|
|
56
73
|
const { request } = context;
|
|
57
74
|
const query = JSON.stringify(request.query, null, ' ')?.replace(/"/g, '');
|
|
@@ -72,4 +89,4 @@ class ErrorHandling extends base_route_1.default {
|
|
|
72
89
|
}
|
|
73
90
|
}
|
|
74
91
|
exports.default = ErrorHandling;
|
|
75
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
92
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3ItaGFuZGxpbmcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcm91dGVzL3N5c3RlbS9lcnJvci1oYW5kbGluZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDZCQUErQztBQUMvQyx3RUFJeUM7QUFHekMsdUNBQWtEO0FBQ2xELCtEQUFzQztBQUV0QyxNQUFxQixhQUFjLFNBQVEsb0JBQVM7SUFBcEQ7O1FBQ0UsU0FBSSxHQUFHLGlCQUFTLENBQUMsWUFBWSxDQUFDO0lBdUZoQyxDQUFDO0lBckZDLFdBQVcsQ0FBQyxNQUFjO1FBQ3hCLE1BQU0sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztJQUMzQyxDQUFDO0lBRU8sS0FBSyxDQUFDLFlBQVksQ0FBQyxPQUFnQixFQUFFLElBQVU7UUFDckQsSUFBSTtZQUNGLE1BQU0sSUFBSSxFQUFFLENBQUM7U0FDZDtRQUFDLE9BQU8sQ0FBQyxFQUFFO1lBQ1YsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLGNBQWMsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUN0QyxNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsZUFBZSxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBRXJDLE9BQU8sQ0FBQyxRQUFRLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQztZQUNqQyxPQUFPLENBQUMsUUFBUSxDQUFDLElBQUksR0FBRztnQkFDdEIsTUFBTSxFQUFFO29CQUNOO3dCQUNFLElBQUksRUFBRSxJQUFJLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQzt3QkFDMUIsTUFBTSxFQUFFLElBQUksQ0FBQyxlQUFlLENBQUMsQ0FBQyxDQUFDO3dCQUMvQixNQUFNO3dCQUNOLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztxQkFDMUI7aUJBQ0Y7YUFD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
|
|
@@ -12,10 +12,11 @@ class QueryStringParser {
|
|
|
12
12
|
try {
|
|
13
13
|
const filters = context.request.body?.data?.attributes?.all_records_subset_query?.filters ??
|
|
14
14
|
context.request.body?.filters ??
|
|
15
|
+
context.request.body?.filter ??
|
|
15
16
|
context.request.query?.filters;
|
|
16
17
|
if (!filters)
|
|
17
18
|
return null;
|
|
18
|
-
const json = JSON.parse(filters.toString());
|
|
19
|
+
const json = typeof filters === 'object' ? filters : JSON.parse(filters.toString());
|
|
19
20
|
const conditionTree = condition_tree_parser_1.default.fromPlainObject(collection, json);
|
|
20
21
|
datasource_toolkit_1.ConditionTreeValidator.validate(conditionTree, collection);
|
|
21
22
|
return conditionTree;
|
|
@@ -131,4 +132,4 @@ class QueryStringParser {
|
|
|
131
132
|
}
|
|
132
133
|
}
|
|
133
134
|
exports.default = QueryStringParser;
|
|
134
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
135
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVlcnktc3RyaW5nLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL3F1ZXJ5LXN0cmluZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLHdFQWF5QztBQUV6QyxvRkFBMEQ7QUFFMUQsTUFBTSxzQkFBc0IsR0FBRyxFQUFFLENBQUM7QUFDbEMsTUFBTSxvQkFBb0IsR0FBRyxDQUFDLENBQUM7QUFFL0IsTUFBcUIsaUJBQWlCO0lBQ3BDLE1BQU0sQ0FBQyxrQkFBa0IsQ0FBQyxVQUFzQixFQUFFLE9BQWdCO1FBQ2hFLElBQUk7WUFDRixNQUFNLE9BQU8sR0FDWCxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxJQUFJLEVBQUUsVUFBVSxFQUFFLHdCQUF3QixFQUFFLE9BQU87Z0JBQ3pFLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFLE9BQU87Z0JBQzdCLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFLE1BQU07Z0JBQzVCLE9BQU8sQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLE9BQU8sQ0FBQztZQUVqQyxJQUFJLENBQUMsT0FBTztnQkFBRSxPQUFPLElBQUksQ0FBQztZQUUxQixNQUFNLElBQUksR0FBRyxPQUFPLE9BQU8sS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztZQUNwRixNQUFNLGFBQWEsR0FBRywrQkFBbUIsQ0FBQyxlQUFlLENBQUMsVUFBVSxFQUFFLElBQUksQ0FBQyxDQUFDO1lBQzVFLDJDQUFzQixDQUFDLFFBQVEsQ0FBQyxhQUFhLEVBQUUsVUFBVSxDQUFDLENBQUM7WUFFM0QsT0FBTyxhQUFhLENBQUM7U0FDdEI7UUFBQyxPQUFPLENBQUMsRUFBRTtZQUNWLE1BQU0sSUFBSSxvQ0FBZSxDQUFDLG9CQUFvQixDQUFDLENBQUMsT0FBTyxHQUFH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
|