foreman_leapp 0.1.2 → 0.1.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (26) hide show
  1. checksums.yaml +4 -4
  2. data/app/lib/helpers/job_helper.rb +3 -4
  3. data/app/views/foreman_leapp/job_templates/{check.erb → leapp_check.erb} +1 -0
  4. data/app/views/foreman_leapp/job_templates/{preupgrade.erb → leapp_preupgrade.erb} +3 -2
  5. data/app/views/foreman_leapp/job_templates/{remediation.erb → leapp_remediation.erb} +4 -3
  6. data/app/views/foreman_leapp/job_templates/{upgrade.erb → leapp_upgrade.erb} +4 -3
  7. data/db/seeds.d/10_leapp_preupgrade.rb +1 -1
  8. data/lib/foreman_leapp/engine.rb +2 -4
  9. data/lib/foreman_leapp/version.rb +1 -1
  10. data/locale/action_names.rb +6 -0
  11. data/locale/en/foreman_leapp.po +104 -2
  12. data/locale/foreman_leapp.pot +164 -8
  13. data/package.json +6 -6
  14. data/test/unit/actions/preupgrade_job_test.rb +1 -1
  15. data/test/unit/helpers/job_helper_test.rb +3 -10
  16. data/webpack/components/PreupgradeReports/PreupgradeReports.js +3 -3
  17. data/webpack/components/PreupgradeReports/components/EntriesFilter.js +1 -1
  18. data/webpack/components/PreupgradeReports/components/UpgradeAllButton.js +15 -16
  19. data/webpack/components/PreupgradeReports/components/__snapshots__/EntriesFilter.test.js.snap +4 -4
  20. data/webpack/components/PreupgradeReports/components/__snapshots__/UpgradeAllButton.test.js.snap +12 -0
  21. data/webpack/components/PreupgradeReportsList/components/PreupgradeReportsListHeader.js +1 -1
  22. data/webpack/components/PreupgradeReportsList/components/__tests__/__snapshots__/PreupgradeReportEntry.test.js.snap +2 -2
  23. data/webpack/components/PreupgradeReportsList/components/__tests__/__snapshots__/PreupgradeReportsListHeader.test.js.snap +1 -1
  24. data/webpack/components/PreupgradeReportsList/components/__tests__/__snapshots__/helpers.test.js.snap +1 -1
  25. data/webpack/components/PreupgradeReportsList/components/helpers.js +4 -4
  26. metadata +18 -11
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 20a8b95728d37a13354b85aad5ab0c27dd6ec96ac248f30f7786ffeb769047c1
4
- data.tar.gz: f87a224721de93faa6923cb9db3e4a92dae7bb6e4813c4b8f7c9b515bfb789b0
3
+ metadata.gz: 0f53abbd1654c96303f55576990e18b12ebf75b4f90721fc07e33ecee98ec391
4
+ data.tar.gz: 4057361799540b43773a321c20cb964d33dc6afe88af4e735c01a78dee971405
5
5
  SHA512:
6
- metadata.gz: d3bc726e4aa2c21789ecb7d615e1de19df419501f04e141a4a8de60f951902fa6ce76f665428a5b2c564c32fa7e094260b99fa0528dd9dccc6dd55216e68becf
7
- data.tar.gz: 2d76583bdc24a72b8faf91da3ecd9f04475135af429fab8e2505ac4d3dcc206bcd40b51a3ee6486b196581b011722e7c9f39e4f5eff17aa25793005aafa2ad3b
6
+ metadata.gz: f2bda54c06b4c2b313023721d447ef06a61c0351cc0c38a3d98c31900b70213ee4b414fd7ac61f5386ace70ca9ac1d9253d9f431a44e4fdcdd482d2684186d21
7
+ data.tar.gz: 3e3a8acc3c78e88aa282989c3c66a7ee80feabaec1c21ee85ebab5b1364066ef44a731ea54350637102b2b1a2ff28a04f28318bc23a58090da48741f7105681f
@@ -4,10 +4,9 @@ module Helpers
4
4
  module JobHelper
5
5
  class << self
6
6
  def correct_feature?(job_invocation, feature)
7
- job_invocation.job_category == ::ForemanLeapp::JOB_CATEGORY &&
8
- RemoteExecutionFeature.find_by(job_template_id: job_invocation.pattern_template_invocations
9
- .pluck(:template_id)
10
- .first)&.label == feature
7
+ RemoteExecutionFeature.where(job_template_id: job_invocation.pattern_template_invocations
8
+ .first
9
+ .template_id, label: feature).any?
11
10
  end
