Refactorize visualization Capacity and Infrastructure

Gemfile

@@ -104,4 +104,5 @@ gem "jquery-ui-rails"
 gem "rubanok"
 gem "stimulus-rails", "~> 1.2"
 gem "store_attribute", "~> 1.2"
+gem "turbo-rails"
 gem "view_component"

Gemfile.lock

@@ -101,7 +101,7 @@ GEM
     bootstrap (5.3.2)
       autoprefixer-rails (>= 9.1.0)
       popper_js (>= 2.11.8, < 3)
-    builder (3.2.4)
+    builder (3.3.0)
     byebug (11.1.3)
     capybara (3.40.0)
       addressable
@@ -114,7 +114,7 @@ GEM
       xpath (~> 3.2)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.3.1)
+    concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
     content_disposition (1.0.0)
     crass (1.0.6)
@@ -159,7 +159,7 @@ GEM
     drb (2.2.1)
     email_validator (2.2.4)
       activemodel
-    erubi (1.12.0)
+    erubi (1.13.0)
     exception_notification (4.5.0)
       actionmailer (>= 5.2, < 8)
       activesupport (>= 5.2, < 8)
@@ -197,7 +197,7 @@ GEM
       activesupport (>= 6.0.0)
       railties (>= 6.0.0)
     io-console (0.7.2)
-    irb (1.13.1)
+    irb (1.14.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jbuilder (2.11.5)
@@ -267,7 +267,7 @@ GEM
     mini_mime (1.1.5)
     mini_racer (0.12.0)
       libv8-node (~> 21.7.2.0)
-    minitest (5.23.1)
+    minitest (5.24.1)
     msgpack (1.7.2)
     mutex_m (0.2.0)
     net-http (0.4.1)
@@ -282,11 +282,11 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.1)
-    nokogiri (1.16.5-arm64-darwin)
+    nokogiri (1.16.7-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-darwin)
+    nokogiri (1.16.7-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-linux)
+    nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
     omniauth (2.1.2)
       hashie (>= 3.4.6)
@@ -331,8 +331,8 @@ GEM
     public_suffix (5.0.5)
     puma (6.4.2)
       nio4r (~> 2.0)
-    racc (1.8.0)
-    rack (3.0.11)
+    racc (1.8.1)
+    rack (3.1.7)
     rack-mini-profiler (3.3.1)
       rack (>= 1.2.0)
     rack-oauth2 (2.2.1)
@@ -393,13 +393,13 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdoc (6.6.3.1)
+    rdoc (6.7.0)
       psych (>= 4.0.0)
     record_tag_helper (1.0.1)
       actionview (>= 5)
     redcarpet (3.6.0)
     regexp_parser (2.9.1)
-    reline (0.5.6)
+    reline (0.5.9)
       io-console (~> 0.5)
     responders (3.1.1)
       actionpack (>= 5.2)
@@ -511,7 +511,7 @@ GEM
       railties (>= 6.0.0)
     store_attribute (1.2.0)
       activerecord (>= 6.0)
-    stringio (3.1.0)
+    stringio (3.1.1)
     strscan (3.1.0)
     swd (2.0.3)
       activesupport (>= 3)
@@ -526,6 +526,10 @@ GEM
     thread_safe (0.3.6)
     tilt (2.3.0)
     timeout (0.4.1)
