foreman_omaha 5.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0ee3bbe2a41f9d5ac5ffac14c72895f5f523ba58691cdbd59c21086638d74b7
-  data.tar.gz: 6348671022cae92df4f7da03f665514234f325be028c523db136ab3c81244eea
+  metadata.gz: 4de0935e85838acb0fdd917072c2619b9fb24eb9496f8075ecf5addc0c517e4f
+  data.tar.gz: '0047259a6a55630216f155c2751c391256fddb5b11d8f47a2494d647283b4a62'
 SHA512:
-  metadata.gz: b97bae1c564d7745876cae86a16558f986057a63553676e8c55e6199208c810cceeca7f8a588bb637399fc32c485bfac874b61b649dd0e9252752c3226be467c
-  data.tar.gz: adae755d7a4e0859663bea2495c2ccce1041a7d05d478ae4eca3ca2d8910a8aff3bdcca925165e6a28101005612a5ffc980e7af2a1a0fe427a884b9f92f98ebd
+  metadata.gz: d1aa36e5c03a1104802f968f9417217ffcb67c628aefba80efc4ecadd6ba940275d0c08ce9c2a490ec8ddb66782f8bf366945732506ad3244ef3f0e849667447
+  data.tar.gz: 32bf0acccb2ebd329f66651874fa1b68822851c7c1c9ce8d85b0c45e29505455b1fd2be09e59c0564f5173f1ddca8940c81dda13f2848817c777ebaaaf6805dd

data/app/helpers/foreman_omaha/omaha_groups_helper.rb

@@ -13,13 +13,13 @@ module ForemanOmaha
       version_list = omaha_group.operatingsystems.pluck(:major, :minor).map { |v| Gem::Version.new(v.join('.')) }.sort.reverse
       current = version_list.max
       content_tag :div, :class => 'progress version-breakdown' do
