fix: fix delete selection with search (#2012)

Author: nichenqin

apps/nestjs-backend/src/features/record/query-builder/record-query-builder.interface.ts

@@ -28,6 +28,8 @@ export interface ICreateRecordQueryBuilderOptions {
   limit?: number;
   /** Optional pagination offset (skip) */
   offset?: number;
+  /** When true, hide-not-match search filtering is applied */
+  hasSearch?: boolean;
   /** Optional fallback field used for default ordering */
   defaultOrderField?: string;
   /**

apps/nestjs-backend/src/features/record/query-builder/record-query-builder.service.ts

@@ -151,6 +151,7 @@ export class RecordQueryBuilderService implements IRecordQueryBuilder {
         sort: options.sort,
         currentUserId: options.currentUserId,
         defaultOrderField: options.defaultOrderField,
+        hasSearch: options.hasSearch,
       });
       this.buildFieldCtes(qb, tables, state, options.projection);
     }
@@ -184,6 +185,7 @@ export class RecordQueryBuilderService implements IRecordQueryBuilder {
       sort,
       currentUserId,
       defaultOrderField: options.defaultOrderField,
+      hasSearch: options.hasSearch,
     });
 
     this.buildSelect(
@@ -297,9 +299,10 @@ export class RecordQueryBuilderService implements IRecordQueryBuilder {
       sort?: ISortItem[];
       currentUserId?: string;
       defaultOrderField?: string;
+      hasSearch?: boolean;
     }
   ): void {
-    const { limit, offset, filter, sort, currentUserId, defaultOrderField } = params;
+    const { limit, offset, filter, sort, currentUserId, defaultOrderField, hasSearch } = params;
     state.setBaseCteName(undefined);
 
     if (state.getContext() !== 'table') {
@@ -316,6 +319,11 @@ export class RecordQueryBuilderService implements IRecordQueryBuilder {
       return;
     }
 
+    if (hasSearch) {
+      // Avoid trimming candidate rows before search filter applies; search runs after base CTE.
+      return;
+    }
+
     const requiredFieldIds = this.collectRequiredFieldIds(filter, sort, defaultOrderField);
     const fieldLookup = this.buildFieldLookup(table);
 

apps/nestjs-backend/src/features/record/record.service.ts

@@ -576,6 +576,7 @@ export class RecordService {
         useQueryModel,
         limit: query.take,
         offset: query.skip,
+        hasSearch: Boolean(search?.[2]),
         defaultOrderField: basicSortIndex,
       }
     );

apps/nestjs-backend/test/selection.e2e-spec.ts

@@ -588,6 +588,38 @@ describe('OpenAPI SelectionController (e2e)', () => {
       });
       expect(result.data.ids).toEqual([table.records[0].id, table.records[2].id]);
     });
+
+    it('should delete rows matched by hide-not-match search even when matches are beyond base range', async () => {
+      const searchTable = await createTable(baseId, {
+        name: 'search table',
+        fields: [
+          {
+            name: 'name',
+            type: FieldType.SingleLineText,
+          },
+        ],
+        records: [
+          { fields: { name: 'alpha' } },
+          { fields: { name: 'beta' } },
+          { fields: { name: 'gamma' } },
+          { fields: { name: 'target one' } },
+          { fields: { name: 'target two' } },
+        ],
+      });
+      try {
+        const viewId = searchTable.views[0].id;
+        const result = await deleteSelection(searchTable.id, {
+          viewId,
+          type: RangeType.Rows,
+          ranges: [[0, 1]],
+          search: ['target', searchTable.fields[0].id, true],
+        });
+
+        expect(result.data.ids).toEqual([searchTable.records[3].id, searchTable.records[4].id]);
+      } finally {
+        await permanentDeleteTable(baseId, searchTable.id);
+      }
+    });
   });
 
   describe('paste user', () => {