From 957f04e1fd6f1b271aff4d77560d874ce1afd850 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Wed, 31 May 2023 13:24:28 +0800 Subject: [PATCH 1/6] fix(nocodb): use includes to check if NONE is in target list --- packages/nocodb/src/cache/RedisCacheMgr.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/nocodb/src/cache/RedisCacheMgr.ts b/packages/nocodb/src/cache/RedisCacheMgr.ts index e0dafae4a1..7fc39c554d 100644 --- a/packages/nocodb/src/cache/RedisCacheMgr.ts +++ b/packages/nocodb/src/cache/RedisCacheMgr.ts @@ -135,7 +135,7 @@ export default class RedisCacheMgr extends CacheMgr { // e.g. arr = ["nc:::", "nc:::"] const arr = (await this.get(key, CacheGetType.TYPE_ARRAY)) || []; log(`RedisCacheMgr::getList: getting list with key ${key}`); - const isNoneList = arr.length && arr[0] === 'NONE'; + const isNoneList = arr.length && arr.includes('NONE'); if (isNoneList) { return Promise.resolve({ @@ -248,7 +248,7 @@ export default class RedisCacheMgr extends CacheMgr { : `${this.prefix}:${scope}:${subListKeys.join(':')}:list`; log(`RedisCacheMgr::appendToList: append key ${key} to ${listKey}`); let list = (await this.get(listKey, CacheGetType.TYPE_ARRAY)) || []; - if (list.length && list[0] === 'NONE') { + if (list.length && list.includes('NONE')) { list = []; await this.del(listKey); } From e3a06191e37f87a25eeddca0bc25d3212d7e1240 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Wed, 31 May 2023 13:24:51 +0800 Subject: [PATCH 2/6] fix(nocodb): revise user project list delete logic --- packages/nocodb/src/models/ProjectUser.ts | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/packages/nocodb/src/models/ProjectUser.ts b/packages/nocodb/src/models/ProjectUser.ts index f3d8897541..31eda80fbb 100644 --- a/packages/nocodb/src/models/ProjectUser.ts +++ b/packages/nocodb/src/models/ProjectUser.ts @@ -194,11 +194,16 @@ export default class ProjectUser { const { isNoneList } = cachedList; if (!isNoneList && cachedProjectList?.length) { cachedProjectList = cachedProjectList.filter((p) => p.id !== projectId); - await NocoCache.setList( - CacheScope.USER_PROJECT, - [userId], - cachedProjectList, - ); + // delete the whole list first so that the old one won't be included + await NocoCache.del(`${CacheScope.USER_PROJECT}:${userId}:list`); + if (cachedProjectList.length > 0) { + // set the updated list (i.e. excluding the to-be-deleted project id) + await NocoCache.setList( + CacheScope.USER_PROJECT, + [userId], + cachedProjectList, + ); + } } await NocoCache.del(`${CacheScope.PROJECT_USER}:${projectId}:${userId}`); From 283cd8f5660d4c7375804918c72763e8f8961a5f Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Wed, 31 May 2023 13:26:44 +0800 Subject: [PATCH 3/6] refactor(nocodb): remove unused code --- packages/nocodb/src/models/ProjectUser.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/nocodb/src/models/ProjectUser.ts b/packages/nocodb/src/models/ProjectUser.ts index 31eda80fbb..5042466fbf 100644 --- a/packages/nocodb/src/models/ProjectUser.ts +++ b/packages/nocodb/src/models/ProjectUser.ts @@ -174,11 +174,6 @@ export default class ProjectUser { } static async delete(projectId: string, userId: string, ncMeta = Noco.ncMeta) { - // await NocoCache.deepDel( - // CacheScope.PROJECT_USER, - // `${CacheScope.PROJECT_USER}:${projectId}:${userId}`, - // CacheDelDirection.CHILD_TO_PARENT - // ); const { email } = await ncMeta.metaGet2(null, null, MetaTable.USERS, { id: userId, }); From 51855e8893ffaca0b2e16da29a8113db1600879a Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Wed, 31 May 2023 16:07:52 +0800 Subject: [PATCH 4/6] fix(nocodb): add missing acl middleware --- .../nocodb/src/controllers/projects.controller.ts | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/packages/nocodb/src/controllers/projects.controller.ts b/packages/nocodb/src/controllers/projects.controller.ts index 7b905cba2e..65949ca778 100644 --- a/packages/nocodb/src/controllers/projects.controller.ts +++ b/packages/nocodb/src/controllers/projects.controller.ts @@ -11,15 +11,13 @@ import { Request, UseGuards, } from '@nestjs/common'; -import { AuthGuard } from '@nestjs/passport'; import isDocker from 'is-docker'; import { ProjectReqType } from 'nocodb-sdk'; import { GlobalGuard } from '../guards/global/global.guard'; import { PagedResponseImpl } from '../helpers/PagedResponse'; import { ExtractProjectIdMiddleware, - UseAclMiddleware, - UseProjectIdMiddleware, + Acl, } from '../middlewares/extract-project-id/extract-project-id.middleware'; import Noco from '../Noco'; import { packageVersion } from '../utils/packageVersion'; @@ -31,9 +29,7 @@ import type { ProjectType } from 'nocodb-sdk'; export class ProjectsController { constructor(private readonly projectsService: ProjectsService) {} - @UseAclMiddleware({ - permissionName: 'projectList', - }) + @Acl('projectList') @Get('/api/v1/db/meta/projects/') async list(@Query() queryParams: Record, @Request() req) { const projects = await this.projectsService.projectList({ @@ -57,7 +53,7 @@ export class ProjectsController { PackageVersion: packageVersion, }; } - + @Acl('projectGet') @Get('/api/v1/db/meta/projects/:projectId') async projectGet(@Param('projectId') projectId: string) { const project = await this.projectsService.getProjectWithInfo({ @@ -68,7 +64,7 @@ export class ProjectsController { return project; } - + @Acl('projectUpdate') @Patch('/api/v1/db/meta/projects/:projectId') async projectUpdate( @Param('projectId') projectId: string, @@ -82,6 +78,7 @@ export class ProjectsController { return project; } + @Acl('projectDelete') @Delete('/api/v1/db/meta/projects/:projectId') async projectDelete(@Param('projectId') projectId: string) { const deleted = await this.projectsService.projectSoftDelete({ @@ -91,6 +88,7 @@ export class ProjectsController { return deleted; } + @Acl('projectCreate') @Post('/api/v1/db/meta/projects') @HttpCode(200) async projectCreate(@Body() projectBody: ProjectReqType, @Request() req) { From 2d151627c31dd2b3e39138551ece0a746606d497 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Wed, 31 May 2023 16:08:05 +0800 Subject: [PATCH 5/6] refactor(nocodb): remove unused code --- .../src/controllers/projects.controller.ts | 63 ------------------- 1 file changed, 63 deletions(-) diff --git a/packages/nocodb/src/controllers/projects.controller.ts b/packages/nocodb/src/controllers/projects.controller.ts index 65949ca778..afde4b59a5 100644 --- a/packages/nocodb/src/controllers/projects.controller.ts +++ b/packages/nocodb/src/controllers/projects.controller.ts @@ -100,66 +100,3 @@ export class ProjectsController { return project; } } - -/* -// // Project CRUD - - - -export async function projectCost(req, res) { - let cost = 0; - const project = await Project.getWithInfo(req.params.projectId); - - for (const base of project.bases) { - const sqlClient = await NcConnectionMgrv2.getSqlClient(base); - const userCount = await ProjectUser.getUsersCount(req.query); - const recordCount = (await sqlClient.totalRecords())?.data.TotalRecords; - - if (recordCount > 100000) { - // 36,000 or $79/user/month - cost = Math.max(36000, 948 * userCount); - } else if (recordCount > 50000) { - // $36,000 or $50/user/month - cost = Math.max(36000, 600 * userCount); - } else if (recordCount > 10000) { - // $240/user/yr - cost = Math.min(240 * userCount, 36000); - } else if (recordCount > 1000) { - // $120/user/yr - cost = Math.min(120 * userCount, 36000); - } - } - - T.event({ - event: 'a:project:cost', - data: { - cost, - }, - }); - - res.json({ cost }); -} - -export async function hasEmptyOrNullFilters(req, res) { - res.json(await Filter.hasEmptyOrNullFilters(req.params.projectId)); -} - -export default (router) => { - - - router.get( - '/api/v1/db/meta/projects/:projectId/cost', - metaApiMetrics, - ncMetaAclMw(projectCost, 'projectCost') - ); - - - - router.get( - '/api/v1/db/meta/projects/:projectId/has-empty-or-null-filters', - metaApiMetrics, - ncMetaAclMw(hasEmptyOrNullFilters, 'hasEmptyOrNullFilters') - ); -}; - -* */ From 07ab34e650f3c0b8beb9f7852fdd356b7f6eb54c Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Wed, 31 May 2023 16:27:53 +0800 Subject: [PATCH 6/6] fix(nc-gui): add missing isUIAllowed --- packages/nc-gui/pages/index/index/index.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/nc-gui/pages/index/index/index.vue b/packages/nc-gui/pages/index/index/index.vue index 486786b72b..8aeedb8bc6 100644 --- a/packages/nc-gui/pages/index/index/index.vue +++ b/packages/nc-gui/pages/index/index/index.vue @@ -308,6 +308,7 @@ const copyProjectMeta = async () => {
{ - +