Refactor GetTableRowsUseCase to optionally handle saved filters, updating response structure to include them in the output

Author: Artuomka

backend/src/entities/table/use-cases/get-table-rows.use.case.ts

@@ -110,10 +110,10 @@ export class GetTableRowsUseCase extends AbstractUseCase<GetTableRowsDs, FoundTa
         ? findFilteringFieldsUtil(query, tableStructure)
         : parseFilteringFieldsFromBodyData(filters, tableStructure);
 
-      if (!filteringFields.length && savedTableFilters) {
-        const parsedSavedTableFilters = parseFilteringFieldsFromBodyData(savedTableFilters.filters, tableStructure);
-        filteringFields.push(...parsedSavedTableFilters);
-      }
+      // if (!filteringFields.length && savedTableFilters) {
+      //   const parsedSavedTableFilters = parseFilteringFieldsFromBodyData(savedTableFilters.filters, tableStructure);
+      //   filteringFields.push(...parsedSavedTableFilters);
+      // }
 
       const orderingField = findOrderingFieldUtil(query, tableStructure, tableSettings);
 
@@ -239,7 +239,7 @@ export class GetTableRowsUseCase extends AbstractUseCase<GetTableRowsDs, FoundTa
         large_dataset: largeDataset,
         allow_csv_export: allowCsvExport,
         allow_csv_import: allowCsvImport,
-        saved_filters: savedTableFilters.filters,
+        saved_filters: savedTableFilters?.filters ? savedTableFilters.filters : null,
       };
 
       const identitiesMap = new Map<string, any[]>();

backend/test/ava-tests/saas-tests/connection-e2e.test.ts

@@ -388,7 +388,7 @@ test.serial(
       t.is(findOneConnectionRO.connection.hasOwnProperty('host'), false);
       t.is(findOneConnectionRO.connection.hasOwnProperty('port'), false);
       t.is(findOneConnectionRO.connection.hasOwnProperty('username'), false);
-      t.is(findOneConnectionRO.connection.hasOwnProperty('database'), false);
+      t.is(findOneConnectionRO.connection.hasOwnProperty('database'), true);
       t.is(findOneConnectionRO.connection.hasOwnProperty('sid'), false);
       t.is(findOneConnectionRO.connection.hasOwnProperty('password'), false);
       t.is(findOneConnectionRO.connection.hasOwnProperty('groups'), false);

backend/test/ava-tests/saas-tests/table-filters-e2e-test.ts

@@ -333,13 +333,12 @@ test.serial(
       t.is(getTableRowsResponse.status, 200);
 
       const getTableRowsRO = JSON.parse(getTableRowsResponse.text);
-      console.log('🚀 ~ withsearch,pagination:page=1,perPage=2andDESCsorting`, ~ getTableRowsRO:', getTableRowsRO);
 
       t.is(typeof getTableRowsRO, 'object');
       t.is(getTableRowsRO.hasOwnProperty('rows'), true);
       t.is(getTableRowsRO.hasOwnProperty('primaryColumns'), true);
       t.is(getTableRowsRO.hasOwnProperty('pagination'), true);
-      t.is(getTableRowsRO.rows.length, 2);
+      t.is(getTableRowsRO.rows.length, 3);
       t.is(Object.keys(getTableRowsRO.rows[1]).length, 5);
 
       t.is(getTableRowsRO.rows[0][testTableColumnName], testSearchedUserName);
@@ -353,6 +352,8 @@ test.serial(
       t.is(typeof getTableRowsRO.primaryColumns, 'object');
       t.is(getTableRowsRO.primaryColumns[0].hasOwnProperty('column_name'), true);
       t.is(getTableRowsRO.primaryColumns[0].hasOwnProperty('data_type'), true);
+      t.is(getTableRowsRO.hasOwnProperty('saved_filters'), true);
+      t.deepEqual(getTableRowsRO.saved_filters, filters);
     } catch (error) {
       console.error(error);
       t.fail();