apostrophe 3.47.0 → 3.49.0

package/modules/@apostrophecms/login/ui/apos/logic/TheAposLogin.js

@@ -0,0 +1,107 @@
+// This is the business logic of the TheAposLogin Vue component.
+// It is in a separate file so that you can override the component's templates
+// and styles just by copying the .vue file to your project, and leave the business logic
+// unchanged.
+
+import AposThemeMixin from 'Modules/@apostrophecms/ui/mixins/AposThemeMixin';
+
+const STAGES = [
+  'login',
+  'forgotPassword',
+  'resetPassword'
+];
+
+export default {
+  mixins: [ AposThemeMixin ],
+  data() {
+    return {
+      stage: STAGES[0],
+      mounted: false,
+      beforeCreateFinished: false,
+      error: '',
+      passwordResetData: {},
+      context: {}
+    };
+  },
+  computed: {
+    loaded() {
+      return this.mounted && this.beforeCreateFinished;
+    },
+    showNav() {
+      return this.stage !== STAGES[0];
+    },
+    homeUrl() {
+      return `${apos.prefix}/`;
+    }
+  },
+  // We need it here and not in the login form because the version used in the footer.
+  // The context will be passed to every form, might be a good thing in the future.
+  async beforeCreate() {
+    const stateChange = parseInt(window.sessionStorage.getItem('aposStateChange'));
+    const seen = JSON.parse(window.sessionStorage.getItem('aposStateChangeSeen') || '{}');
+    if (!seen[window.location.href]) {
+      const lastModified = Date.parse(document.lastModified);
+      if (stateChange && lastModified && (lastModified < stateChange)) {
+        seen[window.location.href] = true;
+        window.sessionStorage.setItem('aposStateChangeSeen', JSON.stringify(seen));
+        location.reload();
+        return;
+      }
+    }
+    try {
+      this.context = await apos.http.post(`${apos.login.action}/context`, {
+        busy: true
+      });
+    } catch (e) {
+      this.context = {};
+      this.error = e.message || 'apostrophe:loginErrorGeneric';
+    } finally {
+      this.beforeCreateFinished = true;
+    }
+  },
+  created() {
+    const url = new URL(document.location);
+    const data = {
+      email: url.searchParams.get('email'),
+      reset: url.searchParams.get('reset')
+    };
+    if (data.email && data.reset) {
+      this.passwordResetData = data;
+      this.setStage('resetPassword');
+    }
+  },
+  mounted() {
+    this.mounted = true;
+  },
+  methods: {
+    setStage(name) {
+      // 1. Enabled status per stage. A bit cryptic but effective.
+      // Search for a method composed of the `name` + `Enabled`
+      // (e.g. `forgotPasswordEnabled` and execute it (should return boolean).
+      // If no method is found it is enabled. Fallback to the default stage.
+      const enabled = this[`${name}Enabled`]?.() ?? true;
+      if (!enabled) {
+        this.stage = STAGES[0];
+        return;
+      }
+      // 2. Set it only if it's a known stage
+      if (STAGES.includes(name)) {
+        this.stage = name;
+        return;
+      }
+      // 3. Fallback to the default stage
+      this.stage = STAGES[0];
+    },
+    forgotPasswordEnabled() {
+      return apos.login.passwordResetEnabled;
+    },
+    resetPasswordEnabled() {
+      return apos.login.passwordResetEnabled;
+    },
+    onRedirect(loc) {
+      window.sessionStorage.setItem('aposStateChange', Date.now());
+      window.sessionStorage.setItem('aposStateChangeSeen', '{}');
+      location.assign(loc);
+    }
+  }
+};

package/modules/@apostrophecms/modal/ui/apos/components/AposDocsManagerToolbar.vue

@@ -5,6 +5,7 @@
         v-if="canSelectAll"
         label="apostrophe:select"
         type="outline"
