308778 - Rename Composant model

app/controllers/frames_controller.rb

@@ -121,7 +121,7 @@ def frame_params
   end
 
   def set_frame
-    @frame = Frame.all.includes(servers: [modele: [:category, :composants],
+    @frame = Frame.all.includes(servers: [modele: [:category, :components],
                                           cards: [:composant,
                                                   ports: [connection: [cable: :connections]],
                                                   card_type: [:port_type],]],

app/controllers/modeles_controller.rb

@@ -17,11 +17,11 @@ def show
 
   def new
     @modele = Modele.new
-    @modele.composants.build(:name => 'ALIM', type_composant_id: 4)
-    @modele.composants.build(:name => 'IPMI', type_composant_id: 4)
-    @modele.composants.build(:name => 'CM', type_composant_id: 4)
+    @modele.components.build(:name => 'ALIM', type_composant_id: 4)
+    @modele.components.build(:name => 'IPMI', type_composant_id: 4)
+    @modele.components.build(:name => 'CM', type_composant_id: 4)
     7.times do |i|
-      @modele.composants.build(:name => "SL#{i + 1}", type_composant_id: 4)
+      @modele.components.build(:name => "SL#{i + 1}", type_composant_id: 4)
     end
   end
 
@@ -84,7 +84,7 @@ def modele_params
       network_types: [],
       enclosures_attributes: [
         :id, :modele_id, :_destroy, :position, :display, :grid_areas,
-        composants_attributes: [:type_composant_id, :enclosure_id, :name, :position, :_destroy, :id],
+        components_attributes: [:type_composant_id, :enclosure_id, :name, :position, :_destroy, :id],
       ]
     )
   end

app/models/card.rb

@@ -17,7 +17,7 @@ class Card < ApplicationRecord
   delegate :is_power_input?, to: :card_type, allow_nil: true
 
   belongs_to :server
-  belongs_to :composant
+  belongs_to :composant, class_name: "EnclosureComponent"
   delegate :frame, to: :server # TODO: replace by has_one?
 
   has_many :ports

app/models/enclosure.rb

@@ -5,9 +5,9 @@ class Enclosure < ApplicationRecord
   acts_as_list scope: [:modele_id]
 
   belongs_to :modele
-  has_many :composants, -> { order(position: :asc) }
+  has_many :components, -> { order(position: :asc) }, class_name: "EnclosureComponent"
 
-  accepts_nested_attributes_for :composants,
+  accepts_nested_attributes_for :components,
                                 :allow_destroy => true,
                                 :reject_if     => :all_blank
 end

app/models/composant.rb → app/models/enclosure_component.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Composant < ApplicationRecord
+class EnclosureComponent < ApplicationRecord
   include PublicActivity::Model
   tracked owner: ->(controller, model) { controller && controller.current_user }
   tracked :parameters => {
@@ -15,7 +15,7 @@ class Composant < ApplicationRecord
 
   has_many :cards
 
-  scope :slots, -> { where(type_composant: TypeComposant.find_by_name('SLOT')).order("composants.position ASC") }
+  scope :slots, -> { where(type_composant: TypeComposant.find_by_name('SLOT')).order("enclosure_components.position ASC") }
 
   def to_s
     name.to_s

app/models/frame.rb

@@ -138,7 +138,7 @@ def init_pdus
                                      side: Pdu.calculated_side(frame, line_name),
                                      color: line_name == 'A' ? 'J' : 'B')
       puts "ERROR: #{pdu}" unless pdu.valid?
-      enclosure.composants.each do |composant|
+      enclosure.components.each do |composant|
         card = Card.find_or_create_by(card_type: card_type,
                            server: pdu,
                            composant: composant)

app/models/modele.rb

@@ -16,7 +16,7 @@ class Modele < ApplicationRecord
 
   has_many :servers, dependent: :restrict_with_error
   has_many :enclosures, dependent: :restrict_with_error
-  has_many :composants, through: :enclosures
+  has_many :components, through: :enclosures
 
   belongs_to :manufacturer, counter_cache: true
   belongs_to :architecture, counter_cache: true

app/models/type_composant.rb

@@ -5,5 +5,5 @@ class TypeComposant < ApplicationRecord
   tracked owner: ->(controller, model) { controller && controller.current_user }
   has_changelog
 
-  has_many :composants
+  has_many :components, class_name: "EnclosureComponent"
 end

app/queries/frames/including_servers_query.rb

@@ -7,7 +7,7 @@ def self.call(relation = Frame.all, order = nil)
                                       bay: [:frames],
                                       servers: [
                                         :frame, :gestion, :cluster,
-                                        modele: [:category, :composants],
+                                        modele: [:category, :components],
                                         cards: [
                                           :composant,
                                           ports: [:cable, connection: :cable],

app/views/islets/_network_capacity.html.erb

@@ -12,7 +12,7 @@
                     grid-row: <%= "#{bay.lane.to_i}/#{bay.lane.to_i+1}" %>;">
                     <% frames.each_with_index do |frame, index| %>
                       <% # TODO: move in the action or a model method %>
-                      <% servers = frame.servers.includes(:bay, :stack, modele: { enclosures: :composants },
+                      <% servers = frame.servers.includes(:bay, :stack, modele: { enclosures: :components },
                                                                         cards:  [{ card_type: :port_type }, { ports: :cable }])
                               .where("servers.network_types @> ?", "{#{network}}") # Switch LAN
                       %>
@@ -40,7 +40,7 @@
                                 <% if server.modele.present? %>
                                   <% server.modele.enclosures.each do |enclosure| %>
                                     <% cards = server.cards %>
-                                    <% components_per_enclosure = enclosure.composants.reject { |c| c.name&.downcase == "alim" } %>
+                                    <% components_per_enclosure = enclosure.components.reject { |c| c.name&.downcase == "alim" } %>
                                     <% if enclosure.display != 'horizontal' %>
                                       <table>
                                         <tr>

app/views/modeles/_enclosure_fields.html.erb

@@ -13,12 +13,12 @@
       </span>
     </div>
 
-    <% child_index = "__#{Digest::MD5.hexdigest("Enclosure_composants")}_NEW_RECORD__" %>
+    <% child_index = "__#{Digest::MD5.hexdigest("Enclosure_components")}_NEW_RECORD__" %>
     <div data-controller="nested-form" data-nested-form-child-index-name-value="<%= child_index %>">
       <template data-nested-form-target="template">
-        <%= f.fields_for :composants, f.object.composants.slots.klass.new,
+        <%= f.fields_for :components, f.object.components.slots.klass.new,
                                       child_index: child_index do |composant_fields| %>
-          <%= render partial: "composant_fields", locals: { f: composant_fields, type_composant: "SLOT" } %>
+          <%= render partial: "component_fields", locals: { f: composant_fields, type_composant: "SLOT" } %>
         <% end %>
       </template>
 
@@ -38,8 +38,8 @@
               <%= f.text_area :grid_areas, class: "font-monospace form-control", style: "height:110px;" %>
             </fieldset>
           </li>
-          <%= f.fields_for :composants, f.object.composants.slots do |composant_fields| %>
-            <%= render partial: "composant_fields", locals: { f: composant_fields, type_composant: "SLOT" } %>
+          <%= f.fields_for :components, f.object.components.slots do |composant_fields| %>
+            <%= render partial: "component_fields", locals: { f: composant_fields, type_composant: "SLOT" } %>
           <% end %>
 
           <li class="list-group-item bg-transparent" data-nested-form-target="target"></li>

app/views/modeles/show.json.jbuilder

@@ -3,7 +3,7 @@
 json.extract! @modele, :id, :name, :description, :color, :u, :nb_elts, :category, :architecture, :manufacturer
 
 json.enclosures(@modele.enclosures) do |enclosure|
-  json.extract! enclosure, :id, :display, :position, :grid_areas, :composants
+  json.extract! enclosure, :id, :display, :position, :grid_areas, :components
 end
 
 json.extract! @modele, :created_at, :updated_at

app/views/pdus/_pdu.html.erb

@@ -1,5 +1,5 @@
 <h5 class="text-center"><%= link_to pdu.name[-1], edit_server_path(pdu.id) %></h5>
-<% pdu.modele.enclosures.first.composants.each do |component| %>
+<% pdu.modele.enclosures.first.components.each do |component| %>
   <div class="py-0 px-3 mb-4 text-center">
     <%= link_to "#", class: "pdu-line" do %>
       <span class="badge text-bg-secondary"><%= component.name ? component.name[-2..-1] : ' ' %></span>

app/views/servers/_card_fields.html.erb

@@ -1,8 +1,8 @@
 <%
   if local_assigns[:enclosure].present?
-    composants = enclosure.composants.slots
+    components = enclosure.components.slots
   else
-    composants = server.modele.composants.slots
+    components = server.modele.components.slots
   end
 %>
 
@@ -11,7 +11,7 @@
       data-new-record="<%= f.object.new_record? %>">
     <div class="row">
       <span class="col-md-2 mb-2 mb-md-0">
-        <%= f.select :composant_id, options_for_select(composants.map { |c| [c.name || c.position, c.id] },
+        <%= f.select :composant_id, options_for_select(components.map { |c| [c.name || c.position, c.id] },
                                     f.object.composant_id),
                                     {},
                                     { class: "form-select" } %>

app/views/servers/_draw_patch_panel.html.erb

@@ -2,7 +2,7 @@
   <b><%= link_to h(server.name), server_path(server, :view => params[:view]) %></b>
   <br>
 
-  <% slots_sur_modele = server.modele.composants.slots.to_a %>
+  <% slots_sur_modele = server.modele.components.slots.to_a %>
   <% half_slots = slots_sur_modele.length / 2 %>
 
   <% slots_sur_modele.slice(0, half_slots).each do |slot| %>

app/views/servers/_draw_server.html.erb

@@ -1,6 +1,6 @@
 <% if server.modele.present? %>
   <div class="float-end">
-    <% slots_sur_modele = server.modele.composants.slots %>
+    <% slots_sur_modele = server.modele.components.slots %>
     <table class="slots">
       <thead>
       <% slots_sur_modele.each do |slot| %>
@@ -33,15 +33,15 @@
       <tr>
         <td>
           <%= ports_by_card(port_type: PortType.find_by_name('RJ'),
-                            port_quantity: server.modele.composants.where(type_composant_id: 3).count,
+                            port_quantity: server.modele.components.where(type_composant_id: 3).count,
                             ports_data: Port.where(card: server.cards.joins(composant: :type_composant).where('type_composants.name = ?', 'CM')) )%>
         </td>
       </tr>
       </tbody>
     </table>
   </div>
 
-  <% if server.modele.composants.where(type_composant_id: 2).count > 0 %>
+  <% if server.modele.components.where(type_composant_id: 2).count > 0 %>
     <div class="float-end">
       <%= ports_by_card(port_type: PortType.find_by_name('IPMI'),
                         port_quantity: 1,
@@ -60,7 +60,7 @@
   <br>
   <i><%= link_to server.modele.try(:name), edit_modele_path(server.modele) %></i>
   <div class="alims">
-    <% alims_sur_modele = server.modele.composants.where(type_composant_id: 1) %>
+    <% alims_sur_modele = server.modele.components.where(type_composant_id: 1) %>
     <% alims_sur_modele.each_with_index do |composant_alim, i| %>
       <span class="alim">ALIM <%= i+1 %></span>
     <% end %>

app/views/servers/_draw_server_compact.html.erb

@@ -5,7 +5,7 @@
 
     <% server.modele.enclosures.each_with_index do |enclosure, index| %>
 
-      <% composants_per_enclosure = enclosure.composants.slots %>
+      <% components_per_enclosure = enclosure.components.slots %>
 
       <% if enclosure.display == "grid" %>
         <style type="text/css">
@@ -14,7 +14,7 @@
           }
         </style>
         <div class="container enclosure-container">
-          <% composants_per_enclosure.each do |component| %>
+          <% components_per_enclosure.each do |component| %>
             <% class_name = "item-#{component.name}" %>
             <style>
               .<%= class_name %> {
@@ -38,12 +38,12 @@
           <% if enclosure.display != "horizontal" %>
 
             <tr>
-              <% composants_per_enclosure.each do |component| %>
+              <% components_per_enclosure.each do |component| %>
                 <th><%= slot_label(server, component) %></th>
               <% end %>
             </tr>
             <tr>
-              <% composants_per_enclosure.each do |component| %>
+              <% components_per_enclosure.each do |component| %>
                 <td class="slot_column">
                   <%= render partial: "servers/draw_component", locals: { server: , component: , selected_port:  } %>
                 </td>
@@ -52,7 +52,7 @@
 
           <% else %>
 
-            <% composants_per_enclosure.each do |component| %>
+            <% components_per_enclosure.each do |component| %>
               <tr>
                 <th><%= slot_label(server, component) %></th>
                 <td>

app/views/servers/show.html.erb

@@ -137,7 +137,7 @@
 
             <dt class="col-6 text-end"><%= Card.model_name.human.pluralize %> :</dt>
             <dd class="col-6">
-              <% @server.modele.composants.slots.each do |slot| %>
+              <% @server.modele.components.slots.each do |slot| %>
                 <% @server.cards.where(:composant_id => slot.id).each do |card| %>
                   <div>
                     <%= card.composant.name ? card.composant.name : card.composant.position %>

db/migrate/20240918144044_rename_composants_to_enclosure_component.rb

@@ -0,0 +1,5 @@
+class RenameComposantsToEnclosureComponent < ActiveRecord::Migration[7.1]
+  def change
+    rename_table :composants, :enclosure_components
+  end
+end

lib/tasks/fix_duplicated_slots.rake

@@ -8,22 +8,22 @@ namespace :duplicated_slots do
   desc "Fix duplicated slots"
   task :fix => :environment do
 
-    Modele.includes(:enclosures => :composants)
+    Modele.includes(enclosures: :components)
       .find_each do |modele|
 
       servers = []
       modele.enclosures.each do |enclosure|
 
-        composants_names = enclosure.composants.map(&:name)
-        if composants_names.include?('SL1') && composants_names.include?('1')
+        components_names = enclosure.components.map(&:name)
+        if components_names.include?('SL1') && components_names.include?('1')
           # Potential duplicated slot
           puts "****** Modele ##{modele.id} - #{modele.name}"
 
-          enclosure.composants.each do |composant|
+          enclosure.components.each do |composant|
             if composant.name.to_i.to_s == composant.name
               # Duplicated slot
               puts "****** Composant ##{composant.id} - #{composant.name}"
-              correct_composant = enclosure.composants.find_by(name: 'SL' + composant.name)
+              correct_composant = enclosure.components.find_by(name: 'SL' + composant.name)
               puts "****** correct_composant ##{correct_composant.id} - #{correct_composant.name}"
               composant.cards.each do |card|
                 card.composant = correct_composant

spec/models/composant_spec.rb → spec/models/enclosure_component_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe Composant do
+RSpec.describe EnclosureComponent do
   # it_behaves_like "changelogable", object: -> { described_class.new(type_composant: TypeComposant.create!) },
   #                                  new_attributes: { name: "New name" }
 

spec/models/enclosure_spec.rb

@@ -7,6 +7,6 @@
 
   describe "associations" do
     it { is_expected.to belong_to(:modele) }
-    it { is_expected.to have_many(:composants) }
+    it { is_expected.to have_many(:components) }
   end
 end

spec/models/modele_spec.rb

@@ -13,7 +13,7 @@
     it { is_expected.to belong_to(:category) }
     it { is_expected.to have_many(:servers) }
     it { is_expected.to have_many(:enclosures) }
-    it { is_expected.to have_many(:composants).through(:enclosures) }
+    it { is_expected.to have_many(:components).through(:enclosures) }
   end
 
   describe "#validate_network_types_values" do