Merge branch 'feat/ts-vector-filter-type' of github.com:abdulrahmancodes/twenty into feat/ts-vector-filter-type

Author: FelixMalfait

packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-filter/graphql-query-filter-field.parser.ts

@@ -1,4 +1,3 @@
-import { FieldMetadataType } from 'twenty-shared/types';
 import { capitalize } from 'twenty-shared/utils';
 import { WhereExpressionBuilder } from 'typeorm';
 
@@ -57,7 +56,6 @@ export class GraphqlQueryFilterFieldParser {
 
     if (
       ARRAY_OPERATORS.includes(operator) &&
-      fieldMetadata.type !== FieldMetadataType.TS_VECTOR &&
       (!Array.isArray(value) || value.length === 0)
     ) {
       throw new GraphqlQueryRunnerException(
@@ -71,7 +69,6 @@ export class GraphqlQueryFilterFieldParser {
       objectNameSingular,
       key,
       value,
-      fieldMetadataType: fieldMetadata.type,
     });
 
     if (isFirst) {
@@ -119,7 +116,6 @@ export class GraphqlQueryFilterFieldParser {
 
       if (
         ARRAY_OPERATORS.includes(operator) &&
-        fieldMetadata.type !== FieldMetadataType.TS_VECTOR &&
         (!Array.isArray(value) || value.length === 0)
       ) {
         throw new GraphqlQueryRunnerException(
@@ -132,7 +128,6 @@ export class GraphqlQueryFilterFieldParser {
         operator,
         objectNameSingular,
         key: fullFieldName,
-        fieldMetadataType: subFieldMetadata.type,
         value,
       });
 

packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/compute-where-condition-parts.ts

@@ -1,4 +1,3 @@
-import { FieldMetadataType } from 'twenty-shared/types';
 import { ObjectLiteral } from 'typeorm';
 
 import {
@@ -16,19 +15,15 @@ export const computeWhereConditionParts = ({
   objectNameSingular,
   key,
   value,
-  fieldMetadataType,
 }: {
   operator: string;
   objectNameSingular: string;
   key: string;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   value: any;
-  fieldMetadataType?: FieldMetadataType;
 }): WhereConditionParts => {
   const uuid = Math.random().toString(36).slice(2, 7);
 
-  const isTSVectorField = fieldMetadataType === FieldMetadataType.TS_VECTOR;
-
   switch (operator) {
     case 'isEmptyArray':
       return {
@@ -96,28 +91,27 @@ export const computeWhereConditionParts = ({
         params: { [`${key}${uuid}`]: `${value}` },
       };
     case 'contains':
-      if (isTSVectorField) {
-        const tsQuery = value
-          .split(/\s+/)
-          .map((term: string) => `${term}:*`)
-          .join(' & ');
-
-        return {
-          sql: `(
-            "${objectNameSingular}"."${key}" @@ to_tsquery('simple', :${key}${uuid}Ts) OR
-            "${objectNameSingular}"."${key}"::text ILIKE :${key}${uuid}Like
-          )`,
-          params: {
-            [`${key}${uuid}Ts`]: tsQuery,
-            [`${key}${uuid}Like`]: `%${value}%`,
-          },
-        };
-      }
-
       return {
         sql: `"${objectNameSingular}"."${key}" @> ARRAY[:...${key}${uuid}]`,
         params: { [`${key}${uuid}`]: value },
       };
+    case 'search': {
+      const tsQuery = value
+        .split(/\s+/)
+        .map((term: string) => `${term}:*`)
+        .join(' & ');
+
+      return {
+        sql: `(
+          "${objectNameSingular}"."${key}" @@ to_tsquery('simple', :${key}${uuid}Ts) OR
+          "${objectNameSingular}"."${key}"::text ILIKE :${key}${uuid}Like
+        )`,
+        params: {
+          [`${key}${uuid}Ts`]: tsQuery,
+          [`${key}${uuid}Like`]: `%${value}%`,
+        },
+      };
+    }
     case 'notContains':
       return {
         sql: `NOT ("${objectNameSingular}"."${key}"::text[] && ARRAY[:...${key}${uuid}]::text[])`,

packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/ts-vector-filter.input-type.ts

@@ -3,6 +3,6 @@ import { GraphQLInputObjectType, GraphQLString } from 'graphql';
 export const TSVectorFilterType = new GraphQLInputObjectType({
   name: 'TSVectorFilter',
   fields: {
-    contains: { type: GraphQLString },
+    search: { type: GraphQLString },
   },
 });