+        :modifiers="['small']"
         text-color="var(--a-base-1)"
         :icon-only="true"
         :icon="checkboxIcon"
@@ -24,9 +25,9 @@
         <AposButton
           v-if="!operations"
           :label="label"
-          :icon-only="true"
           :icon="icon"
           :disabled="!checkedCount"
+          :modifiers="['small']"
           type="outline"
           @click="confirmOperation({ action, label, ...rest })"
         />
@@ -302,7 +303,12 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  .apos-manager-toolbar ::v-deep .apos-field--search {
-    width: 250px;
+  .apos-manager-toolbar ::v-deep {
+    .apos-field--search {
+      width: 250px;
+    }
+    .apos-input {
+      height: 32px;
+    }
   }
 </style>

package/modules/@apostrophecms/modal/ui/apos/components/AposModalToolbar.vue

@@ -45,5 +45,6 @@ export default {
 
   .apos-toolbar__group {
     display: flex;
+    align-items: center;
   }
 </style>

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

@@ -100,6 +100,7 @@ module.exports = {
     self.enableBrowserData();
     self.addLegacyMigrations();
     self.addMisreplicatedParkedPagesMigration();
+    self.addDuplicateParkedPagesMigration();
     await self.createIndexes();
   },
   restApiRoutes(self) {
@@ -1959,7 +1960,10 @@ database.`);
           delete _item._children;
           if (!parent) {
             // Parking the home page for the first time
-            _item.aposDocId = self.apos.util.generateId();
+            _item.aposDocId = await self.apos.doc.bestAposDocId({
+              level: 0,
+              slug: '/'
+            });
             _item.path = _item.aposDocId;
             _item.lastPublishedAt = new Date();
             return self.apos.doc.insert(req, _item);
@@ -2365,6 +2369,64 @@ database.`);
             }
           }
         });
+      },
+      addDuplicateParkedPagesMigration() {
+        self.apos.migration.add('duplicate-parked-pages', async () => {
+          let parkedPages = await self.apos.doc.db.find({
+            parkedId: {
+              $ne: null
+            }
+          }).toArray();
+          const parkedIds = [ ...new Set(parkedPages.map(page => page.parkedId)) ];
+          const names = Object.keys(self.apos.i18n.locales);
+          const locales = [
+            ...names.map(locale => `${locale}:draft`),
+            ...names.map(locale => `${locale}:published`),
+            ...names.map(locale => `${locale}:previous`)
+          ];
+          let changes = 0;
+          const winners = new Map();
+          for (const locale of locales) {
+            for (const parkedId of parkedIds) {
+              let matches = parkedPages.filter(page =>
+                (page.parkedId === parkedId) &&
+                (page.aposLocale === locale)
+              );
+              if (matches.length > 0) {
+                if (!winners.has(parkedId)) {
+                  winners.set(parkedId, matches[0].aposDocId);
+                }
+              }
+              if (matches.length > 1) {
+                matches = matches.sort((a, b) => a.createdAt - b.createdAt);
+                const ids = matches.slice(1).map(page => page._id);
+                await self.apos.doc.db.removeMany({
+                  _id: {
+                    $in: ids
+                  }
+                });
+                parkedPages = parkedPages.filter(page => !ids.includes(page._id));
+                changes++;
+              }
+            }
+          }
+          const idChanges = [];
+          for (const parkedId of parkedIds) {
+            const aposDocId = winners.get(parkedId);
+            const matches = parkedPages.filter(page => page.parkedId === parkedId);
+            for (const match of matches) {
+              if (match.aposDocId !== aposDocId) {
+                idChanges.push([ match._id, match._id.replace(match.aposDocId, aposDocId) ]);
+              }
+            }
+          }
+          if (idChanges.length) {
+            // Also calls self.apos.attachment.recomputeAllDocReferences
+            await self.apos.doc.changeDocIds(idChanges);
+          } else if (changes > 0) {
+            await self.apos.attachment.recomputeAllDocReferences();
+          }
+        });
       }
     };
   },

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

