Skip to content

chore(collection capabilities): refactor capabilities #1264

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

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
23 changes: 1 addition & 22 deletions packages/agent/src/routes/capabilities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,29 +37,8 @@ export default class Capabilities extends BaseRoute {
agentCapabilities: {
canUseProjectionOnGetOne: true,
},
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),
})) ?? [],
collections: collections?.map(collection => collection.capabilities) ?? [],
};
context.response.status = HttpCode.Ok;
}

private pascalCaseToSnakeCase(str: string): string {
return str
.split(/\.?(?=[A-Z])/)
.join('_')
.toLowerCase();
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import {
Caller,
CollectionCapabilities,
CollectionDecorator,
CollectionSchema,
CollectionUtils,
Expand Down Expand Up @@ -59,4 +60,27 @@ export default class OperatorsEquivalenceCollectionDecorator extends CollectionD
}),
});
}

private pascalCaseToSnakeCase(str: string): string {
return str
.split(/\.?(?=[A-Z])/)
.join('_')
.toLowerCase();
}

override refineCapabilities(capabilities: CollectionCapabilities): CollectionCapabilities {
const fields = Object.entries(this.schema.fields)
.map(([fieldName, field]) => {
return field.type === 'Column'
? {
name: fieldName,
type: field.columnType,
operators: [...field.filterOperators].map(this.pascalCaseToSnakeCase),
}
: null;
})
.filter(Boolean);

return { ...capabilities, fields };
}
}
7 changes: 7 additions & 0 deletions packages/datasource-toolkit/src/base-collection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ export default abstract class BaseCollection implements Collection {
};
}

get capabilities() {
return {
name: this.name,
fields: [],
};
}

protected addAction(name: string, schema: ActionSchema): void {
const action = this.schema.actions[name];

Expand Down
15 changes: 15 additions & 0 deletions packages/datasource-toolkit/src/decorators/collection-decorator.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { ActionFormElement, ActionResult } from '../interfaces/action';
import { Caller } from '../interfaces/caller';
import { CollectionCapabilities } from '../interfaces/capabilities';
import { Chart } from '../interfaces/chart';
import { Collection, DataSource, GetFormMetas } from '../interfaces/collection';
import Aggregation, { AggregateResult } from '../interfaces/query/aggregation';
Expand All @@ -14,6 +15,7 @@ export default class CollectionDecorator implements Collection {
protected childCollection: Collection;

private lastSchema: CollectionSchema;
private lastCapabilities: CollectionCapabilities;

get nativeDriver(): unknown {
return this.childCollection.nativeDriver;
Expand All @@ -33,6 +35,15 @@ export default class CollectionDecorator implements Collection {
return this.childCollection.name;
}

get capabilities(): CollectionCapabilities {
if (!this.lastCapabilities) {
const { capabilities } = this.childCollection;
this.lastCapabilities = this.refineCapabilities(capabilities);
}

return this.lastCapabilities;
}

constructor(childCollection: Collection, dataSource: DataSource) {
this.childCollection = childCollection;
this.dataSource = dataSource;
Expand Down Expand Up @@ -128,4 +139,8 @@ export default class CollectionDecorator implements Collection {
protected refineSchema(subSchema: CollectionSchema): CollectionSchema {
return subSchema;
}

protected refineCapabilities(capabilities: CollectionCapabilities): CollectionCapabilities {
return capabilities;
}
}
1 change: 1 addition & 0 deletions packages/datasource-toolkit/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ export { default as SortFactory } from './interfaces/query/sort/factory';

export * from './interfaces/action';
export * from './interfaces/caller';
export * from './interfaces/capabilities';
export * from './interfaces/chart';
export * from './interfaces/collection';
export * from './interfaces/query/aggregation';
Expand Down
12 changes: 12 additions & 0 deletions packages/datasource-toolkit/src/interfaces/capabilities.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { ColumnType } from './schema';

export type FieldCapabilities = {
name: string;
type: ColumnType;
operators: string[];
};

export type CollectionCapabilities = {
name: string;
fields: FieldCapabilities[];
};
2 changes: 2 additions & 0 deletions packages/datasource-toolkit/src/interfaces/collection.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { ActionFormElement, ActionResult } from './action';
import { Caller } from './caller';
import { CollectionCapabilities } from './capabilities';
import { Chart } from './chart';
import Aggregation, { AggregateResult } from './query/aggregation';
import PaginatedFilter from './query/filter/paginated';
Expand Down Expand Up @@ -35,6 +36,7 @@ export interface Collection {
get dataSource(): DataSource;
get name(): string;
get schema(): CollectionSchema;
get capabilities(): CollectionCapabilities;

execute(
caller: Caller,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export default CollectionFactory.define(() => ({
dataSource: null,
name: 'a collection',
schema: collectionSchemaFactory.build(),
capabilities: { name: 'a collection', fields: [] },
execute: jest.fn(),
getForm: jest.fn(),
renderChart: jest.fn(),
Expand Down
Loading