From 733f7c709d949906cdb7ec9c83bf26fc15484609 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 18 Nov 2023 12:10:33 +0530
Subject: [PATCH] refactor: uniform error message

---
 packages/nocodb/src/db/BaseModelSqlv2.ts            | 4 ++--
 packages/nocodb/src/db/conditionV2.ts               | 2 +-
 packages/nocodb/src/db/generateLookupSelectQuery.ts | 2 +-
 packages/nocodb/src/db/sortV2.ts                    | 2 +-
 packages/nocodb/src/helpers/catchError.ts           | 2 +-
 packages/nocodb/src/helpers/getAst.ts               | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/nocodb/src/db/BaseModelSqlv2.ts b/packages/nocodb/src/db/BaseModelSqlv2.ts
index 97b0de29dc..90a83914f1 100644
--- a/packages/nocodb/src/db/BaseModelSqlv2.ts
+++ b/packages/nocodb/src/db/BaseModelSqlv2.ts
@@ -5195,7 +5195,7 @@ export function extractSortsObject(
 
     if (throwErrorIfInvalid && !sort.fk_column_id)
       NcError.unprocessableEntity(
-        `Invalid column '${s.replace(/^[+-]/, '')}' in sort`,
+        `Invalid field '${s.replace(/^[+-]/, '')}' in sort`,
       );
 
     return new Sort(sort);
@@ -5360,7 +5360,7 @@ export function extractCondition(
 
       validateFilterComparison(aliasColObjMap[alias].uidt, op, sub_op);
     } else if (throwErrorIfInvalid) {
-      NcError.unprocessableEntity(`Column '${alias}' not found.`);
+      NcError.unprocessableEntity(`Invalid field '${alias}' in Query`);
     }
 
     return new Filter({
diff --git a/packages/nocodb/src/db/conditionV2.ts b/packages/nocodb/src/db/conditionV2.ts
index 2cee6d72c6..fa6104cdc8 100644
--- a/packages/nocodb/src/db/conditionV2.ts
+++ b/packages/nocodb/src/db/conditionV2.ts
@@ -156,7 +156,7 @@ const parseConditionV2 = async (
     if (!column) {
       if (throwErrorIfInvalid) {
         NcError.unprocessableEntity(
-          `Invalid column id '${filter.fk_column_id}' in filter`,
+          `Invalid field ID '${filter.fk_column_id}' in Query`,
         );
       }
       return;
diff --git a/packages/nocodb/src/db/generateLookupSelectQuery.ts b/packages/nocodb/src/db/generateLookupSelectQuery.ts
index 09187d1fdc..758b5894db 100644
--- a/packages/nocodb/src/db/generateLookupSelectQuery.ts
+++ b/packages/nocodb/src/db/generateLookupSelectQuery.ts
@@ -54,7 +54,7 @@ export default async function generateLookupSelectQuery({
     if (column.uidt === UITypes.Lookup) {
       lookupColOpt = await column.getColOptions<LookupColumn>();
     } else if (column.uidt !== UITypes.LinkToAnotherRecord) {
-      NcError.badRequest('Invalid column type');
+      NcError.badRequest('Invalid field type');
     }
 
     await column.getColOptions<LookupColumn>();
diff --git a/packages/nocodb/src/db/sortV2.ts b/packages/nocodb/src/db/sortV2.ts
index 05f36dde69..949b9799e6 100644
--- a/packages/nocodb/src/db/sortV2.ts
+++ b/packages/nocodb/src/db/sortV2.ts
@@ -37,7 +37,7 @@ export default async function sortV2(
     if (!column) {
       if (throwErrorIfInvalid) {
         NcError.unprocessableEntity(
-          `Invalid column id '${sort.fk_column_id}' in sort`,
+          `Invalid field ID '${sort.fk_column_id}' in Query`,
         );
       }
       continue;
diff --git a/packages/nocodb/src/helpers/catchError.ts b/packages/nocodb/src/helpers/catchError.ts
index 0cb8109447..0d4e4060d7 100644
--- a/packages/nocodb/src/helpers/catchError.ts
+++ b/packages/nocodb/src/helpers/catchError.ts
@@ -324,7 +324,7 @@ export function extractDBError(error): {
           / Invalid object name '(\w+)'./i,
         );
         const extractMissingColMatch = error.message.match(
-          / Invalid column name '(\w+)'./i,
+          / Invalid field '(\w+)'./i,
         );
 
         if (extractTableNameMatch && extractTableNameMatch[1]) {
diff --git a/packages/nocodb/src/helpers/getAst.ts b/packages/nocodb/src/helpers/getAst.ts
index 95eb299177..bbe05d0d9c 100644
--- a/packages/nocodb/src/helpers/getAst.ts
+++ b/packages/nocodb/src/helpers/getAst.ts
@@ -74,7 +74,7 @@ const getAst = async ({
       );
       if (invalidFields.length) {
         NcError.unprocessableEntity(
-          `Following fields are invalid: ${invalidFields.join(', ')}`,
+          `Invalid field '${invalidFields[0]}' in Query`,
         );
       }
     }