Validation NeTEx: support des warnings

Author: ptitfred

apps/transport/client/stylesheets/components/_validation.scss

@@ -163,15 +163,18 @@ details > code {
   }
 
   table.netex_generic_issue {
-    th, td {
-      &:nth-child(1) {
-        width: 60%;
-      }
-      &:nth-child(3) {
-        width: 10%;
-      }
+    col.level {
+      width: 5%;
+    }
+    col.message {
+      width: 60%;
+    }
+    col.line {
+      width: 10%;
+    }
+    td.line {
+      text-align: right;
     }
-
     tr.debug {
       &:hover {
         background: revert;
@@ -303,6 +306,10 @@ details > code {
   button[popovertarget="french-profile-rules"] {
     margin-left: 0.5em;
   }
+
+  .text-error { color: var(--red); }
+  .text-warning { color: var(--orange); }
+  .text-info { color: var(--dark-blue); }
 }
 
 blockquote {

apps/transport/lib/transport_web/controllers/resource_controller.ex

@@ -195,7 +195,7 @@ defmodule TransportWeb.ResourceController do
   defp render_netex_details(conn, params, resource, validation) do
     config = make_pagination_config(params, @netex_issues_page_size)
 
-    {results_adapter, validation_details, issues, errors_template, max_severity, xsd_errors} =
+    {results_adapter, validation_details, issues, errors_template, max_severity, xsd_errors, category_severity_counts} =
       build_netex_validation_details(validation, params, config)
 
     {filter, pagination} = issues
@@ -215,6 +215,7 @@ defmodule TransportWeb.ResourceController do
     |> assign(:results_adapter, results_adapter)
     |> assign(:max_severity, max_severity)
     |> assign(:data_vis, nil)
+    |> assign(:category_severity_counts, category_severity_counts)
     |> render("netex_details.html")
   end
 
@@ -244,7 +245,7 @@ defmodule TransportWeb.ResourceController do
   end
 
   defp build_netex_validation_details(nil, _params, _pagination_config),
-    do: {nil, {nil, nil, nil, []}, {%{}, {0, []}}, nil, nil, []}
+    do: {nil, {nil, nil, nil, []}, {%{}, {0, []}}, nil, nil, [], %{}}
 
   defp build_netex_validation_details(
          %{
@@ -257,16 +258,17 @@ defmodule TransportWeb.ResourceController do
          pagination_config
        ) do
     results_adapter = Transport.Validators.NeTEx.ResultsAdapter.resolve(version)
-    summary = digest["summary"]
+    summary = results_adapter.summary_from_binary(binary_result)
     stats = digest["stats"]
     errors_template = pick_netex_errors_template(version)
     max_severity = digest["max_severity"]
 
     issues = results_adapter.get_issues(binary_result, params, pagination_config)
     xsd_errors = results_adapter.summarize_xsd_errors(binary_result)
+    category_severity_counts = results_adapter.count_by_category_and_severity(binary_result)
 
     {results_adapter, {summary, stats, metadata.metadata, metadata.modes}, issues, errors_template, max_severity,
-     xsd_errors}
+     xsd_errors, category_severity_counts}
   end
 
   defp pick_netex_errors_template("0.2.2"), do: "_netex_validation_errors_v0_2_x.html"

apps/transport/lib/transport_web/controllers/validation_controller.ex

@@ -198,15 +198,20 @@ defmodule TransportWeb.ValidationController do
 
         xsd_errors = results_adapter.summarize_xsd_errors(validation.binary_result)
 
+        category_severity_counts =
+          results_adapter.count_by_category_and_severity(validation.binary_result)
+
         conn
         |> assign_base_validation_details(params)
         |> assign(:filter, filter)
         |> assign(:issues, TransportWeb.ResourceController.paginate_netex_results(pagination, config))
         |> assign(:results_adapter, results_adapter)
         |> assign(:metadata, validation.metadata.metadata)
         |> assign(:max_severity, validation.digest["max_severity"])
-        |> assign(:validation_summary, validation.digest["summary"])
+        |> assign(:validation_summary, results_adapter.summary_from_binary(validation.binary_result))
         |> assign(:severities_count, validation.digest["stats"])
+        |> assign(:category_severity_counts, category_severity_counts)
+        |> assign(:pagination, pagination)
         |> assign(:validation_report_url, validation_report_url)
         |> assign(:xsd_errors, xsd_errors)
         |> render(template)

apps/transport/lib/transport_web/templates/resource/_netex_generic_issue.html.heex

@@ -1 +1 @@
-<.netex_generic_issues issues={@issues} />
+<.netex_generic_issues issues={@issues} severities_count={@severities_count || %{}} results_adapter={@results_adapter} />

apps/transport/lib/transport_web/templates/resource/_netex_validation_errors_v0_1_0.html.heex

@@ -13,12 +13,20 @@
     )}
   </nav>
   <% issue_type = @results_adapter.issue_type(@issues.entries) %>
+  <% current_category = Map.get(@filter, "issues_category") || "base-rules" %>
+  <% all_counts = @category_severity_counts || Map.new() %>
+  <% category_counts = Map.get(all_counts, current_category, Map.new()) %>
   <div class="main-pane">
     {pagination_links(@conn, @issues, [@resource.id],
       issue_type: issue_type,
       path: &resource_path/4,
       action: :details
     )}
-    {render(netex_template(), issues: @issues || [], conn: @conn)}
+    {render(netex_template(),
+      issues: @issues || [],
+      severities_count: category_counts,
+      results_adapter: @results_adapter,
+      conn: @conn
+    )}
   </div>
 <% end %>

apps/transport/lib/transport_web/templates/resource/_netex_validation_errors_v0_2_x.html.heex

@@ -10,6 +10,8 @@
 <.netex_validation_report_content
   conn={@conn}
   current_category={current_category}
+  severities_count={@severities_count}
+  category_severity_counts={@category_severity_counts || %{}}
   xsd_errors={@xsd_errors}
   issues={@issues}
   results_adapter={@results_adapter}

apps/transport/lib/transport_web/templates/resource/netex_details.html.heex

@@ -59,7 +59,8 @@
           max_severity: @max_severity,
           filter: @filter,
           validation_report_url: @validation_report_url,
-          xsd_errors: @xsd_errors
+          xsd_errors: @xsd_errors,
+          category_severity_counts: @category_severity_counts
         )}
         <div class="issues-footer">
           <%= unless is_nil(@metadata) or @metadata == %{} do %>

apps/transport/lib/transport_web/templates/validation/show_netex_v0_1_0.html.heex

@@ -48,7 +48,12 @@
                 action: :show
               ) %>
             {pagination}
