foreman_openscap 8.0.0 → 8.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cff46602347754ec7072e88a2033eafc6815b7898909fe6b4e0fc1bd7502749a
-  data.tar.gz: ae676b964339af51be73f77bdf2be8da05fc7d4250a73fc9d727c5324edc7086
+  metadata.gz: 3bf645bb17178ebf3a7845c4955f6b100814e3fcae13f834bcaa4b94522e6d67
+  data.tar.gz: e5a773297d59f9d7f81c3a26085b73534424149aac6dec6a205798d98f3764e2
 SHA512:
-  metadata.gz: 4ff495ee8c3ca45fc5e658e1def666fe971ff6fc2cb8a43f245c6ecbfb579ac0506b2215770eb2c30a95d5e74ae1128f831dfd356f91593fa0b5718940d0b14a
-  data.tar.gz: 4696593f4916854a2e5b616d8c40dafdaa25b974b07d0067fa0188fdbf8b6541be5768e549735853c348b4f4f5be48b839a16a6183d4ce2f346ca9155ac8c58a
+  metadata.gz: c51175dfdebd026cf1cd0f75a77cb04b10ed2c1fbdb05c74557a5385ff390b6b6e979f5ec7433229e965fb35ab8528c7d817a368d16b3483ca8ac80f228f3341
+  data.tar.gz: df041f57fe9dfa77f4568579c0294f92d2c7ce16b391884cc35fce39c2c60447b0aa648ee2c9edb8bd3322dc0c6ae1bccbf9d8b6bca0296cd32a3b89f53c51b4

data/app/models/concerns/foreman_openscap/compliance_status_scoped_search.rb

@@ -109,11 +109,15 @@ module ForemanOpenscap
 
     included do
       if ForemanOpenscap.with_katello?
-        has_one :lifecycle_environment, :through => :host
+        has_one :content_facet, :through => :host
+        has_many :content_view_environment_content_facets, through: :content_facet, class_name: 'Katello::ContentViewEnvironmentContentFacet'
+        has_many :content_view_environments, through: :content_view_environment_content_facets
+        has_many :content_views, through: :content_view_environments
+        has_many :lifecycle_environments, through: :content_view_environments
 
         has_many :host_collections, :through => :host
 
-        scoped_search :relation => :lifecycle_environment, :on => :name, :complete_value => true, :rename => :lifecycle_environment
+        scoped_search :relation => :lifecycle_environments, :on => :name, :complete_value => true, :rename => :lifecycle_environment
         scoped_search :relation => :host_collections, :on => :name, :complete_value => true, :rename => :host_collection,
                       :operators => ['= ', '!= '], :ext_method => :search_by_host_collection_name
       end

data/app/models/concerns/foreman_openscap/hostgroup_extensions.rb

@@ -5,8 +5,8 @@ module ForemanOpenscap
     include InheritedPolicies
 
     included do
-      has_one :asset, :as => :assetable, :class_name => "::ForemanOpenscap::Asset", dependent: :destroy
-      has_many :asset_policies, :through => :asset, :class_name => "::ForemanOpenscap::AssetPolicy"
+      has_many :assets, :as => :assetable, :class_name => "::ForemanOpenscap::Asset", dependent: :destroy
+      has_many :asset_policies, :through => :assets, :class_name => "::ForemanOpenscap::AssetPolicy"
       has_many :policies, :through => :asset_policies, :class_name => "::ForemanOpenscap::Policy"
     end
 

data/app/models/foreman_openscap/asset.rb

@@ -1,6 +1,6 @@
 module ForemanOpenscap
   class Asset < ApplicationRecord
-    has_many :asset_policies
+    has_many :asset_policies, :dependent => :delete_all
     has_many :policies, :through => :asset_policies
     belongs_to :assetable, :polymorphic => true
 

data/db/migrate/20240426143215_remove_orphaned_asset_policies.rb

@@ -0,0 +1,6 @@
+class RemoveOrphanedAssetPolicies < ActiveRecord::Migration[6.0]
+  def up
+    orphaned_asset_policy_ids = ForemanOpenscap::AssetPolicy.left_outer_joins(:asset).where(asset: { id: nil }).pluck(:asset_id)
+    ForemanOpenscap::AssetPolicy.where(asset_id: orphaned_asset_policy_ids).delete_all
+  end
+end

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "8.0.0".freeze
+  VERSION = "8.0.1".freeze
 end

data/test/unit/concerns/hostgroup_extensions_test.rb

@@ -0,0 +1,10 @@
+require 'test_plugin_helper'
+
+class HostgroupExtensionsTest < ActiveSupport::TestCase
+  test "should remove all linked assets on hostgroup destroy" do
+    hostgroup = FactoryBot.create(:hostgroup)
+    FactoryBot.create_list(:asset, 3, :assetable_id => hostgroup.id, :assetable_type => 'Hostgroup')
+    asset_scope = ::ForemanOpenscap::Asset.where(:assetable_id => hostgroup.id, :assetable_type => 'Hostgroup')
+    assert_difference("asset_scope.count", -3) { hostgroup.destroy }
+  end
+end

data/webpack/components/OpenscapRemediationWizard/steps/ReviewHosts.js

@@ -1,3 +1,4 @@
+/* eslint-disable camelcase */
 import React, { useContext, useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import {
@@ -160,11 +161,18 @@ const ReviewHosts = () => {
   const columns = {
     name: {
       title: __('Name'),
-      wrapper: ({ id, name }) => <a href={foremanUrl(`hosts/${id}`)}>{name}</a>,
+      wrapper: ({ id, display_name: displayName }) => (
+        <a href={foremanUrl(`hosts/${id}`)}>{displayName}</a>
+      ),
       isSorted: true,
+      weight: 50,
+      isRequired: true,
     },
-    operatingsystem_name: {
+    os_title: {
       title: __('OS'),
+      wrapper: hostDetails => hostDetails?.operatingsystem_name,
+      isSorted: true,
+      weight: 200,
     },
   };
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.0.1
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-26 00:00:00.000000000 Z
+date: 2024-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -326,6 +326,7 @@ files:
 - db/migrate/20210409095625_add_oval_policy_reference_to_cve.rb
 - db/migrate/20210819143316_drop_unused_tables.rb
 - db/migrate/20230912122310_add_fixes_to_message.rb
+- db/migrate/20240426143215_remove_orphaned_asset_policies.rb
 - db/seeds.d/75-job_templates.rb
 - db/seeds.d/openscap_feature.rb
 - db/seeds.d/openscap_policy_notification.rb
@@ -449,6 +450,7 @@ files:
 - test/unit/arf_report_test.rb
 - test/unit/compliance_status_test.rb
 - test/unit/concerns/host_extensions_test.rb
+- test/unit/concerns/hostgroup_extensions_test.rb
 - test/unit/concerns/openscap_proxy_extenstions_test.rb
 - test/unit/message_cleaner_test.rb
 - test/unit/openscap_host_test.rb
@@ -635,6 +637,7 @@ test_files:
 - test/unit/arf_report_test.rb
 - test/unit/compliance_status_test.rb
 - test/unit/concerns/host_extensions_test.rb
+- test/unit/concerns/hostgroup_extensions_test.rb
 - test/unit/concerns/openscap_proxy_extenstions_test.rb
 - test/unit/message_cleaner_test.rb
 - test/unit/openscap_host_test.rb