Browse Source

refactor: uniform error message

pull/7025/head
Pranav C 10 months ago
parent
commit
733f7c709d
  1. 4
      packages/nocodb/src/db/BaseModelSqlv2.ts
  2. 2
      packages/nocodb/src/db/conditionV2.ts
  3. 2
      packages/nocodb/src/db/generateLookupSelectQuery.ts
  4. 2
      packages/nocodb/src/db/sortV2.ts
  5. 2
      packages/nocodb/src/helpers/catchError.ts
  6. 2
      packages/nocodb/src/helpers/getAst.ts

4
packages/nocodb/src/db/BaseModelSqlv2.ts

@ -5195,7 +5195,7 @@ export function extractSortsObject(
if (throwErrorIfInvalid && !sort.fk_column_id) if (throwErrorIfInvalid && !sort.fk_column_id)
NcError.unprocessableEntity( NcError.unprocessableEntity(
`Invalid column '${s.replace(/^[+-]/, '')}' in sort`, `Invalid field '${s.replace(/^[+-]/, '')}' in sort`,
); );
return new Sort(sort); return new Sort(sort);
@ -5360,7 +5360,7 @@ export function extractCondition(
validateFilterComparison(aliasColObjMap[alias].uidt, op, sub_op); validateFilterComparison(aliasColObjMap[alias].uidt, op, sub_op);
} else if (throwErrorIfInvalid) { } else if (throwErrorIfInvalid) {
NcError.unprocessableEntity(`Column '${alias}' not found.`); NcError.unprocessableEntity(`Invalid field '${alias}' in Query`);
} }
return new Filter({ return new Filter({

2
packages/nocodb/src/db/conditionV2.ts

@ -156,7 +156,7 @@ const parseConditionV2 = async (
if (!column) { if (!column) {
if (throwErrorIfInvalid) { if (throwErrorIfInvalid) {
NcError.unprocessableEntity( NcError.unprocessableEntity(
`Invalid column id '${filter.fk_column_id}' in filter`, `Invalid field ID '${filter.fk_column_id}' in Query`,
); );
} }
return; return;

2
packages/nocodb/src/db/generateLookupSelectQuery.ts

@ -54,7 +54,7 @@ export default async function generateLookupSelectQuery({
if (column.uidt === UITypes.Lookup) { if (column.uidt === UITypes.Lookup) {
lookupColOpt = await column.getColOptions<LookupColumn>(); lookupColOpt = await column.getColOptions<LookupColumn>();
} else if (column.uidt !== UITypes.LinkToAnotherRecord) { } else if (column.uidt !== UITypes.LinkToAnotherRecord) {
NcError.badRequest('Invalid column type'); NcError.badRequest('Invalid field type');
} }
await column.getColOptions<LookupColumn>(); await column.getColOptions<LookupColumn>();

2
packages/nocodb/src/db/sortV2.ts

@ -37,7 +37,7 @@ export default async function sortV2(
if (!column) { if (!column) {
if (throwErrorIfInvalid) { if (throwErrorIfInvalid) {
NcError.unprocessableEntity( NcError.unprocessableEntity(
`Invalid column id '${sort.fk_column_id}' in sort`, `Invalid field ID '${sort.fk_column_id}' in Query`,
); );
} }
continue; continue;

2
packages/nocodb/src/helpers/catchError.ts

@ -324,7 +324,7 @@ export function extractDBError(error): {
/ Invalid object name '(\w+)'./i, / Invalid object name '(\w+)'./i,
); );
const extractMissingColMatch = error.message.match( const extractMissingColMatch = error.message.match(
/ Invalid column name '(\w+)'./i, / Invalid field '(\w+)'./i,
); );
if (extractTableNameMatch && extractTableNameMatch[1]) { if (extractTableNameMatch && extractTableNameMatch[1]) {

2
packages/nocodb/src/helpers/getAst.ts

@ -74,7 +74,7 @@ const getAst = async ({
); );
if (invalidFields.length) { if (invalidFields.length) {
NcError.unprocessableEntity( NcError.unprocessableEntity(
`Following fields are invalid: ${invalidFields.join(', ')}`, `Invalid field '${invalidFields[0]}' in Query`,
); );
} }
} }

Loading…
Cancel
Save