Skip to content

Commit a884e77

Browse files
author
Marc Schlaeppi
committed
Remove legacy description preview controls
1 parent ba7ab61 commit a884e77

9 files changed

Lines changed: 46 additions & 264 deletions

File tree

‎source/app/blueprints/pages/case/templates/modal_add_case_event.html‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -80,26 +80,13 @@ <h4 class="modal-title mr-4">{% if event.event_id %} Event ID #{{ event.event_i
8080
<div class="form-group mt-3 col-12">
8181
<label for="event_content" class="placeholder">Event description</label>
8282
<div class="md_description_field">
83-
<div class="form-group mt--2">
84-
<button type="button" class="float-right icon-note btn btn-circle btn-sm mt-2" onclick="edit_in_event_desc();" >
85-
</button>
86-
<button type="button" style="display: none;" class="btn btn-dark btn-sm float-right mr-2 mt-2"
87-
onclick="preview_event_description();" id="event_preview_button"><i class="fa-solid fa-eye"></i></button>
88-
</div>
89-
<div class="row">
90-
<div class="col mb--2 ml--2" id="event_edition_btn" style="display:none;">
91-
</div>
92-
</div>
9383
<div class="row" style="margin-left:0px;">
94-
<div class="col-12" id="container_event_desc_content">
84+
<div class="col-12">
9585
<div id="event_description" contenteditable="true" spellcheck="true" class="mr-2" data-theme="{% if current_user.in_dark_mode %}dark{% else %}light{% endif %}">{% if event.event_content %}{{ event.event_content }}{% endif %}</div>
96-
<textarea id="event_desc_content" rows="10" cols="82" style="display: none"></textarea>
97-
</div>
98-
<div class="col-12" id="container_event_description" style="display:none">
99-
<div id="target_event_desc"></div>
10086
</div>
10187
</div>
10288
</div>
89+
</div>
10390
</div>
10491
</div>
10592
<div class="row">
@@ -326,4 +313,4 @@ <h4 class="modal-title mr-4">{% if event.event_id %} Event ID #{{ event.event_i
326313
]);
327314
$('#event_iocs').trigger('change');
328315
</script>
329-
{% endif %}
316+
{% endif %}

‎source/app/blueprints/pages/case/templates/modal_add_case_ioc.html‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -73,23 +73,10 @@ <h4 class="modal-title mr-4">{% if ioc.ioc_id %}Edit IOC #{{ ioc.ioc_id }}{% els
7373
<div class="form-group mt-3">
7474
<label for="ioc_description" class="placeholder">Description</label>
7575
<div class="md_description_field">
76-
<div class="form-group mt--2">
77-
<button type="button" class="float-right icon-note btn btn-circle btn-sm mt-2" onclick="edit_in_ioc_desc();">
78-
</button>
79-
<button type="button" style="display: none;" class="btn btn-dark btn-sm float-right mr-2 mt-2"
80-
onclick="preview_ioc_description();" id="ioc_preview_button"><i class="fa-solid fa-eye"></i></button>
81-
</div>
82-
<div class="row">
83-
<div class="col mb--2 ml--2" id="ioc_edition_btn" style="display:none;">
84-
</div>
85-
</div>
86-
<div class="row" style="margin-left:0px;">
87-
<div class="col-12" id="container_ioc_desc_content">
88-
<div id="ioc_description" contenteditable="true" spellcheck="true" class="mr-2" data-theme="{% if current_user.in_dark_mode %}dark{% else %}light{% endif %}">{% if ioc and ioc.ioc_description %}{{ ioc.ioc_description }}{% endif %}</div>
89-
<textarea id="ioc_desc_content" rows="10" cols="82" style="display: none"></textarea>
90-
</div>
91-
<div class="col-12" id="container_ioc_description" style="display:none">
92-
<div id="target_ioc_desc"></div>
76+
<div class="row" style="margin-left:0px;">
77+
<div class="col-12">
78+
<div id="ioc_description" contenteditable="true" spellcheck="true" class="mr-2" data-theme="{% if current_user.in_dark_mode %}dark{% else %}light{% endif %}">{% if ioc and ioc.ioc_description %}{{ ioc.ioc_description }}{% endif %}</div>
79+
</div>
9380
</div>
9481
</div>
9582
</div>
@@ -144,4 +131,4 @@ <h4 class="modal-title mr-4">{% if ioc.ioc_id %}Edit IOC #{{ ioc.ioc_id }}{% els
144131
{% else %}
145132
$('#ioc_tlp_id').selectpicker('val', '2');
146133
{% endif %}
147-
</script>
134+
</script>

