apostrophe 4.0.0 → 4.1.0

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

@@ -32,7 +32,7 @@
       :style="style"
     >
       <defs>
-        <linearGradient x1="8.042%" y1="0%" x2="65.682%" y2="23.865%" id="a">
+        <linearGradient id="a" x1="8.042%" y1="0%" x2="65.682%" y2="23.865%">
           <stop stop-color="currentColor" stop-opacity="0" offset="0%" />
           <stop stop-color="currentColor" stop-opacity=".631" offset="63.146%" />
           <stop stop-color="currentColor" offset="100%" />
@@ -40,7 +40,7 @@
       </defs>
       <g fill="none" fill-rule="evenodd">
         <g transform="translate(1 1)">
-          <path d="M36 18c0-9.94-8.06-18-18-18" id="Oval-2" stroke="url(#a)" stroke-width="2" transform="rotate(266.312 18 18)">
+          <path id="Oval-2" d="M36 18c0-9.94-8.06-18-18-18" stroke="url(#a)" stroke-width="2" transform="rotate(266.312 18 18)">
             <animateTransform attributeName="transform" type="rotate" from="0 18 18" to="360 18 18" dur="0.9s" repeatCount="indefinite" />
           </path>
           <circle fill="currentColor" cx="36" cy="18" r="1" transform="rotate(266.312 18 18)">

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

@@ -1,8 +1,9 @@
 <template>
   <div class="apos-tag">
-    <button @click="click" class="apos-tag__button">
+    <button class="apos-tag__button" @click="click">
       <close-icon
-        class="apos-tag__remove" title="Remove Tag"
+        class="apos-tag__remove"
+        title="Remove Tag"
         :size="10"
       />
     </button>

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

@@ -1,7 +1,8 @@
 <template>
   <li class="apos-tag-list__item">
     <button
-      :class="{'apos-is-active' : active}" class="apos-tag-list__button"
+      :class="{'apos-is-active' : active}"
+      class="apos-tag-list__button"
       @click="click(tag)"
     >
       <AposIndicator

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

@@ -190,7 +190,7 @@ export default {
       }
     }
   },
-  emits: [ 'update', 'update:checked' ],
+  emits: [ 'update', 'update:checked', 'change' ],
   data() {
     return {
       treeBranches: []

package/modules/@apostrophecms/ui/ui/apos/scss/global/_theme.scss

@@ -8,6 +8,7 @@
   --a-warning-dark: #a75c07;
   --a-warning-fade: #ffce0030;
   --a-progress-bg: #2c354d;
+  --a-highlight: #fff6e8;
 
   --a-danger-button-hover: #c00717;
   --a-danger-button-active: #a10000;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apostrophe",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "The Apostrophe Content Management System.",
   "main": "index.js",
   "scripts": {
@@ -78,7 +78,7 @@
     "form-data": "^4.0.0",
     "fs-extra": "^7.0.1",
     "glob": "^5.0.15",
-    "he": "^0.5.0",
+    "he": "^1.2.0",
     "html-to-text": "^9.0.5",
     "i18next": "^20.3.2",
     "i18next-http-middleware": "^3.1.5",
@@ -149,4 +149,4 @@
   "browserslist": [
     "ie >= 10"
   ]
-}
+}

package/test/attachments.js

@@ -442,5 +442,10 @@ describe('Attachment', function() {
 
       assert(height === 400);
     });
+
+    it('should generate an appropriate missing attachment url', function() {
+      const url = apos.attachment.url(null);
+      assert.strictEqual(url, '/apos-frontend/default/modules/@apostrophecms/attachment/img/missing-icon.svg');
+    });
   });
 });

package/test/schemas.js

@@ -288,6 +288,44 @@ describe('Schemas', function() {
               }
             };
           }
