@budibase/server 1.0.176-alpha.0 → 1.0.178-alpha.0

package/dist/utilities/redis.js

@@ -51,7 +51,7 @@ exports.getAllLocks = () => __awaiter(void 0, void 0, void 0, function* () {
 exports.updateLock = (devAppId, user) => __awaiter(void 0, void 0, void 0, function* () {
     // make sure always global user ID
     const globalId = getGlobalIDFromUserMetadataID(user._id);
-    const inputUser = Object.assign(Object.assign({}, user), { userId: globalId, _id: globalId });
+    const inputUser = Object.assign(Object.assign({}, user), { userId: globalId, _id: globalId, lockedAt: new Date().getTime() });
     yield devAppClient.store(devAppId, inputUser, APP_DEV_LOCK_SECONDS);
 });
 exports.clearLock = (devAppId, user) => __awaiter(void 0, void 0, void 0, function* () {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.176-alpha.0",
+  "version": "1.0.178-alpha.0",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -70,10 +70,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.176-alpha.0",
-    "@budibase/client": "^1.0.176-alpha.0",
-    "@budibase/pro": "1.0.175",
-    "@budibase/string-templates": "^1.0.176-alpha.0",
+    "@budibase/backend-core": "^1.0.178-alpha.0",
+    "@budibase/client": "^1.0.178-alpha.0",
+    "@budibase/pro": "^1.0.175",
+    "@budibase/string-templates": "^1.0.178-alpha.0",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
@@ -184,5 +184,5 @@
   "optionalDependencies": {
     "oracledb": "^5.3.0"
   },
-  "gitHead": "163be3719cc11f26d3b553829e98746d272a4b98"
+  "gitHead": "c1da01986fb22dcdf29a10d441f0a2f0e35dbc2c"
 }

package/src/middleware/builder.js

@@ -6,7 +6,7 @@ const {
   setDebounce,
 } = require("../utilities/redis")
 const { doWithDB } = require("@budibase/backend-core/db")
-const { DocumentTypes } = require("../db/utils")
+const { DocumentTypes, getGlobalIDFromUserMetadataID } = require("../db/utils")
 const { PermissionTypes } = require("@budibase/backend-core/permissions")
 const { app: appCache } = require("@budibase/backend-core/cache")
 
@@ -51,6 +51,9 @@ async function updateAppUpdatedAt(ctx) {
   await doWithDB(appId, async db => {
     const metadata = await db.get(DocumentTypes.APP_METADATA)
     metadata.updatedAt = new Date().toISOString()
+
+    metadata.updatedBy = getGlobalIDFromUserMetadataID(ctx.user.userId)
+
     const response = await db.put(metadata)
     metadata._rev = response.rev
     await appCache.invalidateAppMetadata(appId, metadata)
@@ -67,7 +70,15 @@ module.exports = async (ctx, permType) => {
   }
   const isBuilderApi = permType === PermissionTypes.BUILDER
   const referer = ctx.headers["referer"]
-  const editingApp = referer ? referer.includes(appId) : false
+
+  const overviewPath = "/builder/portal/overview/"
+  const overviewContext = !referer ? false : referer.includes(overviewPath)
+  if (overviewContext) {
+    return
+  }
+
+  const hasAppId = !referer ? false : referer.includes(appId)
+  const editingApp = referer ? hasAppId : false
   // check this is a builder call and editing
   if (!isBuilderApi || !editingApp) {
     return

package/src/utilities/redis.js

@@ -48,7 +48,9 @@ exports.updateLock = async (devAppId, user) => {
     ...user,
     userId: globalId,
     _id: globalId,
+    lockedAt: new Date().getTime(),
   }
+
   await devAppClient.store(devAppId, inputUser, APP_DEV_LOCK_SECONDS)
 }