Browse Source

chore: lint

Signed-off-by: Pranav C <pranavxc@gmail.com>
pull/5174/head
Pranav C 2 years ago
parent
commit
d0e2441559
  1. 8
      packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/helpers/getAst.ts
  2. 2
      packages/nocodb/src/lib/meta/api/apiTokenApis.ts
  3. 2
      packages/nocodb/src/lib/meta/api/baseApis.ts
  4. 5
      packages/nocodb/src/lib/meta/api/columnApis.ts
  5. 2
      packages/nocodb/src/lib/meta/api/filterApis.ts
  6. 2
      packages/nocodb/src/lib/meta/api/formViewApis.ts
  7. 2
      packages/nocodb/src/lib/meta/api/formViewColumnApis.ts
  8. 2
      packages/nocodb/src/lib/meta/api/galleryViewApis.ts
  9. 2
      packages/nocodb/src/lib/meta/api/gridViewApis.ts
  10. 2
      packages/nocodb/src/lib/meta/api/gridViewColumnApis.ts
  11. 5
      packages/nocodb/src/lib/meta/api/helpers/columnHelpers.ts
  12. 2
      packages/nocodb/src/lib/meta/api/hookApis.ts
  13. 2
      packages/nocodb/src/lib/meta/api/hookFilterApis.ts
  14. 2
      packages/nocodb/src/lib/meta/api/kanbanViewApis.ts
  15. 2
      packages/nocodb/src/lib/meta/api/modelVisibilityApis.ts
  16. 2
      packages/nocodb/src/lib/meta/api/orgLicenseApis.ts
  17. 2
      packages/nocodb/src/lib/meta/api/projectApis.ts
  18. 2
      packages/nocodb/src/lib/meta/api/publicApis/publicDataApis.ts
  19. 2
      packages/nocodb/src/lib/meta/api/sortApis.ts
  20. 1
      packages/nocodb/src/lib/meta/api/viewApis.ts
  21. 2
      packages/nocodb/src/lib/models/Base.ts
  22. 2
      packages/nocodb/src/lib/models/LinkToAnotherRecordColumn.ts
  23. 1
      packages/nocodb/src/lib/models/MapView.ts
  24. 2
      packages/nocodb/src/lib/models/Project.ts
  25. 1
      packages/nocodb/src/lib/utils/globals.ts

8
packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/helpers/getAst.ts

@ -81,13 +81,13 @@ const getAst = async ({
...(await obj), ...(await obj),
[col.title]: [col.title]:
allowedCols && (!includePkByDefault || !col.pk) allowedCols && (!includePkByDefault || !col.pk)
? (allowedCols[col.id] && ? allowedCols[col.id] &&
(!isSystemColumn(col) || view.show_system_fields) && (!isSystemColumn(col) || view.show_system_fields) &&
(!fields?.length || fields.includes(col.title)) && (!fields?.length || fields.includes(col.title)) &&
value) value
: (fields?.length : fields?.length
? fields.includes(col.title) && value ? fields.includes(col.title) && value
: value), : value,
}; };
}, Promise.resolve({})); }, Promise.resolve({}));
}; };

2
packages/nocodb/src/lib/meta/api/apiTokenApis.ts