‎source/app/blueprints/pages/case/templates/modal_add_case_rfile.html‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -101,26 +101,13 @@ <h4 class="modal-title mr-4">{% if rfile.id %}Edit evidence #{{rfile.id}}{% else
101101
<div class="form-group">
102102
<label for="rfile_desc" class="placeholder">Description</label>
103103
<div class="md_description_field">
104-
<div class="form-group mt--2">
105-
<button type="button" class="float-right icon-note btn btn-circle btn-sm mt-2" onclick="edit_in_evidence_desc();" >
106-
</button>
107-
<button type="button" style="display: none;" class="btn btn-dark btn-sm float-right mr-2 mt-2"
108-
onclick="preview_evidence_description();" id="evidence_preview_button"><i class="fa-solid fa-eye"></i></button>
109-
</div>
110-
<div class="row">
111-
<div class="col mb--2 ml--2" id="evidence_edition_btn" style="display:none;">
112-
</div>
113-
</div>
114104
<div class="row" style="margin-left:0px;">
115-
<div class="col-12" id="container_evidence_desc_content">
105+
<div class="col-12">
116106
<div id="evidence_description" contenteditable="true" spellcheck="true" class="mr-2" data-theme="{% if current_user.in_dark_mode %}dark{% else %}light{% endif %}">{% if rfile %}{{ rfile.file_description }}{% endif %}</div>
117-
<textarea id="evidence_desc_content" rows="10" cols="82" style="display: none"></textarea>
118-
</div>
119-
<div class="col-12" id="container_evidence_description" style="display:none">
120-
<div id="target_evidence_desc"></div>
121107
</div>
122108
</div>
123109
</div>
110+
</div>
124111
</div>
125112
<div class="form-group">
126113
<p>Locally compute file information by selecting it below. <span class="text-danger">The file is not be uploaded on the server nor saved.</span></p>
@@ -142,4 +129,4 @@ <h4 class="modal-title mr-4">{% if rfile.id %}Edit evidence #{{rfile.id}}{% else
142129
<button type="button" class="btn btn-outline-success float-right" onclick="add_rfile();">Register</button>
143130
{% endif %}
144131
</div>
145-
</div>
132+
</div>

‎source/app/blueprints/pages/case/templates/modal_add_case_task.html‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -60,26 +60,13 @@ <h4 class="modal-title mr-4">{% if task.id %} Task ID #{{ task.id }}{% else %}
6060
<div class="form-group mt-3">
6161
<label for="task_description" class="placeholder">Description</label>
6262
<div class="md_description_field">
63-
<div class="form-group mt--2">
64-
<button type="button" class="float-right icon-note btn btn-circle btn-sm mt-2" onclick="edit_in_task_desc();">
65-
</button>
66-
<button type="button" style="display: none;" class="btn btn-dark btn-sm float-right mr-2 mt-2"
67-
onclick="preview_task_description();" id="task_preview_button"><i class="fa-solid fa-eye"></i></button>
68-
</div>
69-
<div class="row">
70-
<div class="col mb--2 ml--2" id="task_edition_btn" style="display:none;">
71-
</div>
72-
</div>
7363
<div class="row" style="margin-left:0px;">
74-
<div class="col-12" id="container_task_desc_content">
64+
<div class="col-12">
7565
<div id="task_description" contenteditable="true" spellcheck="true" class="mr-2" data-theme="{% if current_user.in_dark_mode %}dark{% else %}light{% endif %}">{% if task.task_description %}{{ task.task_description }}{% endif %}</div>
76-
<textarea id="task_desc_content" rows="10" cols="82" style="display: none"></textarea>
77-
</div>
78-
<div class="col-12" id="container_task_description" style="display:none">
79-
<div id="target_task_desc"></div>
8066
</div>
8167
</div>
8268
</div>
69+
</div>
8370
</div>
8471
<div class="form-group mt-3">
8572
<label for="task_tags">Task tags

‎ui/src/pages/case.ioc.js‎

Lines changed: 3 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,6 @@ function reload_iocs() {
77
get_case_ioc();
88
}
99

