apostrophe 3.28.0 → 3.28.1

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 3.28.1 (2022-09-15)
+
+### Fixes
+
+* `AposInputBoolean` can now be `required` and have the value `false`.
+* Schema fields containing boolean filters can now list both `yes` and `no` choices according to available values in the database.
+* Fix attachment `getHeight()` and `getWidth()` template helpers by changing the assignment of the `attachment._crop` property.
+* Change assignment of `attachment._focalPoint` for consistency.
+
 ## 3.28.0 (2022-08-31)
 
 ### Fixes

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

@@ -708,8 +708,8 @@ module.exports = {
               if (ancestorFields) {
                 value = _.clone(value);
                 o.attachment = value;
-                value._crop = _.pick(ancestorFields, 'width', 'height', 'top', 'left');
-                value._focalPoint = _.pick(ancestorFields, 'x', 'y');
+                value._crop = ancestorFields.width ? _.pick(ancestorFields, 'width', 'height', 'top', 'left') : undefined;
+                value._focalPoint = (typeof ancestorFields.x === 'number') ? _.pick(ancestorFields, 'x', 'y') : undefined;
                 break;
               }
             }

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

@@ -753,7 +753,7 @@ module.exports = {
       isShareDraftRequest(req) {
         const { aposShareId, aposShareKey } = req.query;
 
-        return (
+        return Boolean(
           typeof aposShareId === 'string' &&
           aposShareId.length &&
           typeof aposShareKey === 'string' &&

package/modules/@apostrophecms/schema/lib/addFieldTypes.js

@@ -165,7 +165,7 @@ module.exports = (self) => {
       destination[field.name] = self.apos.launder.boolean(data[field.name], field.def);
     },
     isEmpty: function (field, value) {
-      return !value;
+      return !value && value !== false;
     },
     exporters: {
       string: function (req, field, object, output) {
@@ -190,7 +190,7 @@ module.exports = (self) => {
           return self.apos.launder.booleanOrNull(b);
         },
         choices: async function () {
-          const values = query.toDistinct(field.name);
+          const values = await query.toDistinct(field.name);
           const choices = [];
           if (_.includes(values, true)) {
             choices.push({
@@ -198,7 +198,7 @@ module.exports = (self) => {
               label: 'apostrophe:yes'
             });
           }
-          if (_.includes(values, true)) {
+          if (_.includes(values, false)) {
             choices.push({
               value: '0',
               label: 'apostrophe:no'

package/modules/@apostrophecms/schema/ui/apos/components/AposInputBoolean.vue

@@ -81,7 +81,7 @@ export default {
     },
     validate(value) {
       if (this.field.required) {
-        if (!value) {
+        if (!value && value !== false) {
           return 'required';
         }
       }

package/package.json

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

package/test/areas.js

@@ -336,11 +336,29 @@ describe('Areas', function() {
       }, true)
     );
     assert(
-      apos.schema.fieldTypes.boolean.isEmpty({
+      !apos.schema.fieldTypes.boolean.isEmpty({
         type: 'boolean',
         name: 'test'
       }, false)
     );
+    assert(
+      apos.schema.fieldTypes.boolean.isEmpty({
+        type: 'boolean',
+        name: 'test'
+      }, null)
+    );
+    assert(
+      apos.schema.fieldTypes.boolean.isEmpty({
+        type: 'boolean',
+        name: 'test'
+      }, undefined)
+    );
+    assert(
+      apos.schema.fieldTypes.boolean.isEmpty({
+        type: 'boolean',
+        name: 'test'
+      }, 0)
+    );
     assert(
       !apos.schema.fieldTypes.boolean.empty({
         type: 'boolean',
@@ -348,11 +366,29 @@ describe('Areas', function() {
       }, true)
     );
     assert(
-      apos.schema.fieldTypes.boolean.empty({
+      !apos.schema.fieldTypes.boolean.empty({
         type: 'boolean',
         name: 'test'
       }, false)
     );
+    assert(
+      apos.schema.fieldTypes.boolean.empty({
+        type: 'boolean',
+        name: 'test'
+      }, null)
+    );
+    assert(
+      apos.schema.fieldTypes.boolean.empty({
+        type: 'boolean',
+        name: 'test'
+      }, undefined)
+    );
+    assert(
+      apos.schema.fieldTypes.boolean.empty({
+        type: 'boolean',
+        name: 'test'
+      }, 0)
+    );
   });
 });
 

package/test/schemaBuilders.js

@@ -73,6 +73,11 @@ describe('Schema builders', function() {
                 idsStorage: 'favoriteIds',
                 label: 'Favorites',
                 withType: 'cat'
+              },
+              isACatPerson: {
+                type: 'boolean',
+                label: 'Is a cat person?',
+                required: true
               }
             }
           }
@@ -102,9 +107,11 @@ describe('Schema builders', function() {
     }
     for (i = 0; (i < people.length); i++) {
       const person = people[i];
+      person.isACatPerson = true;
       // person 10 has no favorite cat
       if (i < 10) {
         person.favoriteIds = [ cats[i].aposDocId ];
+        person.isACatPerson = false;
       }
       person.catsIds = [];
       let j;
@@ -299,6 +306,23 @@ describe('Schema builders', function() {
     assert(cats[0].label);
     assert(cats[0].slug);
   });
+  it('can obtain choices for isACatPerson', async function() {
+    const req = apos.task.getReq();
+    const query = apos.people.find(req);
+    const isACatPerson = await query.toChoices('isACatPerson');
+    const actual = isACatPerson;
+    const expected = [
+      {
+        value: '1',
+        label: 'apostrophe:yes'
+      },
+      {
+        value: '0',
+        label: 'apostrophe:no'
+      }
+    ];
+    assert.deepEqual(actual, expected);
+  });
 
   it('builder for favorite (by slug) exists', function() {
     const req = apos.task.getReq();