feat: query support for geo within and intersects + dynamic GraphQL operator types (#3183)

Co-authored-by: Lucas Blancas <lablancas@gmail.com>

Author: AlessioGr

src/admin/components/elements/WhereBuilder/field-types.tsx

@@ -57,6 +57,16 @@ const geo = [
   },
 ];
 
+const within = {
+  label: 'within',
+  value: 'within',
+};
+
+const intersects = {
+  label: 'intersects',
+  value: 'intersects',
+};
+
 const like = {
   label: 'isLike',
   value: 'like',
@@ -86,7 +96,7 @@ const fieldTypeConditions = {
   },
   json: {
     component: 'Text',
-    operators: [...base, like, contains],
+    operators: [...base, like, contains, within, intersects],
   },
   richText: {
     component: 'Text',
@@ -102,7 +112,7 @@ const fieldTypeConditions = {
   },
   point: {
     component: 'Point',
-    operators: [...geo],
+    operators: [...geo, within, intersects],
   },
   upload: {
     component: 'Text',

src/graphql/schema/buildWhereInputType.ts

@@ -15,13 +15,20 @@ import formatName from '../utilities/formatName';
 import { withOperators } from './withOperators';
 import fieldToSchemaMap from './fieldToWhereInputSchemaMap';
 
-// buildWhereInputType is similar to buildObjectType and operates
-// on a field basis with a few distinct differences.
-//
-// 1. Everything needs to be a GraphQLInputObjectType or scalar / enum
-// 2. Relationships, groups, repeaters and flex content are not
-//    directly searchable. Instead, we need to build a chained pathname
-//    using dot notation so MongoDB can properly search nested paths.
+/** This does as the function name suggests. It builds a where GraphQL input type
+ * for all the fields which are passed to the function.
+ * Each field has different operators which may be valid for a where input type.
+ * For example, a text field may have a "contains" operator, but a number field
+ * may not.
+ *
+ * buildWhereInputType is similar to buildObjectType and operates
+ * on a field basis with a few distinct differences.
+ *
+ * 1. Everything needs to be a GraphQLInputObjectType or scalar / enum
+ * 2. Relationships, groups, repeaters and flex content are not
+ *    directly searchable. Instead, we need to build a chained pathname
+ *    using dot notation so MongoDB can properly search nested paths.
+ */
 const buildWhereInputType = (name: string, fields: Field[], parentName: string): GraphQLInputObjectType => {
   // This is the function that builds nested paths for all
   // field types with nested paths.

src/graphql/schema/operators.ts

@@ -4,6 +4,7 @@ const operators = {
   contains: ['in', 'not_in', 'all'],
   comparison: ['greater_than_equal', 'greater_than', 'less_than_equal', 'less_than'],
   geo: ['near'],
+  geojson: ['within', 'intersects'],
 };
 
 export default operators;