-            {render(netex_template(), issues: @issues || [], conn: @conn)}
+            {render(netex_template(),
+              issues: @issues || [],
+              severities_count: @severities_count || %{},
+              results_adapter: @results_adapter,
+              conn: @conn
+            )}
             <div class="pt-24">{pagination}</div>
           <% else %>
             <h2>{dgettext("validations", "Nice work, there are no issues!")}</h2>

apps/transport/lib/transport_web/templates/validation/show_netex_v0_2_x.html.heex

@@ -31,6 +31,8 @@
         xsd_errors={@xsd_errors}
         issues={@issues}
         results_adapter={@results_adapter}
+        severities_count={@severities_count}
+        category_severity_counts={@category_severity_counts}
         validation_report_url={@validation_report_url}
         validation_summary={@validation_summary}
         pagination={netex_pagination_links(@conn, @issues, @validation_id, current_category)}

apps/transport/lib/transport_web/views/netex_report_components.ex

@@ -13,22 +13,39 @@ defmodule TransportWeb.NeTExReportComponents do
 
   def to_netex_validation_report(url), do: url <> "#validation-report"
 
-  def netex_generic_issues(%{issues: _} = assigns) do
+  def netex_generic_issues(%{issues: _, severities_count: _, results_adapter: _} = assigns) do
+    filtered_severities =
+      Map.get(assigns, :severities_count, %{})
+      |> Enum.filter(fn {_k, v} -> is_integer(v) and v > 0 end)
+
+    assigns = assign(assigns, :filtered_severities, filtered_severities)
+
     ~H"""
+    <ul :if={Enum.any?(@filtered_severities)}>
+      <li :for={{severity, count} <- @filtered_severities}>
+        {@results_adapter.format_severity(severity, count)}
+      </li>
+    </ul>
     <table class="table netex_generic_issue">
+      <colgroup>
+        <col class="message" />
+        <col class="file" />
+        <col class="line" />
+      </colgroup>
+
       <tr>
         <th>{dgettext("validations-explanations", "Message")}</th>
         <th>{dgettext("validations-explanations", "File")}</th>
         <th>{dgettext("validations-explanations", "Line")}</th>
       </tr>
 
       <tr :for={issue <- @issues} class="message">
-        <td lang="en">{issue["message"]}</td>
+        <td><.validity_icon criticity={issue["criticity"]} /> <span lang="en">{issue["message"]}</span></td>
         <%= if is_nil(issue["resource"]) or is_nil(issue["resource"]["filename"]) or is_nil(issue["resource"]["line"]) do %>
           <td colspan="2">{dgettext("validations-explanations", "Unknown location")}</td>
         <% else %>
           <td>{issue["resource"]["filename"]}</td>
-          <td>{issue["resource"]["line"]}</td>
+          <td class="line">{issue["resource"]["line"]}</td>
         <% end %>
       </tr>
     </table>
@@ -76,6 +93,8 @@ defmodule TransportWeb.NeTExReportComponents do
           current_category: _,
           issues: _,
           results_adapter: _,
+          severities_count: _,
+          category_severity_counts: _,
           validation_report_url: _,
           validation_summary: _,
           xsd_errors: _,
@@ -102,6 +121,8 @@ defmodule TransportWeb.NeTExReportComponents do
       conn={@conn}
       compliance_check={compliance_check}
       current_category={@current_category}
+      severities_count={@severities_count}
+      category_severity_counts={@category_severity_counts}
       errors={errors}
       validation_report_url={@validation_report_url}
       pagination={@pagination}
@@ -138,6 +159,8 @@ defmodule TransportWeb.NeTExReportComponents do
            conn: _,
            compliance_check: _,
            current_category: _,
+           severities_count: _,
+           category_severity_counts: _,
            errors: _,
            validation_report_url: _,
            pagination: _,
@@ -180,7 +203,11 @@ defmodule TransportWeb.NeTExReportComponents do
           </table>
         <% else %>
           <.non_translated_messages locale={locale} />
-          <.netex_generic_issues issues={@errors} />
+          <.netex_generic_issues
+            issues={@errors}
+            severities_count={Map.get(@category_severity_counts, @current_category, %{})}
+            results_adapter={@results_adapter}
+          />
           {@pagination}
         <% end %>
       </div>
@@ -329,17 +356,11 @@ defmodule TransportWeb.NeTExReportComponents do
     ~H"""
     <.colorful_link
       href={netex_link_to_category(@conn, @category)}
