From f7be2c6597d9f23be72e630467405ee2691357f3 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Thu, 4 Jan 2024 13:19:25 +0000 Subject: [PATCH] fix: block deletion of system column --- packages/nocodb/src/services/columns.service.ts | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/nocodb/src/services/columns.service.ts b/packages/nocodb/src/services/columns.service.ts index ec3d3cee89..6c140b8835 100644 --- a/packages/nocodb/src/services/columns.service.ts +++ b/packages/nocodb/src/services/columns.service.ts @@ -2031,6 +2031,15 @@ export class ColumnsService { const reuse = param.reuse || {}; const column = await Column.get({ colId: param.columnId }, ncMeta); + + if (column.system) { + NcError.badRequest( + `The column '${ + column.title || column.column_name + }' is a system column and cannot be deleted.`, + ); + } + const table = await reuseOrSave('table', reuse, async () => Model.getWithInfo( { @@ -2216,11 +2225,6 @@ export class ColumnsService { case UITypes.CreatedTime: case UITypes.LastModifiedTime: { - if (column.system) { - NcError.badRequest( - `The column '${column.column_name}' is a system column and cannot be deleted.`, - ); - } await Column.delete(param.columnId, ncMeta); } break;