Refine the consistency of Product import actions #241

Signed-off-by: tdruez <[email protected]>

Author: tdruez

dje/templates/includes/form_errors_alert.html

@@ -1,6 +1,5 @@
 {% if form.errors %}
-  <div class="alert alert-danger alert-dismissible" role="alert">
-    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+  <div class="alert alert-danger" role="alert">
     <p class="m-0">Please correct the error{{ form.errors|pluralize }} below.</p>
   </div>
 {% endif %}

product_portfolio/forms.py

@@ -600,7 +600,6 @@ def save(self, product):
 
 class BaseProductImportFormView(forms.Form):
     project_type = None
-    input_label = ""
 
     input_file = SmartFileField(
         label=_("file or zip archive"),
@@ -629,10 +628,6 @@ class BaseProductImportFormView(forms.Form):
         ),
     )
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.fields["input_file"].label = _(f"{self.input_label} file or zip archive")
-
     @property
     def helper(self):
         helper = FormHelper()
@@ -664,15 +659,24 @@ def submit(self, product, user):
 
 class LoadSBOMsForm(BaseProductImportFormView):
     project_type = ScanCodeProject.ProjectType.LOAD_SBOMS
-    input_label = "SBOM"
     pipeline_name = "load_sbom"
 
+    input_file = SmartFileField(
+        label=_("SBOM file or zip archive"),
+        extensions=["json", "ABOUT", "zip"],
+        required=True,
+    )
+
 
 class ImportManifestsForm(BaseProductImportFormView):
     project_type = ScanCodeProject.ProjectType.IMPORT_FROM_MANIFEST
-    input_label = "Manifest"
     pipeline_name = "resolve_dependencies"
 
+    input_file = SmartFileField(
+        label=_("Manifest file or zip archive"),
+        required=True,
+    )
+
 
 class StrongTextWidget(forms.Widget):
     def render(self, name, value, attrs=None, renderer=None):

product_portfolio/migrations/0012_alter_scancodeproject_type.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.6 on 2025-02-20 21:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('product_portfolio', '0011_alter_product_owner'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='scancodeproject',
+            name='type',
+            field=models.CharField(choices=[('IMPORT_FROM_MANIFEST', 'Import Package manifests'), ('LOAD_SBOMS', 'Import SBOM'), ('PULL_FROM_SCANCODEIO', 'Import ScanCode.io project'), ('IMPROVE_FROM_PURLDB', 'Improve from PurlDB')], db_index=True, help_text='The type of import, for the ProjectType choices.', max_length=50),
+        ),
+    ]

product_portfolio/models.py

@@ -1460,9 +1460,9 @@ class ScanCodeProject(HistoryFieldsMixin, DataspacedModel):
     """Wrap a ScanCode.io Project."""
 
     class ProjectType(models.TextChoices):
-        IMPORT_FROM_MANIFEST = "IMPORT_FROM_MANIFEST", _("Import from Manifest")
-        LOAD_SBOMS = "LOAD_SBOMS", _("Load SBOMs")
-        PULL_FROM_SCANCODEIO = "PULL_FROM_SCANCODEIO", _("Pull from ScanCode.io")
+        IMPORT_FROM_MANIFEST = "IMPORT_FROM_MANIFEST", _("Import Package manifests")
+        LOAD_SBOMS = "LOAD_SBOMS", _("Import SBOM")
+        PULL_FROM_SCANCODEIO = "PULL_FROM_SCANCODEIO", _("Import ScanCode.io project")
         IMPROVE_FROM_PURLDB = "IMPROVE_FROM_PURLDB", _("Improve from PurlDB")
 
     class Status(models.TextChoices):

product_portfolio/templates/product_portfolio/import_manifests_form.html

@@ -60,7 +60,7 @@ <h1 class="header-title">
 
   <div class="row">
     <div class="col-8">
-      {{ form.errors }}
+      {% include 'includes/form_errors_alert.html' %}
       {% crispy form %}
     </div>
   </div>

product_portfolio/templates/product_portfolio/load_sboms_form.html

@@ -62,7 +62,7 @@ <h1 class="header-title">
 
   <div class="row">
     <div class="col-8">
-      {{ form.errors }}
+      {% include 'includes/form_errors_alert.html' %}
       {% crispy form %}
     </div>
   </div>

product_portfolio/templates/product_portfolio/product_details.html

@@ -38,12 +38,12 @@
           <div class="dropdown-header">Import</div>
           {% if has_change_permission %}
             {% if request.user.dataspace.enable_package_scanning %}
-              <a class="dropdown-item" href="{{ object.get_load_sboms_url }}"><i class="fas fa-file-upload"></i> {% trans 'Import SBOM' %}</a>
-              <a class="dropdown-item" href="{{ object.get_import_manifests_url }}"><i class="fas fa-file-upload"></i> {% trans 'Import Package manifests' %}</a>
+              <a class="dropdown-item" href="{{ object.get_load_sboms_url }}"><i class="fas fa-file-upload"></i> Import <strong>SBOM</strong></a>
+              <a class="dropdown-item" href="{{ object.get_import_manifests_url }}"><i class="fas fa-file-upload"></i> Import Package <strong>manifests</strong></a>
             {% endif %}
-            <a class="dropdown-item" href="{{ object.get_import_from_scan_url }}"><i class="fas fa-file-upload"></i> {% trans 'Import ScanCode scan results' %}</a>
+            <a class="dropdown-item" href="{{ object.get_import_from_scan_url }}"><i class="fas fa-file-upload"></i> Import ScanCode <strong>scan results</strong></a>
             {% if pull_project_data_form %}
-              <a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#pull-project-data-modal"><i class="fas fa-file-upload"></i> {% trans 'Import ScanCode.io project' %}</a>
+              <a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#pull-project-data-modal"><i class="fas fa-file-upload"></i> Import ScanCode.io <strong>project</strong></a>
             {% endif %}
           {% endif %}
           {% if has_scan_all_packages %}

product_portfolio/templates/product_portfolio/scancodeio_project_status.html

@@ -43,7 +43,7 @@ <h5>{{ values|length }} {{ object_type }} updated/existing:</h5>
   <ul class="list-unstyled mb-1">
     <li><strong>Pipeline name:</strong> {{ run.pipeline_name }}</li>
     <li>
-      <strong>Status:</strong>
+      <strong>Pipeline status:</strong>
         <span class="badge
           {% if run.status == 'success' %}
             text-bg-success