From 59c2accf8c7e0f449c828cdf3940f1f2b0152794 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 6 Apr 2023 21:12:40 +0800
Subject: [PATCH] refactor(nocodb): adopt getList new format in Filter.ts

---
 packages/nocodb/src/lib/models/Filter.ts | 38 ++++++++++++++++--------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/packages/nocodb/src/lib/models/Filter.ts b/packages/nocodb/src/lib/models/Filter.ts
index abb9b21b1a..aa6afd20c0 100644
--- a/packages/nocodb/src/lib/models/Filter.ts
+++ b/packages/nocodb/src/lib/models/Filter.ts
@@ -326,10 +326,12 @@ export default class Filter implements FilterType {
   public async getChildren(ncMeta = Noco.ncMeta): Promise<Filter[]> {
     if (this.children) return this.children;
     if (!this.is_group) return null;
-    let childFilters = await NocoCache.getList(CacheScope.FILTER_EXP, [
+    const cachedList = await NocoCache.getList(CacheScope.FILTER_EXP, [
       this.id,
     ]);
-    if (!childFilters.length) {
+    let { list: childFilters } = cachedList;
+    const { isEmptyList } = cachedList;
+    if (!isEmptyList && !childFilters.length) {
       childFilters = await ncMeta.metaList2(null, null, MetaTable.FILTER_EXP, {
         condition: {
           fk_parent_id: this.id,
@@ -369,10 +371,12 @@ export default class Filter implements FilterType {
     },
     ncMeta = Noco.ncMeta
   ): Promise<FilterType> {
-    let filters = await NocoCache.getList(CacheScope.FILTER_EXP, [
+    const cachedList = await NocoCache.getList(CacheScope.FILTER_EXP, [
       viewId || hookId,
     ]);
-    if (!filters.length) {
+    let { list: filters } = cachedList;
+    const { isEmptyList } = cachedList;
+    if (!isEmptyList && !filters.length) {
       filters = await ncMeta.metaList2(null, null, MetaTable.FILTER_EXP, {
         condition: viewId ? { fk_view_id: viewId } : { fk_hook_id: hookId },
         orderBy: {
@@ -480,8 +484,10 @@ export default class Filter implements FilterType {
     { viewId }: { viewId: any },
     ncMeta = Noco.ncMeta
   ) {
-    let filterObjs = await NocoCache.getList(CacheScope.FILTER_EXP, [viewId]);
-    if (!filterObjs.length) {
+    const cachedList = await NocoCache.getList(CacheScope.FILTER_EXP, [viewId]);
+    let { list: filterObjs } = cachedList;
+    const { isEmptyList } = cachedList;
+    if (!isEmptyList && !filterObjs.length) {
       filterObjs = await ncMeta.metaList2(null, null, MetaTable.FILTER_EXP, {
         condition: { fk_view_id: viewId },
         orderBy: {
@@ -499,8 +505,10 @@ export default class Filter implements FilterType {
     { hookId }: { hookId: any },
     ncMeta = Noco.ncMeta
   ) {
-    let filterObjs = await NocoCache.getList(CacheScope.FILTER_EXP, [hookId]);
-    if (!filterObjs.length) {
+    const cachedList = await NocoCache.getList(CacheScope.FILTER_EXP, [hookId]);
+    let { list: filterObjs } = cachedList;
+    const { isEmptyList } = cachedList;
+    if (!isEmptyList && !filterObjs.length) {
       filterObjs = await ncMeta.metaList2(null, null, MetaTable.FILTER_EXP, {
         condition: { fk_hook_id: hookId },
         orderBy: {
@@ -520,8 +528,12 @@ export default class Filter implements FilterType {
     },
     ncMeta = Noco.ncMeta
   ) {
-    let filterObjs = await NocoCache.getList(CacheScope.FILTER_EXP, [parentId]);
-    if (!filterObjs.length) {
+    const cachedList = await NocoCache.getList(CacheScope.FILTER_EXP, [
+      parentId,
+    ]);
+    let { list: filterObjs } = cachedList;
+    const { isEmptyList } = cachedList;
+    if (!isEmptyList && !filterObjs.length) {
       filterObjs = await ncMeta.metaList2(null, null, MetaTable.FILTER_EXP, {
         condition: {
           fk_parent_id: parentId,
@@ -546,11 +558,13 @@ export default class Filter implements FilterType {
     },
     ncMeta = Noco.ncMeta
   ) {
-    let filterObjs = await NocoCache.getList(CacheScope.FILTER_EXP, [
+    const cachedList = await NocoCache.getList(CacheScope.FILTER_EXP, [
       hookId,
       parentId,
     ]);
-    if (!filterObjs.length) {
+    let { list: filterObjs } = cachedList;
+    const { isEmptyList } = cachedList;
+    if (!isEmptyList && !filterObjs.length) {
       filterObjs = await ncMeta.metaList2(null, null, MetaTable.FILTER_EXP, {
         condition: {
           fk_parent_id: parentId,