Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[backend] Fix entity pdf export message (#4193) #4215

Merged
merged 1 commit into from
Sep 6, 2023
Merged

[backend] Fix entity pdf export message (#4193) #4215

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 19 additions & 22 deletions opencti-platform/opencti-graphql/src/database/file-storage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,18 +306,18 @@ export const upload = async (context, user, path, fileUpload, opts) => {

export const filesListing = async (context, user, first, path, entity = null, prefixMimeType = '') => {
const filesListingFn = async () => {
const files = await rawFilesListing(context, user, path);
let files = await rawFilesListing(context, user, path);
if (entity) {
files = files.filter((file) => file.metaData.entity_id === entity.internal_id);
files = await resolveImageFiles(context, user, files, entity);
}
if (prefixMimeType) {
files = files.filter((file) => file.metaData.mimetype.includes(prefixMimeType));
}
const inExport = await loadExportWorksAsProgressFiles(context, user, path);
const allFiles = R.concat(inExport, files);
const sortedFiles = allFiles.sort((a, b) => b.lastModified - a.lastModified);
let fileNodes = sortedFiles.map((f) => ({ node: f }));
if (prefixMimeType) {
fileNodes = fileNodes.filter((n) => n.node.metaData.mimetype.includes(prefixMimeType));
}
if (entity) {
fileNodes = fileNodes.filter((n) => n.node.metaData.entity_id === entity.internal_id, fileNodes);
fileNodes = await resolveImageFiles(context, user, fileNodes, entity);
}
const fileNodes = sortedFiles.map((f) => ({ node: f }));
return buildPagination(first, null, fileNodes, fileNodes.length);
};
return telemetry(context, user, `STORAGE ${path}`, {
Expand All @@ -334,28 +334,25 @@ export const deleteAllFiles = async (context, user, path) => {
return deleteFiles(context, user, ids);
};

const resolveImageFiles = async (context, user, fileNodes, resolveEntity) => {
const resolveImageFiles = async (context, user, files, resolveEntity) => {
const elasticFiles = resolveEntity.x_opencti_files;
return fileNodes.map((file) => {
const elasticFile = (elasticFiles ?? []).find((e) => e.id === file.node.id);
return files.map((file) => {
const elasticFile = (elasticFiles ?? []).find((e) => e.id === file.id);
if (elasticFile) {
return {
...file,
node: {
...file.node,
metaData: {
...file.node.metaData,
order: elasticFile.order,
inCarousel: elasticFile.inCarousel,
description: elasticFile.description
}
metaData: {
...file.metaData,
order: elasticFile.order,
inCarousel: elasticFile.inCarousel,
description: elasticFile.description
}
};
}
return file;
}).sort((a, b) => {
const orderA = a.node.metaData?.order ?? Infinity;
const orderB = b.node.metaData?.order ?? Infinity;
const orderA = a.metaData?.order ?? Infinity;
const orderB = b.metaData?.order ?? Infinity;
return orderA - orderB;
});
};