apostrophe 3.8.0 → 3.8.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 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/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
@@ -1274,6 +1269,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);
           }

package/modules/@apostrophecms/rich-text-widget/ui/apos/components/AposRichTextWidgetEditor.vue

@@ -100,7 +100,11 @@ export default {
       activeOptions.toolbar = (activeOptions.toolbar !== undefined)
         ? activeOptions.toolbar : this.defaultOptions.toolbar;
 
-      activeOptions.styles = this.enhanceStyles(activeOptions.styles || this.defaultOptions.styles);
+      activeOptions.styles = this.enhanceStyles(
+        activeOptions.styles?.length ?
+          activeOptions.styles :
+          this.defaultOptions.styles
+      );
 
       activeOptions.className = (activeOptions.className !== undefined)
         ? activeOptions.className : this.moduleOptions.className;
@@ -118,6 +122,7 @@ export default {
         // the text align control will not work until the user manually
         // applies a style or refreshes the page
         const defaultStyle = this.editorOptions.styles.find(style => style.def);
+
         const _class = defaultStyle.class ? ` class="${defaultStyle.class}"` : '';
         return `<${defaultStyle.tag}${_class}></${defaultStyle.tag}>`;
       } else {

package/package.json

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

package/test/pieces.js

@@ -1263,4 +1263,21 @@ describe('Pieces', function() {
     assert(fs.readFileSync(path.join(__dirname, 'public', resume.attachment._url), 'utf8') === fs.readFileSync(path.join(__dirname, '/public/static-test.txt'), 'utf8'));
   });
 
+  it('should convert a piece keeping only the present fields', async () => {
+    const req = apos.task.getReq();
+
+    const inputPiece = {
+      title: 'new product name'
+    };
+
+    const existingPiece = {
+      color: 'red'
+    };
+
+    await apos.modules.product.convert(req, inputPiece, existingPiece, { presentFieldsOnly: true });
+
+    assert(Object.keys(existingPiece).length === 2);
+    assert(existingPiece.title === 'new product name');
+    assert(existingPiece.color === 'red');
+  });
 });