12
11
  end
13
12
  end
@@ -5,6 +5,7 @@ kind: job_template
5
5
  job_category: Leapp
6
6
  provider_type: SSH
7
7
  snippet: true
8
+ model: JobTemplate
8
9
  %>
9
10
 
10
11
  if ! command -v leapp > /dev/null
@@ -1,16 +1,17 @@
1
1
  <%#
2
2
  kind: job_template
3
3
  name: Run preupgrade via Leapp
4
- job_category: Leapp
4
+ job_category: Leapp - Preupgrade
5
5
  description_format: 'Upgradeability check for RHEL 7 host'
6
6
  provider_type: SSH
7
7
  feature: leapp_preupgrade
8
+ model: JobTemplate
8
9
  %>
9
10
 
10
11
  <%= render_template 'Check Leapp' %>
11
12
 
13
+ rm -f /var/log/leapp/leapp-report.json
12
14
  leapp preupgrade
13
15
 
14
16
  echo "===leap_upgrade_report_start==="
15
17
  cat /var/log/leapp/leapp-report.json
16
- rm -f /var/log/leapp/leapp-report.json
@@ -1,10 +1,11 @@
1
1
  <%#
2
2
  kind: job_template
3
- name: Remediation plan
4
- job_category: Leapp
5
- description_format: 'Run Remediation plan with Leapp'
3
+ name: Run remediation plan via Leapp
4
+ job_category: Other
5
+ description_format: 'Run remediation plan via Leapp'
6
6
  provider_type: SSH
7
7
  feature: leapp_remediation_plan
8
+ model: JobTemplate
8
9
  template_inputs:
9
10
  - name: remediation_ids
10
11
  required: true
@@ -1,10 +1,11 @@
1
1
  <%#
2
2
  kind: job_template
3
3
  name: Run upgrade via Leapp
4
- job_category: Ansible Playbook
4
+ job_category: Leapp - Upgrade
5
5
  description_format: 'Upgrade RHEL 7 host'
6
6
  provider_type: Ansible
7
7
  feature: leapp_upgrade
8
+ model: JobTemplate
8
9
  template_inputs:
9
10
  - name: Reboot
10
11
  description: Reboot the host automaticaly to continue with the upgrade
@@ -18,8 +19,8 @@ template_inputs:
18
19
  tasks:
19
20
  - name: Run Leapp Upgrade
20
21
  command: leapp upgrade
21
- <% if input('Reboot') == "true" %>
22
+ <%- if input('Reboot') == "true" -%>
22
23
  - name: Reboot the machine
23
24
  reboot:
24
25
  reboot_timeout: 1800
25
- <% end %>
26
+ <%- end -%>
@@ -9,7 +9,7 @@ User.as_anonymous_admin do
9
9
  'job_templates/**/*.erb')].each do |template|
10
10
  template = JobTemplate.import_raw!(File.read(template),
11
11
  :default => true,
12
- :locked => true,
12
+ :lock => true,
13
13
  :update => true)
14
14
  template.organizations = organizations if template.present?
15
15
  template.locations = locations if template.present?
@@ -1,8 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module ForemanLeapp
4
- JOB_CATEGORY = 'Leapp'
5
-
6
4
  class Engine < ::Rails::Engine
7
5
  engine_name 'foreman_leapp'
8
6
 
@@ -44,8 +42,8 @@ module ForemanLeapp
44
42
  # Include concerns in this config.to_prepare block
45
43
  config.to_prepare do
46
44
  begin
47
- HostsHelper.prepend ForemanLeapp::HostsHelperExtensions
48
- Host::JobInvocation.include ForemanLeapp::JobInvocationExtensions
45
+ ::HostsHelper.prepend ForemanLeapp::HostsHelperExtensions
46
+ ::JobInvocation.include ForemanLeapp::JobInvocationExtensions
49
47
  rescue StandardError => e
50
48
  Rails.logger.warn "ForemanLeapp: skipping engine hook (#{e})"
51
49
  end
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module ForemanLeapp
4
- VERSION = '0.1.2'
4
+ VERSION = '0.1.7'
5
5
  end
@@ -0,0 +1,6 @@
1
+ # Autogenerated!
2
+ _("Preupgrade job")
3
+ _("Remote action:")
4
+ _("Import Puppet classes")
5
+ _("Import facts")
6
+ _("Action with sub plans")
@@ -2,12 +2,10 @@
2
2
  #
