apostrophe 3.41.1 → 3.42.0

package/modules/@apostrophecms/schema/ui/apos/components/AposInputSelect.vue

@@ -10,6 +10,7 @@
       <AposSelect
         :icon="icon"
         :choices="choices"
+        :classes="classes"
         :disabled="field.readOnly"
         :selected="value.data"
         @change="change"
@@ -37,6 +38,11 @@ export default {
       choices: []
     };
   },
+  computed: {
+    classes () {
+      return [ this.value.duplicate && 'apos-input--error' ];
+    }
+  },
   async mounted() {
     // Add an null option if there isn't one already
     if (!this.field.required && !this.choices.find(choice => {

package/modules/@apostrophecms/schema/ui/apos/components/AposInputString.vue

@@ -66,7 +66,7 @@ export default {
       }
     },
     classes () {
-      return [ 'apos-input', `apos-input--${this.type}` ];
+      return [ 'apos-input', `apos-input--${this.type}`, this.value.duplicate && 'apos-input--error' ];
     },
     icon () {
       if (this.error) {

package/modules/@apostrophecms/schema/ui/apos/components/AposInputWrapper.vue

@@ -1,7 +1,10 @@
 <template>
   <div
     class="apos-field__wrapper"
-    :class="`apos-field__wrapper--${field.type}`"
+    :class="{
+      [`apos-field__wrapper--${field.type}`]: true,
+      'apos-field__wrapper--full-width': field.type === 'array' && field.style === 'table'
+    }"
   >
     <component :is="wrapEl" :class="classList">
       <div class="apos-field__info">
@@ -178,6 +181,9 @@ export default {
 .apos-field__wrapper {
   position: relative;
 }
+.apos-field__wrapper.apos-field__wrapper--full-width {
+  max-width: 100%;
+}
 
 .apos-field {
   border-width: 0;

package/modules/@apostrophecms/schema/ui/apos/components/AposSchema.vue

@@ -23,10 +23,15 @@
   an external reason.
 -->
 <template>
-  <div class="apos-schema">
-    <div
+  <component
+    class="apos-schema"
+    :is="fieldStyle === 'table' ? 'tr' : 'div'"
+  >
+    <slot name="before" />
+    <component
       v-for="field in schema" :key="field.name"
       :data-apos-field="field.name"
+      :is="fieldStyle === 'table' ? 'td' : 'div'"
     >
       <component
         v-show="displayComponent(field.name)"
@@ -43,8 +48,9 @@
         :ref="field.name"
         :generation="generation"
       />
-    </div>
-  </div>
+    </component>
+    <slot name="after" />
+  </component>
 </template>
 
 <script>
@@ -68,6 +74,11 @@ export default {
       type: Array,
       required: true
     },
+    fieldStyle: {
+      type: String,
+      required: false,
+      default: ''
+    },
     currentFields: {
       type: Array,
       default() {
@@ -318,6 +329,9 @@ export default {
   .apos-schema ::v-deep .apos-field__wrapper {
     max-width: $input-max-width;
   }
+  .apos-schema ::v-deep .apos-field__wrapper.apos-field__wrapper--full-width {
+    max-width: inherit;
+  }
 
   .apos-schema ::v-deep .apos-field__wrapper--area {
     max-width: 100%;

package/modules/@apostrophecms/schema/ui/apos/components/AposSearchList.vue

@@ -1,19 +1,35 @@
 <template>
-  <ul class="apos-search">
+  <ul class="apos-primary-scrollbar apos-search">
     <li
       v-for="item in list"
       :key="item._id"
       :class="getClasses(item)"
-      v-apos-tooltip="item.disabled ? disabledTooltip : null"
+      v-apos-tooltip="getTooltip(item)"
       @click="select(item, $event)"
     >
-      <div class="apos-search__item__main">
-        <div class="apos-search__item__title">
-          {{ item.title }}
-        </div>
-        <div class="apos-search__item__slug">
-          {{ item.slug }}
-        </div>
+      <AposIndicator
+        v-if="getIcon(item).icon"
+        :icon="getIcon(item).icon"
+        :icon-size="getIcon(item).iconSize"
+        class="apos-button__icon"
+        fill-color="currentColor"
+      />
+      <div class="apos-search__item__title">
+        {{ item.title }}
+      </div>
+      <div
+        v-for="field in fields"
+        :key="field"
+        class="apos-search__item__field"
+      >
+        {{ item[field] }}
+      </div>
+      <div
+        v-for="field in item.customFields"
+        :key="field"
+        class="apos-search__item__field"
+      >
+        {{ item[field] }}
       </div>
     </li>
   </ul>
@@ -30,6 +46,12 @@ export default {
         return [];
       }
     },
+    customFields: {
+      type: Array,
+      default() {
+        return [];
+      }
+    },
     selectedItems: {
       type: Array,
       default() {
@@ -39,6 +61,28 @@ export default {
     disabledTooltip: {
       type: String,
       default: null
+    },
+    label: {
+      type: String,
+      default: ''
+    },
+    help: {
+      type: [ String, Object ],
+      default: ''
+    },
+    icon: {
+      type: String,
+      default: 'text-box-icon'
+    },
+    iconSize: {
+      type: Number,
+      default: 20
+    },
+    fields: {
+      type: Array,
+      default() {
+        return [ 'slug' ];
+      }
     }
   },
   emits: [ 'select' ],
@@ -61,7 +105,20 @@ export default {
       if (item.disabled) {
         classes['apos-search__item--disabled'] = true;
       }
+      item.classes && Array.isArray(item.classes) && item.classes.forEach(suffix => {
+        classes[`apos-search__item--${suffix}`] = true;
+      });
+
       return classes;
+    },
+    getTooltip(item) {
+      return item.disabled && item.tooltip !== false ? this.disabledTooltip : null;
+    },
+    getIcon(item) {
+      return {
+        icon: item.icon ?? this.icon,
+        iconSize: item.iconSize || this.iconSize
+      };
     }
   }
 };
@@ -71,13 +128,13 @@ export default {
 .apos-search {
   z-index: $z-index-default;
   position: absolute;
-  top: 37px;
   overflow: auto;
   width: 100%;
   list-style: none;
   box-shadow: var(--a-box-shadow);
   box-sizing: border-box;
   max-height: 300px;
+  margin: 0;
   padding: 0;
   border-bottom-left-radius: var(--a-border-radius);
   border-bottom-right-radius: var(--a-border-radius);
@@ -97,17 +154,42 @@ export default {
   .apos-search__item__title {
     color: $input-color-disabled;
   }
-  .apos-search__item__slug {
+  .apos-search__item__field {
     color: $input-color-disabled;
   }
 }
 
+@mixin suggestion {
+  padding-top: 14px;
+  background-color: var(--a-background-inverted);
+  .apos-search__item__title {
+    color: var(--a-text-inverted);
+  }
+  .apos-search__item__field {
+    color: var(--a-base-8);
+  }
+}
+
+@mixin hint {
+  flex-direction: column;
+  gap: 4px;
+  border-top: 1px solid var(--a-base-5);
+  .apos-search__item__title {
+    color: var(--a-base-2);
+  }
+  .apos-search__item__field {
+    color: var(--a-text-primary);
+  }
+}
+
 .apos-search__item {
   display: flex;
-  justify-content: space-between;
-  margin: 10px;
+  justify-content: flex-start;
+  align-items: center;
+  gap: 10px;
+  margin: 0;
   padding: 10px 20px;
-  border-radius: var(--a-border-radius);
+  border-top: 1px solid var(--a-base-5);
   box-sizing: border-box;
   transition: background-color 0.3s ease;
   & * {
@@ -115,34 +197,25 @@ export default {
   }
 
   &:hover.apos-search__item {
-    padding: 9px 19px;
-    border: 1px solid var(--a-base-5);
     background-color: var(--a-base-10);
     cursor: pointer;
     &.apos-search__item--disabled {
       @include disabled;
     }
-  }
-
-  &:hover.apos-search__item {
-    padding: 9px 19px;
-    border: 1px solid var(--a-base-5);
-    background-color: var(--a-base-10);
-    cursor: pointer;
-  }
-
-  &__main {
-    display: flex;
-    flex-direction: column;
+    &.apos-search__item--suggestion {
+      @include suggestion;
+    }
+    &.apos-search__item--hint {
+      @include hint;
+    }
   }
 
   &__title {
     @include type-base;
     color: var(--a-text-primary);
-    margin-bottom: 3px;
   }
 
-  &__slug {
+  &__field {
     @include type-base;
     color: var(--a-base-2);
   }
@@ -150,5 +223,13 @@ export default {
   &.apos-search__item--disabled {
     @include disabled;
   }
+
+  &.apos-search__item--suggestion {
+    @include suggestion;
+  }
+
+  &.apos-search__item--hint {
+    @include hint;
+  }
 }
 </style>

package/modules/@apostrophecms/submitted-draft/index.js

@@ -9,7 +9,7 @@ module.exports = {
     quickCreate: false,
     label: 'apostrophe:submittedDraft',
     pluralLabel: 'Submitted Drafts',
-    canCreate: false,
+    showCreate: false,
     showDismissSubmission: true,
     showArchive: false,
     showDiscardDraft: false,

package/modules/@apostrophecms/ui/ui/apos/components/AposSlatList.vue

@@ -25,7 +25,7 @@
           :key="item._id"
           :item="item"
           :selected="selected === item._id"
-          :class="{'apos-slat-list__item--disabled' : disabled}"
+          :class="{'apos-slat-list__item--disabled' : disabled, 'apos-input--error': duplicate}"
           :disabled="disabled"
           :engaged="engaged === item._id"
           :parent="listId"
@@ -77,6 +77,10 @@ export default {
     editorIcon: {
       type: String,
       default: null
+    },
+    duplicate: {
+      type: String,
+      default: null
     }
   },
   emits: [ 'update', 'item-clicked', 'select', 'input' ],

package/modules/@apostrophecms/ui/ui/apos/lib/i18next.js

@@ -24,6 +24,7 @@ export default {
       interpolation: {
         escapeValue: false
       },
+      skipOnVariables: false,
       appendNamespaceToMissingKey: true,
       defaultNS: [ apos.i18n.defaultNamespace ],
       parseMissingKeyHandler (key) {

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

@@ -46,7 +46,8 @@ module.exports = {
     editRole: 'admin',
     publishRole: 'admin',
     viewRole: 'admin',
-    showPermissions: true
+    showPermissions: true,
+    relationshipSuggestionIcon: 'account-box-icon'
   },
   fields(self) {
     return {

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

@@ -323,12 +323,15 @@ module.exports = {
       },
 
       // Return a new schema containing only fields for which the
-      // current user has the permission specified by the `permission`
-      // property of the schema field, or there is no `permission` property for the field.
+      // current user has the permission specified by the `editPermission`
+      // property of the schema field, or there is no `editPermission`|`viewPermission` property for the field.
 
       allowedSchema(req) {
         return _.filter(self.schema, function (field) {
-          return !field.permission || self.apos.permission.can(req, field.permission.action, field.permission.type);
+          return (!field.editPermission && !field.viewPermission) ||
+            (field.editPermission && self.apos.permission.can(req, field.editPermission.action, field.editPermission.type)) ||
+            (field.viewPermission && self.apos.permission.can(req, field.viewPermission.action, field.viewPermission.type)) ||
+            false;
         });
       },
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apostrophe",
-  "version": "3.41.1",
+  "version": "3.42.0",
   "description": "The Apostrophe Content Management System.",
   "main": "index.js",
   "scripts": {
@@ -33,20 +33,20 @@
     "@apostrophecms/vue-color": "^2.8.2",
     "@opentelemetry/api": "^1.0.4",
     "@opentelemetry/semantic-conventions": "^1.0.1",
-    "@tiptap/extension-highlight": "^2.0.0-beta.33",
-    "@tiptap/extension-link": "^2.0.0-beta.38",
-    "@tiptap/extension-placeholder": "^2.0.0-beta.196",
-    "@tiptap/extension-subscript": "^2.0.0-beta.209",
-    "@tiptap/extension-superscript": "^2.0.0-beta.209",
-    "@tiptap/extension-table": "^2.0.0-beta.209",
-    "@tiptap/extension-table-cell": "^2.0.0-beta.209",
-    "@tiptap/extension-table-header": "^2.0.0-beta.209",
-    "@tiptap/extension-table-row": "^2.0.0-beta.209",
-    "@tiptap/extension-text-align": "^2.0.0-beta.29",
-    "@tiptap/extension-text-style": "^2.0.0-beta.23",
-    "@tiptap/extension-underline": "^2.0.0-beta.23",
-    "@tiptap/starter-kit": "^2.0.0-beta.185",
-    "@tiptap/vue-2": "^2.0.0-beta.79",
+    "@tiptap/extension-highlight": "^2.0.0-beta.220",
+    "@tiptap/extension-link": "^2.0.0-beta.220",
+    "@tiptap/extension-placeholder": "^2.0.0-beta.220",
+    "@tiptap/extension-subscript": "^2.0.0-beta.220",
+    "@tiptap/extension-superscript": "^2.0.0-beta.220",
+    "@tiptap/extension-table": "^2.0.0-beta.220",
+    "@tiptap/extension-table-cell": "^2.0.0-beta.220",
+    "@tiptap/extension-table-header": "^2.0.0-beta.220",
+    "@tiptap/extension-table-row": "^2.0.0-beta.220",
+    "@tiptap/extension-text-align": "^2.0.0-beta.220",
+    "@tiptap/extension-text-style": "^2.0.0-beta.220",
+    "@tiptap/extension-underline": "^2.0.0-beta.220",
+    "@tiptap/starter-kit": "^2.0.0-beta.220",
+    "@tiptap/vue-2": "^2.0.0-beta.220",
     "autoprefixer": "^10.4.1",
     "bluebird": "^3.7.2",
     "body-parser": "^1.18.2",