Fix Milkdown description modal layout

Author: Marc Schlaeppi

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

@@ -79,13 +79,7 @@ <h4 class="modal-title mr-4">{% if event.event_id %} Event ID #{{ event.event_i
                                 <div class="row">
                                     <div class="form-group mt-3 col-12">
                                         <label for="event_content" class="placeholder">Event description</label>
-                                        <div class="md_description_field">
-                                            <div class="row" style="margin-left:0px;">
-                                                <div class="col-12">
-                                                    <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>
-                                                </div>
-                                            </div>
-                                        </div>
+                                        <div id="event_description" contenteditable="true" spellcheck="true" data-theme="{% if current_user.in_dark_mode %}dark{% else %}light{% endif %}">{% if event.event_content %}{{ event.event_content  }}{% endif %}</div>
                                         </div>
                                     </div>
                                 </div>

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

@@ -72,13 +72,7 @@ <h4 class="modal-title mr-4">{% if ioc.ioc_id %}Edit IOC #{{ ioc.ioc_id }}{% els
                              {% endif %}
                             <div class="form-group mt-3">
                                 <label for="ioc_description" class="placeholder">Description</label>
-                                    <div class="md_description_field">
-                                        <div class="row" style="margin-left:0px;">
-                                            <div class="col-12">
-                                                <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>
-                                            </div>
-                                        </div>
-                                    </div>
+                                <div id="ioc_description" contenteditable="true" spellcheck="true" data-theme="{% if current_user.in_dark_mode %}dark{% else %}light{% endif %}">{% if ioc and ioc.ioc_description %}{{ ioc.ioc_description  }}{% endif %}</div>
                                 </div>
                             </div>
                             <div class="form-group">

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

@@ -100,13 +100,7 @@ <h4 class="modal-title mr-4">{% if rfile.id %}Edit evidence #{{rfile.id}}{% else
 
                                 <div class="form-group">
                                     <label for="rfile_desc" class="placeholder">Description</label>
-                                     <div class="md_description_field">
-                                        <div class="row" style="margin-left:0px;">
-                                            <div class="col-12">
-                                                <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>
-                                            </div>
-                                        </div>
-                                    </div>
+                                    <div id="evidence_description" contenteditable="true" spellcheck="true" data-theme="{% if current_user.in_dark_mode %}dark{% else %}light{% endif %}">{% if rfile %}{{ rfile.file_description  }}{% endif %}</div>
                                     </div>
                                 </div>
                                 <div class="form-group">

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

@@ -59,13 +59,7 @@ <h4 class="modal-title mr-4">{% if task.id %} Task ID #{{ task.id }}{% else %}
                                 </div>
                                 <div class="form-group mt-3">
                                     <label for="task_description" class="placeholder">Description</label>
-                                     <div class="md_description_field">
-                                        <div class="row" style="margin-left:0px;">
-                                            <div class="col-12">
-                                                <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>
-                                            </div>
-                                        </div>
-                                    </div>
+                                    <div id="task_description" contenteditable="true" spellcheck="true" data-theme="{% if current_user.in_dark_mode %}dark{% else %}light{% endif %}">{% if task.task_description %}{{ task.task_description  }}{% endif %}</div>
                                     </div>
                                 </div>
                                 <div class="form-group mt-3">

ui/src/pages/case.ioc.js

@@ -33,7 +33,7 @@ function add_ioc() {
                                 $('#last_saved > i').attr('class', "fa-solid fa-file-circle-exclamation");
                             }, null);
 
-        g_ioc_desc_editor.setOption("minLines", "10");
+        g_ioc_desc_editor.setOption("minLines", "6");
         $('#submit_new_ioc').on("click", function () {
             if(!$('form#form_new_ioc').valid()) {
                 return false;
@@ -171,7 +171,7 @@ function edit_ioc(ioc_id) {
                                 $('#last_saved > i').attr('class', "fa-solid fa-file-circle-exclamation");
                             }, null);
 
-        g_ioc_desc_editor.setOption("minLines", "10");
+        g_ioc_desc_editor.setOption("minLines", "6");
 
         load_menu_mod_options_modal(ioc_id, 'ioc', $("#ioc_modal_quick_actions"));
         $('.dtr-modal').hide();

ui/src/pages/case.rfiles.js

@@ -41,7 +41,7 @@ function add_modal_rfile() {
                         $('#last_saved').addClass('btn-danger').removeClass('btn-success');
                         $('#last_saved > i').attr('class', "fa-solid fa-file-circle-exclamation");
                     }, null);
-        g_evidence_desc_editor.setOption("minLines", "10");
+        g_evidence_desc_editor.setOption("minLines", "6");
         load_evidence_type();
 
         $('#modal_add_rfiles').modal({ show: true });

ui/src/pages/case.tasks.js

@@ -18,7 +18,7 @@ function add_task() {
                                 $('#last_saved').addClass('btn-danger').removeClass('btn-success');
                                 $('#last_saved > i').attr('class', "fa-solid fa-file-circle-exclamation");
                             }, null);
-        g_task_desc_editor.setOption("minLines", "10");
+        g_task_desc_editor.setOption("minLines", "6");
         $('#submit_new_task').on("click", function () {
 
             clear_api_error();

ui/src/pages/case.timeline.js

@@ -20,7 +20,7 @@ function add_event(parent_event_id = null) {
                                 $('#last_saved > i').attr('class', "fa-solid fa-file-circle-exclamation");
                             }, null);
 
-        g_event_desc_editor.setOption("minLines", "10");
+        g_event_desc_editor.setOption("minLines", "6");
         let parent_selector = $('#parent_event_id');
 
         // Add empty option

ui/test/legacy_description_controls.test.js

@@ -18,7 +18,8 @@ test('case description forms use Milkdown without legacy preview controls', asyn
         );
         const script = await readFile(new URL(`ui/src/pages/${scriptName}`, root), 'utf8');
 
-        assert.doesNotMatch(template, new RegExp(`${prefix}_preview_button|icon-note`));
+        assert.doesNotMatch(template, new RegExp(`${prefix}_preview_button|icon-note|md_description_field`));
         assert.doesNotMatch(script, new RegExp(`edit_in_${prefix}_desc|preview_${prefix}_description`));
+        assert.doesNotMatch(script, new RegExp(`g_${prefix}_desc_editor\\.setOption\\("minLines", "10"\\)`));
     }
 });