3
3
  # This file is distributed under the same license as foreman_leapp.
4
4
  #
5
- #, fuzzy
6
5
  msgid ""
7
6
  msgstr ""
8
7
  "Project-Id-Version: version 0.0.1\n"
9
8
  "Report-Msgid-Bugs-To: \n"
10
- "POT-Creation-Date: 2014-08-20 08:46+0100\n"
11
9
  "PO-Revision-Date: 2014-08-20 08:54+0100\n"
12
10
  "Last-Translator: Foreman Team <foreman-dev@googlegroups.com>\n"
13
11
  "Language-Team: Foreman Team <foreman-dev@googlegroups.com>\n"
@@ -17,3 +15,107 @@ msgstr ""
17
15
  "Content-Transfer-Encoding: 8bit\n"
18
16
  "Plural-Forms: nplurals=2; plural=(n != 1);\n"
19
17
 
18
+ msgid "A foreman plugin to support inplace RHEL 7 -> RHEL 8 upgrades with Leapp utility."
19
+ msgstr ""
20
+
21
+ msgid "All"
22
+ msgstr ""
23
+
24
+ msgid "Command"
25
+ msgstr ""
26
+
27
+ msgid "Fix Selected"
28
+ msgstr ""
29
+
30
+ msgid "Fix Type"
31
+ msgstr ""
32
+
33
+ msgid "Has Remediation?"
34
+ msgstr ""
35
+
36
+ msgid "High"
37
+ msgstr ""
38
+
39
+ msgid "Hint"
40
+ msgstr ""
41
+
42
+ msgid "Host"
43
+ msgstr ""
44
+
45
+ msgid "Info"
46
+ msgstr ""
47
+
48
+ msgid "Inhibitor"
49
+ msgstr ""
50
+
51
+ msgid "Inhibitor?"
52
+ msgstr ""
53
+
54
+ msgid "Leapp preupgrade report"
55
+ msgstr ""
56
+
57
+ msgid "List Preupgrade reports"
58
+ msgstr ""
59
+
60
+ msgid "List Preupgrade reports for Job invocation"
61
+ msgstr ""
62
+
63
+ msgid "Low"
64
+ msgstr ""
65
+
66
+ msgid "Medium"
67
+ msgstr ""
68
+
69
+ msgid "Missing one of the required permissions: view_hosts"
70
+ msgstr ""
71
+
72
+ msgid "No"
73
+ msgstr ""
74
+
75
+ msgid "No Preupgrade Report Available"
76
+ msgstr ""
77
+
78
+ msgid "Preupgrade check with Leapp"
79
+ msgstr ""
80
+
81
+ msgid "Remediation plan"
82
+ msgstr ""
83
+
84
+ msgid "Rerun preupgrade check"
85
+ msgstr ""
86
+
87
+ msgid "Risk Factor"
88
+ msgstr ""
89
+
90
+ msgid "Run Leapp Preupgrade check again"
91
+ msgstr ""
92
+
93
+ msgid "Run Leapp upgrade job for RHEL 7 host"
94
+ msgstr ""
95
+
96
+ msgid "Run Remediation plan with Leapp"
97
+ msgstr ""
98
+
99
+ msgid "Run Upgrade"
100
+ msgstr ""
101
+
102
+ msgid "Show Preupgrade report"
103
+ msgstr ""
104
+
105
+ msgid "The preupgrade report will be available after the job finishes"
106
+ msgstr ""
107
+
108
+ msgid "This issue inhibits the upgrade."
109
+ msgstr ""
110
+
111
+ msgid "Title"
112
+ msgstr ""
113
+
114
+ msgid "Upgrade with Leapp"
115
+ msgstr ""
116
+
117
+ msgid "Upgradeability check for RHEL 7 host"
118
+ msgstr ""
119
+
120
+ msgid "Yes"
121
+ msgstr ""
@@ -1,19 +1,175 @@
1
- # foreman_leapp
2
- #
3
- # This file is distributed under the same license as foreman_leapp.
1
+ # SOME DESCRIPTIVE TITLE.
2
+ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3
+ # This file is distributed under the same license as the foreman_leapp package.
4
+ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
4
5
  #
5
6
  #, fuzzy
6
7
  msgid ""
7
8
  msgstr ""
