From 4abbf4a123e2845ee34a2a4439c93ae35e70c2aa Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Tue, 18 Apr 2023 11:40:45 +0800 Subject: [PATCH] fix(nocodb): set none list for all scopes --- packages/nocodb/src/lib/cache/RedisCacheMgr.ts | 13 ++----------- packages/nocodb/src/lib/cache/RedisMockCacheMgr.ts | 12 ++---------- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/packages/nocodb/src/lib/cache/RedisCacheMgr.ts b/packages/nocodb/src/lib/cache/RedisCacheMgr.ts index b096f5a068..5fa6f24b69 100644 --- a/packages/nocodb/src/lib/cache/RedisCacheMgr.ts +++ b/packages/nocodb/src/lib/cache/RedisCacheMgr.ts @@ -163,17 +163,8 @@ export default class RedisCacheMgr extends CacheMgr { ? `${this.prefix}:${scope}:list` : `${this.prefix}:${scope}:${subListKeys.join(':')}:list`; if (!list.length) { - if ( - [ - CacheScope.FILTER_EXP, - CacheScope.SORT, - CacheScope.MODEL_ROLE_VISIBILITY, - ].includes(scope as CacheScope) - ) { - // Set NONE here so that it won't hit the DB on each page load - return this.set(listKey, ['NONE']); - } - return Promise.resolve(true); + // Set NONE here so that it won't hit the DB on each page load + return this.set(listKey, ['NONE']); } // fetch existing list const listOfGetKeys = diff --git a/packages/nocodb/src/lib/cache/RedisMockCacheMgr.ts b/packages/nocodb/src/lib/cache/RedisMockCacheMgr.ts index 0f82bd4185..831d650429 100644 --- a/packages/nocodb/src/lib/cache/RedisMockCacheMgr.ts +++ b/packages/nocodb/src/lib/cache/RedisMockCacheMgr.ts @@ -162,16 +162,8 @@ export default class RedisMockCacheMgr extends CacheMgr { ? `${this.prefix}:${scope}:list` : `${this.prefix}:${scope}:${subListKeys.join(':')}:list`; if (!list.length) { - if ( - [ - CacheScope.FILTER_EXP, - CacheScope.SORT, - CacheScope.MODEL_ROLE_VISIBILITY, - ].includes(scope as CacheScope) - ) { - return this.set(listKey, ['NONE']); - } - return Promise.resolve(true); + // Set NONE here so that it won't hit the DB on each page load + return this.set(listKey, ['NONE']); } // fetch existing list const listOfGetKeys =