yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: change the way that share permissions are checked on child documents to use the parentId field of documents rather than the collection structure (#3294)

Browse Source
This commit is contained in:
Nan Yu
2022-03-28 10:18:59 -07:00
committed by GitHub
parent 3d478246bf
commit 096b35e08e
3 changed files with 6 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
server/models/Collection.test.ts
View File

@@ -85,56 +85,6 @@ describe("getDocumentTree", () => {
});
});
describe("isChildDocument", () => {
test("should return false with unexpected data", async () => {
const document = await buildDocument();
const collection = await buildCollection({
documentStructure: [document.toJSON()],
});
expect(collection.isChildDocument(document.id, document.id)).toEqual(false);
expect(collection.isChildDocument(document.id, undefined)).toEqual(false);
expect(collection.isChildDocument(undefined, document.id)).toEqual(false);
});
test("should return false if sibling", async () => {
const one = await buildDocument();
const document = await buildDocument();
const collection = await buildCollection({
documentStructure: [one.toJSON(), document.toJSON()],
});
expect(collection.isChildDocument(one.id, document.id)).toEqual(false);
expect(collection.isChildDocument(document.id, one.id)).toEqual(false);
});
test("should return true if direct child of parent", async () => {
const parent = await buildDocument();
const document = await buildDocument();
const collection = await buildCollection({
documentStructure: [
{ ...parent.toJSON(), children: [document.toJSON()] },
],
});
expect(collection.isChildDocument(parent.id, document.id)).toEqual(true);
expect(collection.isChildDocument(document.id, parent.id)).toEqual(false);
});
test("should return true if nested child of parent", async () => {
const parent = await buildDocument();
const nested = await buildDocument();
const document = await buildDocument();
const collection = await buildCollection({
documentStructure: [
{
...parent.toJSON(),
children: [{ ...nested.toJSON(), children: [document.toJSON()] }],
},
],
});
expect(collection.isChildDocument(parent.id, document.id)).toEqual(true);
expect(collection.isChildDocument(document.id, parent.id)).toEqual(false);
});
});
describe("#addDocumentToStructure", () => {
test("should add as last element without index", async () => {
const { collection } = await seed();

27
server/models/Collection.ts
View File

@@ -506,33 +506,6 @@ class Collection extends ParanoidModel {
return result;
};
isChildDocument = function (
parentDocumentId?: string,
documentId?: string
): boolean {
let result = false;
const loopChildren = (documents: NavigationNode[], input: string[]) => {
if (result) {
return;
}
documents.forEach((document) => {
const parents = [...input];
if (document.id === documentId && parentDocumentId) {
result = parents.includes(parentDocumentId);
} else {
parents.push(document.id);
loopChildren(document.children, parents);
}
});
};
loopChildren(this.documentStructure, []);
return result;
};
/**
* Update document's title and url in the documentStructure
*/