github
/
nocodb
mirror of https://github.com/nocodb/nocodb
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

nested lookup, user logs, duplicate columns, error handling 

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
sync
Raju Udava 3 years ago
parent
54736d8d70
commit
861b96371f
2 changed files with 124 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 119
      packages/nocodb/tests/sync/sync.js
  2. 23
      packages/nocodb/tests/sync/test.js

119
packages/nocodb/tests/sync/sync.js
Unescape View File

@ -5,7 +5,7 @@ const axios = require('axios').default;
const FormData = require('form-data');
function syncLog(log) {
console.log(log)
// console.log(log)
}
// read configurations
@ -203,11 +203,11 @@ function tablesPrepare(tblSchema) {
table.table_name = tblSchema[i].name;
table.title = tblSchema[i].name;
// insert record_id of type ID by default
// insert _aTbl_nc_rec_id of type ID by default
table.columns = [
{
title: 'record_id',
column_name: 'record_id',
title: '_aTbl_nc_rec_id',
column_name: '_aTbl_nc_rec_id',
// uidt: UITypes.ID
uidt: UITypes.SingleLineText,
pk: true,
@ -230,11 +230,20 @@ function tablesPrepare(tblSchema) {
title: col.name.trim(),
// knex complains use of '?' in field name
//column_name: col.name.replace(/\?/g, '\\?').trim(),
column_name: col.name.replace(/\?/g, 'QQ').trim(),
// good to replace all special characters by _ in one go
column_name: col.name.replace(/\?/g, 'QQ').replace('.', '_').trim(),
uidt: getNocoType(col)
};
// check if already a column exists with same name?
let duplicateColumn = table.columns.find(x => x.title === col.name.trim())
if(duplicateColumn) {
console.log(`## Duplicate ${ncCol.title}`)
ncCol.title = ncCol.title + '_2'
ncCol.column_name = ncCol.column_name + '_2'
}
// additional column parameters when applicable
let colOptions = getNocoTypeOptions(col);
@ -259,9 +268,13 @@ async function nocoCreateBaseSchema(aTblSchema) {
// base schema preparation: exclude
let tables = tablesPrepare(aTblSchema);
console.log(`Total tables: ${tables.length} `)
// for each table schema, create nc table
for (let idx = 0; idx < tables.length; idx++) {
console.log(`Creating base table schema: [${idx+1}/${tables.length}] ${tables[idx].title}`)
syncLog(`NC API: dbTable.create ${tables[idx].title}`)
let table = await api.dbTable.create(
ncCreatedProjectSchema.id,
@ -284,6 +297,7 @@ async function nocoCreateBaseSchema(aTblSchema) {
async function nocoCreateLinkToAnotherRecord(aTblSchema) {
// Link to another RECORD
for (let idx = 0; idx < aTblSchema.length; idx++) {
let aTblLinkColumns = aTblSchema[idx].columns.filter(
x => x.type === 'foreignKey'
);
@ -292,6 +306,7 @@ async function nocoCreateLinkToAnotherRecord(aTblSchema) {
//
if (aTblLinkColumns.length) {
for (let i = 0; i < aTblLinkColumns.length; i++) {
console.log(`Configuring Links: ${aTblSchema[idx].name} [${idx+1}/${aTblSchema.length}] :: ${i}/${aTblLinkColumns.length}`)
{
let src = aTbl_getColumnName(aTblLinkColumns[i].id)
@ -312,10 +327,17 @@ async function nocoCreateLinkToAnotherRecord(aTblSchema) {
// retrieve child table ID (nc) from table name
let childTableId = (await nc_getTableSchema(childTable.tn)).id;
// check if already a column exists with this name?
let srcTbl = await api.dbTable.read(srcTableId)
let duplicate = srcTbl.columns.find(x => x.title === aTblLinkColumns[i].name)
let suffix = duplicate?'_2':'';
if(duplicate)
console.log(`## Duplicate ${aTblLinkColumns[i].name}`)
// create link
let column = await api.dbTableColumn.create(srcTableId, {
uidt: 'LinkToAnotherRecord',
title: aTblLinkColumns[i].name,
title: aTblLinkColumns[i].name + suffix,
parentId: srcTableId,
childId: childTableId,
type: 'mm'
@ -366,7 +388,15 @@ async function nocoCreateLinkToAnotherRecord(aTblSchema) {
col => col.title === ncLinkMappingTable[x].nc.title
);
// hack // fix me
if(parentLinkColumn.uidt !== 'LinkToAnotherRecord') {
parentLinkColumn = parentTblSchema.columns.find(
col => col.title === (ncLinkMappingTable[x].nc.title + '_2')
);
}
let childLinkColumn = {};
if (parentLinkColumn.colOptions.type == 'hm') {
// for hm:
// mapping between child & parent column id is direct
@ -395,12 +425,19 @@ async function nocoCreateLinkToAnotherRecord(aTblSchema) {
);
}
// check if already a column exists with this name?
let duplicate = childTblSchema.columns.find(x => x.title === aTblLinkColumns[i].name)
let suffix = duplicate?'_2':'';
if(duplicate)
console.log(`## Duplicate ${aTblLinkColumns[i].name}`)
// rename
// note that: current rename API requires us to send all parameters,
// not just title being renamed
let res = await api.dbTableColumn.update(childLinkColumn.id, {
...childLinkColumn,
title: aTblLinkColumns[i].name,
title: aTblLinkColumns[i].name + suffix,
});
// console.log(res.columns.find(x => x.title === aTblLinkColumns[i].name))
syncLog(`NC API: dbTableColumn.update rename symmetric column`)
@ -410,9 +447,12 @@ async function nocoCreateLinkToAnotherRecord(aTblSchema) {
}
}
let nestedLookupTbl = []
async function nocoCreateLookups(aTblSchema) {
// LookUps
for (let idx = 0; idx < aTblSchema.length; idx++) {
let aTblColumns = aTblSchema[idx].columns.filter(x => x.type === 'lookup');
// parent table ID
@ -421,6 +461,14 @@ async function nocoCreateLookups(aTblSchema) {
if (aTblColumns.length) {
// Lookup
for (let i = 0; i < aTblColumns.length; i++) {
console.log(`Configuring Lookups: ${aTblSchema[idx].name} [${idx+1}/${aTblSchema.length}] :: ${i+1}/${aTblColumns.length}`)
// something is not right, skip
if(aTblColumns[i]?.typeOptions?.dependencies?.invalidColumnIds?.length) {
console.log(` >> ## Invalid column IDs mapped; skip`)
continue
}
let ncRelationColumn = await nc_getColumnSchema(
aTblColumns[i].typeOptions.relationColumnId
);
@ -428,6 +476,12 @@ async function nocoCreateLookups(aTblSchema) {
aTblColumns[i].typeOptions.foreignTableRollupColumnId
);
if(ncLookupColumn === undefined) {
aTblColumns[i]['srcTableId'] = srcTableId;
nestedLookupTbl.push(aTblColumns[i])
continue;
}
let lookupColumn = await api.dbTableColumn.create(srcTableId, {
uidt: 'Lookup',
title: aTblColumns[i].name,
@ -439,6 +493,48 @@ async function nocoCreateLookups(aTblSchema) {
}
}
}
let level = 2
let nestedCnt = 0
while(nestedLookupTbl.length) {
// if nothing has changed from previous iteration, skip rest
if(nestedCnt === nestedLookupTbl.length) {
console.log(`Failed to configure ${nestedLookupTbl.length} lookups`)
break;
}
// Nested lookup
nestedCnt = nestedLookupTbl.length
for (let i = 0; i < nestedLookupTbl.length; i++) {
console.log(`Configuring Nested Lookup: Level-${level} ${i+1}/${nestedCnt}`)
let srcTableId = nestedLookupTbl[i].srcTableId
let ncRelationColumn = await nc_getColumnSchema(
nestedLookupTbl[i].typeOptions.relationColumnId
);
let ncLookupColumn = await nc_getColumnSchema(
nestedLookupTbl[i].typeOptions.foreignTableRollupColumnId
);
if (ncLookupColumn === undefined) {
continue;
}
let lookupColumn = await api.dbTableColumn.create(srcTableId, {
uidt: 'Lookup',
title: nestedLookupTbl[i].name,
fk_relation_column_id: ncRelationColumn.id,
fk_lookup_column_id: ncLookupColumn.id
});
// remove entry
nestedLookupTbl.splice(i, 1)
syncLog(`NC API: dbTableColumn.create LOOKUP`)
}
level++
}
}
async function nocoCreateRollups(aTblSchema) {
@ -506,7 +602,7 @@ async function nc_hideColumn(tblName, viewName, columnName) {
async function nocoReconfigureFields(aTblSchema) {
for (let idx = 0; idx < aTblSchema.length; idx++) {
let hiddenColumns = ["record_id"]
let hiddenColumns = ["_aTbl_nc_rec_id"]
// extract other columns hidden in this view
let hiddenColumnID = aTblSchema[idx].meaningfulColumnOrder.filter(x => x.visibility===false)
@ -643,7 +739,7 @@ function nocoBaseDataProcessing(table, record) {
}
// insert airtable record ID explicitly into each records
rec['record_id'] = record.id;
rec['_aTbl_nc_rec_id'] = record.id;
// console.log(rec)
@ -801,7 +897,8 @@ async function nc_migrateATbl() {
}
nc_migrateATbl().catch(e => {
console.log(e?.config?.url);
// console.log(e?.config?.url);
console.log(e)
});

23
packages/nocodb/tests/sync/test.js
Unescape View File

@ -13,12 +13,12 @@ const syncDB = {
'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6InVzZXJAbm9jb2RiLmNvbSIsImZpcnN0bmFtZSI6bnVsbCwibGFzdG5hbWUiOm51bGwsImlkIjoidXNfOGtwZ3lqd3lzcGEwN3giLCJyb2xlcyI6InVzZXIsc3VwZXIiLCJpYXQiOjE2NTEwNTIzNzl9.QjK4-w1u_ZYaRAjmCD_0YBZyHerMm08LcRp0oheGAIw'
};
const api = new Api({
baseURL: syncDB.baseURL,
headers: {
'xc-auth': syncDB.authToken
}
});
// const apiSignUp = new Api({
// baseURL: syncDB.baseURL,
// });
let api;
async function init() {
// delete 'sample' project if already exists
@ -33,8 +33,17 @@ async function init() {
}
(async () => {
api = new Api({
baseURL: syncDB.baseURL,
});
let auth = await api.auth.signup({email: 'user@nocodb.com', password: 'Password123.'})
await init()
api = new Api({
baseURL: syncDB.baseURL,
headers: {
'xc-auth': auth.token
}
});
let ncCreatedProjectSchema = await api.project.create({
title: syncDB.projectName

Write Preview
Loading…
Cancel
Save