Merge branch 'master' into cheeks-fixes

lerna.json

@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "3.7.0",
+  "version": "3.7.2",
   "npmClient": "yarn",
   "concurrency": 20,
   "command": {

packages/backend-core/src/cache/docWritethrough.ts

@@ -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 * as dbUtils from "../db"
@@ -57,6 +57,10 @@ export class DocWritethroughProcessor {
     docId: string
     data: Record<string, any>
   }) {
+    // HACK - for now drop SCIM events
+    if (docId.startsWith(DocumentType.SCIM_LOG)) {
+      return
+    }
     const db = dbUtils.getDB(dbName)
     let doc: AnyDocument | undefined
     try {

packages/pro

@@ -1 +1 @@
-Subproject commit ae33c80d3a7f289535951669e48f8d8a437467cc
+Subproject commit d9d2766261e02b11318ae76ad0d79698e14f89a9