gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

server: Fix duplicating notes with relationships (closes #308)

Browse Source
This commit is contained in:
Elian Doran 2024-08-09 22:31:30 +03:00
parent ddc82853fc
commit f297105c25
No known key found for this signature in database
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
integration-tests/auth.setup.ts
View File

@ -2,8 +2,8 @@ import { test as setup, expect } from '@playwright/test';
const authFile = 'playwright/.auth/user.json'; const authFile = 'playwright/.auth/user.json';
const ROOT_URL = "http://localhost:8080"; const ROOT_URL = "http://localhost:8082";
const LOGIN_PASSWORD = "eliandoran"; const LOGIN_PASSWORD = "demo1234";
// Reference: https://playwright.dev/docs/auth#basic-shared-account-in-all-tests // Reference: https://playwright.dev/docs/auth#basic-shared-account-in-all-tests

9
integration-tests/duplicate.spec.ts Normal file
View File

@ -0,0 +1,9 @@
import { test, expect } from '@playwright/test';
test("Can duplicate note with broken links", async ({ page }) => {
await page.goto(`http://localhost:8082/#2VammGGdG6Ie`);
await page.locator('.tree-wrapper .fancytree-active').getByText('Note map').click({ button: 'right' });
await page.getByText('Duplicate subtree').click();
await expect(page.locator(".toast-body")).toBeHidden();
await expect(page.locator('.tree-wrapper').getByText('Note map (dup)')).toBeVisible();
});

4
src/becca/entities/abstract_becca_entity.ts
View File

@ -34,7 +34,7 @@ abstract class AbstractBeccaEntity<T extends AbstractBeccaEntity<T>> {
isSynced?: boolean; isSynced?: boolean;
blobId?: string; blobId?: string;
protected beforeSaving() { protected beforeSaving(opts?: {}) {
const constructorData = (this.constructor as unknown as ConstructorData<T>); const constructorData = (this.constructor as unknown as ConstructorData<T>);
if (!(this as any)[constructorData.primaryKeyName]) { if (!(this as any)[constructorData.primaryKeyName]) {
(this as any)[constructorData.primaryKeyName] = utils.newEntityId(); (this as any)[constructorData.primaryKeyName] = utils.newEntityId();
@ -109,7 +109,7 @@ abstract class AbstractBeccaEntity<T extends AbstractBeccaEntity<T>> {
const isNewEntity = !(this as any)[primaryKeyName]; const isNewEntity = !(this as any)[primaryKeyName];
this.beforeSaving(); this.beforeSaving(opts);
const pojo = this.getPojoToSave(); const pojo = this.getPojoToSave();

4
src/services/notes.ts
View File

@ -817,7 +817,6 @@ function undeleteBranch(branchId: string, deleteId: string, taskContext: TaskCon
for (const attributeRow of attributeRows) { for (const attributeRow of attributeRows) {
// relation might point to a note which hasn't been undeleted yet and would thus throw up // relation might point to a note which hasn't been undeleted yet and would thus throw up
// TODO: skipValidation is not used.
new BAttribute(attributeRow).save({skipValidation: true}); new BAttribute(attributeRow).save({skipValidation: true});
} }
@ -997,8 +996,7 @@ function duplicateSubtreeInner(origNote: BNote, origBranch: BBranch, newParentNo
} }
// the relation targets may not be created yet, the mapping is pre-generated // the relation targets may not be created yet, the mapping is pre-generated
// TODO: This used to be `attr.save({skipValidation: true});`, but skipValidation is in beforeSaving. attr.save({skipValidation: true});
attr.save();
} }
for (const childBranch of origNote.getChildBranches()) { for (const childBranch of origNote.getChildBranches()) {