foreman_leapp 0.1.7 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f53abbd1654c96303f55576990e18b12ebf75b4f90721fc07e33ecee98ec391
-  data.tar.gz: 4057361799540b43773a321c20cb964d33dc6afe88af4e735c01a78dee971405
+  metadata.gz: b1891f98edb810793eaf892578ca6a2fdafe87be017e1e3ee370ebbd008baaeb
+  data.tar.gz: 3a618bb3303b275113dc3ddaae440971f6f17939d274e4d0263c66424d5511b8
 SHA512:
-  metadata.gz: f2bda54c06b4c2b313023721d447ef06a61c0351cc0c38a3d98c31900b70213ee4b414fd7ac61f5386ace70ca9ac1d9253d9f431a44e4fdcdd482d2684186d21
-  data.tar.gz: 3e3a8acc3c78e88aa282989c3c66a7ee80feabaec1c21ee85ebab5b1364066ef44a731ea54350637102b2b1a2ff28a04f28318bc23a58090da48741f7105681f
+  metadata.gz: 652a75504d5ccfb8b20580043c02335547d0ab1d763f936329558499d9e4bdfe1958c6fc091c76fc8c55a77babeb8b2beb89c655afc8c5ae33f48cf4494a0372
+  data.tar.gz: 05b6c03d647d507262bb8f7847c87da4cb97facc0ea20d139fd90e788e37bc51664de0bd56d5bba0f89c0731e40eff8f02daadf0beba2dc890a6a2fced63e44e

data/config/routes.rb

@@ -4,7 +4,8 @@ Rails.application.routes.draw do
   resources :preupgrade_reports, :only => %i[index]
 
   namespace :api, defaults: { format: 'json' } do
-    scope '(:apiv)', module: :v2, defaults: { apiv: 'v2' }, apiv: /v2/, constraints: ApiConstraints.new( version: 2, default: true) do
+    scope '(:apiv)', module: :v2, defaults: { apiv: 'v2' }, apiv: /v2/,
+          constraints: ApiConstraints.new( version: 2, default: true) do
       resources :preupgrade_reports, only: %i[index show]
       get 'job_invocations/:id/preupgrade_reports', to: 'preupgrade_reports#job_invocation'
     end

data/db/seeds.d/10_leapp_preupgrade.rb

@@ -4,6 +4,14 @@ organizations = Organization.unscoped.all
 locations = Location.unscoped.all
 User.as_anonymous_admin do
   RemoteExecutionFeature.without_auditing do
+    if Rails.env.test? || Foreman.in_rake?
+      # If this file tries to import a template with a REX feature in a SeedsTest,
+      # it will fail - the REX feature isn't registered on SeedsTest because
+      # DatabaseCleaner truncates the db before every test.
+      # During db:seed, we also want to know the feature is registered before
+      # seeding the template
+      ForemanLeapp::Engine.register_rex_features
+    end
     JobTemplate.without_auditing do
       Dir[File.join("#{ForemanLeapp::Engine.root}/app/views/foreman_leapp/"\
                     'job_templates/**/*.erb')].each do |template|

data/lib/foreman_leapp/engine.rb

@@ -21,7 +21,7 @@ module ForemanLeapp
 
     initializer 'foreman_leapp.register_plugin', before: :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_leapp do
-        requires_foreman '>= 2.1'
+        requires_foreman '>= 3.2'
 
         apipie_documented_controllers ["#{ForemanLeapp::Engine.root}/app/controllers/api/v2/*.rb"]
         extend_template_helpers ForemanLeapp::TemplateHelper
@@ -36,6 +36,11 @@ module ForemanLeapp
                              ::Helpers::JobHelper.correct_feature?(subject, 'leapp_remediation_plan')
                          }
         end
+
+        security_block :foreman_leapp do
+          permission :view_job_invocations, { :preupgrade_reports => %i[index show job_invocation],
+                                              'api/v2/preupgrade_reports' => %i[index show job_invocation] }
+        end
       end
     end
 
