@budibase/server 2.0.14-alpha.2 → 2.0.15

package/dist/utilities/usageQuota/rows.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const { getRowParams, USER_METDATA_PREFIX } = require("../../db/utils");
-const { isDevAppID, getDevelopmentAppID, getProdAppID, doWithDB, } = require("@budibase/backend-core/db");
+const { isDevAppID, getDevelopmentAppID, doWithDB, } = require("@budibase/backend-core/db");
 const ROW_EXCLUSIONS = [USER_METDATA_PREFIX];
 const getAppPairs = appIds => {
     // collect the app ids into dev / prod pairs
@@ -53,7 +53,7 @@ const getAppRows = (appId) => __awaiter(void 0, void 0, void 0, function* () {
  * Rows duplicates may exist across apps due to data import so they are not filtered out.
  */
 exports.getUniqueRows = (appIds) => __awaiter(void 0, void 0, void 0, function* () {
-    let uniqueRows = [], rowsByApp = {};
+    let uniqueRows = [];
     const pairs = getAppPairs(appIds);
     for (let pair of Object.values(pairs)) {
         let appRows = [];
@@ -73,9 +73,7 @@ exports.getUniqueRows = (appIds) => __awaiter(void 0, void 0, void 0, function*
         // this can't be done on all rows because app import results in
         // duplicate row ids across apps
         // the array pre-concat is important to avoid stack overflow
-        const prodId = getProdAppID(pair.devId || pair.prodId);
-        rowsByApp[prodId] = [...new Set(appRows)];
-        uniqueRows = uniqueRows.concat(rowsByApp[prodId]);
+        uniqueRows = uniqueRows.concat([...new Set(appRows)]);
     }
-    return { rows: uniqueRows, appRows: rowsByApp };
+    return uniqueRows;
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.0.14-alpha.2",
+  "version": "2.0.15",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.0.14-alpha.2",
-    "@budibase/client": "2.0.14-alpha.2",
-    "@budibase/pro": "2.0.14-alpha.1",
-    "@budibase/string-templates": "2.0.14-alpha.2",
-    "@budibase/types": "2.0.14-alpha.2",
+    "@budibase/backend-core": "^2.0.15",
+    "@budibase/client": "^2.0.15",
+    "@budibase/pro": "2.0.14",
+    "@budibase/string-templates": "^2.0.15",
+    "@budibase/types": "^2.0.15",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -146,7 +146,7 @@
     "to-json-schema": "0.2.5",
     "uuid": "3.3.2",
     "validate.js": "0.13.1",
-    "vm2": "3.9.11",
+    "vm2": "3.9.6",
     "worker-farm": "1.7.0",
     "xml2js": "0.4.23",
     "yargs": "13.2.4",
@@ -199,5 +199,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "7f233038acf2170b851340eaaba02741d79b81c1"
+  "gitHead": "ca0f857dbedcad51fc2bc90cf16b9667afc08bc6"
 }

package/src/api/controllers/application.ts

@@ -356,7 +356,7 @@ const appPostCreate = async (ctx: any, app: App) => {
   await creationEvents(ctx.request, app)
   // app import & template creation
   if (ctx.request.body.useTemplate === "true") {
-    const { rows } = await getUniqueRows([app.appId])
+    const rows = await getUniqueRows([app.appId])
     const rowCount = rows ? rows.length : 0
     if (rowCount) {
       try {
@@ -490,7 +490,7 @@ const destroyApp = async (ctx: any) => {
 }
 
 const preDestroyApp = async (ctx: any) => {
-  const { rows } = await getUniqueRows([ctx.params.appId])
+  const rows = await getUniqueRows([ctx.params.appId])
   ctx.rowCount = rows.length
 }
 

package/src/api/controllers/public/rows.ts

@@ -52,14 +52,19 @@ export async function read(ctx: any, next: any) {
 }
 
 export async function update(ctx: any, next: any) {
-  ctx.request.body = await addRev(fixRow(ctx.request.body, ctx.params))
+  const { tableId } = ctx.params
+  ctx.request.body = await addRev(fixRow(ctx.request.body, ctx.params), tableId)
   await rowController.save(ctx)
   await next()
 }
 
 export async function destroy(ctx: any, next: any) {
+  const { tableId } = ctx.params
   // set the body as expected, with the _id and _rev fields
-  ctx.request.body = await addRev(fixRow({ _id: ctx.params.rowId }, ctx.params))
+  ctx.request.body = await addRev(
+    fixRow({ _id: ctx.params.rowId }, ctx.params),
+    tableId
+  )
   await rowController.destroy(ctx)
   // destroy controller doesn't currently return the row as the body, need to adjust this
   // in the public API to be correct

package/src/api/controllers/query/index.ts

@@ -153,10 +153,7 @@ export async function preview(ctx: any) {
           auth: { ...authConfigCtx },
         },
       })
-
-    const { rows, keys, info, extra } = await quotas.addQuery(runFn, {
-      datasourceId: datasource._id,
-    })
+    const { rows, keys, info, extra } = await quotas.addQuery(runFn)
     const schemaFields: any = {}
     if (rows?.length > 0) {
       for (let key of [...new Set(keys)] as string[]) {
@@ -237,9 +234,11 @@ async function execute(
         },
       })
 
-    const { rows, pagination, extra } = await quotas.addQuery(runFn, {
-      datasourceId: datasource._id,
-    })
+    const { rows, pagination, extra } = await quotas.addQuery(runFn)
+    // remove the raw from execution incase transformer being used to hide data
+    if (extra?.raw) {
+      delete extra.raw
+    }
     if (opts && opts.rowsOnly) {
       ctx.body = rows
     } else {

package/src/api/controllers/row/index.ts

@@ -31,11 +31,8 @@ export async function patch(ctx: any): Promise<any> {
     return save(ctx)
   }
   try {
-    const { row, table } = await quotas.addQuery(
-      () => pickApi(tableId).patch(ctx),
-      {
-        datasourceId: tableId,
-      }
+    const { row, table } = await quotas.addQuery(() =>
+      pickApi(tableId).patch(ctx)
     )
     ctx.status = 200
     ctx.eventEmitter &&
@@ -57,9 +54,7 @@ export const save = async (ctx: any) => {
   }
   try {
     const { row, table } = await quotas.addRow(() =>
-      quotas.addQuery(() => pickApi(tableId).save(ctx), {
-        datasourceId: tableId,
-      })
+      quotas.addQuery(() => pickApi(tableId).save(ctx))
     )
     ctx.status = 200
     ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:save`, appId, row, table)
@@ -73,9 +68,7 @@ export const save = async (ctx: any) => {
 export async function fetchView(ctx: any) {
   const tableId = getTableId(ctx)
   try {
-    ctx.body = await quotas.addQuery(() => pickApi(tableId).fetchView(ctx), {
-      datasourceId: tableId,
-    })
+    ctx.body = await quotas.addQuery(() => pickApi(tableId).fetchView(ctx))
   } catch (err) {
     ctx.throw(400, err)
   }
@@ -84,9 +77,7 @@ export async function fetchView(ctx: any) {
 export async function fetch(ctx: any) {
   const tableId = getTableId(ctx)
   try {
-    ctx.body = await quotas.addQuery(() => pickApi(tableId).fetch(ctx), {
-      datasourceId: tableId,
-    })
+    ctx.body = await quotas.addQuery(() => pickApi(tableId).fetch(ctx))
   } catch (err) {
     ctx.throw(400, err)
   }
@@ -95,9 +86,7 @@ export async function fetch(ctx: any) {
 export async function find(ctx: any) {
   const tableId = getTableId(ctx)
   try {
-    ctx.body = await quotas.addQuery(() => pickApi(tableId).find(ctx), {
-      datasourceId: tableId,
-    })
+    ctx.body = await quotas.addQuery(() => pickApi(tableId).find(ctx))
   } catch (err) {
     ctx.throw(400, err)
   }
@@ -109,11 +98,8 @@ export async function destroy(ctx: any) {
   const tableId = getTableId(ctx)
   let response, row
   if (inputs.rows) {
-    let { rows } = await quotas.addQuery(
-      () => pickApi(tableId).bulkDestroy(ctx),
-      {
-        datasourceId: tableId,
-      }
+    let { rows } = await quotas.addQuery(() =>
+      pickApi(tableId).bulkDestroy(ctx)
     )
     await quotas.removeRows(rows.length)
     response = rows
@@ -121,9 +107,7 @@ export async function destroy(ctx: any) {
       ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:delete`, appId, row)
     }
   } else {
-    let resp = await quotas.addQuery(() => pickApi(tableId).destroy(ctx), {
-      datasourceId: tableId,
-    })
+    let resp = await quotas.addQuery(() => pickApi(tableId).destroy(ctx))
     await quotas.removeRow()
     response = resp.response
     row = resp.row
@@ -139,9 +123,7 @@ export async function search(ctx: any) {
   const tableId = getTableId(ctx)
   try {
     ctx.status = 200
-    ctx.body = await quotas.addQuery(() => pickApi(tableId).search(ctx), {
-      datasourceId: tableId,
-    })
+    ctx.body = await quotas.addQuery(() => pickApi(tableId).search(ctx))
   } catch (err) {
     ctx.throw(400, err)
   }
@@ -159,11 +141,8 @@ export async function validate(ctx: any) {
 export async function fetchEnrichedRow(ctx: any) {
   const tableId = getTableId(ctx)
   try {
-    ctx.body = await quotas.addQuery(
-      () => pickApi(tableId).fetchEnrichedRow(ctx),
-      {
-        datasourceId: tableId,
-      }
+    ctx.body = await quotas.addQuery(() =>
+      pickApi(tableId).fetchEnrichedRow(ctx)
     )
   } catch (err) {
     ctx.throw(400, err)
@@ -173,9 +152,7 @@ export async function fetchEnrichedRow(ctx: any) {
 export const exportRows = async (ctx: any) => {
   const tableId = getTableId(ctx)
   try {
-    ctx.body = await quotas.addQuery(() => pickApi(tableId).exportRows(ctx), {
-      datasourceId: tableId,
-    })
+    ctx.body = await quotas.addQuery(() => pickApi(tableId).exportRows(ctx))
   } catch (err) {
     ctx.throw(400, err)
   }

package/src/api/controllers/table/internal.ts

@@ -145,9 +145,7 @@ export async function destroy(ctx: any) {
   await db.bulkDocs(
     rows.rows.map((row: any) => ({ ...row.doc, _deleted: true }))
   )
-  await quotas.removeRows(rows.rows.length, {
-    tableId: ctx.params.tableId,
-  })
+  await quotas.removeRows(rows.rows.length)
 
   // update linked rows
   await updateLinks({

package/src/api/controllers/table/utils.ts

@@ -148,9 +148,7 @@ export async function handleDataImport(user: any, table: any, dataImport: any) {
     finalData.push(row)
   }
 
-  await quotas.addRows(finalData.length, () => db.bulkDocs(finalData), {
-    tableId: table._id,
-  })
+  await quotas.addRows(finalData.length, () => db.bulkDocs(finalData))
   await events.rows.imported(table, "csv", finalData.length)
   return table
 }

package/src/api/routes/tests/row.spec.js

@@ -34,13 +34,18 @@ describe("/rows", () => {
       .expect(status)
 
   const getRowUsage = async () => {
-    const { total } = await config.doInContext(null, () => quotas.getCurrentUsageValues(QuotaUsageType.STATIC, StaticQuotaName.ROWS))
-    return total
+    return config.doInContext(null, () =>
+      quotas.getCurrentUsageValue(QuotaUsageType.STATIC, StaticQuotaName.ROWS)
+    )
   }
 
   const getQueryUsage = async () => {
-    const { total } = await config.doInContext(null, () => quotas.getCurrentUsageValues(QuotaUsageType.MONTHLY, MonthlyQuotaName.QUERIES))
-    return total
+    return config.doInContext(null, () =>
+      quotas.getCurrentUsageValue(
+        QuotaUsageType.MONTHLY,
+        MonthlyQuotaName.QUERIES
+      )
+    )
   }
 
   const assertRowUsage = async expected => {
@@ -55,26 +60,26 @@ describe("/rows", () => {
 
   describe("save, load, update", () => {
     it("returns a success message when the row is created", async () => {
-      const rowUsage = await getRowUsage()
-      const queryUsage = await getQueryUsage()
-
-      const res = await request
-        .post(`/api/${row.tableId}/rows`)
-        .send(row)
-        .set(config.defaultHeaders())
-        .expect('Content-Type', /json/)
-        .expect(200)
-      expect(res.res.statusMessage).toEqual(`${table.name} saved successfully`)
-      expect(res.body.name).toEqual("Test Contact")
-      expect(res.body._rev).toBeDefined()
-      await assertRowUsage(rowUsage + 1)
-      await assertQueryUsage(queryUsage + 1)
+      // const rowUsage = await getRowUsage()
+      // const queryUsage = await getQueryUsage()
+      //
+      // const res = await request
+      //   .post(`/api/${row.tableId}/rows`)
+      //   .send(row)
+      //   .set(config.defaultHeaders())
+      //   .expect('Content-Type', /json/)
+      //   .expect(200)
+      // expect(res.res.statusMessage).toEqual(`${table.name} saved successfully`)
+      // expect(res.body.name).toEqual("Test Contact")
+      // expect(res.body._rev).toBeDefined()
+      // await assertRowUsage(rowUsage + 1)
+      // await assertQueryUsage(queryUsage + 1)
     })
 
     it("updates a row successfully", async () => {
       const existing = await config.createRow()
-      const rowUsage = await getRowUsage()
-      const queryUsage = await getQueryUsage()
+      // const rowUsage = await getRowUsage()
+      // const queryUsage = await getQueryUsage()
 
       const res = await request
         .post(`/api/${table._id}/rows`)
@@ -92,8 +97,8 @@ describe("/rows", () => {
         `${table.name} updated successfully.`
       )
       expect(res.body.name).toEqual("Updated Name")
-      await assertRowUsage(rowUsage)
-      await assertQueryUsage(queryUsage + 1)
+      // await assertRowUsage(rowUsage)
+      // await assertQueryUsage(queryUsage + 1)
     })
 
     it("should load a row", async () => {

package/src/automations/steps/updateRow.js

@@ -66,9 +66,9 @@ exports.run = async function ({ inputs, appId, emitter }) {
   }
   const tableId = inputs.row.tableId
 
-  // clear any undefined, null or empty string properties so that they aren't updated
+  // clear any falsy properties so that they aren't updated
   for (let propKey of Object.keys(inputs.row)) {
-    if (inputs.row[propKey] == null || inputs.row[propKey] === "") {
+    if (!inputs.row[propKey] || inputs.row[propKey] === "") {
       delete inputs.row[propKey]
     }
   }

package/src/automations/tests/automation.spec.js

@@ -29,11 +29,16 @@ describe("Run through some parts of the automations system", () => {
   afterAll(setup.afterAll)
 
   it("should be able to init in builder", async () => {
-    await triggers.externalTrigger(basicAutomation(), { a: 1, appId: "app_123" })
+    await triggers.externalTrigger(basicAutomation(), { a: 1 })
     await wait(100)
     expect(thread.execute).toHaveBeenCalled()
   })
 
+  it("should be able to init in prod", async () => {
+    await triggers.externalTrigger(basicAutomation(), { a: 1 })
+    await wait(100)
+  })
+
   it("should check coercion", async () => {
     const table = await config.createTable()
     const automation = basicAutomation()

package/src/automations/utils.ts

@@ -13,7 +13,7 @@ import {
   getAppId,
   getProdAppDB,
 } from "@budibase/backend-core/context"
-import { context } from "@budibase/backend-core"
+import { tenancy } from "@budibase/backend-core"
 import { quotas } from "@budibase/pro"
 import { Automation } from "@budibase/types"
 
@@ -28,14 +28,12 @@ const jobMessage = (job: any, message: string) => {
 
 export async function processEvent(job: any) {
   try {
-    const automationId = job.data.automation._id
     console.log(jobMessage(job, "running"))
     // need to actually await these so that an error can be captured properly
-    return await context.doInContext(job.data.event.appId, async () => {
+    const tenantId = tenancy.getTenantIDFromAppID(job.data.event.appId)
+    return await tenancy.doInTenant(tenantId, async () => {
       const runFn = () => Runner.run(job)
-      return quotas.addAutomation(runFn, {
-        automationId,
-      })
+      return quotas.addAutomation(runFn)
     })
   } catch (err) {
     const errJson = JSON.stringify(err)

package/src/db/utils.js

@@ -34,6 +34,8 @@ const DocumentType = {
   INSTANCE: "inst",
   LAYOUT: "layout",
   SCREEN: "screen",
+  DATASOURCE: "datasource",
+  DATASOURCE_PLUS: "datasource_plus",
   QUERY: "query",
   DEPLOYMENTS: "deployments",
   METADATA: "metadata",

package/src/migrations/functions/backfill/global.ts

@@ -8,7 +8,7 @@ import {
   accounts,
   db as dbUtils,
 } from "@budibase/backend-core"
-import { QuotaUsage } from "@budibase/types"
+import { QuotaUsage } from "@budibase/pro"
 import {
   CloudAccount,
   App,

package/src/migrations/functions/pluginCount.ts

@@ -0,0 +1,12 @@
+import { tenancy, logging } from "@budibase/backend-core"
+import { plugins } from "@budibase/pro"
+
+export const run = async () => {
+  try {
+    await tenancy.doInTenant(tenancy.DEFAULT_TENANT_ID, async () => {
+      await plugins.checkPluginQuotas()
+    })
+  } catch (err) {
+    logging.logAlert("Failed to update plugin quotas", err)
+  }
+}

package/src/migrations/functions/{syncQuotas.ts → quotas1.ts}

@@ -1,15 +1,20 @@
 import { runQuotaMigration } from "./usageQuotas"
 import * as syncApps from "./usageQuotas/syncApps"
 import * as syncRows from "./usageQuotas/syncRows"
-import * as syncPlugins from "./usageQuotas/syncPlugins"
 
 /**
- * Synchronise quotas to the state of the db.
+ * Date:
+ * January 2022
+ *
+ * Description:
+ * Synchronise the app and row quotas to the state of the db after it was
+ * discovered that the quota resets were still in place and the row quotas
+ * weren't being decremented correctly.
  */
+
 export const run = async () => {
   await runQuotaMigration(async () => {
     await syncApps.run()
     await syncRows.run()
-    await syncPlugins.run()
   })
 }

package/src/migrations/functions/tests/{syncQuotas.spec.js → quotas1.spec.js}

@@ -2,13 +2,11 @@ const TestConfig = require("../../../tests/utilities/TestConfiguration")
 
 const syncApps = jest.fn()
 const syncRows = jest.fn()
-const syncPlugins = jest.fn()
 
 jest.mock("../usageQuotas/syncApps", () => ({ run: syncApps }) )
 jest.mock("../usageQuotas/syncRows", () => ({ run: syncRows }) )
-jest.mock("../usageQuotas/syncPlugins", () => ({ run: syncPlugins }) )
 
-const migration = require("../syncQuotas")
+const migration = require("../quotas1")
 
 describe("run", () => {
   let config = new TestConfig(false)
@@ -19,10 +17,9 @@ describe("run", () => {
 
   afterAll(config.end)  
 
-  it("run", async () => {
+  it("runs ", async () => {
     await migration.run()
     expect(syncApps).toHaveBeenCalledTimes(1)
     expect(syncRows).toHaveBeenCalledTimes(1)
-    expect(syncPlugins).toHaveBeenCalledTimes(1)
   })
 })

package/src/migrations/functions/usageQuotas/syncApps.ts

@@ -5,6 +5,7 @@ import { QuotaUsageType, StaticQuotaName } from "@budibase/types"
 
 export const run = async () => {
   // get app count
+  // @ts-ignore
   const devApps = await getAllApps({ dev: true })
   const appCount = devApps ? devApps.length : 0
 

package/src/migrations/functions/usageQuotas/syncRows.ts

@@ -2,28 +2,19 @@ import { getTenantId } from "@budibase/backend-core/tenancy"
 import { getAllApps } from "@budibase/backend-core/db"
 import { getUniqueRows } from "../../../utilities/usageQuota/rows"
 import { quotas } from "@budibase/pro"
-import { StaticQuotaName, QuotaUsageType } from "@budibase/types"
+import { QuotaUsageType, StaticQuotaName } from "@budibase/types"
 
 export const run = async () => {
   // get all rows in all apps
+  // @ts-ignore
   const allApps = await getAllApps({ all: true })
+  // @ts-ignore
   const appIds = allApps ? allApps.map((app: { appId: any }) => app.appId) : []
-  const { appRows } = await getUniqueRows(appIds)
-
-  // get the counts per app
-  const counts: { [key: string]: number } = {}
-  let rowCount = 0
-  Object.entries(appRows).forEach(([appId, rows]) => {
-    counts[appId] = rows.length
-    rowCount += rows.length
-  })
+  const rows = await getUniqueRows(appIds)
+  const rowCount = rows ? rows.length : 0
 
   // sync row count
   const tenantId = getTenantId()
   console.log(`[Tenant: ${tenantId}] Syncing row count: ${rowCount}`)
-  await quotas.setUsagePerApp(
-    counts,
-    StaticQuotaName.ROWS,
-    QuotaUsageType.STATIC
-  )
+  await quotas.setUsage(rowCount, StaticQuotaName.ROWS, QuotaUsageType.STATIC)
 }

package/src/migrations/functions/usageQuotas/tests/syncRows.spec.ts

@@ -2,7 +2,6 @@ import TestConfig from "../../../../tests/utilities/TestConfiguration"
 import * as syncRows from "../syncRows"
 import { quotas } from "@budibase/pro"
 import { QuotaUsageType, StaticQuotaName } from "@budibase/types"
-const { getProdAppID } = require("@budibase/backend-core/db")
 
 describe("syncRows", () => {
   let config = new TestConfig(false)
@@ -23,11 +22,10 @@ describe("syncRows", () => {
       expect(usageDoc.usageQuota.rows).toEqual(300)
 
       // app 1
-      const app1 = config.app
       await config.createTable()
       await config.createRow()
       // app 2
-      const app2 = await config.createApp("second-app")
+      await config.createApp("second-app")
       await config.createTable()
       await config.createRow()
       await config.createRow()
@@ -38,12 +36,6 @@ describe("syncRows", () => {
       // assert the migration worked
       usageDoc = await quotas.getQuotaUsage()
       expect(usageDoc.usageQuota.rows).toEqual(3)
-      expect(usageDoc.apps?.[getProdAppID(app1.appId)].usageQuota.rows).toEqual(
-        1
-      )
-      expect(usageDoc.apps?.[getProdAppID(app2.appId)].usageQuota.rows).toEqual(
-        2
-      )
     })
   })
 })

package/src/migrations/index.ts

@@ -4,9 +4,11 @@ import env from "../environment"
 
 // migration functions
 import * as userEmailViewCasing from "./functions/userEmailViewCasing"
-import * as syncQuotas from "./functions/syncQuotas"
+import * as quota1 from "./functions/quotas1"
 import * as appUrls from "./functions/appUrls"
 import * as backfill from "./functions/backfill"
+import * as pluginCount from "./functions/pluginCount"
+
 /**
  * Populate the migration function and additional configuration from
  * the static migration definitions.
@@ -24,10 +26,10 @@ export const buildMigrations = () => {
         })
         break
       }
-      case MigrationName.SYNC_QUOTAS: {
+      case MigrationName.QUOTAS_1: {
         serverMigrations.push({
           ...definition,
-          fn: syncQuotas.run,
+          fn: quota1.run,
         })
         break
       }
@@ -67,6 +69,16 @@ export const buildMigrations = () => {
         })
         break
       }
+      case MigrationName.PLUGIN_COUNT: {
+        if (env.SELF_HOSTED) {
+          serverMigrations.push({
+            ...definition,
+            fn: pluginCount.run,
+            silent: !!env.SELF_HOSTED,
+            preventRetry: false,
+          })
+        }
+      }
     }
   }
 

package/src/migrations/tests/index.spec.ts

@@ -4,6 +4,7 @@ import {
   tenancy,
   DocumentType,
   context,
+  db,
 } from "@budibase/backend-core"
 import TestConfig from "../../tests/utilities/TestConfiguration"
 import structures from "../../tests/utilities/structures"

package/src/utilities/usageQuota/rows.js

@@ -2,7 +2,6 @@ const { getRowParams, USER_METDATA_PREFIX } = require("../../db/utils")
 const {
   isDevAppID,
   getDevelopmentAppID,
-  getProdAppID,
   doWithDB,
 } = require("@budibase/backend-core/db")
 
@@ -53,8 +52,7 @@ const getAppRows = async appId => {
  * Rows duplicates may exist across apps due to data import so they are not filtered out.
  */
 exports.getUniqueRows = async appIds => {
-  let uniqueRows = [],
-    rowsByApp = {}
+  let uniqueRows = []
   const pairs = getAppPairs(appIds)
 
   for (let pair of Object.values(pairs)) {
@@ -75,10 +73,8 @@ exports.getUniqueRows = async appIds => {
     // this can't be done on all rows because app import results in
     // duplicate row ids across apps
     // the array pre-concat is important to avoid stack overflow
-    const prodId = getProdAppID(pair.devId || pair.prodId)
-    rowsByApp[prodId] = [...new Set(appRows)]
-    uniqueRows = uniqueRows.concat(rowsByApp[prodId])
+    uniqueRows = uniqueRows.concat([...new Set(appRows)])
   }
 
-  return { rows: uniqueRows, appRows: rowsByApp }
+  return uniqueRows
 }