From 8fe8449071e51b93fd341ca464ce4886f67ea2c8 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Sat, 24 Jun 2023 17:13:26 +0530
Subject: [PATCH] test: trigger soft delete instead of full project delete

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../test/TestResetService/index.ts            | 21 ++++++++++++-------
 tests/playwright/tests/db/filters.spec.ts     |  4 ----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/packages/nocodb/src/controllers/test/TestResetService/index.ts b/packages/nocodb/src/controllers/test/TestResetService/index.ts
index 6a5d67ec46..ddf1d8d108 100644
--- a/packages/nocodb/src/controllers/test/TestResetService/index.ts
+++ b/packages/nocodb/src/controllers/test/TestResetService/index.ts
@@ -116,14 +116,19 @@ export class TestResetService {
     if (project) {
       await removeProjectUsersFromCache(project);
 
-      const bases = await project.getBases();
-
-      for (const base of bases) {
-        await NcConnectionMgrv2.deleteAwait(base);
-        await base.delete(Noco.ncMeta, { force: true });
-      }
-
-      await Project.delete(project.id);
+      // Kludge: Soft reset to support PG as root DB in PW tests
+      // Revisit to fix this later
+
+      // const bases = await project.getBases();
+      //
+      // for (const base of bases) {
+      //   await NcConnectionMgrv2.deleteAwait(base);
+      //   await base.delete(Noco.ncMeta, { force: true });
+      // }
+      //
+      // await Project.delete(project.id);
+
+      await Project.softDelete(project.id);
     }
 
     if (dbType == 'sqlite') {
diff --git a/tests/playwright/tests/db/filters.spec.ts b/tests/playwright/tests/db/filters.spec.ts
index 4a56c34d4d..162cfda00e 100644
--- a/tests/playwright/tests/db/filters.spec.ts
+++ b/tests/playwright/tests/db/filters.spec.ts
@@ -1163,10 +1163,6 @@ test.describe('Filter Tests: Filter groups', () => {
   });
 
   test('Filter: Empty filters', async () => {
-    if (isPg(context)) {
-      test.skip();
-    }
-
     await dashboard.closeTab({ title: 'Team & Auth' });
     await dashboard.treeView.openTable({ title: 'Country', networkResponse: false });