+        },
+        article: {
+          extend: '@apostrophecms/piece-type',
+          options: {
+            alias: 'article'
+          },
+          fields(self) {
+            return {
+              add: {
+                title: {
+                  label: '',
+                  type: 'string',
+                  required: true
+                },
+                area: {
+                  label: 'Area',
+                  type: 'area',
+                  options: {
+                    widgets: {
+                      '@apostrophecms/rich-text': {}
+                    }
+                  }
+                },
+                array: {
+                  label: 'Array',
+                  type: 'array',
+                  fields: {
+                    add: {
+                      arrayTitle: {
+                        label: 'Array Title',
+                        type: 'string'
+                      }
+                    }
+                  }
+                }
+              }
+            };
+          }
         }
       }
     });
@@ -2263,6 +2301,106 @@ describe('Schemas', function() {
     assert(output.goodValue === '2022-05-09T22:36:00.000Z');
   });
 
+  it('should compare two document properly with the method getChanges', async function() {
+    const req = apos.task.getReq();
+    const instance = apos.article.newInstance();
+    const article1 = {
+      ...instance,
+      title: 'article 1',
+      area: {
+        _id: 'clrth36680007mnmd3jj7cta0',
+        items: [
+          {
+            _id: 'clt79l48g001h2061j5ihxjkv',
+            metaType: 'widget',
+            type: '@apostrophecms/rich-text',
+            aposPlaceholder: false,
+            content: '<p>Some text here.</p>',
+            permalinkIds: [],
+            imageIds: []
+          }
+        ],
+        metaType: 'area'
+      },
+      array: [
+        {
+          _id: 'clt79llm800242061v4dx9kv5',
+          metaType: 'arrayItem',
+          scopedArrayName: 'doc.article.array',
+          arrayTitle: 'array title 1'
+        },
+        {
+          _id: 'clt79llm800242061v4d47364',
+          metaType: 'arrayItem',
+          scopedArrayName: 'doc.article.array',
+          arrayTitle: 'array title 2'
+        }
+      ]
+    };
+    const article2 = {
+      ...article1,
+      title: 'article 2'
+    };
+    const article3 = {
+      ...instance,
+      title: 'article 3',
+
+      area: {
+        _id: 'clrth36680007mnmd3jj7cta0',
+        items: [
+          {
+            _id: 'clt79l48g001h2061j5ihxjkv',
+            metaType: 'widget',
+            type: '@apostrophecms/rich-text',
+            aposPlaceholder: false,
+            content: '<p>Some text here changed.</p>',
+            permalinkIds: [],
+            imageIds: []
+          }
+        ],
+        metaType: 'area'
+      },
+      array: [
+        {
+          _id: 'clt79llm800242061v4dx9kv5',
+          metaType: 'arrayItem',
+          scopedArrayName: 'doc.article.array',
+          arrayTitle: 'array title 1 changed'
+        },
+        {
+          _id: 'clt79llm800242061v4d47364',
+          metaType: 'arrayItem',
+          scopedArrayName: 'doc.article.array',
+          arrayTitle: 'array title 2'
+        }
+      ]
+    };
+
+    await apos.article.insert(req, article1);
+    await apos.article.insert(req, article2);
+    await apos.article.insert(req, article3);
+
+    const art1 = await apos.doc.db.findOne({ title: 'article 1' });
+    const art2 = await apos.doc.db.findOne({ title: 'article 2' });
+    const art3 = await apos.doc.db.findOne({ title: 'article 3' });
+
+    const changes11 = apos.schema.getChanges(req, apos.article.schema, art1, art1);
+    const changes12 = apos.schema.getChanges(req, apos.article.schema, art1, art2);
+    const changes23 = apos.schema.getChanges(req, apos.article.schema, art2, art3);
+    const actual = {
+      changes11,
+      changes12,
+      changes23
+    };
+    const expected = {
+      changes11: [],
+      changes12: [ 'title', 'slug' ],
+      changes23: [ 'title', 'slug', 'area', 'array' ]
+    };
+
+    assert.deepEqual(actual, expected);
+  });
+
   describe('field editPermission|viewPermission', function() {
     const schema = [
       {