wekan
diff --git a/‎client/components/cards/subtasks.js‎
Lines changed: 11 additions & 5 deletions b/‎client/components/cards/subtasks.js‎
Lines changed: 11 additions & 5 deletions
diff --git a/‎models/boards.js‎
Lines changed: 11 additions & 4 deletions b/‎models/boards.js‎
Lines changed: 11 additions & 4 deletions
diff --git a/‎tests/subtasksDefaultBoard.test.cjs‎
Lines changed: 17 additions & 0 deletions b/‎tests/subtasksDefaultBoard.test.cjs‎
Lines changed: 17 additions & 0 deletions
@@ -22,7 +22,7 @@ Template.subtasks.events({
     event.preventDefault();
     const textarea = tpl.find('textarea.js-add-subtask-item');
     const title = textarea.value.trim();
-    const cardId = Template.currentData().cardId;
+    const cardId = this.cardId;
 
     if (title) {
       // Subtask creation is performed server-side by the `addSubtaskCard` Meteor
@@ -32,9 +32,12 @@ Template.subtasks.events({
       // (#3868 / #5788 / #2256) and lets multiple subtasks be created reliably
       // (#4782), and the method applies the destination board's automatic
       // custom fields to the new subtask (#4037 / #3562).
-      const _id = await Meteor.callAsync('addSubtaskCard', cardId, title);
+      try {
+        const _id = await Meteor.callAsync('addSubtaskCard', cardId, title);
 
-      if (_id) {
+        if (!_id) {
+          throw new Error('The server could not create the subtask.');
+        }
         // In case the filter is active we need to add the newly inserted card in
         // the list of exceptions -- cards that are not filtered. Otherwise the
         // card will disappear instantly.
@@ -46,10 +49,13 @@ Template.subtasks.events({
             .last()
             .click();
         }, 100);
+        textarea.value = '';
+        textarea.focus();
+      } catch (error) {
+        alert(error?.reason || error?.message || 'Could not create the subtask.');
+        textarea.focus();
       }
     }
-    textarea.value = '';
-    textarea.focus();
   },
   'submit .js-edit-subtask-title'(event, tpl) {
     event.preventDefault();
 
@@ -1895,7 +1895,10 @@ Boards.helpers({
       { _id: defaultId },
       { $setOnInsert: this.defaultSwimlaneFields() },
     );
-    return ReactiveCache.getSwimlane({ _id: defaultId });
+    return (
+      (await ReactiveCache.getSwimlane({ _id: defaultId })) ||
+      (Meteor.isServer ? await Swimlanes.findOneAsync(defaultId) : undefined)
+    );
   },
 
   // Fields for an upsert-inserted default swimlane. archived/type must be set
@@ -1910,9 +1913,13 @@ Boards.helpers({
   async getDefaultSwimlineAsync() {
     // Issue #1971: prefer a NON-archived swimlane (see getDefaultSwimline).
     const { pickDefaultSwimlane } = require('./lib/defaultSwimlane');
-    let result = pickDefaultSwimlane(
-      await ReactiveCache.getSwimlanes({ boardId: this._id }),
-    );
+    // On the server this can run immediately after creating a helper board and
+    // its first swimlane. The reactive cache may still hold the pre-insert
+    // empty result, so use the authoritative collection in server methods.
+    const swimlanes = Meteor.isServer
+      ? await Swimlanes.find({ boardId: this._id }).fetchAsync()
+      : await ReactiveCache.getSwimlanes({ boardId: this._id });
+    let result = pickDefaultSwimlane(swimlanes);
     if (result === undefined && Meteor.isServer && this._id) {
       // Issue #6382: never auto-create swimlanes from the client (see
       // getDefaultSwimline) — only the server may insert the default one.
 
@@ -55,6 +55,23 @@ test('getDefaultSubtasksListAsync creates the landing list with async APIs', ()
   assert.ok(fn.includes('Meteor.isServer'));
 });
 
+test('async swimlane lookup bypasses a stale server cache after creation', () => {
+  const fn = extract('getDefaultSwimlineAsync');
+  assert.ok(
+    fn.includes("Meteor.isServer\n      ? await Swimlanes.find({ boardId: this._id }).fetchAsync()"),
+    'server creation must read the authoritative collection, not a stale cache',
+  );
+});
+
+test('async default-swimlane self-heal returns the inserted document', () => {
+  const fn = extract('ensureDefaultSwimlaneIdAsync');
+  assert.ok(fn.includes('await Swimlanes.upsertAsync('));
+  assert.ok(
+    fn.includes('await Swimlanes.findOneAsync(defaultId)'),
+    'a cache miss immediately after upsert must fall back to the collection',
+  );
+});
+
 // --- The sync getters are pure (no creation) ---------------------------------
 
 test('sync getters no longer create anything', () => {