0.58.2-0

closes #2416

Dockerfile

@@ -35,6 +35,7 @@ ENV NODE_ENV production
 
 COPY --from=builder $APP_PATH/build ./build
 COPY --from=builder $APP_PATH/server ./server
+COPY --from=builder $APP_PATH/public ./public
 COPY --from=builder $APP_PATH/.sequelizerc ./.sequelizerc
 COPY --from=deps-prod $APP_PATH/node_modules ./node_modules
 COPY --from=builder $APP_PATH/package.json ./package.json

package.json

@@ -143,7 +143,7 @@
     "react-window": "^1.8.6",
     "reakit": "^1.3.8",
     "regenerator-runtime": "^0.13.7",
-    "rich-markdown-editor": "^11.17.0",
+    "rich-markdown-editor": "^11.17.1",
     "semver": "^7.3.2",
     "sequelize": "^6.3.4",
     "sequelize-cli": "^6.2.0",
@@ -211,5 +211,5 @@
     "dot-prop": "^5.2.0",
     "js-yaml": "^3.13.1"
   },
-  "version": "0.58.0"
+  "version": "0.58.2-0"
 }

server/api/documents.js

@@ -310,9 +310,10 @@ router.post("documents.viewed", auth(), pagination(), async (ctx) => {
 
   const user = ctx.state.user;
   const collectionIds = await user.collectionIds();
+  const userId = user.id;
 
   const views = await View.findAll({
-    where: { userId: user.id },
+    where: { userId },
     order: [[sort, direction]],
     include: [
       {
@@ -325,9 +326,16 @@ router.post("documents.viewed", auth(), pagination(), async (ctx) => {
           {
             model: Star,
             as: "starred",
-            where: { userId: user.id },
+            where: { userId },
+            separate: true,
             required: false,
           },
+          {
+            model: Collection.scope({
+              method: ["withMembership", userId],
+            }),
+            as: "collection",
+          },
         ],
       },
     ],

server/api/documents.test.js

@@ -1349,6 +1349,7 @@ describe("#documents.viewed", () => {
     expect(res.status).toEqual(200);
     expect(body.data.length).toEqual(1);
     expect(body.data[0].id).toEqual(document.id);
+    expect(body.policies[0].abilities.update).toEqual(true);
   });
 
   it("should not return recently viewed but deleted documents", async () => {

yarn.lock

@@ -11566,10 +11566,10 @@ retry-as-promised@^3.2.0:
   dependencies:
     any-promise "^1.3.0"
 
-rich-markdown-editor@^11.17.0:
-  version "11.17.0"
-  resolved "https://registry.yarnpkg.com/rich-markdown-editor/-/rich-markdown-editor-11.17.0.tgz#9a39f5bd6518de1d0dc6c6ffa352fd3f7f664d96"
-  integrity sha512-zCl9F7eeR3T5O2tiSU9iNGDOKhYBfTMqwWMPSY4ADjHcxELNkF1wOdKb0lqM8ZOfM63DkPEZy/N7cSifReyqvg==
+rich-markdown-editor@^11.17.1:
+  version "11.17.1"
+  resolved "https://registry.yarnpkg.com/rich-markdown-editor/-/rich-markdown-editor-11.17.1.tgz#ace87dccf7e7c7f6e093d73accb467794d3cee60"
+  integrity sha512-/V7nPhjASnKVqFRW0CFKCe1+PrRZywVWzjvlpwzAKjpYW8QSWL/fViIkYzWBsynYamCT/A/iLx8ms6KJr6gSjw==
   dependencies:
     copy-to-clipboard "^3.0.8"
     lodash "^4.17.11"