Browse Source

refactor(nocodb): use extractProps for insertObj

pull/5168/head
Wing-Kam Wong 2 years ago
parent
commit
353cc8ea60
  1. 38
      packages/nocodb/src/lib/models/Audit.ts
  2. 15
      packages/nocodb/src/lib/models/BarcodeColumn.ts
  3. 77
      packages/nocodb/src/lib/models/Column.ts
  4. 43
      packages/nocodb/src/lib/models/Filter.ts
  5. 34
      packages/nocodb/src/lib/models/FormView.ts
  6. 43
      packages/nocodb/src/lib/models/FormViewColumn.ts
  7. 17
      packages/nocodb/src/lib/models/FormulaColumn.ts
  8. 32
      packages/nocodb/src/lib/models/GalleryView.ts
  9. 23
      packages/nocodb/src/lib/models/GalleryViewColumn.ts
  10. 17
      packages/nocodb/src/lib/models/GridView.ts
  11. 25
      packages/nocodb/src/lib/models/GridViewColumn.ts
  12. 64
      packages/nocodb/src/lib/models/Hook.ts
  13. 25
      packages/nocodb/src/lib/models/HookFilter.ts
  14. 21
      packages/nocodb/src/lib/models/KanbanView.ts
  15. 23
      packages/nocodb/src/lib/models/KanbanViewColumn.ts
  16. 38
      packages/nocodb/src/lib/models/LinkToAnotherRecordColumn.ts
  17. 14
      packages/nocodb/src/lib/models/LookupColumn.ts
  18. 45
      packages/nocodb/src/lib/models/Model.ts
  19. 21
      packages/nocodb/src/lib/models/ModelRoleVisibility.ts
  20. 24
      packages/nocodb/src/lib/models/Project.ts
  21. 17
      packages/nocodb/src/lib/models/ProjectUser.ts
  22. 14
      packages/nocodb/src/lib/models/QrCodeColumn.ts
  23. 14
      packages/nocodb/src/lib/models/RollupColumn.ts
  24. 15
      packages/nocodb/src/lib/models/SelectOption.ts
  25. 24
      packages/nocodb/src/lib/models/Sort.ts
  26. 15
      packages/nocodb/src/lib/models/SyncLogs.ts
  27. 18
      packages/nocodb/src/lib/models/SyncSource.ts
  28. 34
      packages/nocodb/src/lib/models/View.ts

38
packages/nocodb/src/lib/models/Audit.ts

