Merge branch 'master' into cheeks-fixes
This commit is contained in:
commit
b386d4a23b
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
|
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
|
||||||
"version": "3.7.0",
|
"version": "3.7.2",
|
||||||
"npmClient": "yarn",
|
"npmClient": "yarn",
|
||||||
"concurrency": 20,
|
"concurrency": 20,
|
||||||
"command": {
|
"command": {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import { AnyDocument, Database, Document } from "@budibase/types"
|
import { AnyDocument, Database, Document, DocumentType } from "@budibase/types"
|
||||||
|
|
||||||
import { JobQueue, Queue, createQueue } from "../queue"
|
import { JobQueue, Queue, createQueue } from "../queue"
|
||||||
import * as dbUtils from "../db"
|
import * as dbUtils from "../db"
|
||||||
|
@ -57,6 +57,10 @@ export class DocWritethroughProcessor {
|
||||||
docId: string
|
docId: string
|
||||||
data: Record<string, any>
|
data: Record<string, any>
|
||||||
}) {
|
}) {
|
||||||
|
// HACK - for now drop SCIM events
|
||||||
|
if (docId.startsWith(DocumentType.SCIM_LOG)) {
|
||||||
|
return
|
||||||
|
}
|
||||||
const db = dbUtils.getDB(dbName)
|
const db = dbUtils.getDB(dbName)
|
||||||
let doc: AnyDocument | undefined
|
let doc: AnyDocument | undefined
|
||||||
try {
|
try {
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit ae33c80d3a7f289535951669e48f8d8a437467cc
|
Subproject commit d9d2766261e02b11318ae76ad0d79698e14f89a9
|
Loading…
Reference in New Issue