apostrophe 4.5.3 → 4.6.0

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

@@ -11,7 +11,6 @@
           content: (!disabled && !first) ? 'apostrophe:nudgeUp' : null,
           placement: 'left'
         }"
-        :modifiers="[ 'inline' ]"
         @click="$emit('up')"
       />
       <AposButton
@@ -22,7 +21,6 @@
           content: 'apostrophe:editWidget',
           placement: 'left'
         }"
-        :modifiers="[ 'inline' ]"
         @click="$emit('edit')"
       />
       <AposButton
@@ -32,7 +30,6 @@
           content: 'apostrophe:cut',
           placement: 'left'
         }"
-        :modifiers="[ 'inline' ]"
         @click="$emit('cut')"
       />
       <AposButton
@@ -52,7 +49,6 @@
           content: 'apostrophe:duplicate',
           placement: 'left'
         }"
-        :modifiers="[ 'inline' ]"
         @click="$emit('clone')"
       />
       <AposButton
@@ -63,7 +59,6 @@
           content: 'apostrophe:delete',
           placement: 'left'
         }"
-        :modifiers="[ 'inline' ]"
         @click="$emit('remove')"
       />
       <AposButton
@@ -74,7 +69,6 @@
           content: (!disabled && !last) ? 'apostrophe:nudgeDown' : null,
           placement: 'left'
         }"
-        :modifiers="[ 'inline' ]"
         @click="$emit('down')"
       />
     </AposButtonGroup>
@@ -110,23 +104,26 @@ export default {
     maxReached: {
       type: Boolean,
       default: false
+    },
+    tabbable: {
+      type: Boolean,
+      default: false
     }
   },
   emits: [ 'remove', 'edit', 'cut', 'copy', 'clone', 'up', 'down' ],