10-
function edit_in_ioc_desc() {
11-
if($('#container_ioc_desc_content').is(':visible')) {
12-
$('#container_ioc_description').show(100);
13-
$('#container_ioc_desc_content').hide(100);
14-
$('#ioc_edition_btn').hide(100);
15-
$('#ioc_preview_button').hide(100);
16-
} else {
17-
$('#ioc_preview_button').show(100);
18-
$('#ioc_edition_btn').show(100);
19-
$('#container_ioc_desc_content').show(100);
20-
$('#container_ioc_description').hide(100);
21-
}
22-
}
23-
2410
function _parse_ioc_values() {
2511
const ioc_value = $('#ioc_value').val();
2612
if (!$('#ioc_one_per_line').is(':checked')) {
@@ -41,19 +27,13 @@ function add_ioc() {
4127
return false;
4228
}
4329

44-
g_ioc_desc_editor = get_new_markdown_editor('ioc_description', 'ioc_desc_content', 'target_ioc_desc',
30+
g_ioc_desc_editor = get_new_markdown_editor('ioc_description', null, null,
4531
function() {
4632
$('#last_saved').addClass('btn-danger').removeClass('btn-success');
4733
$('#last_saved > i').attr('class', "fa-solid fa-file-circle-exclamation");
4834
}, null);
4935

5036
g_ioc_desc_editor.setOption("minLines", "10");
51-
edit_in_ioc_desc();
52-
53-
headers = get_editor_headers('g_ioc_desc_editor', null, 'ioc_edition_btn');
54-
$('#ioc_edition_btn').append(headers);
55-
56-
5737
$('#submit_new_ioc').on("click", function () {
5838
if(!$('form#form_new_ioc').valid()) {
5939
return false;
@@ -185,49 +165,21 @@ function edit_ioc(ioc_id) {
185165
}
186166

187167
g_ioc_id = ioc_id;
188-
g_ioc_desc_editor = get_new_markdown_editor('ioc_description', 'ioc_desc_content', 'target_ioc_desc',
168+
g_ioc_desc_editor = get_new_markdown_editor('ioc_description', null, null,
189169
function() {
190170
$('#last_saved').addClass('btn-danger').removeClass('btn-success');
191171
$('#last_saved > i').attr('class', "fa-solid fa-file-circle-exclamation");
192-
}, null, false, false);
172+
}, null);
193173

194174
g_ioc_desc_editor.setOption("minLines", "10");
195-
preview_ioc_description(true);
196-
headers = get_editor_headers('g_ioc_desc_editor', null, 'ioc_edition_btn');
197-
$('#ioc_edition_btn').append(headers);
198175

199176
load_menu_mod_options_modal(ioc_id, 'ioc', $("#ioc_modal_quick_actions"));
200177
$('.dtr-modal').hide();
201178
$('#modal_add_ioc').modal({ show: true });
202-
edit_in_ioc_desc();
203179
});
204180

205181
}
206182

207-
function preview_ioc_description(no_btn_update) {
208-
if(!$('#container_ioc_description').is(':visible')) {
209-
ioc_desc = g_ioc_desc_editor.getValue();
210-
converter = get_showdown_convert();
211-
html = converter.makeHtml(do_md_filter_xss(ioc_desc));
212-
ioc_desc_html = do_md_filter_xss(html);
213-
$('#target_ioc_desc').html(ioc_desc_html);
214-
$('#container_ioc_description').show();
215-
if (!no_btn_update) {
216-
$('#ioc_preview_button').html('<i class="fa-solid fa-eye-slash"></i>');
217-
}
218-
$('#container_ioc_desc_content').hide();
219-
}
220-
else {
221-
$('#container_ioc_description').hide();
222-
if (!no_btn_update) {
223-
$('#ioc_preview_button').html('<i class="fa-solid fa-eye"></i>');
224-
}
225-
226-
$('#ioc_preview_button').html('<i class="fa-solid fa-eye"></i>');
227-
$('#container_ioc_desc_content').show();
228-
}
229-
}
230-
231183
function update_ioc(ioc_id) {
232184
if(!$('form#form_new_ioc').valid()) {
233185
return false;

‎ui/src/pages/case.rfiles.js‎

Lines changed: 2 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,6 @@ function reload_rfiles(notify) {
66
}
77
}
88

9-
function edit_in_evidence_desc() {
10-
if($('#container_evidence_desc_content').is(':visible')) {
11-
$('#container_evidence_description').show(100);
12-
$('#container_evidence_desc_content').hide(100);
13-
$('#evidence_edition_btn').hide(100);
14-
$('#evidence_preview_button').hide(100);
15-
} else {
16-
$('#evidence_preview_button').show(100);
17-
$('#evidence_edition_btn').show(100);
18-
$('#container_evidence_desc_content').show(100);
19-
$('#container_evidence_description').hide(100);
20-
}
21-
}
22-
239
function get_hash() {
2410
if (document.getElementById("input_autofill").files[0] === undefined) {
2511
$('#btn_rfile_proc').text("Please select a file");
@@ -50,17 +36,12 @@ function add_modal_rfile() {
5036
return false;
5137
}
5238

53-
g_evidence_desc_editor = get_new_markdown_editor('evidence_description', 'evidence_desc_content', 'target_evidence_desc',
39+
g_evidence_desc_editor = get_new_markdown_editor('evidence_description', null, null,
5440
function() {
5541
$('#last_saved').addClass('btn-danger').removeClass('btn-success');
5642
$('#last_saved > i').attr('class', "fa-solid fa-file-circle-exclamation");
5743
}, null);
5844
g_evidence_desc_editor.setOption("minLines", "10");
59-
edit_in_evidence_desc();
60-
61-
let headers = get_editor_headers('g_evidence_desc_editor', null, 'evidence_edition_btn');
62-
$('#evidence_edition_btn').append(headers);
63-
6445
load_evidence_type();
6546

6647
$('#modal_add_rfiles').modal({ show: true });
@@ -207,26 +188,21 @@ function edit_rfiles(rfiles_id) {
207188
return false;
208189
}
209190

210-
g_evidence_desc_editor = get_new_markdown_editor('evidence_description', 'evidence_desc_content', 'target_evidence_desc',
191+
g_evidence_desc_editor = get_new_markdown_editor('evidence_description', null, null,
211192
function() {
212193
$('#last_saved').addClass('btn-danger').removeClass('btn-success');
213194
$('#last_saved > i').attr('class', "fa-solid fa-file-circle-exclamation");
214195
$('#submit_new_evidence').text("Unsaved").removeClass('btn-success').addClass('btn-outline-warning').removeClass('btn-outline-danger');
215196
}, null);
216197

217198
g_evidence_desc_editor.setOption("minLines", "6");
218-
preview_evidence_description(true);
219-
220-
let headers = get_editor_headers('g_evidence_desc_editor', null, 'evidence_edition_btn');
221-
$('#evidence_edition_btn').append(headers);
222199

223200
load_menu_mod_options_modal(rfiles_id, 'evidence', $("#evidence_modal_quick_actions"));
224201

225202
load_evidence_type();
226203

227204
$('#modal_add_rfiles').modal({ show: true });
228205

229-
edit_in_evidence_desc();
230206
});
231207
}
232208

@@ -291,30 +267,6 @@ function load_evidence_type() {
291267
})
292268
}
293269

294-
function preview_evidence_description(no_btn_update) {
295-
if(!$('#container_evidence_description').is(':visible')) {
296-
evidence_desc = g_evidence_desc_editor.getValue();
297-
converter = get_showdown_convert();
298-
html = converter.makeHtml(do_md_filter_xss(evidence_desc));
299-
evidence_desc_html = do_md_filter_xss(html);
300-
$('#target_evidence_desc').html(evidence_desc_html);
301-
$('#container_evidence_description').show();
302-
if (!no_btn_update) {
303-
$('#evidence_preview_button').html('<i class="fa-solid fa-eye-slash"></i>');
304-
}
305-
$('#container_evidence_desc_content').hide();
306-
}
307-
else {
308-
$('#container_evidence_description').hide();
309-
if (!no_btn_update) {
310-
$('#evidence_preview_button').html('<i class="fa-solid fa-eye"></i>');
311-
}
312-
313-
$('#evidence_preview_button').html('<i class="fa-solid fa-eye"></i>');
314-
$('#container_evidence_desc_content').show();
315-
}
316-
}
317-
318270
/* Update an rfiles */
319271
function update_rfile(rfiles_id) {
320272
let data_sent = $('form#form_edit_rfile').serializeObject();

0 commit comments

Comments
 (0)