@@ -48,26 +53,7 @@ module ForemanLeapp
         Rails.logger.warn "ForemanLeapp: skipping engine hook (#{e})"
       end
 
-      RemoteExecutionFeature.register(
-        :leapp_preupgrade,
-        N_('Preupgrade check with Leapp'),
-        description: N_('Upgradeability check for RHEL 7 host'),
-        host_action_button: false
-      )
-
-      RemoteExecutionFeature.register(
-        :leapp_upgrade,
-        N_('Upgrade with Leapp'),
-        description: N_('Run Leapp upgrade job for RHEL 7 host'),
-        host_action_button: false
-      )
-
-      RemoteExecutionFeature.register(
-        :leapp_remediation_plan,
-        N_('Remediation plan'),
-        description: N_('Run Remediation plan with Leapp'),
-        host_action_button: false
-      )
+      ForemanLeapp::Engine.register_rex_features
     end
 
     rake_tasks do
@@ -97,5 +83,28 @@ module ForemanLeapp
     initializer 'foreman_leapp.apipie' do
       Apipie.configuration.checksum_path += ['/api/']
     end
+
+    def self.register_rex_features
+      RemoteExecutionFeature.register(
+        :leapp_preupgrade,
+        N_('Preupgrade check with Leapp'),
+        description: N_('Upgradeability check for RHEL 7 host'),
+        host_action_button: false
+      )
+
+      RemoteExecutionFeature.register(
+        :leapp_upgrade,
+        N_('Upgrade with Leapp'),
+        description: N_('Run Leapp upgrade job for RHEL 7 host'),
+        host_action_button: false
+      )
+
+      RemoteExecutionFeature.register(
+        :leapp_remediation_plan,
+        N_('Remediation plan'),
+        description: N_('Run Remediation plan with Leapp'),
+        host_action_button: false
+      )
+    end
   end
 end

data/lib/foreman_leapp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanLeapp
-  VERSION = '0.1.7'
+  VERSION = '0.1.10'
 end

data/webpack/__mocks__/foremanReact/components/Pagination.js

@@ -0,0 +1,2 @@
+const Pagination = () => jest.fn();
+export default Pagination;

data/webpack/components/PreupgradeReports/PreupgradeReportsHelpers.js