+    turbo-rails (2.0.6)
+      actionpack (>= 6.0.0)
+      activejob (>= 6.0.0)
+      railties (>= 6.0.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
@@ -562,7 +566,7 @@ GEM
     xpath (3.2.0)
       nokogiri (~> 1.8)
     yard (0.9.36)
-    zeitwerk (2.6.13)
+    zeitwerk (2.6.17)
 
 PLATFORMS
   arm64-darwin-22
@@ -637,6 +641,7 @@ DEPENDENCIES
   stimulus-rails (~> 1.2)
   store_attribute (~> 1.2)
   terser
+  turbo-rails
   view_component
   virtus
   web-console (>= 4.1.0)

app/controllers/air_conditioners_controller.rb

@@ -4,7 +4,7 @@ class AirConditionersController < ApplicationController
   before_action :set_air_conditioner, only: %i[show edit update destroy]
 
   def index
-    @filter = Filter.new(AirConditioner.joins(:room, :islet).order('rooms.position, islets.name, air_conditioners.name'), params)
+    @filter = ProcessorFilter.new(AirConditioner.joins(:room, :islet).order('rooms.position, islets.name, air_conditioners.name'), params)
     @air_conditioners = @filter.results
   end
 

app/controllers/bays_controller.rb

@@ -6,7 +6,7 @@ class BaysController < ApplicationController
   before_action :set_bay, only: [:edit, :update, :destroy, :show]
 
   def index
-    @filter = Filter.new(Bay.joins(:room, :islet).order('rooms.position, islets.name, bays.lane, bays.position'), params)
+    @filter = ProcessorFilter.new(Bay.joins(:room, :islet).order('rooms.position, islets.name, bays.lane, bays.position'), params)
     @bays = @filter.results
   end
 

app/controllers/clusters_controller.rb

@@ -6,7 +6,7 @@ class ClustersController < ApplicationController
   # GET /clusters
   # GET /clusters.json
   def index
-    @filter = Filter.new(Cluster.includes(:servers), params)
+    @filter = ProcessorFilter.new(Cluster.includes(:servers), params)
     @clusters = @filter.results
   end
 

app/controllers/frames_controller.rb

@@ -5,7 +5,7 @@ class FramesController < ApplicationController
   include RoomsHelper
 
   def index
-    @filter = Filter.new(Frame.includes(bay: { islet: :room }).references(bay: { islet: :room }), params)
+    @filter = ProcessorFilter.new(Frame.includes(bay: { islet: :room }).references(bay: { islet: :room }), params)
     @frames = @filter.results
   end
 

app/controllers/modeles_controller.rb

@@ -6,7 +6,7 @@ class ModelesController < ApplicationController
   before_action :set_modele, only: [:show, :edit, :update, :destroy]
 
   def index
-    @filter = Filter.new(Modele.includes(:category, :enclosures).order(:name), params)
+    @filter = ProcessorFilter.new(Modele.includes(:category, :enclosures).order(:name), params)
     @modeles = @filter.results
     @types = @modeles.group_by { |m| m.category.name }.sort_by { |categorie, modeles| categorie.to_s }
   end

app/controllers/rooms_controller.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-class RoomsController < ApplicationController # rubocop:disable Metrics/ClassLength
+class RoomsController < ApplicationController
   include ServersHelper
   include RoomsHelper
 
   before_action :set_room, only: %i[show edit update destroy islet]
 
   def index
-    @filter = Filter.new(Room.joins(:site).order('sites.position asc, rooms.position asc, rooms.name asc'), params)
+    @filter = ProcessorFilter.new(Room.joins(:site).order('sites.position asc, rooms.position asc, rooms.name asc'), params)
     @rooms = @filter.results
   end
 
@@ -103,47 +103,6 @@ def overview
     end
   end
 
-  def infrastructure
-    @sites = Site.joins(:rooms).includes(:rooms => [:islets => [:bays => :frames]]).order(:position).distinct
-    @room = @sites.first.rooms.order(:position).first
-    @islet = @room.islets.first
-
-    @servers = Server.includes(:frame, :stack, :ports, :cards => [:ports])
-      .where.not(network_types: [])
-    # .includes(:cards, :ports => [:connection => [:port, :cable =>[:connections => [:port => :card]]]]).
-    @concentrateurs_ids = [383, 384, 1043, 1044]
-    @concentrateurs = Server.where(id: @concentrateurs_ids).includes(:ports => :connection, :cards => [:ports => :connection])
-    @switchs_lan_ids = @concentrateurs_ids | @servers.pluck(:id) # Switch LAN
-    # TODO: Remove hard-coded values
-    @hubs = {}
-
-    unless Rails.env.test?
-      @hubs = { "gbe" => { 4 => Server.find(383), 3 => Server.find(384) }, "10gbe" => { 4 => Server.find(1043), 3 => Server.find(1044) } } # Concentrateurs per room
-    end
-
-    @connections = {}
-    @stacks = @servers.map(&:stack).uniq.compact
-    @servers.each do |server|
-      @connections[server.id] = server.directly_connected_servers_ids_with_color.reject { |conn| @switchs_lan_ids.exclude?(conn[:server_id]) }
-    end
-    @concentrateurs.each do |hub|
-      @connections[hub.id] = hub.connected_servers_ids_through_twin_cards_with_color.reject { |conn| @switchs_lan_ids.exclude?(conn[:server_id]) }
-    end
-
-    # TODO: remove when hard-coded system will be removed
-    @network_types = Modele::Network::TYPES.excluding("fiber")
-
-    # puts "@@@connections : #{@connections.inspect}"
-  end
-
-  def capacity
-    @sites = Site.joins(:rooms).includes(:rooms => [:islets => [:bays => :frames]]).order(:position).distinct
-    @room = @sites.first.rooms.order(:position).first
-    @islet = @room.islets.first
-    @servers_last_update_time = Server.maximum(:updated_at).to_s
-    @ports_last_update_time = Port.maximum(:updated_at).to_s
-  end
-
   def filtered_overview; end
 
   def new

app/controllers/servers_controller.rb

@@ -6,10 +6,10 @@ class ServersController < ApplicationController
   before_action :set_server, only: [:show, :edit, :update, :destroy]
 
   def index
-    @servers = Server.includes(:room, :islet, :frame, bay: :frames, modele: :category)
-                     .references(:room, :islet, :bay, :frame, modele: :category)
-                     .order(:name)
-    @filter = Filter.new(@servers, params)
+    @servers = Server.includes(:frame, :room, :islet, bay: :frames, modele: :category)
+      .references(:room, :islet, :bay, modele: :category)
+      .order(:name)
+    @filter = ProcessorFilter.new(@servers, params)
     @servers = @filter.results
   end
 

app/controllers/users_controller.rb

@@ -6,7 +6,7 @@ class UsersController < ApplicationController
   before_action :set_user, only: %i[show update destroy reset_authentication_token suspend unsuspend]
 
   def index
-    @filter = Filter.new(User.order(sign_in_count: :desc), params)
+    @filter = ProcessorFilter.new(User.order(sign_in_count: :desc), params)
     @users = @filter.results
   end
 

app/controllers/visualization/infrastructures_controller.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Visualization
+  class InfrastructuresController < ApplicationController
+    def show
+      @filter = Filter.new(params, %i[network_type islet_id])
+
+      unless @filter.filled?
+        islet_id = Islet.sorted.not_empty.has_name.distinct.first.id
+
+        redirect_to islet_id:, network_type: :gbe
+      end
+
+      load_data! if turbo_frame_request?
+    end
+
+    private
+
+    def load_data!
+      @islet = Islet.find(@filter.islet_id)
+      @room = @islet.room
+
+      @servers = Server.includes(:frame, :stack, :ports, :cards => [:ports])
+        .where.not(network_types: [])
+      # .includes(:cards, :ports => [:connection => [:port, :cable =>[:connections => [:port => :card]]]]).
+      @concentrateurs_ids = [383, 384, 1043, 1044]
+      @concentrateurs = Server.where(id: @concentrateurs_ids).includes(:ports => :connection, :cards => [:ports => :connection])
+      @switchs_lan_ids = @concentrateurs_ids | @servers.pluck(:id) # Switch LAN
+      # TODO: Remove hard-coded values
+      @hubs = {}
+
+      unless Rails.env.test?
+        @hubs = { "gbe" => { 4 => Server.find(383), 3 => Server.find(384) }, "10gbe" => { 4 => Server.find(1043), 3 => Server.find(1044) } } # Concentrateurs per room
+      end
+
+      @connections = {}
+      @stacks = @servers.map(&:stack).uniq.compact
+      @servers.each do |server|
+        @connections[server.id] = server.directly_connected_servers_ids_with_color.reject { |conn| @switchs_lan_ids.exclude?(conn[:server_id]) }
+      end
+      @concentrateurs.each do |hub|
+        @connections[hub.id] = hub.connected_servers_ids_through_twin_cards_with_color.reject { |conn| @switchs_lan_ids.exclude?(conn[:server_id]) }
+      end
+
+      # TODO: remove when hard-coded system will be removed
+      @network_types = Modele::Network::TYPES.excluding("fiber")
+      @network = @filter.network_type # TODO: take from params and raise error if not good
+
+      return unless @room.id == 4 || @room.id == 3
+
+      @hub = @hubs[@network][@room.id]
+      @second_room = Room.find(@room.id == 4 ? 3 : 4)
+      @second_hub = @hubs[@network][@second_room.id]
+    end
+  end
+end

app/controllers/visualization/network_capacities_controller.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Visualization
+  class NetworkCapacitiesController < ApplicationController
+    def show
+      @filter = Filter.new(params, %i[network_type islet_id])
+      @filter_filled = @filter.filled?
+
+      unless @filter.filled?
+        islet_id = Islet.sorted.not_empty.has_name.distinct.first.id
+
+        redirect_to islet_id:, network_type: :gbe
+      end
+
+      load_data! if turbo_frame_request?
+    end
+
+    private
+
+    def load_data!
+      @islet = Islet.find(@filter.islet_id)
+      @room = @islet.room
+      @network = @filter.network_type # TODO: take from params and raise error if not good
+      @bays = @islet.bays.sorted
+    end
+  end
+end

app/decorators/islet_decorator.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class IsletDecorator < ApplicationDecorator
+  class << self
+    def grouped_by_sites_options_for_select
+      Islet.includes(:site, room: :islets).sorted.not_empty.has_name.distinct.group_by(&:site).to_h do |site, islets|
+        islets = islets.map do |i|
+          name = i.room.islets.size > 1 ? "#{i.room.name} Ilot #{i.name}" : i.room.name
+          [name, i.id]
+        end
+
+        [site.name, islets]
+      end
+    end
+  end
+end

app/helpers/servers_helper.rb

@@ -146,7 +146,7 @@ def link_to_port_by_type(label, type, port_data, position, card_id, port_id)
 
     link_to label.to_s, edit_port_url, id: port_id, title: (port_data.present? ? "#{port_data.vlans}" : ""),
                                        class: "border border-secondary port port#{port_class} #{port_data.try(:cable_color) ? port_data.try(:cable_color) : "empty"}",
-                                       data: { url: edit_port_url, position: position, type: type, controller: 'tooltip', bs_placement: 'top' }
+                                       data: { url: edit_port_url, position: , type: , controller: 'tooltip', bs_placement: 'top' }, target: :_top
   end
 
   private

app/javascript/application.js

@@ -1,6 +1,8 @@
 // Configure your import map in config/importmap.rb. Read more: https://github.com/rails/importmap-rails
 
-// import "@hotwired/turbo-rails"
+import "@hotwired/turbo-rails"
+Turbo.session.drive = false
+
 import "controllers"
 import "popper"
 import "bootstrap"