The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix(api): isEmptyArray filter ignores boolean value and misses NULL-stored arrays (#27232)
okxint9f78493d2d49
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/__tests__/compute-where-condition-parts.spec.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/__tests__/compute-where-condition-parts.spec.tsnew file mode 100644index 00000000000..e0089e5691f--- /dev/null+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/__tests__/compute-where-condition-parts.spec.ts@@ -0,0 +1,43 @@+import { FieldMetadataType } from 'twenty-shared/types';++import { computeWhereConditionParts } from 'src/engine/api/graphql/graphql-query-runner/utils/compute-where-condition-parts';++describe('computeWhereConditionParts', () => {+ describe('isEmptyArray', () => {+ it.each([FieldMetadataType.ARRAY, FieldMetadataType.MULTI_SELECT])(+ 'should match NULL and empty %s values when true',+ (fieldMetadataType) => {+ expect(+ computeWhereConditionParts({+ operator: 'isEmptyArray',+ objectNameSingular: 'pet',+ key: 'traits',+ value: true,+ fieldMetadataType,+ }),+ ).toEqual({+ sql: `("pet"."traits" = '{}' OR "pet"."traits" IS NULL)`,+ params: {},+ });+ },+ );++ it.each([FieldMetadataType.ARRAY, FieldMetadataType.MULTI_SELECT])(+ 'should exclude NULL and empty %s values when false',+ (fieldMetadataType) => {+ expect(+ computeWhereConditionParts({+ operator: 'isEmptyArray',+ objectNameSingular: 'pet',+ key: 'traits',+ value: false,+ fieldMetadataType,+ }),+ ).toEqual({+ sql: `("pet"."traits" IS NOT NULL AND "pet"."traits" != '{}')`,+ params: {},+ });+ },+ );+ });+});diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/compute-where-condition-parts.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/compute-where-condition-parts.tsindex a4e3bcb792a..cdf1d8fb6ce 100644--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/compute-where-condition-parts.ts+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/compute-where-condition-parts.ts@@ -56,8 +56,15 @@ export const computeWhereConditionParts = ({switch (operator) {case 'isEmptyArray':+ if (value === true) {+ return {+ sql: `(${fieldReference} = '{}' OR ${fieldReference} IS NULL)`,+ params: {},+ };+ }+return {- sql: `${fieldReference} = '{}'${hasNullEquivalentFieldValue ? ` OR ${fieldReference} IS NULL` : ''}`,+ sql: `(${fieldReference} IS NOT NULL AND ${fieldReference} != '{}')`,params: {},};case 'eq':diff --git a/packages/twenty-server/test/integration/graphql/suites/inputs-validation/filter-validation/constants/successful-filter-input-by-field-metadata-type.constant.ts b/packages/twenty-server/test/integration/graphql/suites/inputs-validation/filter-validation/constants/successful-filter-input-by-field-metadata-type.constant.tsindex 92948121e34..2daca44d374 100644--- a/packages/twenty-server/test/integration/graphql/suites/inputs-validation/filter-validation/constants/successful-filter-input-by-field-metadata-type.constant.ts+++ b/packages/twenty-server/test/integration/graphql/suites/inputs-validation/filter-validation/constants/successful-filter-input-by-field-metadata-type.constant.ts@@ -849,6 +849,20 @@ export const successfulFilterInputByFieldMetadataType: {return isDefined(record.multiSelectField);},},+ {+ gqlFilterInput: { multiSelectField: { isEmptyArray: true } },+ restFilterInput: '',+ validateFilter: (record: Record<string, any>) => {+ return record.multiSelectField.length === 0;+ },+ },+ {+ gqlFilterInput: { multiSelectField: { isEmptyArray: false } },+ restFilterInput: '',+ validateFilter: (record: Record<string, any>) => {+ return record.multiSelectField.length > 0;+ },+ },],[FieldMetadataType.ADDRESS]: [{@@ -956,6 +970,20 @@ export const successfulFilterInputByFieldMetadataType: {);},},+ {+ gqlFilterInput: { arrayField: { isEmptyArray: true } },+ restFilterInput: '',+ validateFilter: (record: Record<string, any>) => {+ return record.arrayField.length === 0;+ },+ },+ {+ gqlFilterInput: { arrayField: { isEmptyArray: false } },+ restFilterInput: '',+ validateFilter: (record: Record<string, any>) => {+ return record.arrayField.length > 0;+ },+ },],[FieldMetadataType.FILES]: [{diff --git a/packages/twenty-server/test/integration/graphql/suites/inputs-validation/filter-validation/multi-select-field-filter-input-validation.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/inputs-validation/filter-validation/multi-select-field-filter-input-validation.integration-spec.tsindex 582efc4827b..6c7b50f81e0 100644--- a/packages/twenty-server/test/integration/graphql/suites/inputs-validation/filter-validation/multi-select-field-filter-input-validation.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/inputs-validation/filter-validation/multi-select-field-filter-input-validation.integration-spec.ts@@ -94,10 +94,12 @@ describe(`Filter input validation - ${FIELD_METADATA_TYPE}`, () => {describe('Rest filter input - success', () => {it.each(- successfulTestCases.map((testCase) => ({- ...testCase,- stringifiedFilter: JSON.stringify(testCase.restFilterInput),- })),+ successfulTestCases+ .filter((testCase) => testCase.restFilterInput)+ .map((testCase) => ({+ ...testCase,+ stringifiedFilter: JSON.stringify(testCase.restFilterInput),+ })),)(`${FIELD_METADATA_TYPE} field type - should succeed with filter : $stringifiedFilter`,async ({ restFilterInput, validateFilter }) => {diff --git a/packages/twenty-shared/src/utils/filter/utils/__tests__/isMatchingArrayFilter.test.ts b/packages/twenty-shared/src/utils/filter/utils/__tests__/isMatchingArrayFilter.test.tsindex 6d771849960..fd3bb9087f7 100644--- a/packages/twenty-shared/src/utils/filter/utils/__tests__/isMatchingArrayFilter.test.ts+++ b/packages/twenty-shared/src/utils/filter/utils/__tests__/isMatchingArrayFilter.test.ts@@ -40,32 +40,21 @@ describe('isMatchingArrayFilter', () => {});describe('isEmptyArray filter', () => {- it('should return true when array is empty and checking for empty array', () => {- expect(- isMatchingArrayFilter({- arrayFilter: { isEmptyArray: true },- value: [],- }),- ).toBe(true);- });-- it('should return false when array is not empty and checking for empty array', () => {- expect(- isMatchingArrayFilter({- arrayFilter: { isEmptyArray: true },- value: ['test'],- }),- ).toBe(false);- });-- it('should return false when value is null and checking for empty array', () => {- expect(- isMatchingArrayFilter({- arrayFilter: { isEmptyArray: true },- value: null,- }),- ).toBe(false);- });+ it.each([+ { isEmptyArray: true, value: [], expected: true },+ { isEmptyArray: true, value: null, expected: true },+ { isEmptyArray: true, value: ['test'], expected: false },+ { isEmptyArray: false, value: [], expected: false },+ { isEmptyArray: false, value: null, expected: false },+ { isEmptyArray: false, value: ['test'], expected: true },+ ])(+ 'should return $expected for isEmptyArray $isEmptyArray on $value',+ ({ isEmptyArray, value, expected }) => {+ expect(+ isMatchingArrayFilter({ arrayFilter: { isEmptyArray }, value }),+ ).toBe(expected);+ },+ );});describe('containsIlike filter', () => {diff --git a/packages/twenty-shared/src/utils/filter/utils/__tests__/isMatchingMultiSelectFilter.test.ts b/packages/twenty-shared/src/utils/filter/utils/__tests__/isMatchingMultiSelectFilter.test.tsindex b768f60589c..f1032818bd3 100644--- a/packages/twenty-shared/src/utils/filter/utils/__tests__/isMatchingMultiSelectFilter.test.ts+++ b/packages/twenty-shared/src/utils/filter/utils/__tests__/isMatchingMultiSelectFilter.test.ts@@ -58,23 +58,24 @@ describe('isMatchingMultiSelectFilter', () => {});describe('isEmptyArray', () => {- it('should return true for empty array', () => {- expect(- isMatchingMultiSelectFilter({- multiSelectFilter: { isEmptyArray: true },- value: [],- }),- ).toBe(true);- });-- it('should return false for non-empty array', () => {- expect(- isMatchingMultiSelectFilter({- multiSelectFilter: { isEmptyArray: true },- value: ['A'],- }),- ).toBe(false);- });+ it.each([+ { isEmptyArray: true, value: [], expected: true },+ { isEmptyArray: true, value: null, expected: true },+ { isEmptyArray: true, value: ['A'], expected: false },+ { isEmptyArray: false, value: [], expected: false },+ { isEmptyArray: false, value: null, expected: false },+ { isEmptyArray: false, value: ['A'], expected: true },+ ])(+ 'should return $expected for isEmptyArray $isEmptyArray on $value',+ ({ isEmptyArray, value, expected }) => {+ expect(+ isMatchingMultiSelectFilter({+ multiSelectFilter: { isEmptyArray },+ value,+ }),+ ).toBe(expected);+ },+ );});describe('is', () => {diff --git a/packages/twenty-shared/src/utils/filter/utils/isMatchingArrayFilter.ts b/packages/twenty-shared/src/utils/filter/utils/isMatchingArrayFilter.tsindex b9a889ff879..9a5c4696837 100644--- a/packages/twenty-shared/src/utils/filter/utils/isMatchingArrayFilter.ts+++ b/packages/twenty-shared/src/utils/filter/utils/isMatchingArrayFilter.ts@@ -18,7 +18,7 @@ export const isMatchingArrayFilter = ({}}case arrayFilter.isEmptyArray !== undefined: {- return Array.isArray(value) && value.length === 0;+ return arrayFilter.isEmptyArray !== isNonEmptyArray(value);}case arrayFilter.containsIlike !== undefined: {if (!isNonEmptyArray(value)) {diff --git a/packages/twenty-shared/src/utils/filter/utils/isMatchingMultiSelectFilter.ts b/packages/twenty-shared/src/utils/filter/utils/isMatchingMultiSelectFilter.tsindex 7ff7628e967..3552cf67d89 100644--- a/packages/twenty-shared/src/utils/filter/utils/isMatchingMultiSelectFilter.ts+++ b/packages/twenty-shared/src/utils/filter/utils/isMatchingMultiSelectFilter.ts@@ -1,4 +1,5 @@import { type MultiSelectFilter } from '@/types';+import { isNonEmptyArray } from '@/utils/array/isNonEmptyArray';export const isMatchingMultiSelectFilter = ({multiSelectFilter,@@ -15,7 +16,7 @@ export const isMatchingMultiSelectFilter = ({);}case multiSelectFilter.isEmptyArray !== undefined: {- return Array.isArray(value) && value.length === 0;+ return multiSelectFilter.isEmptyArray !== isNonEmptyArray(value);}case multiSelectFilter.is !== undefined: {if (multiSelectFilter.is === 'NULL') {