apostrophe 3.8.0 → 3.10.0

package/.github/workflows/main.yml

@@ -0,0 +1,45 @@
+# This is a basic workflow to help you get started with Actions
+
+name: Tests
+
+# Controls when the action will run. 
+on:
+  push:
+    branches: [ '*' ]
+  pull_request:
+    branches: [ '*' ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [12, 14, 16]
+        mongodb-version: [4.2, 4.4, 5.0]
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    - name: Git checkout
+      uses: actions/checkout@v2
+
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+
+    - name: Start MongoDB
+      uses: supercharge/mongodb-github-action@1.3.0
+      with:
+        mongodb-version: ${{ matrix.mongodb-version }}
+
+    - run: npm install
+
+    - run: npm test
+      env:
+        CI: true

package/CHANGELOG.md

@@ -1,5 +1,57 @@
 # Changelog
 
+## 3.10.0 - 2021-12-22
+
+### Fixes
+
+* `slug` type fields can now have an empty string or `null` as their `def` value without the string `'none'` populating automatically.
+* The `underline` feature works properly in tiptap toolbar configuration.
+* Required checkbox fields now properly prevent editor submission when empty.
+* Pins `vue-click-outside-element` to a version that does not attempt to use `eval` in its distribution build, which is incompatible with a strict Content Security Policy.
+
+### Adds
+
+* Adds a `last` option to fields. Setting `last: true` on a field puts that field at the end of the field's widget order. If more than one field has that option active the true last item will depend on general field registration order. If the field is ordered with the `fields.order` array or field group ordering, those specified orders will take precedence.
+
+### Changes
+
+* Adds deprecation notes to the widget class methods `getWidgetWrapperClasses` and `getWidgetClasses` from A2.
+* Adds a deprecation note to the `reorganize` query builder for the next major version.
+* Uses the runtime build of Vue. This has major performance and bundle size benefits, however it does require changes to Apostrophe admin UI apps that use a `template` property (components should require no changes, just apps require an update). These apps must now use a `render` function instead. Since custom admin UI apps are not yet a documented feature we do not regard this as a bc break.
+* Compatible with the `@apostrophecms/security-headers` module, which supports a strict `Content-Security-Policy`.
+* Adds a deprecation note to the `addLateCriteria` query builder.
+* Updates the `toCount` doc type query method to use Math.ceil rather than Math.floor plus an additional step.
+
+## 3.9.0 - 2021-12-08
+
+### Adds
+
+* Developers can now override any Vue component of the ApostropheCMS admin UI by providing a component of the same name in the `ui/apos/components` folder of their own module. This is not always the best approach, see the documentation for details.
+* When running a job, we now trigger the notification before to run the job, this way the progress notification ID is available from the job and the notification can be dismissed if needed.
+* Adds `maxUi`, `maxLabel`, `minUi`, and `minLabel` localization strings for array input and other UI.
+
+### Fixes
+
+* Fully removes references to the A2 `self.partial` module method. It appeared only once outside of comments, but was not actually used by the UI. The `self.render` method should be used for simple template rendering.
+* Fixes string interpolation for the confirmation modal when publishing a page that has an unpublished parent page.
+* No more "cannot set headers after they are sent to the client" and "req.res.redirect not defined" messages when handling URLs with extra trailing slashes.
+* The `apos.util.runPlayers` method is not called until all of the widgets in a particular tree of areas and sub-areas have been added to the DOM. This means a parent area widget player will see the expected markup for any sub-widgets when the "Edit" button is clicked.
+* Properly activates the `apostropheI18nDebugPlugin` i18next debugging plugin when using the `APOS_SHOW_I18N` environment variable. The full set of l10n emoji indicators previously available for the UI is now available for template and server-side strings.
+* Actually registers piece types for site search unless the `searchable` option is `false`.
+* Fixes the methods required for the search `index` task.
+
+### Changes
+
+* Adds localization keys for the password field component's min and max error messages.
+
+## 3.8.1 - 2021-11-23
+
+### Fixes
+
+* The search field of the pieces manager modal works properly. Thanks to [Miro Yovchev](https://github.com/myovchev) for pointing out the issue and providing a solution.
+* Fixes a bug in `AposRichTextWidgetEditor.vue` when a rich text widget was specifically configured with an empty array as the `styles` option. In that case a new empty rich text widget will initiate with an empty paragraph tag.
+* The`fieldsPresent` method that is used with the `presentFieldsOnly` option in doc-type was broken, looking for properties in strings and wasn't returning anything.
+
 ## 3.8.0 - 2021-11-15
 
 ### Adds

package/README.md

@@ -1,5 +1,4 @@
-
-[![CircleCI](https://circleci.com/gh/apostrophecms/apostrophe/tree/main.svg?style=svg)](https://circleci.com/gh/apostrophecms/apostrophe/tree/main)
+![Unit Tests](https://github.com/apostrophecms/apostrophe/actions/workflows/main.yml/badge.svg)
 [![Chat on Discord](https://img.shields.io/discord/517772094482677790.svg)](https://chat.apostrophecms.org)
 
 <p align="center">

package/lib/moog.js

@@ -179,17 +179,42 @@ module.exports = function(options) {
               ...properties.add
             };
           }
+
+          const lastFields = Object.entries(that[cascade])
+            .filter(([ field, val ]) => val.last === true)
+            .map(([ field, val ]) => field);
+
           if (properties.remove) {
             for (const field of properties.remove) {
               delete that[cascade][field];
             }
           }
           if (properties.order) {
+            // 1. Ordered fields
+            // 2. Other fields not marked as last
+            // 3. Fields marked as last
             that[cascade] = Object.fromEntries([
               ...properties.order.map(field => [ field, that[cascade][field] ]),
-              ...Object.keys(that[cascade]).filter(field => !properties.order.includes[field]).map(field => [ field, that[cascade][field] ])
+              ...Object.keys(that[cascade])
+                .filter(field => {
+                  return !properties.order.includes(field) &&
+                    !lastFields.includes(field);
+                })
+                .map(field => [ field, that[cascade][field] ]),
+              ...lastFields.filter(field => !properties.order.includes(field))
+                .map(field => [ field, that[cascade][field] ])
+            ]);
+          } else if (lastFields.length > 0) {
+            // 1. Fields not marked as last
+            // 2. Fields marked as last
+            that[cascade] = Object.fromEntries([
+              ...Object.keys(that[cascade])
+                .filter(field => !lastFields.includes(field))
+                .map(field => [ field, that[cascade][field] ]),
+              ...lastFields.map(field => [ field, that[cascade][field] ])
             ]);
           }
+
           if (properties.group) {
             const groups = klona(that[`${cascade}Groups`]);
             for (const value of Object.values(properties.group)) {

package/modules/@apostrophecms/admin-bar/ui/apos/apps/AposAdminBar.js

@@ -10,7 +10,13 @@ export default function() {
           return window.apos;
         }
       },
-      template: '<component :is="`TheAposAdminBar`" :items="apos.adminBar.items" />'
+      render: function (h) {
+        return h('TheAposAdminBar', {
+          props: {
+            items: apos.adminBar.items
+          }
+        });
+      }
     });
   }
 };

package/modules/@apostrophecms/any-page-type/index.js

@@ -287,6 +287,8 @@ module.exports = {
         // are suitable for display in the reorganize view.
         // The only pages excluded are those with a `reorganize`
         // property explicitly set to `false`.
+        // NOTE: This query builder is deprecated and will be removed in the
+        // next major version.
         reorganize: {
           def: null,
           finalize() {

package/modules/@apostrophecms/area/ui/apos/apps/AposAreas.js

@@ -3,27 +3,32 @@ import { klona } from 'klona';
 
 export default function() {
 
+  let widgetsRendering = 0;
+
   createWidgetClipboardApp();
 
-  prepareAreas();
+  createAreaApps();
 
   document.documentElement.style.setProperty('--a-widget-margin', apos.ui.widgetMargin);
 
+  apos.bus.$on('widget-rendering', function() {
+    widgetsRendering++;
+  });
+
   apos.bus.$on('widget-rendered', function() {
-    prepareAreas();
+    widgetsRendering--;
+    createAreaAppsAndRunPlayersIfDone();
   });
+
   apos.bus.$on('refreshed', function() {
-    prepareAreas();
+    createAreaAppsAndRunPlayersIfDone();
   });
 
-  function prepareAreas() {
-    // Doing this first allows markup to be captured for the editor
-    // before players alter it
+  function createAreaAppsAndRunPlayersIfDone() {
     createAreaApps();
-    // Even though we invoke the player directly from
-    // the widget mixin used for editable widgets, we still have to
-    // call runPlayers eventually to account for any foreign area widgets
-    apos.util.runPlayers();
+    if (widgetsRendering === 0) {
+      apos.util.runPlayers();
+    }
   }
 
   function createAreaApps() {
@@ -106,7 +111,19 @@ export default function() {
             renderings
           };
         },
-        template: `<${component} :options="options" :items="items" :choices="choices" :id="$data.id" :docId="$data.docId" :fieldId="fieldId" :renderings="renderings" />`
+        render(h) {
+          return h(component, {
+            props: {
+              options: this.options,
+              items: this.items,
+              choices: this.choices,
+              id: this.id,
+              docId: this.docId,
+              fieldId: this.fieldId,
+              renderings: this.renderings
+            }
+          });
+        }
       });
     }
   }

package/modules/@apostrophecms/asset/index.js

@@ -192,7 +192,10 @@ module.exports = {
             let iconImports, componentImports, tiptapExtensionImports, appImports, indexJsImports, indexSassImports;
             if (options.apos) {
               iconImports = getIcons();
-              componentImports = getImports(`${source}/components`, '*.vue', { registerComponents: true });
+              componentImports = getImports(`${source}/components`, '*.vue', {
+                registerComponents: true,
+                importLastVersion: true
+              });
               tiptapExtensionImports = getImports(`${source}/tiptap-extensions`, '*.js', { registerTiptapExtensions: true });
               appImports = getImports(`${source}/apps`, '*.js', {
                 invokeApps: true,
@@ -441,6 +444,25 @@ module.exports = {
               paths: []
             };
 
+            if (options.importLastVersion) {
+              // Reverse the list so we can easily find the last configured import
+              // of a given component, allowing "improve" modules to win over
+              // the originals when shipping an override of a Vue component
+              // with the same name, and filter out earlier versions
+              components.reverse();
+              const seen = new Set();
+              components = components.filter(component => {
+                const name = getComponentName(component, options);
+                if (seen.has(name)) {
+                  return false;
+                }
+                seen.add(name);
+                return true;
+              });
+              // Put the components back in their original order
+              components.reverse();
+            }
+
             components.forEach((component, i) => {
               if (options.requireDefaultExport) {
                 if (!fs.readFileSync(component, 'utf8').match(/export[\s\n]+default/)) {
@@ -453,7 +475,7 @@ module.exports = {
                 }
               }
               const jsFilename = JSON.stringify(component);
-              const name = require('path').basename(component).replace(/\.\w+/, '') + (options.enumerateImports ? `_${i}` : '');
+              const name = getComponentName(component, options, i);
               const jsName = JSON.stringify(name);
               output.paths.push(component);
               const importCode = `
@@ -492,6 +514,10 @@ module.exports = {
 
             return pkgTimestamp > parseInt(timestamp);
           }
+
+          function getComponentName(component, options, i) {
+            return require('path').basename(component).replace(/\.\w+/, '') + (options.enumerateImports ? `_${i}` : '');
+          }
         }
       }
     };
@@ -726,8 +752,7 @@ module.exports = {
         if (!self.shouldRefreshOnRestart()) {
           return '';
         }
-        const script = fs.readFileSync(path.join(__dirname, '/lib/refresh-on-restart.js'), 'utf8');
-        return self.apos.template.safe(`<script data-apos-refresh-on-restart="${self.action}/restart-id">\n${script}</script>`);
+        return self.apos.template.safe(`<script data-apos-refresh-on-restart="${self.action}/restart-id" src="${self.action}/refresh-on-restart"></script>`);
       },
       url(path) {
         return `${self.getAssetBaseUrl()}${path}`;
@@ -739,6 +764,12 @@ module.exports = {
       return;
     }
     return {
+      get: {
+        refreshOnRestart(req) {
+          req.res.setHeader('content-type', 'text/javascript');
+          return fs.readFileSync(path.join(__dirname, '/lib/refresh-on-restart.js'), 'utf8');
+        }
+      },
       // Use a POST route so IE11 doesn't cache it
       post: {
         async restartId(req) {

package/modules/@apostrophecms/asset/lib/webpack/apos/webpack.config.js

@@ -28,7 +28,7 @@ module.exports = ({
     optimization: {
       minimize: process.env.NODE_ENV === 'production'
     },
-    devtool: 'eval-source-map',
+    devtool: 'source-map',
     output: {
       path: outputPath,
       filename: outputFilename
@@ -42,7 +42,7 @@ module.exports = ({
     resolve: {
       extensions: [ '*', '.js', '.vue', '.json' ],
       alias: {
-        vue$: 'vue/dist/vue.esm.js',
+        vue$: 'vue/dist/vue.runtime.esm.js',
         // resolve apostrophe modules
         Modules: path.resolve(modulesDir)
       },

package/modules/@apostrophecms/asset/lib/webpack/src/webpack.config.js

@@ -34,7 +34,7 @@ module.exports = ({
     optimization: {
       minimize: process.env.NODE_ENV === 'production'
     },
-    devtool: 'eval-source-map',
+    devtool: 'source-map',
     output: {
       path: outputPath,
       filename: outputFilename

package/modules/@apostrophecms/attachment/index.js

@@ -230,7 +230,6 @@ module.exports = {
       addFieldType() {
         self.apos.schema.addFieldType({
           name: self.name,
-          partial: self.fieldTypePartial,
           convert: self.convert,
           index: self.index,
           register: self.register
@@ -274,9 +273,6 @@ module.exports = {
         await self.db.replaceOne({ _id: info._id }, info);
         object[field.name] = info;
       },
-      fieldTypePartial(data) {
-        return self.partial('attachment', data);
-      },
       index(value, field, texts) {
         const silent = field.silent === undefined ? true : field.silent;
         texts.push({

package/modules/@apostrophecms/busy/ui/apos/apps/AposBusy.js

@@ -3,6 +3,8 @@ import Vue from 'Modules/@apostrophecms/ui/lib/vue';
 export default function() {
   return new Vue({
     el: '#apos-busy',
-    template: '<component :is="`TheAposBusy`" />'
+    render: function (h) {
+      return h('TheAposBusy');
+    }
   });
 };

package/modules/@apostrophecms/doc-type/index.js

@@ -545,8 +545,11 @@ module.exports = {
 
         await self.apos.schema.convert(req, schema, input, doc);
 
-        doc.copyOfId = copyOf && copyOf._id;
         if (copyOf) {
+          if (copyOf._id) {
+            doc.copyOfId = copyOf._id;
+          }
+
           self.apos.schema.regenerateIds(req, fullSchema, doc);
         }
       },
@@ -554,17 +557,9 @@ module.exports = {
       // taking into account issues like relationship fields keeping their data in
       // a separate ids property, etc.
       fieldsPresent(input) {
-        const schema = self.schema;
-        const output = [];
-        for (const field of schema) {
-          if (field.type.name.substring(0, 5) === '_relationship') {
-            if (_.has(input, field.idsStorage)) {
-              output.push(field.name);
-            }
-          } else {
-            output.push(field.name);
-          }
-        }
+        return self.schema
+          .filter((field) => _.has(input, field.name))
+          .map((field) => field.name);
       },
       // Returns a query that finds docs the current user can edit. Unlike
       // find(), this query defaults to including docs in the archive. Subclasses
@@ -1157,8 +1152,10 @@ module.exports = {
 
         // `.addLateCriteria({...})` provides an object to be merged directly into the final
         // criteria object that will go to MongoDB. This is to be used only
-        // in cases where MongoDB forbids the use of an operator inside
-        // `$and`, such as the `$near` operator.
+        // in cases where MongoDB forbids the use of an operator inside `$and`.
+        //
+        // TODO: Since `$near` can now be used in `$and` operators, this query
+        // builder is deprecated and should be removed in the 4.x major version.
         addLateCriteria: {
           set(c) {
             let lateCriteria = query.get('lateCriteria');
@@ -1274,6 +1271,14 @@ module.exports = {
             if (query.get('search')) {
               // MongoDB mandates this if we want to sort on search result quality
               projection.textScore = { $meta: 'textScore' };
+            } else if (projection.textScore) {
+              // Gracefully elide the textScore projection when it is not useful and
+              // would cause an error anyway.
+              //
+              // This allows the reuse of the `project()` value passed to one query
+              // in a second query without worrying about whether the second query
+              // contains a search or not
+              delete projection.textScore;
             }
             query.set('project', projection);
           }
@@ -1417,7 +1422,7 @@ module.exports = {
           }
         },
 
-        // `.permission('admin')` would limit the returned docs to those for which the
+        // `.permission('edit')` would limit the returned docs to those for which the
         // user associated with the query's `req` has the named permission.
         // By default, `view` is checked for. You might want to specify
         // `edit`.
@@ -1655,7 +1660,11 @@ module.exports = {
             const _req = query.req.clone({
               mode: 'published'
             });
-            const publishedDocs = await self.find(_req)._ids(results.map(result => result._id.replace(':draft', ':published'))).project(query.get('project')).toArray();
+            const publishedDocs = await self.find(_req)
+              ._ids(results.map(result => {
+                return result._id.replace(':draft', ':published');
+              })).project(query.get('project')).toArray();
+
             for (const doc of results) {
               const publishedDoc = publishedDocs.find(publishedDoc => doc.aposDocId === publishedDoc.aposDocId);
               doc._publishedDoc = publishedDoc;
@@ -2145,10 +2154,8 @@ module.exports = {
           const count = await mongo.count();
           if (query.get('perPage')) {
             const perPage = query.get('perPage');
-            let totalPages = Math.floor(count / perPage);
-            if (count % perPage) {
-              totalPages++;
-            }
+            const totalPages = Math.ceil(count / perPage);
+
             query.set('totalPages', totalPages);
           }
           return count;

package/modules/@apostrophecms/doc-type/ui/apos/components/AposDocEditor.vue

@@ -162,7 +162,6 @@ export default {
       return `${this.moduleAction}/${this.docId}`;
     },
     tooltip() {
-      // TODO I18N
       let msg;
       if (this.errorCount) {
         msg = {

package/modules/@apostrophecms/i18n/i18n/en.json

@@ -124,6 +124,7 @@
   "errorPageMessage": "An error has occurred",
   "errorPageStatusCode": "500",
   "errorPageTitle": "An error has occurred",
+  "errorBatchOperationNoti": "Batch operation {{ operation }} failed.",
   "everythingElse": "Everything Else",
   "exit": "Exit",
   "fetchPublishedVersionFailed": "An error occurred fetching the published version of the document.",
@@ -176,6 +177,8 @@
   "manageDocType": "Manage {{ type }}",
   "manageDraftSubmissions": "Manage Draft Submissions",
   "managePages": "Manage Pages",
+  "maxLabel": "Max:",
+  "maxUi": "Max: {{ number }}",
   "mediaCreatedDate": "Uploaded: {{ createdDate }}",
   "mediaDimensions": "Dimensions: {{ width }} 𝗑 {{ height }}",
   "mediaFileSize": "File Size: {{ fileSize }}",
@@ -183,6 +186,8 @@
   "mediaMB": "{{ size }}MB",
   "mediaUploadViaDrop": "Drop ’em when you’re ready",
   "mediaUploadViaExplorer": "Or click to open the file explorer",
+  "minLabel": "Min:",
+  "minUi": "Min: {{ number }}",
   "modify": "Modify",
   "modifyOrDelete": "Modify / Delete",
   "moreOptions": "More Options",
@@ -213,6 +218,7 @@
   "notYetPublished": "This document hasn't been published yet.",
   "nudgeDown": "Nudge Down",
   "nudgeUp": "Nudge Up",
+  "numberAdded": "{{ count }} Added",
   "office": "Office",
   "openGlobal": "Open Global Site Settings",
   "page": "Page",
@@ -248,6 +254,8 @@
   "richTextUndo": "Undo",
   "richTextStyleConfigWarning": "Misconfigured rich text style: label: {{ label }}, {{ tag }}",
   "password": "Password",
+  "passwordErrorMin": "Minimum of {{ min }} characters",
+  "passwordErrorMax": "Maximum of {{ max }} characters",
   "passwordResetRequest": "Your request to reset your password on {{ site }}",
   "pasteWidget": "Paste {{ widget }}",
   "pending": "Pending",

package/modules/@apostrophecms/i18n/i18n/es.json

@@ -204,7 +204,7 @@
   "notFoundPageStatusCode": "404",
   "notFoundPageTitle": "404 - Página no encontrada",
   "notInLocale": "La página actual no existe en {{ label }}. ¿Traducir la versión desde la configuración regional {{ currentLocale }}?",
-  "noTypeFound": "Ningún {{ type }} Ecnontrado",
+  "noTypeFound": "Ningún {{ type }} Encontrado",
   "parentNotLocalized": "Primero traduzca la configuración regional de la página principal",
   "notYetPublished": "Este documento aún no ha sido publicado.",
   "nudgeDown": "Mover Hacia Arriba",

package/modules/@apostrophecms/i18n/index.js

@@ -13,11 +13,27 @@ const ExpressSessionCookie = require('express-session/session/cookie');
 
 const apostropheI18nDebugPlugin = {
   type: 'postProcessor',
-  name: 'apostrophei18nDebugPlugin',
+  name: 'apostropheI18nDebugPlugin',
   process(value, key, options, translator) {
-    // For ease of tracking down which phrases were
-    // actually passed through i18next
-    return `🌍 ${value}`;
+    // The key is passed as an array (theoretically to include multiple keys).
+    // We confirm that and grab the primary one for comparison.
+    const l10nKey = Array.isArray(key) ? key[0] : key;
+
+    if (value === l10nKey) {
+      if (l10nKey.match(/^\S+:/)) {
+        // The l10n key does not have a value assigned (or the key is
+        // actually the same as the phrase). The key seems to have a
+        // namespace, so might be from the Apostrophe UI.
+        return `❌ ${value}`;
+      } else {
+        // The l10n key does not have a value assigned (or the key is
+        // actually the same as the phrase). It is in the default namespace.
+        return `🕳 ${value}`;
+      }
+    } else {
+      // The phrase is fully localized.
+      return `🌍 ${value}`;
+    }
   }
 };
 
@@ -73,7 +89,12 @@ module.exports = {
     if (self.show) {
       self.i18next.use(apostropheI18nDebugPlugin);
     }
-    await self.i18next.init();
+
+    const i18nextOptions = self.show ? {
+      postProcess: 'apostropheI18nDebugPlugin'
+    } : {};
+
+    await self.i18next.init(i18nextOptions);
     self.addInitialResources();
     self.enableBrowserData();
   },

package/modules/@apostrophecms/job/index.js

@@ -189,38 +189,31 @@ module.exports = {
       async run(req, doTheWork, options = {}) {
         const res = req.res;
         let job;
-        let notification;
         let total;
 
         try {
           job = await self.start(options);
-          run();
 
-          // Trigger the "in progress" notification.
-          notification = await self.triggerNotification(req, 'progress', {
-            // It's only relevant to pass a job ID to the notification if
-            // the notification will show progress. Without a total number we
-            // can't show progress.
-            jobId: total && job._id,
-            count: total
+          const notification = await self.triggerNotification(req, 'progress', {
+            jobId: job._id
           });
 
+          run({ notificationId: notification.noteId });
+
           return {
             jobId: job._id
           };
         } catch (err) {
           self.apos.util.error(err);
-          if (job) {
-            // Not a lot we can do about this since we already
-            // stopped talking to the user
-            self.apos.util.error(err);
-          } else {
+
+          if (!job) {
             // If we never made a job, then we never responded
+            // otherwise we already stopped talking to the user
             return res.status(500).send('error');
           }
         }
 
-        async function run() {
+        async function run(info) {
           let results;
           let good = false;
           try {
@@ -240,7 +233,7 @@ module.exports = {
               setResults (_results) {
                 results = _results;
               }
-            });
+            }, info);
             good = true;
           } finally {
             await self.end(job, good, results);
@@ -253,7 +246,7 @@ module.exports = {
             // Dismiss the progress notification. It will delay 4 seconds
             // because "completed" notification will dismiss in 5 and we want
             // to maintain the feeling of process order for users.
-            await self.apos.notification.dismiss(req, notification.noteId, 4000);
+            await self.apos.notification.dismiss(req, info.notificationId, 4000);
           }
         }
       },