apostrophe 3.4.1 → 3.8.0

package/modules/@apostrophecms/ui/ui/apos/components/AposIndicator.vue

@@ -7,6 +7,7 @@
     <component
       :is="icon"
       :size="iconSize"
+      :title="title ? title : ''"
       class="apos-indicator__icon"
       :fill-color="iconColor"
     />
@@ -30,6 +31,10 @@ export default {
       type: [ String, Object, Boolean ],
       default: false
     },
+    title: {
+      type: [ String, Boolean ],
+      default: false
+    },
     iconColor: {
       type: String,
       default: 'currentColor'

package/modules/@apostrophecms/ui/ui/apos/lib/i18next.js

@@ -10,11 +10,20 @@ export default {
   install(Vue, options) {
     const i18n = options.i18n;
 
+    const fallbackLng = [ i18n.defaultLocale ];
+    // In case the default locale also has inadequate admin UI phrases
+    if (fallbackLng[0] !== 'en') {
+      fallbackLng.push('en');
+    }
+
     i18next.init({
       lng: i18n.locale,
-      fallbackLng: i18n.defaultLocale,
+      fallbackLng,
       resources: {},
-      debug: i18n.debug
+      debug: i18n.debug,
+      interpolation: {
+        escapeValue: false
+      }
     });
 
     for (const [ ns, phrases ] of Object.entries(i18n.i18n[i18n.locale])) {
@@ -25,6 +34,11 @@ export default {
         i18next.addResourceBundle(i18n.defaultLocale, ns, phrases, true, true);
       }
     }
+    if ((i18n.locale !== 'en') && (i18n.defaultLocale !== 'en')) {
+      for (const [ ns, phrases ] of Object.entries(i18n.i18n.en)) {
+        i18next.addResourceBundle('en', ns, phrases, true, true);
+      }
+    }
 
     // Like standard i18next $t, but also with support
     // for just one object argument with at least a `key`

package/modules/@apostrophecms/ui/ui/apos/scss/global/_tables.scss

@@ -5,7 +5,7 @@
 
 .apos-table__header {
   margin-bottom: $spacing-base;
-  padding: 12.5px 4.5px;
+  padding: 12.5px 15px;
   border-bottom: 1px solid var(--a-base-8);
   color: var(--a-base-3);
   text-align: left;
@@ -52,12 +52,13 @@ span.apos-table__header-label:hover {
   @include apos-transition(all, 0.05s);
 }
 .apos-table__cell {
-  padding: 5px;
+  padding: 5px 15px;
   border-bottom: 1px solid var(--a-base-10);
 }
 
 .apos-table__cell--context-menu  {
-  width: 40px;
+  padding-right: 0;
+  padding-left: 0;
 }
 
 .apos-table__cell-field--context-menu  {

package/modules/@apostrophecms/ui/ui/apos/scss/global/_theme.scss

@@ -78,6 +78,9 @@
   --a-line-base: 1;
   --a-line-tall: 1.3;
   --a-line-tallest: 1.6;
+
+  // Admin styles
+  --a-widget-margin: 0;
 }
 
 .apos-theme-dark {

package/modules/@apostrophecms/ui/ui/apos/scss/global/_widgets.scss

@@ -0,0 +1,3 @@
+[data-apos-area] [data-apos-area] {
+  margin: var(--a-widget-margin);
+}

package/modules/@apostrophecms/ui/ui/apos/scss/global/import-all.scss

@@ -9,4 +9,5 @@
 @import './_scrollbars';
 @import './_utilities';
 @import './_tables';
-@import './_tooltips';
+@import './_tooltips';
+@import './_widgets';

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

@@ -185,6 +185,19 @@ module.exports = {
           if (![ 'guest', 'editor', 'contributor', 'admin' ].includes(doc.role)) {
             throw self.apos.error('invalid', 'The role property of a user must be guest, editor, contributor or admin');
           }
+        },
+        async invalidatePriorLogins(req, doc, options) {
+          const effectiveUserId = req.user && req.user._id;
+          // Invalidate prior login sessions if the password field changes or
+          // the user is newly marked as disabled.
+          if (doc._id && doc._passwordUpdated && (effectiveUserId !== doc._id)) {
+            // Invalidate old sessions
+            doc.loginInvalidBefore = Date.now();
+            // Just delete old bearer tokens
+            return self.apos.login.bearerTokens.removeMany({
+              userId: doc._id
+            });
+          }
         }
       },
       // Reflect email and username changes in the safe after deduplicating in the piece
@@ -347,6 +360,13 @@ module.exports = {
       // alone and `safeUser` is not updated.
       //
       // Called automatically by `hashSecrets`, above.
+      //
+      // The secret property itself is immediately deleted from doc
+      // to avoid any risk of accidentally storing it in cleartext.
+      // However there is a way to detect that it was updated:
+      // if `secret` is `password`, then the `_passwordUpdated` temporary
+      // property is set to true. This provides a way to take additional
+      // actions stemming from this change in a `beforeSave` handler, etc.
 
       async hashSecret(doc, safeUser, secret) {
         if (!doc[secret]) {
@@ -355,6 +375,7 @@ module.exports = {
         const hash = await require('util').promisify(self.pw.hash)(doc[secret]);
         delete doc[secret];
         safeUser[secret + 'Hash'] = hash;
+        doc[`_${secret}Updated`] = true;
       },
 
       // Verify the given password by checking it against the

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

@@ -414,7 +414,7 @@ module.exports = {
           return self.insensitiveSortCompare(a[property], b[property]);
         });
       },
-      // Copmpare two strings in a case-insensitive way, returning -1, 0 or 1, suitable for use with sort().
+      // Compare two strings in a case-insensitive way, returning -1, 0 or 1, suitable for use with sort().
       // If the two strings represent numbers, compare them as numbers for a natural sort order
       // when comparing strings like '4' and '10'.
       insensitiveSortCompare(a, b) {
@@ -858,7 +858,7 @@ module.exports = {
         return _.startCase(o);
       },
 
-      // check if something is a function (as opposd to property)
+      // check if something is a function (as opposed to property)
       isFunction: function(o) {
         return (typeof o === 'function');
       },

package/modules/@apostrophecms/util/ui/src/http.js

@@ -150,10 +150,12 @@ export default () => {
     if (options.busy) {
       if (!busyActive[busyName]) {
         busyActive[busyName] = 0;
-        apos.bus.$emit('busy', {
-          active: true,
-          name: busyName
-        });
+        if (apos.bus) {
+          apos.bus.$emit('busy', {
+            active: true,
+            name: busyName
+          });
+        }
       }
       // keep track of nested calls
       busyActive[busyName]++;
@@ -240,10 +242,12 @@ export default () => {
         busyActive[busyName]--;
         if (!busyActive[busyName]) {
           // if no nested calls, disable the "busy" state
-          apos.bus.$emit('busy', {
-            active: false,
-            name: busyName
-          });
+          if (apos.bus) {
+            apos.bus.$emit('busy', {
+              active: false,
+              name: busyName
+            });
+          }
         }
       }
     });

package/modules/@apostrophecms/util/ui/src/util.js

@@ -257,6 +257,21 @@ export default () => {
     return path + '.' + file.extension;
   };
 
+  // Given an asset path such as `/modules/modulename/images/file.png`, this
+  // method will return a URL for it. This is used when frontend JavaScript
+  // code needs to access static assets shipped in the `public` subdirectory of
+  // individual modules. Currently `path` must begin with `/modules/` followed
+  // by a module name; other namespaces may exist later. The remainder of the
+  // path, such as `/images/file.png` in the above example, must currespond
+  // to a file that exists in the `public` subdirectory of the named module.
+  //
+  // Asset paths of this type are also automatically supported by CSS and
+  // SCSS files in the project when using `url()`.
+
+  apos.util.assetUrl = function(path) {
+    return apos.assetBaseUrl + path;
+  };
+
   // Returns true if the uri references the same site (same host and port) as the
   // current page. Cross-browser implementation, valid at least back to IE11.
   // Regarding port numbers, this will match as long as the URIs are consistent

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

@@ -156,7 +156,7 @@ module.exports = {
         self.schema = self.apos.schema.compose({
           addFields: self.apos.schema.fieldsToArray(`Module ${self.__meta.name}`, self.fields),
           arrangeFields: self.apos.schema.groupsToArray(self.fieldsGroups)
-        });
+        }, self);
         const forbiddenFields = [
           '_id',
           'type'

package/modules/@apostrophecms/widget-type/ui/apos/components/AposWidgetEditor.vue

@@ -19,6 +19,7 @@
               :schema="schema"
               :value="docFields"
               @input="updateDocFields"
+              @validate="triggerValidate"
               :following-values="followingValues()"
               :conditional-fields="conditionalFields()"
               ref="schema"

package/modules/@apostrophecms/widget-type/ui/apos/mixins/AposWidgetMixin.js

@@ -23,7 +23,8 @@ export default {
   data() {
     return {
       rendered: '...',
-      playerOpts: null
+      playerOpts: null,
+      playerEl: null
     };
   },
   mounted() {
@@ -40,6 +41,7 @@ export default {
   },
   methods: {
     async renderContent() {
+      const self = this;
       const parameters = {
         _docId: this.docId,
         widget: this.value,
@@ -61,6 +63,7 @@ export default {
         // AposAreas manager can spot any new area divs.
         // This will also run the player
         setTimeout(function() {
+          self.setPlayerEl();
           apos.bus.$emit('widget-rendered');
         }, 0);
       } catch (e) {
@@ -68,13 +71,18 @@ export default {
         console.error('Unable to render widget. Possibly the schema has been changed and the existing widget does not pass validation.', e);
       }
     },
-    runPlayer() {
-      if (!this.playerOpts) {
-        return;
+    setPlayerEl() {
+      if (this.playerOpts) {
+        const el = this.$el.querySelector(this.playerOpts.selector);
+        if (el && this.playerOpts.player) {
+          this.playerEl = el;
+        }
       }
-      const el = this.$el.querySelector(this.playerOpts.selector);
-      if (el && this.playerOpts.player) {
-        this.playerOpts.player(el);
+    },
+    runPlayer() {
+      if (this.playerEl && !this.playerEl.aposWidgetPlayed) {
+        this.playerOpts.player(this.playerEl);
+        this.playerEl.aposWidgetPlayed = true;
       }
     },
     clicked(e) {

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "apostrophe",
-  "version": "3.4.1",
+  "version": "3.8.0",
   "description": "The Apostrophe Content Management System.",
   "main": "index.js",
   "scripts": {
-    "pretest": "npm run lint && npm audit",
+    "pretest": "npm run lint",
     "test": "nyc --reporter=html mocha -t 10000",
     "lint": "eslint . && node scripts/lint-i18n"
   },
@@ -112,7 +112,7 @@
     "vue": "^2.6.14",
     "vue-click-outside-element": "^1.0.13",
     "vue-loader": "^15.9.6",
-    "vue-material-design-icons": "^4.9.0",
+    "vue-material-design-icons": "~4.12.1",
     "vue-style-loader": "^4.1.2",
     "vue-template-compiler": "^2.6.14",
     "vuedraggable": "^2.24.3",
@@ -127,7 +127,7 @@
     "eslint-loader": "^4.0.2",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-vue": "^7.9.0",
-    "mocha": "^7.1.2",
+    "mocha": "^9.1.2",
     "nyc": "^15.1.0",
     "replace-in-file": "^6.1.0",
     "vue-eslint-parser": "^7.1.1",

package/test/extra_node_modules/improve-global/index.js

@@ -0,0 +1,7 @@
+module.exports = {
+  improve: '@apostrophecms/global',
+  options: {
+    testGlobalLevelLoaded: true,
+    testGlobalLevel: true
+  }
+};

package/test/extra_node_modules/improve-piece-type/index.js

@@ -0,0 +1,7 @@
+module.exports = {
+  improve: '@apostrophecms/piece-type',
+  options: {
+    testPieceTypeLevelLoaded: true,
+    testPieceTypeLevel: true
+  }
+};

package/test/improve-overrides.js

@@ -0,0 +1,30 @@
+const t = require('../test-lib/test.js');
+const assert = require('assert');
+
+describe('Improve Overrides', function() {
+
+  this.timeout(t.timeout);
+
+  it('"improve" should work, but project level should override it', async function() {
+    let apos;
+    try {
+      apos = await t.create({
+        root: module,
+        modules: {
+          'improve-piece-type': {},
+          'improve-global': {}
+        }
+      });
+      assert(apos.global.options.verifyProjectLevelLoaded);
+      assert.strictEqual(apos.user.options.testPieceTypeLevelLoaded, true);
+      assert.strictEqual(apos.user.options.testPieceTypeLevel, true);
+      assert.strictEqual(apos.global.options.testPieceTypeLevelLoaded, true);
+      assert.strictEqual(apos.global.options.testPieceTypeLevel, false);
+      assert.strictEqual(apos.global.options.testGlobalLevelLoaded, true);
+      assert.strictEqual(apos.global.options.testGlobalLevel, false);
+    } finally {
+      t.destroy(apos);
+    }
+  });
+
+});

package/test/job.js

@@ -0,0 +1,224 @@
+const t = require('../test-lib/test.js');
+const assert = require('assert');
+const Promise = require('bluebird');
+let apos;
+
+describe('Job module', function() {
+
+  this.timeout(t.timeout);
+
+  after(async function() {
+    return t.destroy(apos);
+  });
+
+  let jobModule;
+
+  it('should be a property of the apos object', async function() {
+    this.timeout(t.timeout);
+    this.slow(2000);
+
+    apos = await t.create({
+      root: module,
+      modules: {
+        article: {
+          extend: '@apostrophecms/piece-type'
+        }
+      }
+    });
+    jobModule = apos.modules['@apostrophecms/job'];
+    assert(apos.modules['@apostrophecms/job']);
+  });
+
+  it('has a related database collection', async function () {
+    assert(jobModule.db);
+  });
+
+  let jobOne;
+
+  it('should create a new job', async function () {
+    jobOne = await jobModule.start({});
+
+    assert(jobOne._id);
+
+    const found = await jobModule.db.findOne({ _id: jobOne._id });
+
+    assert(found);
+    assert(found.status === 'running');
+    assert(found.ended === false);
+  });
+
+  it('should end a job and mark it as successful', async function () {
+    const result = await jobModule.end(jobOne, 'success', { testing: 'testing' });
+
+    assert(result.result.nModified === 1);
+
+    const found = await jobModule.db.findOne({ _id: jobOne._id });
+
+    assert(found);
+    assert(found.status === 'completed');
+    assert(found.ended === true);
+  });
+  let jar;
+  it('should get admin jar', async () => {
+    await t.createAdmin(apos);
+
+    jar = await t.getUserJar(apos);
+
+    assert(jar);
+  });
+
+  it('should access a job via REST API GET request', async function () {
+    const job = await apos.http.get(`/api/v1/@apostrophecms/job/${jobOne._id}`, {
+      jar
+    });
+
+    assert(job._id === jobOne._id);
+  });
+
+  let articleIds;
+
+  it('can insert many test articles', async function () {
+    const req = apos.task.getReq();
+
+    const promises = [];
+
+    for (let i = 1; i <= 500; i++) {
+      promises.push(insert(req, apos.modules.article, 'article', {}, i));
+    }
+
+    const inserted = await Promise.all(promises);
+    articleIds = inserted.map(doc => doc._id);
+
+    assert(inserted.length === 500);
+    assert(!!inserted[0]._id);
+  });
+
+  let jobTwo;
+  it('can run a batch job', async function () {
+    const req = apos.task.getReq();
+
+    jobTwo = await jobModule.runBatch(
+      req,
+      articleIds,
+      async function(req, id) {
+        await apos.doc.db.updateOne({
+          _id: id
+        }, {
+          $set: {
+            checked: true
+          }
+        });
+      }
+    );
+
+    assert(!!jobTwo.jobId);
+  });
+
+  it('can follow the second job as it works', async function () {
+    const { completed } = await pollJob({
+      route: `${jobModule.action}/${jobTwo.jobId}`
+    }, {
+      jar
+    });
+
+    assert(completed === articleIds.length);
+    const index = Math.floor(Math.random() * (articleIds.length - 1));
+
+    const article = await apos.http.get(`/api/v1/article/${articleIds[index]}`, {
+      jar
+    });
+
+    assert(article.checked === true);
+  });
+
+  const logged = [];
+
+  let jobThree;
+
+  it('can run a generic job', async function () {
+    const req = apos.task.getReq();
+
+    jobThree = await jobModule.run(
+      req,
+      async function(req, reporters) {
+        let count = 1;
+        reporters.setTotal(articleIds.length);
+
+        for (const id of articleIds) {
+          await Promise.delay(3);
+          logged.push(id);
+          if (count % 2) {
+            reporters.success();
+          } else {
+            reporters.failure();
+          }
+          count++;
+        }
+      }
+    );
+
+    assert(!!jobThree.jobId);
+  });
+
+  it('can follow the third job as it works', async function () {
+    const route = `${jobModule.action}/${jobThree.jobId}`;
+    const { total } = await apos.http.get(route, { jar });
+    // Tests setTotal()
+    assert(total === articleIds.length);
+
+    const {
+      completed,
+      good,
+      bad
+    } = await pollJob({
+      route
+    }, {
+      jar
+    });
+
+    assert(completed === articleIds.length);
+    // Tests success()
+    assert(good === (articleIds.length / 2));
+    // Tests failure()
+    assert(bad === (articleIds.length / 2));
+  });
+});
+
+function padInteger (i, places) {
+  let s = i + '';
+  while (s.length < places) {
+    s = '0' + s;
+  }
+  return s;
+}
+
+async function insert (req, pieceModule, title, data, i) {
+  const docData = Object.assign(pieceModule.newInstance(), {
+    title: `${title} #${padInteger(i, 5)}`,
+    slug: `${title}-${padInteger(i, 5)}`,
+    ...data
+  });
+
+  return pieceModule.insert(req, docData);
+};
+
+async function pollJob(job, { jar }) {
+  const {
+    processed,
+    total,
+    good,
+    bad
+  } = await apos.http.get(job.route, { jar });
+
+  if (processed < total) {
+    Promise.delay(100);
+
+    return await pollJob(job, { jar });
+  } else {
+    return {
+      completed: processed,
+      good,
+      bad
+    };
+  }
+}