wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-03-19 13:18:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse Source 
Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
This commit is contained in:
Andrey Sobolev 2024-08-27 18:46:25 +07:00
commit cf53ac25b7
No known key found for this signature in database
GPG Key ID: BD80F68D68D8F7F2
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -140,12 +140,13 @@ Development mode allows for live reloading and a smoother development process.
```bash ```bash
cd dev/prod cd dev/prod
rush validate
rushx dev-server rushx dev-server
``` ```
Then go to http://localhost:8080 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 ```plain
Email: user1 Email: user1

8
dev/tool/src/markup.ts
View File

@ -197,8 +197,12 @@ async function processMigrateMarkupFor (
const blob = await storageAdapter.stat(ctx, workspaceId, documentId) const blob = await storageAdapter.stat(ctx, workspaceId, documentId)
// only for documents not in storage // only for documents not in storage
if (blob === undefined) { if (blob === undefined) {
const ydoc = markupToYDoc(value, attribute.name) try {
await saveCollaborativeDoc(storageAdapter, workspaceId, collaborativeDoc, ydoc, ctx) 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)
}
} }
} }
} }

8
models/core/src/migration.ts
View File

@ -230,8 +230,12 @@ async function processMigrateContentFor (
const blob = await storageAdapter.stat(ctx, client.workspaceId, documentId) const blob = await storageAdapter.stat(ctx, client.workspaceId, documentId)
// only for documents not in storage // only for documents not in storage
if (blob === undefined) { if (blob === undefined) {
const ydoc = markupToYDoc(value, attribute.name) try {
await saveCollaborativeDoc(storageAdapter, client.workspaceId, collaborativeDoc, ydoc, ctx) 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 update[attributeName] = collaborativeDoc