-  data() {
-    return {
-      buttonDefaults: {
+  computed: {
+    buttonDefaults() {
+      return {
         iconOnly: true,
         icon: 'plus-icon',
         type: 'group',
-        modifiers: [ 'small' ],
+        modifiers: [ 'small', 'inline' ],
         role: 'menuitem',
         class: 'apos-area-modify-controls__button',
-        iconSize: 16
-      }
-    };
-  },
-  computed: {
+        iconSize: 16,
+        disableFocus: !this.tabbable
+      };
+    },
     upButton() {
       return {
         ...this.buttonDefaults,

package/modules/@apostrophecms/asset/lib/webpack/apos/webpack.config.js

@@ -25,6 +25,15 @@ module.exports = ({
 
   const mode = process.env.NODE_ENV || 'development';
   const pnpmModulePath = apos.isPnpm ? [ path.join(apos.selfDir, '../') ] : [];
+  const dev = (mode === 'development');
+  // The default behavior of the security-headers module
+  // blocks eval, and only eval-source-map currently associates
+  // errors with the right file. With regular source-map the
+  // results are worse than no source map. A developer who wishes
+  // to experiment can set the devSourceMap option of the asset module
+  const csp = apos.modules['@apostrophecms/security-headers'];
+  const fallbackSourceMap = csp ? false : 'eval-source-map';
+  const devtool = dev ? (apos.asset.options.devSourceMap || fallbackSourceMap) : false;
   const config = {
     performance: {
       hints: false
@@ -36,7 +45,7 @@ module.exports = ({
     optimization: {
       minimize: process.env.NODE_ENV === 'production'
     },
-    devtool: 'source-map',
+    devtool,
     output: {
       path: outputPath,
       filename: outputFilename

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

@@ -119,9 +119,8 @@ module.exports = {
 
         self.apos.dbClient = await mongodbConnect(uri, self.options.connect);
         self.uri = uri;
-        const parsed = new URL(uri);
-        self.apos.db = self.apos.dbClient.db(parsed.pathname.substring(1));
-
+        // Automatically uses the db name in the connection string
+        self.apos.db = self.apos.dbClient.db();
       },
       async versionCheck() {
         if (!self.options.versionCheck) {

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

@@ -759,7 +759,9 @@ module.exports = {
 
       async convert(req, input, doc, options = {
         presentFieldsOnly: false,
-        copyingId: false
+        type: null,
+        copyingId: null,
+        createId: null
       }) {
         const fullSchema = self.apos.doc.getManager(options.type || self.name)
           .allowedSchema(req, doc);
@@ -784,6 +786,10 @@ module.exports = {
 
         await self.apos.schema.convert(req, schema, input, doc);
 
+        if (options.createId) {
+          doc.aposDocId = options.createId;
+        }
+
         if (copyOf) {
           if (copyOf._id) {
             doc.copyOfId = copyOf._id;

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

@@ -3,6 +3,7 @@
     class="apos-doc-editor"
     :modal="modal"
     :modal-title="modalTitle"
+    :modal-data="modalData"
     @inactive="modal.active = false"
     @show-modal="modal.showModal = true"
     @esc="confirmAndCancel"
@@ -14,6 +15,15 @@
         @click="confirmAndCancel"
       />
     </template>
+    <template v-if="showLocalePicker" #localeDisplay>
+      <AposDocLocalePicker
+        :locale="modalData.locale"
+        :doc-id="referenceDocId"
+        :module-options="moduleOptions"
+        :is-modified="isModified"
+        @switch-locale="switchLocale"
+      />
+    </template>
     <template #primaryControls>
       <AposDocContextMenu
         v-if="original"
@@ -23,6 +33,7 @@
         :published="published"
         :show-edit="false"
         :can-delete-draft="moduleOptions.canDeleteDraft"
+        :locale-switched="localeSwitched"
         @close="close"
       />
       <AposButton
@@ -71,7 +82,7 @@
               :utility-rail="false"
               :following-values="followingValues('other')"
               :conditional-fields="conditionalFields"
-              :doc-id="docId"
+              :doc-id="currentId"
               :model-value="docFields"
               :meta="docMeta"
               :server-errors="serverErrors"
@@ -97,7 +108,7 @@
             :utility-rail="true"
             :following-values="followingUtils"
             :conditional-fields="conditionalFields"
-            :doc-id="docId"
+            :doc-id="currentId"
             :model-value="docFields"
             :meta="docMeta"
             :modifiers="['small', 'inverted']"
@@ -114,6 +125,7 @@
 
 <script>
 import { klona } from 'klona';
+import { mapActions } from 'pinia';
 import AposModifiedMixin from 'Modules/@apostrophecms/ui/mixins/AposModifiedMixin';
 import AposModalTabsMixin from 'Modules/@apostrophecms/modal/mixins/AposModalTabsMixin';
 import AposEditorMixin from 'Modules/@apostrophecms/modal/mixins/AposEditorMixin';
@@ -122,6 +134,7 @@ import AposArchiveMixin from 'Modules/@apostrophecms/ui/mixins/AposArchiveMixin'
 import AposAdvisoryLockMixin from 'Modules/@apostrophecms/ui/mixins/AposAdvisoryLockMixin';
 import AposDocErrorsMixin from 'Modules/@apostrophecms/modal/mixins/AposDocErrorsMixin';
 import { detectDocChange } from 'Modules/@apostrophecms/schema/lib/detectChange';
+import { useModalStore } from 'Modules/@apostrophecms/ui/stores/modal';
 
 export default {
   name: 'AposDocEditor',
@@ -156,6 +169,10 @@ export default {
     copyOfId: {
       type: String,
       default: null
+    },
+    modalData: {
+      type: Object,
+      required: true
     }
   },
   emits: [ 'modal-result' ],
@@ -168,7 +185,8 @@ export default {
         active: false,
         triggerFocusRefresh: 0,
         type: 'overlay',
-        showModal: false
+        showModal: false,
+        componentType: 'editorModal'
       },
       triggerValidation: false,
       original: null,
@@ -179,12 +197,15 @@ export default {
       readOnly: false,
       restoreOnly: false,
       saveMenu: null,
-      generation: 0
+      generation: 0,
+      localeSwitched: this.modalData.hasContextLocale,
+      referenceDocId: this.docId,
+      currentId: this.docId
     };
   },
   computed: {
     getOnePath() {
-      return `${this.moduleAction}/${this.docId}`;
+      return `${this.moduleAction}/${this.currentId}`;
     },
     followingUtils() {
       return this.followingValues('utility');
@@ -220,7 +241,7 @@ export default {
         // Always block save if there are errors in the modal
         return true;
       }
-      if (!this.docId) {
+      if (!this.currentId) {
         // If it is new you can always save it, even just to insert it with
         // defaults is sometimes useful
         return false;
@@ -272,17 +293,10 @@ export default {
       return this.filterOutParkedFields(fields);
     },
     modalTitle() {
-      if (this.docId) {
-        return {
-          key: 'apostrophe:editType',
-          type: this.$t(this.moduleOptions.label)
-        };
-      } else {
-        return {
-          key: 'apostrophe:newDocType',
-          type: this.$t(this.moduleOptions.label)
-        };
-      }
+      return {
+        key: this.currentId ? 'apostrophe:editType' : 'apostrophe:newDocType',
+        type: this.$t(this.moduleOptions.label)
+      };
     },
     saveLabel() {
       if (this.restoreOnly) {
@@ -330,6 +344,11 @@ export default {
         pref = null;
       }
       return pref;
+    },
+    showLocalePicker() {
+      return Object.keys(window.apos.i18n.locales).length > 1 &&
+        this.moduleOptions.localized !== false &&
+        !this.modalData.hasContextLocale;
     }
   },
   watch: {
@@ -363,6 +382,21 @@ export default {
       type: this.$t(this.moduleOptions.label)
     };
     if (this.docId) {
+      await this.instantiateExistingDoc();
+    } else if (this.copyOfId) {
+      this.instantiateCopiedDoc();
+    } else {
+      await this.$nextTick();
+      await this.instantiateNewDoc();
+    }
+    apos.bus.$on('content-changed', this.onContentChanged);
+  },
+  unmounted() {
+    apos.bus.$off('content-changed', this.onContentChanged);
+  },
+  methods: {
+    ...mapActions(useModalStore, [ 'updateModalData' ]),
+    async instantiateExistingDoc() {
       await this.loadDoc();
       this.evaluateConditions();
       try {
@@ -386,7 +420,8 @@ export default {
         }
       }
       this.modal.triggerFocusRefresh++;
-    } else if (this.copyOfId) {
+    },
+    async instantiateCopiedDoc() {
       this.evaluateConditions();
 
       // Because the page or piece manager might give us just a projected,
@@ -419,37 +454,44 @@ export default {
       this.prepErrors();
       this.docReady = true;
       this.modal.triggerFocusRefresh++;
-    } else {
-      this.$nextTick(async () => {
-        await this.loadNewInstance();
-        this.evaluateConditions();
-        this.modal.triggerFocusRefresh++;
-      });
-    }
-    apos.bus.$on('content-changed', this.onContentChanged);
-  },
-  unmounted() {
-    apos.bus.$off('content-changed', this.onContentChanged);
-  },
-  methods: {
-    async saveHandler(action) {
+    },
+    async instantiateNewDoc () {
+      this.docReady = false;
+      const newInstance = await this.getNewInstance();
+      this.original = newInstance;
+      if (newInstance && newInstance.type !== this.docType) {
+        this.docType = newInstance.type;
+      }
+      this.docFields.data = newInstance;
+      const slugField = this.schema.find(field => field.name === 'slug');
+      if (slugField) {
+        // As a matter of UI implementation, we know our slug input field will
+        // automatically change the empty string to the prefix, so to
+        // prevent a false positive for this being considered a change,
+        // do it earlier when creating a new doc.
+        this.original.slug = this.original.slug || slugField.def || slugField.prefix || '';
+      }
+      this.prepErrors();
+      this.docReady = true;
+      this.evaluateConditions();
+    },
+    async saveHandler(action, saveOpts = {}) {
       this.triggerValidation = true;
-      this.$nextTick(async () => {
-        if (this.savePreference !== action) {
-          this.setSavePreference(action);
-        }
-        if (!this.errorCount) {
-          this[action]();
-        } else {
-          this.triggerValidation = false;
-          await apos.notify('apostrophe:resolveErrorsBeforeSaving', {
-            type: 'warning',
-            icon: 'alert-circle-icon',
-            dismiss: true
-          });
-          this.focusNextError();
-        }
-      });
+      await this.$nextTick();
+      if (this.savePreference !== action) {
+        this.setSavePreference(action);
+      }
+      if (!this.errorCount) {
+        return this[action](saveOpts);
+      } else {
+        this.triggerValidation = false;
+        await apos.notify('apostrophe:resolveErrorsBeforeSaving', {
+          type: 'warning',
+          icon: 'alert-circle-icon',
+          dismiss: true
+        });
+        this.focusNextError();
+      }
     },
     async loadDoc() {
       let docData;
@@ -469,7 +511,7 @@ export default {
         }
         const canEdit = docData._edit || this.moduleOptions.canEdit;
         this.readOnly = canEdit === false;
-        if (canEdit && !await this.lock(this.getOnePath, this.docId)) {
+        if (canEdit && !await this.lock(this.getOnePath, this.currentId)) {
           this.lockNotAvailable();
           return;
         }
@@ -490,8 +532,14 @@ export default {
             ...this.getDefault(),
             ...docData
           };
+          // TODO: Is this block even useful since published is fetched after loadDoc?
           if (this.published) {
-            this.changed = detectDocChange(this.schema, this.original, this.published, { differences: true });
+            this.changed = detectDocChange(
+              this.schema,
+              this.original,
+              this.published,
+              { differences: true }
+            );
           }
           this.docReady = true;
           this.prepErrors();
@@ -527,17 +575,21 @@ export default {
       await this.restore(this.original);
       await this.loadDoc();
     },
-    async onSave({ navigate = false } = {}) {
+    async onSave({
+      navigate = false, keepOpen = false, andPublish = null
+    } = {}) {
       if (this.canPublish || !this.manuallyPublished) {
-        await this.save({
-          andPublish: this.manuallyPublished,
-          navigate
+        return this.save({
+          andPublish: andPublish ?? this.manuallyPublished,
+          navigate,
+          keepOpen
         });
       } else {
-        await this.save({
+        return this.save({
           andPublish: false,
           andSubmit: true,
-          navigate
+          navigate,
+          keepOpen
         });
       }
     },
@@ -555,7 +607,7 @@ export default {
     async onSaveDraftAndView() {
       await this.onSaveDraft({ navigate: true });
     },
-    async onSaveDraft(navigate = false) {
+    async onSaveDraft({ navigate = false } = {}) {
       await this.save({
         andPublish: false,
         navigate
@@ -566,32 +618,22 @@ export default {
         icon: 'file-document-icon'
       });
     },
-    // If andPublish is true, publish after saving.
     async save({
       andPublish = false,
       navigate = false,
-      andSubmit = false
+      andSubmit = false,
+      keepOpen = false
     }) {
-      const body = this.docFields.data;
-      let route;
-      let requestMethod;
-      if (this.docId) {
-        route = `${this.moduleAction}/${this.docId}`;
-        requestMethod = apos.http.put;
-        this.addLockToRequest(body);
-      } else {
-        route = this.moduleAction;
-        requestMethod = apos.http.post;
+      const body = this.getRequestBody({ update: Boolean(this.currentId) });
+      const route = this.currentId
+        ? `${this.moduleAction}/${this.currentId}`
+        : this.moduleAction;
+      const requestMethod = this.currentId ? apos.http.put : apos.http.post;
 
-        if (this.moduleName === '@apostrophecms/page') {
-          // New pages are always born as drafts
-          body._targetId = apos.page.page._id.replace(':published', ':draft');
-          body._position = 'lastChild';
-        }
-        if (this.copyOfId) {
-          body._copyingId = this.copyOfId;
-        }
+      if (this.currentId) {
+        this.addLockToRequest(body);
       }
+
       let doc;
       try {
         await this.postprocess();
@@ -607,7 +649,8 @@ export default {
         }
         apos.bus.$emit('content-changed', {
           doc,
-          action: (requestMethod === apos.http.put) ? 'update' : 'insert'
+          action: (requestMethod === apos.http.put) ? 'update' : 'insert',
+          localeSwitched: this.localeSwitched
         });
       } catch (e) {
         if (this.isLockedError(e)) {
@@ -621,8 +664,10 @@ export default {
           return;
         }
       }
-      this.$emit('modal-result', doc);
-      this.modal.showModal = false;
+      if (!keepOpen) {
+        this.$emit('modal-result', doc);
+        this.modal.showModal = false;
+      }
       if (navigate) {
         if (doc._url) {
           window.location = doc._url;
@@ -633,18 +678,11 @@ export default {
           });
         }
       }
+      return doc;
     },
     async getNewInstance() {
       try {
-        const body = {
-          _newInstance: true
-        };
-
-        if (this.moduleName === '@apostrophecms/page') {
-          // New pages are always born as drafts
-          body._targetId = apos.page.page._id.replace(':published', ':draft');
-          body._position = 'lastChild';
-        }
+        const body = this.getRequestBody({ newInstance: true });
         const newDoc = await apos.http.post(this.moduleAction, {
           body,
           draft: true
@@ -662,25 +700,6 @@ export default {
         this.modal.showModal = false;
       }
     },
-    async loadNewInstance () {
-      this.docReady = false;
-      const newInstance = await this.getNewInstance();
-      this.original = newInstance;
-      if (newInstance && newInstance.type !== this.docType) {
-        this.docType = newInstance.type;
-      }
-      this.docFields.data = newInstance;
-      const slugField = this.schema.find(field => field.name === 'slug');
-      if (slugField) {
-        // As a matter of UI implementation, we know our slug input field will
-        // automatically change the empty string to the prefix, so to
-        // prevent a false positive for this being considered a change,
-        // do it earlier when creating a new doc.
-        this.original.slug = this.original.slug || slugField.def || slugField.prefix || '';
-      }
-      this.prepErrors();
-      this.docReady = true;
-    },
     startNew() {
       this.modal.showModal = false;
       apos.bus.$emit('admin-menu-click', {
@@ -719,7 +738,7 @@ export default {
       const typeLabel = this.$t(this.moduleOptions
         ? this.moduleOptions.label
         : 'document');
-      const isNew = !this.docId;
+      const isNew = !this.currentId;
       // this.original takes a moment to populate, don't crash
       const canPreview = this.original && (this.original._id ? this.original._url : this.original._previewable);
       const canNew = this.moduleOptions.showCreate;
@@ -823,6 +842,61 @@ export default {
     },
     close() {
       this.modal.showModal = false;
+    },
+    async switchLocale({
+      locale, localized, save
+    }) {
+      if (save) {
+        const saved = await this.saveHandler('onSave', {
+          keepOpen: true,
+          andPublish: false
+        });
+        if (this.errorCount > 0) {
+          return;
+        }
+        if (!this.referenceDocId && saved) {
+          this.referenceDocId = saved._id;
+        }
+      }
+      this.updateModalData(this.modalData.id, { locale });
+      this.localeSwitched = locale !== apos.i18n.locale;
+      this.published = null;
+      if (localized) {
+        this.currentId = localized._id;
+        await this.instantiateExistingDoc();
+      } else {
+        this.currentId = '';
+        this.docType = this.moduleName;
+        await this.instantiateNewDoc();
+      }
+    },
+    getRequestBody({ newInstance = false, update = false }) {
+      const body = newInstance
+        ? { _newInstance: true }
+        : this.docFields.data;
+
+      if (update) {
+        return body;
+      }
+
+      if (this.moduleName === '@apostrophecms/page') {
+        // New pages are always born as drafts
+        // When in another locale we don't know if the current page exist
+        body._targetId = this.localeSwitched
+          ? '_home'
+          : apos.page.page._id.replace(':published', ':draft');
+        body._position = 'lastChild';
+      }
+
+      if (!newInstance) {
+        if (this.copyOfId) {
+          body._copyingId = this.copyOfId;
+        } else if (this.localeSwitched && this.referenceDocId) {
+          body._createId = this.referenceDocId.split(':')[0];
+        }
+      }
+
+      return body;
     }
   }
 };