Skip to content

Commit ec7f09f

Browse files
Archidoitlndrtrbn
andauthored
[frontend] fix file name in fintel template export form (#8336)
Co-authored-by: Landry Trebon <[email protected]>
1 parent a624fe6 commit ec7f09f

File tree

3 files changed

+5
-14
lines changed

3 files changed

+5
-14
lines changed

opencti-platform/opencti-front/src/private/components/common/form/StixCoreObjectFileExportForm.tsx

+1-11
Original file line numberDiff line numberDiff line change
@@ -142,16 +142,6 @@ const StixCoreObjectFileExportForm = ({
142142
[defaultTemplate] = templates ?? [];
143143
}
144144
const defaultFileToExport = fileOptions?.find((f) => f.value === defaultValues?.fileToExport);
145-
let defaultExportFileName = null;
146-
if (defaultTemplate) defaultExportFileName = defaultTemplate.label;
147-
if (defaultFileToExport) {
148-
defaultExportFileName = defaultFileToExport.value === 'mappableContent' && scoName
149-
? scoName
150-
: defaultFileToExport.label.split('.')[0];
151-
}
152-
if (defaultTemplate || defaultFileToExport) {
153-
defaultExportFileName = `${defaultExportFileName}_${now()}`;
154-
}
155145
let defaultFormat = '';
156146
if (defaultValues?.format) {
157147
defaultFormat = defaultValues.format;
@@ -164,7 +154,7 @@ const StixCoreObjectFileExportForm = ({
164154
type: null,
165155
template: defaultTemplate ?? null,
166156
fileToExport: defaultFileToExport ?? null,
167-
exportFileName: defaultExportFileName,
157+
exportFileName: null,
168158
contentMaxMarkings: [],
169159
fileMarkings: defaultFileToExport?.fileMarkings.map(({ id, name }) => ({ label: name, value: id })) ?? [],
170160
};

opencti-platform/opencti-front/src/private/components/settings/sub_types/fintel_templates/FintelTemplatePopover.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ const FintelTemplatePopover = ({
5757
const onHandleCloseDelete = (e: UIEvent) => {
5858
stopEvent(e);
5959
handleCloseDelete();
60-
setAnchorEl(null);
60+
setAnchorEl(undefined);
6161
};
6262

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

8585
const onExport = async (e: UIEvent) => {
8686
stopEvent(e);
87+
setAnchorEl(undefined);
8788
await exportFintel(templateId);
8889
};
8990

opencti-platform/opencti-graphql/src/utils/fintelTemplate/__executiveSummary.template.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,11 @@ const executiveSummaryContent = (containerType: string) => {
8787
<ul>
8888
<li>The timeline of the incident/risk </li>
8989
<li>The attribution of the incident/risk: pick the main threats from this list.</li>
90-
<div>$threats</div>
9190
<li>The main victims of the incident/risk: pick the main form the list.</li>
92-
<div>$victims</div>
9391
</ul>
9492
</blockquote>
93+
<div>$threats</div>
94+
<div>$victims</div>
9595
9696
<div class="page-break" style="page-break-after:always;">
9797
<span style="display:none;">&nbsp;</span>

0 commit comments

Comments
 (0)