@@ -22,6 +22,7 @@ module.exports = {
           type: 'select',
           label: 'apostrophe:type',
           required: true,
+          def: self.options.apos.page.typeChoices[0].name,
           choices: self.options.apos.page.typeChoices.map(function (type) {
             return {
               value: type.name,
@@ -297,6 +298,11 @@ module.exports = {
       // the `title` property, but since this is a page we are including
       // the slug as well.
       getAutocompleteTitle(doc, query) {
+        // TODO Remove in next major version.
+        self.apos.util.warnDevOnce(
+          'deprecate-get-autocomplete-title',
+          'self.getAutocompleteTitle() is deprecated. Use the autocomplete(\'...\') query builder instead. More info at https://v3.docs.apostrophecms.org/reference/query-builders.html#autocomplete'
+        );
         return doc.title + ' (' + doc.slug + ')';
       },
       // `req` determines what the user is eligible to edit, `criteria`

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

@@ -26,17 +26,39 @@ module.exports = {
     // publicApiProjection: {
     //   title: 1,
     //   _url: 1,
+    // },
+    // By default the manager modal will get all the pieces fields below + all manager columns
+    // you can enable a projection using
+    // managerApiProjection: {
+    //   _id: 1,
+    //   _url: 1,
+    //   aposDocId: 1,
+    //   aposLocale: 1,
+    //   aposMode: 1,
+    //   docPermissions: 1,
+    //   slug: 1,
+    //   title: 1,
+    //   type: 1,
+    //   visibility: 1
     // }
   },
-  fields: {
-    add: {
-      slug: {
-        type: 'slug',
-        label: 'apostrophe:slug',
-        following: [ 'title', 'archived' ],
-        required: true
-      }
-    }
+  fields(self) {
+    return {
+      add: {
+        slug: {
+          type: 'slug',
+          label: 'apostrophe:slug',
+          following: [ 'title', 'archived' ],
+          required: true
+        }
+      },
+      remove: self.options.singletonAuto ? [
+        'title',
+        'slug',
+        'archived',
+        'visibility'
+      ] : []
+    };
   },
   columns(self) {
     return {
@@ -182,6 +204,10 @@ module.exports = {
     if (!self.options.name) {
       throw new Error('@apostrophecms/pieces require name option');
     }
+    const badFieldName = Object.keys(self.fields).indexOf('type') !== -1;
+    if (badFieldName) {
+      throw new Error(`The ${self.__meta.name} module contains a forbidden field property name: "type".`);
+    }
     if (!self.options.label) {
       // Englishify it
       self.options.label = _.startCase(self.options.name);
@@ -1063,7 +1089,49 @@ module.exports = {
             return self.apos.permission.can(req, batchOperation.permission, self.name);
           }
           return true;
+
         });
+      },
+      getManagerApiProjection(req) {
+        if (!self.options.managerApiProjection) {
+          return null;
+        }
+
+        const projection = { ...self.options.managerApiProjection };
+        self.columns.forEach(({ name }) => {
+          const column = (name.startsWith('draft:') || name.startsWith('published:'))
+            ? name.replace(/^(draft|published):/, '')
+            : name;
+
+          projection[column] = 1;
+        });
+
+        return projection;
+      },
+      async insertIfMissing() {
+        if (!self.options.singletonAuto) {
+          return;
+        }
+        // Insert at startup
+        const req = self.apos.task.getReq();
+        const criteria = {
+          type: self.name
+        };
+        if (self.options.localized) {
+          criteria.aposLocale = {
+            $in: Object.keys(self.apos.i18n.locales).map(locale => [ `${locale}:published`, `${locale}:draft` ]).flat()
+          };
+        }
+        const existing = await self.apos.doc.db.findOne(criteria, { _id: 1 });
+        if (!existing) {
+          const _new = {
+            ...self.newInstance(),
+            aposDocId: await self.apos.doc.bestAposDocId({
+              type: self.name
+            })
+          };
+          await self.insert(req, _new);
+        }
       }
     };
   },
@@ -1092,11 +1160,27 @@ module.exports = {
           editorModal: 'AposDocEditor',
           managerModal: 'AposDocsManager'
         });
+        browserOptions.managerApiProjection = self.getManagerApiProjection(req);
 
         return browserOptions;
       },
       find(_super, req, criteria, projection) {
         return _super(req, criteria, projection).defaultSort(self.options.sort || { updatedAt: -1 });
+      },
+      newInstance(_super) {
+        if (!self.options.singletonAuto) {
+          return _super();
+        }
+        const slug = self.apos.util.slugify(self.options.singletonAuto?.slug || self.name);
+        return {
+          ..._super(),
+          // These fields are removed from the editable schema of singletons,
+          // but we assign them directly for broader compatibility
+          slug,
+          title: slug,
+          archived: false,
+          visibility: 'public'
+        };
       }
     };
   },

package/modules/@apostrophecms/piece-type/ui/apos/components/AposDocsManager.vue

@@ -316,6 +316,10 @@ export default {
       const {
         currentPage, pages, results, choices
       } = await this.request({
+        ...(
+          this.moduleOptions.managerApiProjection &&
+          { project: this.moduleOptions.managerApiProjection }
+        ),
         page: this.currentPage
       });
 

package/modules/@apostrophecms/rich-text-widget/index.js

@@ -435,7 +435,7 @@ module.exports = {
             },
             {
               tag: 'img',
-              attributes: [ 'src' ]
+              attributes: [ 'src', 'alt' ]
             }
           ]
         };

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

