apostrophe 3.16.0 → 3.16.1-alpha.20210331

package/test/docs.js

@@ -299,6 +299,40 @@ describe('Docs', function() {
     assert(doc.slug.match(/^one\d+$/));
   });
 
+  it('should add the aposDocId to the related documents\' relatedReverseIds field', async () => {
+    const object = {
+      aposDocId: 'paul',
+      aposLocale: 'en:published',
+      slug: 'paul',
+      visibility: 'public',
+      type: 'test-people',
+      firstName: 'Paul',
+      lastName: 'McCartney',
+      age: 24,
+      alive: false,
+      friendsIds: [ 'carl', 'larry' ],
+      _friends: [ { _id: 'carl:en:published' }, { _id: 'larry:en:published' } ]
+    };
+
+    await apos.doc.insert(apos.task.getReq(), object);
+
+    const carlDoc = await apos.doc.db.findOne({
+      slug: 'carl',
+      aposLocale: 'en:published'
+    });
+
+    const larryDoc = await apos.doc.db.findOne({
+      slug: 'larry',
+      aposLocale: 'en:published'
+    });
+
+    assert(carlDoc.relatedReverseIds.length === 1);
+    assert(carlDoc.relatedReverseIds[0] === 'paul');
+
+    assert(larryDoc.relatedReverseIds.length === 1);
+    assert(larryDoc.relatedReverseIds[0] === 'paul');
+  });
+
   it('should not allow you to call the insert method if you are not an admin', async function() {
     const object = {
       slug: 'not-for-you',
@@ -364,7 +398,7 @@ describe('Docs', function() {
     }).toDistinct('firstName');
 
     assert(Array.isArray(firstNames));
-    assert(firstNames.length === 4);
+    assert(firstNames.length === 5);
     assert(_.includes(firstNames, 'Larry'));
   });
 
@@ -376,7 +410,7 @@ describe('Docs', function() {
     const firstNames = await cursor.toDistinct('firstName');
 
     assert(Array.isArray(firstNames));
-    assert(firstNames.length === 4);
+    assert(firstNames.length === 5);
     assert(_.includes(firstNames, 'Larry'));
 
     const counts = await cursor.get('distinctCounts');
@@ -385,6 +419,37 @@ describe('Docs', function() {
     assert(counts.Lori === 2);
   });
 
+  it('should remove the aposDocId from the related documents\' relatedReverseIds field', async () => {
+    const paulDoc = await apos.doc.db.findOne({
+      slug: 'paul',
+      aposLocale: 'en:published'
+    });
+
+    // carl removed from paul's related friends, only larry remains
+    const object = {
+      ...paulDoc,
+      friendsIds: [ 'larry' ],
+      _friends: [ { _id: 'larry:en:published' } ]
+    };
+
+    await apos.doc.update(apos.task.getReq(), object);
+
+    const carlDoc = await apos.doc.db.findOne({
+      slug: 'carl',
+      aposLocale: 'en:published'
+    });
+
+    const larryDoc = await apos.doc.db.findOne({
+      slug: 'larry',
+      aposLocale: 'en:published'
+    });
+
+    assert(carlDoc.relatedReverseIds.length === 0);
+
+    assert(larryDoc.relatedReverseIds.length === 1);
+    assert(larryDoc.relatedReverseIds[0] === 'paul');
+  });
+
   it('should not allow you to call the update method if you are not an admin', async function() {
     const cursor = apos.doc.find(apos.task.getAnonReq(), {
       type: 'test-people',

package/test/modules/bundle/index.js

@@ -0,0 +1,7 @@
+module.exports = {
+  extend: '@apostrophecms/piece-type',
+  options: {
+    label: 'Bundles piece',
+    pluralLabel: 'Bundles Pieces'
+  }
+};

package/test/modules/bundle-page/index.js

@@ -0,0 +1,32 @@
+module.exports = {
+  extend: '@apostrophecms/piece-page-type',
+  webpack: {
+    bundles: {
+      extra: {
+        templates: [ 'show' ]
+      }
+    },
+    extensions: {
+      ext1: {
+        resolve: {
+          alias: {
+            ext1: 'foo-path'
+          }
+        }
+      }
+    }
+  },
+  fields: {
+    add: {
+      main: {
+        type: 'area',
+        contextual: true,
+        options: {
+          widgets: {
+            bundle: {}
+          }
+        }
+      }
+    }
+  }
+};

package/test/modules/bundle-page/ui/src/extra.js

@@ -0,0 +1 @@
+export default () => {};

package/test/modules/bundle-page/views/index.html

@@ -0,0 +1,9 @@
+{% extends data.outerLayout %}
+
+{% block main %}
+  <div>
+    <h1>My Index Page</h1>
+    {% area data.page, 'main' %}
+  </div>
+{% endblock %}
+

package/test/modules/bundle-page/views/show.html

@@ -0,0 +1,10 @@
+{% extends data.outerLayout %}
+
+{% block main %}
+  <div>
+    <div>
+      <h1>My Show Page</h1>
+    </div>
+  </div>
+{% endblock %}
+

package/test/modules/bundle-widget/index.js

@@ -0,0 +1,27 @@
+module.exports = {
+  extend: '@apostrophecms/widget-type',
+  options: {
+    label: 'Bundle Widget'
+  },
+  webpack: {
+    bundles: {
+      extra2: {}
+    },
+    extensions: {
+      ext1: {
+        resolve: {
+          alias: {
+            ext1Overriden: 'bar-path'
+          }
+        }
+      },
+      ext2: {
+        resolve: {
+          alias: {
+            ext2: 'ext2-path'
+          }
+        }
+      }
+    }
+  }
+};

package/test/modules/bundle-widget/ui/src/extra2.js

@@ -0,0 +1 @@
+export default () => {};

package/test/modules/bundle-widget/views/widget.html

@@ -0,0 +1 @@
+<h3>Bundle Widget</h3>

package/test/pieces.js

@@ -92,7 +92,9 @@ describe('Pieces', function() {
             publicApiProjection: {
               title: 1,
               _url: 1,
-              _articles: 1
+              _articles: 1,
+              relationshipsInArray: 1,
+              relationshipsInObject: 1
             }
           },
           fields: {
@@ -123,16 +125,6 @@ describe('Pieces', function() {
                 type: 'attachment',
                 group: 'images'
               },
-              addresses: {
-                type: 'array',
-                fields: {
-                  add: {
-                    street: {
-                      type: 'string'
-                    }
-                  }
-                }
-              },
               _articles: {
                 type: 'relationship',
                 withType: 'article',
@@ -151,6 +143,28 @@ describe('Pieces', function() {
                     }
                   }
                 }
+              },
+              relationshipsInArray: {
+                type: 'array',
+                fields: {
+                  add: {
+                    _articles: {
+                      type: 'relationship',
+                      withType: 'article'
+                    }
+                  }
+                }
+              },
+              relationshipsInObject: {
+                type: 'object',
+                fields: {
+                  add: {
+                    _articles: {
+                      type: 'relationship',
+                      withType: 'article'
+                    }
+                  }
+                }
               }
             }
           }
@@ -737,13 +751,23 @@ describe('Pieces', function() {
             }
           ]
         },
-        _articles: [ article ]
+        _articles: [ article ],
+        relationshipsInArray: [
+          {
+            _articles: [ article ]
+          }
+        ],
+        relationshipsInObject: {
+          _articles: [ article ]
+        }
       },
       jar
     });
     assert(response._id);
     assert(response.articlesIds[0] === article.aposDocId);
     assert(response.articlesFields[article.aposDocId].relevance === 'The very first article that was ever published about this product');
+    assert(response.relationshipsInArray[0].articlesIds[0] === article.aposDocId);
+    assert(response.relationshipsInObject.articlesIds[0] === article.aposDocId);
     relatedProductId = response._id;
   });
 
@@ -756,6 +780,8 @@ describe('Pieces', function() {
     assert(product._articles.length === 1);
     assert(product._articles[0]._fields);
     assert.strictEqual(product._articles[0]._fields.relevance, 'The very first article that was ever published about this product');
+    assert(product.relationshipsInArray[0]._articles[0].title === 'First Article');
+    assert(product.relationshipsInObject._articles[0].title === 'First Article');
   });
 
   let relatedArticleId;

package/test/package.json

@@ -1,11 +0,0 @@
-{
-  "name": "test",
-  "dependencies": {
-    "apostrophe": "^3.0.0",
-    "improve-global": "1.0.0",
-    "improve-piece-type": "1.0.0"
-  },
-  "devDependencies": {
-    "test-bundle": "1.0.0"
-  }
-}

package/test/public/static-test.txt

@@ -1 +0,0 @@
-served