Add new advanced filters experience

api/src/database/helpers/geometry.ts

@@ -60,7 +60,7 @@ class KnexSpatial {
 	}
 	_intersects_bbox(key: string, geojson: GeoJSONGeometry): Knex.Raw {
 		const geometry = this.fromGeoJSON(geojson);
-		return this.knex.raw('intersects(??, ?)', [key, geometry]);
+		return this.knex.raw('st_intersects(??, ?)', [key, geometry]);
 	}
 	intersects_bbox(key: string, geojson: GeoJSONGeometry): Knex.Raw {
 		return this.isTrue(this._intersects_bbox(key, geojson));

api/src/database/migrations/20211007A-update-presets.ts

@@ -0,0 +1,141 @@
+import { Filter, LogicalFilterAND } from '@directus/shared/types';
+import { Knex } from 'knex';
+import { nanoid } from 'nanoid';
+
+type OldFilter = {
+	key: string;
+	field: string;
+	value: any;
+	operator: string;
+};
+
+export async function up(knex: Knex): Promise<void> {
+	await knex.schema.alterTable('directus_presets', (table) => {
+		table.json('filter');
+	});
+
+	const presets = await knex
+		.select<{ id: number; filters: string | OldFilter[]; layout_query: string | Record<string, any> }[]>(
+			'id',
+			'filters',
+			'layout_query'
+		)
+		.from('directus_presets');
+
+	for (const preset of presets) {
+		if (preset.filters) {
+			const oldFilters: OldFilter[] =
+				(typeof preset.filters === 'string' ? JSON.parse(preset.filters) : preset.filters) ?? [];
+
+			if (oldFilters.length === 0) continue;
+
+			const newFilter: Filter = {
+				_and: [],
+			};
+
+			for (const oldFilter of oldFilters) {
+				if (oldFilter.key === 'hide-archived') continue;
+
+				newFilter._and.push({
+					[oldFilter.field]: {
+						['_' + oldFilter.operator]: oldFilter.value,
+					},
+				});
+			}
+
+			if (newFilter._and.length > 0) {
+				await knex('directus_presets')
+					.update({ filter: JSON.stringify(newFilter) })
+					.where('id', '=', preset.id);
+			}
+		}
+
+		if (preset.layout_query) {
+			const layoutQuery: Record<string, any> =
+				typeof preset.layout_query === 'string' ? JSON.parse(preset.layout_query) : preset.layout_query;
+
+			for (const [layout, query] of Object.entries(layoutQuery)) {
+				if (query.sort) {
+					query.sort = [query.sort];
+				}
+
+				layoutQuery[layout] = query;
+			}
+
+			await knex('directus_presets')
+				.update({ layout_query: JSON.stringify(layoutQuery) })
+				.where('id', '=', preset.id);
+		}
+	}
+
+	await knex.schema.alterTable('directus_presets', (table) => {
+		table.dropColumn('filters');
+	});
+}
+
+export async function down(knex: Knex): Promise<void> {
+	await knex.schema.alterTable('directus_presets', (table) => {
+		table.json('filters');
+	});
+
+	const presets = await knex
+		.select<{ id: number; filter: string | OldFilter[]; layout_query: string | Record<string, any> }[]>(
+			'id',
+			'filter',
+			'layout_query'
+		)
+		.from('directus_presets');
+
+	for (const preset of presets) {
+		if (preset.filter) {
+			const newFilter: LogicalFilterAND =
+				(typeof preset.filter === 'string' ? JSON.parse(preset.filter) : preset.filter) ?? {};
+
+			if (Object.keys(newFilter).length === 0) continue;
+
+			const oldFilters: OldFilter[] = [];
+
+			for (const filter of newFilter._and ?? []) {
+				const field = Object.keys(filter)?.[0];
+				const operator = Object.keys(Object.values(filter)?.[0] ?? {})?.[0];
+				const value = Object.values(Object.values(filter)?.[0] ?? {})?.[0];
+
+				if (!field || !operator || !value) continue;
+
+				oldFilters.push({
+					key: nanoid(),
+					field,
+					operator: operator.substring(1),
+					value,
+				});
+			}
+
+			if (oldFilters.length > 0) {
+				await knex('directus_presets')
+					.update({ filters: JSON.stringify(oldFilters) })
+					.where('id', '=', preset.id);
+			}
+		}
+
+		if (preset.layout_query) {
+			const layoutQuery: Record<string, any> =
+				typeof preset.layout_query === 'string' ? JSON.parse(preset.layout_query) : preset.layout_query;
+
+			for (const [layout, query] of Object.entries(layoutQuery)) {
+				if (query.sort && Array.isArray(query.sort)) {
+					query.sort = query.sort?.[0] ?? null;
+				}
+
+				layoutQuery[layout] = query;
+			}
+
+			await knex('directus_presets')
+				.update({ layout_query: JSON.stringify(layoutQuery) })
+				.where('id', '=', preset.id);
+		}
+	}
+
+	await knex.schema.alterTable('directus_presets', (table) => {
+		table.dropColumn('filter');
+	});
+}

api/src/database/run-ast.ts

@@ -1,13 +1,14 @@
 import { Knex } from 'knex';
 import { clone, cloneDeep, pick, uniq } from 'lodash';
 import { PayloadService } from '../services/payload';
-import { Item, Query, SchemaOverview } from '../types';
+import { Item, SchemaOverview } from '../types';
 import { AST, FieldNode, NestedCollectionNode, M2ONode } from '../types/ast';
 import { applyFunctionToColumnName } from '../utils/apply-function-to-column-name';
 import applyQuery from '../utils/apply-query';
 import { getColumn } from '../utils/get-column';
 import { stripFunction } from '../utils/strip-function';
 import { toArray } from '@directus/shared/utils';
+import { Query } from '@directus/shared/types';
 import getDatabase from './index';
 import { isNativeGeometry } from '../utils/geometry';
 import { getGeometryHelper } from '../database/helpers/geometry';
@@ -289,7 +290,7 @@ function applyParentFilters(
 					...nestedNode.query[relatedCollection],
 					filter: {
 						_and: [
-							nestedNode.query[relatedCollection].filter,
+							nestedNode.query[relatedCollection].filter ?? {},
 							{
 								[nestedNode.relatedKey[relatedCollection]]: {
 									_in: uniq(keysPerCollection[relatedCollection]),
@@ -343,7 +344,14 @@ function mergeWithParentItems(
 				})
 				.sort((a, b) => {
 					// This is pre-filled in get-ast-from-query
-					const { column, order } = nestedNode.query.sort![0]!;
+					const sortField = nestedNode.query.sort![0]!;
+					let column = sortField;
+					let order: 'asc' | 'desc' = 'asc';
+
+					if (sortField.startsWith('-')) {
+						column = sortField.substring(1);
+						order = 'desc';
+					}
 
 					if (a[column] === b[column]) return 0;
 					if (a[column] === null) return 1;

api/src/database/system-data/app-access-permissions/index.ts

@@ -1,5 +1,5 @@
 import { merge } from 'lodash';
-import { Permission } from '../../../types';
+import { Permission } from '@directus/shared/types';
 import { requireYAML } from '../../../utils/require-yaml';
 
 const defaults: Partial<Permission> = {

api/src/database/system-data/fields/presets.yaml

@@ -1,7 +1,7 @@
 table: directus_presets
 
 fields:
-  - field: filters
+  - field: filter
     hidden: true
     special: json
 

api/src/services/authorization.ts

@@ -11,13 +11,10 @@ import {
 	FieldNode,
 	Item,
 	NestedCollectionNode,
-	Permission,
-	PermissionsAction,
 	PrimaryKey,
-	Query,
 	SchemaOverview,
-	Aggregate,
 } from '../types';
+import { Query, Aggregate, Permission, PermissionsAction } from '@directus/shared/types';
 import { ItemsService } from './items';
 import { PayloadService } from './payload';
 
@@ -105,7 +102,11 @@ export class AuthorizationService {
 				}
 			}
 
-			function checkFields(collection: string, children: (NestedCollectionNode | FieldNode)[], aggregate?: Aggregate) {
+			function checkFields(
+				collection: string,
+				children: (NestedCollectionNode | FieldNode)[],
+				aggregate?: Aggregate | null
+			) {
 				// We check the availability of the permissions in the step before this is run
 				const permissions = permissionsForCollections.find((permission) => permission.collection === collection)!;
 				const allowedFields = permissions.fields || [];
@@ -185,7 +186,7 @@ export class AuthorizationService {
 					query.filter._and.push(parsedPermissions);
 				}
 
-				if (query.filter._and.length === 0) delete query.filter._and;
+				if (query.filter._and.length === 0) delete query.filter;
 			}
 		}
 	}
@@ -258,7 +259,7 @@ export class AuthorizationService {
 		}
 
 		if (requiredColumns.length > 0) {
-			permission.validation = hasValidationRules ? { _and: [permission.validation] } : { _and: [] };
+			permission.validation = hasValidationRules ? { _and: [permission.validation!] } : { _and: [] };
 
 			for (const field of requiredColumns) {
 				if (action === 'create' && field.defaultValue === null) {

api/src/services/graphql.ts

@@ -52,8 +52,8 @@ import env from '../env';
 import { BaseException } from '@directus/shared/exceptions';
 import { ForbiddenException, GraphQLValidationException, InvalidPayloadException } from '../exceptions';
 import { getExtensionManager } from '../extensions';
-import { Accountability } from '@directus/shared/types';
-import { AbstractServiceOptions, Action, Aggregate, GraphQLParams, Item, Query, SchemaOverview } from '../types';
+import { Accountability, Query, Aggregate } from '@directus/shared/types';
+import { AbstractServiceOptions, Action, GraphQLParams, Item, SchemaOverview } from '../types';
 import { getGraphQLType } from '../utils/get-graphql-type';
 import { reduceSchema } from '../utils/reduce-schema';
 import { sanitizeQuery } from '../utils/sanitize-query';
@@ -1413,7 +1413,7 @@ export class GraphQLService {
 			return uniq(fields);
 		};
 
-		const replaceFuncs = (filter?: Filter): undefined | Filter => {
+		const replaceFuncs = (filter?: Filter | null): null | undefined | Filter => {
 			if (!filter) return filter;
 
 			return replaceFuncDeep(filter);

api/src/services/items.ts

@@ -9,17 +9,8 @@ import env from '../env';
 import { ForbiddenException, InvalidPayloadException } from '../exceptions';
 import { translateDatabaseError } from '../exceptions/database/translate';
 import logger from '../logger';
-import { Accountability } from '@directus/shared/types';
-import {
-	AbstractService,
-	AbstractServiceOptions,
-	Action,
-	Item as AnyItem,
-	PermissionsAction,
-	PrimaryKey,
-	Query,
-	SchemaOverview,
-} from '../types';
+import { Accountability, Query, PermissionsAction } from '@directus/shared/types';
+import { AbstractService, AbstractServiceOptions, Action, Item as AnyItem, PrimaryKey, SchemaOverview } from '../types';
 import getASTFromQuery from '../utils/get-ast-from-query';
 import { toArray } from '@directus/shared/utils';
 import { AuthorizationService } from './authorization';

api/src/services/meta.ts

@@ -2,8 +2,7 @@ import { Knex } from 'knex';
 import getDatabase from '../database';
 import { ForbiddenException } from '../exceptions';
 import { AbstractServiceOptions, SchemaOverview } from '../types';
-import { Accountability } from '@directus/shared/types';
-import { Query } from '../types/query';
+import { Accountability, Query } from '@directus/shared/types';
 import { applyFilter, applySearch } from '../utils/apply-query';
 import { parseFilter } from '@directus/shared/utils';
 
@@ -18,11 +17,11 @@ export class MetaService {
 		this.schema = options.schema;
 	}
 
-	async getMetaForQuery(collection: string, query: Query): Promise<Record<string, any> | undefined> {
+	async getMetaForQuery(collection: string, query: any): Promise<Record<string, any> | undefined> {
 		if (!query || !query.meta) return;
 
 		const results = await Promise.all(
-			query.meta.map((metaVal) => {
+			query.meta.map((metaVal: string) => {
 				if (metaVal === 'total_count') return this.totalCount(collection);
 				if (metaVal === 'filter_count') return this.filterCount(collection, query);
 			})

api/src/services/payload.ts

@@ -5,8 +5,8 @@ import { clone, cloneDeep, isObject, isPlainObject, omit, isNil } from 'lodash';
 import { v4 as uuidv4 } from 'uuid';
 import getDatabase from '../database';
 import { ForbiddenException, InvalidPayloadException } from '../exceptions';
-import { AbstractServiceOptions, Item, PrimaryKey, Query, SchemaOverview, Alterations } from '../types';
-import { Accountability } from '@directus/shared/types';
+import { AbstractServiceOptions, Item, PrimaryKey, SchemaOverview, Alterations } from '../types';
+import { Accountability, Query } from '@directus/shared/types';
 import { toArray } from '@directus/shared/utils';
 import { ItemsService } from './items';
 import { unflatten } from 'flat';

api/src/services/permissions.ts

@@ -1,7 +1,8 @@
 import { appAccessMinimalPermissions } from '../database/system-data/app-access-permissions';
 import logger from '../logger';
 import { ItemsService, QueryOptions } from '../services/items';
-import { AbstractServiceOptions, Item, PermissionsAction, PrimaryKey, Query } from '../types';
+import { AbstractServiceOptions, Item, PrimaryKey } from '../types';
+import { Query, PermissionsAction } from '@directus/shared/types';
 import { filterItems } from '../utils/filter-items';
 
 export class PermissionsService extends ItemsService {

api/src/services/relations.ts

@@ -1,7 +1,8 @@
 import { Knex } from 'knex';
 import { systemRelationRows } from '../database/system-data/relations';
 import { ForbiddenException, InvalidPayloadException } from '../exceptions';
-import { AbstractServiceOptions, SchemaOverview, Query, Relation, RelationMeta } from '../types';
+import { AbstractServiceOptions, SchemaOverview, Relation, RelationMeta } from '../types';
+import { Query } from '@directus/shared/types';
 import { Accountability } from '@directus/shared/types';
 import { toArray } from '@directus/shared/utils';
 import { ItemsService, QueryOptions } from './items';

api/src/services/roles.ts

@@ -1,5 +1,6 @@
 import { ForbiddenException, UnprocessableEntityException } from '../exceptions';
-import { AbstractServiceOptions, PrimaryKey, Query, Alterations, Item } from '../types';
+import { AbstractServiceOptions, PrimaryKey, Alterations, Item } from '../types';
+import { Query } from '@directus/shared/types';
 import { ItemsService, MutationOptions } from './items';
 import { PermissionsService } from './permissions';
 import { PresetsService } from './presets';

api/src/services/specifications.ts

@@ -15,8 +15,8 @@ import {
 import { version } from '../../package.json';
 import getDatabase from '../database';
 import env from '../env';
-import { AbstractServiceOptions, Collection, Permission, Relation, SchemaOverview } from '../types';
-import { Accountability, Field, Type } from '@directus/shared/types';
+import { AbstractServiceOptions, Collection, Relation, SchemaOverview } from '../types';
+import { Accountability, Field, Type, Permission } from '@directus/shared/types';
 import { getRelationType } from '../utils/get-relation-type';
 import { CollectionsService } from './collections';
 import { FieldsService } from './fields';

api/src/services/users.ts

@@ -7,7 +7,8 @@ import { FailedValidationException } from '@directus/shared/exceptions';
 import { ForbiddenException, InvalidPayloadException, UnprocessableEntityException } from '../exceptions';
 import { RecordNotUniqueException } from '../exceptions/database/record-not-unique';
 import logger from '../logger';
-import { AbstractServiceOptions, Item, PrimaryKey, Query, SchemaOverview } from '../types';
+import { AbstractServiceOptions, Item, PrimaryKey, SchemaOverview } from '../types';
+import { Query } from '@directus/shared/types';
 import { Accountability } from '@directus/shared/types';
 import isUrlAllowed from '../utils/is-url-allowed';
 import { toArray } from '@directus/shared/utils';

api/src/types/ast.ts

@@ -1,4 +1,4 @@
-import { Query } from './query';
+import { Query } from '@directus/shared/types';
 import { Relation } from './relation';
 
 export type M2ONode = {

api/src/types/express.d.ts

@@ -3,7 +3,7 @@
  */
 
 import { Accountability } from '@directus/shared/types';
-import { Query } from './query';
+import { Query } from '@directus/shared/types';
 import { SchemaOverview } from './schema';
 
 export {};