apostrophe 2.227.8 → 2.227.10-beta.1

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 2.227.10-beta.1 (2025-02-28)
+
+* Improve docs locking system messages.
+* Refresh stale docs locks that have the current context ID.
+
+## 2.227.9 (2024-08-19)
+
+* Update CKEDITOR combo styles to target all combos in the toolbar.
+
 ## 2.227.8 (2024-08-08)
 
 ### Changes

package/lib/modules/apostrophe-docs/lib/api.js

@@ -1078,7 +1078,7 @@ module.exports = function(self, options) {
   self.verifyLock = function(req, id, contextId, callback) {
 
     if (!(req && req.res)) {
-      return callback(new Error('You forgot to pass req as the first argument'));
+      return callback('no req', 'You forgot to pass req as the first argument');
     }
 
     if (!id) {
@@ -1101,8 +1101,11 @@ module.exports = function(self, options) {
       // Refresh the timestamp of an existing lock, if we still hold it
       var criteria = {
         _id: id,
-        'advisoryLock._id': contextId,
-        'advisoryLock.updatedAt': { $gte: self.getAdvisoryLockExpiration() }
+        'advisoryLock._id': contextId
+
+        // The following line was commented in order to force-refresh a stale lock,
+        // as long as the context ID is the same (same tab, so no risk of docs editing conflicts):
+        // 'advisoryLock.updatedAt': { $gte: self.getAdvisoryLockExpiration() }
       };
       return self.db.update(criteria, {
         $set: {
@@ -1117,14 +1120,16 @@ module.exports = function(self, options) {
         { advisoryLock: 1 },
         function(err, info) {
           if (err) {
-            return callback(err);
+            message = err.message;
+            return callback('error');
           }
           if (!info) {
             return callback('notfound');
           }
           // A stale lock is effectively a missing lock
           if (info.advisoryLock && info.advisoryLock.updatedAt < self.getAdvisoryLockExpiration()) {
-            return callback('notfound');
+            message = req.__ns('apostrophe', 'The lock has expired.');
+            return callback('stale-lock');
           }
           if ((!info.advisoryLock) || (info.advisoryLock._id !== contextId)) {
             if (info.advisoryLock && info.advisoryLock.username === req.user.username) {

package/lib/modules/apostrophe-docs/lib/routes.js

@@ -31,7 +31,7 @@ module.exports = function(self, options) {
       req.htmlPageId,
       function(err, message) {
         if (err) {
-          return next(err, null, { message: message });
+          return next(err, null, { message: message || err.message || err });
         }
         return next(null);
       }

package/lib/modules/apostrophe-rich-text-widgets/public/css/components/ckeditor-controls.less

@@ -1,8 +1,8 @@
 // CKEditor Toolbar Styles
 .cke
 {
-  // styles dropdown button
-  .cke_combo__styles
+  // combo dropdown button
+  .cke_combo
   {
     .cke_combo_button
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apostrophe",
-  "version": "2.227.8",
+  "version": "2.227.10-beta.1",
   "description": "The Apostrophe Content Management System.",
   "main": "index.js",
   "scripts": {