foreman_datacenter 1.24.2 → 1.24.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa372e8673608cecc9343f4a2efa60d2d38dc77cb9ef37cfd55f8ec261907ccc
-  data.tar.gz: b806528ffcea447652114e76043f216d28eb50c2386f253ca93bd8808ab0ee35
+  metadata.gz: 0b77182c1385f10fbeb5506db376a8fa29a079b4cebae2945ce99d07a3350aa7
+  data.tar.gz: 36f47250116e01a60c30a1be2503ff7c636e18bf7408fc75b00fd130b9eabc99
 SHA512:
-  metadata.gz: 8fa308e3840207c9a77aecfaa18491b578a73f5a1307bcea72fabafa1e97d4b3dfcf6bd9386803c847bbc410e75de3515d629c1e12227d4606d5e8385096c721
-  data.tar.gz: 3a00433a5afb85a305c687e66f153dd4279efe62f2ec842d6c67d321085062530dc261529436076b3ea0df0e74136bed184b79b388b98cf34f39eb6ecd0066b9
+  metadata.gz: 73e0482bff2ae27ec2b2f59ad59946c89ec6bc712362952e1f2fb77095b1953f0cce0e943506fae0814b94ccb4188172a50106e23b4b2789358886a1c9ffef04
+  data.tar.gz: a3ff1c963f5f22c2902a25e503b3218aa408b27edf7da7417545010b4faf3eaaeb81ae3c460d73fd6e08acd6496beceb9f0b1893f42589f3fe6e188de86b21a3

data/app/assets/stylesheets/foreman_datacenter/rack_show.css

@@ -0,0 +1,56 @@
+.rack-grid {
+  width: 100%;
+  border-bottom: 1px solid #d1d1d1;
+  border-left: 1px solid #d1d1d1;
+	display: inline-grid;
+}
+
+.item {
+	justify-content: center;
+  padding: 2px 10px 3px;
+  border-top: 1px solid #d1d1d1;
+  border-right: 1px solid #d1d1d1;
+}
+
+.item-dev {
+	position: relative;
+	text-align: center;
+}
+
+.dev-cell {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	position: absolute;
+	height: inherit;
+	width: 90%;
+	text-align: center;
+}
+
+.a:hover {
+	overflow: visible;
+}
+
+.no-border {
+	border: none !important;
+}
+
+.panel-head-border {
+	border-top: 1px solid #ddd !important;
+	border-left: 1px solid #ddd !important;
+	border-right: 1px solid #ddd !important;
+	border-bottom: none !important;
+}
+
+.item-row {
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+}
+
+.item-row:hover {
+	overflow: visible;
+}
+
+.item-empty-cell {
+}

data/app/controllers/foreman_datacenter/rack_groups_controller.rb

@@ -61,6 +61,7 @@ module ForemanDatacenter
     def racks
       @racks = @rack_group.racks.includes(devices: [:device_role])
       process_error redirect: rack_groups_path(@rack_group), error_msg: 'Current Rack Group haven\'t any Racks.' if @racks.empty?
+      @order = params[:order] || "desc"
     end
 
     def update_associated_objects

data/app/controllers/foreman_datacenter/racks_controller.rb

@@ -17,6 +17,7 @@ module ForemanDatacenter
 
     def show
       @rack = resource_base.includes(devices: [:device_role]).find(params[:id])
+      @order = params[:order] || "desc"
     end
 
     def new

data/app/helpers/foreman_datacenter/racks_helper.rb

@@ -4,5 +4,101 @@ module ForemanDatacenter
       collection = rack.site ? rack.site.rack_groups : []
       options_from_collection_for_select(collection, 'id', 'name', rack.rack_group_id)
     end