8
- "Project-Id-Version: version 0.0.1\n"
9
+ "Project-Id-Version: foreman_leapp 1.0.0\n"
9
10
  "Report-Msgid-Bugs-To: \n"
10
- "POT-Creation-Date: 2014-08-20 08:46+0100\n"
11
- "PO-Revision-Date: 2014-08-20 08:46+0100\n"
12
- "Last-Translator: Foreman Team <foreman-dev@googlegroups.com>\n"
13
- "Language-Team: Foreman Team <foreman-dev@googlegroups.com>\n"
11
+ "POT-Creation-Date: 2020-07-20 08:46+0200\n"
12
+ "PO-Revision-Date: 2020-07-20 08:46+0200\n"
13
+ "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
+ "Language-Team: LANGUAGE <LL@li.org>\n"
14
15
  "Language: \n"
15
16
  "MIME-Version: 1.0\n"
16
17
  "Content-Type: text/plain; charset=UTF-8\n"
17
18
  "Content-Transfer-Encoding: 8bit\n"
18
19
  "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
19
20
 
21
+ #: ../app/controllers/api/v2/concerns/api_authorizer.rb:16
22
+ msgid "Missing one of the required permissions: view_hosts"
23
+ msgstr ""
24
+
25
+ #: ../app/controllers/api/v2/preupgrade_reports_controller.rb:10
26
+ msgid "List Preupgrade reports"
27
+ msgstr ""
28
+
29
+ #: ../app/controllers/api/v2/preupgrade_reports_controller.rb:16
30
+ msgid "Show Preupgrade report"
31
+ msgstr ""
32
+
33
+ #: ../app/controllers/api/v2/preupgrade_reports_controller.rb:22
34
+ msgid "List Preupgrade reports for Job invocation"
35
+ msgstr ""
36
+
37
+ #: ../app/helpers/concerns/foreman_leapp/hosts_helper_extensions.rb:6
38
+ #: ../app/helpers/concerns/foreman_leapp/hosts_helper_extensions.rb:11
39
+ #: ../lib/foreman_leapp/engine.rb:53
40
+ msgid "Preupgrade check with Leapp"
41
+ msgstr ""
42
+
43
+ #: ../app/helpers/concerns/foreman_leapp/hosts_helper_extensions.rb:7
44
+ #: ../app/helpers/concerns/foreman_leapp/hosts_helper_extensions.rb:13
45
+ #: ../lib/foreman_leapp/engine.rb:60
46
+ msgid "Upgrade with Leapp"
47
+ msgstr ""
48
+
49
+ #: ../app/helpers/concerns/foreman_leapp/remote_execution_helper_extension.rb:8
50
+ msgid "Rerun preupgrade check"
51
+ msgstr ""
52
+
53
+ #:
54
+ #: ../app/helpers/concerns/foreman_leapp/remote_execution_helper_extension.rb:11
55
+ msgid "Run Leapp Preupgrade check again"
56
+ msgstr ""
57
+
58
+ #: ../lib/foreman_leapp/engine.rb:32
59
+ msgid "Leapp preupgrade report"
60
+ msgstr ""
61
+
62
+ #: ../lib/foreman_leapp/engine.rb:54
63
+ msgid "Upgradeability check for RHEL 7 host"
64
+ msgstr ""
65
+
66
+ #: ../lib/foreman_leapp/engine.rb:61
67
+ msgid "Run Leapp upgrade job for RHEL 7 host"
68
+ msgstr ""
69
+
70
+ #: ../lib/foreman_leapp/engine.rb:67
71
+ msgid "Remediation plan"
72
+ msgstr ""
73
+
74
+ #: ../lib/foreman_leapp/engine.rb:68
75
+ msgid "Run Remediation plan with Leapp"
76
+ msgstr ""
77
+
78
+ #: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:19
79
+ #: ../webpack/components/PreupgradeReportsList/components/PreupgradeReportsListHeader.js:38
80
+ msgid "Title"
81
+ msgstr ""
82
+
83
+ #: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:20
84
+ #: ../webpack/components/PreupgradeReportsList/components/PreupgradeReportsListHeader.js:13
85
+ msgid "Risk Factor"
86
+ msgstr ""
87
+
88
+ #: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:21
89
+ #: ../webpack/components/PreupgradeReportsList/components/PreupgradeReportsListHeader.js:12
90
+ msgid "Host"
91
+ msgstr ""
92
+
93
+ #: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:22
94
+ msgid "Fix Type"
95
+ msgstr ""
96
+
97
+ #: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:23
98
+ #: ../webpack/components/PreupgradeReportsList/components/InhibitorInfoItem.js:21
99
+ msgid "Inhibitor"
100
+ msgstr ""
101
+
102
+ #: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:27
103
+ #: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:35
104
+ #: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:41
105
+ msgid "All"
106
+ msgstr ""
107
+
108
+ #: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:28
109
+ msgid "Low"
110
+ msgstr ""
111
+
112
+ #: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:29
113
+ msgid "Medium"
114
+ msgstr ""
115
+
116
+ #: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:30
117
+ msgid "High"
118
+ msgstr ""
119
+
120
+ #: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:31
121
+ msgid "Info"
122
+ msgstr ""
123
+
124
+ #: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:36
125
+ msgid "Hint"
126
+ msgstr ""
127
+
128
+ #: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:37
129
+ msgid "Command"
130
+ msgstr ""
131
+
132
+ #: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:42
133
+ msgid "Yes"
134
+ msgstr ""
135
+
136
+ #: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:43
137
+ msgid "No"
138
+ msgstr ""
139
+
140
+ #: ../webpack/components/PreupgradeReports/components/FixSelectedButton.js:12
141
+ msgid "Fix Selected"
142
+ msgstr ""
143
+
144
+ #: ../webpack/components/PreupgradeReports/components/NoReports.js:17
145
+ msgid "The preupgrade report will be available after the job finishes"
146
+ msgstr ""
147
+
148
+ #: ../webpack/components/PreupgradeReports/components/NoReports.js:25
149
+ msgid "No Preupgrade Report Available"
150
+ msgstr ""
151
+
152
+ #: ../webpack/components/PreupgradeReports/components/UpgradeAllButton.js:13
153
+ msgid "Run Upgrade"
154
+ msgstr ""
155
+
156
+ #:
157
+ #: ../webpack/components/PreupgradeReportsList/components/InhibitorInfoItem.js:17
158
+ msgid "This issue inhibits the upgrade."
159
+ msgstr ""
160
+
161
+ #:
162
+ #: ../webpack/components/PreupgradeReportsList/components/PreupgradeReportsListHeader.js:14
163
+ msgid "Has Remediation?"
164
+ msgstr ""
165
+
166
+ #:
167
+ #: ../webpack/components/PreupgradeReportsList/components/PreupgradeReportsListHeader.js:15
168
+ msgid "Inhibitor?"
169
+ msgstr ""
170
+
171
+ #: gemspec.rb:4
172
+ msgid ""
173
+ "A foreman plugin to support inplace RHEL 7 -> RHEL 8 upgrades with Leapp utili"
174
+ "ty."
175
+ msgstr ""
data/package.json CHANGED
@@ -25,15 +25,15 @@
25
25
  },
