diff --git a/packages/backend/server/src/core/utils/__tests__/__snapshots__/blocksute.spec.ts.md b/packages/backend/server/src/core/utils/__tests__/__snapshots__/blocksute.spec.ts.md index b10017f90e..cc8182962e 100644 --- a/packages/backend/server/src/core/utils/__tests__/__snapshots__/blocksute.spec.ts.md +++ b/packages/backend/server/src/core/utils/__tests__/__snapshots__/blocksute.spec.ts.md @@ -605,6 +605,7 @@ Generated by [AVA](https://avajs.dev). 'BFZk3c2ERp-sliRvA7MQ_p3NdkdCLt2Ze0DQ9i21dpA=', ], blockId: 'lcZphIJe63', + content: '', docId: 'doc-0', flavour: 'affine:image', parentBlockId: '6x7ALjUDjj', @@ -619,6 +620,7 @@ Generated by [AVA](https://avajs.dev). 'HWvCItS78DzPGbwcuaGcfkpVDUvL98IvH5SIK8-AcL8=', ], blockId: 'JlgVJdWU12', + content: '', docId: 'doc-0', flavour: 'affine:image', parentBlockId: '6x7ALjUDjj', @@ -633,6 +635,7 @@ Generated by [AVA](https://avajs.dev). 'ZRKpsBoC88qEMmeiXKXqywfA1rLvWoLa5rpEh9x9Oj0=', ], blockId: 'lht7AqBqnF', + content: '', docId: 'doc-0', flavour: 'affine:image', parentBlockId: '6x7ALjUDjj', @@ -1236,6 +1239,7 @@ Generated by [AVA](https://avajs.dev). 'BFZk3c2ERp-sliRvA7MQ_p3NdkdCLt2Ze0DQ9i21dpA=', ], blockId: 'lcZphIJe63', + content: '', docId: 'doc-0', flavour: 'affine:image', parentBlockId: '6x7ALjUDjj', @@ -1250,6 +1254,7 @@ Generated by [AVA](https://avajs.dev). 'HWvCItS78DzPGbwcuaGcfkpVDUvL98IvH5SIK8-AcL8=', ], blockId: 'JlgVJdWU12', + content: '', docId: 'doc-0', flavour: 'affine:image', parentBlockId: '6x7ALjUDjj', @@ -1264,6 +1269,7 @@ Generated by [AVA](https://avajs.dev). 'ZRKpsBoC88qEMmeiXKXqywfA1rLvWoLa5rpEh9x9Oj0=', ], blockId: 'lht7AqBqnF', + content: '', docId: 'doc-0', flavour: 'affine:image', parentBlockId: '6x7ALjUDjj', diff --git a/packages/backend/server/src/core/utils/__tests__/__snapshots__/blocksute.spec.ts.snap b/packages/backend/server/src/core/utils/__tests__/__snapshots__/blocksute.spec.ts.snap index 676184bedb..3d84ff9c2d 100644 Binary files a/packages/backend/server/src/core/utils/__tests__/__snapshots__/blocksute.spec.ts.snap and b/packages/backend/server/src/core/utils/__tests__/__snapshots__/blocksute.spec.ts.snap differ diff --git a/packages/common/reader/__tests__/__snapshots__/reader.spec.ts.snap b/packages/common/reader/__tests__/__snapshots__/reader.spec.ts.snap index 89c5d6d8b8..610f6353a6 100644 --- a/packages/common/reader/__tests__/__snapshots__/reader.spec.ts.snap +++ b/packages/common/reader/__tests__/__snapshots__/reader.spec.ts.snap @@ -1673,6 +1673,7 @@ exports[`should read doc blocks work 1`] = ` "BFZk3c2ERp-sliRvA7MQ_p3NdkdCLt2Ze0DQ9i21dpA=", ], "blockId": "lcZphIJe63", + "content": "", "docId": "test-doc", "flavour": "affine:image", "parentBlockId": "6x7ALjUDjj", @@ -1702,6 +1703,7 @@ exports[`should read doc blocks work 1`] = ` "HWvCItS78DzPGbwcuaGcfkpVDUvL98IvH5SIK8-AcL8=", ], "blockId": "JlgVJdWU12", + "content": "", "docId": "test-doc", "flavour": "affine:image", "parentBlockId": "6x7ALjUDjj", @@ -1731,6 +1733,7 @@ exports[`should read doc blocks work 1`] = ` "ZRKpsBoC88qEMmeiXKXqywfA1rLvWoLa5rpEh9x9Oj0=", ], "blockId": "lht7AqBqnF", + "content": "", "docId": "test-doc", "flavour": "affine:image", "parentBlockId": "6x7ALjUDjj", @@ -3361,6 +3364,7 @@ exports[`should read doc blocks work without root doc 1`] = ` "BFZk3c2ERp-sliRvA7MQ_p3NdkdCLt2Ze0DQ9i21dpA=", ], "blockId": "lcZphIJe63", + "content": "", "docId": "test-doc", "flavour": "affine:image", "parentBlockId": "6x7ALjUDjj", @@ -3390,6 +3394,7 @@ exports[`should read doc blocks work without root doc 1`] = ` "HWvCItS78DzPGbwcuaGcfkpVDUvL98IvH5SIK8-AcL8=", ], "blockId": "JlgVJdWU12", + "content": "", "docId": "test-doc", "flavour": "affine:image", "parentBlockId": "6x7ALjUDjj", @@ -3419,6 +3424,7 @@ exports[`should read doc blocks work without root doc 1`] = ` "ZRKpsBoC88qEMmeiXKXqywfA1rLvWoLa5rpEh9x9Oj0=", ], "blockId": "lht7AqBqnF", + "content": "", "docId": "test-doc", "flavour": "affine:image", "parentBlockId": "6x7ALjUDjj", diff --git a/packages/common/reader/src/reader.ts b/packages/common/reader/src/reader.ts index dd2973f754..e15ca701f6 100644 --- a/packages/common/reader/src/reader.ts +++ b/packages/common/reader/src/reader.ts @@ -648,12 +648,24 @@ export async function readAllBlocksFromDoc({ parentBlockId, }); } - } else if (flavour === 'affine:attachment' || flavour === 'affine:image') { + } else if (flavour === 'affine:attachment') { const blobId = block.get('prop:sourceId'); if (typeof blobId === 'string') { blockDocuments.push({ ...commonBlockProps, blob: [blobId], + content: block.get('prop:name')?.toString() ?? '', + parentFlavour, + parentBlockId, + }); + } + } else if (flavour === 'affine:image') { + const blobId = block.get('prop:sourceId'); + if (typeof blobId === 'string') { + blockDocuments.push({ + ...commonBlockProps, + blob: [blobId], + content: block.get('prop:caption')?.toString() ?? '', parentFlavour, parentBlockId, });