diff --git a/.run/Run NocoDB Sqlite.run.xml b/.run/Run NocoDB Sqlite.run.xml
index 19996f59ba..e7b120a2af 100644
--- a/.run/Run NocoDB Sqlite.run.xml
+++ b/.run/Run NocoDB Sqlite.run.xml
@@ -12,4 +12,4 @@
-
\ No newline at end of file
+
diff --git a/packages/nc-gui/components/dashboard/settings/data-sources/CreateBase.vue b/packages/nc-gui/components/dashboard/settings/data-sources/CreateBase.vue
index bb4f6d56d8..296f0bced1 100644
--- a/packages/nc-gui/components/dashboard/settings/data-sources/CreateBase.vue
+++ b/packages/nc-gui/components/dashboard/settings/data-sources/CreateBase.vue
@@ -495,7 +495,7 @@ watch(
-
+
{{ $t('activity.useConnectionUrl') }}
@@ -611,7 +611,7 @@ watch(
-
+
{{ $t('activity.testDbConn') }}
diff --git a/packages/nc-gui/lang/fr.json b/packages/nc-gui/lang/fr.json
index 28d5266003..402c97bd4f 100644
--- a/packages/nc-gui/lang/fr.json
+++ b/packages/nc-gui/lang/fr.json
@@ -260,7 +260,7 @@
"barcodeFormat": "Format du code-barres",
"qrCodeValueTooLong": "Trop de caractères pour un code QR",
"barcodeValueTooLong": "Trop de caractères pour un code-barres",
- "currentLocation": "Current Location",
+ "currentLocation": "Emplacement actuel",
"lng": "Lng",
"lat": "Lat",
"aggregateFunction": "Fonction agrégée",
@@ -385,12 +385,12 @@
"nextRecord": "Ligne suivante",
"previousRecord": "Ligne précédente",
"copyApiURL": "Copier l'URL de l'API",
- "createTable": "Create New Table",
+ "createTable": "Créer une nouvelle table",
"refreshTable": "Actualiser le tableau",
- "renameTable": "Rename Table",
- "deleteTable": "Delete Table",
+ "renameTable": "Renommer la table",
+ "deleteTable": "Supprimer la table",
"addField": "Ajouter un nouveau champ à ce tableau",
- "setDisplay": "Set as Display value",
+ "setDisplay": "Définir comme valeur d'affichage",
"addRow": "Ajouter une nouvelle ligne",
"saveRow": "Enregistrer la ligne",
"saveAndExit": "Enregistrer et quitter",
diff --git a/packages/nc-gui/package-lock.json b/packages/nc-gui/package-lock.json
index da2ac9d801..4a50a2051b 100644
--- a/packages/nc-gui/package-lock.json
+++ b/packages/nc-gui/package-lock.json
@@ -30,7 +30,7 @@
"leaflet.markercluster": "^1.5.3",
"locale-codes": "^1.3.1",
"monaco-editor": "^0.33.0",
- "nocodb-sdk": "0.107.4",
+ "nocodb-sdk": "file:../nocodb-sdk",
"papaparse": "^5.3.2",
"pinia": "^2.0.33",
"qrcode": "^1.5.1",
@@ -111,7 +111,6 @@
},
"../nocodb-sdk": {
"version": "0.107.4",
- "extraneous": true,
"license": "AGPL-3.0-or-later",
"dependencies": {
"axios": "^0.21.1",
@@ -8776,6 +8775,7 @@
"version": "1.15.1",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz",
"integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==",
+ "devOptional": true,
"funding": [
{
"type": "individual",
@@ -12294,21 +12294,8 @@
}
},
"node_modules/nocodb-sdk": {
- "version": "0.107.4",
- "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.107.4.tgz",
- "integrity": "sha512-9fmUMTmsyY6T5ahqidwGpG5aoDnmrheLYYAAZug5CctEsdCCYv0RoIag/0AB7PAkAqrA3pvjnmFTtCbPoRF1vQ==",
- "dependencies": {
- "axios": "^0.21.1",
- "jsep": "^1.3.6"
- }
- },
- "node_modules/nocodb-sdk/node_modules/axios": {
- "version": "0.21.4",
- "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
- "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
- "dependencies": {
- "follow-redirects": "^1.14.0"
- }
+ "resolved": "../nocodb-sdk",
+ "link": true
},
"node_modules/node-abi": {
"version": "3.23.0",
@@ -24810,7 +24797,8 @@
"follow-redirects": {
"version": "1.15.1",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz",
- "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA=="
+ "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==",
+ "devOptional": true
},
"form-data": {
"version": "4.0.0",
@@ -27360,22 +27348,22 @@
}
},
"nocodb-sdk": {
- "version": "0.107.4",
- "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.107.4.tgz",
- "integrity": "sha512-9fmUMTmsyY6T5ahqidwGpG5aoDnmrheLYYAAZug5CctEsdCCYv0RoIag/0AB7PAkAqrA3pvjnmFTtCbPoRF1vQ==",
+ "version": "file:../nocodb-sdk",
"requires": {
+ "@typescript-eslint/eslint-plugin": "^4.0.1",
+ "@typescript-eslint/parser": "^4.0.1",
"axios": "^0.21.1",
- "jsep": "^1.3.6"
- },
- "dependencies": {
- "axios": {
- "version": "0.21.4",
- "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
- "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
- "requires": {
- "follow-redirects": "^1.14.0"
- }
- }
+ "cspell": "^4.1.0",
+ "eslint": "^7.8.0",
+ "eslint-config-prettier": "^6.11.0",
+ "eslint-plugin-eslint-comments": "^3.2.0",
+ "eslint-plugin-functional": "^3.0.2",
+ "eslint-plugin-import": "^2.22.0",
+ "eslint-plugin-prettier": "^4.0.0",
+ "jsep": "^1.3.6",
+ "npm-run-all": "^4.1.5",
+ "prettier": "^2.1.1",
+ "typescript": "^4.0.2"
}
},
"node-abi": {
diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json
index e13fb76ecb..847017b499 100644
--- a/packages/nc-gui/package.json
+++ b/packages/nc-gui/package.json
@@ -54,7 +54,7 @@
"leaflet.markercluster": "^1.5.3",
"locale-codes": "^1.3.1",
"monaco-editor": "^0.33.0",
- "nocodb-sdk": "0.107.4",
+ "nocodb-sdk": "file:../nocodb-sdk",
"papaparse": "^5.3.2",
"pinia": "^2.0.33",
"qrcode": "^1.5.1",
diff --git a/packages/nocodb-sdk/package-lock.json b/packages/nocodb-sdk/package-lock.json
index 84bdda167b..bc7fc27f3c 100644
--- a/packages/nocodb-sdk/package-lock.json
+++ b/packages/nocodb-sdk/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "nocodb-sdk",
- "version": "0.107.3",
+ "version": "0.107.4",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "nocodb-sdk",
- "version": "0.107.3",
+ "version": "0.107.4",
"license": "AGPL-3.0-or-later",
"dependencies": {
"axios": "^0.21.1",
diff --git a/packages/nocodb-sdk/src/lib/Api.ts b/packages/nocodb-sdk/src/lib/Api.ts
index 3d0a0e92f3..8903a6d481 100644
--- a/packages/nocodb-sdk/src/lib/Api.ts
+++ b/packages/nocodb-sdk/src/lib/Api.ts
@@ -1603,7 +1603,7 @@ export interface NormalColumnRequestType {
/** Data Type Extra */
dtx?: StringOrNullType;
/** Data Type Extra Precision */
- dtxp?: StringOrNullType | number;
+ dtxp?: string | number | null;
/** Data Type Extra Scale */
dtxs?: StringOrNullType | number;
/** Numeric Precision */
diff --git a/packages/nocodb/package-lock.json b/packages/nocodb/package-lock.json
index b3a9c1c156..6095a65621 100644
--- a/packages/nocodb/package-lock.json
+++ b/packages/nocodb/package-lock.json
@@ -83,7 +83,7 @@
"nc-lib-gui": "0.107.4",
"nc-plugin": "^0.1.3",
"ncp": "^2.0.0",
- "nocodb-sdk": "0.107.4",
+ "nocodb-sdk": "file:../nocodb-sdk",
"nodemailer": "^6.4.10",
"object-hash": "^3.0.0",
"os-locale": "^6.0.2",
@@ -191,7 +191,6 @@
},
"../nocodb-sdk": {
"version": "0.107.4",
- "extraneous": true,
"license": "AGPL-3.0-or-later",
"dependencies": {
"axios": "^0.21.1",
@@ -13207,13 +13206,8 @@
}
},
"node_modules/nocodb-sdk": {
- "version": "0.107.4",
- "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.107.4.tgz",
- "integrity": "sha512-9fmUMTmsyY6T5ahqidwGpG5aoDnmrheLYYAAZug5CctEsdCCYv0RoIag/0AB7PAkAqrA3pvjnmFTtCbPoRF1vQ==",
- "dependencies": {
- "axios": "^0.21.1",
- "jsep": "^1.3.6"
- }
+ "resolved": "../nocodb-sdk",
+ "link": true
},
"node_modules/node-abort-controller": {
"version": "3.1.1",
@@ -28485,12 +28479,22 @@
"integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg=="
},
"nocodb-sdk": {
- "version": "0.107.4",
- "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.107.4.tgz",
- "integrity": "sha512-9fmUMTmsyY6T5ahqidwGpG5aoDnmrheLYYAAZug5CctEsdCCYv0RoIag/0AB7PAkAqrA3pvjnmFTtCbPoRF1vQ==",
+ "version": "file:../nocodb-sdk",
"requires": {
+ "@typescript-eslint/eslint-plugin": "^4.0.1",
+ "@typescript-eslint/parser": "^4.0.1",
"axios": "^0.21.1",
- "jsep": "^1.3.6"
+ "cspell": "^4.1.0",
+ "eslint": "^7.8.0",
+ "eslint-config-prettier": "^6.11.0",
+ "eslint-plugin-eslint-comments": "^3.2.0",
+ "eslint-plugin-functional": "^3.0.2",
+ "eslint-plugin-import": "^2.22.0",
+ "eslint-plugin-prettier": "^4.0.0",
+ "jsep": "^1.3.6",
+ "npm-run-all": "^4.1.5",
+ "prettier": "^2.1.1",
+ "typescript": "^4.0.2"
}
},
"node-abort-controller": {
diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json
index c44b621b64..1b8701a2e6 100644
--- a/packages/nocodb/package.json
+++ b/packages/nocodb/package.json
@@ -116,7 +116,7 @@
"nc-lib-gui": "0.107.4",
"nc-plugin": "^0.1.3",
"ncp": "^2.0.0",
- "nocodb-sdk": "0.107.4",
+ "nocodb-sdk": "file:../nocodb-sdk",
"nodemailer": "^6.4.10",
"object-hash": "^3.0.0",
"os-locale": "^6.0.2",
@@ -203,4 +203,4 @@
"coverageDirectory": "../coverage",
"testEnvironment": "node"
}
-}
\ No newline at end of file
+}
diff --git a/packages/nocodb/src/Noco.ts b/packages/nocodb/src/Noco.ts
index 1b93161bb7..048901ac47 100644
--- a/packages/nocodb/src/Noco.ts
+++ b/packages/nocodb/src/Noco.ts
@@ -1,6 +1,6 @@
+import path from 'path';
import Sentry, { Handlers } from '@sentry/node';
import { Logger } from '@nestjs/common';
-import path from 'path';
import { NestFactory } from '@nestjs/core';
import clear from 'clear';
import * as express from 'express';
diff --git a/packages/nocodb/src/db/BaseModelSqlv2.ts b/packages/nocodb/src/db/BaseModelSqlv2.ts
index f7ddc9db94..d5f1f95852 100644
--- a/packages/nocodb/src/db/BaseModelSqlv2.ts
+++ b/packages/nocodb/src/db/BaseModelSqlv2.ts
@@ -130,10 +130,24 @@ class BaseModelSqlv2 {
autoBind(this);
}
- public async readByPk(id?: any, validateFormula = false): Promise {
+ public async readByPk(
+ id?: any,
+ validateFormula = false,
+ query: any = {},
+ ): Promise {
const qb = this.dbDriver(this.tnPath);
- await this.selectObject({ qb, validateFormula });
+ const { ast, dependencyFields } = await getAst({
+ query,
+ model: this.model,
+ view: this.viewId && (await View.get(this.viewId)),
+ });
+
+ await this.selectObject({
+ ...(dependencyFields ?? {}),
+ qb,
+ validateFormula,
+ });
qb.where(_wherePk(this.model.primaryKeys, id));
@@ -153,14 +167,7 @@ class BaseModelSqlv2 {
data.__proto__ = proto;
}
- // retrieve virtual column data as well
- const project = await Project.get(this.model.project_id);
- const { model, view } = await getViewAndModelByAliasOrId({
- projectName: project.title,
- tableName: this.model.title,
- });
- const { ast } = await getAst({ model, view });
- return data ? await nocoExecute(ast, data, {}) : {};
+ return data ? await nocoExecute(ast, data, {}, query) : {};
}
public async exist(id?: any): Promise {
@@ -190,7 +197,7 @@ class BaseModelSqlv2 {
): Promise {
const { where, ...rest } = this._getListArgs(args as any);
const qb = this.dbDriver(this.tnPath);
- await this.selectObject({ qb, validateFormula });
+ await this.selectObject({ ...args, qb, validateFormula });
const aliasColObjMap = await this.model.getAliasColObjMap();
const sorts = extractSortsObject(rest?.sort, aliasColObjMap);
@@ -2091,6 +2098,7 @@ class BaseModelSqlv2 {
raw?: boolean;
} = {},
) {
+ let trx;
try {
// TODO: ag column handling for raw bulk insert
const insertDatas = raw
@@ -2115,7 +2123,7 @@ class BaseModelSqlv2 {
// refer : https://www.sqlite.org/limits.html
const chunkSize = this.isSqlite ? 10 : _chunkSize;
- const trx = await this.dbDriver.transaction();
+ trx = await this.dbDriver.transaction();
if (!foreign_key_checks) {
if (this.isPg) {
@@ -2146,6 +2154,7 @@ class BaseModelSqlv2 {
return response;
} catch (e) {
+ await trx?.rollback();
// await this.errorInsertb(e, data, null);
throw e;
}
diff --git a/packages/nocodb/src/schema/swagger.json b/packages/nocodb/src/schema/swagger.json
index 2912be1cb4..690c3ce3bb 100644
--- a/packages/nocodb/src/schema/swagger.json
+++ b/packages/nocodb/src/schema/swagger.json
@@ -17834,10 +17834,13 @@
"dtxp": {
"oneOf": [
{
- "$ref": "#/components/schemas/StringOrNull"
+ "type": "string"
},
{
"type": "number"
+ },
+ {
+ "type": "null"
}
],
"description": "Data Type Extra Precision"
diff --git a/packages/nocodb/src/services/app-init.service.ts b/packages/nocodb/src/services/app-init.service.ts
index c913fcaefb..e1050d480c 100644
--- a/packages/nocodb/src/services/app-init.service.ts
+++ b/packages/nocodb/src/services/app-init.service.ts
@@ -4,7 +4,7 @@ import { Connection } from '../connection/connection';
import initAdminFromEnv from '../helpers/initAdminFromEnv';
import NcPluginMgrv2 from '../helpers/NcPluginMgrv2';
import { MetaService } from '../meta/meta.service';
-import { User } from '../models'
+import { User } from '../models';
import Noco from '../Noco';
import getInstance from '../utils/getInstance';
import NcConfigFactory from '../utils/NcConfigFactory';
diff --git a/packages/nocodb/src/services/datas.service.ts b/packages/nocodb/src/services/datas.service.ts
index 1e1aa78d24..c41609f6c0 100644
--- a/packages/nocodb/src/services/datas.service.ts
+++ b/packages/nocodb/src/services/datas.service.ts
@@ -185,8 +185,8 @@ export class DatasService {
view,
});
- const data = await baseModel.findOne({ ...args, dependencyFields });
- return data ? await nocoExecute(ast, data, {}, {}) : {};
+ const data = await baseModel.findOne({ ...args, ...dependencyFields });
+ return data ? await nocoExecute(ast, data, {}, dependencyFields) : {};
}
async getDataGroupBy(param: { model: Model; view: View; query?: any }) {
@@ -221,15 +221,13 @@ export class DatasService {
dbDriver: await NcConnectionMgrv2.get(base),
});
- const row = await baseModel.readByPk(param.rowId);
+ const row = await baseModel.readByPk(param.rowId, false, param.query);
if (!row) {
NcError.notFound('Row not found');
}
- const { ast } = await getAst({ model, query: param.query, view });
-
- return await nocoExecute(ast, row, {}, param.query);
+ return row;
}
async dataExist(param: PathParams & { rowId: string; query: any }) {
@@ -274,9 +272,9 @@ export class DatasService {
dbDriver: await NcConnectionMgrv2.get(base),
});
- const { ast } = await getAst({ model, query, view });
+ const { ast, dependencyFields } = await getAst({ model, query, view });
- const listArgs: any = { ...query };
+ const listArgs: any = { ...dependencyFields };
try {
listArgs.filterArr = JSON.parse(listArgs.filterArrJson);
} catch (e) {}
@@ -637,13 +635,16 @@ export class DatasService {
dbDriver: await NcConnectionMgrv2.get(base),
});
- const { ast } = await getAst({ model, query: param.query });
+ const { ast, dependencyFields } = await getAst({
+ model,
+ query: param.query,
+ });
return await nocoExecute(
ast,
- await baseModel.readByPk(param.rowId),
- {},
+ await baseModel.readByPk(param.rowId, false),
{},
+ dependencyFields,
);
} catch (e) {
console.log(e);
diff --git a/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts b/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts
index 689bf1fbc7..947c58bfba 100644
--- a/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts
+++ b/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts
@@ -1,8 +1,9 @@
import 'mocha';
+import request from 'supertest';
+import { UITypes } from 'nocodb-sdk';
+import { expect } from 'chai';
import init from '../../init';
import { createProject, createSakilaProject } from '../../factory/project';
-import request from 'supertest';
-import { ColumnType, UITypes } from 'nocodb-sdk';
import {
createColumn,
createLookupColumn,
@@ -11,18 +12,18 @@ import {
} from '../../factory/column';
import { createTable, getTable } from '../../factory/table';
import {
+ createBulkRows,
createChildRow,
createRow,
generateDefaultRowAttributes,
getOneRow,
getRow,
listRow,
- createBulkRows,
} from '../../factory/row';
import { isMysql, isPg, isSqlite } from '../../init/db';
-import Model from '../../../../src/models/Model';
-import Project from '../../../../src/models/Project';
-import { expect } from 'chai';
+import type { ColumnType } from 'nocodb-sdk';
+import type Model from '../../../../src/models/Model';
+import type Project from '../../../../src/models/Project';
const isColumnsCorrectInResponse = (row, columns: ColumnType[]) => {
const responseColumnsListStr = Object.keys(row).sort().join(',');
@@ -160,7 +161,7 @@ function tableTest() {
it('Get desc sorted table data list with required columns', async function () {
const firstNameColumn = customerColumns.find(
- (col) => col.title === 'FirstName'
+ (col) => col.title === 'FirstName',
);
const visibleColumns = [firstNameColumn];
const sortInfo = [{ fk_column_id: firstNameColumn.id, direction: 'desc' }];
@@ -214,7 +215,7 @@ function tableTest() {
it('Get asc sorted table data list with required columns', async function () {
const firstNameColumn = customerColumns.find(
- (col) => col.title === 'FirstName'
+ (col) => col.title === 'FirstName',
);
const visibleColumns = [firstNameColumn];
const sortInfo = [{ fk_column_id: firstNameColumn.id, direction: 'asc' }];
@@ -427,7 +428,7 @@ function tableTest() {
});
const paymentListColumn = (await rentalTable.getColumns()).find(
- (c) => c.title === 'Payment List'
+ (c) => c.title === 'Payment List',
);
const nestedFilter = {
@@ -513,11 +514,11 @@ function tableTest() {
});
const paymentListColumn = (await rentalTable.getColumns()).find(
- (c) => c.title === 'Payment List'
+ (c) => c.title === 'Payment List',
);
const returnDateColumn = (await rentalTable.getColumns()).find(
- (c) => c.title === 'ReturnDate'
+ (c) => c.title === 'ReturnDate',
);
const nestedFilter = {
@@ -630,15 +631,15 @@ function tableTest() {
});
const paymentListColumn = (await customerTable.getColumns()).find(
- (c) => c.title === 'Payment List'
+ (c) => c.title === 'Payment List',
);
const activeColumn = (await customerTable.getColumns()).find(
- (c) => c.title === 'Active'
+ (c) => c.title === 'Active',
);
const addressColumn = (await customerTable.getColumns()).find(
- (c) => c.title === 'Address'
+ (c) => c.title === 'Address',
);
const nestedFilter = [
@@ -786,11 +787,11 @@ function tableTest() {
});
const paymentListColumn = (await customerTable.getColumns()).find(
- (c) => c.title === 'Payment List'
+ (c) => c.title === 'Payment List',
);
const activeColumn = (await customerTable.getColumns()).find(
- (c) => c.title === 'Active'
+ (c) => c.title === 'Active',
);
const nestedFields = {
@@ -866,7 +867,7 @@ function tableTest() {
}
const nestedRentalResponse = Object.keys(
- ascResponse.body.list[0]['Rental List']
+ ascResponse.body.list[0]['Rental List'],
);
if (
nestedRentalResponse.includes('ReturnDate') &&
@@ -914,7 +915,7 @@ function tableTest() {
if (
(response.body.list as Array).every(
(row) =>
- parseInt(row['Formula']) !== parseInt(row[rollupColumnTitle]) + 10
+ parseInt(row['Formula']) !== parseInt(row[rollupColumnTitle]) + 10,
)
) {
throw new Error('Wrong formula');
@@ -998,13 +999,13 @@ function tableTest() {
it('Find one sorted table data list with required columns', async function () {
const firstNameColumn = customerColumns.find(
- (col) => col.title === 'FirstName'
+ (col) => col.title === 'FirstName',
);
const visibleColumns = [firstNameColumn];
let response = await request(context.app)
.get(
- `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/find-one`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/find-one`,
)
.set('xc-auth', context.token)
.query({
@@ -1025,7 +1026,7 @@ function tableTest() {
response = await request(context.app)
.get(
- `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/find-one`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/find-one`,
)
.set('xc-auth', context.token)
.query({
@@ -1047,7 +1048,7 @@ function tableTest() {
it('Find one desc sorted and with rollup table data list with required columns', async function () {
const firstNameColumn = customerColumns.find(
- (col) => col.title === 'FirstName'
+ (col) => col.title === 'FirstName',
);
const rollupColumn = await createRollupColumn(context, {
@@ -1064,7 +1065,7 @@ function tableTest() {
const response = await request(context.app)
.get(
- `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/find-one`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/find-one`,
)
.set('xc-auth', context.token)
.query({
@@ -1095,15 +1096,17 @@ function tableTest() {
});
const paymentListColumn = (await customerTable.getColumns()).find(
- (c) => c.title === 'Payment List'
+ (c) => c.title === 'Payment List',
);
const activeColumn = (await customerTable.getColumns()).find(
- (c) => c.title === 'Active'
+ (c) => c.title === 'Active',
);
const nestedFields = {
- 'Rental List': ['RentalDate', 'ReturnDate'],
+ 'Rental List': {
+ f: 'RentalDate,ReturnDate',
+ },
};
const nestedFilter = [
@@ -1152,7 +1155,7 @@ function tableTest() {
const ascResponse = await request(context.app)
.get(
- `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/find-one`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/find-one`,
)
.set('xc-auth', context.token)
.query({
@@ -1179,7 +1182,7 @@ function tableTest() {
it('Groupby desc sorted and with rollup table data list with required columns', async function () {
const firstNameColumn = customerColumns.find(
- (col) => col.title === 'FirstName'
+ (col) => col.title === 'FirstName',
);
const rollupColumn = await createRollupColumn(context, {
@@ -1196,7 +1199,7 @@ function tableTest() {
const response = await request(context.app)
.get(
- `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/groupby`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/groupby`,
)
.set('xc-auth', context.token)
.query({
@@ -1215,7 +1218,7 @@ function tableTest() {
it('Groupby desc sorted and with rollup table data list with required columns', async function () {
const firstNameColumn = customerColumns.find(
- (col) => col.title === 'FirstName'
+ (col) => col.title === 'FirstName',
);
const rollupColumn = await createRollupColumn(context, {
@@ -1232,7 +1235,7 @@ function tableTest() {
const response = await request(context.app)
.get(
- `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/groupby`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/groupby`,
)
.set('xc-auth', context.token)
.query({
@@ -1260,7 +1263,7 @@ function tableTest() {
const readResponse = await request(context.app)
.get(
- `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/${row['CustomerId']}`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/${row['CustomerId']}`,
)
.set('xc-auth', context.token)
.expect(200);
@@ -1273,6 +1276,39 @@ function tableTest() {
}
});
+ it('Read table row with nested fields', async () => {
+ const rowId = 1;
+ const actorTable = await getTable({
+ project: sakilaProject,
+ name: 'actor',
+ });
+ const response = await request(context.app)
+ .get(
+ `/api/v1/db/data/noco/${sakilaProject.id}/${actorTable.id}/${rowId}/`,
+ )
+ .set('xc-auth', context.token)
+ .query({
+ 'nested[Film List][fields]': 'Title,ReleaseYear,Language',
+ })
+ .expect(200);
+
+ const record = response.body;
+ expect(record['Film List']).length(19);
+ expect(record['Film List'][0]).to.have.all.keys(
+ 'Title',
+ 'ReleaseYear',
+ 'Language',
+ );
+
+ // for SQLite Sakila, Language is null
+ if (isPg(context)) {
+ expect(record['Film List'][0]['Language']).to.have.all.keys(
+ 'Name',
+ 'LanguageId',
+ );
+ }
+ });
+
it('Update table row', async function () {
const table = await createTable(context, project);
const row = await createRow(context, { project, table });
@@ -1396,7 +1432,7 @@ function tableTest() {
if (
!(response.body.message[0] as string).includes(
- 'is a LinkToAnotherRecord of'
+ 'is a LinkToAnotherRecord of',
)
) {
throw new Error('Should give ltar foreign key error');
@@ -1411,7 +1447,7 @@ function tableTest() {
const response = await request(context.app)
.get(
- `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/${row['CustomerId']}/exist`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/${row['CustomerId']}/exist`,
)
.set('xc-auth', context.token)
.expect(200);
@@ -1424,7 +1460,7 @@ function tableTest() {
it('Exist should be false table row when it does not exists', async function () {
const response = await request(context.app)
.get(
- `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/998546/exist`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/998546/exist`,
)
.set('xc-auth', context.token)
.expect(200);
@@ -1531,7 +1567,7 @@ function tableTest() {
.patch(`/api/v1/db/data/bulk/noco/${project.id}/${table.id}`)
.set('xc-auth', context.token)
.send(
- rows.map((row) => ({ title: `new-${row['Title']}`, id: row['Id'] }))
+ rows.map((row) => ({ title: `new-${row['Title']}`, id: row['Id'] })),
)
.expect(200);
const updatedRows: Array = await listRow({ project, table });
@@ -1612,7 +1648,7 @@ function tableTest() {
it('Export csv', async () => {
const response = await request(context.app)
.get(
- `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.title}/export/csv`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.title}/export/csv`,
)
.set('xc-auth', context.token)
.expect(200);
@@ -1631,14 +1667,14 @@ function tableTest() {
it('Export excel', async () => {
const response = await request(context.app)
.get(
- `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.title}/export/excel`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.title}/export/excel`,
)
.set('xc-auth', context.token)
.expect(200);
if (
!response['header']['content-disposition'].includes(
- 'Customer-export.xlsx'
+ 'Customer-export.xlsx',
)
) {
throw new Error('Wrong file name');
@@ -1653,11 +1689,11 @@ function tableTest() {
it('Nested row list hm', async () => {
const rowId = 1;
const rentalListColumn = (await customerTable.getColumns()).find(
- (column) => column.title === 'Rental List'
+ (column) => column.title === 'Rental List',
)!;
const response = await request(context.app)
.get(
- `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/${rowId}/hm/${rentalListColumn.id}`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/${rowId}/hm/${rentalListColumn.id}`,
)
.set('xc-auth', context.token)
.expect(200);
@@ -1672,11 +1708,11 @@ function tableTest() {
it('Nested row list hm with limit and offset', async () => {
const rowId = 1;
const rentalListColumn = (await customerTable.getColumns()).find(
- (column) => column.title === 'Rental List'
+ (column) => column.title === 'Rental List',
)!;
const response = await request(context.app)
.get(
- `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/${rowId}/hm/${rentalListColumn.id}`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/${rowId}/hm/${rentalListColumn.id}`,
)
.set('xc-auth', context.token)
.query({
@@ -1698,11 +1734,11 @@ function tableTest() {
it('Row list hm with invalid table id', async () => {
const rowId = 1;
const rentalListColumn = (await customerTable.getColumns()).find(
- (column) => column.title === 'Rental List'
+ (column) => column.title === 'Rental List',
)!;
const response = await request(context.app)
.get(
- `/api/v1/db/data/noco/${sakilaProject.id}/wrong-id/${rowId}/hm/${rentalListColumn.id}`
+ `/api/v1/db/data/noco/${sakilaProject.id}/wrong-id/${rowId}/hm/${rentalListColumn.id}`,
)
.set('xc-auth', context.token)
.expect(404);
@@ -1750,11 +1786,11 @@ function tableTest() {
});
const filmTable = await getTable({ project: sakilaProject, name: 'film' });
const filmListColumn = (await actorTable.getColumns()).find(
- (column) => column.title === 'Film List'
+ (column) => column.title === 'Film List',
)!;
const response = await request(context.app)
.get(
- `/api/v1/db/data/noco/${sakilaProject.id}/${actorTable.id}/${rowId}/mm/${filmListColumn.id}`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${actorTable.id}/${rowId}/mm/${filmListColumn.id}`,
)
.set('xc-auth', context.token)
.expect(200);
@@ -1774,11 +1810,11 @@ function tableTest() {
});
const filmTable = await getTable({ project: sakilaProject, name: 'film' });
const filmListColumn = (await actorTable.getColumns()).find(
- (column) => column.title === 'Film List'
+ (column) => column.title === 'Film List',
)!;
const response = await request(context.app)
.get(
- `/api/v1/db/data/noco/${sakilaProject.id}/${actorTable.id}/${rowId}/mm/${filmListColumn.id}`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${actorTable.id}/${rowId}/mm/${filmListColumn.id}`,
)
.set('xc-auth', context.token)
.query({
@@ -1805,11 +1841,11 @@ function tableTest() {
name: 'actor',
});
const filmListColumn = (await actorTable.getColumns()).find(
- (column) => column.title === 'Film List'
+ (column) => column.title === 'Film List',
)!;
const response = await request(context.app)
.get(
- `/api/v1/db/data/noco/${sakilaProject.id}/invalid-table-id/${rowId}/mm/${filmListColumn.id}`
+ `/api/v1/db/data/noco/${sakilaProject.id}/invalid-table-id/${rowId}/mm/${filmListColumn.id}`,
)
.set('xc-auth', context.token)
.expect(404);
@@ -1823,12 +1859,12 @@ function tableTest() {
it('Create hm relation with invalid table id', async () => {
const rowId = 1;
const rentalListColumn = (await customerTable.getColumns()).find(
- (column) => column.title === 'Rental List'
+ (column) => column.title === 'Rental List',
)!;
const refId = 1;
const response = await request(context.app)
.post(
- `/api/v1/db/data/noco/${sakilaProject.id}/invalid-table-id/${rowId}/hm/${rentalListColumn.id}/${refId}`
+ `/api/v1/db/data/noco/${sakilaProject.id}/invalid-table-id/${rowId}/hm/${rentalListColumn.id}/${refId}`,
)
.set('xc-auth', context.token)
.expect(404);
@@ -1841,12 +1877,12 @@ function tableTest() {
it('Create hm relation with non ltar column', async () => {
const rowId = 1;
const firstNameColumn = (await customerTable.getColumns()).find(
- (column) => column.title === 'FirstName'
+ (column) => column.title === 'FirstName',
)!;
const refId = 1;
const response = await request(context.app)
.post(
- `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/${rowId}/hm/${firstNameColumn.id}/${refId}`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/${rowId}/hm/${firstNameColumn.id}/${refId}`,
)
.set('xc-auth', context.token)
.expect(404);
@@ -1863,7 +1899,7 @@ function tableTest() {
const response = await request(context.app)
.post(
- `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/${rowId}/hm/invalid-column/${refId}`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/${rowId}/hm/invalid-column/${refId}`,
)
.set('xc-auth', context.token)
.expect(404);
@@ -1898,20 +1934,20 @@ function tableTest() {
it('Create list hm', async () => {
const rowId = 1;
const rentalListColumn = (await customerTable.getColumns()).find(
- (column) => column.title === 'Rental List'
+ (column) => column.title === 'Rental List',
)!;
const refId = 1;
const lisResponseBeforeUpdate = await request(context.app)
.get(
- `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/${rowId}/hm/${rentalListColumn.id}`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/${rowId}/hm/${rentalListColumn.id}`,
)
.set('xc-auth', context.token)
.expect(200);
await request(context.app)
.post(
- `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/${rowId}/hm/${rentalListColumn.id}/${refId}`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/${rowId}/hm/${rentalListColumn.id}/${refId}`,
)
.set('xc-auth', context.token)
.expect(200);
@@ -1919,7 +1955,7 @@ function tableTest() {
const lisResponseAfterUpdate = await request(context.app)
.get(
- `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/${rowId}/hm/${rentalListColumn.id}`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/${rowId}/hm/${rentalListColumn.id}`,
)
.set('xc-auth', context.token)
.expect(200);
@@ -1942,7 +1978,7 @@ function tableTest() {
const response = await request(context.app)
.post(
- `/api/v1/db/data/noco/${sakilaProject.id}/${actorTable.id}/${rowId}/mm/invalid-column/${refId}`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${actorTable.id}/${rowId}/mm/invalid-column/${refId}`,
)
.set('xc-auth', context.token)
.expect(404);
@@ -1962,12 +1998,12 @@ function tableTest() {
name: 'actor',
});
const firstNameColumn = (await actorTable.getColumns()).find(
- (column) => column.title === 'FirstName'
+ (column) => column.title === 'FirstName',
)!;
const refId = 1;
const response = await request(context.app)
.post(
- `/api/v1/db/data/noco/${sakilaProject.id}/${actorTable.id}/${rowId}/mm/${firstNameColumn.id}/${refId}`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${actorTable.id}/${rowId}/mm/${firstNameColumn.id}/${refId}`,
)
.set('xc-auth', context.token)
.expect(404);
@@ -1985,13 +2021,13 @@ function tableTest() {
name: 'actor',
});
const filmListColumn = (await actorTable.getColumns()).find(
- (column) => column.title === 'Film List'
+ (column) => column.title === 'Film List',
)!;
const refId = 1;
await request(context.app)
.post(
- `/api/v1/db/data/noco/${sakilaProject.id}/${actorTable.id}/${rowId}/mm/${filmListColumn.id}/${refId}`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${actorTable.id}/${rowId}/mm/${filmListColumn.id}/${refId}`,
)
.set('xc-auth', context.token)
.expect(400);
@@ -2007,20 +2043,20 @@ function tableTest() {
name: 'actor',
});
const filmListColumn = (await actorTable.getColumns()).find(
- (column) => column.title === 'Film List'
+ (column) => column.title === 'Film List',
)!;
const refId = 2;
const lisResponseBeforeUpdate = await request(context.app)
.get(
- `/api/v1/db/data/noco/${sakilaProject.id}/${actorTable.id}/${rowId}/mm/${filmListColumn.id}`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${actorTable.id}/${rowId}/mm/${filmListColumn.id}`,
)
.set('xc-auth', context.token)
.expect(200);
await request(context.app)
.post(
- `/api/v1/db/data/noco/${sakilaProject.id}/${actorTable.id}/${rowId}/mm/${filmListColumn.id}/${refId}`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${actorTable.id}/${rowId}/mm/${filmListColumn.id}/${refId}`,
)
.set('xc-auth', context.token)
.expect(200);
@@ -2028,7 +2064,7 @@ function tableTest() {
const lisResponseAfterUpdate = await request(context.app)
.get(
- `/api/v1/db/data/noco/${sakilaProject.id}/${actorTable.id}/${rowId}/mm/${filmListColumn.id}`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${actorTable.id}/${rowId}/mm/${filmListColumn.id}`,
)
.set('xc-auth', context.token)
.expect(200);
@@ -2044,12 +2080,12 @@ function tableTest() {
it('List hm with non ltar column', async () => {
const rowId = 1;
const firstNameColumn = (await customerTable.getColumns()).find(
- (column) => column.title === 'FirstName'
+ (column) => column.title === 'FirstName',
)!;
await request(context.app)
.get(
- `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/${rowId}/hm/${firstNameColumn.id}`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/${rowId}/hm/${firstNameColumn.id}`,
)
.set('xc-auth', context.token)
.expect(400);
@@ -2058,12 +2094,12 @@ function tableTest() {
it('List mm with non ltar column', async () => {
const rowId = 1;
const firstNameColumn = (await customerTable.getColumns()).find(
- (column) => column.title === 'FirstName'
+ (column) => column.title === 'FirstName',
)!;
await request(context.app)
.get(
- `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/${rowId}/mm/${firstNameColumn.id}`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/${rowId}/mm/${firstNameColumn.id}`,
)
.set('xc-auth', context.token)
.expect(400);
@@ -2076,20 +2112,20 @@ function tableTest() {
name: 'actor',
});
const filmListColumn = (await actorTable.getColumns()).find(
- (column) => column.title === 'Film List'
+ (column) => column.title === 'Film List',
)!;
const refId = 1;
const lisResponseBeforeDelete = await request(context.app)
.get(
- `/api/v1/db/data/noco/${sakilaProject.id}/${actorTable.id}/${rowId}/mm/${filmListColumn.id}`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${actorTable.id}/${rowId}/mm/${filmListColumn.id}`,
)
.set('xc-auth', context.token)
.expect(200);
await request(context.app)
.delete(
- `/api/v1/db/data/noco/${sakilaProject.id}/${actorTable.id}/${rowId}/mm/${filmListColumn.id}/${refId}`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${actorTable.id}/${rowId}/mm/${filmListColumn.id}/${refId}`,
)
.set('xc-auth', context.token)
.expect(200);
@@ -2097,7 +2133,7 @@ function tableTest() {
const lisResponseAfterDelete = await request(context.app)
.get(
- `/api/v1/db/data/noco/${sakilaProject.id}/${actorTable.id}/${rowId}/mm/${filmListColumn.id}`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${actorTable.id}/${rowId}/mm/${filmListColumn.id}`,
)
.set('xc-auth', context.token)
.expect(200);
@@ -2116,13 +2152,13 @@ function tableTest() {
const rowId = 1;
const rentalListColumn = (await customerTable.getColumns()).find(
- (column) => column.title === 'Rental List'
+ (column) => column.title === 'Rental List',
)!;
const refId = 76;
const response = await request(context.app)
.delete(
- `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/${rowId}/hm/${rentalListColumn.id}/${refId}`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/${rowId}/hm/${rentalListColumn.id}/${refId}`,
)
.set('xc-auth', context.token)
.expect(400);
@@ -2130,7 +2166,7 @@ function tableTest() {
// todo: only keep generic error message once updated in noco catchError middleware
if (
!response.body.message?.includes(
- "The column 'customer_id' cannot be null"
+ "The column 'customer_id' cannot be null",
) &&
!response.body.message?.includes("Column 'customer_id' cannot be null") &&
!response.body.message?.includes('Cannot add or update a child row') &&
@@ -2139,7 +2175,7 @@ function tableTest() {
) {
console.log(
'Delete list hm with existing ref row id with non nullable clause',
- response.body
+ response.body,
);
throw new Error('Wrong error message');
}
@@ -2169,7 +2205,7 @@ function tableTest() {
const response = await request(context.app)
.delete(
- `/api/v1/db/data/noco/${project.id}/${table.id}/${row['Id']}/hm/${ltarColumn.id}/${childRow['Id']}`
+ `/api/v1/db/data/noco/${project.id}/${table.id}/${row['Id']}/hm/${ltarColumn.id}/${childRow['Id']}`,
)
.set('xc-auth', context.token)
.expect(200);
@@ -2180,7 +2216,9 @@ function tableTest() {
throw new Error('Was not deleted');
}
- if (response.body['msg'] !== 'The relation data has been deleted successfully') {
+ if (
+ response.body['msg'] !== 'The relation data has been deleted successfully'
+ ) {
throw new Error('Response incorrect');
}
});
@@ -2188,12 +2226,12 @@ function tableTest() {
it('Exclude list hm', async () => {
const rowId = 1;
const rentalListColumn = (await customerTable.getColumns()).find(
- (column) => column.title === 'Rental List'
+ (column) => column.title === 'Rental List',
)!;
const response = await request(context.app)
.get(
- `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/${rowId}/hm/${rentalListColumn.id}/exclude`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/${rowId}/hm/${rentalListColumn.id}/exclude`,
)
.set('xc-auth', context.token)
.expect(200);
@@ -2207,12 +2245,12 @@ function tableTest() {
it('Exclude list hm with limit and offset', async () => {
const rowId = 1;
const rentalListColumn = (await customerTable.getColumns()).find(
- (column) => column.title === 'Rental List'
+ (column) => column.title === 'Rental List',
)!;
const response = await request(context.app)
.get(
- `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/${rowId}/hm/${rentalListColumn.id}/exclude`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/${rowId}/hm/${rentalListColumn.id}/exclude`,
)
.set('xc-auth', context.token)
.query({
@@ -2239,12 +2277,12 @@ function tableTest() {
name: 'actor',
});
const filmListColumn = (await actorTable.getColumns()).find(
- (column) => column.title === 'Film List'
+ (column) => column.title === 'Film List',
)!;
const response = await request(context.app)
.get(
- `/api/v1/db/data/noco/${sakilaProject.id}/${actorTable.id}/${rowId}/mm/${filmListColumn.id}/exclude`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${actorTable.id}/${rowId}/mm/${filmListColumn.id}/exclude`,
)
.set('xc-auth', context.token)
.expect(200);
@@ -2262,12 +2300,12 @@ function tableTest() {
name: 'actor',
});
const filmListColumn = (await actorTable.getColumns()).find(
- (column) => column.title === 'Film List'
+ (column) => column.title === 'Film List',
)!;
const response = await request(context.app)
.get(
- `/api/v1/db/data/noco/${sakilaProject.id}/${actorTable.id}/${rowId}/mm/${filmListColumn.id}/exclude`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${actorTable.id}/${rowId}/mm/${filmListColumn.id}/exclude`,
)
.set('xc-auth', context.token)
.query({
@@ -2294,12 +2332,12 @@ function tableTest() {
name: 'address',
});
const cityColumn = (await addressTable.getColumns()).find(
- (column) => column.title === 'City'
+ (column) => column.title === 'City',
)!;
const response = await request(context.app)
.get(
- `/api/v1/db/data/noco/${sakilaProject.id}/${addressTable.id}/${rowId}/bt/${cityColumn.id}/exclude`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${addressTable.id}/${rowId}/bt/${cityColumn.id}/exclude`,
)
.set('xc-auth', context.token)
.expect(200);
@@ -2315,12 +2353,12 @@ function tableTest() {
name: 'address',
});
const cityColumn = (await addressTable.getColumns()).find(
- (column) => column.title === 'City'
+ (column) => column.title === 'City',
)!;
const response = await request(context.app)
.get(
- `/api/v1/db/data/noco/${sakilaProject.id}/${addressTable.id}/${rowId}/bt/${cityColumn.id}/exclude`
+ `/api/v1/db/data/noco/${sakilaProject.id}/${addressTable.id}/${rowId}/bt/${cityColumn.id}/exclude`,
)
.set('xc-auth', context.token)
.query({
@@ -2336,12 +2374,12 @@ function tableTest() {
it('Create nested hm relation with invalid table id', async () => {
const rowId = 1;
const rentalListColumn = (await customerTable.getColumns()).find(
- (column) => column.title === 'Rental List'
+ (column) => column.title === 'Rental List',
)!;
const refId = 1;
const response = await request(context.app)
.post(
- `/api/v1/db/data/noco/${sakilaProject.id}/invalid-table-id/${rowId}/hm/${rentalListColumn.id}/exclude`
+ `/api/v1/db/data/noco/${sakilaProject.id}/invalid-table-id/${rowId}/hm/${rentalListColumn.id}/exclude`,
)
.set('xc-auth', context.token)
.expect(404);
@@ -2359,11 +2397,11 @@ function tableTest() {
name: 'actor',
});
const filmListColumn = (await actorTable.getColumns()).find(
- (column) => column.title === 'Film List'
+ (column) => column.title === 'Film List',
)!;
const response = await request(context.app)
.post(
- `/api/v1/db/data/noco/${sakilaProject.id}/invalid-table-id/${rowId}/mm/${filmListColumn.id}/exclude`
+ `/api/v1/db/data/noco/${sakilaProject.id}/invalid-table-id/${rowId}/mm/${filmListColumn.id}/exclude`,
)
.set('xc-auth', context.token)
.expect(404);
@@ -2383,7 +2421,7 @@ function tableTest() {
const response = await request(context.app)
.get(
- `/api/v1/db/data/noco/${sakilaProject.id}/Film/group/${ratingColumn.id}`
+ `/api/v1/db/data/noco/${sakilaProject.id}/Film/group/${ratingColumn.id}`,
)
.set('xc-auth', context.token)
.expect(200);
diff --git a/packages/nocodb/tests/unit/rest/tests/viewRow.test.ts b/packages/nocodb/tests/unit/rest/tests/viewRow.test.ts
index 971c471879..3473c79bcf 100644
--- a/packages/nocodb/tests/unit/rest/tests/viewRow.test.ts
+++ b/packages/nocodb/tests/unit/rest/tests/viewRow.test.ts
@@ -901,7 +901,7 @@ function viewRowTests() {
);
const nestedFields = {
- 'Rental List': ['RentalDate', 'ReturnDate'],
+ 'Rental List': { f: 'RentalDate,ReturnDate' },
};
const nestedFilter = [