+
+    def grid_u_desc(rack)
+      i = rack.height + 1
+      limit = 0
+      result = ""
+
+      while limit <= i do
+        if i == 0 && !rack.unpositioned_devices.empty?
+          concat content_tag(:div, "Unpositioned Devices")
+        else
+          if i != 0
+            if rack.child_devices.any? { |d| d.position == i }
+              concat content_tag :div, &-> do
+                concat "#{i}U"
+                rack.child_devices.each do |d|
+                  if d.position == i
+                    concat content_tag :strong, &-> do
+                      concat link_to("Child", device_path(d))
+                    end
+                  end
+                end
+              end
+            else
+              concat content_tag(:div, "#{i}U")
+            end
+          end
+        end
+        i -= 1
+      end
+    end
+
+    def grid_empty_style(cell, id)
+      case cell[1]
+      when ["right"]
+        column = "grid-area: rack-#{id}-row-#{cell[0]}-right-empty"
+      when ["left"]
+        column = "grid-area: rack-#{id}-row-#{cell[0]}-left-empty"
+      when ["left", "right"] || ["right", "left"]
+        column = "grid-area: rack-#{id}-row-#{cell[0]}-full-empty"
+      end
+      return column
+    end
+
+    def margin_style(height)
+      result = "top: "
+      case height
+      when 1
+        result += "7%"
+      when 2
+        result += "30%"
+      when 3
+        result += "35%"
+      when 4
+        result += "40%"
+      else
+        result += "45%"
+      end
+    end
+
+    def grid_rack_style(device)
+      css_class_name = device.name.gsub(/[.@#\s]/, "_")
+      return "grid-area: #{css_class_name}"
+    end
+
+    def grid_rack_height(height)
+      return (height + 1)
+    end
+
+    def grid_template(grid, id, order)
+      result = []
+      gr = JSON.parse(grid)
+      gr = gr.to_a.reverse.to_h if order == "desc"
+
+      gr.each do |k,v|
+        row = "rack-#{id}-u#{k}"
+        if v.instance_of? Array
+          if k == "0"
+            row += " rack-#{id}-unpos-devs rack-#{id}-unpos-devs"
+          else
+            row += " rack-#{id}-row-#{k}-full-empty rack-#{id}-row-#{k}-full-empty"
+          end
+        else
+          if v.size > 1
+            row += " #{v['left']} #{v['right']}"
+          else
+            row += " #{v['left']} rack-#{id}-row-#{k}-right-empty" if v.key?("left")
+            row += " rack-#{id}-row-#{k}-left-empty #{v['right']}" if v.key?("right")
+            row += " #{v['full']} #{v['full']}" if v.key?("full")
+          end
+        end
+        result << row
+      end
+      final = result.join("' '").prepend("'") + "'"
+      return "grid-template-areas: #{final}; grid-template-columns: 22% 39% 39%"
+    end
+
   end
 end

data/app/models/foreman_datacenter/device.rb

@@ -34,6 +34,7 @@ module ForemanDatacenter
     validates :serial, length: { maximum: 50 }
     validates :rack_id, presence: true
     validates :position, numericality: { only_integer: true }, allow_nil: true
+    validate :correct_position
 
     after_create :create_interfaces
     after_create :import_interfaces_from_host
@@ -72,6 +73,10 @@ module ForemanDatacenter
       device_type.try(:subdevice_role) == 'Parent'
     end
 
+    def child?
+      device_type.try(:subdevice_role) == 'Child'
+    end
+
     def free_interfaces
       interfaces.where(mgmt_only: false).reject(&:connected?)
     end
@@ -139,6 +144,39 @@ module ForemanDatacenter
       end
     end
 
+    def correct_position
+      if position > 0
+        grid_template = JSON.parse(self.rack.grid_template_areas)
+        correct_pos = true
+        pos = []
+        sz = (size == 0 || size == 1) ? [position] : [*position..(position + (size - 1))]
+        sd = (side.nil?) ? "full" : side
+        sz.each do |i|
+          if grid_template["#{i}"].is_a?(Hash)
+            if grid_template["#{i}"].key?("full") &&  grid_template["#{i}"]["full"] != "device-#{self.id}"
+              correct_pos = false
+              pos << "#{i}(full)"
+            end
+            if sd == "full"
+              ["left", "right"].each do |s|
+                if grid_template["#{i}"].key?("#{s}") && grid_template["#{i}"]["#{s}"] != "device-#{self.id}"
+                  correct_pos = false
+                  pos << "#{i}(#{s})"
+                end
+              end
+            else
+              if grid_template["#{i}"].key?("#{sd}") && grid_template["#{i}"]["#{sd}"] != "device-#{self.id}"
+                correct_pos = false
+                pos << "#{i}(#{sd})"
+              end
+            end
+          end
+        end
+        pos.uniq!
+        errors.add(:position, "Positions: #{pos.join(', ')} already taken") if correct_pos == false
+      end
+    end
+
     private
 
     def create_interfaces

data/app/models/foreman_datacenter/rack.rb

@@ -12,6 +12,7 @@ module ForemanDatacenter
     validates :facility_id, length: { maximum: 30 }
     validates :height, presence: true
     validates_numericality_of :height, only_integer: true, greater_than: 0
+    validate :correct_position
 
     scoped_search on: :name, complete_value: true
     scoped_search on: :height, validator: ScopedSearch::Validators::INTEGER
@@ -22,6 +23,7 @@ module ForemanDatacenter
     scoped_search in: :site, on: :name, complete_value: true, rename: :site
     scoped_search in: :rack_group, on: :name, complete_value: true, rename: :rack_group
 
+
     def device_at(position)
       devices.where(position: position).to_a
     end
@@ -43,7 +45,7 @@ module ForemanDatacenter
     end
 
     def unpositioned_devices
-      devices.where(position: nil).to_a
+      devices.where(position: nil).or(devices.where(position: "0")).to_a
     end
 
     def devices_count
@@ -75,6 +77,72 @@ module ForemanDatacenter
       File.open("#{self.name}.csv", "w") {|f| f << csv_string}
     end
 
+   # Finding all empty cells for grid layout
+    def empty_cells
+      cells = {} # all cells of grid
+      devices_cells = {} # cells with devices
+      height.times.each do |i|
+        cells[i+1] = ["left", "right"]
+      end
+      devices.each do |d|
+        if d.size > 0
+          if !d.position.nil? && d.position != 0
+            s = (d.size == 0 || d.size == 1) ? 0 : (d.size - 1)
+            places = [*d.position..d.position+s]
+            places.each do |p|
+              devices_cells[p] = [] unless devices_cells.key?(p)
+              if (d.side == "full" || d.side.nil?)
+                ["left", "right"].each {|side| devices_cells[p] << side}
+              else
+                devices_cells[p] << d.side
+              end
+            end
+          end
+        end
+      end
+      devices_cells.each do |k,v|
+        v.each {|c| cells[k].delete(c)}
+      end
+      cells.each {|k,v| cells.except!(k) if cells[k] == []}
+      return cells
+    end
+
+    def grid_template_areas
+      result = {}
+      (height+1).times.each do |i|
+        if i == 0
+          result[0] = unpositioned_devices.map{|d| "device-#{d.id}"}
+        else
+          dev = {}
+          devices.each do |d|
+            if d.size > 0
+              if !d.position.nil? && d.position != 0
+                css_class_name = "device-#{d.id}"
+                s = (d.size == 1 || d.size == 0) ? 0 : (d.size - 1)
+                if [*d.position..(d.position + s)].include?(i)
+                  if d.side.nil?
+                    dev["full"] = css_class_name
+                  else
+                    dev["#{d.side}"] = css_class_name
+                  end
+                  result[i] = dev
+                end
+              end
+            end
+          end
+        end
+      end
+      (height+1).times.each do |i|
+        result[i] = [] if result[i].nil?
+      end
+      # result[0].reject! if result[0].empty?
+      return result.sort_by{|k,v| k}.to_h.to_json
+    end
+
+    def child_devices
+      devices.joins(:device_type).where("device_types.subdevice_role = ?", "Child")
+    end
+
     private
 
     def sort_for_csv(device_array)
@@ -97,7 +165,5 @@ module ForemanDatacenter
       devices.each{|d| devs[1] << d[1][0]}
       return devs
     end
-
-
   end
 end

data/app/views/foreman_datacenter/devices/show.html.erb

@@ -70,7 +70,7 @@
         </tr>
         <tr>
           <td><%= _("Position") %></td>
-          <td><%= @device.positions.join(", ") %> / <%= @device.face %> / <%= @device.side %></td>
+          <td><%= (@device.position > 0) ? (@device.child? ? "#{@device.position} (Child)" : @device.positions.join(", ")) : 0 %> / <%= @device.face %> / <%= @device.side %></td>
         </tr>
         <tr>
           <td><%= _("Device Type") %></td>

data/app/views/foreman_datacenter/racks/_device_position_new.html.erb

@@ -0,0 +1,91 @@
+<div class="panel panel-default no-border">
+  <div class="panel-heading text-center panel-head-border">
+    <h4 class="nonmargintop nonmarginbottom">
+      <strong>
+        <%= link_to rack.name, rack_path(rack)  %>
+      </strong>
+      <strong>
+        <%= link_to 'Export to CSV', export_to_csv_rack_path(rack.id), class: "btn btn-primary btn-xs pull-right" %>
+      </strong>
+      <strong>
+        <% if @order == "asc" %>
+         <%= link_to 'DESC', url_for(), class: "btn btn-success btn-xs pull-left" %>
+       <% else %>
+         <%= link_to 'ASC', url_for(order: "asc"), class: "btn btn-success btn-xs pull-left" %>
+       <% end %>
+      </strong>
+    </h4>
+  </div>
+
+  <!-- Grid -->
+  <div class="rack-grid rack-<%= rack.id %>" style="<%= grid_template(rack.grid_template_areas, rack.id, @order) %>">
+   
+    <!-- Rows -->
+    <% (rack.height+1).times.each do |i| %>
+      <% if i == 0 && !rack.unpositioned_devices.empty? %>
+        <div class="item item-row" style="grid-area: rack-<%= rack.id %>-u<%= i %>">
+          <%= i == 0 ? "Unpositioned Devices" : "#{i}U"%>
+        </div>
+      <% else %>
+        <% if i != 0 %>
+          <div class="item item-row" style="grid-area: rack-<%= rack.id %>-u<%= i %>">
+            <%= "#{i}U" %>
+            <% rack.child_devices.each do |d| %>
+              <% if d.position == i %>
+                <strong>
+                  <%= link_to "Child", device_path(d), class: "btn btn-primary btn-xs pull-right" %>
+                </strong>
+              <% end %>
+            <% end %>
+          </div>
+        <% else %>
+          <% next %>
+        <% end %>
+      <% end %>
+    <% end %>
+   
+    <!-- Empty cells -->
+    <% rack.empty_cells.each do |c| %>
+      <div class="item item-empty-cell" style="<%= grid_empty_style(c, rack.id)%>">
+        &nbsp;
+      </div>
+    <% end %>
+   
+    <!-- Devices -->
+    <% rack.devices.each do |d| %>
+      <% if !d.position.nil? && d.size != 0 && d.position != 0 %>
+        <div class="item item-dev" style="grid-area: device-<%= d.id %>">
+          <div class="dev-cell" style="<%= margin_style(d.size) %>">
+            <div class="<%= "label " + d.device_role.color.downcase.gsub(" ","") %>" style="border-radius:40px;border:0px;">&nbsp;&nbsp;</div>
+            <%= link_to d.name, device_path(d) %>
+            <% if d.side.nil? %>
+              *
+            <% end %>
+            <% if d.size.nil? %>
+              **
+            <% end %>
+          </div>
+        </div>
+      <% end %>
+    <% end %>
+   
+    <!-- Unpositioned devices -->
+    <% if rack.unpositioned_devices.count != 0 %>
+      <div class="item item-dev" style="grid-area: rack-<%= rack.id %>-unpos-devs">
+        <% rack.unpositioned_devices.each do |d| %>
+          <div class="<%= "label " + d.device_role.color.downcase.gsub(" ","") %>" style="border-radius:40px;border:0px;">&nbsp;&nbsp;</div>
+          <%= link_to d.name, device_path(d) %>
+          <% if d.side.nil? %>
+            *
+          <% end %>
+          <% if d.size.nil? %>
+            **
+          <% end %>
+          <br>
+        <% end %>
+      </div>
+    <% end %>
+
+  </div>
+
+</div>

data/app/views/foreman_datacenter/racks/show.html.erb

@@ -1,5 +1,6 @@
 <% stylesheet 'foreman_datacenter/device_roles' %>
 <% stylesheet 'foreman_datacenter/datacenter' %>
+<% stylesheet 'foreman_datacenter/rack_show' %>
 <% stylesheet 'foreman_datacenter/modal' %>
 <% javascript 'foreman_datacenter/modal' %>
 
@@ -89,10 +90,11 @@
   </div>
 
   <div class="col-md-6">
-    <!-- Devices -->
-    <%= render "device_position", rack: @rack %>
-    <!-- Unpositioned Devices -->
-    <%= render "unpositioned_devices", rack: @rack if @rack.unpositioned_devices.count != 0 %>
+    <%= render "device_position_new", rack: @rack %>
+      <!-- Devices -->
+      <%#= render "device_position", rack: @rack %>
+      <!-- Unpositioned Devices -->
+      <%#= render "unpositioned_devices", rack: @rack if @rack.unpositioned_devices.count != 0 %>
     <div><h6 class="text-right"><%= _("* side is not defined") %></h6></div>
     <div><h6 class="text-right"><%= _("** size is not defined") %></h6></div>
   </div>

data/lib/foreman_datacenter/version.rb

@@ -1,3 +1,3 @@
 module ForemanDatacenter
-  VERSION = '1.24.2'.freeze
+  VERSION = '1.24.3'.freeze
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: foreman_datacenter
 version: !ruby/object:Gem::Version
-  version: 1.24.2
+  version: 1.24.3
 platform: ruby
 authors:
 - Pavel Ivanov
 - Eugene Loginov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-31 00:00:00.000000000 Z
+date: 2020-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -92,6 +92,7 @@ files:
 - app/assets/stylesheets/foreman_datacenter/devices.css
 - app/assets/stylesheets/foreman_datacenter/horizontal-scroll.css
 - app/assets/stylesheets/foreman_datacenter/modal.css
+- app/assets/stylesheets/foreman_datacenter/rack_show.css
 - app/assets/stylesheets/foreman_datacenter/title_filter.css
 - app/controllers/api/v2/foreman_datacenter/base_controller.rb
 - app/controllers/api/v2/foreman_datacenter/console_port_templates_controller.rb
@@ -463,6 +464,7 @@ files:
 - app/views/foreman_datacenter/rack_groups/show.html.erb
 - app/views/foreman_datacenter/rack_groups/welcome.html.erb
 - app/views/foreman_datacenter/racks/_device_position.html.erb
+- app/views/foreman_datacenter/racks/_device_position_new.html.erb
 - app/views/foreman_datacenter/racks/_dp.html.erb
 - app/views/foreman_datacenter/racks/_form.html.erb
 - app/views/foreman_datacenter/racks/_rack_groups.html.erb
@@ -588,7 +590,7 @@ files:
 homepage: https://github.com/theforeman/foreman_datacenter
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -603,9 +605,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: A plugin that lets you document your servers in a datacenter
 test_files: