Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(capabilities): register capabilities route for field filter operators #1197

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 59 additions & 0 deletions packages/agent/src/routes/capabilities.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
import { DataSource } from '@forestadmin/datasource-toolkit';
import Router from '@koa/router';
import { Context } from 'koa';

import BaseRoute from './base-route';
import { ForestAdminHttpDriverServices } from '../services';
import { AgentOptionsWithDefaults, HttpCode, RouteType } from '../types';

export default class Capabilities extends BaseRoute {
readonly type = RouteType.PrivateRoute;
protected readonly dataSource: DataSource;

constructor(
services: ForestAdminHttpDriverServices,
options: AgentOptionsWithDefaults,
dataSource: DataSource,
) {
super(services, options);
this.dataSource = dataSource;
}

setupRoutes(router: Router): void {
router.post(`/capabilities`, this.fetchCapabilities.bind(this));
}

private async fetchCapabilities(context: Context) {
const collections = this.dataSource.collections.filter(collection =>
(context.request.body as { collectionNames: string[] }).collectionNames?.includes(
collection.name,
),
);

context.response.body = {
collections:
collections?.map(collection => ({
name: collection.name,
fields: Object.entries(collection.schema.fields)
.map(([fieldName, field]) => {
return field.type === 'Column'
? {
name: fieldName,
type: field.columnType,
operators: [...field.filterOperators].map(this.pascalCaseToSnakeCase),
}
: null;
})
.filter(Boolean),
})) ?? [],
};
context.response.status = HttpCode.Ok;
}

private pascalCaseToSnakeCase(str: string): string {
return str
.split(/\.?(?=[A-Z])/)
.join('_')
.toLowerCase();
}
}
15 changes: 15 additions & 0 deletions packages/agent/src/routes/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import Get from './access/get';
import List from './access/list';
import ListRelated from './access/list-related';
import BaseRoute from './base-route';
import Capabilities from './capabilities';
import ActionRoute from './modification/action/action';
import AssociateRelated from './modification/associate-related';
import Create from './modification/create';
Expand Down Expand Up @@ -55,6 +56,7 @@ export const RELATED_ROUTES_CTOR = [
ListRelated,
];
export const RELATED_RELATION_ROUTES_CTOR = [UpdateRelation];
export const CAPABILITIES_ROUTES_CTOR = [Capabilities];

