diff --git a/packages/api/src/entity/library_item.ts b/packages/api/src/entity/library_item.ts index 416c65b68..07f4ccd05 100644 --- a/packages/api/src/entity/library_item.ts +++ b/packages/api/src/entity/library_item.ts @@ -129,6 +129,10 @@ export class LibraryItem { @JoinColumn({ name: 'upload_file_id' }) uploadFile?: UploadFile + // get upload_file_id without joining relations + @Column('text', { nullable: true }) + uploadFileId?: string + @Column('enum', { enum: ContentReaderType, default: ContentReaderType.WEB }) contentReader!: ContentReaderType diff --git a/packages/api/src/resolvers/function_resolvers.ts b/packages/api/src/resolvers/function_resolvers.ts index bc58b54bf..ca145815e 100644 --- a/packages/api/src/resolvers/function_resolvers.ts +++ b/packages/api/src/resolvers/function_resolvers.ts @@ -465,7 +465,7 @@ export const functionResolvers = { async url(item: SearchItem, _: unknown, ctx: WithDataSourcesContext) { if ( (item.pageType == PageType.File || item.pageType == PageType.Book) && - ctx.uid && + ctx.claims && item.uploadFileId ) { const upload = await findUploadFileById(item.uploadFileId) diff --git a/packages/api/src/services/save_page.ts b/packages/api/src/services/save_page.ts index 3e82374d7..fa9110565 100644 --- a/packages/api/src/services/save_page.ts +++ b/packages/api/src/services/save_page.ts @@ -242,7 +242,7 @@ export const parsedContentToLibraryItem = ({ publishedAt: validatedDate( publishedAt || parsedContent?.publishedDate || undefined ), - uploadFile: { id: uploadFileId ?? undefined }, + uploadFileId: uploadFileId || undefined, readingProgressTopPercent: 0, readingProgressHighestReadAnchor: 0, state: state diff --git a/packages/api/src/utils/helpers.ts b/packages/api/src/utils/helpers.ts index dadcfe171..bdfe443c1 100644 --- a/packages/api/src/utils/helpers.ts +++ b/packages/api/src/utils/helpers.ts @@ -268,7 +268,6 @@ export const libraryItemToSearchItem = (item: LibraryItem): SearchItem => ({ ), image: item.thumbnail, highlights: item.highlights?.map(highlightDataToHighlight), - uploadFileId: item.uploadFile?.id, wordsCount: item.wordCount, })