feat: working trash filter button

packages/twenty-front/src/modules/object-record/record-index/options/components/RecordIndexOptionsDropdownContent.tsx

@@ -38,7 +38,6 @@ import { useGetCurrentView } from '@/views/hooks/useGetCurrentView';
 import { ViewType } from '@/views/types/ViewType';
 import { useLocation } from 'react-router-dom';
 import { useSetRecoilState } from 'recoil';
-import { useCombinedViewFilters } from '@/views/hooks/useCombinedViewFilters';
 import { useHandleToggleTrashColumnFilter } from '@/object-record/record-index/hooks/useHandleToggleTrashColumnFilter';
 
 type RecordIndexOptionsMenu = 'fields' | 'hiddenFields';
@@ -62,8 +61,6 @@ export const RecordIndexOptionsDropdownContent = ({
     RecordIndexOptionsMenu | undefined
   >(undefined);
 
-  const { upsertCombinedViewFilter } = useCombinedViewFilters();
-
   const resetMenu = () => setCurrentMenu(undefined);
 
   const handleSelectMenu = (option: RecordIndexOptionsMenu) => {
@@ -163,7 +160,10 @@ export const RecordIndexOptionsDropdownContent = ({
             text={displayedExportProgress(progress)}
           />
           <MenuItem
-            onClick={handleToggleTrashColumnFilter}
+            onClick={() => {
+              handleToggleTrashColumnFilter();
+              closeDropdown();
+            }}
             LeftIcon={IconTrash}
             text="Trash"
           />

packages/twenty-front/src/modules/views/components/VariantFilterChip.tsx

@@ -15,8 +15,7 @@ export const VariantFilterChip = ({ viewFilter }: VariantFilterChipProps) => {
   const { getIcon } = useIcons();
 
   const handleRemoveClick = () => {
-    // FixMe: Why it's not working ?
-    removeCombinedViewFilter(viewFilter.fieldMetadataId);
+    removeCombinedViewFilter(viewFilter.id);
   };
 
   const variant = useMemo(() => {

packages/twenty-front/src/modules/views/components/ViewBarDetails.tsx

@@ -157,11 +157,6 @@ export const ViewBarDetails = ({
     return null;
   }
 
-  console.log(
-    'currentViewWithCombinedFiltersAndSorts?.viewFilters: ',
-    currentViewWithCombinedFiltersAndSorts?.viewFilters,
-  );
-
   return (
     <StyledBar>
       <StyledFilterContainer>
@@ -171,6 +166,7 @@ export const ViewBarDetails = ({
               key={viewFilter.fieldMetadataId}
               // Why do we have two types, Filter and ViewFilter?
               // Why key defition is already present in the Filter type and added on the fly here with mapViewFiltersToFilters ?
+              // Also as filter is spread into viewFilter, definition is present
               // FixMe: Ugly hack to make it work
               viewFilter={viewFilter as unknown as Filter}
             />

packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/args-string.factory.ts

@@ -3,6 +3,7 @@ import { Injectable } from '@nestjs/common';
 import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
 
 import { stringifyWithoutKeyQuote } from 'src/engine/api/graphql/workspace-query-builder/utils/stringify-without-key-quote.util';
+import { isDefined } from 'src/utils/is-defined';
 
 import { ArgsAliasFactory } from './args-alias.factory';
 
@@ -20,8 +21,9 @@ export class ArgsStringFactory {
     }
     if (softDeletable) {
       initialArgs.filter = {
-        deletedAt: { is: 'NULL' },
-        ...initialArgs.filter,
+        and: [initialArgs.filter, { deletedAt: { is: 'NULL' } }].filter(
+          isDefined,
+        ),
       };
     }
     let argsString = '';

packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/fields-string.factory.ts

@@ -30,8 +30,6 @@ export class FieldsStringFactory {
   ): Promise<string> {
     const selectedFields: Partial<Record> = graphqlFields(info);
 
-    console.log('selectedFields', JSON.stringify(selectedFields, null, 2));
-
     const res = await this.createFieldsStringRecursive(
       info,
       selectedFields,
@@ -40,8 +38,6 @@ export class FieldsStringFactory {
       withSoftDeleted ?? false,
     );
 
-    console.log('res', res);
-
     return res;
   }
 

packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/find-many-query.factory.ts

@@ -39,14 +39,6 @@ export class FindManyQueryFactory {
       !options.withSoftDeleted && !!options.objectMetadataItem.isSoftDeletable,
     );
 
-    console.log(
-      'argsString',
-      args,
-      argsString,
-      options.withSoftDeleted,
-      options.objectMetadataItem.isSoftDeletable,
-    );
-
     return `
       query {
         ${computeObjectTargetTable(options.objectMetadataItem)}Collection${

packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/relation-field-alias.factory.ts

@@ -100,14 +100,6 @@ export class RelationFieldAliasFactory {
     ) {
       const args = getFieldArgumentsByKey(info, fieldKey);
 
-      // If the referenced object is soft deletable, we need to filter out the deleted objects
-      if (!withSoftDeleted && referencedObjectMetadata.isSoftDeletable) {
-        args.filter = {
-          deletedAt: { is: 'NULL' },
-          ...args.filter,
-        };
-      }
-
       const argsString = this.argsStringFactory.create(
         args,
         referencedObjectMetadata.fields ?? [],

packages/twenty-server/src/engine/api/graphql/workspace-query-runner/utils/with-soft-deleted.util.ts

@@ -0,0 +1,27 @@
+import { RecordFilter } from 'src/engine/api/graphql/workspace-query-builder/interfaces/record.interface';
+
+import { isDefined } from 'src/utils/is-defined';
+
+export const withSoftDeleted = <T extends RecordFilter>(
+  filter: T | undefined | null,
+): boolean => {
+  if (!isDefined(filter)) {
+    return false;
+  }
+
+  if (Array.isArray(filter)) {
+    return filter.some((item) => withSoftDeleted(item));
+  }
+
+  for (const [key, value] of Object.entries(filter)) {
+    if (key === 'deletedAt') {
+      return true;
+    }
+
+    if (typeof value === 'object') {
+      return withSoftDeleted(value);
+    }
+  }
+
+  return false;
+};

packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service.ts

@@ -52,6 +52,7 @@ import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.
 import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
 import { isQueryTimeoutError } from 'src/engine/utils/query-timeout.util';
 import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { withSoftDeleted } from 'src/engine/api/graphql/workspace-query-runner/utils/with-soft-deleted.util';
 
 import {
   PGGraphQLMutation,
@@ -110,7 +111,7 @@ export class WorkspaceQueryRunnerService {
       computedArgs,
       {
         ...options,
-        withSoftDeleted: !!args.filter?.deletedAt,
+        withSoftDeleted: withSoftDeleted(args.filter),
       },
     );
 
@@ -164,7 +165,7 @@ export class WorkspaceQueryRunnerService {
       computedArgs,
       {
         ...options,
-        withSoftDeleted: !!args.filter?.deletedAt,
+        withSoftDeleted: withSoftDeleted(args.filter),
       },
     );