From 58480d139e2f7b816c542fbcf5c463eb157f15ee Mon Sep 17 00:00:00 2001 From: Raju Udava <86527202+dstala@users.noreply.github.com> Date: Mon, 2 May 2022 00:20:06 +0530 Subject: [PATCH] hide columns for secondary views, id mapping table Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> --- packages/nocodb/tests/sync/sync.js | 208 +++++++++++++++++++++-------- 1 file changed, 153 insertions(+), 55 deletions(-) diff --git a/packages/nocodb/tests/sync/sync.js b/packages/nocodb/tests/sync/sync.js index 0a7c010d8c..d778111818 100644 --- a/packages/nocodb/tests/sync/sync.js +++ b/packages/nocodb/tests/sync/sync.js @@ -15,6 +15,7 @@ const start = Date.now(); let enableErrorLogs = false let process_aTblData = true let generate_migrationStats = true +let aTblNcMappingTbl = {} let migrationStats = [] let migrationStatsObj = { table_name: '', @@ -33,6 +34,27 @@ let migrationStatsObj = { } } +// static mapping records between aTblId && ncId +async function addToMappingTbl(aTblId, ncId, ncName) { + aTblNcMappingTbl[`${aTblId}`] = { + ncId: ncId, + + // name added to assist in quick debug + ncName: ncName + } +} + +function getNcIdFromAtId(aId) { + return aTblNcMappingTbl[`aId`]?.ncId +} + +function getNcNameFromAtId(aId) { + return aTblNcMappingTbl[`aId`]?.ncName +} + + +// statistics +// async function generateMigrationStats(aTblSchema) { for (let idx = 0; idx < aTblSchema.length; idx++) { @@ -76,6 +98,8 @@ async function generateMigrationStats(aTblSchema) { x => x.uidt === 'Rollup' ); + // all links hardwired as m2m. m2m generates additional tables per link + // hence link/2 migrationStatsObj.nc.columns = ncTbl.columns.length - linkColumn.length/2; migrationStatsObj.nc.links = linkColumn.length/2; migrationStatsObj.nc.lookup = lookup.length; @@ -396,12 +420,23 @@ async function nocoCreateBaseSchema(aTblSchema) { tables[idx] ); + // update mapping table + await addToMappingTbl(aTblSchema[idx].id, table.id, table.title) + for(let colIdx=0; colIdx x.name.trim() === table.columns[colIdx].title)?.id + if(aId) + await addToMappingTbl(aId, table.columns[colIdx].id, table.columns[colIdx].title) + } + // update default view name- to match it to airtable view name syncLog(`NC API: dbView.list ${table.id}`) let view = await api.dbView.list(table.id); syncLog(`NC API: dbView.update ${view.list[0].id} ${aTblSchema[idx].views[0].name}`) - let x = await api.dbView.update(view.list[0].id, {title: aTblSchema[idx].views[0].name}) + let aTbl_grid = aTblSchema[idx].views.find(x => x.type === 'grid') + let x = await api.dbView.update(view.list[0].id, {title: aTbl_grid.name}) + + await addToMappingTbl(aTbl_grid.id, table.views[0].id, aTbl_grid.name) } // debug @@ -450,7 +485,7 @@ async function nocoCreateLinkToAnotherRecord(aTblSchema) { if(enableErrorLogs) console.log(`## Duplicate ${aTblLinkColumns[i].name}`) // create link - let column = await api.dbTableColumn.create(srcTableId, { + let ncTbl = await api.dbTableColumn.create(srcTableId, { uidt: 'LinkToAnotherRecord', title: aTblLinkColumns[i].name + suffix, parentId: srcTableId, @@ -462,6 +497,9 @@ async function nocoCreateLinkToAnotherRecord(aTblSchema) { }); syncLog(`NC API: dbTableColumn.create LinkToAnotherRecord`) + let ncId = ncTbl.columns.find(x => x.title === aTblLinkColumns[i].name + suffix)?.id + await addToMappingTbl(aTblLinkColumns[i].id, ncId, aTblLinkColumns[i].name + suffix) + // store link information in separate table // this information will be helpful in identifying relation pair let link = { @@ -546,14 +584,17 @@ async function nocoCreateLinkToAnotherRecord(aTblSchema) { if(duplicate) if(enableErrorLogs) 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, { + let ncTbl = await api.dbTableColumn.update(childLinkColumn.id, { ...childLinkColumn, title: aTblLinkColumns[i].name + suffix, }); + + let ncId = ncTbl.columns.find(x => x.title === aTblLinkColumns[i].name + suffix)?.id + await addToMappingTbl(aTblLinkColumns[i].id, ncId, aTblLinkColumns[i].name + suffix) + // console.log(res.columns.find(x => x.title === aTblLinkColumns[i].name)) syncLog(`NC API: dbTableColumn.update rename symmetric column`) } @@ -584,26 +625,39 @@ async function nocoCreateLookups(aTblSchema) { continue } - let ncRelationColumn = await nc_getColumnSchema( - aTblColumns[i].typeOptions.relationColumnId - ); - let ncLookupColumn = await nc_getColumnSchema( - aTblColumns[i].typeOptions.foreignTableRollupColumnId - ); - - if(ncLookupColumn === undefined) { + // let ncRelationColumn = await nc_getColumnSchema( + // aTblColumns[i].typeOptions.relationColumnId + // ); + // let ncLookupColumn = await nc_getColumnSchema( + // aTblColumns[i].typeOptions.foreignTableRollupColumnId + // ); + // + // if(ncLookupColumn === undefined) { + // aTblColumns[i]['srcTableId'] = srcTableId; + // nestedLookupTbl.push(aTblColumns[i]) + // continue; + // } + + let ncRelationColumnId = getNcIdFromAtId(aTblColumns[i].typeOptions.relationColumnId); + let ncLookupColumnId = getNcIdFromAtId(aTblColumns[i].typeOptions.foreignTableRollupColumnId); + + if (ncLookupColumnId === undefined) { aTblColumns[i]['srcTableId'] = srcTableId; nestedLookupTbl.push(aTblColumns[i]) continue; } + let lookupColumn = await api.dbTableColumn.create(srcTableId, { uidt: 'Lookup', title: aTblColumns[i].name, - fk_relation_column_id: ncRelationColumn.id, - fk_lookup_column_id: ncLookupColumn.id + fk_relation_column_id: ncRelationColumnId, + fk_lookup_column_id: ncLookupColumnId }); + let ncId = lookupColumn.columns.find(x => x.title === aTblColumns[i].name)?.id + await addToMappingTbl(aTblColumns[i].id, ncId, aTblColumns[i].name) + syncLog(`NC API: dbTableColumn.create LOOKUP`) } } @@ -625,26 +679,36 @@ async function nocoCreateLookups(aTblSchema) { for (let i = 0; i < nestedLookupTbl.length; i++) { console.log(`Phase-4 Configuring Nested Lookup: Level-${level} [${i+1}/${nestedCnt}]`) - let srcTableId = nestedLookupTbl[i].srcTableId + let srcTableId = nestedLookupTbl[i].srcTableId; - let ncRelationColumn = await nc_getColumnSchema( - nestedLookupTbl[i].typeOptions.relationColumnId - ); - let ncLookupColumn = await nc_getColumnSchema( - nestedLookupTbl[i].typeOptions.foreignTableRollupColumnId - ); + // let ncRelationColumn = await nc_getColumnSchema( + // nestedLookupTbl[i].typeOptions.relationColumnId + // ); + // let ncLookupColumn = await nc_getColumnSchema( + // nestedLookupTbl[i].typeOptions.foreignTableRollupColumnId + // ); + // + // if (ncLookupColumn === undefined) { + // continue; + // } - if (ncLookupColumn === undefined) { + let ncRelationColumnId = getNcIdFromAtId(nestedLookupTbl[i].typeOptions.relationColumnId); + let ncLookupColumnId = getNcIdFromAtId(nestedLookupTbl[i].typeOptions.foreignTableRollupColumnId); + + if (ncLookupColumnId === 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 + fk_relation_column_id: ncRelationColumnId, + fk_lookup_column_id: ncLookupColumnId }); + let ncId = lookupColumn.columns.find(x => x.title === aTblColumns[i].name)?.id + await addToMappingTbl(aTblColumns[i].id, ncId, aTblColumns[i].name) + // remove entry nestedLookupTbl.splice(i, 1) syncLog(`NC API: dbTableColumn.create LOOKUP`) @@ -673,26 +737,40 @@ async function nocoCreateRollups(aTblSchema) { continue } - let ncRelationColumn = await nc_getColumnSchema( - aTblColumns[i].typeOptions.relationColumnId - ); - let ncRollupColumn = await nc_getColumnSchema( - aTblColumns[i].typeOptions.foreignTableRollupColumnId - ); - - if(ncRollupColumn === undefined) { + // let ncRelationColumn = await nc_getColumnSchema( + // aTblColumns[i].typeOptions.relationColumnId + // ); + // let ncRollupColumn = await nc_getColumnSchema( + // aTblColumns[i].typeOptions.foreignTableRollupColumnId + // ); + // + // if(ncRollupColumn === undefined) { + // aTblColumns[i]['srcTableId'] = srcTableId; + // nestedRollupTbl.push(aTblColumns[i]) + // continue; + // } + + let ncRelationColumnId = getNcIdFromAtId(aTblColumns[i].typeOptions.relationColumnId) + let ncRollupColumnId = getNcIdFromAtId(aTblColumns[i].typeOptions.foreignTableRollupColumnId) + + if (ncRollupColumnId === undefined) { aTblColumns[i]['srcTableId'] = srcTableId; nestedRollupTbl.push(aTblColumns[i]) continue; } + let rollupColumn = await api.dbTableColumn.create(srcTableId, { uidt: 'Rollup', title: aTblColumns[i].name, - fk_relation_column_id: ncRelationColumn.id, - fk_rollup_column_id: ncRollupColumn.id, + fk_relation_column_id: ncRelationColumnId, + fk_rollup_column_id: ncRollupColumnId, rollup_function: 'sum' // fix me: hardwired }); syncLog(`NC API: dbTableColumn.create ROLLUP`) + + let ncId = rollupColumn.columns.find(x => x.title === aTblColumns[i].name)?.id + await addToMappingTbl(aTblColumns[i].id, ncId, aTblColumns[i].name) + } } } @@ -706,27 +784,33 @@ async function nocoLookupForRollups() { let srcTableId = nestedLookupTbl[i].srcTableId; - let ncRelationColumn = await nc_getColumnSchema( - nestedLookupTbl[i].typeOptions.relationColumnId - ); - let ncLookupColumn = await nc_getColumnSchema( - nestedLookupTbl[i].typeOptions.foreignTableRollupColumnId - ); + // let ncRelationColumn = await nc_getColumnSchema( + // nestedLookupTbl[i].typeOptions.relationColumnId + // ); + // let ncLookupColumn = await nc_getColumnSchema( + // nestedLookupTbl[i].typeOptions.foreignTableRollupColumnId + // ); + + let ncRelationColumnId = getNcIdFromAtId(nestedLookupTbl[i].typeOptions.relationColumnId) + let ncLookupColumnId = getNcIdFromAtId(nestedLookupTbl[i].typeOptions.foreignTableRollupColumnId) - if (ncLookupColumn === undefined) { + if (ncLookupColumnId === 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 + fk_relation_column_id: ncRelationColumnId, + fk_lookup_column_id: ncLookupColumnId }); // remove entry nestedLookupTbl.splice(i, 1) syncLog(`NC API: dbTableColumn.create LOOKUP`) + + let ncId = lookupColumn.columns.find(x => x.title === nestedLookupTbl[i].name)?.id + await addToMappingTbl(nestedLookupTbl[i].id, ncId, nestedLookupTbl[i].name) } } @@ -780,7 +864,8 @@ async function nocoReconfigureFields(aTblSchema) { } console.log(`Phase-8 [${String(idx+1).padStart(2, '0')}/${aTblSchema.length}] Hide columns [${idx+1}/${aTblSchema.length}] ${aTblSchema[idx].name}`) - await nc_hideColumn(aTblSchema[idx].name, aTblSchema[idx].views[0].name, hiddenColumns) + let aTbl_viewname = aTblSchema[idx].views.find(x => x.type === 'grid').name + await nc_hideColumn(aTblSchema[idx].name, aTbl_viewname, hiddenColumns) } } @@ -1039,24 +1124,31 @@ async function nocoConfigureGridView(aTblSchema) { let ncViewId = viewList?.list?.find(x => x.tn === viewName)?.id // create view (default already created) - if(i>0) - await api.dbView.gridCreate(tblId, {title: viewName}) + if (i > 0) { + let viewCreated = await api.dbView.gridCreate(tblId, { title: viewName }) + await addToMappingTbl(gridViews[i].id, viewCreated.id, viewName) + } // hide fields - // let hiddenColumns = ["_aTbl_nc_rec_id"] - // // extract other columns hidden in this view - // let hiddenColumnID = vData.columnOrder.filter(x => x.visibility===false) - // for(let j=0; j