function getRootRoutes(options: Options, services: Services): BaseRoute[] {
return ROOT_ROUTES_CTOR.map(Route => new Route(services, options));
Expand Down Expand Up @@ -92,6 +94,18 @@ function getCrudRoutes(dataSource: DataSource, options: Options, services: Servi
return routes;
}

function getCapabilitiesRoutes(
dataSource: DataSource,
options: Options,
services: Services,
): BaseRoute[] {
const routes: BaseRoute[] = [];

routes.push(...CAPABILITIES_ROUTES_CTOR.map(Route => new Route(services, options, dataSource)));

return routes;
}

function getRelatedRoutes(
dataSource: DataSource,
options: Options,
Expand Down Expand Up @@ -144,6 +158,7 @@ export default function makeRoutes(
const routes = [
...getRootRoutes(options, services),
...getCrudRoutes(dataSource, options, services),
...getCapabilitiesRoutes(dataSource, options, services),
...getApiChartRoutes(dataSource, options, services),
...getRelatedRoutes(dataSource, options, services),
...getActionRoutes(dataSource, options, services),
Expand Down
66 changes: 3 additions & 63 deletions packages/agent/src/utils/forest-schema/filterable.ts
Original file line number Diff line number Diff line change
@@ -1,73 +1,13 @@
import { ColumnType, Operator, PrimitiveTypes } from '@forestadmin/datasource-toolkit';
import { Operator } from '@forestadmin/datasource-toolkit';

export default class FrontendFilterableUtils {
private static readonly baseOperators: Operator[] = ['Equal', 'NotEqual', 'Present', 'Blank'];

private static readonly dateOperators: Operator[] = [
...FrontendFilterableUtils.baseOperators,
'LessThan',
'GreaterThan',
'Today',
'Yesterday',
'PreviousXDays',
'PreviousWeek',
'PreviousQuarter',
'PreviousYear',
'PreviousXDaysToDate',
'PreviousWeekToDate',
'PreviousMonthToDate',
'PreviousQuarterToDate',
'PreviousYearToDate',
'Past',
'Future',
'BeforeXHoursAgo',
'AfterXHoursAgo',
];

private static readonly operatorByType: Partial<Record<PrimitiveTypes, Operator[]>> = {
Boolean: FrontendFilterableUtils.baseOperators,
Date: FrontendFilterableUtils.dateOperators,
Dateonly: FrontendFilterableUtils.dateOperators,
Enum: [...FrontendFilterableUtils.baseOperators, 'In'],
Number: [...FrontendFilterableUtils.baseOperators, 'In', 'GreaterThan', 'LessThan'],
String: [
...FrontendFilterableUtils.baseOperators,
'In',
'StartsWith',
'EndsWith',
'Contains',
'NotContains',
],
Time: [...FrontendFilterableUtils.baseOperators, 'GreaterThan', 'LessThan'],
Uuid: FrontendFilterableUtils.baseOperators,
};

/**
* Compute if a column if filterable according to forestadmin's frontend.
*
* @param type column's type (string, number, or a composite type)
* @param operators list of operators that the column supports
* @returns either if the frontend would consider this column filterable or not.
*/
static isFilterable(type: ColumnType, operators?: Set<Operator>): boolean {
const neededOperators = FrontendFilterableUtils.getRequiredOperators(type);
const supportedOperators = operators ?? new Set();

return Boolean(neededOperators && neededOperators.every(op => supportedOperators.has(op)));
}

static getRequiredOperators(type: ColumnType): Operator[] | null {
if (typeof type === 'string' && FrontendFilterableUtils.operatorByType[type]) {
return FrontendFilterableUtils.operatorByType[type];
}

// It sound highly unlikely that this operator can work with dates, or nested objects
// and they should be more restricted, however the frontend code does not seems to check the
// array's content so I'm replicating the same test here
if (Array.isArray(type)) {
return ['IncludesAll'];
}

return null;
static isFilterable(operators: Set<Operator>): boolean {
return Boolean(operators && operators.size > 0);
}
}
5 changes: 2 additions & 3 deletions packages/agent/src/utils/forest-schema/generator-fields.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export default class SchemaGeneratorFields {
field: name,
integration: null,
inverseOf: null,
isFilterable: FrontendFilterableUtils.isFilterable(column.columnType, column.filterOperators),
isFilterable: FrontendFilterableUtils.isFilterable(column.filterOperators),
isPrimaryKey: Boolean(column.isPrimaryKey),

// When a column is a foreign key, it is readonly.
Expand Down Expand Up @@ -158,8 +158,7 @@ export default class SchemaGeneratorFields {
private static isForeignCollectionFilterable(foreignCollection: Collection): boolean {
return Object.values(foreignCollection.schema.fields).some(
field =>
field.type === 'Column' &&
FrontendFilterableUtils.isFilterable(field.columnType, field.filterOperators),
field.type === 'Column' && FrontendFilterableUtils.isFilterable(field.filterOperators),
);
}

Expand Down
200 changes: 200 additions & 0 deletions packages/agent/test/routes/capabilities.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,200 @@
import { allowedOperatorsForColumnType } from '@forestadmin/datasource-toolkit';
import { createMockContext } from '@shopify/jest-koa-mocks';

import Capabilities from '../../src/routes/capabilities';
import * as factories from '../__factories__';

describe('Capabilities', () => {
const defaultContext = {
state: { user: { email: 'john.doe@domain.com' } },
customProperties: { query: { timezone: 'Europe/Paris' } },
};
const options = factories.forestAdminHttpDriverOptions.build();
const router = factories.router.mockAllMethods().build();
const services = factories.forestAdminHttpDriverServices.build();

beforeEach(() => {
jest.resetAllMocks();
});

test('should register "/capabilities" route', () => {
const dataSource = factories.dataSource.buildWithCollection(
factories.collection.build({ name: 'books' }),
);
const route = new Capabilities(services, options, dataSource);
route.setupRoutes(router);

expect(router.post).toHaveBeenCalledWith('/capabilities', expect.any(Function));
});

describe('with the route mounted', () => {
let route: Capabilities;
beforeEach(() => {
const dataSource = factories.dataSource.buildWithCollection(
factories.collection.build({
name: 'books',
schema: factories.collectionSchema.build({
fields: {
id: factories.columnSchema.uuidPrimaryKey().build(),
name: factories.columnSchema.text().build(),
publishedAt: factories.columnSchema.build({
columnType: 'Date',
filterOperators: new Set(allowedOperatorsForColumnType.Date),
}),
price: factories.columnSchema.build({
columnType: 'Number',
filterOperators: new Set(allowedOperatorsForColumnType.Number),
}),
},
}),
}),
);
route = new Capabilities(services, options, dataSource);
});

describe('when request body does not list any collection name', () => {
test('should return nothing', async () => {
const context = createMockContext({
...defaultContext,
requestBody: { collectionNames: [] },
});

// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
await route.fetchCapabilities(context);

expect(context.response.body).toEqual({
collections: [],
});
});

test('should handle empty body', async () => {
const context = createMockContext({
...defaultContext,
requestBody: {},
});

// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
await route.fetchCapabilities(context);

expect(context.response.body).toEqual({
collections: [],
});
});
});

describe('when requesting a collection capabilities', () => {
test('should return the capabilities', async () => {
const context = createMockContext({
...defaultContext,
requestBody: { collectionNames: ['books'] },
});

// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
await route.fetchCapabilities(context);

expect(context.response.body).toEqual({
collections: [
{
name: 'books',
fields: [
{
name: 'id',
type: 'Uuid',
operators: [
'blank',
'equal',
'missing',
'not_equal',
'present',
'in',
'not_in',
'includes_all',
'includes_none',
],
},
{
name: 'name',
type: 'String',
operators: [
'blank',
'equal',
'missing',
'not_equal',
'present',
'in',
'not_in',
'includes_all',
'includes_none',
'contains',
'not_contains',
'ends_with',
'starts_with',
'longer_than',
'shorter_than',
'like',
'i_like',
'i_contains',
'not_i_contains',
'i_ends_with',
'i_starts_with',
],
},
{
name: 'publishedAt',
type: 'Date',
operators: [
'blank',
'equal',
'missing',
'not_equal',
'present',
'today',
'yesterday',
'previous_x_days_to_date',
'previous_week',
'previous_week_to_date',
'previous_month',
'previous_month_to_date',
'previous_quarter',
'previous_quarter_to_date',
'previous_year',
'previous_year_to_date',
'past',
'future',
'previous_x_days',
'before',
'after',
'before_x_hours_ago',
'after_x_hours_ago',
],
},
{
name: 'price',
type: 'Number',
operators: [
'blank',
'equal',
'missing',
'not_equal',
'present',
'in',
'not_in',
'includes_all',
'includes_none',
'greater_than',
'less_than',
'greater_than_or_equal',
'less_than_or_equal',
],
},
],
},
],
});
});
});
});
});
Loading
Loading