diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/helpers/getAst.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/helpers/getAst.ts index 67834641d9..8b8c3def97 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/helpers/getAst.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/helpers/getAst.ts @@ -81,13 +81,13 @@ const getAst = async ({ ...(await obj), [col.title]: allowedCols && (!includePkByDefault || !col.pk) - ? (allowedCols[col.id] && + ? allowedCols[col.id] && (!isSystemColumn(col) || view.show_system_fields) && (!fields?.length || fields.includes(col.title)) && - value) - : (fields?.length + value + : fields?.length ? fields.includes(col.title) && value - : value), + : value, }; }, Promise.resolve({})); }; diff --git a/packages/nocodb/src/lib/meta/api/apiTokenApis.ts b/packages/nocodb/src/lib/meta/api/apiTokenApis.ts index 5470ca3f50..5ed4c08094 100644 --- a/packages/nocodb/src/lib/meta/api/apiTokenApis.ts +++ b/packages/nocodb/src/lib/meta/api/apiTokenApis.ts @@ -5,7 +5,7 @@ import { NcError } from '../helpers/catchError'; import ncMetaAclMw from '../helpers/ncMetaAclMw'; import ApiToken from '../../models/ApiToken'; import { metaApiMetrics } from '../helpers/apiMetrics'; -import { getAjvValidatorMw } from './helpers' +import { getAjvValidatorMw } from './helpers'; export async function apiTokenList(req: Request, res: Response) { res.json(await ApiToken.list(req['user'].id)); diff --git a/packages/nocodb/src/lib/meta/api/baseApis.ts b/packages/nocodb/src/lib/meta/api/baseApis.ts index 7c97afa8cc..c13bbd18d3 100644 --- a/packages/nocodb/src/lib/meta/api/baseApis.ts +++ b/packages/nocodb/src/lib/meta/api/baseApis.ts @@ -7,7 +7,7 @@ import Base from '../../models/Base'; import ncMetaAclMw from '../helpers/ncMetaAclMw'; import { Tele } from 'nc-help'; import { metaApiMetrics } from '../helpers/apiMetrics'; -import { getAjvValidatorMw, populateMeta } from './helpers' +import { getAjvValidatorMw, populateMeta } from './helpers'; export async function baseGet( req: Request, diff --git a/packages/nocodb/src/lib/meta/api/columnApis.ts b/packages/nocodb/src/lib/meta/api/columnApis.ts index ef52fc0b98..a5e9e8e9ec 100644 --- a/packages/nocodb/src/lib/meta/api/columnApis.ts +++ b/packages/nocodb/src/lib/meta/api/columnApis.ts @@ -40,12 +40,13 @@ import { MetaTable } from '../../utils/globals'; import formulaQueryBuilderv2 from '../../db/sql-data-mapper/lib/sql/formulav2/formulaQueryBuilderv2'; import { createHmAndBtColumn, - generateFkName, getAjvValidatorMw, + generateFkName, + getAjvValidatorMw, randomID, validateLookupPayload, validateRequiredField, validateRollupPayload, -} from './helpers' +} from './helpers'; export enum Altered { NEW_COLUMN = 1, diff --git a/packages/nocodb/src/lib/meta/api/filterApis.ts b/packages/nocodb/src/lib/meta/api/filterApis.ts index ff751d47df..1be850b7d8 100644 --- a/packages/nocodb/src/lib/meta/api/filterApis.ts +++ b/packages/nocodb/src/lib/meta/api/filterApis.ts @@ -13,7 +13,7 @@ import Project from '../../models/Project'; import Filter from '../../models/Filter'; import ncMetaAclMw from '../helpers/ncMetaAclMw'; import { metaApiMetrics } from '../helpers/apiMetrics'; -import { getAjvValidatorMw } from './helpers' +import { getAjvValidatorMw } from './helpers'; // @ts-ignore export async function filterGet(req: Request, res: Response, next) { diff --git a/packages/nocodb/src/lib/meta/api/formViewApis.ts b/packages/nocodb/src/lib/meta/api/formViewApis.ts index 1edb3b2dcf..98955f9076 100644 --- a/packages/nocodb/src/lib/meta/api/formViewApis.ts +++ b/packages/nocodb/src/lib/meta/api/formViewApis.ts @@ -13,7 +13,7 @@ import View from '../../models/View'; import FormView from '../../models/FormView'; import ncMetaAclMw from '../helpers/ncMetaAclMw'; import { metaApiMetrics } from '../helpers/apiMetrics'; -import { getAjvValidatorMw } from './helpers' +import { getAjvValidatorMw } from './helpers'; // @ts-ignore export async function formViewGet(req: Request, res: Response) { diff --git a/packages/nocodb/src/lib/meta/api/formViewColumnApis.ts b/packages/nocodb/src/lib/meta/api/formViewColumnApis.ts index 4a5053b0ac..9349b5ae68 100644 --- a/packages/nocodb/src/lib/meta/api/formViewColumnApis.ts +++ b/packages/nocodb/src/lib/meta/api/formViewColumnApis.ts @@ -3,7 +3,7 @@ import FormViewColumn from '../../models/FormViewColumn'; import { Tele } from 'nc-help'; import ncMetaAclMw from '../helpers/ncMetaAclMw'; import { metaApiMetrics } from '../helpers/apiMetrics'; -import { getAjvValidatorMw } from './helpers' +import { getAjvValidatorMw } from './helpers'; // import { getAjvValidatorMw } from './helpers' export async function columnUpdate(req: Request, res: Response) { diff --git a/packages/nocodb/src/lib/meta/api/galleryViewApis.ts b/packages/nocodb/src/lib/meta/api/galleryViewApis.ts index d563a32f6f..2c6c79db9e 100644 --- a/packages/nocodb/src/lib/meta/api/galleryViewApis.ts +++ b/packages/nocodb/src/lib/meta/api/galleryViewApis.ts @@ -5,7 +5,7 @@ import GalleryView from '../../models/GalleryView'; import { Tele } from 'nc-help'; import ncMetaAclMw from '../helpers/ncMetaAclMw'; import { metaApiMetrics } from '../helpers/apiMetrics'; -import { getAjvValidatorMw } from './helpers' +import { getAjvValidatorMw } from './helpers'; export async function galleryViewGet(req: Request, res: Response) { res.json(await GalleryView.get(req.params.galleryViewId)); } diff --git a/packages/nocodb/src/lib/meta/api/gridViewApis.ts b/packages/nocodb/src/lib/meta/api/gridViewApis.ts index 400fc52fe8..96880398cb 100644 --- a/packages/nocodb/src/lib/meta/api/gridViewApis.ts +++ b/packages/nocodb/src/lib/meta/api/gridViewApis.ts @@ -13,7 +13,7 @@ import View from '../../models/View'; import ncMetaAclMw from '../helpers/ncMetaAclMw'; import { metaApiMetrics } from '../helpers/apiMetrics'; import GridView from '../../models/GridView'; -import { getAjvValidatorMw } from './helpers' +import { getAjvValidatorMw } from './helpers'; // @ts-ignore export async function gridViewCreate(req: Request, res) { diff --git a/packages/nocodb/src/lib/meta/api/gridViewColumnApis.ts b/packages/nocodb/src/lib/meta/api/gridViewColumnApis.ts index 4680935414..28669a6a2f 100644 --- a/packages/nocodb/src/lib/meta/api/gridViewColumnApis.ts +++ b/packages/nocodb/src/lib/meta/api/gridViewColumnApis.ts @@ -3,7 +3,7 @@ import GridViewColumn from '../../models/GridViewColumn'; import { Tele } from 'nc-help'; import ncMetaAclMw from '../helpers/ncMetaAclMw'; import { metaApiMetrics } from '../helpers/apiMetrics'; -import { getAjvValidatorMw } from './helpers' +import { getAjvValidatorMw } from './helpers'; export async function columnList(req: Request, res: Response) { res.json(await GridViewColumn.list(req.params.gridViewId)); diff --git a/packages/nocodb/src/lib/meta/api/helpers/columnHelpers.ts b/packages/nocodb/src/lib/meta/api/helpers/columnHelpers.ts index d53d7d1c01..ad53a41b6d 100644 --- a/packages/nocodb/src/lib/meta/api/helpers/columnHelpers.ts +++ b/packages/nocodb/src/lib/meta/api/helpers/columnHelpers.ts @@ -2,12 +2,13 @@ import { customAlphabet } from 'nanoid'; import { ColumnReqType, LinkToAnotherRecordType, - LookupColumnReqType, NcBoolType, + LookupColumnReqType, + NcBoolType, RelationTypes, RollupColumnReqType, TableType, UITypes, -} from 'nocodb-sdk' +} from 'nocodb-sdk'; import Column from '../../../models/Column'; import LinkToAnotherRecordColumn from '../../../models/LinkToAnotherRecordColumn'; import LookupColumn from '../../../models/LookupColumn'; diff --git a/packages/nocodb/src/lib/meta/api/hookApis.ts b/packages/nocodb/src/lib/meta/api/hookApis.ts index c59617607a..bf0b29b6ec 100644 --- a/packages/nocodb/src/lib/meta/api/hookApis.ts +++ b/packages/nocodb/src/lib/meta/api/hookApis.ts @@ -9,7 +9,7 @@ import Model from '../../models/Model'; import populateSamplePayload from '../helpers/populateSamplePayload'; import ncMetaAclMw from '../helpers/ncMetaAclMw'; import { metaApiMetrics } from '../helpers/apiMetrics'; -import { getAjvValidatorMw } from './helpers' +import { getAjvValidatorMw } from './helpers'; export async function hookList( req: Request, diff --git a/packages/nocodb/src/lib/meta/api/hookFilterApis.ts b/packages/nocodb/src/lib/meta/api/hookFilterApis.ts index 662b7243a2..7b182fcab4 100644 --- a/packages/nocodb/src/lib/meta/api/hookFilterApis.ts +++ b/packages/nocodb/src/lib/meta/api/hookFilterApis.ts @@ -13,7 +13,7 @@ import Project from '../../models/Project'; import Filter from '../../models/Filter'; import ncMetaAclMw from '../helpers/ncMetaAclMw'; import { metaApiMetrics } from '../helpers/apiMetrics'; -import { getAjvValidatorMw } from './helpers' +import { getAjvValidatorMw } from './helpers'; // @ts-ignore export async function filterGet(req: Request, res: Response, next) { diff --git a/packages/nocodb/src/lib/meta/api/kanbanViewApis.ts b/packages/nocodb/src/lib/meta/api/kanbanViewApis.ts index 5509751f93..c8d864bf82 100644 --- a/packages/nocodb/src/lib/meta/api/kanbanViewApis.ts +++ b/packages/nocodb/src/lib/meta/api/kanbanViewApis.ts @@ -5,7 +5,7 @@ import KanbanView from '../../models/KanbanView'; import { Tele } from 'nc-help'; import ncMetaAclMw from '../helpers/ncMetaAclMw'; import { metaApiMetrics } from '../helpers/apiMetrics'; -import { getAjvValidatorMw } from './helpers' +import { getAjvValidatorMw } from './helpers'; export async function kanbanViewGet(req: Request, res: Response) { res.json(await KanbanView.get(req.params.kanbanViewId)); diff --git a/packages/nocodb/src/lib/meta/api/modelVisibilityApis.ts b/packages/nocodb/src/lib/meta/api/modelVisibilityApis.ts index b9b9fc1498..26dc965bb1 100644 --- a/packages/nocodb/src/lib/meta/api/modelVisibilityApis.ts +++ b/packages/nocodb/src/lib/meta/api/modelVisibilityApis.ts @@ -4,7 +4,7 @@ import { Router } from 'express'; import { Tele } from 'nc-help'; import ncMetaAclMw from '../helpers/ncMetaAclMw'; import { metaApiMetrics } from '../helpers/apiMetrics'; -import { getAjvValidatorMw } from './helpers' +import { getAjvValidatorMw } from './helpers'; async function xcVisibilityMetaSetAll(req, res) { Tele.emit('evt', { evt_type: 'uiAcl:updated' }); for (const d of req.body) { diff --git a/packages/nocodb/src/lib/meta/api/orgLicenseApis.ts b/packages/nocodb/src/lib/meta/api/orgLicenseApis.ts index 63366b4e4d..ec13f4f9e7 100644 --- a/packages/nocodb/src/lib/meta/api/orgLicenseApis.ts +++ b/packages/nocodb/src/lib/meta/api/orgLicenseApis.ts @@ -5,7 +5,7 @@ import Store from '../../models/Store'; import Noco from '../../Noco'; import { metaApiMetrics } from '../helpers/apiMetrics'; import ncMetaAclMw from '../helpers/ncMetaAclMw'; -import { getAjvValidatorMw } from './helpers' +import { getAjvValidatorMw } from './helpers'; async function licenseGet(_req, res) { const license = await Store.get(NC_LICENSE_KEY); diff --git a/packages/nocodb/src/lib/meta/api/projectApis.ts b/packages/nocodb/src/lib/meta/api/projectApis.ts index 388d6ae120..3c5b536e05 100644 --- a/packages/nocodb/src/lib/meta/api/projectApis.ts +++ b/packages/nocodb/src/lib/meta/api/projectApis.ts @@ -18,7 +18,7 @@ import { metaApiMetrics } from '../helpers/apiMetrics'; import { extractPropsAndSanitize } from '../helpers/extractProps'; import NcConfigFactory from '../../utils/NcConfigFactory'; import { promisify } from 'util'; -import { getAjvValidatorMw, populateMeta } from './helpers' +import { getAjvValidatorMw, populateMeta } from './helpers'; import Filter from '../../models/Filter'; const nanoid = customAlphabet('1234567890abcdefghijklmnopqrstuvwxyz_', 4); diff --git a/packages/nocodb/src/lib/meta/api/publicApis/publicDataApis.ts b/packages/nocodb/src/lib/meta/api/publicApis/publicDataApis.ts index b756424fdc..bb678b10f3 100644 --- a/packages/nocodb/src/lib/meta/api/publicApis/publicDataApis.ts +++ b/packages/nocodb/src/lib/meta/api/publicApis/publicDataApis.ts @@ -28,7 +28,7 @@ export async function dataList(req: Request, res: Response) { if ( view.type !== ViewTypes.GRID && view.type !== ViewTypes.KANBAN && - view.type !== ViewTypes.GALLERY && + view.type !== ViewTypes.GALLERY && view.type !== ViewTypes.MAP ) { NcError.notFound('Not found'); diff --git a/packages/nocodb/src/lib/meta/api/sortApis.ts b/packages/nocodb/src/lib/meta/api/sortApis.ts index 233fc4ae13..5341d07cba 100644 --- a/packages/nocodb/src/lib/meta/api/sortApis.ts +++ b/packages/nocodb/src/lib/meta/api/sortApis.ts @@ -12,7 +12,7 @@ import Project from '../../models/Project'; import Sort from '../../models/Sort'; import ncMetaAclMw from '../helpers/ncMetaAclMw'; import { metaApiMetrics } from '../helpers/apiMetrics'; -import { getAjvValidatorMw } from './helpers' +import { getAjvValidatorMw } from './helpers'; // @ts-ignore export async function sortGet(req: Request, res: Response) {} diff --git a/packages/nocodb/src/lib/meta/api/viewApis.ts b/packages/nocodb/src/lib/meta/api/viewApis.ts index 996fe81de4..b062a2b2ef 100644 --- a/packages/nocodb/src/lib/meta/api/viewApis.ts +++ b/packages/nocodb/src/lib/meta/api/viewApis.ts @@ -89,7 +89,6 @@ async function showAllColumns(req: Request, res) { } async function hideAllColumns(req: Request, res) { - res.json( await View.hideAllColumns( req.params.viewId, diff --git a/packages/nocodb/src/lib/models/Base.ts b/packages/nocodb/src/lib/models/Base.ts index 040848eea9..c0568b6bd4 100644 --- a/packages/nocodb/src/lib/models/Base.ts +++ b/packages/nocodb/src/lib/models/Base.ts @@ -7,7 +7,7 @@ import { MetaTable, } from '../utils/globals'; import Model from './Model'; -import { BaseType, NcBoolType, UITypes } from 'nocodb-sdk' +import { BaseType, NcBoolType, UITypes } from 'nocodb-sdk'; import NocoCache from '../cache/NocoCache'; import CryptoJS from 'crypto-js'; import { extractProps } from '../meta/helpers/extractProps'; diff --git a/packages/nocodb/src/lib/models/LinkToAnotherRecordColumn.ts b/packages/nocodb/src/lib/models/LinkToAnotherRecordColumn.ts index e607dab0a3..8b12d7aa47 100644 --- a/packages/nocodb/src/lib/models/LinkToAnotherRecordColumn.ts +++ b/packages/nocodb/src/lib/models/LinkToAnotherRecordColumn.ts @@ -1,4 +1,4 @@ -import { NcBoolType } from 'nocodb-sdk' +import { NcBoolType } from 'nocodb-sdk'; import Noco from '../Noco'; import Column from './Column'; import Model from './Model'; diff --git a/packages/nocodb/src/lib/models/MapView.ts b/packages/nocodb/src/lib/models/MapView.ts index d8d4c56e3e..fe4d5f2547 100644 --- a/packages/nocodb/src/lib/models/MapView.ts +++ b/packages/nocodb/src/lib/models/MapView.ts @@ -93,7 +93,6 @@ export default class MapView implements MapType { await View.updateColumn(body.fk_view_id, mapViewMappedByColumn.id, { show: true, }); - } // update meta diff --git a/packages/nocodb/src/lib/models/Project.ts b/packages/nocodb/src/lib/models/Project.ts index 939b28d74d..6b3f724e4d 100644 --- a/packages/nocodb/src/lib/models/Project.ts +++ b/packages/nocodb/src/lib/models/Project.ts @@ -1,6 +1,6 @@ import Base from './/Base'; import Noco from '../Noco'; -import { NcBoolType, ProjectType } from 'nocodb-sdk' +import { NcBoolType, ProjectType } from 'nocodb-sdk'; import { CacheDelDirection, CacheGetType, diff --git a/packages/nocodb/src/lib/utils/globals.ts b/packages/nocodb/src/lib/utils/globals.ts index f39a0efda7..efade2f1b0 100644 --- a/packages/nocodb/src/lib/utils/globals.ts +++ b/packages/nocodb/src/lib/utils/globals.ts @@ -42,7 +42,6 @@ export enum MetaTable { MAP_VIEW = 'nc_map_view_v2', MAP_VIEW_COLUMNS = 'nc_map_view_columns_v2', STORE = 'nc_store', - } export const orderedMetaTables = [