Update Network types locales + add help text on form

app/decorators/modele_decorator.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class ModeleDecorator < ApplicationDecorator
+  def network_types_to_human
+    return Modele.human_attribute_name("network_types.blank") unless (n_t = network_types.presence)
+
+    n_t.map { |type| Modele.human_attribute_name("network_types.#{type}") }.join(", ")
+  end
+end

app/decorators/server_decorator.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class ServerDecorator < ApplicationDecorator
+  def network_types_to_human
+    return Modele.human_attribute_name("network_types.blank") unless (n_t = network_types.presence)
+
+    n_t.map { |type| Modele.human_attribute_name("network_types.#{type}") }.join(", ")
+  end
+end

app/views/modeles/_form.html.erb

@@ -56,7 +56,16 @@
       <%= f.select :network_types,
                   Modele::Network::TYPES.map { |type| [Modele.human_attribute_name("network_types.#{type}"), type] },
                   { prompt: true, include_blank: true },
-                  { class: "form-select", data: { controller: "select" }, multiple: true } %>
+                  {
+                    class: "form-select",
+                    data: { controller: "select" },
+                    multiple: true,
+                    placeholder: Modele.human_attribute_name("network_types.blank")
+                  }
+      %>
+      <div id="networkTypesHelp" class="form-text fst-italic">
+        <%= Modele.human_attribute_name("network_types.help") %>
+      </div>
     </fieldset>
 
     <fieldset data-controller="nested-form" class="col-12 mt-4">

app/views/modeles/index.html.erb

@@ -93,7 +93,7 @@
             <% end %>
 
             <% table.with_column(Modele.human_attribute_name(:network_types)) do |modele| %>
-              <%= modele.network_types.map { |type| Modele.human_attribute_name("network_types.#{type}") }.join(", ") %>
+              <%= modele.decorated.network_types_to_human %>
             <% end %>
 
             <% table.with_column(style: "min-width: 70px; width: 70px") do |modele| %>

app/views/modeles/show.html.erb

@@ -16,10 +16,8 @@
           <dd class="mb-0 pb-2 ps-3"><%= @modele.public_send(attribute_name) %></dd>
         <% end %>
 
-        <dt class="pb-2"><%= Modele.human_attribute_name(:network_types) %> :</dt>
-        <dd class="mb-0 pb-2 ps-3">
-          <%= @modele.network_types.map { |type| Modele.human_attribute_name("network_types.#{type}") }.join(", ") %>
-        </dd>
+        <dt class="pb-2"><%= Modele.human_attribute_name(:network_types) %></dt>
+        <dd class="mb-0 pb-2 ps-3"><%= @modele.decorated.network_types_to_human %></dd>
       </dl>
     <% end %>
   </div>

app/views/servers/_form.html.erb

@@ -68,7 +68,16 @@
         <%= f.select :network_types,
                      Modele::Network::TYPES.map { |type| [Modele.human_attribute_name("network_types.#{type}"), type] },
                      { prompt: true, include_blank: true },
-                     { class: "form-select", data: { controller: "select" }, multiple: true } %>
+                     {
+                       class: "form-select",
+                       data: { controller: "select" },
+                       multiple: true,
+                       placeholder: Modele.human_attribute_name("network_types.blank")
+                     }
+        %>
+        <div id="networkTypesHelp" class="form-text fst-italic">
+          <%= Modele.human_attribute_name("network_types.help") %>
+        </div>
       </fieldset>
 
       <fieldset class="col-md-6 col-12 mt-4 align-self-center">

app/views/servers/index.html.erb

@@ -152,7 +152,7 @@
       <% end %>
 
       <% table.with_column(Server.human_attribute_name(:network_types)) do |server| %>
-        <%= server.network_types.map { |type| Modele.human_attribute_name("network_types.#{type}") }.join(", ") %>
+        <%= server.decorated.network_types_to_human %>
       <% end %>
 
       <% table.with_column(style: "min-width: 100px; width: 100px") do |server| %>

app/views/servers/show.html.erb

@@ -199,9 +199,7 @@
           </dd>
 
           <dt class="pb-2"><%= Server.human_attribute_name(:network_types) %></dt>
-          <dd class="mb-0 pb-2 ps-3">
-            <%= @server.network_types.map { |type| Modele.human_attribute_name("network_types.#{type}") }.join(", ") %>
-          </dd>
+          <dd class="mb-0 pb-2 ps-3"><%= @server.decorated.network_types_to_human %></dd>
         </dl>
       <% end %>
     </div>

config/locales/activerecord.fr.yml

@@ -96,7 +96,7 @@ fr:
         modele_id: Modèle
         critique: Critique
         gestion_id: Gestionnaire
-        network_types: Type de visualisation
+        network_types: Composant réseau
         stack: Stack
         stack_id: Stack
         comment: Commentaire
@@ -236,12 +236,13 @@ fr:
         manufacturer_id: Constructeur
         nb_elts: Nb d'éléments
         color: Couleur
-        network_types: Type de visualisation
+        network_types: Composant réseau
       modele/network_types:
-        gbe: Composant Réseau Gb
-        10gbe: Composant Réseau 10 Gb
-        fiber: Composant Réseau Fibre
-        blank: Pas de
+        gbe: Backbone Gbps
+        10gbe: Backbone 10Gbps
+        fiber: Backbone Fibre
+        blank: Non (par défaut)
+        help: Représentation ou non sur les dashboard d'infrastructure réseau
         short_gbe: Gb
         short_10gbe: 10 Gb
         short_fiber: Fibre

spec/decorators/modele_decorator_spec.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+RSpec.describe ModeleDecorator, type: :decorator do
+  let(:modele) { modeles(:one) }
+  let(:decorated_modele) { modele.decorated }
+
+  describe "#network_types_to_human" do
+    subject(:network_types_sentence) { decorated_modele.network_types_to_human }
+
+    context "when modele has no network type" do
+      it { is_expected.to eq("Non (par défaut)") }
+    end
+
+    context "when modele has one network type" do
+      before { modele.network_types = %w[gbe] }
+
+      it { is_expected.to eq("Backbone Gbps") }
+    end
+
+    context "when modele has many network types" do
+      before { modele.network_types = %w[10gbe fiber] }
+
+      it { is_expected.to eq("Backbone 10Gbps, Backbone Fibre") }
+    end
+  end
+end

spec/decorators/server_decorator_spec.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+RSpec.describe ServerDecorator, type: :decorator do
+  let(:server) { servers(:one) }
+  let(:decorated_server) { server.decorated }
+
+  describe "#network_types_to_human" do
+    subject(:network_types_sentence) { decorated_server.network_types_to_human }
+
+    context "when server has no network type" do
+      it { is_expected.to eq("Non (par défaut)") }
+    end
+
+    context "when server has one network type" do
+      before { server.network_types = %w[gbe] }
+
+      it { is_expected.to eq("Backbone Gbps") }
+    end
+
+    context "when server has many network types" do
+      before { server.network_types = %w[10gbe fiber] }
+
+      it { is_expected.to eq("Backbone 10Gbps, Backbone Fibre") }
+    end
+  end
+end