@@ -1,7 +1,7 @@
 <template>
   <div
     v-if="active"
-    v-click-outside-element="close"
+    v-click-outside-element="cancel"
     class="apos-popover apos-image-control__dialog"
     x-placement="bottom"
     :class="{
@@ -16,7 +16,6 @@
         :schema="schema"
         :trigger-validation="triggerValidation"
         v-model="docFields"
-        :utility-rail="false"
         :modifiers="formModifiers"
         :key="lastSelectionTime"
         :generation="generation"
@@ -26,7 +25,7 @@
       <footer class="apos-image-control__footer">
         <AposButton
           type="default" label="apostrophe:cancel"
-          @click="close"
+          @click="cancel"
           :modifiers="formModifiers"
         />
         <AposButton
@@ -55,7 +54,7 @@ export default {
       required: true
     }
   },
-  emits: [ 'before-commands', 'close' ],
+  emits: [ 'before-commands', 'done', 'cancel' ],
   data() {
     return {
       generation: 1,
@@ -114,8 +113,11 @@ export default {
     }
   },
   methods: {
-    close() {
-      this.$emit('close');
+    cancel() {
+      this.$emit('cancel');
+    },
+    done() {
+      this.$emit('done');
     },
     save() {
       this.triggerValidation = true;
@@ -125,23 +127,25 @@ export default {
         }
         const image = this.docFields.data._image[0];
         this.docFields.data.imageId = image && image.aposDocId;
+        this.docFields.data.alt = image && image.alt;
         this.$emit('before-commands');
         this.editor.commands.setImage({
           imageId: this.docFields.data.imageId,
           caption: this.docFields.data.caption,
-          style: this.docFields.data.style
+          style: this.docFields.data.style,
+          alt: this.docFields.data.alt
         });
-        this.close();
+        this.done();
       });
     },
     keyboardHandler(e) {
       if (e.keyCode === 27) {
-        this.close();
+        this.cancel();
       }
       if (e.keyCode === 13) {
         if (this.docFields.data.href || e.metaKey) {
           this.save();
-          this.close();
+          this.done();
         }
         e.preventDefault();
       }