26
26
  "homepage": "https://github.com/oamg/foreman_leapp",
27
27
  "peerDependencies": {
28
- "@theforeman/vendor": ">= 4.2.1"
28
+ "@theforeman/vendor": ">= 8.3.3"
29
29
  },
30
30
  "devDependencies": {
31
31
  "@babel/core": "^7.7.0",
32
- "@theforeman/builder": "^4.2.1",
33
- "@theforeman/eslint-plugin-foreman": "4.2.1",
34
- "@theforeman/stories": "^4.2.1",
35
- "@theforeman/test": "^4.2.1",
36
- "@theforeman/vendor-dev": "^4.2.1",
32
+ "@theforeman/builder": "^8.3.3",
33
+ "@theforeman/eslint-plugin-foreman": "8.3.3",
34
+ "@theforeman/stories": "^8.3.3",
35
+ "@theforeman/test": "^8.3.3",
36
+ "@theforeman/vendor-dev": "^8.3.3",
37
37
  "babel-eslint": "^10.0.0",
38
38
  "eslint": "^6.8.0",
39
39
  "jest-svg-transformer": "^1.0.0",
@@ -11,7 +11,7 @@ module ForemanLeapp
11
11
  FactoryBot.create(:job_template, template: 'echo "1"', job_category: 'leapp',
12
12
  provider_type: 'SSH', name: 'Leapp preupgrade')
13
13
  end
14
- let(:job_invocation) { FactoryBot.create(:job_invocation, job_category: ::ForemanLeapp::JOB_CATEGORY) }
14
+ let(:job_invocation) { FactoryBot.create(:job_invocation) }
15
15
  let(:template_invocation) do
16
16
  FactoryBot.create(:template_invocation, template: job_template, job_invocation: job_invocation)
17
17
  end
@@ -5,12 +5,12 @@ require 'test_plugin_helper'
5
5
  module Helpers
6
6
  class JobHelperTest < ActionView::TestCase
7
7
  let(:helper) { ::Helpers::JobHelper }
8
- # let(:host) { FactoryBot.create(:host) }
8
+
9
9
  let(:job_template) do
10
10
  FactoryBot.create(:job_template, template: 'echo "1"', job_category: 'leapp',
11
11
  provider_type: 'SSH', name: 'Leapp preupgrade')
12
12
  end
13
- let(:job_invocation) { FactoryBot.create(:job_invocation, job_category: ::ForemanLeapp::JOB_CATEGORY) }
13
+ let(:job_invocation) { FactoryBot.create(:job_invocation) }
14
14
 
15
15
  describe 'correct_feature?' do
16
16
  setup do
@@ -18,17 +18,10 @@ module Helpers
18
18
  FactoryBot.create(:template_invocation, template: job_template, job_invocation: job_invocation)
19
19
  end
20
20
 
21
- it 'correct category & feature' do
21
+ it 'correct feature' do
22
22
  assert helper.correct_feature?(job_invocation, 'leapp_preupgrade')
23
23
  end
24
24
 
25
- it 'wrong category' do
26
- job_invocation = FactoryBot.create(:job_invocation, job_category: 'NOPE')
27
- FactoryBot.create(:template_invocation, template: job_template, job_invocation: job_invocation)
28
-
29
- assert_not helper.correct_feature?(job_invocation, 'leapp_preupgrade')
30
- end
31
-
32
25
  it 'wrong feature' do
33
26
  assert_not helper.correct_feature?(job_invocation, 'leapp_preupgrade2')
34
27
  end
@@ -110,8 +110,8 @@ const PreupgradeReports = ({
110
110
  );
111
111
  };
112
112
 
113
- const withLoadingState = Component => props => {
114
- const { error, loading, preupgradeReports, reportsExpected } = props;
113
+ const withLoadingState = Component => componentProps => {
114
+ const { error, loading, preupgradeReports, reportsExpected } = componentProps;
115
115
 
116
116
  if (!isEmpty(error)) {
117
117
  return (
@@ -126,7 +126,7 @@ const withLoadingState = Component => props => {
126
126
  return (
127
127
  <LoadingState loading={loading}>
128
128
  {preupgradeReports.length > 0 ? (
129
- <Component {...props} />
129
+ <Component {...componentProps} />
130
130
  ) : (
131
131
  <NoReports reportsExpected={reportsExpected} />
132
132
  )}
@@ -17,7 +17,7 @@ const EntriesFilter = ({
17
17
 
18
18
  const filterTypes = [
19
19
  { value: 'title', label: __('Title') },
20
- { value: 'severity', label: __('Severity') },
20
+ { value: 'severity', label: __('Risk Factor') },
21
21
  { value: 'hostname', label: __('Host') },
22
22
  { value: 'fix', label: __('Fix Type') },
23
23
  { value: 'inhibitor', label: __('Inhibitor') },
@@ -3,22 +3,21 @@ import PropTypes from 'prop-types';
3
3
  import { Button } from 'patternfly-react';
4
4
  import { translate as __ } from 'foremanReact/common/I18n';
5
5
 
6
- import { idsForInvocationFromReports } from '../PreupgradeReportsHelpers';
7
-
8
- const UpgradeAllButton = ({ preupgradeReports, postUrl, csrfToken }) => {
9
- const { hostIds } = idsForInvocationFromReports(preupgradeReports);
10
-
11
- return (
12
- <form action={postUrl} method="post">
13
- <Button type="submit">{__('Run Upgrade')}</Button>
14
- <input type="hidden" name="authenticity_token" value={csrfToken} />
15
- <input type="hidden" name="feature" value="leapp_upgrade" />
16
- {hostIds.map(hostId => (
17
- <input type="hidden" name="host_ids[]" key={hostId} value={hostId} />
18
- ))}
19
- </form>
20
- );
21
- };
6
+ const UpgradeAllButton = ({ preupgradeReports, postUrl, csrfToken }) => (
7
+ <form action={postUrl} method="post">
8
+ <Button type="submit">{__('Run Upgrade')}</Button>
9
+ <input type="hidden" name="authenticity_token" value={csrfToken} />
10
+ <input type="hidden" name="feature" value="leapp_upgrade" />
11
+ {preupgradeReports.map(report => (
12
+ <input
13
+ type="hidden"
14
+ name="host_ids[]"
15
+ key={report.hostId}
16
+ value={report.hostId}
17
+ />
18
+ ))}
19
+ </form>
20
+ );
22
21
 
23
22
  UpgradeAllButton.propTypes = {
24
23
  preupgradeReports: PropTypes.array.isRequired,
@@ -41,7 +41,7 @@ exports[`EntriresFilter should render for host filter 1`] = `
41
41
  key="severity"
42
42
  onClick={[Function]}
43
43
  >
44
- Severity
44
+ Risk Factor
45
45
  </MenuItem>
46
46
  <MenuItem
47
47
  active={true}
@@ -112,7 +112,7 @@ exports[`EntriresFilter should render for severity filter 1`] = `
112
112
  <DropdownButton
113
113
  componentClass={[Function]}
114
114
  id="entry-filter"
115
- title="Severity"
115
+ title="Risk Factor"
116
116
  >
117
117
  <MenuItem
118
118
  active={false}
@@ -134,7 +134,7 @@ exports[`EntriresFilter should render for severity filter 1`] = `
134
134
  key="severity"
135
135
  onClick={[Function]}
136
136
  >
137
- Severity
137
+ Risk Factor
138
138
  </MenuItem>
139
139
  <MenuItem
140
140
  active={false}
@@ -277,7 +277,7 @@ exports[`EntriresFilter should render for title filter 1`] = `
277
277
  key="severity"
278
278
  onClick={[Function]}
279
279
  >
280
- Severity
280
+ Risk Factor
281
281
  </MenuItem>
282
282
  <MenuItem
283
283
  active={false}
@@ -25,5 +25,17 @@ exports[`UpgradeAllButton should render 1`] = `
25
25
  type="hidden"
26
26
  value="leapp_upgrade"
27
27
  />
28
+ <input
29
+ key="5"
30
+ name="host_ids[]"
31
+ type="hidden"
32
+ value={5}
33
+ />
34
+ <input
35
+ key="6"
36
+ name="host_ids[]"
37
+ type="hidden"
38
+ value={6}
39
+ />
28
40
  </form>
29
41
  `;
@@ -10,7 +10,7 @@ import SortableHeaderItem from './SortableHeaderItem';
10
10
  const PreupgradeReportsListHeader = ({ sort, changeSort, toggleSelectAll }) => {
11
11
  const additionalInfoColumns = [
12
12
  { label: __('Host'), value: 'hostname' },
13
- { label: __('Severity'), value: 'severity' },
13
+ { label: __('Risk Factor'), value: 'severity' },
14
14
  { label: __('Has Remediation?'), value: 'fix' },
15
15
  { label: __('Inhibitor?'), value: 'inhibitor' },
16
16
  ];
@@ -20,7 +20,7 @@ exports[`PreupgradeReportEntry should render 1`] = `
20
20
  stacked={false}
21
21
  >
22
22
  <img
23
- alt="Low Severity"
23
+ alt="Low Risk Factor"
24
24
  className="severity-img"
25
25
  src={[Function]}
26
26
  />
@@ -116,7 +116,7 @@ exports[`PreupgradeReportEntry should render 1`] = `
116
116
  md={8}
117
117
  >
118
118
  <img
119
- alt="Low Severity"
119
+ alt="Low Risk Factor"
120
120
  className="severity-img"
121
121
  key="5-7-sv5"
122
122
  src={[Function]}
@@ -36,7 +36,7 @@ exports[`PreupgradeReportsListHeader should render 1`] = `
36
36
  "order": "asc",
37
37
  }
38
38
  }
39
- title="Severity"
39
+ title="Risk Factor"
40
40
  value="severity"
41
41
  />
42
42
  </strong>
@@ -92,7 +92,7 @@ exports[`PreupgradeReportList/helpers should return severity 1`] = `
92
92
  md={8}
93
93
  >
94
94
  <img
95
- alt="High Severity"
95
+ alt="High Risk Factor"
96
96
  className="severity-img"
97
97
  src={[Function]}
98
98
  />
@@ -24,7 +24,7 @@ export const getSeverityImg = entry => {
24
24
  <img
25
25
  key={key}
26
26
  src={SeverityLow}
27
- alt="Low Severity"
27
+ alt="Low Risk Factor"
28
28
  className="severity-img"
29
29
  />
30
30
  );
@@ -33,7 +33,7 @@ export const getSeverityImg = entry => {
33
33
  <img
34
34
  key={key}
35
35
  src={SeverityMedium}
36
- alt="Medium Severity"
36
+ alt="Medium Risk Factor"
37
37
  className="severity-img"
38
38
  />
39
39
  );
@@ -42,7 +42,7 @@ export const getSeverityImg = entry => {
42
42
  <img
43
43
  key={key}
44
44
  src={SeverityHigh}
45
- alt="High Severity"
45
+ alt="High Risk Factor"
46
46
  className="severity-img"
47
47
  />
48
48
  );
@@ -51,7 +51,7 @@ export const getSeverityImg = entry => {
51
51
  <img
52
52
  key={key}
53
53
  src={SeverityLow}
54
- alt="Low Severity"
54
+ alt="Low Risk Factor"
55
55
  className="severity-img"
56
56
  />
57
57
  );
metadata CHANGED
@@ -1,41 +1,47 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman_leapp
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.2
4
+ version: 0.1.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Foreman Leapp team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-05-12 00:00:00.000000000 Z
11
+ date: 2021-03-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: foreman_remote_execution
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - "~>"
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
19
  version: '3.2'
20
+ - - "<"
21
+ - !ruby/object:Gem::Version
22
+ version: '5.0'
20
23
  type: :runtime
21
24
  prerelease: false
22
25
  version_requirements: !ruby/object:Gem::Requirement
23
26
  requirements:
24
- - - "~>"
27
+ - - ">="
25
28
  - !ruby/object:Gem::Version
26
29
  version: '3.2'
30
+ - - "<"
31
+ - !ruby/object:Gem::Version
32
+ version: '5.0'
27
33
  - !ruby/object:Gem::Dependency
28
34
  name: foreman_ansible
29
35
  requirement: !ruby/object:Gem::Requirement
30
36
  requirements:
31
- - - "~>"
37
+ - - ">="
32
38
  - !ruby/object:Gem::Version
33
39
  version: '5.0'
34
40
  type: :runtime
35
41
  prerelease: false
36
42
  version_requirements: !ruby/object:Gem::Requirement
37
43
  requirements:
38
- - - "~>"
44
+ - - ">="
39
45
  - !ruby/object:Gem::Version
40
46
  version: '5.0'
41
47
  - !ruby/object:Gem::Dependency
@@ -93,10 +99,10 @@ files:
93
99
  - app/views/api/v2/preupgrade_reports/index.json.rabl
94
100
  - app/views/api/v2/preupgrade_reports/job_invocation.json.rabl
95
101
  - app/views/api/v2/preupgrade_reports/show.json.rabl
96
- - app/views/foreman_leapp/job_templates/check.erb
97
- - app/views/foreman_leapp/job_templates/preupgrade.erb
98
- - app/views/foreman_leapp/job_templates/remediation.erb
99
- - app/views/foreman_leapp/job_templates/upgrade.erb
102
+ - app/views/foreman_leapp/job_templates/leapp_check.erb
103
+ - app/views/foreman_leapp/job_templates/leapp_preupgrade.erb
104
+ - app/views/foreman_leapp/job_templates/leapp_remediation.erb
105
+ - app/views/foreman_leapp/job_templates/leapp_upgrade.erb
100
106
  - app/views/job_invocations/_leapp_preupgrade_report.html.erb
101
107
  - app/views/preupgrade_report_entries/base.json.rabl
102
108
  - app/views/preupgrade_reports/index.json.rabl
@@ -112,6 +118,7 @@ files:
112
118
  - lib/foreman_leapp/version.rb
113
119
  - lib/tasks/foreman_leapp_tasks.rake
114
120
  - locale/Makefile
121
+ - locale/action_names.rb
115
122
  - locale/en/foreman_leapp.po
116
123
  - locale/foreman_leapp.pot
117
124
  - locale/gemspec.rb
@@ -211,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
211
218
  - !ruby/object:Gem::Version
212
219
  version: '0'
213
220
  requirements: []
214
- rubygems_version: 3.0.3
221
+ rubygems_version: 3.1.4
215
222
  signing_key:
216
223
  specification_version: 4
217
224
  summary: A Foreman plugin for Leapp utility.