-      variant={
-        if @stats["count"] == 0 do
-          :valid
-        else
-          :error
-        end
-      }
+      variant={severity_variant(@stats["criticity"])}
       selected={@current_category == @category}
     >
       <:icon>
-        <.validity_icon errors={@stats["count"]} />
+        <.validity_icon criticity={@stats["criticity"]} />
       </:icon>
       <:label>
         <span class="category">
@@ -404,9 +425,21 @@ defmodule TransportWeb.NeTExReportComponents do
     """
   end
 
-  defp validity_icon(%{errors: errors} = assigns) when errors > 0 do
+  defp validity_icon(%{criticity: criticity} = assigns) when criticity == "error" do
+    ~H"""
+    <i class="fa fa-xmark fa-lg text-error"></i>
+    """
+  end
+
+  defp validity_icon(%{criticity: criticity} = assigns) when criticity == "warning" do
+    ~H"""
+    <i class="fa fa-triangle-exclamation fa-lg text-warning"></i>
+    """
+  end
+
+  defp validity_icon(%{criticity: criticity} = assigns) when criticity == "information" do
     ~H"""
-    <i class="fa fa-xmark fa-lg"></i>
+    <i class="fa fa-circle-info fa-lg text-info"></i>
     """
   end
 
@@ -422,6 +455,11 @@ defmodule TransportWeb.NeTExReportComponents do
     """
   end
 
+  defp severity_variant("error"), do: :error
+  defp severity_variant("warning"), do: :warning
+  defp severity_variant("information"), do: :information
+  defp severity_variant(_), do: nil
+
   defp netex_category_label("xsd-schema"), do: dgettext("validations", "XSD")
   defp netex_category_label("french-profile"), do: dgettext("validations", "French profile")
   defp netex_category_label("base-rules"), do: dgettext("validations", "Base rules")