@ -2,6 +2,7 @@ import { AuditOperationTypes, AuditType } from 'nocodb-sdk';
import { MetaTable } from '../utils/globals';
import Noco from '../Noco';
import Model from './Model';
import { extractProps } from '../meta/helpers/extractProps';
export default class Audit implements AuditType {
id?: string;
@ -48,27 +49,28 @@ export default class Audit implements AuditType {
return;
}
const insertAudit = async () => {
if (!audit.project_id && audit.fk_model_id) {
audit.project_id = (
await Model.getByIdOrName({ id: audit.fk_model_id }, ncMeta)
const insertObj = extractProps(audit, [
'user',
'ip',
'base_id',
'project_id',
'row_id',
'fk_model_id',
'op_type',
'op_sub_type',
'status',
'description',
'details',
'created_at',
'updated_at',
]);
if (!insertObj.project_id && insertObj.fk_model_id) {
insertObj.project_id = (
await Model.getByIdOrName({ id: insertObj.fk_model_id }, ncMeta)
).project_id;
}
return await ncMeta.metaInsert2(null, null, MetaTable.AUDIT, {
user: audit.user,
ip: audit.ip,
base_id: audit.base_id,
project_id: audit.project_id,
row_id: audit.row_id,
fk_model_id: audit.fk_model_id,
op_type: audit.op_type,
op_sub_type: audit.op_sub_type,
status: audit.status,
description: audit.description,
details: audit.details,
created_at: audit.created_at,
updated_at: audit.updated_at,
});
return await ncMeta.metaInsert2(null, null, MetaTable.AUDIT, insertObj);
};
if (forceAwait) {

15
packages/nocodb/src/lib/models/BarcodeColumn.ts

@ -14,16 +14,17 @@ export default class BarcodeColumn {
}
public static async insert(
data: Partial<BarcodeColumn>,
barcodeColumn: Partial<BarcodeColumn>,
ncMeta = Noco.ncMeta
) {
await ncMeta.metaInsert2(null, null, MetaTable.COL_BARCODE, {
fk_column_id: data.fk_column_id,
fk_barcode_value_column_id: data.fk_barcode_value_column_id,
barcode_format: data.barcode_format,
});
const insertObj = extractProps(barcodeColumn, [
'fk_column_id',
'fk_barcode_value_column_id',
'barcode_format',
]);
await ncMeta.metaInsert2(null, null, MetaTable.COL_BARCODE, insertObj);
return this.read(data.fk_column_id, ncMeta);
return this.read(barcodeColumn.fk_column_id, ncMeta);
}
public static async read(columnId: string, ncMeta = Noco.ncMeta) {
let column =

77
packages/nocodb/src/lib/models/Column.ts

@ -86,41 +86,50 @@ export default class Column<T = any> implements ColumnType {
) {
if (!column.fk_model_id) NcError.badRequest('Missing model id');
const insertObj: any = {
id: column?.id,
fk_model_id: column.fk_model_id,
column_name: column.column_name || column.cn,
title: column.title || column._cn,
uidt: column.uidt,
dt: column.dt,
np: column.np,
ns: column.ns,
clen: column.clen,
cop: column.cop,
pk: column.pk,
rqd: column.rqd,
un: column.un,
ct: column.ct,
ai: column.ai,
unique: column.unique,
cdf: column.cdf,
cc: column.cc,
csn: column.csn,
dtx: column.dtx,
dtxp: column.dtxp,
dtxs: column.dtxs,
au: column.au,
pv: column.pv,
order: column.order,
project_id: column.project_id,
base_id: column.base_id,
system: column.system,
meta:
column.meta && typeof column.meta === 'object'
? JSON.stringify(column.meta)
: column.meta,
};
// TODO: fix type
const insertObj = extractProps(column as any, [
'id',
'fk_model_id',
'column_name',
'title',
'uidt',
'dt',
'np',
'ns',
'clen',
'cop',
'pk',
'rqd',
'un',
'ct',
'ai',
'unique',
'cdf',
'cc',
'csn',
'dtx',
'dtxp',
'dtxs',
'au',
'pv',
'order',
'project_id',
'base_id',
'system',
'meta',
]);
if (!insertObj.column_name) {
insertObj.column_name = column.cn;
}
if (!insertObj.title) {
insertObj.title = column._cn;
}
if (insertObj.meta && typeof insertObj.meta === 'object') {
insertObj.meta = JSON.stringify(insertObj.meta);
}
if (column.validate) {
if (typeof column.validate === 'string')
insertObj.validate = column.validate;

43
packages/nocodb/src/lib/models/Filter.ts

@ -77,29 +77,30 @@ export default class Filter {
}
public static async insert(
filter: Partial<FilterType>,
filter: Partial<FilterType> & { order?: number },
ncMeta = Noco.ncMeta
) {
const insertObj = {
id: filter.id,
fk_view_id: filter.fk_view_id,
fk_hook_id: filter.fk_hook_id,
fk_column_id: filter.fk_column_id,
comparison_op: filter.comparison_op,
value: filter.value,
fk_parent_id: filter.fk_parent_id,
is_group: filter.is_group,
logical_op: filter.logical_op,
project_id: filter.project_id,
base_id: filter.base_id,
order: await ncMeta.metaGetNextOrder(MetaTable.FILTER_EXP, {
[filter.fk_hook_id ? 'fk_hook_id' : 'fk_view_id']: filter.fk_hook_id
? filter.fk_hook_id
: filter.fk_view_id,
}),
};
const insertObj = extractProps(filter, [
'id',
'fk_view_id',
'fk_hook_id',
'fk_column_id',
'comparison_op',
'value',
'fk_parent_id',
'is_group',
'logical_op',
'project_id',
'base_id',
'order',
]);
insertObj.order = await ncMeta.metaGetNextOrder(MetaTable.FILTER_EXP, {
[filter.fk_hook_id ? 'fk_hook_id' : 'fk_view_id']: filter.fk_hook_id
? filter.fk_hook_id
: filter.fk_view_id,
});
if (!(filter.project_id && filter.base_id)) {
let model: { project_id?: string; base_id?: string };
if (filter.fk_view_id) {

34
packages/nocodb/src/lib/models/FormView.ts

@ -54,22 +54,24 @@ export default class FormView implements FormType {
}
static async insert(view: Partial<FormView>, ncMeta = Noco.ncMeta) {
const insertObj = {
fk_view_id: view.fk_view_id,
project_id: view.project_id,
base_id: view.base_id,
heading: view.heading,
subheading: view.subheading,
success_msg: view.success_msg,
redirect_url: view.redirect_url,
redirect_after_secs: view.redirect_after_secs,
email: view.email,
banner_image_url: view.banner_image_url,
logo_url: view.logo_url,
submit_another_form: view.submit_another_form,
show_blank_form: view.show_blank_form,
meta: serializeJSON(view.meta),
};
const insertObj = extractProps(view, [
'fk_view_id',
'project_id',
'base_id',
'heading',
'subheading',
'success_msg',
'redirect_url',
'redirect_after_secs',
'email',
'banner_image_url',
'logo_url',
'submit_another_form',
'show_blank_form',
]);
if (insertObj.meta) {
insertObj.meta = serializeJSON(insertObj.meta);
}
if (!(view.project_id && view.base_id)) {
const viewRef = await View.get(view.fk_view_id);
insertObj.project_id = viewRef.project_id;

43
packages/nocodb/src/lib/models/FormViewColumn.ts

@ -55,27 +55,32 @@ export default class FormViewColumn implements FormColumnType {
}
static async insert(column: Partial<FormViewColumn>, ncMeta = Noco.ncMeta) {
const insertObj: Partial<FormViewColumn> = {
fk_view_id: column.fk_view_id,
fk_column_id: column.fk_column_id,
order: await ncMeta.metaGetNextOrder(MetaTable.FORM_VIEW_COLUMNS, {
fk_view_id: column.fk_view_id,
}),
show: column.show,
project_id: column.project_id,
base_id: column.base_id,
label: column.label,
help: column.help,
description: column.description,
required: column.required,
};
if (column.meta) {
insertObj.meta = serializeJSON(column.meta);
const insertObj = extractProps(column, [
'fk_view_id',
'fk_column_id',
'show',
'project_id',
'base_id',
'label',
'help',
'description',
'required',
'meta',
]);
insertObj.order = await ncMeta.metaGetNextOrder(
MetaTable.FORM_VIEW_COLUMNS,
{
fk_view_id: insertObj.fk_view_id,
}
);
if (insertObj.meta) {
insertObj.meta = serializeJSON(insertObj.meta);
}
if (!(column.project_id && column.base_id)) {
const viewRef = await View.get(column.fk_view_id, ncMeta);
if (!(insertObj.project_id && insertObj.base_id)) {
const viewRef = await View.get(insertObj.fk_view_id, ncMeta);
insertObj.project_id = viewRef.project_id;
insertObj.base_id = viewRef.base_id;
}

17
packages/nocodb/src/lib/models/FormulaColumn.ts

@ -14,17 +14,18 @@ export default class FormulaColumn {
}
public static async insert(
data: Partial<FormulaColumn>,
formulaColumn: Partial<FormulaColumn>,
ncMeta = Noco.ncMeta
) {
await ncMeta.metaInsert2(null, null, MetaTable.COL_FORMULA, {
fk_column_id: data.fk_column_id,
formula_raw: data.formula_raw,
formula: data.formula,
error: data.error,
});
const insertObj = extractProps(formulaColumn, [
'fk_column_id',
'formula_raw',
'formula',
'error',
]);
await ncMeta.metaInsert2(null, null, MetaTable.COL_FORMULA, insertObj);
return this.read(data.fk_column_id, ncMeta);
return this.read(formulaColumn.fk_column_id, ncMeta);
}
public static async read(columnId: string, ncMeta = Noco.ncMeta) {
let column =

32
packages/nocodb/src/lib/models/GalleryView.ts

@ -52,21 +52,23 @@ export default class GalleryView implements GalleryType {
.then((v) => v?.getModel(ncMeta))
.then((m) => m.getColumns(ncMeta));
const insertObj = {
project_id: view.project_id,
base_id: view.base_id,
fk_view_id: view.fk_view_id,
fk_cover_image_col_id:
view?.fk_cover_image_col_id ||
columns?.find((c) => c.uidt === UITypes.Attachment)?.id,
next_enabled: view.next_enabled,
prev_enabled: view.prev_enabled,
cover_image_idx: view.cover_image_idx,
cover_image: view.cover_image,
restrict_types: view.restrict_types,
restrict_size: view.restrict_size,
restrict_number: view.restrict_number,
};
const insertObj = extractProps(view, [
'project_id',
'base_id',
'fk_view_id',
'next_enabled',
'prev_enabled',
'cover_image_idx',
'cover_image',
'restrict_types',
'restrict_size',
'restrict_number',
]);
insertObj.fk_cover_image_col_id =
view?.fk_cover_image_col_id ||
columns?.find((c) => c.uidt === UITypes.Attachment)?.id;
if (!(view.project_id && view.base_id)) {
const viewRef = await View.get(view.fk_view_id);
insertObj.project_id = viewRef.project_id;

23
packages/nocodb/src/lib/models/GalleryViewColumn.ts

@ -2,6 +2,7 @@ import Noco from '../Noco';
import { CacheGetType, CacheScope, MetaTable } from '../utils/globals';
import View from './View';
import NocoCache from '../cache/NocoCache';
import { extractProps } from '../meta/helpers/extractProps';
export default class GalleryViewColumn {
id: string;
@ -43,16 +44,20 @@ export default class GalleryViewColumn {
column: Partial<GalleryViewColumn>,
ncMeta = Noco.ncMeta
) {
const insertObj = {
fk_view_id: column.fk_view_id,
fk_column_id: column.fk_column_id,
order: await ncMeta.metaGetNextOrder(MetaTable.GALLERY_VIEW_COLUMNS, {
const insertObj = extractProps(column, [
'fk_view_id',
'fk_column_id',
'show',
'project_id',
'base_id',
]);
insertObj.order = await ncMeta.metaGetNextOrder(
MetaTable.GALLERY_VIEW_COLUMNS,
{
fk_view_id: column.fk_view_id,
}),
show: column.show,
project_id: column.project_id,
base_id: column.base_id,
};
}
);
if (!(column.project_id && column.base_id)) {
const viewRef = await View.get(column.fk_view_id, ncMeta);

17
packages/nocodb/src/lib/models/GridView.ts

@ -41,14 +41,15 @@ export default class GridView {
}
static async insert(view: Partial<GridView>, ncMeta = Noco.ncMeta) {
const insertObj = {
fk_view_id: view.fk_view_id,
project_id: view.project_id,
base_id: view.base_id,
row_height: view.row_height,
};
if (!(view.project_id && view.base_id)) {
const viewRef = await View.get(view.fk_view_id, ncMeta);
const insertObj = extractProps(view, [
'fk_view_id',
'project_id',
'base_id',
'row_height',
]);
if (!(insertObj.project_id && insertObj.base_id)) {
const viewRef = await View.get(insertObj.fk_view_id, ncMeta);
insertObj.project_id = viewRef.project_id;
insertObj.base_id = viewRef.base_id;
}

25
packages/nocodb/src/lib/models/GridViewColumn.ts

@ -67,18 +67,19 @@ export default class GridViewColumn implements GridColumnType {
}
static async insert(column: Partial<GridViewColumn>, ncMeta = Noco.ncMeta) {
const insertObj = {
fk_view_id: column.fk_view_id,
fk_column_id: column.fk_column_id,
order:
column?.order ??
(await ncMeta.metaGetNextOrder(MetaTable.GRID_VIEW_COLUMNS, {
fk_view_id: column.fk_view_id,
})),
show: column.show,
project_id: column.project_id,
base_id: column.base_id,
};
const insertObj = extractProps(column, [
'fk_view_id',
'fk_column_id',
'show',
'project_id',
'base_id',
]);
insertObj.order =
column?.order ??
(await ncMeta.metaGetNextOrder(MetaTable.GRID_VIEW_COLUMNS, {
fk_view_id: column.fk_view_id,
}));
if (!(column.project_id && column.base_id)) {
const viewRef = await View.get(column.fk_view_id, ncMeta);

64
packages/nocodb/src/lib/models/Hook.ts

@ -122,32 +122,44 @@ export default class Hook implements HookType {
>,
ncMeta = Noco.ncMeta
) {
const insertObj = {
fk_model_id: hook.fk_model_id,
title: hook.title,
description: hook.description,
env: hook.env,
type: hook.type,
event: hook.event?.toLowerCase?.(),
operation: hook.operation?.toLowerCase?.(),
async: hook.async,
payload: !!hook.payload,
url: hook.url,
headers: hook.headers,
condition: hook.condition,
notification:
hook.notification && typeof hook.notification === 'object'
? JSON.stringify(hook.notification)
: hook.notification,
retries: hook.retries,
retry_interval: hook.retry_interval,
timeout: hook.timeout,
active: hook.active,
project_id: hook.project_id,
base_id: hook.base_id,
created_at: hook.created_at,
updated_at: hook.updated_at,
};
const insertObj = extractProps(hook, [
'fk_model_id',
'title',
'description',
'env',
'type',
'event',
'operation',
'async',
'url',
'headers',
'notification',
'retries',
'retry_interval',
'timeout',
'active',
'project_id',
'base_id',
'created_at',
'updated_at',
]);
if (insertObj.event) {
insertObj.event = insertObj.event.toLowerCase() as 'after' | 'before';
}
if (insertObj.operation) {
insertObj.operation = insertObj.operation.toLowerCase() as
| 'insert'
| 'delete'
| 'update';
}
if (insertObj.notification) {
insertObj.notification && typeof insertObj.notification === 'object'
? JSON.stringify(insertObj.notification)
: insertObj.notification;
}
if (!(hook.project_id && hook.base_id)) {
const model = await Model.getByIdOrName({ id: hook.fk_model_id }, ncMeta);

25
packages/nocodb/src/lib/models/HookFilter.ts

@ -49,20 +49,19 @@ export default class Filter {
filter: Partial<FilterType>,
ncMeta = Noco.ncMeta
) {
const insertObj = {
id: filter.id,
fk_view_id: filter.fk_view_id,
fk_column_id: filter.fk_column_id,
comparison_op: filter.comparison_op,
value: filter.value,
fk_parent_id: filter.fk_parent_id,
is_group: filter.is_group,
logical_op: filter.logical_op,
const insertObj = extractProps(filter, [
'id',
'fk_view_id',
'fk_column_id',
'comparison_op',
'value',
'fk_parent_id',
'is_group',
'logical_op',
'project_id',
'base_id',
]);
project_id: filter.project_id,
base_id: filter.base_id,
};
if (!(filter.project_id && filter.base_id)) {
const model = await Column.get({ colId: filter.fk_column_id }, ncMeta);
insertObj.project_id = model.project_id;

21
packages/nocodb/src/lib/models/KanbanView.ts

@ -64,16 +64,17 @@ export default class KanbanView implements KanbanType {
.then((v) => v?.getModel(ncMeta))
.then((m) => m.getColumns(ncMeta));
const insertObj = {
project_id: view.project_id,
base_id: view.base_id,
fk_view_id: view.fk_view_id,
fk_grp_col_id: view.fk_grp_col_id,
fk_cover_image_col_id:
view?.fk_cover_image_col_id ||
columns?.find((c) => c.uidt === UITypes.Attachment)?.id,
meta: view.meta,
};
const insertObj = extractProps(view, [
'project_id',
'base_id',
'fk_view_id',
'fk_grp_col_id',
'meta',
]);
insertObj.fk_cover_image_col_id =
view?.fk_cover_image_col_id ||
columns?.find((c) => c.uidt === UITypes.Attachment)?.id;
if (!(view.project_id && view.base_id)) {
const viewRef = await View.get(view.fk_view_id);

23
packages/nocodb/src/lib/models/KanbanViewColumn.ts

@ -2,6 +2,7 @@ import Noco from '../Noco';
import { CacheGetType, CacheScope, MetaTable } from '../utils/globals';
import View from './View';
import NocoCache from '../cache/NocoCache';
import { extractProps } from '../meta/helpers/extractProps';
export default class KanbanViewColumn {
id: string;
@ -40,16 +41,20 @@ export default class KanbanViewColumn {
return view && new KanbanViewColumn(view);
}
static async insert(column: Partial<KanbanViewColumn>, ncMeta = Noco.ncMeta) {
const insertObj = {
fk_view_id: column.fk_view_id,
fk_column_id: column.fk_column_id,
order: await ncMeta.metaGetNextOrder(MetaTable.KANBAN_VIEW_COLUMNS, {
const insertObj = extractProps(column, [
'fk_view_id',
'fk_column_id',
'show',
'project_id',
'base_id',
]);
insertObj.order = await ncMeta.metaGetNextOrder(
MetaTable.KANBAN_VIEW_COLUMNS,
{
fk_view_id: column.fk_view_id,
}),
show: column.show,
project_id: column.project_id,
base_id: column.base_id,
};
}
);
if (!(column.project_id && column.base_id)) {
const viewRef = await View.get(column.fk_view_id, ncMeta);

38
packages/nocodb/src/lib/models/LinkToAnotherRecordColumn.ts

@ -1,9 +1,9 @@
import Noco from '../Noco';
import Column from './Column';
import Model from './Model';
// import NocoCache from '../cache/NocoCache';
import { CacheGetType, CacheScope, MetaTable } from '../utils/globals';
import NocoCache from '../cache/NocoCache';
import { extractProps } from '../meta/helpers/extractProps';
export default class LinkToAnotherRecordColumn {
fk_column_id?: string;
@ -89,27 +89,21 @@ export default class LinkToAnotherRecordColumn {
data: Partial<LinkToAnotherRecordColumn>,
ncMeta = Noco.ncMeta
) {
await ncMeta.metaInsert2(null, null, MetaTable.COL_RELATIONS, {
fk_column_id: data.fk_column_id,
// ref_db_alias
type: data.type,
// db_type:
fk_child_column_id: data.fk_child_column_id,
fk_parent_column_id: data.fk_parent_column_id,
fk_mm_model_id: data.fk_mm_model_id,
fk_mm_child_column_id: data.fk_mm_child_column_id,
fk_mm_parent_column_id: data.fk_mm_parent_column_id,
ur: data.ur,
dr: data.dr,
fk_index_name: data.fk_index_name,
fk_related_model_id: data.fk_related_model_id,
virtual: data.virtual,
});
const insertObj = extractProps(data, [
'fk_column_id',
'type',
'fk_child_column_id',
'fk_parent_column_id',
'fk_mm_model_id',
'fk_mm_child_column_id',
'fk_mm_parent_column_id',
'ur',
'dr',
'fk_index_name',
'fk_related_model_id',
'virtual',
]);
await ncMeta.metaInsert2(null, null, MetaTable.COL_RELATIONS, insertObj);
return this.read(data.fk_column_id, ncMeta);
}

14
packages/nocodb/src/lib/models/LookupColumn.ts

@ -1,8 +1,8 @@
import Noco from '../Noco';
// import NocoCache from '../cache/NocoCache';
import Column from './Column';
import { CacheGetType, CacheScope, MetaTable } from '../utils/globals';
import NocoCache from '../cache/NocoCache';
import { extractProps } from '../meta/helpers/extractProps';
export default class LookupColumn {
fk_relation_column_id: string;
@ -29,11 +29,13 @@ export default class LookupColumn {
data: Partial<LookupColumn>,
ncMeta = Noco.ncMeta
) {
await ncMeta.metaInsert2(null, null, MetaTable.COL_LOOKUP, {
fk_column_id: data.fk_column_id,
fk_relation_column_id: data.fk_relation_column_id,
fk_lookup_column_id: data.fk_lookup_column_id,
});
const insertObj = extractProps(data, [
'fk_column_id',
'fk_relation_column_id',
'fk_lookup_column_id',
]);
await ncMeta.metaInsert2(null, null, MetaTable.COL_LOOKUP, insertObj);
await NocoCache.appendToList(
CacheScope.COL_LOOKUP,

45
packages/nocodb/src/lib/models/Model.ts

@ -22,6 +22,7 @@ import View from './View';
import { NcError } from '../meta/helpers/catchError';
import Audit from './Audit';
import { sanitize } from '../db/sql-data-mapper/lib/sql/helpers/sanitize';
import { extractProps } from '../meta/helpers/extractProps';
export default class Model implements TableType {
copy_enabled: boolean;
@ -103,25 +104,39 @@ export default class Model implements TableType {
},
ncMeta = Noco.ncMeta
) {
const insertObj = extractProps(model, [
'table_name',
'title',
'mm',
'order',
'created_at',
'updated_at',
'id',
]);
if (insertObj.mm) {
insertObj.mm = !!insertObj.mm;
}
if (!insertObj.order) {
insertObj.order = await ncMeta.metaGetNextOrder(
MetaTable.FORM_VIEW_COLUMNS,
{
project_id: projectId,
base_id: baseId,
}
);
}
if (!insertObj.type) {
insertObj.type = ModelTypes.TABLE;
}
const { id } = await ncMeta.metaInsert2(
projectId,
baseId,
MetaTable.MODELS,
{
table_name: model.table_name,
title: model.title,
mm: !!model.mm,
order:
model.order ||
(await ncMeta.metaGetNextOrder(MetaTable.FORM_VIEW_COLUMNS, {
project_id: projectId,
base_id: baseId,
})),
type: model.type || ModelTypes.TABLE,
created_at: model.created_at,
updated_at: model.updated_at,
id: model.id,
}
insertObj
);
await NocoCache.appendToList(

21
packages/nocodb/src/lib/models/ModelRoleVisibility.ts

@ -8,6 +8,7 @@ import {
} from '../utils/globals';
import NocoCache from '../cache/NocoCache';
import View from './View';
import { extractProps } from '../meta/helpers/extractProps';
export default class ModelRoleVisibility implements ModelRoleVisibilityType {
id?: string;
@ -134,17 +135,17 @@ export default class ModelRoleVisibility implements ModelRoleVisibilityType {
>,
ncMeta = Noco.ncMeta
) {
const insertObj = {
role: body.role,
disabled: body.disabled,
fk_view_id: body.fk_view_id,
project_id: body.project_id,
base_id: body.base_id,
created_at: body.created_at,
updated_at: body.updated_at,
};
const insertObj = extractProps(body, [
'role',
'disabled',
'fk_view_id',
'project_id',
'base_id',
'created_at',
'updated_at',
]);
if (!(body.project_id && body.base_id)) {
if (!(insertObj.project_id && insertObj.base_id)) {
const view = await View.get(body.fk_view_id, ncMeta);
insertObj.project_id = view.project_id;
insertObj.base_id = view.base_id;

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

@ -36,25 +36,27 @@ export default class Project implements ProjectType {
}
public static async createProject(
projectBody: ProjectType & {
project: ProjectType & {
created_at?;
updated_at?;
},
ncMeta = Noco.ncMeta
): Promise<Project> {
const insertObj = extractProps(project, [
'id',
'title',
'prefix',
'description',
'is_meta',
'created_at',
'updated_at',
]);
const { id: projectId } = await ncMeta.metaInsert2(
null,
null,
MetaTable.PROJECT,
{
id: projectBody?.id,
title: projectBody.title,
prefix: projectBody.prefix,
description: projectBody.description,
is_meta: projectBody.is_meta,
created_at: projectBody.created_at,
updated_at: projectBody.updated_at,
}
insertObj
);
await NocoCache.appendToList(
@ -63,7 +65,7 @@ export default class Project implements ProjectType {
`${CacheScope.PROJECT}:${projectId}`
);
for (const base of projectBody.bases) {
for (const base of project.bases) {
await Base.createBase(
{
type: base.config?.client,

17
packages/nocodb/src/lib/models/ProjectUser.ts

@ -8,6 +8,7 @@ import {
import Noco from '../Noco';
import NocoCache from '../cache/NocoCache';
import User from './User';
import { extractProps } from '../meta/helpers/extractProps';
export default class ProjectUser {
project_id: string;
@ -22,17 +23,19 @@ export default class ProjectUser {
projectUser: Partial<ProjectUser & { created_at?: any; updated_at?: any }>,
ncMeta = Noco.ncMeta
) {
const insertObj = extractProps(projectUser, [
'fk_user_id',
'project_id',
'roles',
'created_at',
'updated_at',
]);
const { project_id, fk_user_id } = await ncMeta.metaInsert2(
null,
null,
MetaTable.PROJECT_USERS,
{
fk_user_id: projectUser.fk_user_id,
project_id: projectUser.project_id,
roles: projectUser.roles,
created_at: projectUser.created_at,
updated_at: projectUser.updated_at,
},
insertObj,
true
);

14
packages/nocodb/src/lib/models/QrCodeColumn.ts

@ -12,15 +12,17 @@ export default class QrCodeColumn {
}
public static async insert(
data: Partial<QrCodeColumn>,
qrCode: Partial<QrCodeColumn>,
ncMeta = Noco.ncMeta
) {
await ncMeta.metaInsert2(null, null, MetaTable.COL_QRCODE, {
fk_column_id: data.fk_column_id,
fk_qr_value_column_id: data.fk_qr_value_column_id,
});
const insertObj = extractProps(qrCode, [
'fk_column_id',
'fk_qr_value_column_id',
]);
await ncMeta.metaInsert2(null, null, MetaTable.COL_QRCODE, insertObj);
return this.read(data.fk_column_id, ncMeta);
return this.read(qrCode.fk_column_id, ncMeta);
}
public static async read(columnId: string, ncMeta = Noco.ncMeta) {
let column =

14
packages/nocodb/src/lib/models/RollupColumn.ts

@ -2,6 +2,7 @@ import Noco from '../Noco';
import Column from './Column';
import { CacheGetType, CacheScope, MetaTable } from '../utils/globals';
import NocoCache from '../cache/NocoCache';
import { extractProps } from '../meta/helpers/extractProps';
export default class RollupColumn {
fk_column_id;
@ -20,12 +21,13 @@ export default class RollupColumn {
data: Partial<RollupColumn>,
ncMeta = Noco.ncMeta
) {
await ncMeta.metaInsert2(null, null, MetaTable.COL_ROLLUP, {
fk_column_id: data.fk_column_id,
fk_relation_column_id: data.fk_relation_column_id,
fk_rollup_column_id: data.fk_rollup_column_id,
rollup_function: data.rollup_function,
});
const insertObj = extractProps(data, [
'fk_column_id',
'fk_relation_column_id',
'fk_rollup_column_id',
'rollup_function',
]);
await ncMeta.metaInsert2(null, null, MetaTable.COL_ROLLUP, insertObj);
await NocoCache.appendToList(
CacheScope.COL_ROLLUP,

15
packages/nocodb/src/lib/models/SelectOption.ts

@ -1,6 +1,7 @@
import Noco from '../Noco';
import NocoCache from '../cache/NocoCache';
import { CacheGetType, CacheScope, MetaTable } from '../utils/globals';
import { extractProps } from '../meta/helpers/extractProps';
export default class SelectOption {
title: string;
@ -16,11 +17,23 @@ export default class SelectOption {
data: Partial<SelectOption>,
ncMeta = Noco.ncMeta
) {
// title: string;
// fk_column_id: string;
// color: string;
// order: number;
const insertObj = extractProps(data, [
'title',
'fk_column_id',
'color',
'order',
]);
const { id } = await ncMeta.metaInsert2(
null,
null,
MetaTable.COL_SELECT_OPTIONS,
data
insertObj
);
await NocoCache.appendToList(

24
packages/nocodb/src/lib/models/Sort.ts

@ -9,6 +9,7 @@ import {
} from '../utils/globals';
import NocoCache from '../cache/NocoCache';
import { SortType } from 'nocodb-sdk';
import { extractProps } from '../meta/helpers/extractProps';
export default class Sort {
id: string;
@ -35,11 +36,20 @@ export default class Sort {
}
public static async insert(
sortObj: Partial<Sort> & { push_to_top?: boolean },
sortObj: Partial<Sort> & { push_to_top?: boolean; order?: number },
ncMeta = Noco.ncMeta
) {
const insertObj = extractProps(sortObj, [
'id',
'fk_view_id',
'fk_column_id',
'direction',
'project_id',
'base_id',
]);
// todo: implement a generic function
const order = sortObj.push_to_top
insertObj.order = sortObj.push_to_top
? 1
: (+(
await ncMeta
@ -50,16 +60,6 @@ export default class Sort {
})
.first()
)?.order || 0) + 1;
const insertObj = {
id: sortObj.id,
fk_view_id: sortObj.fk_view_id,
fk_column_id: sortObj.fk_column_id,
direction: sortObj.direction,
project_id: sortObj.project_id,
base_id: sortObj.base_id,
order,
};
if (!(sortObj.project_id && sortObj.base_id)) {
const model = await Column.get({ colId: sortObj.fk_column_id }, ncMeta);
insertObj.project_id = model.project_id;

15
packages/nocodb/src/lib/models/SyncLogs.ts

@ -1,5 +1,6 @@
import Noco from '../Noco';
import { MetaTable } from '../utils/globals';
import { extractProps } from '../meta/helpers/extractProps';
export default class SyncLogs {
id?: string;
@ -34,13 +35,13 @@ export default class SyncLogs {
>,
ncMeta = Noco.ncMeta
) {
const insertObj = {
project_id: syncLog?.project_id,
fk_sync_source_id: syncLog?.fk_sync_source_id,
time_taken: syncLog?.time_taken,
status: syncLog?.status,
status_details: syncLog?.status_details,
};
const insertObj = extractProps(syncLog, [
'project_id',
'fk_sync_source_id',
'time_taken',
'status',
'status_details',
]);
const { id } = await ncMeta.metaInsert2(
null,

18
packages/nocodb/src/lib/models/SyncSource.ts

@ -73,15 +73,15 @@ export default class SyncSource {
>,
ncMeta = Noco.ncMeta
) {
const insertObj = {
id: syncSource?.id,
title: syncSource?.title,
type: syncSource?.type,
details: syncSource?.details,
project_id: syncSource?.project_id,
base_id: syncSource?.base_id,
fk_user_id: syncSource?.fk_user_id,
};
const insertObj = extractProps(syncSource, [
'id',
'title',
'type',
'details',
'project_id',
'base_id',
'fk_user_id',
]);
if (insertObj.details && typeof insertObj.details === 'object') {
insertObj.details = JSON.stringify(insertObj.details);

34
packages/nocodb/src/lib/models/View.ts

@ -244,25 +244,29 @@ export default class View implements ViewType {
},
ncMeta = Noco.ncMeta
) {
const insertObj = extractProps(view, [
'id',
'title',
'is_default',
'type',
'fk_model_id',
'project_id',
'base_id',
'created_at',
'updated_at',
'meta',
]);
// get order value
const order = await ncMeta.metaGetNextOrder(MetaTable.VIEWS, {
insertObj.order = await ncMeta.metaGetNextOrder(MetaTable.VIEWS, {
fk_model_id: view.fk_model_id,
});
const insertObj = {
id: view.id,
title: view.title,
show: true,
is_default: view.is_default,
order,
type: view.type,
fk_model_id: view.fk_model_id,
project_id: view.project_id,
base_id: view.base_id,
created_at: view.created_at,
updated_at: view.updated_at,
meta: view.meta ?? {},
};
insertObj.show = true;
if (!insertObj.meta) {
insertObj.meta = {};
}
insertObj.meta = stringifyMetaProp(insertObj);

Loading…
Cancel
Save