-        safe_join(versions.map do |version|
+        safe_join(versions.compact.map do |version|
           semver = Gem::Version.new(version[:version])
           position = version_list.index(semver)
           css = {
             :width => "#{version[:percentage]}%"
           }
-          label = if semver > current
+          label = if !current || semver > current
                     :info
                   elsif semver == current
                     :success

data/app/services/foreman_omaha/charts/oem_distribution.rb

@@ -15,10 +15,7 @@ module ForemanOmaha
 
       def to_chart_data
         query.map do |oem, count|
-          {
-            :label => oem,
-            :data => count
-          }
+          [oem, count]
         end
       end
     end

data/app/services/foreman_omaha/charts/status_distribution.rb

@@ -15,11 +15,7 @@ module ForemanOmaha
 
       def to_chart_data
         query.map do |status, count|
-          {
-            :label => status_label(status),
-            :data => count,
-            :color => status_color(status)
-          }
+          [status_label(status), count]
         end
       end
 

data/app/services/foreman_omaha/charts/version_distribution.rb

@@ -15,10 +15,7 @@ module ForemanOmaha
 
       def to_chart_data
         query.map do |version, count|
-          {
-            :label => version,
-            :data => count
-          }
+          [version, count]
         end
       end
     end

data/app/views/omaha_groups/show.html.erb

@@ -71,37 +71,37 @@
         <div class="card-pf-body">
           <div class="row">
             <div class="col-xs-12 col-sm-4 col-md-4">
-              <h3 class="card-pf-subtitle"><%= _('Version Distribution') %></h3>
               <%=
-                flot_pie_chart(
-                  'omaha_status_distribution_chart',
-                  _('Version Distribution'),
-                  @version_distribution.to_chart_data,
-                  :class => 'statistics-pie small',
-                  :search => "omaha_group = #{@omaha_group} and omaha_version = ~VAL~"
+                react_component('ChartBox', type: 'donut',
+                  status: 'RESOLVED',
+                  title: _('Version Distribution'),
+                  chart: {
+                    data: @version_distribution.to_chart_data,
+                    search: hosts_path(search: "omaha_group = #{@omaha_group} and omaha_version = ~VAL~")
+                  }
                 )
               %>
             </div>
             <div class="col-xs-12 col-sm-4 col-md-4">
-              <h3 class="card-pf-subtitle"><%= _('Host Upgrade Progress') %></h3>
               <%=
-                flot_pie_chart(
-                  'omaha_status_distribution_chart',
-                  _('Version Distribution'),
-                  @status_distribution.to_chart_data,
-                  :class => 'statistics-pie small'
+                react_component('ChartBox', type: 'donut',
+                  status: 'RESOLVED',
+                  title: _('Host Upgrade Progress'),
+                  chart: {
+                    data: @status_distribution.to_chart_data
+                  }
                 )
               %>
             </div>
             <div class="col-xs-12 col-sm-4 col-md-4">
-               <h3 class="card-pf-subtitle"><%= _('OEM Distribution') %></h3>
                <%=
-                 flot_pie_chart(
-                   'omaha_oem_distribution_chart',
-                   _('OEM Distribution'),
-                   @oem_distribution.to_chart_data,
-                   :class => 'statistics-pie small',
-                   :search => "omaha_group = #{@omaha_group} and omaha_oem = ~VAL~"
+                 react_component('ChartBox', type: 'donut',
+                   status: 'RESOLVED',
+                   title: _('OEM Distribution'),
+                   chart: {
+                     data: @oem_distribution.to_chart_data,
+                     search: hosts_path(search: "omaha_group = #{@omaha_group} and omaha_oem = ~VAL~")
+                   }
                  )
                %>
             </div>
@@ -186,13 +186,3 @@
   </div>
   <% end %>
 </div>
-<script>
-$(document).on('ContentLoad', function () {
-  refreshCharts();
-  // matchHeight the contents of each .card-pf and then the .card-pf itself
-  $(".row-cards-pf > [class*='col'] > .card-pf .card-pf-title").matchHeight();
-  $(".row-cards-pf > [class*='col'] > .card-pf > .card-pf-body").matchHeight();
-  $(".row-cards-pf > [class*='col'] > .card-pf > .card-pf-footer").matchHeight();
-  $(".row-cards-pf > [class*='col'] > .card-pf").matchHeight();
-});
-</script>

data/lib/foreman_omaha/engine.rb

@@ -23,6 +23,9 @@ module ForemanOmaha
       Foreman::Plugin.register :foreman_omaha do
         requires_foreman '>= 3.0'
 
+        automatic_assets(false)
+        precompile_assets(['foreman_omaha/version_breakdown.css', 'foreman_omaha/application.js'])
+
         apipie_documented_controllers ["#{ForemanOmaha::Engine.root}/app/controllers/api/v2/*.rb"]
 
         register_custom_status HostStatus::OmahaStatus

data/lib/foreman_omaha/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanOmaha
-  VERSION = '5.0.0'
+  VERSION = '5.0.1'
 end

data/test/unit/charts/oem_distribution_test.rb

@@ -17,10 +17,8 @@ module ForemanOmaha
         end
 
         test 'calculates the oem distribution' do
-          expected = [
-            { :label => 'rackspace', :data => 5 }
-          ]
-          assert_equal(expected, oem_distribition_chart.to_chart_data.sort_by { |e| e[:label] })
+          expected = [['rackspace', 5]]
+          assert_same_elements expected, oem_distribition_chart.to_chart_data
         end
       end
     end

data/test/unit/charts/status_distribution_test.rb

@@ -18,11 +18,8 @@ module ForemanOmaha
         end
 
         test 'calculates the status distribution' do
-          expected = [
-            { :label => 'Complete', :data => 5, :color => '#89A54E' },
-            { :label => 'Downloading', :data => 3, :color => '#3D96AE' }
-          ]
-          assert_equal(expected, status_distribition_chart.to_chart_data.sort_by { |e| e[:label] })
+          expected = [['Complete', 5], ['Downloading', 3]]
+          assert_same_elements expected, status_distribition_chart.to_chart_data
         end
       end
     end

data/test/unit/charts/version_distribution_test.rb

@@ -18,11 +18,8 @@ module ForemanOmaha
         end
 
         test 'calculates the version distribution' do
-          expected = [
-            { :label => '1068.9.0', :data => 5 },
-            { :label => '1465.7.0', :data => 7 }
-          ]
-          assert_equal(expected, version_distribition_chart.to_chart_data.sort_by { |e| e[:label] })
+          expected = [['1068.9.0', 5], ['1465.7.0', 7]]
+          assert_same_elements expected, version_distribition_chart.to_chart_data
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_omaha
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - Timo Goebel
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-25 00:00:00.000000000 Z
+date: 2022-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-matchheight-rails
@@ -204,7 +204,7 @@ homepage: http://github.com/theforeman/foreman_omaha
 licenses:
 - GPL-3
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -219,32 +219,32 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: This plug-in adds support for the Omaha procotol to The Foreman.
 test_files:
-- test/unit/omaha_fact_parser_test.rb
-- test/unit/charts/version_distribution_test.rb
-- test/unit/charts/oem_distribution_test.rb
-- test/unit/charts/status_distribution_test.rb
-- test/unit/group_version_breakdown_test.rb
-- test/unit/host_test.rb
-- test/unit/host_status/omaha_status_test.rb
-- test/unit/renderer_test.rb
-- test/unit/omaha_report_test.rb
-- test/graphql/queries/omaha_group_query_test.rb
-- test/graphql/queries/omaha_report_query_test.rb
-- test/graphql/queries/omaha_groups_query_test.rb
-- test/graphql/queries/omaha_reports_query_test.rb
-- test/graphql/queries/host_query_extensions_test.rb
-- test/factories/smart_proxy.rb
 - test/factories/feature.rb
-- test/factories/host.rb
 - test/factories/foreman_omaha_factories.rb
-- test/test_plugin_helper.rb
-- test/functional/omaha_groups_controller_test.rb
-- test/functional/omaha_hosts_controller_test.rb
+- test/factories/host.rb
+- test/factories/smart_proxy.rb
 - test/functional/api/v2/omaha_groups_controller_test.rb
 - test/functional/api/v2/omaha_reports_controller_test.rb
+- test/functional/omaha_groups_controller_test.rb
+- test/functional/omaha_hosts_controller_test.rb
 - test/functional/omaha_reports_controller_test.rb
+- test/graphql/queries/host_query_extensions_test.rb
+- test/graphql/queries/omaha_group_query_test.rb
+- test/graphql/queries/omaha_groups_query_test.rb
+- test/graphql/queries/omaha_report_query_test.rb
+- test/graphql/queries/omaha_reports_query_test.rb
+- test/test_plugin_helper.rb
+- test/unit/charts/oem_distribution_test.rb
+- test/unit/charts/status_distribution_test.rb
+- test/unit/charts/version_distribution_test.rb
+- test/unit/group_version_breakdown_test.rb
+- test/unit/host_status/omaha_status_test.rb
+- test/unit/host_test.rb
+- test/unit/omaha_fact_parser_test.rb
+- test/unit/omaha_report_test.rb
+- test/unit/renderer_test.rb