Add a select_across checkbox on the ProjectReportForm #1524

scanpipe/forms.py

@@ -238,7 +238,21 @@ def save(self, project):
         return input_source
 
 
-class ArchiveProjectForm(forms.Form):
+class BaseProjectActionForm(forms.Form):
+    select_across = forms.BooleanField(
+        label="",
+        required=False,
+        initial=0,
+        help_text="All project matching current search and filters will be included.",
+    )
+    url_query = forms.CharField(
+        widget=forms.HiddenInput,
+        required=False,
+        help_text="Stores the current URL filters.",
+    )
+
+
+class ArchiveProjectForm(BaseProjectActionForm):
     remove_input = forms.BooleanField(
         label="Remove inputs",
         initial=True,
@@ -256,7 +270,7 @@ class ArchiveProjectForm(forms.Form):
     )
 
 
-class ProjectOutputDownloadForm(forms.Form):
+class ProjectOutputDownloadForm(BaseProjectActionForm):
     output_format = forms.ChoiceField(
         label="Choose the output format to include in the ZIP file",
         choices=[
@@ -272,7 +286,7 @@ class ProjectOutputDownloadForm(forms.Form):
     )
 
 
-class ProjectReportForm(forms.Form):
+class ProjectReportForm(BaseProjectActionForm):
     model_name = forms.ChoiceField(
         label="Choose the object type to include in the XLSX file",
         choices=[

scanpipe/pipes/__init__.py

@@ -113,7 +113,7 @@ def collect_and_create_codebase_resources(project, batch_size=5000):
     Collect and create codebase resources including the "to/" and "from/" context using
     the resource tag field.
 
-    The default ``batch_size`` can be overriden, although the benefits of a value
+    The default ``batch_size`` can be overridden, although the benefits of a value
     greater than 5000 objects are usually not significant.
     """
     model_class = CodebaseResource

scanpipe/templates/registration/login.html

@@ -21,7 +21,6 @@
           <div class="field">
             <label class="label">Username</label>
             <div class="control has-icons-left">
-              <!-- {{ form.username }}-->
               <input class="input" type="text" name="username" autofocus autocomplete="username" maxlength="150" required id="id_username">
               <span class="icon is-small is-left">
                 <i class="fa-solid fa-user"></i>
@@ -32,7 +31,6 @@
           <div class="field mb-5">
             <label class="label">Password</label>
             <div class="control has-icons-left">
-              <!-- {{ form.password }}-->
               <input class="input" type="password" name="password" autocomplete="current-password" required id="id_password">
               <span class="icon is-small is-left">
               <i class="fa-solid fa-lock"></i>

scanpipe/templates/scanpipe/modals/projects_archive_modal.html

@@ -1,3 +1,4 @@
+{% load humanize %}
 <div class="modal" id="modal-projects-archive">
   <div class="modal-background"></div>
   <div class="modal-card">
@@ -9,18 +10,39 @@
       <section class="modal-card-body">
         <div class="notification is-warning has-text-weight-semibold">
           The selected projects will be marked as archived and will become read-only.
-          Those will not appear in the project list by default anymore.
+          Those will not appear in the project list by default anymore.<br>
         </div>
         <p class="mb-2">
           The selected directories will be removed:
         </p>
-        <ul class="mb-5">
-          {{ archive_form.as_ul }}
-        </ul>
-        <p>
-          Are you sure you want to do this?
-        </p>
+        <div class="field">
+          <label class="label">
+            {{ archive_form.remove_input }}
+            {{ archive_form.remove_input.label }}
+          </label>
+        </div>
+        <div class="field">
+          <label class="label">
+            {{ archive_form.remove_codebase }}
+            {{ archive_form.remove_codebase.label }}
+          </label>
+        </div>
+        <div class="field">
+          <label class="label">
+            {{ archive_form.remove_output }}
+            {{ archive_form.remove_output.label }}
+          </label>
+        </div>
+        <hr>
+        <div class="field">
+          <label class="checkbox" for="{{ archive_form.select_across.id_for_label }}">
+            <input type="checkbox" name="{{ archive_form.select_across.name }}" id="{{ archive_form.select_across.id_for_label }}">
+            Include all {{ paginator.count|intcomma }} projects
+          </label>
+          <p class="help">{{ outputs_download_form.select_across.help_text }}</p>
+        </div>
       </section>
+      <input type="hidden" name="{{ archive_form.url_query.name }}" value="{{ request.GET.urlencode }}">
       <input type="hidden" name="action" value="archive">
       <footer class="modal-card-foot is-flex is-justify-content-space-between">
         <button class="button has-text-weight-semibold" type="reset">No, Cancel</button>

scanpipe/templates/scanpipe/modals/projects_delete_modal.html

@@ -1,3 +1,4 @@
+{% load humanize %}
 <div class="modal" id="modal-projects-delete">
   <div class="modal-background"></div>
   <div class="modal-card">
@@ -21,6 +22,7 @@
       </p>
     </section>
     <form action="{% url 'project_action' %}" method="post" id="delete-projects-form">{% csrf_token %}
+      <input type="hidden" name="{{ action_form.url_query.name }}" value="{{ request.GET.urlencode }}">
       <input type="hidden" name="action" value="delete">
       <footer class="modal-card-foot is-flex is-justify-content-space-between">
         <button class="button has-text-weight-semibold" type="reset">No, Cancel</button>

scanpipe/templates/scanpipe/modals/projects_download_modal.html

@@ -1,3 +1,4 @@
+{% load humanize %}
 <div class="modal" id="modal-projects-download">
   <div class="modal-background"></div>
   <div class="modal-card">
@@ -7,10 +8,22 @@
     </header>
     <form action="{% url 'project_action' %}" method="post" id="download-projects-form">{% csrf_token %}
       <section class="modal-card-body">
-        <ul class="mb-3">
-          {{ outputs_download_form.as_ul }}
-        </ul>
+        <div class="field">
+          <label class="label">{{ outputs_download_form.output_format.label }}</label>
+          <div class="control">
+            {{ outputs_download_form.output_format }}
+          </div>
+        </div>
+        <hr>
+        <div class="field">
+          <label class="checkbox" for="{{ outputs_download_form.select_across.id_for_label }}">
+            <input type="checkbox" name="{{ outputs_download_form.select_across.name }}" id="{{ outputs_download_form.select_across.id_for_label }}">
+            Include all {{ paginator.count|intcomma }} projects
+          </label>
+          <p class="help">{{ outputs_download_form.select_across.help_text }}</p>
+        </div>
       </section>
+      <input type="hidden" name="{{ outputs_download_form.url_query.name }}" value="{{ request.GET.urlencode }}">
       <input type="hidden" name="action" value="download">
       <footer class="modal-card-foot is-flex is-justify-content-space-between">
         <button class="button has-text-weight-semibold" type="reset">Cancel</button>

scanpipe/templates/scanpipe/modals/projects_report_modal.html

@@ -1,3 +1,4 @@
+{% load humanize %}
 <div class="modal" id="modal-projects-report">
   <div class="modal-background"></div>
   <div class="modal-card">
@@ -7,10 +8,22 @@
     </header>
     <form action="{% url 'project_action' %}" method="post" id="report-projects-form">{% csrf_token %}
       <section class="modal-card-body">
-        <ul class="mb-3">
-          {{ report_form.as_ul }}
-        </ul>
+        <div class="field">
+          <label class="label">{{ report_form.model_name.label }}</label>
+          <div class="control">
+            {{ report_form.model_name }}
+          </div>
+        </div>
+        <hr>
+        <div class="field">
+          <label class="checkbox" for="{{ report_form.select_across.id_for_label }}">
+            <input type="checkbox" name="{{ report_form.select_across.name }}" id="{{ report_form.select_across.id_for_label }}">
+            Include all {{ paginator.count|intcomma }} projects
+          </label>
+          <p class="help">{{ report_form.select_across.help_text }}</p>
+        </div>
       </section>
+      <input type="hidden" name="{{ report_form.url_query.name }}" value="{{ request.GET.urlencode }}">
       <input type="hidden" name="action" value="report">
       <footer class="modal-card-foot is-flex is-justify-content-space-between">
         <button class="button has-text-weight-semibold" type="reset">Cancel</button>

scanpipe/templates/scanpipe/modals/projects_reset_modal.html

@@ -1,3 +1,4 @@
+{% load humanize %}
 <div class="modal" id="modal-projects-reset">
   <div class="modal-background"></div>
   <div class="modal-card">
@@ -17,6 +18,7 @@
       </p>
     </section>
     <form action="{% url 'project_action' %}" method="post" id="reset-projects-form">{% csrf_token %}
+      <input type="hidden" name="{{ action_form.url_query.name }}" value="{{ request.GET.urlencode }}">
       <input type="hidden" name="action" value="reset">
       <footer class="modal-card-foot is-flex is-justify-content-space-between">
         <button class="button has-text-weight-semibold" type="reset">No, Cancel</button>

scanpipe/templates/scanpipe/panels/project_inputs.html

@@ -42,9 +42,11 @@
         {% if project.can_change_inputs and input_source.uuid %}
           <a class="modal-button is-grey-link is-clickable ml-1" data-target="modal-inputs-delete" aria-haspopup="true" data-url="{% url 'project_delete_input' project.slug input_source.uuid %}" data-filename="{{ input_source.filename }}" href="#"><i class="fa-regular fa-trash-can"></i></a>
         {% endif %}
-        <a class="modal-button is-grey-link is-clickable ml-1" data-input-source-uuid="{{ input_source.uuid }}" data-tag-value="{{ input_source.tag }}" data-target="edit-input-tag-modal" aria-haspopup="true">
-          <span class="icon width-1 height-1"><i class="fa-solid fa-tag"></i></span>
-        </a>
+        {% if input_source.uuid %}{# File added in directory manually, no InputSource object available #}
+          <a class="modal-button is-grey-link is-clickable ml-1" data-input-source-uuid="{{ input_source.uuid }}" data-tag-value="{{ input_source.tag }}" data-target="edit-input-tag-modal" aria-haspopup="true">
+            <span class="icon width-1 height-1"><i class="fa-solid fa-tag"></i></span>
+          </a>
+        {% endif %}
       </div>
     </div>
   {% endfor %}

scanpipe/tests/test_views.py

@@ -187,10 +187,6 @@ def test_scanpipe_views_project_actions_view(self):
         self.assertRedirects(response, reverse("project_list"))
         expected = '<div class="message-body">1 projects have been delete.</div>'
         self.assertContains(response, expected, html=True)
-        expected = (
-            f'<div class="message-body">Project {random_uuid} does not exist.</div>'
-        )
-        self.assertContains(response, expected, html=True)
 
     def test_scanpipe_views_project_action_report_view(self):
         url = reverse("project_action")