diff --git a/packages/server/src/api/controllers/row/external.js b/packages/server/src/api/controllers/row/external.js index 4c1974230f..e3e46ae527 100644 --- a/packages/server/src/api/controllers/row/external.js +++ b/packages/server/src/api/controllers/row/external.js @@ -79,9 +79,17 @@ async function handleRequest( } await Promise.all(promises) } - const output = outputProcessing(response, table, relationships, tables, fullDocs) + const output = outputProcessing( + response, + table, + relationships, + tables, + fullDocs + ) // if reading it'll just be an array of rows, return whole thing - return operation === DataSourceOperation.READ && Array.isArray(response) ? output : { row: output[0], table } + return operation === DataSourceOperation.READ && Array.isArray(response) + ? output + : { row: output[0], table } } exports.patch = async ctx => { @@ -123,9 +131,14 @@ exports.find = async ctx => { const appId = ctx.appId const id = ctx.params.rowId const tableId = ctx.params.tableId - const response = await handleRequest(appId, DataSourceOperation.READ, tableId, { - id, - }) + const response = await handleRequest( + appId, + DataSourceOperation.READ, + tableId, + { + id, + } + ) return response ? response[0] : response } @@ -227,9 +240,14 @@ exports.fetchEnrichedRow = async ctx => { const id = ctx.params.rowId const tableId = ctx.params.tableId // TODO: this only enriches the full docs 1 layer deep, need to join those as well - const response = await handleRequest(appId, DataSourceOperation.READ, tableId, { - id, - fullDocs: true, - }) + const response = await handleRequest( + appId, + DataSourceOperation.READ, + tableId, + { + id, + fullDocs: true, + } + ) return response ? response[0] : response } diff --git a/packages/server/src/api/controllers/row/externalUtils.js b/packages/server/src/api/controllers/row/externalUtils.js index e7d8973b87..6074bdb429 100644 --- a/packages/server/src/api/controllers/row/externalUtils.js +++ b/packages/server/src/api/controllers/row/externalUtils.js @@ -76,7 +76,13 @@ exports.generateIdForRow = (row, table) => { return generateRowIdField(idParts) } -exports.updateRelationshipColumns = (row, rows, relationships, allTables, fullDocs) => { +exports.updateRelationshipColumns = ( + row, + rows, + relationships, + allTables, + fullDocs +) => { const columns = {} for (let relationship of relationships) { const linkedTable = allTables[relationship.tableName] @@ -106,7 +112,13 @@ exports.updateRelationshipColumns = (row, rows, relationships, allTables, fullDo return rows } -exports.outputProcessing = (rows, table, relationships, allTables, fullDocs) => { +exports.outputProcessing = ( + rows, + table, + relationships, + allTables, + fullDocs +) => { // if no rows this is what is returned? Might be PG only if (rows[0].read === true) { return [] diff --git a/packages/server/tsconfig.json b/packages/server/tsconfig.json index bd6dbc1686..934d0bdd2b 100644 --- a/packages/server/tsconfig.json +++ b/packages/server/tsconfig.json @@ -8,7 +8,8 @@ "strict": true, "noImplicitAny": true, "esModuleInterop": true, - "resolveJsonModule": true + "resolveJsonModule": true, + "incremental": true }, "include": [ "./src/**/*"