@ -5,7 +5,7 @@ import { NcError } from '../helpers/catchError';
import ncMetaAclMw from '../helpers/ncMetaAclMw'; import ncMetaAclMw from '../helpers/ncMetaAclMw';
import ApiToken from '../../models/ApiToken'; import ApiToken from '../../models/ApiToken';
import { metaApiMetrics } from '../helpers/apiMetrics'; import { metaApiMetrics } from '../helpers/apiMetrics';
import { getAjvValidatorMw } from './helpers' import { getAjvValidatorMw } from './helpers';
export async function apiTokenList(req: Request, res: Response) { export async function apiTokenList(req: Request, res: Response) {
res.json(await ApiToken.list(req['user'].id)); res.json(await ApiToken.list(req['user'].id));

2
packages/nocodb/src/lib/meta/api/baseApis.ts

@ -7,7 +7,7 @@ import Base from '../../models/Base';
import ncMetaAclMw from '../helpers/ncMetaAclMw'; import ncMetaAclMw from '../helpers/ncMetaAclMw';
import { Tele } from 'nc-help'; import { Tele } from 'nc-help';
import { metaApiMetrics } from '../helpers/apiMetrics'; import { metaApiMetrics } from '../helpers/apiMetrics';
import { getAjvValidatorMw, populateMeta } from './helpers' import { getAjvValidatorMw, populateMeta } from './helpers';
export async function baseGet( export async function baseGet(
req: Request<any, any, any>, req: Request<any, any, any>,

5
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 formulaQueryBuilderv2 from '../../db/sql-data-mapper/lib/sql/formulav2/formulaQueryBuilderv2';
import { import {
createHmAndBtColumn, createHmAndBtColumn,
generateFkName, getAjvValidatorMw, generateFkName,
getAjvValidatorMw,
randomID, randomID,
validateLookupPayload, validateLookupPayload,
validateRequiredField, validateRequiredField,
validateRollupPayload, validateRollupPayload,
} from './helpers' } from './helpers';
export enum Altered { export enum Altered {
NEW_COLUMN = 1, NEW_COLUMN = 1,

2
packages/nocodb/src/lib/meta/api/filterApis.ts

@ -13,7 +13,7 @@ import Project from '../../models/Project';
import Filter from '../../models/Filter'; import Filter from '../../models/Filter';
import ncMetaAclMw from '../helpers/ncMetaAclMw'; import ncMetaAclMw from '../helpers/ncMetaAclMw';
import { metaApiMetrics } from '../helpers/apiMetrics'; import { metaApiMetrics } from '../helpers/apiMetrics';
import { getAjvValidatorMw } from './helpers' import { getAjvValidatorMw } from './helpers';
// @ts-ignore // @ts-ignore
export async function filterGet(req: Request, res: Response, next) { export async function filterGet(req: Request, res: Response, next) {

2
packages/nocodb/src/lib/meta/api/formViewApis.ts

@ -13,7 +13,7 @@ import View from '../../models/View';
import FormView from '../../models/FormView'; import FormView from '../../models/FormView';
import ncMetaAclMw from '../helpers/ncMetaAclMw'; import ncMetaAclMw from '../helpers/ncMetaAclMw';
import { metaApiMetrics } from '../helpers/apiMetrics'; import { metaApiMetrics } from '../helpers/apiMetrics';
import { getAjvValidatorMw } from './helpers' import { getAjvValidatorMw } from './helpers';
// @ts-ignore // @ts-ignore
export async function formViewGet(req: Request, res: Response<FormType>) { export async function formViewGet(req: Request, res: Response<FormType>) {

2
packages/nocodb/src/lib/meta/api/formViewColumnApis.ts

@ -3,7 +3,7 @@ import FormViewColumn from '../../models/FormViewColumn';
import { Tele } from 'nc-help'; import { Tele } from 'nc-help';
import ncMetaAclMw from '../helpers/ncMetaAclMw'; import ncMetaAclMw from '../helpers/ncMetaAclMw';
import { metaApiMetrics } from '../helpers/apiMetrics'; import { metaApiMetrics } from '../helpers/apiMetrics';
import { getAjvValidatorMw } from './helpers' import { getAjvValidatorMw } from './helpers';
// import { getAjvValidatorMw } from './helpers' // import { getAjvValidatorMw } from './helpers'
export async function columnUpdate(req: Request, res: Response) { export async function columnUpdate(req: Request, res: Response) {

2
packages/nocodb/src/lib/meta/api/galleryViewApis.ts

@ -5,7 +5,7 @@ import GalleryView from '../../models/GalleryView';
import { Tele } from 'nc-help'; import { Tele } from 'nc-help';
import ncMetaAclMw from '../helpers/ncMetaAclMw'; import ncMetaAclMw from '../helpers/ncMetaAclMw';
import { metaApiMetrics } from '../helpers/apiMetrics'; import { metaApiMetrics } from '../helpers/apiMetrics';
import { getAjvValidatorMw } from './helpers' import { getAjvValidatorMw } from './helpers';
export async function galleryViewGet(req: Request, res: Response<GalleryType>) { export async function galleryViewGet(req: Request, res: Response<GalleryType>) {
res.json(await GalleryView.get(req.params.galleryViewId)); res.json(await GalleryView.get(req.params.galleryViewId));
} }

2
packages/nocodb/src/lib/meta/api/gridViewApis.ts

@ -13,7 +13,7 @@ import View from '../../models/View';
import ncMetaAclMw from '../helpers/ncMetaAclMw'; import ncMetaAclMw from '../helpers/ncMetaAclMw';
import { metaApiMetrics } from '../helpers/apiMetrics'; import { metaApiMetrics } from '../helpers/apiMetrics';
import GridView from '../../models/GridView'; import GridView from '../../models/GridView';
import { getAjvValidatorMw } from './helpers' import { getAjvValidatorMw } from './helpers';
// @ts-ignore // @ts-ignore
export async function gridViewCreate(req: Request<any, any>, res) { export async function gridViewCreate(req: Request<any, any>, res) {

2
packages/nocodb/src/lib/meta/api/gridViewColumnApis.ts

@ -3,7 +3,7 @@ import GridViewColumn from '../../models/GridViewColumn';
import { Tele } from 'nc-help'; import { Tele } from 'nc-help';
import ncMetaAclMw from '../helpers/ncMetaAclMw'; import ncMetaAclMw from '../helpers/ncMetaAclMw';
import { metaApiMetrics } from '../helpers/apiMetrics'; import { metaApiMetrics } from '../helpers/apiMetrics';
import { getAjvValidatorMw } from './helpers' import { getAjvValidatorMw } from './helpers';
export async function columnList(req: Request, res: Response) { export async function columnList(req: Request, res: Response) {
res.json(await GridViewColumn.list(req.params.gridViewId)); res.json(await GridViewColumn.list(req.params.gridViewId));

5
packages/nocodb/src/lib/meta/api/helpers/columnHelpers.ts

@ -2,12 +2,13 @@ import { customAlphabet } from 'nanoid';
import { import {
ColumnReqType, ColumnReqType,
LinkToAnotherRecordType, LinkToAnotherRecordType,
LookupColumnReqType, NcBoolType, LookupColumnReqType,
NcBoolType,
RelationTypes, RelationTypes,
RollupColumnReqType, RollupColumnReqType,
TableType, TableType,
UITypes, UITypes,
} from 'nocodb-sdk' } from 'nocodb-sdk';
import Column from '../../../models/Column'; import Column from '../../../models/Column';
import LinkToAnotherRecordColumn from '../../../models/LinkToAnotherRecordColumn'; import LinkToAnotherRecordColumn from '../../../models/LinkToAnotherRecordColumn';
import LookupColumn from '../../../models/LookupColumn'; import LookupColumn from '../../../models/LookupColumn';

2
packages/nocodb/src/lib/meta/api/hookApis.ts

@ -9,7 +9,7 @@ import Model from '../../models/Model';
import populateSamplePayload from '../helpers/populateSamplePayload'; import populateSamplePayload from '../helpers/populateSamplePayload';
import ncMetaAclMw from '../helpers/ncMetaAclMw'; import ncMetaAclMw from '../helpers/ncMetaAclMw';
import { metaApiMetrics } from '../helpers/apiMetrics'; import { metaApiMetrics } from '../helpers/apiMetrics';
import { getAjvValidatorMw } from './helpers' import { getAjvValidatorMw } from './helpers';
export async function hookList( export async function hookList(
req: Request<any, any, any>, req: Request<any, any, any>,

2
packages/nocodb/src/lib/meta/api/hookFilterApis.ts

@ -13,7 +13,7 @@ import Project from '../../models/Project';
import Filter from '../../models/Filter'; import Filter from '../../models/Filter';
import ncMetaAclMw from '../helpers/ncMetaAclMw'; import ncMetaAclMw from '../helpers/ncMetaAclMw';
import { metaApiMetrics } from '../helpers/apiMetrics'; import { metaApiMetrics } from '../helpers/apiMetrics';
import { getAjvValidatorMw } from './helpers' import { getAjvValidatorMw } from './helpers';
// @ts-ignore // @ts-ignore
export async function filterGet(req: Request, res: Response, next) { export async function filterGet(req: Request, res: Response, next) {

2
packages/nocodb/src/lib/meta/api/kanbanViewApis.ts

@ -5,7 +5,7 @@ import KanbanView from '../../models/KanbanView';
import { Tele } from 'nc-help'; import { Tele } from 'nc-help';
import ncMetaAclMw from '../helpers/ncMetaAclMw'; import ncMetaAclMw from '../helpers/ncMetaAclMw';
import { metaApiMetrics } from '../helpers/apiMetrics'; import { metaApiMetrics } from '../helpers/apiMetrics';
import { getAjvValidatorMw } from './helpers' import { getAjvValidatorMw } from './helpers';
export async function kanbanViewGet(req: Request, res: Response<KanbanType>) { export async function kanbanViewGet(req: Request, res: Response<KanbanType>) {
res.json(await KanbanView.get(req.params.kanbanViewId)); res.json(await KanbanView.get(req.params.kanbanViewId));

2
packages/nocodb/src/lib/meta/api/modelVisibilityApis.ts

@ -4,7 +4,7 @@ import { Router } from 'express';
import { Tele } from 'nc-help'; import { Tele } from 'nc-help';
import ncMetaAclMw from '../helpers/ncMetaAclMw'; import ncMetaAclMw from '../helpers/ncMetaAclMw';
import { metaApiMetrics } from '../helpers/apiMetrics'; import { metaApiMetrics } from '../helpers/apiMetrics';
import { getAjvValidatorMw } from './helpers' import { getAjvValidatorMw } from './helpers';
async function xcVisibilityMetaSetAll(req, res) { async function xcVisibilityMetaSetAll(req, res) {
Tele.emit('evt', { evt_type: 'uiAcl:updated' }); Tele.emit('evt', { evt_type: 'uiAcl:updated' });
for (const d of req.body) { for (const d of req.body) {

2
packages/nocodb/src/lib/meta/api/orgLicenseApis.ts

@ -5,7 +5,7 @@ import Store from '../../models/Store';
import Noco from '../../Noco'; import Noco from '../../Noco';
import { metaApiMetrics } from '../helpers/apiMetrics'; import { metaApiMetrics } from '../helpers/apiMetrics';
import ncMetaAclMw from '../helpers/ncMetaAclMw'; import ncMetaAclMw from '../helpers/ncMetaAclMw';
import { getAjvValidatorMw } from './helpers' import { getAjvValidatorMw } from './helpers';
async function licenseGet(_req, res) { async function licenseGet(_req, res) {
const license = await Store.get(NC_LICENSE_KEY); const license = await Store.get(NC_LICENSE_KEY);

2
packages/nocodb/src/lib/meta/api/projectApis.ts

@ -18,7 +18,7 @@ import { metaApiMetrics } from '../helpers/apiMetrics';
import { extractPropsAndSanitize } from '../helpers/extractProps'; import { extractPropsAndSanitize } from '../helpers/extractProps';
import NcConfigFactory from '../../utils/NcConfigFactory'; import NcConfigFactory from '../../utils/NcConfigFactory';
import { promisify } from 'util'; import { promisify } from 'util';
import { getAjvValidatorMw, populateMeta } from './helpers' import { getAjvValidatorMw, populateMeta } from './helpers';
import Filter from '../../models/Filter'; import Filter from '../../models/Filter';
const nanoid = customAlphabet('1234567890abcdefghijklmnopqrstuvwxyz_', 4); const nanoid = customAlphabet('1234567890abcdefghijklmnopqrstuvwxyz_', 4);

2
packages/nocodb/src/lib/meta/api/publicApis/publicDataApis.ts

@ -28,7 +28,7 @@ export async function dataList(req: Request, res: Response) {
if ( if (
view.type !== ViewTypes.GRID && view.type !== ViewTypes.GRID &&
view.type !== ViewTypes.KANBAN && view.type !== ViewTypes.KANBAN &&
view.type !== ViewTypes.GALLERY && view.type !== ViewTypes.GALLERY &&
view.type !== ViewTypes.MAP view.type !== ViewTypes.MAP
) { ) {
NcError.notFound('Not found'); NcError.notFound('Not found');

2
packages/nocodb/src/lib/meta/api/sortApis.ts

@ -12,7 +12,7 @@ import Project from '../../models/Project';
import Sort from '../../models/Sort'; import Sort from '../../models/Sort';
import ncMetaAclMw from '../helpers/ncMetaAclMw'; import ncMetaAclMw from '../helpers/ncMetaAclMw';
import { metaApiMetrics } from '../helpers/apiMetrics'; import { metaApiMetrics } from '../helpers/apiMetrics';
import { getAjvValidatorMw } from './helpers' import { getAjvValidatorMw } from './helpers';
// @ts-ignore // @ts-ignore
export async function sortGet(req: Request, res: Response<TableType>) {} export async function sortGet(req: Request, res: Response<TableType>) {}

1
packages/nocodb/src/lib/meta/api/viewApis.ts

@ -89,7 +89,6 @@ async function showAllColumns(req: Request<any, any>, res) {
} }
async function hideAllColumns(req: Request<any, any>, res) { async function hideAllColumns(req: Request<any, any>, res) {
res.json( res.json(
await View.hideAllColumns( await View.hideAllColumns(
req.params.viewId, req.params.viewId,

2
packages/nocodb/src/lib/models/Base.ts

@ -7,7 +7,7 @@ import {
MetaTable, MetaTable,
} from '../utils/globals'; } from '../utils/globals';
import Model from './Model'; import Model from './Model';
import { BaseType, NcBoolType, UITypes } from 'nocodb-sdk' import { BaseType, NcBoolType, UITypes } from 'nocodb-sdk';
import NocoCache from '../cache/NocoCache'; import NocoCache from '../cache/NocoCache';
import CryptoJS from 'crypto-js'; import CryptoJS from 'crypto-js';
import { extractProps } from '../meta/helpers/extractProps'; import { extractProps } from '../meta/helpers/extractProps';

2
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 Noco from '../Noco';
import Column from './Column'; import Column from './Column';
import Model from './Model'; import Model from './Model';

1
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, { await View.updateColumn(body.fk_view_id, mapViewMappedByColumn.id, {
show: true, show: true,
}); });
} }
// update meta // update meta

2
packages/nocodb/src/lib/models/Project.ts

@ -1,6 +1,6 @@
import Base from './/Base'; import Base from './/Base';
import Noco from '../Noco'; import Noco from '../Noco';
import { NcBoolType, ProjectType } from 'nocodb-sdk' import { NcBoolType, ProjectType } from 'nocodb-sdk';
import { import {
CacheDelDirection, CacheDelDirection,
CacheGetType, CacheGetType,

1
packages/nocodb/src/lib/utils/globals.ts

@ -42,7 +42,6 @@ export enum MetaTable {
MAP_VIEW = 'nc_map_view_v2', MAP_VIEW = 'nc_map_view_v2',
MAP_VIEW_COLUMNS = 'nc_map_view_columns_v2', MAP_VIEW_COLUMNS = 'nc_map_view_columns_v2',
STORE = 'nc_store', STORE = 'nc_store',
} }
export const orderedMetaTables = [ export const orderedMetaTables = [

Loading…
Cancel
Save