From f25866afcf3fa05592247f15da7c13f827167aeb Mon Sep 17 00:00:00 2001 From: akhismat Date: Tue, 27 Aug 2024 16:00:07 +0700 Subject: [PATCH 1/2] Update readme (#6401) --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4a6886ed85..ec34b4f8ce 100644 --- a/README.md +++ b/README.md @@ -140,12 +140,13 @@ Development mode allows for live reloading and a smoother development process. ```bash cd dev/prod +rush validate rushx dev-server ``` Then go to http://localhost:8080 -Use the following login credentials: +Click on "Login with password" link on the bottom of the right panel and use the following login credentials: ```plain Email: user1 From f1d2d4512cfd25f686b3dbd2e09a731d949a7737 Mon Sep 17 00:00:00 2001 From: Alexander Onnikov Date: Tue, 27 Aug 2024 18:45:55 +0700 Subject: [PATCH 2/2] fix: ignore ydoc migration errors (#6402) Signed-off-by: Alexander Onnikov --- dev/tool/src/markup.ts | 8 ++++++-- models/core/src/migration.ts | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dev/tool/src/markup.ts b/dev/tool/src/markup.ts index 7c194924ff..8b889614d9 100644 --- a/dev/tool/src/markup.ts +++ b/dev/tool/src/markup.ts @@ -197,8 +197,12 @@ async function processMigrateMarkupFor ( const blob = await storageAdapter.stat(ctx, workspaceId, documentId) // only for documents not in storage if (blob === undefined) { - const ydoc = markupToYDoc(value, attribute.name) - await saveCollaborativeDoc(storageAdapter, workspaceId, collaborativeDoc, ydoc, ctx) + try { + const ydoc = markupToYDoc(value, attribute.name) + await saveCollaborativeDoc(storageAdapter, workspaceId, collaborativeDoc, ydoc, ctx) + } catch (err) { + console.error('failed to process document', doc._class, doc._id, err) + } } } } diff --git a/models/core/src/migration.ts b/models/core/src/migration.ts index 7282d9ae27..8b3130a753 100644 --- a/models/core/src/migration.ts +++ b/models/core/src/migration.ts @@ -230,8 +230,12 @@ async function processMigrateContentFor ( const blob = await storageAdapter.stat(ctx, client.workspaceId, documentId) // only for documents not in storage if (blob === undefined) { - const ydoc = markupToYDoc(value, attribute.name) - await saveCollaborativeDoc(storageAdapter, client.workspaceId, collaborativeDoc, ydoc, ctx) + try { + const ydoc = markupToYDoc(value, attribute.name) + await saveCollaborativeDoc(storageAdapter, client.workspaceId, collaborativeDoc, ydoc, ctx) + } catch (err) { + console.error('failed to process document', doc._class, doc._id, err) + } } update[attributeName] = collaborativeDoc