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

[frontend] fix file name in fintel template export form (#8336) #9807

Merged
merged 2 commits into from
Feb 3, 2025
Merged

[frontend] fix file name in fintel template export form (#8336) #9807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb3e159
[frontend] fix export name in export form (#8336)
Archidoit Feb 3, 2025
73cfa68
[frontend] some fixes
lndrtrbn Feb 3, 2025
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
12 changes: 1 addition & 11 deletions ...latform/opencti-front/src/private/components/common/form/StixCoreObjectFileExportForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,16 +142,6 @@ const StixCoreObjectFileExportForm = ({
[defaultTemplate] = templates ?? [];
}
const defaultFileToExport = fileOptions?.find((f) => f.value === defaultValues?.fileToExport);
let defaultExportFileName = null;
if (defaultTemplate) defaultExportFileName = defaultTemplate.label;
if (defaultFileToExport) {
defaultExportFileName = defaultFileToExport.value === 'mappableContent' && scoName
? scoName
: defaultFileToExport.label.split('.')[0];
}
if (defaultTemplate || defaultFileToExport) {
defaultExportFileName = `${defaultExportFileName}_${now()}`;
}
let defaultFormat = '';
if (defaultValues?.format) {
defaultFormat = defaultValues.format;
Expand All @@ -164,7 +154,7 @@ const StixCoreObjectFileExportForm = ({
type: null,
template: defaultTemplate ?? null,
fileToExport: defaultFileToExport ?? null,
exportFileName: defaultExportFileName,
exportFileName: null,
contentMaxMarkings: [],
fileMarkings: defaultFileToExport?.fileMarkings.map(({ id, name }) => ({ label: name, value: id })) ?? [],
};
Expand Down
3 changes: 2 additions & 1 deletion ...ront/src/private/components/settings/sub_types/fintel_templates/FintelTemplatePopover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const FintelTemplatePopover = ({
const onHandleCloseDelete = (e: UIEvent) => {
stopEvent(e);
handleCloseDelete();
setAnchorEl(null);
setAnchorEl(undefined);
};

const update = (e: UIEvent) => {
Expand All @@ -84,6 +84,7 @@ const FintelTemplatePopover = ({

const onExport = async (e: UIEvent) => {
stopEvent(e);
setAnchorEl(undefined);
await exportFintel(templateId);
};

Expand Down
4 changes: 2 additions & 2 deletions opencti-platform/opencti-graphql/src/utils/fintelTemplate/__executiveSummary.template.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@ const executiveSummaryContent = (containerType: string) => {
<ul>
<li>The timeline of the incident/risk </li>
<li>The attribution of the incident/risk: pick the main threats from this list.</li>
<div>$threats</div>
<li>The main victims of the incident/risk: pick the main form the list.</li>
<div>$victims</div>
</ul>
</blockquote>
<div>$threats</div>
<div>$victims</div>

<div class="page-break" style="page-break-after:always;">
<span style="display:none;">&nbsp;</span>
Expand Down