Merge pull request nanego#307 from pantographe/360356-follow-up-conne…

…ction-index-update

Merge Cables and Connections indexes

app/assets/stylesheets/application.scss

@@ -154,7 +154,6 @@ table.card_layout {
 }
 
 .portRJ, .portFC, .portSCSI, .portALIM {
-  cursor: pointer;
   position: relative;
   font-size: 10px;
   display: inline-block;
@@ -172,7 +171,8 @@ table.card_layout {
 .portRJ,
 .portFC,
 .portSCSI,
-.portALIM{
+.portALIM,
+.cable {
   // Colors are !important so we can print them
   &.R {
     color: #FFFFFF !important;
@@ -443,6 +443,77 @@ dd {
   font-weight: 700;
 }
 
+/* Cable index */
+.cable-index-servers {
+  min-width: 450px;
+
+  & > .d-flex {
+    padding-left: 37px;
+  }
+
+  .btn-collapse-vlans {
+    transition: transform 0.3s ease-in-out;
+
+    &[aria-expanded="true"] {
+      transform: rotate(-180deg);
+    }
+   }
+
+  .cable {
+    &.R {
+      border-color: #ee3b3b !important;
+    }
+    &.G {
+      border-color: #AAAAAA !important;
+    }
+    &.V {
+      border-color: green !important;
+    }
+    &.T {
+      border-color: #3B9C9C !important;
+    }
+    &.Vi {
+      border-color: #663399 !important;
+    }
+    &.M {
+      border-color: #8b4c39 !important;
+    }
+    &.B {
+      border-color: #4876ff !important;
+    }
+    &.N {
+      border-color: #000000 !important;
+    }
+    &.O {
+      border-color: #FF9000 !important;
+    }
+    &.W {
+      border-color: #FFFFFF !important;
+    }
+    &.J {
+      border-color: #FFDD00 !important;
+    }
+    &.P {
+      border-color: #ff9ee5 !important;
+    }
+  }
+
+  .port {
+    &.no_client {
+      border: solid 2px #FF9000 !important;
+    }
+  }
+
+  .vlans-card {
+    width: min-content;
+    min-width: fit-content;
+
+    & > .d-flex {
+      min-width: 400px;
+    }
+  }
+}
+
 /* Page about */
 .about {
   .github-link {
@@ -456,11 +527,6 @@ dd {
   }
 }
 
-.align-middle {
-  vertical-align: middle !important;
-}
-
-
 /* MyDCIM CSS */
 html,
 body {
@@ -806,6 +872,10 @@ body {
     display: inline-block;
   }
 
+  .overflow-wrap {
+    overflow-wrap: break-word;
+  }
+
   nav.pagy-bootstrap.nav .pagination {
     margin-bottom: 0;
   }

app/controllers/cables_controller.rb

@@ -4,13 +4,17 @@ class CablesController < ApplicationController
   before_action :set_cable, only: [:destroy]
 
   def index
-    @cables = sorted(Cable.includes(:connections, connections: [:port]).order(created_at: :desc))
-    @pagy, @cables = pagy(@cables)
+    @cables = Cable.includes(:connections,
+                             connections: [:port, :server, :card],
+                             cards: [:card_type],
+                             card_types: [:port_type])
+      .order(created_at: :desc)
+    @filter = ProcessorFilter.new(@cables, params)
+
+    @pagy, @cables = pagy(@filter.results.distinct)
   end
 
   def destroy
-    port_id = params[:redirect_to_port_id]
-
     @cable.ports.each do |port|
       if @from_server.nil?
         @from_server = port.server
@@ -23,7 +27,7 @@ def destroy
 
     respond_to do |format|
       format.html do
-        redirect_to connections_edit_path(from_port_id: port_id), notice: t(".flashes.destroyed")
+        redirect_to cables_path, notice: t(".flashes.destroyed")
       end
 
       format.js { render 'connections/update' }

app/controllers/connections_controller.rb

@@ -1,14 +1,6 @@
 # frozen_string_literal: true
 
 class ConnectionsController < ApplicationController
-  def index
-    @connections = Connection.includes(:port, :card, :server, :card_type, :port_type, cable: :connections)
-      .order(created_at: :desc)
-    @filter = ProcessorFilter.new(@connections, params)
-
-    @pagy, @connections = pagy(@filter.results)
-  end
-
   def edit
     if params[:from_port_id].present? && params[:from_port_id].to_i > 0
       @from_port = Port.find_by_id(params[:from_port_id])

app/decorators/bay_decorator.rb

@@ -19,10 +19,10 @@ def access_control_to_human
 
   def no_frame_warning_icon
     tag.span class: "bay-with-no-frame-warning ms-2" do
-      concat(tag.i(class: "bi bi-exclamation-triangle-fill text-warning",
-                   title: I18n.t(".bays.decorator.no_frame_warning_text"),
-                   aria: { hidden: true },
-                   data: { controller: "tooltip", bs_placement: "right" }))
+      concat(tag.span(class: "bi bi-exclamation-triangle-fill text-warning",
+                      title: I18n.t(".bays.decorator.no_frame_warning_text"),
+                      aria: { hidden: true },
+                      data: { controller: "tooltip", bs_placement: "right" }))
       concat(tag.span(I18n.t(".bays.decorator.no_frame_warning_text"), class: "visually-hidden"))
     end
   end

app/decorators/cable_decorator.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+class CableDecorator < ApplicationDecorator
+  include ActionView::Helpers::AssetTagHelper
+  include Rails.application.routes.url_helpers
+  include ActionView::Helpers::UrlHelper
+  include ActionView::Helpers::TextHelper
+  include ActionView::Context
+
+  class << self
+    def special_case_options_for_select
+      [true, false].map do |s|
+        [I18n.t("boolean.#{s}"), s]
+      end
+    end
+
+    def colors_options_for_select
+      Cable::COLORS.map do |k, v|
+        [I18n.t(".activerecord.attributes.cable/color.#{v}"), k]
+      end
+    end
+  end
+
+  def server_connected_with_link(connection, from: false)
+    tag.span class: class_names("text-body-emphasis col overflow-wrap", 'text-end': from) do
+      if (server = connection&.server)
+        link_to server.to_s,
+                server_path(server),
+                class: "text-body-emphasis",
+                data: { turbo_frame: :_top }
+      else
+        tag.span "n/c", class: "fst-italic fw-lighter"
+      end
+    end
+  end
+
+  def draw_port(connection)
+    if (twin_card_id = connection&.card&.twin_card_id)
+      twin_card = Card.find(twin_card_id)
+      twin_connections = twin_card.ports.map(&:connection)
+      twin_card_used_ports = []
+      twin_connections.each { |c| twin_card_used_ports << c.port.position if c&.port }
+    end
+
+    if (port = connection&.port) && name.present?
+      port_type_class = connection&.card&.card_type&.port_type&.decorated&.css_class_name
+
+      tag.span name,
+               class: class_names(
+                 "me-0 port #{color} text-body-emphasis #{port_type_class}",
+                 'fst-italic fw-lighter': name.blank?,
+                 no_client: port && port.cable_name && twin_card_used_ports&.exclude?(port.position)
+               )
+    else
+      tag.span "n/c", class: "badge empty me-0 border text-body-emphasis fst-italic fw-lighter"
+    end
+  end
+end

app/decorators/port_type_decorator.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class PortTypeDecorator < ApplicationDecorator
+  def css_class_name
+    case name
+    when "RJ", "XRJ"
+      "portRJ"
+    when "FC", "SC"
+      "portFC"
+    when "ALIM"
+      "portALIM"
+    else
+      "portSCSI"
+    end
+  end
+end

app/helpers/servers_helper.rb

@@ -81,7 +81,6 @@ def ports_by_card_with_presentation(card:, selected_port: nil, moved_connections
           if (cell_index + 1) % number_of_columns_in_cell(card.orientation, ports_per_cell, card_type.max_aligned_ports) == 0 # Every XX ports do
             html += '</div><div class="d-flex">'
           end
-
         end
 
         html += "</div></td>"

app/models/cable.rb

@@ -1,10 +1,29 @@
 # frozen_string_literal: true
 
 class Cable < ApplicationRecord
+  COLORS = {
+    N: :black,
+    M: :brown,
+    R: :red,
+    O: :orange,
+    J: :yellow,
+    V: :green,
+    T: :turquoise,
+    B: :blue,
+    Vi: :purple,
+    P: :pink,
+    G: :grey,
+    W: :white
+  }.freeze
+
   has_changelog
 
   has_many :connections, dependent: :destroy
   has_many :ports, through: :connections
+  has_many :servers, through: :connections
+  has_many :cards, through: :connections
+  has_many :card_types, through: :cards
+  has_many :port_types, through: :card_types
 
   after_update :touch_ports
 

app/models/connection.rb

@@ -4,7 +4,7 @@ class Connection < ApplicationRecord
   has_changelog
 
   belongs_to :port, touch: true
-  belongs_to :cable, touch: true, counter_cache: true
+  belongs_to :cable, touch: true
 
   has_one :card, through: :port
   has_one :server, through: :port

app/models/filter.rb

@@ -76,11 +76,7 @@ def respond_to_missing?(symbol, include_all)
 
   def _permitted_attributes_names
     attribute_names.map do |attribute_name|
-      if attribute_name.end_with?("_ids")
-        [attribute_name, { attribute_name => [] }]
-      else
-        attribute_name
-      end
+      [attribute_name, { attribute_name => [] }]
     end
   end
 

app/processors/cables_processor.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+class CablesProcessor < ApplicationProcessor
+  include Sortable
+  SORTABLE_FIELDS = %w[special_case].freeze
+
+  map :cable_name do |cable_name:|
+    raw.where(name: cable_name)
+  end
+
+  map :special_case do |special_case:|
+    raw.where(special_case:)
+  end
+
+  map :colors, filter_with: :non_empty_array do |colors:|
+    raw.where(color: colors)
+  end
+
+  map :comments do |comments:|
+    raw.where(Cable.arel_table[:comments].matches("%#{comments}%"))
+  end
+
+  map :vlans do |vlans:|
+    raw.joins(:ports).where(Port.arel_table[:vlans].matches("%#{vlans}%"))
+  end
+
+  map :server_ids, filter_with: :non_empty_array do |server_ids:|
+    raw.joins(:servers).where(servers: { id: server_ids })
+  end
+
+  map :port_type_ids, filter_with: :non_empty_array do |port_type_ids:|
+    raw.joins(:port_types).where(port_types: { id: port_type_ids })
+  end
+
+  map :card_query do |card_query:|
+    name_condition = Card.arel_table[:name].matches("%#{card_query}%")
+    card_type_condition = CardType.arel_table[:name].matches("%#{card_query}%")
+    slot_condition = Composant.arel_table[:name].matches("%#{card_query}%")
+    combined_conditions = name_condition.or(card_type_condition).or(slot_condition)
+    raw.joins(:cards, :card_types, cards: :composant).where(combined_conditions)
+  end
+
+  sortable fields: SORTABLE_FIELDS do
+    having "comments" do |sort: "asc"|
+      valid_sort_value!(sort)
+
+      raw.reorder("comments #{sort.upcase} nulls last")
+    end
+  end
+end