Display import source data on documents (#6651)
* Display import source in Insights * Ensure sourceMetadata is not returned on public requests * Support createdByName * Prefer display source name
This commit is contained in:
@@ -49,6 +49,8 @@ async function presentDocument(
|
||||
}
|
||||
|
||||
if (!options.isPublic) {
|
||||
const source = await document.$get("import");
|
||||
|
||||
data.collectionId = document.collectionId;
|
||||
data.parentDocumentId = document.parentDocumentId;
|
||||
data.createdBy = presentUser(document.createdBy);
|
||||
@@ -57,6 +59,14 @@ async function presentDocument(
|
||||
data.templateId = document.templateId;
|
||||
data.template = document.template;
|
||||
data.insightsEnabled = document.insightsEnabled;
|
||||
data.sourceMetadata = document.sourceMetadata
|
||||
? {
|
||||
importedAt: source?.createdAt ?? document.createdAt,
|
||||
importType: source?.format,
|
||||
createdByName: document.sourceMetadata.createdByName,
|
||||
fileName: document.sourceMetadata?.fileName,
|
||||
}
|
||||
: undefined;
|
||||
}
|
||||
|
||||
return data;
|
||||
|
||||
@@ -125,6 +125,7 @@ export default class ExportJSONTask extends ExportTask {
|
||||
title: document.title,
|
||||
data: DocumentHelper.toProsemirror(document),
|
||||
createdById: document.createdById,
|
||||
createdByName: document.createdBy.name,
|
||||
createdByEmail: document.createdBy.email,
|
||||
createdAt: document.createdAt.toISOString(),
|
||||
updatedAt: document.updatedAt.toISOString(),
|
||||
|
||||
@@ -78,6 +78,7 @@ export type StructuredImportData = {
|
||||
publishedAt?: Date | null;
|
||||
parentDocumentId?: string | null;
|
||||
createdById?: string;
|
||||
createdByName?: string;
|
||||
createdByEmail?: string | null;
|
||||
path: string;
|
||||
mimeType: string;
|
||||
@@ -467,6 +468,7 @@ export default abstract class ImportTask extends BaseTask<Props> {
|
||||
fileName: path.basename(item.path),
|
||||
mimeType: item.mimeType,
|
||||
externalId: item.externalId,
|
||||
createdByName: item.createdByName,
|
||||
},
|
||||
id: item.id,
|
||||
title: item.title,
|
||||
|
||||
@@ -467,6 +467,7 @@ export type DocumentJSONExport = {
|
||||
title: string;
|
||||
data: Record<string, any>;
|
||||
createdById: string;
|
||||
createdByName: string;
|
||||
createdByEmail: string | null;
|
||||
createdAt: string;
|
||||
updatedAt: string;
|
||||
|
||||
Reference in New Issue
Block a user