@@ -57,9 +57,9 @@ export const idsForInvocationFromReports = reports =>
   idsForInvocationFromEntries(flattenEntries(reports));
 
 export const entriesPage = (entries, pagination) => {
-  const offset = (pagination.page - 1) * pagination.perPage;
+  const offset = (pagination.page - 1) * pagination.per_page;
 
-  return entries.slice(offset, offset + pagination.perPage);
+  return entries.slice(offset, offset + pagination.per_page);
 };
 
 export const filterEntries = (attribute, value, entries) => {

data/webpack/components/PreupgradeReports/__tests__/__snapshots__/PreupgradeReportsHelpers.test.js.snap

@@ -131,31 +131,7 @@ Array [
 ]
 `;
 
-exports[`PreupgradeReportsHelpers should return entries page 1`] = `
-Array [
-  Object {
-    "flags": Array [],
-    "hostname": "foo.example.com",
-    "id": 45,
-    "severity": "low",
-    "title": "Not enough credits",
-  },
-  Object {
-    "flags": Array [],
-    "hostname": "foo.example.com",
-    "id": 46,
-    "severity": "medium",
-    "title": "SELinux is turned off",
-  },
-  Object {
-    "flags": Array [],
-    "hostname": "foo.example.com",
-    "id": 47,
-    "severity": "medium",
-    "title": "Root password is too short",
-  },
-]
-`;
+exports[`PreupgradeReportsHelpers should return entries page 1`] = `Array []`;
 
 exports[`PreupgradeReportsHelpers should return fixable entries 1`] = `
 Array [

data/webpack/components/PreupgradeReportsList/__tests__/__snapshots__/PreupgradeReportsList.test.js.snap

@@ -59,23 +59,9 @@ exports[`PreupgradeReportsList should render 1`] = `
     key="3"
     toggleSelected={[Function]}
   />
-  <PaginationWrapper
-    dropdownButtonId="preupgrade-report-entries-pagination-dropdown"
+  <Pagination
     itemCount={4}
     onChange={[Function]}
-    pagination={
-      Object {
-        "page": 1,
-        "perPage": 20,
-        "perPageOptions": Array [
-          5,
-          10,
-          20,
-          30,
-          50,
-        ],
-      }
-    }
     viewType="list"
   />
 </ListView>
@@ -140,23 +126,9 @@ exports[`PreupgradeReportsList should render when working 1`] = `
     key="3"
     toggleSelected={[Function]}
   />
-  <PaginationWrapper
-    dropdownButtonId="preupgrade-report-entries-pagination-dropdown"
+  <Pagination
     itemCount={4}
     onChange={[Function]}
-    pagination={
-      Object {
-        "page": 1,
-        "perPage": 20,
-        "perPageOptions": Array [
-          5,
-          10,
-          20,
-          30,
-          50,
-        ],
-      }
-    }
     viewType="list"
   />
 </ListView>

data/webpack/components/PreupgradeReportsList/index.js

@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import { ListView } from 'patternfly-react';
 import PropTypes from 'prop-types';
 
-import Pagination from 'foremanReact/components/Pagination/PaginationWrapper';
+import Pagination from 'foremanReact/components/Pagination';
 import { useForemanSettings } from 'foremanReact/Root/Context/ForemanContext';
 
 import PreupgradeReportEntry from './components/PreupgradeReportEntry';
@@ -22,7 +22,7 @@ const PreupgradeReportsList = ({
   const { perPage, perPageOptions } = useForemanSettings();
   const [pagination, setPagination] = useState({
     page: 1,
-    perPage,
+    per_page: perPage,
     perPageOptions,
   });
 
@@ -44,9 +44,7 @@ const PreupgradeReportsList = ({
       <Pagination
         viewType="list"
         itemCount={allEntries.length}
-        pagination={pagination}
         onChange={newPage => setPagination({ ...pagination, ...newPage })}
-        dropdownButtonId="preupgrade-report-entries-pagination-dropdown"
       />
     </ListView>
   );

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_leapp
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.10
 platform: ruby
 authors:
 - Foreman Leapp team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-30 00:00:00.000000000 Z
+date: 2022-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_remote_execution
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: foreman_ansible
   requirement: !ruby/object:Gem::Requirement
@@ -58,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.2'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.80'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.80'
 description: A Foreman plugin to support inplace RHEL 7 -> RHEL 8 upgrades with Leapp
   utility.
 email:
@@ -134,7 +114,7 @@ files:
 - test/unit/helpers/job_helper_test.rb
 - webpack/__mocks__/foremanReact/Root/Context/ForemanContext.js
 - webpack/__mocks__/foremanReact/common/I18n.js
-- webpack/__mocks__/foremanReact/components/Pagination/PaginationWrapper.js
+- webpack/__mocks__/foremanReact/components/Pagination.js
 - webpack/__mocks__/foremanReact/components/common/EmptyState.js
 - webpack/__mocks__/foremanReact/components/common/MessageBox.js
 - webpack/components/PreupgradeReports/PreupgradeReports.js
@@ -199,11 +179,11 @@ files:
 - webpack/index.js
 - webpack/reducer.js
 - webpack/testSetup.js
-homepage: https://github.com/oamg/foreman_leapp
+homepage: https://github.com/theforeman/foreman_leapp
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -218,8 +198,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: A Foreman plugin for Leapp utility.
 test_files:

data/webpack/__mocks__/foremanReact/components/Pagination/PaginationWrapper.js

@@ -1,2 +0,0 @@
-const PaginationWrapper = () => jest.fn();
-export default PaginationWrapper;