Browse Source

Fixing issue where deleted datasources wouldn't clear out queries.

pull/3338/head
mike12345567 5 years ago
parent
commit
d7ef5e606c
  1. 1
      packages/builder/src/stores/backend/datasources.js
  2. 12
      packages/server/src/api/controllers/datasource.js

1
packages/builder/src/stores/backend/datasources.js

@ -95,6 +95,7 @@ export function createDatasourcesStore() {
return { list: sources, selected: null }
})
await queries.fetch()
return response
},
removeSchemaError: () => {

12
packages/server/src/api/controllers/datasource.js

@ -119,8 +119,16 @@ exports.destroy = async function (ctx) {
const db = new CouchDB(ctx.appId)
// Delete all queries for the datasource
const rows = await db.allDocs(getQueryParams(ctx.params.datasourceId, null))
await db.bulkDocs(rows.rows.map(row => ({ ...row.doc, _deleted: true })))
const queries = await db.allDocs(
getQueryParams(ctx.params.datasourceId, null)
)
await db.bulkDocs(
queries.rows.map(row => ({
_id: row.id,
_rev: row.value.rev,
_deleted: true,
}))
)
// delete the datasource
await db.remove(ctx.params.datasourceId, ctx.params.revId)

Loading…
Cancel
Save