apostrophe 3.33.0 → 3.34.0

package/.github/workflows/main.yml

@@ -38,6 +38,9 @@ jobs:
         with:
           mongodb-version: ${{ matrix.mongodb-version }}
 
+      # Exit status must be succesful in the end
+      - run:  ( ( node --version | grep v14 ) && npm install -g npm@8 ) || echo "npm OK"
+
       - run: npm install
 
       - run: npm test

package/CHANGELOG.md

@@ -1,11 +1,24 @@
 # Changelog
 
+## 3.34.0 (2022-12-12)
+
+### Fixes
+
+* Nested areas work properly in widgets that have the `initialModal: false` property.
+* Apostrophe's search index now properly incorporates most string field types as in A2.
+
+### Adds
+
+* Relationships load more quickly.
+* Parked page checks at startup are faster.
+
 ## 3.33.0 (2022-11-28)
 
 ### Adds
 
 * You can now set `inline: true` on schema fields of type `array`. This displays a simple editing interface in the context of the main dialog box for the document in question, avoiding the need to open an additional dialog box. Usually best for cases with just one field or just a few. If your array field has a large number of subfields the default behavior (`inline: false`) is more suitable for your needs. See the [array field](https://v3.docs.apostrophecms.org/reference/field-types/array.html) documentation for more information.
 * Batch feature for publishing pieces.
+* Add extensibility for `rich-text-widget` `defaultOptions`. Every key will now be used in the `AposRichTextWidgetEditor`.
 
 ### Fixes
 

package/modules/@apostrophecms/area/ui/apos/components/AposAreaEditor.vue

@@ -446,9 +446,10 @@ export default {
           index
         });
       } else if (!this.widgetHasInitialModal(name)) {
+        const widget = this.newWidget(name);
         return this.insert({
           widget: {
-            type: name,
+            ...widget,
             aposPlaceholder: this.widgetHasPlaceholder(name)
           },
           index
@@ -561,6 +562,26 @@ export default {
         }
         return window.apos.modules[`${item.type}-widget`];
       });
+    },
+    // Return a new widget object in which defaults are fully populated,
+    // especially valid sub-area objects, so that nested edits work on the page
+    newWidget(type) {
+      const widget = {
+        type
+      };
+      const schema = apos.modules[apos.area.widgetManagers[type]].schema;
+      schema.forEach(field => {
+        if (field.type === 'area') {
+          widget[field.name] = {
+            _id: cuid(),
+            metaType: 'area',
+            items: []
+          };
+        } else {
+          widget[field.name] = field.def ? klona(field.def) : field.def;
+        }
+      });
+      return widget;
     }
   }
 };

package/modules/@apostrophecms/area/ui/apos/components/AposAreaWidget.vue

@@ -268,7 +268,12 @@ export default {
       };
     },
     widgetLabel() {
-      return window.apos.modules[`${this.widget.type}-widget`].label;
+      const moduleName = `${this.widget.type}-widget`;
+      const module = window.apos.modules[moduleName];
+      if (!module) {
+        console.error(`No ${moduleName} module found for widget type ${this.widget.type}`);
+      }
+      return module.label;
     },
     widgetOptions() {
       return this.widgets[this.widget.type];

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

@@ -347,6 +347,15 @@ module.exports = {
           submitted: 1,
           aposLocale: 1
         });
