diff --git a/packages/nocodb/src/db/functionMappings/pg.ts b/packages/nocodb/src/db/functionMappings/pg.ts index 3e1c95a820..3d877855c3 100644 --- a/packages/nocodb/src/db/functionMappings/pg.ts +++ b/packages/nocodb/src/db/functionMappings/pg.ts @@ -210,7 +210,9 @@ const pg = { SUBSTR: async ({ fn, knex, pt, colAlias }: MapFnArgs) => { const str = (await fn(pt.arguments[0])).builder; const positionFrom = (await fn(pt.arguments[1] ?? 1)).builder; - const numberOfCharacters = pt.arguments[2] ? (await fn(pt.arguments[2])).builder : null; + const numberOfCharacters = pt.arguments[2] + ? (await fn(pt.arguments[2])).builder + : null; return { builder: knex.raw( `SUBSTR(${str}::TEXT, ${positionFrom}${ diff --git a/packages/nocodb/src/models/Model.ts b/packages/nocodb/src/models/Model.ts index a00965d40d..f21100562c 100644 --- a/packages/nocodb/src/models/Model.ts +++ b/packages/nocodb/src/models/Model.ts @@ -167,7 +167,7 @@ export default class Model implements TableType { source_id: sourceId, }, { - getColumns: async () => insertedColumns + getColumns: async () => insertedColumns, }, ncMeta, ); diff --git a/packages/nocodb/src/models/View.ts b/packages/nocodb/src/models/View.ts index 8a4b8cb65e..ea3e242a5c 100644 --- a/packages/nocodb/src/models/View.ts +++ b/packages/nocodb/src/models/View.ts @@ -1564,7 +1564,7 @@ export default class View implements ViewType { viewColumns, copyFromView, }: { - copyFromView: View; + copyFromView?: View; columns?: ({ order?: number; show?; @@ -1923,7 +1923,7 @@ export default class View implements ViewType { } else { // populate view columns await View.bulkColumnInsertToViews( - { columns: (await model.getColumns()) as any[], copyFromView }, + { columns: (await model.getColumns()) as any[] }, insertedView, ); } diff --git a/packages/nocodb/src/services/forms.service.ts b/packages/nocodb/src/services/forms.service.ts index f13cb7c655..08db6056b3 100644 --- a/packages/nocodb/src/services/forms.service.ts +++ b/packages/nocodb/src/services/forms.service.ts @@ -33,13 +33,6 @@ export class FormsService { param.body, ); - // const view = await View.insert({ - // ...param.body, - // // todo: sanitize - // fk_model_id: param.tableId, - // type: ViewTypes.FORM, - // }); - const model = await Model.get(param.tableId); const { id } = await View.insertMetaOnly( diff --git a/packages/nocodb/src/services/galleries.service.ts b/packages/nocodb/src/services/galleries.service.ts index 98d7073d12..6afb4eb361 100644 --- a/packages/nocodb/src/services/galleries.service.ts +++ b/packages/nocodb/src/services/galleries.service.ts @@ -32,13 +32,6 @@ export class GalleriesService { 'swagger.json#/components/schemas/ViewCreateReq', param.gallery, ); - // - // const view = await View.insert({ - // ...param.gallery, - // // todo: sanitize - // fk_model_id: param.tableId, - // type: ViewTypes.GALLERY, - // }); const model = await Model.get(param.tableId); diff --git a/packages/nocodb/src/services/grids.service.ts b/packages/nocodb/src/services/grids.service.ts index 759d06c780..1e027f1849 100644 --- a/packages/nocodb/src/services/grids.service.ts +++ b/packages/nocodb/src/services/grids.service.ts @@ -5,7 +5,7 @@ import type { NcRequest } from '~/interface/config'; import { AppHooksService } from '~/services/app-hooks/app-hooks.service'; import { validatePayload } from '~/helpers'; import { NcError } from '~/helpers/catchError'; -import { Column, GridView, Model, View } from '~/models'; +import { GridView, Model, View } from '~/models'; import NocoCache from '~/cache/NocoCache'; import { CacheScope } from '~/utils/globals'; @@ -22,13 +22,6 @@ export class GridsService { 'swagger.json#/components/schemas/ViewCreateReq', param.grid, ); - // - // const view = await View.insert({ - // ...param.grid, - // // todo: sanitize - // fk_model_id: param.tableId, - // type: ViewTypes.GRID, - // }); const model = await Model.get(param.tableId); diff --git a/packages/nocodb/src/services/kanbans.service.ts b/packages/nocodb/src/services/kanbans.service.ts index 06bc83b4d4..900ca2464a 100644 --- a/packages/nocodb/src/services/kanbans.service.ts +++ b/packages/nocodb/src/services/kanbans.service.ts @@ -9,9 +9,9 @@ import type { NcRequest } from '~/interface/config'; import { AppHooksService } from '~/services/app-hooks/app-hooks.service'; import { validatePayload } from '~/helpers'; import { NcError } from '~/helpers/catchError'; -import { KanbanView, Model, View } from '~/models' -import NocoCache from '~/cache/NocoCache' -import { CacheScope } from '~/utils/globals' +import { KanbanView, Model, View } from '~/models'; +import NocoCache from '~/cache/NocoCache'; +import { CacheScope } from '~/utils/globals'; @Injectable() export class KanbansService { @@ -32,13 +32,6 @@ export class KanbansService { param.kanban, ); - // const view = await View.insert({ - // ...param.kanban, - // // todo: sanitize - // fk_model_id: param.tableId, - // type: ViewTypes.KANBAN, - // }); - const model = await Model.get(param.tableId); const { id } = await View.insertMetaOnly( diff --git a/packages/nocodb/src/services/maps.service.ts b/packages/nocodb/src/services/maps.service.ts index b65779fbf6..0069268385 100644 --- a/packages/nocodb/src/services/maps.service.ts +++ b/packages/nocodb/src/services/maps.service.ts @@ -27,12 +27,6 @@ export class MapsService { 'swagger.json#/components/schemas/ViewCreateReq', param.map, ); - // const view = await View.insert({ - // ...param.map, - // // todo: sanitize - // fk_model_id: param.tableId, - // type: ViewTypes.MAP, - // }); const model = await Model.get(param.tableId); diff --git a/packages/nocodb/src/services/tables.service.ts b/packages/nocodb/src/services/tables.service.ts index 84aa0442f5..976d392d0b 100644 --- a/packages/nocodb/src/services/tables.service.ts +++ b/packages/nocodb/src/services/tables.service.ts @@ -613,6 +613,7 @@ export class TablesService { system?: boolean; } >; + if (!source.isMeta()) { columns = ( await sqlMgr.sqlOpPlus(source, 'columnList', { @@ -621,6 +622,7 @@ export class TablesService { }) )?.data?.list; } + const tables = await Model.list({ base_id: base.id, source_id: source.id, diff --git a/tests/playwright/tests/db/features/keyboardShortcuts.spec.ts b/tests/playwright/tests/db/features/keyboardShortcuts.spec.ts index 56494ebf7a..73795f3c90 100644 --- a/tests/playwright/tests/db/features/keyboardShortcuts.spec.ts +++ b/tests/playwright/tests/db/features/keyboardShortcuts.spec.ts @@ -328,7 +328,7 @@ test.describe('Clipboard support', () => { test('multiple cells - horizontal, all data types', async ({ page }) => { // skip for local run (clipboard access issue in headless mode) if (!process.env.CI && config.use.headless) { - // test.skip(); + test.skip(); } // click first cell, press `Ctrl A` and `Ctrl C`