@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
|
@@ -1,34 +1,12 @@
|
|
|
1
|
-
/// <reference types="
|
|
1
|
+
/// <reference types="koa__router" />
|
|
2
2
|
import { DataSource } from '@forestadmin/datasource-toolkit';
|
|
3
|
-
import
|
|
4
|
-
import { AgentOptions } from '../types';
|
|
3
|
+
import Router from '@koa/router';
|
|
5
4
|
import { AgentOptionsWithDefaults } from './types';
|
|
6
|
-
import BaseRoute from './routes/base-route';
|
|
7
|
-
import { ForestAdminHttpDriverServices } from './services';
|
|
8
|
-
/** Native NodeJS callback that can be passed to an HTTP Server */
|
|
9
|
-
export declare type HttpCallback = (req: IncomingMessage, res: ServerResponse) => void;
|
|
10
5
|
export default class ForestAdminHttpDriver {
|
|
11
6
|
readonly dataSource: DataSource;
|
|
12
7
|
readonly options: AgentOptionsWithDefaults;
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
private status;
|
|
17
|
-
/**
|
|
18
|
-
* Native request handler.
|
|
19
|
-
* Can be used directly with express.js or the NodeJS http module.
|
|
20
|
-
* Other frameworks will require adapters.
|
|
21
|
-
*/
|
|
22
|
-
get handler(): HttpCallback;
|
|
23
|
-
constructor(dataSource: DataSource, options: AgentOptions);
|
|
24
|
-
/**
|
|
25
|
-
* Builds the underlying application from the datasource.
|
|
26
|
-
* This method can only be called once.
|
|
27
|
-
*/
|
|
28
|
-
start(): Promise<void>;
|
|
29
|
-
/**
|
|
30
|
-
* Tear down all routes (close open sockets, ...)
|
|
31
|
-
*/
|
|
32
|
-
stop(): Promise<void>;
|
|
8
|
+
constructor(dataSource: DataSource, options: AgentOptionsWithDefaults);
|
|
9
|
+
getRouter(): Promise<Router>;
|
|
10
|
+
sendSchema(): Promise<void>;
|
|
33
11
|
}
|
|
34
12
|
//# sourceMappingURL=forestadmin-http-driver.d.ts.map
|
|
@@ -3,71 +3,41 @@ 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
|
-
const koa_1 = __importDefault(require("koa"));
|
|
7
6
|
const router_1 = __importDefault(require("@koa/router"));
|
|
8
7
|
const koa_bodyparser_1 = __importDefault(require("koa-bodyparser"));
|
|
9
8
|
const cors_1 = __importDefault(require("@koa/cors"));
|
|
10
|
-
const path_1 = __importDefault(require("path"));
|
|
11
|
-
const types_1 = require("../types");
|
|
12
9
|
const forest_http_api_1 = __importDefault(require("./utils/forest-http-api"));
|
|
13
|
-
const http_driver_options_1 = __importDefault(require("./utils/http-driver-options"));
|
|
14
10
|
const emitter_1 = __importDefault(require("./utils/forest-schema/emitter"));
|
|
15
11
|
const routes_1 = __importDefault(require("./routes"));
|
|
16
12
|
const services_1 = __importDefault(require("./services"));
|
|
17
13
|
class ForestAdminHttpDriver {
|
|
18
14
|
constructor(dataSource, options) {
|
|
19
|
-
this.routes = [];
|
|
20
|
-
this.app = new koa_1.default();
|
|
21
|
-
this.status = 'waiting';
|
|
22
15
|
this.dataSource = dataSource;
|
|
23
|
-
this.options =
|
|
24
|
-
this.services = (0, services_1.default)(this.options);
|
|
25
|
-
http_driver_options_1.default.validate(this.options);
|
|
16
|
+
this.options = options;
|
|
26
17
|
}
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
18
|
+
async getRouter() {
|
|
19
|
+
// Bootstrap app
|
|
20
|
+
const services = (0, services_1.default)(this.options);
|
|
21
|
+
const routes = (0, routes_1.default)(this.dataSource, this.options, services);
|
|
22
|
+
await Promise.all(routes.map(route => route.bootstrap()));
|
|
23
|
+
// Build router
|
|
24
|
+
const router = new router_1.default();
|
|
25
|
+
router.all('(.*)', (0, cors_1.default)({ credentials: true, maxAge: 24 * 3600, privateNetworkAccess: true }));
|
|
26
|
+
router.use((0, koa_bodyparser_1.default)({ jsonLimit: '50mb' }));
|
|
27
|
+
routes.forEach(route => route.setupRoutes(router));
|
|
28
|
+
return router;
|
|
34
29
|
}
|
|
35
|
-
|
|
36
|
-
* Builds the underlying application from the datasource.
|
|
37
|
-
* This method can only be called once.
|
|
38
|
-
*/
|
|
39
|
-
async start() {
|
|
40
|
-
if (this.status !== 'waiting') {
|
|
41
|
-
throw new Error('Agent cannot be restarted.');
|
|
42
|
-
}
|
|
43
|
-
this.status = 'running';
|
|
44
|
-
// Build http application
|
|
45
|
-
const router = new router_1.default({ prefix: path_1.default.join('/', this.options.prefix) });
|
|
46
|
-
this.routes = (0, routes_1.default)(this.dataSource, this.options, this.services);
|
|
47
|
-
this.routes.forEach(route => route.setupRoutes(router));
|
|
48
|
-
await Promise.all(this.routes.map(route => route.bootstrap()));
|
|
49
|
-
this.app
|
|
50
|
-
.use((0, cors_1.default)({ credentials: true, maxAge: 24 * 3600 }))
|
|
51
|
-
.use((0, koa_bodyparser_1.default)({ jsonLimit: '50mb' }))
|
|
52
|
-
.use(router.routes());
|
|
53
|
-
// Send schema to forestadmin-server (if relevant).
|
|
30
|
+
async sendSchema() {
|
|
54
31
|
const schema = await emitter_1.default.getSerializedSchema(this.options, this.dataSource);
|
|
55
32
|
const schemaIsKnown = await forest_http_api_1.default.hasSchema(this.options, schema.meta.schemaFileHash);
|
|
56
33
|
if (!schemaIsKnown) {
|
|
34
|
+
this.options.logger('Info', 'Schema was updated, sending new version');
|
|
57
35
|
await forest_http_api_1.default.uploadSchema(this.options, schema);
|
|
58
36
|
}
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
/**
|
|
62
|
-
* Tear down all routes (close open sockets, ...)
|
|
63
|
-
*/
|
|
64
|
-
async stop() {
|
|
65
|
-
if (this.status !== 'running') {
|
|
66
|
-
throw new Error('Agent is not running.');
|
|
37
|
+
else {
|
|
38
|
+
this.options.logger('Info', 'Schema was not updated since last run');
|
|
67
39
|
}
|
|
68
|
-
this.status = 'done';
|
|
69
|
-
await Promise.all(this.routes.map(route => route.tearDown()));
|
|
70
40
|
}
|
|
71
41
|
}
|
|
72
42
|
exports.default = ForestAdminHttpDriver;
|
|
73
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
43
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9yZXN0YWRtaW4taHR0cC1kcml2ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYWdlbnQvZm9yZXN0YWRtaW4taHR0cC1kcml2ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFDQSx5REFBaUM7QUFDakMsb0VBQXdDO0FBQ3hDLHFEQUE2QjtBQUc3Qiw4RUFBb0Q7QUFDcEQsNEVBQTBEO0FBQzFELHNEQUFrQztBQUNsQywwREFBc0M7QUFFdEMsTUFBcUIscUJBQXFCO0lBSXhDLFlBQVksVUFBc0IsRUFBRSxPQUFpQztRQUNuRSxJQUFJLENBQUMsVUFBVSxHQUFHLFVBQVUsQ0FBQztRQUM3QixJQUFJLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQztJQUN6QixDQUFDO0lBRUQsS0FBSyxDQUFDLFNBQVM7UUFDYixnQkFBZ0I7UUFDaEIsTUFBTSxRQUFRLEdBQUcsSUFBQSxrQkFBWSxFQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUM1QyxNQUFNLE1BQU0sR0FBRyxJQUFBLGdCQUFVLEVBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxJQUFJLENBQUMsT0FBTyxFQUFFLFFBQVEsQ0FBQyxDQUFDO1FBQ25FLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsS0FBSyxDQUFDLFNBQVMsRUFBRSxDQUFDLENBQUMsQ0FBQztRQUUxRCxlQUFlO1FBQ2YsTUFBTSxNQUFNLEdBQUcsSUFBSSxnQkFBTSxFQUFFLENBQUM7UUFDNUIsTUFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsSUFBQSxjQUFJLEVBQUMsRUFBRSxXQUFXLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxFQUFFLEdBQUcsSUFBSSxFQUFFLG9CQUFvQixFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQztRQUMvRixNQUFNLENBQUMsR0FBRyxDQUFDLElBQUEsd0JBQVUsRUFBQyxFQUFFLFNBQVMsRUFBRSxNQUFNLEVBQUUsQ0FBQyxDQUFDLENBQUM7UUFDOUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUVuRCxPQUFPLE1BQU0sQ0FBQztJQUNoQixDQUFDO0lBRUQsS0FBSyxDQUFDLFVBQVU7UUFDZCxNQUFNLE1BQU0sR0FBRyxNQUFNLGlCQUFhLENBQUMsbUJBQW1CLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUM7UUFDdEYsTUFBTSxhQUFhLEdBQUcsTUFBTSx5QkFBYSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLE1BQU0sQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLENBQUM7UUFFOUYsSUFBSSxDQUFDLGFBQWEsRUFBRTtZQUNsQixJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUUseUNBQXlDLENBQUMsQ0FBQztZQUN2RSxNQUFNLHlCQUFhLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsTUFBTSxDQUFDLENBQUM7U0FDeEQ7YUFBTTtZQUNMLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLE1BQU0sRUFBRSx1Q0FBdUMsQ0FBQyxDQUFDO1NBQ3RFO0lBQ0gsQ0FBQztDQUNGO0FBbkNELHdDQW1DQyJ9
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
/// <reference types="koa__router" />
|
|
2
|
+
import { DataSource } from '@forestadmin/datasource-toolkit';
|
|
3
|
+
import Router from '@koa/router';
|
|
4
|
+
import { AgentOptionsWithDefaults, RouteType } from '../../types';
|
|
5
|
+
import { ForestAdminHttpDriverServices } from '../../services';
|
|
6
|
+
import BaseRoute from '../base-route';
|
|
7
|
+
export default class ApiChartRoute extends BaseRoute {
|
|
8
|
+
readonly type = RouteType.PrivateRoute;
|
|
9
|
+
private dataSource;
|
|
10
|
+
private chartName;
|
|
11
|
+
constructor(services: ForestAdminHttpDriverServices, options: AgentOptionsWithDefaults, dataSource: DataSource, chartName: string);
|
|
12
|
+
setupRoutes(router: Router): void;
|
|
13
|
+
private handleApiChart;
|
|
14
|
+
private handleSmartChart;
|
|
15
|
+
}
|
|
16
|
+
//# sourceMappingURL=api-chart.d.ts.map
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const uuid_1 = require("uuid");
|
|
7
|
+
const path_1 = __importDefault(require("path"));
|
|
8
|
+
const types_1 = require("../../types");
|
|
9
|
+
const base_route_1 = __importDefault(require("../base-route"));
|
|
10
|
+
const query_string_1 = __importDefault(require("../../utils/query-string"));
|
|
11
|
+
class ApiChartRoute extends base_route_1.default {
|
|
12
|
+
constructor(services, options, dataSource, chartName) {
|
|
13
|
+
super(services, options);
|
|
14
|
+
this.type = types_1.RouteType.PrivateRoute;
|
|
15
|
+
this.dataSource = dataSource;
|
|
16
|
+
this.chartName = chartName;
|
|
17
|
+
}
|
|
18
|
+
setupRoutes(router) {
|
|
19
|
+
// Mount both GET and POST, respectively for smart and api charts.
|
|
20
|
+
const suffix = `/_charts/${this.chartName}`;
|
|
21
|
+
router.get(suffix, this.handleSmartChart.bind(this));
|
|
22
|
+
router.post(suffix, this.handleApiChart.bind(this));
|
|
23
|
+
// Log the route to help the customer fill the url in the frontend
|
|
24
|
+
if (!this.options.isProduction) {
|
|
25
|
+
const url = path_1.default.posix.join('/', this.options.prefix, 'forest', suffix);
|
|
26
|
+
this.options.logger('Info', `Chart '${this.chartName}' was mounted at '${url}'`);
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
async handleApiChart(context) {
|
|
30
|
+
// Api Charts need the data to be formatted in JSON-API
|
|
31
|
+
context.response.body = {
|
|
32
|
+
data: {
|
|
33
|
+
id: (0, uuid_1.v1)(),
|
|
34
|
+
type: 'stats',
|
|
35
|
+
attributes: {
|
|
36
|
+
value: await this.dataSource.renderChart(query_string_1.default.parseCaller(context), this.chartName),
|
|
37
|
+
},
|
|
38
|
+
},
|
|
39
|
+
};
|
|
40
|
+
}
|
|
41
|
+
async handleSmartChart(context) {
|
|
42
|
+
// Smart charts need the data to be unformatted
|
|
43
|
+
context.response.body = await this.dataSource.renderChart(query_string_1.default.parseCaller(context), this.chartName);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
exports.default = ApiChartRoute;
|
|
47
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBpLWNoYXJ0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2FnZW50L3JvdXRlcy9hY2Nlc3MvYXBpLWNoYXJ0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBRUEsK0JBQW9DO0FBRXBDLGdEQUF3QjtBQUV4Qix1Q0FBa0U7QUFFbEUsK0RBQXNDO0FBQ3RDLDRFQUF5RDtBQUV6RCxNQUFxQixhQUFjLFNBQVEsb0JBQVM7SUFNbEQsWUFDRSxRQUF1QyxFQUN2QyxPQUFpQyxFQUNqQyxVQUFzQixFQUN0QixTQUFpQjtRQUVqQixLQUFLLENBQUMsUUFBUSxFQUFFLE9BQU8sQ0FBQyxDQUFDO1FBWGxCLFNBQUksR0FBRyxpQkFBUyxDQUFDLFlBQVksQ0FBQztRQWFyQyxJQUFJLENBQUMsVUFBVSxHQUFHLFVBQVUsQ0FBQztRQUM3QixJQUFJLENBQUMsU0FBUyxHQUFHLFNBQVMsQ0FBQztJQUM3QixDQUFDO0lBRUQsV0FBVyxDQUFDLE1BQWM7UUFDeEIsa0VBQWtFO1FBQ2xFLE1BQU0sTUFBTSxHQUFHLFlBQVksSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDO1FBQzVDLE1BQU0sQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUNyRCxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO1FBRXBELGtFQUFrRTtRQUNsRSxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxZQUFZLEVBQUU7WUFDOUIsTUFBTSxHQUFHLEdBQUcsY0FBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxFQUFFLFFBQVEsRUFBRSxNQUFNLENBQUMsQ0FBQztZQUN4RSxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUUsVUFBVSxJQUFJLENBQUMsU0FBUyxxQkFBcUIsR0FBRyxHQUFHLENBQUMsQ0FBQztTQUNsRjtJQUNILENBQUM7SUFFTyxLQUFLLENBQUMsY0FBYyxDQUFDLE9BQWdCO1FBQzNDLHVEQUF1RDtRQUN2RCxPQUFPLENBQUMsUUFBUSxDQUFDLElBQUksR0FBRztZQUN0QixJQUFJLEVBQUU7Z0JBQ0osRUFBRSxFQUFFLElBQUEsU0FBTSxHQUFFO2dCQUNaLElBQUksRUFBRSxPQUFPO2dCQUNiLFVBQVUsRUFBRTtvQkFDVixLQUFLLEVBQUUsTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLFdBQVcsQ0FDdEMsc0JBQWlCLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxFQUN0QyxJQUFJLENBQUMsU0FBUyxDQUNmO2lCQUNGO2FBQ0Y7U0FDRixDQUFDO0lBQ0osQ0FBQztJQUVPLEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQyxPQUFnQjtRQUM3QywrQ0FBK0M7UUFDL0MsT0FBTyxDQUFDLFFBQVEsQ0FBQyxJQUFJLEdBQUcsTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLFdBQVcsQ0FDdkQsc0JBQWlCLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxFQUN0QyxJQUFJLENBQUMsU0FBUyxDQUNmLENBQUM7SUFDSixDQUFDO0NBQ0Y7QUF0REQsZ0NBc0RDIn0=
|
|
@@ -6,6 +6,7 @@ export default class Chart extends CollectionRoute {
|
|
|
6
6
|
private static readonly formats;
|
|
7
7
|
setupRoutes(router: Router): void;
|
|
8
8
|
handleChart(context: Context): Promise<void>;
|
|
9
|
+
private makeChart;
|
|
9
10
|
private makeValueChart;
|
|
10
11
|
private makeObjectiveChart;
|
|
11
12
|
private makePieChart;
|
|
@@ -8,6 +8,7 @@ const luxon_1 = require("luxon");
|
|
|
8
8
|
const uuid_1 = require("uuid");
|
|
9
9
|
const collection_route_1 = __importDefault(require("../collection-route"));
|
|
10
10
|
const context_filter_factory_1 = __importDefault(require("../../utils/context-filter-factory"));
|
|
11
|
+
const query_string_1 = __importDefault(require("../../utils/query-string"));
|
|
11
12
|
var ChartType;
|
|
12
13
|
(function (ChartType) {
|
|
13
14
|
ChartType["Value"] = "Value";
|
|
@@ -21,20 +22,34 @@ class Chart extends collection_route_1.default {
|
|
|
21
22
|
router.post(`/stats/${this.collection.name}`, this.handleChart.bind(this));
|
|
22
23
|
}
|
|
23
24
|
async handleChart(context) {
|
|
24
|
-
const { body } = context.request;
|
|
25
25
|
await this.services.permissions.canChart(context);
|
|
26
|
-
if (!Object.values(ChartType).includes(body.type)) {
|
|
27
|
-
throw new datasource_toolkit_1.ValidationError(`Invalid Chart type "${body.type}"`);
|
|
28
|
-
}
|
|
29
26
|
context.response.body = {
|
|
30
27
|
data: {
|
|
31
28
|
id: (0, uuid_1.v1)(),
|
|
32
29
|
type: 'stats',
|
|
33
|
-
attributes: { value: await this
|
|
30
|
+
attributes: { value: await this.makeChart(context) },
|
|
34
31
|
},
|
|
35
32
|
};
|
|
36
33
|
}
|
|
34
|
+
async makeChart(context) {
|
|
35
|
+
const { body } = context.request;
|
|
36
|
+
switch (body.type) {
|
|
37
|
+
case ChartType.Value:
|
|
38
|
+
return this.makeValueChart(context);
|
|
39
|
+
case ChartType.Leaderboard:
|
|
40
|
+
return this.makeLeaderboardChart(context);
|
|
41
|
+
case ChartType.Objective:
|
|
42
|
+
return this.makeObjectiveChart(context);
|
|
43
|
+
case ChartType.Pie:
|
|
44
|
+
return this.makePieChart(context);
|
|
45
|
+
case ChartType.Line:
|
|
46
|
+
return this.makeLineChart(context);
|
|
47
|
+
default:
|
|
48
|
+
throw new datasource_toolkit_1.ValidationError(`Invalid Chart type "${body.type}"`);
|
|
49
|
+
}
|
|
50
|
+
}
|
|
37
51
|
async makeValueChart(context) {
|
|
52
|
+
const caller = query_string_1.default.parseCaller(context);
|
|
38
53
|
const currentFilter = await this.getFilter(context);
|
|
39
54
|
const result = {
|
|
40
55
|
countCurrent: await this.computeValue(context, currentFilter),
|
|
@@ -43,7 +58,7 @@ class Chart extends collection_route_1.default {
|
|
|
43
58
|
const isAndAggregator = currentFilter.conditionTree?.aggregator === 'And';
|
|
44
59
|
const withCountPrevious = currentFilter.conditionTree?.someLeaf(leaf => leaf.useIntervalOperator);
|
|
45
60
|
if (withCountPrevious && !isAndAggregator) {
|
|
46
|
-
result.countPrevious = await this.computeValue(context, datasource_toolkit_1.FilterFactory.getPreviousPeriodFilter(currentFilter));
|
|
61
|
+
result.countPrevious = await this.computeValue(context, datasource_toolkit_1.FilterFactory.getPreviousPeriodFilter(currentFilter, caller.timezone));
|
|
47
62
|
}
|
|
48
63
|
return result;
|
|
49
64
|
}
|
|
@@ -52,7 +67,7 @@ class Chart extends collection_route_1.default {
|
|
|
52
67
|
}
|
|
53
68
|
async makePieChart(context) {
|
|
54
69
|
const { group_by_field: groupByField, aggregate, aggregate_field: aggregateField, } = context.request.body;
|
|
55
|
-
const rows = await this.collection.aggregate(await this.getFilter(context), new datasource_toolkit_1.Aggregation({
|
|
70
|
+
const rows = await this.collection.aggregate(query_string_1.default.parseCaller(context), await this.getFilter(context), new datasource_toolkit_1.Aggregation({
|
|
56
71
|
operation: aggregate,
|
|
57
72
|
field: aggregateField,
|
|
58
73
|
groups: [{ field: groupByField }],
|
|
@@ -64,7 +79,7 @@ class Chart extends collection_route_1.default {
|
|
|
64
79
|
}
|
|
65
80
|
async makeLineChart(context) {
|
|
66
81
|
const { aggregate, aggregate_field: aggregateField, group_by_date_field: groupByDateField, time_range: timeRange, } = context.request.body;
|
|
67
|
-
const rows = await this.collection.aggregate(await this.getFilter(context), new datasource_toolkit_1.Aggregation({
|
|
82
|
+
const rows = await this.collection.aggregate(query_string_1.default.parseCaller(context), await this.getFilter(context), new datasource_toolkit_1.Aggregation({
|
|
68
83
|
operation: aggregate,
|
|
69
84
|
field: aggregateField,
|
|
70
85
|
groups: [{ field: groupByDateField, operation: timeRange }],
|
|
@@ -118,7 +133,7 @@ class Chart extends collection_route_1.default {
|
|
|
118
133
|
if (collection && filter && aggregation) {
|
|
119
134
|
const rows = await this.dataSource
|
|
120
135
|
.getCollection(collection)
|
|
121
|
-
.aggregate(filter, aggregation, Number(body.limit));
|
|
136
|
+
.aggregate(query_string_1.default.parseCaller(context), filter, aggregation, Number(body.limit));
|
|
122
137
|
return rows.map(row => ({
|
|
123
138
|
key: row.group[aggregation.groups[0].field],
|
|
124
139
|
value: row.value,
|
|
@@ -129,7 +144,7 @@ class Chart extends collection_route_1.default {
|
|
|
129
144
|
async computeValue(context, filter) {
|
|
130
145
|
const { aggregate, aggregate_field: aggregateField } = context.request.body;
|
|
131
146
|
const aggregation = new datasource_toolkit_1.Aggregation({ operation: aggregate, field: aggregateField });
|
|
132
|
-
const rows = await this.collection.aggregate(filter, aggregation);
|
|
147
|
+
const rows = await this.collection.aggregate(query_string_1.default.parseCaller(context), filter, aggregation);
|
|
133
148
|
return rows.length ? rows[0].value : 0;
|
|
134
149
|
}
|
|
135
150
|
async getFilter(context) {
|
|
@@ -144,4 +159,4 @@ Chart.formats = {
|
|
|
144
159
|
Month: 'MMM yy',
|
|
145
160
|
Year: 'yyyy',
|
|
146
161
|
};
|
|
147
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
162
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"chart.js","sourceRoot":"","sources":["../../../../src/agent/routes/access/chart.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const datasource_toolkit_1 = require("@forestadmin/datasource-toolkit");
|
|
7
7
|
const context_filter_factory_1 = __importDefault(require("../../utils/context-filter-factory"));
|
|
8
8
|
const id_1 = __importDefault(require("../../utils/id"));
|
|
9
|
+
const query_string_1 = __importDefault(require("../../utils/query-string"));
|
|
9
10
|
const relation_route_1 = __importDefault(require("../relation-route"));
|
|
10
11
|
class CountRelatedRoute extends relation_route_1.default {
|
|
11
12
|
setupRoutes(router) {
|
|
@@ -13,12 +14,18 @@ class CountRelatedRoute extends relation_route_1.default {
|
|
|
13
14
|
}
|
|
14
15
|
async handleCountRelated(context) {
|
|
15
16
|
await this.services.permissions.can(context, `browse:${this.collection.name}`);
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
17
|
+
if (this.foreignCollection.schema.countable) {
|
|
18
|
+
const parentId = id_1.default.unpackId(this.collection.schema, context.params.parentId);
|
|
19
|
+
const scope = await this.services.permissions.getScope(this.foreignCollection, context);
|
|
20
|
+
const caller = query_string_1.default.parseCaller(context);
|
|
21
|
+
const filter = context_filter_factory_1.default.build(this.foreignCollection, context, scope);
|
|
22
|
+
const aggregationResult = await datasource_toolkit_1.CollectionUtils.aggregateRelation(this.collection, parentId, this.relationName, caller, filter, new datasource_toolkit_1.Aggregation({ operation: 'Count' }));
|
|
23
|
+
context.response.body = { count: aggregationResult?.[0]?.value ?? 0 };
|
|
24
|
+
}
|
|
25
|
+
else {
|
|
26
|
+
context.response.body = { meta: { count: 'deactivated' } };
|
|
27
|
+
}
|
|
21
28
|
}
|
|
22
29
|
}
|
|
23
30
|
exports.default = CountRelatedRoute;
|
|
24
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
31
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY291bnQtcmVsYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9hZ2VudC9yb3V0ZXMvYWNjZXNzL2NvdW50LXJlbGF0ZWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSx3RUFBK0U7QUFJL0UsZ0dBQXNFO0FBQ3RFLHdEQUFxQztBQUNyQyw0RUFBeUQ7QUFDekQsdUVBQThDO0FBRTlDLE1BQXFCLGlCQUFrQixTQUFRLHdCQUFhO0lBQzFELFdBQVcsQ0FBQyxNQUFjO1FBQ3hCLE1BQU0sQ0FBQyxHQUFHLENBQ1IsSUFBSSxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksNEJBQTRCLElBQUksQ0FBQyxZQUFZLFFBQVEsRUFDN0UsSUFBSSxDQUFDLGtCQUFrQixDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FDbkMsQ0FBQztJQUNKLENBQUM7SUFFTSxLQUFLLENBQUMsa0JBQWtCLENBQUMsT0FBZ0I7UUFDOUMsTUFBTSxJQUFJLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFLFVBQVUsSUFBSSxDQUFDLFVBQVUsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDO1FBRS9FLElBQUksSUFBSSxDQUFDLGlCQUFpQixDQUFDLE1BQU0sQ0FBQyxTQUFTLEVBQUU7WUFDM0MsTUFBTSxRQUFRLEdBQUcsWUFBTyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxPQUFPLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQ25GLE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxpQkFBaUIsRUFBRSxPQUFPLENBQUMsQ0FBQztZQUN4RixNQUFNLE1BQU0sR0FBRyxzQkFBaUIsQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLENBQUM7WUFDdEQsTUFBTSxNQUFNLEdBQUcsZ0NBQW9CLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxpQkFBaUIsRUFBRSxPQUFPLEVBQUUsS0FBSyxDQUFDLENBQUM7WUFFbEYsTUFBTSxpQkFBaUIsR0FBRyxNQUFNLG9DQUFlLENBQUMsaUJBQWlCLENBQy9ELElBQUksQ0FBQyxVQUFVLEVBQ2YsUUFBUSxFQUNSLElBQUksQ0FBQyxZQUFZLEVBQ2pCLE1BQU0sRUFDTixNQUFNLEVBQ04sSUFBSSxnQ0FBVyxDQUFDLEVBQUUsU0FBUyxFQUFFLE9BQU8sRUFBRSxDQUFDLENBQ3hDLENBQUM7WUFFRixPQUFPLENBQUMsUUFBUSxDQUFDLElBQUksR0FBRyxFQUFFLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLEtBQUssSUFBSSxDQUFDLEVBQUUsQ0FBQztTQUN2RTthQUFNO1lBQ0wsT0FBTyxDQUFDLFFBQVEsQ0FBQyxJQUFJLEdBQUcsRUFBRSxJQUFJLEVBQUUsRUFBRSxLQUFLLEVBQUUsYUFBYSxFQUFFLEVBQUUsQ0FBQztTQUM1RDtJQUNILENBQUM7Q0FDRjtBQS9CRCxvQ0ErQkMifQ==
|
|
@@ -6,19 +6,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const datasource_toolkit_1 = require("@forestadmin/datasource-toolkit");
|
|
7
7
|
const collection_route_1 = __importDefault(require("../collection-route"));
|
|
8
8
|
const context_filter_factory_1 = __importDefault(require("../../utils/context-filter-factory"));
|
|
9
|
+
const query_string_1 = __importDefault(require("../../utils/query-string"));
|
|
9
10
|
class CountRoute extends collection_route_1.default {
|
|
10
11
|
setupRoutes(router) {
|
|
11
12
|
router.get(`/${this.collection.name}/count`, this.handleCount.bind(this));
|
|
12
13
|
}
|
|
13
14
|
async handleCount(context) {
|
|
14
15
|
await this.services.permissions.can(context, `browse:${this.collection.name}`);
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
16
|
+
if (this.collection.schema.countable) {
|
|
17
|
+
const scope = await this.services.permissions.getScope(this.collection, context);
|
|
18
|
+
const caller = query_string_1.default.parseCaller(context);
|
|
19
|
+
const filter = context_filter_factory_1.default.build(this.collection, context, scope);
|
|
20
|
+
const aggregation = new datasource_toolkit_1.Aggregation({ operation: 'Count' });
|
|
21
|
+
const aggregationResult = await this.collection.aggregate(caller, filter, aggregation);
|
|
22
|
+
const count = aggregationResult?.[0]?.value ?? 0;
|
|
23
|
+
context.response.body = { count };
|
|
24
|
+
}
|
|
25
|
+
else {
|
|
26
|
+
context.response.body = { meta: { count: 'deactivated' } };
|
|
27
|
+
}
|
|
21
28
|
}
|
|
22
29
|
}
|
|
23
30
|
exports.default = CountRoute;
|
|
24
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
31
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY291bnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvYWdlbnQvcm91dGVzL2FjY2Vzcy9jb3VudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLHdFQUE4RDtBQUk5RCwyRUFBa0Q7QUFDbEQsZ0dBQXNFO0FBQ3RFLDRFQUF5RDtBQUV6RCxNQUFxQixVQUFXLFNBQVEsMEJBQWU7SUFDckQsV0FBVyxDQUFDLE1BQWM7UUFDeEIsTUFBTSxDQUFDLEdBQUcsQ0FBQyxJQUFJLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxRQUFRLEVBQUUsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztJQUM1RSxDQUFDO0lBRU0sS0FBSyxDQUFDLFdBQVcsQ0FBQyxPQUFnQjtRQUN2QyxNQUFNLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsVUFBVSxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUM7UUFFL0UsSUFBSSxJQUFJLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxTQUFTLEVBQUU7WUFDcEMsTUFBTSxLQUFLLEdBQUcsTUFBTSxJQUFJLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxPQUFPLENBQUMsQ0FBQztZQUNqRixNQUFNLE1BQU0sR0FBRyxzQkFBaUIsQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLENBQUM7WUFDdEQsTUFBTSxNQUFNLEdBQUcsZ0NBQW9CLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxVQUFVLEVBQUUsT0FBTyxFQUFFLEtBQUssQ0FBQyxDQUFDO1lBRTNFLE1BQU0sV0FBVyxHQUFHLElBQUksZ0NBQVcsQ0FBQyxFQUFFLFNBQVMsRUFBRSxPQUFPLEVBQUUsQ0FBQyxDQUFDO1lBQzVELE1BQU0saUJBQWlCLEdBQUcsTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLFdBQVcsQ0FBQyxDQUFDO1lBQ3ZGLE1BQU0sS0FBSyxHQUFHLGlCQUFpQixFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsS0FBSyxJQUFJLENBQUMsQ0FBQztZQUVqRCxPQUFPLENBQUMsUUFBUSxDQUFDLElBQUksR0FBRyxFQUFFLEtBQUssRUFBRSxDQUFDO1NBQ25DO2FBQU07WUFDTCxPQUFPLENBQUMsUUFBUSxDQUFDLElBQUksR0FBRyxFQUFFLElBQUksRUFBRSxFQUFFLEtBQUssRUFBRSxhQUFhLEVBQUUsRUFBRSxDQUFDO1NBQzVEO0lBQ0gsQ0FBQztDQUNGO0FBdEJELDZCQXNCQyJ9
|
|
@@ -22,12 +22,12 @@ class CsvRelatedRoute extends relation_route_1.default {
|
|
|
22
22
|
csv_route_context_1.default.buildResponse(context);
|
|
23
23
|
const projection = query_string_1.default.parseProjection(this.foreignCollection, context);
|
|
24
24
|
const scope = await this.services.permissions.getScope(this.foreignCollection, context);
|
|
25
|
+
const caller = query_string_1.default.parseCaller(context);
|
|
25
26
|
const filter = context_filter_factory_1.default.buildPaginated(this.foreignCollection, context, scope);
|
|
26
27
|
const parentId = id_1.default.unpackId(this.collection.schema, context.params.parentId);
|
|
27
|
-
const
|
|
28
|
-
const gen = csv_generator_1.default.generate(projection, header, filter, this.foreignCollection, list);
|
|
28
|
+
const gen = csv_generator_1.default.generate(caller, projection, header, filter, this.foreignCollection, async (cal, fil, proj) => datasource_toolkit_1.CollectionUtils.listRelation(this.collection, parentId, this.relationName, cal, fil, proj));
|
|
29
29
|
context.response.body = stream_1.Readable.from(gen);
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
32
|
exports.default = CsvRelatedRoute;
|
|
33
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
33
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3N2LXJlbGF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvYWdlbnQvcm91dGVzL2FjY2Vzcy9jc3YtcmVsYXRlZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLHdFQUt5QztBQUl6QyxtQ0FBa0M7QUFDbEMsZ0dBQXNFO0FBQ3RFLDhFQUFxRDtBQUNyRCxzRkFBNEQ7QUFDNUQsd0RBQXFDO0FBQ3JDLDRFQUF5RDtBQUN6RCx1RUFBOEM7QUFFOUMsTUFBcUIsZUFBZ0IsU0FBUSx3QkFBYTtJQUN4RCxXQUFXLENBQUMsTUFBYztRQUN4QixNQUFNLENBQUMsR0FBRyxDQUNSLElBQUksSUFBSSxDQUFDLFVBQVUsQ0FBQyxJQUFJLDRCQUE0QixJQUFJLENBQUMsWUFBWSxNQUFNLEVBQzNFLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQ2pDLENBQUM7SUFDSixDQUFDO0lBRUQsS0FBSyxDQUFDLGdCQUFnQixDQUFDLE9BQWdCO1FBQ3JDLE1BQU0sSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFBRSxVQUFVLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUMvRSxNQUFNLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsVUFBVSxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUM7UUFFL0UsTUFBTSxFQUFFLE1BQU0sRUFBRSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsS0FBK0IsQ0FBQztRQUNuRSwyQkFBZSxDQUFDLGFBQWEsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUV2QyxNQUFNLFVBQVUsR0FBRyxzQkFBaUIsQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLGlCQUFpQixFQUFFLE9BQU8sQ0FBQyxDQUFDO1FBQ3RGLE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxpQkFBaUIsRUFBRSxPQUFPLENBQUMsQ0FBQztRQUN4RixNQUFNLE1BQU0sR0FBRyxzQkFBaUIsQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDdEQsTUFBTSxNQUFNLEdBQUcsZ0NBQW9CLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxpQkFBaUIsRUFBRSxPQUFPLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDM0YsTUFBTSxRQUFRLEdBQUcsWUFBTyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxPQUFPLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBRW5GLE1BQU0sR0FBRyxHQUFHLHVCQUFZLENBQUMsUUFBUSxDQUMvQixNQUFNLEVBQ04sVUFBVSxFQUNWLE1BQU0sRUFDTixNQUFNLEVBQ04sSUFBSSxDQUFDLGlCQUFpQixFQUN0QixLQUFLLEVBQUUsR0FBVyxFQUFFLEdBQW9CLEVBQUUsSUFBZ0IsRUFBRSxFQUFFLENBQzVELG9DQUFlLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxVQUFVLEVBQUUsUUFBUSxFQUFFLElBQUksQ0FBQyxZQUFZLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxJQUFJLENBQUMsQ0FDN0YsQ0FBQztRQUNGLE9BQU8sQ0FBQyxRQUFRLENBQUMsSUFBSSxHQUFHLGlCQUFRLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQzdDLENBQUM7Q0FDRjtBQWhDRCxrQ0FnQ0MifQ==
|
|
@@ -14,17 +14,18 @@ class CsvRoute extends collection_route_1.default {
|
|
|
14
14
|
router.get(`/${this.collection.name}.csv`, this.handleCsv.bind(this));
|
|
15
15
|
}
|
|
16
16
|
async handleCsv(context) {
|
|
17
|
-
await this.services.permissions.can(context, `
|
|
17
|
+
await this.services.permissions.can(context, `browse:${this.collection.name}`);
|
|
18
18
|
await this.services.permissions.can(context, `export:${this.collection.name}`);
|
|
19
19
|
const { header } = context.request.query;
|
|
20
20
|
csv_route_context_1.default.buildResponse(context);
|
|
21
21
|
const projection = query_string_1.default.parseProjection(this.collection, context);
|
|
22
22
|
const scope = await this.services.permissions.getScope(this.collection, context);
|
|
23
|
+
const caller = query_string_1.default.parseCaller(context);
|
|
23
24
|
const filter = context_filter_factory_1.default.buildPaginated(this.collection, context, scope);
|
|
24
25
|
const list = this.collection.list.bind(this.collection);
|
|
25
|
-
const gen = csv_generator_1.default.generate(projection, header, filter, this.collection, list);
|
|
26
|
+
const gen = csv_generator_1.default.generate(caller, projection, header, filter, this.collection, list);
|
|
26
27
|
context.response.body = stream_1.Readable.from(gen);
|
|
27
28
|
}
|
|
28
29
|
}
|
|
29
30
|
exports.default = CsvRoute;
|
|
30
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
31
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3N2LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2FnZW50L3JvdXRlcy9hY2Nlc3MvY3N2LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBR0EsbUNBQWtDO0FBQ2xDLDJFQUFrRDtBQUNsRCxnR0FBc0U7QUFDdEUsOEVBQXFEO0FBQ3JELHNGQUE0RDtBQUM1RCw0RUFBeUQ7QUFFekQsTUFBcUIsUUFBUyxTQUFRLDBCQUFlO0lBQ25ELFdBQVcsQ0FBQyxNQUFjO1FBQ3hCLE1BQU0sQ0FBQyxHQUFHLENBQUMsSUFBSSxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksTUFBTSxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7SUFDeEUsQ0FBQztJQUVELEtBQUssQ0FBQyxTQUFTLENBQUMsT0FBZ0I7UUFDOUIsTUFBTSxJQUFJLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFLFVBQVUsSUFBSSxDQUFDLFVBQVUsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDO1FBQy9FLE1BQU0sSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFBRSxVQUFVLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUUvRSxNQUFNLEVBQUUsTUFBTSxFQUFFLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxLQUErQixDQUFDO1FBQ25FLDJCQUFlLENBQUMsYUFBYSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBRXZDLE1BQU0sVUFBVSxHQUFHLHNCQUFpQixDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFLE9BQU8sQ0FBQyxDQUFDO1FBQy9FLE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxVQUFVLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDakYsTUFBTSxNQUFNLEdBQUcsc0JBQWlCLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ3RELE1BQU0sTUFBTSxHQUFHLGdDQUFvQixDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFLE9BQU8sRUFBRSxLQUFLLENBQUMsQ0FBQztRQUVwRixNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ3hELE1BQU0sR0FBRyxHQUFHLHVCQUFZLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRSxVQUFVLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxJQUFJLENBQUMsVUFBVSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQzdGLE9BQU8sQ0FBQyxRQUFRLENBQUMsSUFBSSxHQUFHLGlCQUFRLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQzdDLENBQUM7Q0FDRjtBQXJCRCwyQkFxQkMifQ==
|
|
@@ -7,6 +7,7 @@ const datasource_toolkit_1 = require("@forestadmin/datasource-toolkit");
|
|
|
7
7
|
const types_1 = require("../../types");
|
|
8
8
|
const collection_route_1 = __importDefault(require("../collection-route"));
|
|
9
9
|
const id_1 = __importDefault(require("../../utils/id"));
|
|
10
|
+
const query_string_1 = __importDefault(require("../../utils/query-string"));
|
|
10
11
|
class GetRoute extends collection_route_1.default {
|
|
11
12
|
setupRoutes(router) {
|
|
12
13
|
router.get(`/${this.collection.name}/:id`, this.handleGet.bind(this));
|
|
@@ -17,7 +18,7 @@ class GetRoute extends collection_route_1.default {
|
|
|
17
18
|
const filter = new datasource_toolkit_1.PaginatedFilter({
|
|
18
19
|
conditionTree: datasource_toolkit_1.ConditionTreeFactory.intersect(datasource_toolkit_1.ConditionTreeFactory.matchIds(this.collection.schema, [id]), await this.services.permissions.getScope(this.collection, context)),
|
|
19
20
|
});
|
|
20
|
-
const records = await this.collection.list(filter, datasource_toolkit_1.ProjectionFactory.all(this.collection));
|
|
21
|
+
const records = await this.collection.list(query_string_1.default.parseCaller(context), filter, datasource_toolkit_1.ProjectionFactory.all(this.collection));
|
|
21
22
|
if (!records.length) {
|
|
22
23
|
context.throw(types_1.HttpCode.NotFound, 'Record does not exists');
|
|
23
24
|
}
|
|
@@ -25,4 +26,4 @@ class GetRoute extends collection_route_1.default {
|
|
|
25
26
|
}
|
|
26
27
|
}
|
|
27
28
|
exports.default = GetRoute;
|
|
28
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
29
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2FnZW50L3JvdXRlcy9hY2Nlc3MvZ2V0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsd0VBSXlDO0FBSXpDLHVDQUF1QztBQUN2QywyRUFBa0Q7QUFDbEQsd0RBQXFDO0FBQ3JDLDRFQUF5RDtBQUV6RCxNQUFxQixRQUFTLFNBQVEsMEJBQWU7SUFDbkQsV0FBVyxDQUFDLE1BQWM7UUFDeEIsTUFBTSxDQUFDLEdBQUcsQ0FBQyxJQUFJLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxNQUFNLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztJQUN4RSxDQUFDO0lBRU0sS0FBSyxDQUFDLFNBQVMsQ0FBQyxPQUFnQjtRQUNyQyxNQUFNLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsUUFBUSxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUM7UUFFN0UsTUFBTSxFQUFFLEdBQUcsWUFBTyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxPQUFPLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBQ3ZFLE1BQU0sTUFBTSxHQUFHLElBQUksb0NBQWUsQ0FBQztZQUNqQyxhQUFhLEVBQUUseUNBQW9CLENBQUMsU0FBUyxDQUMzQyx5Q0FBb0IsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQyxFQUMzRCxNQUFNLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFLE9BQU8sQ0FBQyxDQUNuRTtTQUNGLENBQUMsQ0FBQztRQUVILE1BQU0sT0FBTyxHQUFHLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQ3hDLHNCQUFpQixDQUFDLFdBQVcsQ0FBQyxPQUFPLENBQUMsRUFDdEMsTUFBTSxFQUNOLHNDQUFpQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQ3ZDLENBQUM7UUFFRixJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sRUFBRTtZQUNuQixPQUFPLENBQUMsS0FBSyxDQUFDLGdCQUFRLENBQUMsUUFBUSxFQUFFLHdCQUF3QixDQUFDLENBQUM7U0FDNUQ7UUFFRCxPQUFPLENBQUMsUUFBUSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUMxRixDQUFDO0NBQ0Y7QUE1QkQsMkJBNEJDIn0=
|
|
@@ -17,10 +17,9 @@ class ListRelatedRoute extends relation_route_1.default {
|
|
|
17
17
|
const parentId = id_1.default.unpackId(this.collection.schema, context.params.parentId);
|
|
18
18
|
const scope = await this.services.permissions.getScope(this.foreignCollection, context);
|
|
19
19
|
const paginatedFilter = context_filter_factory_1.default.buildPaginated(this.foreignCollection, context, scope);
|
|
20
|
-
const
|
|
21
|
-
const records = await datasource_toolkit_1.CollectionUtils.listRelation(this.collection, parentId, this.relationName, paginatedFilter, projection);
|
|
20
|
+
const records = await datasource_toolkit_1.CollectionUtils.listRelation(this.collection, parentId, this.relationName, query_string_1.default.parseCaller(context), paginatedFilter, query_string_1.default.parseProjectionWithPks(this.foreignCollection, context));
|
|
22
21
|
context.response.body = this.services.serializer.serializeWithSearchMetadata(this.foreignCollection, records, paginatedFilter.search);
|
|
23
22
|
}
|
|
24
23
|
}
|
|
25
24
|
exports.default = ListRelatedRoute;
|
|
26
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
25
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGlzdC1yZWxhdGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2FnZW50L3JvdXRlcy9hY2Nlc3MvbGlzdC1yZWxhdGVkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsd0VBQWtFO0FBSWxFLGdHQUFzRTtBQUN0RSx3REFBcUM7QUFDckMsNEVBQXlEO0FBQ3pELHVFQUE4QztBQUU5QyxNQUFxQixnQkFBaUIsU0FBUSx3QkFBYTtJQUN6RCxXQUFXLENBQUMsTUFBYztRQUN4QixNQUFNLENBQUMsR0FBRyxDQUNSLElBQUksSUFBSSxDQUFDLFVBQVUsQ0FBQyxJQUFJLDRCQUE0QixJQUFJLENBQUMsWUFBWSxFQUFFLEVBQ3ZFLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQ2xDLENBQUM7SUFDSixDQUFDO0lBRU0sS0FBSyxDQUFDLGlCQUFpQixDQUFDLE9BQWdCO1FBQzdDLE1BQU0sSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFBRSxVQUFVLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUUvRSxNQUFNLFFBQVEsR0FBRyxZQUFPLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE9BQU8sQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDbkYsTUFBTSxLQUFLLEdBQUcsTUFBTSxJQUFJLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLGlCQUFpQixFQUFFLE9BQU8sQ0FBQyxDQUFDO1FBQ3hGLE1BQU0sZUFBZSxHQUFHLGdDQUFvQixDQUFDLGNBQWMsQ0FDekQsSUFBSSxDQUFDLGlCQUFpQixFQUN0QixPQUFPLEVBQ1AsS0FBSyxDQUNOLENBQUM7UUFFRixNQUFNLE9BQU8sR0FBRyxNQUFNLG9DQUFlLENBQUMsWUFBWSxDQUNoRCxJQUFJLENBQUMsVUFBVSxFQUNmLFFBQVEsRUFDUixJQUFJLENBQUMsWUFBWSxFQUNqQixzQkFBaUIsQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLEVBQ3RDLGVBQWUsRUFDZixzQkFBaUIsQ0FBQyxzQkFBc0IsQ0FBQyxJQUFJLENBQUMsaUJBQWlCLEVBQUUsT0FBTyxDQUFDLENBQzFFLENBQUM7UUFFRixPQUFPLENBQUMsUUFBUSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLFVBQVUsQ0FBQywyQkFBMkIsQ0FDMUUsSUFBSSxDQUFDLGlCQUFpQixFQUN0QixPQUFPLEVBQ1AsZUFBZSxDQUFDLE1BQU0sQ0FDdkIsQ0FBQztJQUNKLENBQUM7Q0FDRjtBQWxDRCxtQ0FrQ0MifQ==
|
|
@@ -14,10 +14,9 @@ class ListRoute extends collection_route_1.default {
|
|
|
14
14
|
await this.services.permissions.can(context, `browse:${this.collection.name}`);
|
|
15
15
|
const scope = await this.services.permissions.getScope(this.collection, context);
|
|
16
16
|
const paginatedFilter = context_filter_factory_1.default.buildPaginated(this.collection, context, scope);
|
|
17
|
-
const
|
|
18
|
-
const records = await this.collection.list(paginatedFilter, projection);
|
|
17
|
+
const records = await this.collection.list(query_string_1.default.parseCaller(context), paginatedFilter, query_string_1.default.parseProjectionWithPks(this.collection, context));
|
|
19
18
|
context.response.body = this.services.serializer.serializeWithSearchMetadata(this.collection, records, paginatedFilter.search);
|
|
20
19
|
}
|
|
21
20
|
}
|
|
22
21
|
exports.default = ListRoute;
|
|
23
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
22
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGlzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9hZ2VudC9yb3V0ZXMvYWNjZXNzL2xpc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFHQSwyRUFBa0Q7QUFDbEQsZ0dBQXNFO0FBQ3RFLDRFQUF5RDtBQUV6RCxNQUFxQixTQUFVLFNBQVEsMEJBQWU7SUFDcEQsV0FBVyxDQUFDLE1BQWM7UUFDeEIsTUFBTSxDQUFDLEdBQUcsQ0FBQyxJQUFJLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxFQUFFLEVBQUUsSUFBSSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztJQUNyRSxDQUFDO0lBRU0sS0FBSyxDQUFDLFVBQVUsQ0FBQyxPQUFnQjtRQUN0QyxNQUFNLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsVUFBVSxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUM7UUFFL0UsTUFBTSxLQUFLLEdBQUcsTUFBTSxJQUFJLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxPQUFPLENBQUMsQ0FBQztRQUNqRixNQUFNLGVBQWUsR0FBRyxnQ0FBb0IsQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxPQUFPLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFFN0YsTUFBTSxPQUFPLEdBQUcsTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksQ0FDeEMsc0JBQWlCLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxFQUN0QyxlQUFlLEVBQ2Ysc0JBQWlCLENBQUMsc0JBQXNCLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxPQUFPLENBQUMsQ0FDbkUsQ0FBQztRQUVGLE9BQU8sQ0FBQyxRQUFRLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUFDLDJCQUEyQixDQUMxRSxJQUFJLENBQUMsVUFBVSxFQUNmLE9BQU8sRUFDUCxlQUFlLENBQUMsTUFBTSxDQUN2QixDQUFDO0lBQ0osQ0FBQztDQUNGO0FBdkJELDRCQXVCQyJ9
|
|
@@ -8,7 +8,6 @@ export default abstract class BaseRoute {
|
|
|
8
8
|
abstract get type(): RouteType;
|
|
9
9
|
constructor(services: ForestAdminHttpDriverServices, options: AgentOptionsWithDefaults);
|
|
10
10
|
bootstrap(): Promise<void>;
|
|
11
|
-
tearDown(): Promise<void>;
|
|
12
11
|
abstract setupRoutes(router: Router): void;
|
|
13
12
|
}
|
|
14
13
|
//# sourceMappingURL=base-route.d.ts.map
|
|
@@ -8,9 +8,6 @@ class BaseRoute {
|
|
|
8
8
|
async bootstrap() {
|
|
9
9
|
// Do nothing by default
|
|
10
10
|
}
|
|
11
|
-
async tearDown() {
|
|
12
|
-
// Do nothing by default
|
|
13
|
-
}
|
|
14
11
|
}
|
|
15
12
|
exports.default = BaseRoute;
|
|
16
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
13
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZS1yb3V0ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hZ2VudC9yb3V0ZXMvYmFzZS1yb3V0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUtBLE1BQThCLFNBQVM7SUFNckMsWUFBWSxRQUF1QyxFQUFFLE9BQWlDO1FBQ3BGLElBQUksQ0FBQyxRQUFRLEdBQUcsUUFBUSxDQUFDO1FBQ3pCLElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDO0lBQ3pCLENBQUM7SUFFRCxLQUFLLENBQUMsU0FBUztRQUNiLHdCQUF3QjtJQUMxQixDQUFDO0NBR0Y7QUFoQkQsNEJBZ0JDIn0=
|