+        await self.db.createIndex({
+          type: 1,
+          aposDocId: 1,
+          aposLocale: 1
+        });
+        await self.db.createIndex({
+          aposDocId: 1,
+          aposLocale: 1
+        });
         await self.createPathLevelIndex();
       },
       async createTextIndex() {

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

@@ -1867,7 +1867,12 @@ database.`);
           } else {
             parentSlug = item.parent;
           }
-          return self.findOneForEditing(req, { slug: parentSlug });
+          return self.findOneForEditing(req, {
+            slug: parentSlug
+          }, {
+            areas: false,
+            relationships: false
+          });
         }
         async function findExisting() {
           return self.findOneForEditing(req, { parkedId: item.parkedId });

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

@@ -107,16 +107,20 @@ export default {
     editorOptions() {
       const activeOptions = Object.assign({}, this.options);
 
-      // Allow toolbar option to pass through if `false`
-      activeOptions.toolbar = (activeOptions.toolbar !== undefined)
-        ? activeOptions.toolbar : this.defaultOptions.toolbar;
-
       activeOptions.styles = this.enhanceStyles(
         activeOptions.styles?.length
           ? activeOptions.styles
           : this.defaultOptions.styles
       );
 
+      // Allow default options to pass through if `false`
+      Object.keys(this.defaultOptions).forEach((option) => {
+        if (option !== 'styles') {
+          activeOptions[option] = (activeOptions[option] !== undefined)
+            ? activeOptions[option] : this.defaultOptions[option];
+        }
+      });
+
       activeOptions.className = (activeOptions.className !== undefined)
         ? activeOptions.className : this.moduleOptions.className;
 

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

@@ -78,6 +78,18 @@ module.exports = (self) => {
           }
         }
       }
+    },
+    index: function (value, field, texts) {
+      for (const item of ((value && value.items) || [])) {
+        const manager = item.type && self.apos.area.getWidgetManager(item.type);
+        if (!manager) {
+          self.apos.area.warnMissingWidgetType(item.type);
+          return;
+        }
+        if (manager.addSearchTexts) {
+          manager.addSearchTexts(item, texts);
+        }
+      }
     }
   });
 
@@ -845,6 +857,11 @@ module.exports = (self) => {
       }
       return self.isEqual(req, field.schema, one[field.name], two[field.name]);
     },
+    index: function (value, field, texts) {
+      if (value) {
+        self.apos.schema.indexFields(field.schema, value, texts);
+      }
+    },
     def: {}
   });
 

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

@@ -68,6 +68,7 @@ module.exports = {
     self.options.suggestions.url = self.options.suggestions.url || self.action + '/suggest';
     self.dispatchAll();
     self.enableFilters();
+    self.addMigrations();
   },
   routes(self) {
     return {
@@ -119,6 +120,17 @@ module.exports = {
         }
       },
 
+      addMigrations() {
+        self.addIndexFixMigration();
+      },
+
+      addIndexFixMigration() {
+        // Search index lacked most text fields, correct that with a one-time migration
+        self.apos.migration.add('search-index-fix', async () => {
+          return self.indexTask();
+        });
+      },
+
       suggest(req, q) {
         return self.apos.doc.find(req).limit(self.options.suggestions && (self.options.suggestions.limit || 10)).search(q).project({
           _url: 1,
@@ -235,7 +247,6 @@ module.exports = {
       indexDoc(req, doc) {
 
         const texts = self.getSearchTexts(doc);
-
         _.each(texts, function (text) {
           if (text.text === undefined) {
             text.text = '';
@@ -316,29 +327,11 @@ module.exports = {
           text: doc.slug,
           silent: true
         });
-
-        // Areas can be schemaless so find them automatically
-        self.apos.area.walk(doc, function (area, dotPath) {
-          // Do not examine areas accessed via temporarily
-          // present information loaded via relationships, such as
-          // snippets in a snippet widget. Allow those items to be found
-          // on their own as search results, and avoid bloating the
-          // search text up to the 16MB limit
-          if (dotPath.match(/\._\w/)) {
-            return;
-          }
-          _.each(area.items, function (item) {
-            const manager = self.apos.area.getWidgetManager(item.type);
-            if (!manager) {
-              self.apos.area.warnMissingWidgetType(item.type);
-              return;
-            }
-            if (manager.addSearchTexts) {
-              manager.addSearchTexts(item, texts);
-            }
-          });
-        });
-
+        const manager = self.apos.doc.getManager(doc.type);
+        if (manager) {
+          const schema = manager.schema;
+          self.apos.schema.indexFields(schema, doc, texts);
+        }
         return texts;
       },
 
@@ -358,6 +351,13 @@ module.exports = {
 
       docUnversionedFields(req, doc, fields) {
         fields.push('titleSortified', 'highSearchText', 'highSearchWords', 'lowSearchText', 'searchSummary');
+      },
+
+      async indexTask() {
+        const req = self.apos.task.getReq();
+        return self.apos.migration.eachDoc({}, doc => {
+          return self.indexTaskOne(req, doc);
+        });
       }
     };
   },
@@ -366,12 +366,11 @@ module.exports = {
       index: {
         usage: stripIndent`
           Rebuild the search index. Normally this happens automatically.
-          This should only be needed if you have changed the"searchable" property
+          This should only be needed if you have changed the "searchable" property
           for various fields or types.
         `,
-        task(argv) {
-          const req = self.apos.task.getReq();
-          return self.apos.migration.eachDoc({}, _.partial(self.indexTaskOne, req));
+        async task(argv) {
+          await self.indexTask();
         }
       }
     };

package/package.json

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