apostrophe 3.61.1 → 3.63.0

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

@@ -19,7 +19,9 @@ module.exports = {
     relationshipSuggestionIcon: 'text-box-icon',
     relationshipSuggestionFields: [ 'slug' ]
   },
-  cascades: [ 'fields' ],
+  // Adding permissions for advanced permissions to allow modules to use it without
+  // being forced to check if the module is used with advanced permissions or not.
+  cascades: [ 'fields', 'permissions' ],
   fields(self) {
     return {
       add: {
@@ -117,7 +119,7 @@ module.exports = {
             type: 'command-menu-manager-create-new'
           },
           permission: {
-            action: 'edit',
+            action: 'create',
             type: self.__meta.name
           },
           shortcut: 'C'
@@ -145,7 +147,7 @@ module.exports = {
             type: 'command-menu-manager-archive-selected'
           },
           permission: {
-            action: 'edit',
+            action: 'delete',
             type: self.__meta.name
           },
           shortcut: 'E'
@@ -326,6 +328,15 @@ module.exports = {
           }
         }
       },
+      afterDelete: {
+        async deleteRelatedReverseId(req, doc) {
+          // When deleting an unlocalized or draft document,
+          // we remove related reverse IDs of documents having a relation to the deleted one
+          if (!doc.aposMode || doc.aposMode === 'draft') {
+            await self.deleteRelatedReverseId(doc, true);
+          }
+        }
+      },
       afterRescue: {
         async revertDeduplication(req, doc) {
           const $set = await self.getRevertDeduplicationSet(req, doc);
@@ -369,18 +380,27 @@ module.exports = {
 
   methods(self) {
     return {
-      async updateCacheField(req, doc) {
-        const relatedDocsIds = self.getRelatedDocsIds(req, doc);
-
-        // - Remove current doc reference from docs that include it
-        // - Update these docs' cache field
-        await self.apos.doc.db.updateMany({
+      async deleteRelatedReverseId(doc, deleting = false) {
+        const locales = doc.aposLocale && deleting
+          ? [
+            doc.aposLocale.replace(':draft', ':published'),
+            doc.aposLocale.replace(':published', ':draft')
+          ]
+          : [ doc.aposLocale ];
+        return self.apos.doc.db.updateMany({
           relatedReverseIds: { $in: [ doc.aposDocId ] },
-          aposLocale: { $in: [ doc.aposLocale, null ] }
+          aposLocale: { $in: [ ...locales, null ] }
         }, {
           $pull: { relatedReverseIds: doc.aposDocId },
           $set: { cacheInvalidatedAt: doc.updatedAt }
         });
+      },
+      async updateCacheField(req, doc) {
+        const relatedDocsIds = self.getRelatedDocsIds(req, doc);
+
+        // - Remove current doc reference from docs that include it
+        // - Update these docs' cache field
+        await this.deleteRelatedReverseId(doc);
 
         if (relatedDocsIds.length) {
           // - Add current doc reference to related docs
@@ -421,7 +441,8 @@ module.exports = {
           label: 'apostrophe:shareDraft',
           modal: 'AposModalShareDraft',
           manuallyPublished: true,
-          hasUrl: true
+          hasUrl: true,
+          conditions: [ 'canShareDraft' ]
         });
       },
       getRelatedDocsIds(req, doc) {
@@ -1476,11 +1497,52 @@ module.exports = {
             return field.viewPermission && !self.apos.permission.can(req, field.viewPermission.action, field.viewPermission.type);
           });
 
+        if (doc.aposMeta && !self.apos.permission.can(req, 'edit', doc)) {
+          forbiddenSchemaFields.push({
+            name: 'aposMeta'
+          });
+        }
+
         forbiddenSchemaFields.forEach(field => {
           delete doc[field.name];
         });
 
         return doc;
+      },
+
+      composeFilters() {
+        self.filters = Object.keys(self.filters).map((key) => ({
+          name: key,
+          ...self.filters[key],
+          inputType: self.filters[key].inputType || 'select'
+        }));
+        // Add a null choice if not already added or set to `required`
+        self.filters.forEach((filter) => {
+          if (filter.choices) {
+            if (
+              !filter.required &&
+              filter.choices &&
+              !filter.choices.find((choice) => choice.value === null)
+            ) {
+              filter.def = null;
+              filter.choices.push({
+                value: null,
+                label: 'apostrophe:none'
+              });
+            }
+          } else {
+            // Dynamic choices from the REST API, but
+            // we need a label for "no opinion"
+            filter.nullLabel = 'Choose One';
+          }
+        });
+      },
+
+      composeColumns() {
+        self.columns = Object.keys(self.columns).map((key) => ({
+          name: key,
+          ...self.columns[key]
+        }));
       }
     };
   },
@@ -1499,8 +1561,10 @@ module.exports = {
           label,
           pluralLabel,
           relatedDocument: self.options.relatedDocument,
+          canCreate: self.apos.permission.can(req, 'create', self.name, 'draft'),
           canEdit: self.apos.permission.can(req, 'edit', self.name, 'draft'),
-          canPublish: self.apos.permission.can(req, 'publish', self.name)
+          canPublish: self.apos.permission.can(req, 'publish', self.name),
+          canArchive: self.apos.permission.can(req, 'delete', self.name)
         };
         browserOptions.canLocalize = browserOptions.canEdit &&
           self.options.localized &&
@@ -1868,8 +1932,10 @@ module.exports = {
           after(results) {
             // In all cases we mark the docs with ._edit and ._publish if
             // the req is permitted to do those things
+            self.apos.permission.annotate(query.req, 'create', results);
             self.apos.permission.annotate(query.req, 'edit', results);
             self.apos.permission.annotate(query.req, 'publish', results);
+            self.apos.permission.annotate(query.req, 'delete', results);
           }
         },
 

package/modules/@apostrophecms/doc-type/ui/apos/components/AposDocEditor.vue

@@ -19,6 +19,7 @@
         :current="docFields.data"
         :published="published"
         :show-edit="false"
+        :can-delete-draft="moduleOptions.canDeleteDraft"
         @close="close"
       />
       <AposButton
@@ -67,6 +68,7 @@
               :conditional-fields="conditionalFields"
               :doc-id="docId"
               :value="docFields"
+              :meta="docMeta"
               :server-errors="serverErrors"
               :ref="tab.name"
               :generation="generation"
@@ -92,6 +94,7 @@
             :conditional-fields="conditionalFields"
             :doc-id="docId"
             :value="docFields"
+            :meta="docMeta"
             @input="updateDocFields"
             @validate="triggerValidate"
             :modifiers="['small', 'inverted']"
@@ -195,8 +198,13 @@ export default {
 
       return this.moduleOptions.canPublish;
     },
+    canCreate() {
+      return this.original &&
+        !this.original._id &&
+        this.moduleOptions.canCreate;
+    },
     saveDisabled() {
-      if (!this.canEdit) {
+      if (!this.canCreate && !this.canEdit) {
         return true;
       }
       if (this.restoreOnly) {

package/modules/@apostrophecms/doc-type/ui/apos/logic/AposDocContextMenu.js

@@ -48,6 +48,12 @@ export default {
         return true;
       }
     },
+    canDeleteDraft: {
+      type: Boolean,
+      default() {
+        return true;
+      }
+    },
     showCopy: {
       type: Boolean,
       default() {
@@ -105,7 +111,7 @@ export default {
             action: 'edit'
           }
         ] : []),
-        ...((this.showPreview && this.hasUrl) ? [
+        ...((this.showPreview && this.canPreview) ? [
           {
             label: 'apostrophe:preview',
             action: 'preview'
@@ -245,7 +251,10 @@ export default {
       if (!this.context._id) {
         return false;
       }
-      if (!this.canEdit) {
+      if (!this.context.lastPublishedAt && !this.canDeleteDraft && !this.context._delete) {
+        return false;
+      }
+      if (this.context.lastPublishedAt && (!this.context.modified || !this.context._edit)) {
         return false;
       }
       return (
@@ -262,12 +271,12 @@ export default {
     },
     canArchive() {
       return (
-        this.canEdit &&
+        this.context._delete &&
         this.context._id &&
         !this.moduleOptions.singleton &&
         !this.context.archived &&
         !this.context.parked &&
-        ((this.moduleOptions.canPublish && this.context.lastPublishedAt) || !this.manuallyPublished)
+        (Boolean(this.canPublish && this.context.lastPublishedAt) || !this.manuallyPublished)
       );
     },
     canUnpublish() {
@@ -280,7 +289,8 @@ export default {
       );
     },
     canCopy() {
-      return this.canEdit &&
+      return this.moduleOptions.canCreate &&
+        this.canEdit &&
         this.moduleOptions.canEdit &&
         !this.moduleOptions.singleton &&
         this.context._id;
@@ -290,9 +300,17 @@ export default {
         this.canEdit &&
         this.context._id &&
         this.context.archived &&
-        ((this.moduleOptions.canPublish && this.context.lastPublishedAt) || !this.manuallyPublished)
+        ((!this.manuallyPublished && this.canPublish) || this.manuallyPublished)
       );
     },
+    canPreview() {
+      return this.hasUrl &&
+        !this.context.archived;
+    },
+    canShareDraft() {
+      return this.canEdit &&
+        !this.context.archived;
+    },
     manuallyPublished() {
       return this.moduleOptions.localized && !this.autopublish;
     },

package/modules/@apostrophecms/i18n/i18n/en.json

@@ -165,6 +165,7 @@
   "errorWhilePublishing": "An Error Occurred While Publishing",
   "errorWhilePublishingDocument": "An error occurred while publishing the document.",
   "errorWhilePublishingParentPage": "An error occurred while publishing a parent page.",
+  "errorWhilePublishingParentPageForbidden": "Because you do not have permission to publish the parent page, we are saving and submitting your draft. Please let your manager know that the parent page needs to be published.",
   "errorWhileRestoring": "An error occurred while restoring the previously published version.",
   "errorWhileRestoringArchive": "An error occurred while restoring the document from the archive.",
   "errorWhileRestoringPrevious": "An error occurred while restoring the previously published version.",

package/modules/@apostrophecms/image/ui/apos/components/AposMediaManager.vue

@@ -71,7 +71,6 @@
             :accept="accept"
             :items="items"
             :module-options="moduleOptions"
-            :can-edit="moduleOptions.canEdit"
             @edit="updateEditing"
             v-model="checked"
             @select="select"
@@ -106,7 +105,6 @@
           />
           <AposMediaManagerSelections
             :items="selected"
-            :can-edit="moduleOptions.canEdit"
             @clear="clearSelected" @edit="updateEditing"
             v-show="!editing"
           />
@@ -248,7 +246,8 @@ export default {
     async getMedia (options) {
       const qs = {
         ...this.filterValues,
-        page: this.currentPage
+        page: this.currentPage,
+        viewContext: this.relationshipField ? 'relationship' : 'manage'
       };
       const filtered = !!Object.keys(this.filterValues).length;
       if (this.moduleOptions && Array.isArray(this.moduleOptions.filters)) {
@@ -354,9 +353,7 @@ export default {
       this.editing = undefined;
     },
     async updateEditing(id) {
-      if (!this.moduleOptions.canEdit) {
-        return;
-      }
+      const item = this.items.find(item => item._id === id);
       // We only care about the current doc for this prompt,
       // we are not in danger of discarding a selection when
       // we switch images
@@ -371,7 +368,11 @@ export default {
           return false;
         }
       }
-      this.editing = this.items.find(item => item._id === id);
+      if (!item?._edit) {
+        this.editing = null;
+        return true;
+      }
+      this.editing = item;
       return true;
     },
     // select setters

package/modules/@apostrophecms/image/ui/apos/components/AposMediaManagerDisplay.vue

@@ -2,7 +2,7 @@
   <div class="apos-media-manager-display">
     <div class="apos-media-manager-display__grid">
       <AposMediaUploader
-        v-if="canEdit"
+        v-if="moduleOptions.canCreate"
         :disabled="maxReached"
         :action="moduleOptions.action"
         :accept="accept"
@@ -83,10 +83,6 @@ export default {
     event: 'change'
   },
   props: {
-    canEdit: {
-      type: Boolean,
-      default: false
-    },
     maxReached: {
       type: Boolean,
       default: false

package/modules/@apostrophecms/image/ui/apos/components/AposMediaManagerEditor.vue

@@ -171,7 +171,7 @@ export default {
           action: 'localize'
         });
       }
-      if (this.activeMedia._id && !this.restoreOnly) {
+      if (this.activeMedia._id && this.activeMedia._delete && !this.restoreOnly) {
         menu.push({
           label: 'apostrophe:archiveImage',
           action: 'archive',
@@ -209,7 +209,9 @@ export default {
       return dayjs(this.activeMedia.attachment.createdAt).format(this.$t('apostrophe:dayjsMediaCreatedDateFormat'));
     },
     isArchived() {
-      return this.media.archived;
+      // ?. necessary to avoid reference to null due to
+      // race condition when toggling selection off
+      return this.media?.archived;
     }
   },
   watch: {
@@ -248,6 +250,7 @@ export default {
       this[action]();
     },
     async updateActiveDoc(newMedia) {
+      newMedia = newMedia || {};
       this.showReplace = false;
       this.activeMedia = klona(newMedia);
       this.restoreOnly = !!this.activeMedia.archived;

package/modules/@apostrophecms/image/ui/apos/components/AposMediaManagerSelections.vue

@@ -30,7 +30,7 @@
               {{ item.title }}
             </div>
             <AposButton
-              v-if="canEdit"
+              v-if="item._edit"
               label="apostrophe:edit"
               type="quiet"
               :modifiers="['no-motion']"
@@ -49,10 +49,6 @@
 <script>
 export default {
   props: {
-    canEdit: {
-      type: Boolean,
-      default: false
-    },
     items: {
       type: Array,
       required: true

package/modules/@apostrophecms/image/ui/apos/components/AposMediaUploader.vue

@@ -141,9 +141,11 @@ export default {
         for (const file of files) {
           try {
             const img = await this.insertImage(file, emptyDoc);
-            imageIds.push(img._id);
+            if (img?._id) {
+              imageIds.push(img._id);
+            }
           } catch (e) {
-            const msg = e.body && e.body.message ? e.body.message : this.$t('Upload error');
+            const msg = e.body && e.body.message ? e.body.message : this.$t('apostrophe:uploadError');
             await apos.notify(msg, {
               type: 'danger',
               icon: 'alert-circle-icon',

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

@@ -713,6 +713,18 @@ module.exports = {
         };
       },
 
+      async verifyRequirements(req, requirements) {
+        for (const [ name, requirement ] of Object.entries(requirements)) {
+          try {
+            await requirement.verify(req, req.body.requirements && req.body.requirements[name]);
+          } catch (e) {
+            e.data = e.data || {};
+            e.data.requirement = name;
+            throw e;
+          }
+        }
+      },
+
       // Implementation detail of the login route. Log in the user, or if there are
       // `requirements` that require password verification occur first, return an incomplete token.
       async initialLogin(req) {
@@ -734,16 +746,14 @@ module.exports = {
 
         try {
           // Initial login step
-          const { earlyRequirements, lateRequirements } = self.filterRequirements();
-          for (const [ name, requirement ] of Object.entries(earlyRequirements)) {
-            try {
-              await requirement.verify(req, req.body.requirements && req.body.requirements[name]);
-            } catch (e) {
-              e.data = e.data || {};
-              e.data.requirement = name;
-              throw e;
-            }
-          }
+          const {
+            earlyRequirements,
+            onTimeRequirements,
+            lateRequirements
+          } = self.filterRequirements();
+          await self.verifyRequirements(req, earlyRequirements);
+          await self.verifyRequirements(req, onTimeRequirements);
+
           // send log information
           const user = await self.apos.login.verifyLogin(
             username,
@@ -758,7 +768,6 @@ module.exports = {
           }
 
           const requirementsToVerify = Object.keys(lateRequirements);
-
           if (requirementsToVerify.length) {
             const token = cuid();
 
@@ -813,15 +822,12 @@ module.exports = {
       },
 
       filterRequirements() {
+        const requirements = Object.entries(self.requirements);
+
         return {
-          earlyRequirements: Object.fromEntries(
-            Object.entries(self.requirements)
-              .filter(([ _, requirement ]) => requirement.phase === 'beforeSubmit')
-          ),
-          lateRequirements: Object.fromEntries(
-            Object.entries(self.requirements)
-              .filter(([ _, requirement ]) => requirement.phase === 'afterPasswordVerified')
-          )
+          earlyRequirements: Object.fromEntries(requirements.filter(([ , requirement ]) => requirement.phase === 'beforeSubmit')),
+          onTimeRequirements: Object.fromEntries(requirements.filter(requirement => requirement.phase === 'uponSubmit')),
+          lateRequirements: Object.fromEntries(requirements.filter(([ , requirement ]) => requirement.phase === 'afterPasswordVerified'))
         };
       },
 

package/modules/@apostrophecms/login/ui/apos/components/AposLoginForm.vue

@@ -2,7 +2,7 @@
   <div
     key="1"
     class="apos-login-form"
-    v-if="phase === 'beforeSubmit'"
+    v-if="phase === 'beforeSubmit' || phase === 'uponSubmit'"
   >
     <TheAposLoginHeader
       :env="context.env"
@@ -30,6 +30,16 @@
           @done="requirementDone(requirement, $event)"
           @block="requirementBlock(requirement)"
         />
+        <template v-if="phase === 'uponSubmit'">
+          <Component
+            v-for="requirement in uponSubmitRequirements"
+            :key="requirement.name"
+            :is="requirement.component"
+            v-bind="getRequirementProps(requirement.name)"
+            @done="requirementDone(requirement, $event)"
+            @block="requirementBlock(requirement)"
+          />
+        </template>
         <AposButton
           data-apos-test="loginSubmit"
           :busy="busy"

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

@@ -41,6 +41,9 @@ export default {
     beforeSubmitRequirements() {
       return this.requirements.filter(requirement => requirement.phase === 'beforeSubmit');
     },
+    uponSubmitRequirements() {
+      return this.requirements.filter(requirement => requirement.phase === 'uponSubmit');
+    },
     // The currently active requirement expecting a solo presentation.
     // Currently it only concerns `afterPasswordVerified` requirements.
     // beforeSubmit requirements are not presented solo.
@@ -83,6 +86,37 @@ export default {
       } else {
         return null;
       }
+    },
+    uponSubmitRequirements: {
+      deep: true,
+      async handler(newVal) {
+        if (this.phase !== 'uponSubmit') {
+          return;
+        }
+
+        const isUponSubmitRequirementsPending = newVal.some(requirement => requirement.done === null);
+        if (isUponSubmitRequirementsPending) {
+          return;
+        }
+
+        const isUponSubmitRequirementsDone = newVal.every(requirement => requirement.done === true) || this.uponSubmitRequirements.length === 0;
+        if (isUponSubmitRequirementsDone) {
+          await this.postSubmit();
+
+          return;
+        }
+
+        const isUponSubmitRequirementsBlocked = newVal.some(requirement => requirement.done === false);
+        if (isUponSubmitRequirementsBlocked) {
+          for (const requirement of this.uponSubmitRequirements) {
+            requirement.done = null;
+            requirement.value = null;
+          }
+          this.phase = 'beforeSubmit';
+          this.busy = false;
+          this.error = '';
+        }
+      }
     }
   },
   created() {
@@ -96,6 +130,15 @@ export default {
       this.busy = true;
       this.error = '';
 
+      this.uponSubmitRequirements.length
+        ? this.uponSubmit()
+        : await this.postSubmit();
+    },
+    uponSubmit() {
+      this.phase = 'uponSubmit';
+      // Note: uponSubmitRequirements watcher will handle the next step
+    },
+    async postSubmit() {
       await this.invokeInitialLoginApi();
     },
     async invokeInitialLoginApi() {
@@ -169,7 +212,7 @@ export default {
       const requirement = this.requirements
         .find(requirement => requirement.name === requirementDone.name);
 
-      if (requirement.phase === 'beforeSubmit') {
+      if (requirement.phase === 'beforeSubmit' || requirement.phase === 'uponSubmit') {
         requirement.done = true;
         requirement.value = value;
         return;
@@ -226,7 +269,7 @@ function getRequirements() {
       name,
       component: requirement.component || name,
       ...requirement,
-      done: false,
+      done: null,
       value: null,
       success: null,
       error: null
@@ -234,6 +277,7 @@ function getRequirements() {
   });
   return [
     ...requirements.filter(r => r.phase === 'beforeSubmit'),
+    ...requirements.filter(r => r.phase === 'uponSubmit'),
     ...requirements.filter(r => r.phase === 'afterPasswordVerified')
   ];
 }

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

@@ -30,7 +30,7 @@
                 class="apos-share-draft__toggle"
                 @toggle="toggle"
               />
-              <p class="apos-share-draft__toggle-label">
+              <p @click="toggle" class="apos-share-draft__toggle-label">
                 {{ $t('apostrophe:shareDraftEnable') }}
               </p>
             </div>
@@ -266,6 +266,7 @@ export default {
 .apos-share-draft__toggle-wrapper {
   display: flex;
   align-items: center;
+  margin-bottom: $spacing-base;
 }
 
 .apos-share-draft__toggle {
@@ -273,14 +274,18 @@ export default {
 }
 
 .apos-share-draft__toggle-label {
-  @include type-base;
+  @include type-large;
+  flex-grow: 1;
   max-width: 370px;
   line-height: var(--a-line-tallest);
   margin: 0;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 .apos-share-draft__description {
-  @include type-small;
+  @include type-base;
   line-height: var(--a-line-tall);
   max-width: 355px;
   color: var(--a-base-2);

package/modules/@apostrophecms/modal/ui/apos/mixins/AposEditorMixin.js

@@ -46,6 +46,9 @@ export default {
       // Archive UI is handled via action buttons
       schema = schema.filter(field => field.name !== 'archived');
       return schema;
+    },
+    docMeta() {
+      return this.docFields.data?.aposMeta || {};
     }
   },