coop-cloud-chaos-patchs/outline
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: Two restore options when an archived document is deleted (#2194)

Browse Source 
* Merge two menu items

* Add deletedAt guard condition in document unarchive policy

* Make the parentDocumentId null

* Update test
This commit is contained in:
Saumya Pandey
2021-06-11 11:22:32 +05:30
committed by GitHub
parent f58032d305
commit d71f0ae6bd
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/menus/DocumentMenu.js
View File

@ -218,12 +218,7 @@ function DocumentMenu({
items={[ items={[
{ {
title: t("Restore"), title: t("Restore"),
visible: !!can.unarchive, visible: (!!collection && can.restore) || can.unarchive,
onClick: handleRestore,
},
{
title: t("Restore"),
visible: !!(collection && can.restore),
onClick: handleRestore, onClick: handleRestore,
}, },
{ {

2
server/api/documents.test.js
View File

@ -1588,7 +1588,7 @@ describe("#documents.restore", () => {
const body = await res.json(); const body = await res.json();
expect(res.status).toEqual(200); expect(res.status).toEqual(200);
expect(body.data.parentDocumentId).toEqual(undefined); expect(body.data.parentDocumentId).toEqual(null);
expect(body.data.archivedAt).toEqual(null); expect(body.data.archivedAt).toEqual(null);
}); });

2
server/models/Document.js
View File

@ -637,7 +637,7 @@ Document.prototype.unarchive = async function (userId: string) {
}, },
}, },
}); });
if (!parent) this.parentDocumentId = undefined; if (!parent) this.parentDocumentId = null;
} }
if (!this.template) { if (!this.template) {

1
server/policies/document.js
View File

@ -149,6 +149,7 @@ allow(User, "unarchive", Document, (user, document) => {
if (cannot(user, "update", document.collection)) return false; if (cannot(user, "update", document.collection)) return false;
if (!document.archivedAt) return false; if (!document.archivedAt) return false;
if (document.deletedAt) return false;
return user.teamId === document.teamId; return user.teamId === document.teamId;
}); });