foreman_leapp 0.0.6 → 0.1.4

data/locale/foreman_leapp.pot

@@ -1,19 +1,175 @@
-# foreman_leapp
-#
-# This file is distributed under the same license as foreman_leapp.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the foreman_leapp package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: version 0.0.1\n"
+"Project-Id-Version: foreman_leapp 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-20 08:46+0100\n"
-"PO-Revision-Date: 2014-08-20 08:46+0100\n"
-"Last-Translator: Foreman Team <foreman-dev@googlegroups.com>\n"
-"Language-Team: Foreman Team <foreman-dev@googlegroups.com>\n"
+"POT-Creation-Date: 2020-07-20 08:46+0200\n"
+"PO-Revision-Date: 2020-07-20 08:46+0200\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
+#: ../app/controllers/api/v2/concerns/api_authorizer.rb:16
+msgid "Missing one of the required permissions: view_hosts"
+msgstr ""
+
+#: ../app/controllers/api/v2/preupgrade_reports_controller.rb:10
+msgid "List Preupgrade reports"
+msgstr ""
+
+#: ../app/controllers/api/v2/preupgrade_reports_controller.rb:16
+msgid "Show Preupgrade report"
+msgstr ""
+
+#: ../app/controllers/api/v2/preupgrade_reports_controller.rb:22
+msgid "List Preupgrade reports for Job invocation"
+msgstr ""
+
+#: ../app/helpers/concerns/foreman_leapp/hosts_helper_extensions.rb:6
+#: ../app/helpers/concerns/foreman_leapp/hosts_helper_extensions.rb:11
+#: ../lib/foreman_leapp/engine.rb:53
+msgid "Preupgrade check with Leapp"
+msgstr ""
+
+#: ../app/helpers/concerns/foreman_leapp/hosts_helper_extensions.rb:7
+#: ../app/helpers/concerns/foreman_leapp/hosts_helper_extensions.rb:13
+#: ../lib/foreman_leapp/engine.rb:60
+msgid "Upgrade with Leapp"
+msgstr ""
+
+#: ../app/helpers/concerns/foreman_leapp/remote_execution_helper_extension.rb:8
+msgid "Rerun preupgrade check"
+msgstr ""
+
+#:
+#: ../app/helpers/concerns/foreman_leapp/remote_execution_helper_extension.rb:11
+msgid "Run Leapp Preupgrade check again"
+msgstr ""
+
+#: ../lib/foreman_leapp/engine.rb:32
+msgid "Leapp preupgrade report"
+msgstr ""
+
+#: ../lib/foreman_leapp/engine.rb:54
+msgid "Upgradeability check for RHEL 7 host"
+msgstr ""
+
+#: ../lib/foreman_leapp/engine.rb:61
+msgid "Run Leapp upgrade job for RHEL 7 host"
+msgstr ""
+
+#: ../lib/foreman_leapp/engine.rb:67
+msgid "Remediation plan"
+msgstr ""
+
+#: ../lib/foreman_leapp/engine.rb:68
+msgid "Run Remediation plan with Leapp"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:19
+#: ../webpack/components/PreupgradeReportsList/components/PreupgradeReportsListHeader.js:38
+msgid "Title"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:20
+#: ../webpack/components/PreupgradeReportsList/components/PreupgradeReportsListHeader.js:13
+msgid "Risk Factor"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:21
+#: ../webpack/components/PreupgradeReportsList/components/PreupgradeReportsListHeader.js:12
+msgid "Host"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:22
+msgid "Fix Type"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:23
+#: ../webpack/components/PreupgradeReportsList/components/InhibitorInfoItem.js:21
+msgid "Inhibitor"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:27
+#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:35
+#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:41
+msgid "All"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:28
+msgid "Low"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:29
+msgid "Medium"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:30
+msgid "High"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:31
+msgid "Info"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:36
+msgid "Hint"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:37
+msgid "Command"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:42
+msgid "Yes"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:43
+msgid "No"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/FixSelectedButton.js:12
+msgid "Fix Selected"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/NoReports.js:17
+msgid "The preupgrade report will be available after the job finishes"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/NoReports.js:25
+msgid "No Preupgrade Report Available"
+msgstr ""
+
+#: ../webpack/components/PreupgradeReports/components/UpgradeAllButton.js:13
+msgid "Run Upgrade"
+msgstr ""
+
+#:
+#: ../webpack/components/PreupgradeReportsList/components/InhibitorInfoItem.js:17
+msgid "This issue inhibits the upgrade."
+msgstr ""
+
+#:
+#: ../webpack/components/PreupgradeReportsList/components/PreupgradeReportsListHeader.js:14
+msgid "Has Remediation?"
+msgstr ""
+
+#:
+#: ../webpack/components/PreupgradeReportsList/components/PreupgradeReportsListHeader.js:15
+msgid "Inhibitor?"
+msgstr ""
+
+#: gemspec.rb:4
+msgid ""
+"A foreman plugin to support inplace RHEL 7 -> RHEL 8 upgrades with Leapp utili"
+"ty."
+msgstr ""

data/package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "lint": "tfm-lint --plugin -d /webpack",
     "link-leapp-js": "./script/link_leapp_js.sh",
-    "test": "tfm-test --plugin",
+    "test": "tfm-test --plugin --config jest.config.js",
     "test:watch": "tfm-test --plugin --watchAll",
     "test:current": "tfm-test --plugin --watch",
     "publish-coverage": "tfm-publish-coverage",
@@ -32,10 +32,11 @@
     "@theforeman/builder": "^4.2.1",
     "@theforeman/eslint-plugin-foreman": "4.2.1",
     "@theforeman/stories": "^4.2.1",
-    "@theforeman/vendor-dev": "^4.2.1",
     "@theforeman/test": "^4.2.1",
+    "@theforeman/vendor-dev": "^4.2.1",
     "babel-eslint": "^10.0.0",
     "eslint": "^6.8.0",
+    "jest-svg-transformer": "^1.0.0",
     "prettier": "^1.19.1"
   },
   "dependencies": {

data/test/functional/api/v2/preupgrade_reports_controller_test.rb

@@ -7,24 +7,107 @@ module Api
     class PreupgradeReportsControllerTest < ActionController::TestCase
       setup do
         @host = FactoryBot.create(:host)
-        @report = FactoryBot.create(:preupgrade_report, host: @host)
+        @job_invocation = FactoryBot.create(:job_invocation)
+        @report = FactoryBot.create(:preupgrade_report, host: @host, job_invocation: @job_invocation)
         @entry = FactoryBot.create(:preupgrade_report_entry, host: @host, preupgrade_report: @report)
       end
 
-      test 'should get index' do
-        get :index, session: set_session_user
+      test 'should get :index' do
+        get :index
         assert_response :success
-        assert_not_empty ActiveSupport::JSON.decode(@response.body)['results']
+        assert_not_empty JSON.parse(@response.body)['results']
       end
 
-      test 'should get detail of report and its entries' do
+      test 'should get :show' do
         get :show, params: { id: @report.id }
         assert_response :success
 
-        response = ActiveSupport::JSON.decode(@response.body)
+        response = JSON.parse(@response.body)
         assert_equal response['id'], @report.id
         assert_not_empty response['preupgrade_report_entries']
       end
+
+      test 'should get :job_invocation' do
+        get :job_invocation, params: { id: @job_invocation.id }
+        assert_response :success
+        assert_not_empty JSON.parse(@response.body)['results']
+      end
+
+      context 'with permissions' do
+        setup do
+          @user = FactoryBot.create(:user, admin: false)
+          setup_user('view', 'job_invocations', nil, @user)
+          setup_user('view', 'hosts', nil, @user)
+        end
+
+        test 'should get :index' do
+          get :index, session: set_session_user(@user)
+          assert_response :success
+          assert_not_empty JSON.parse(@response.body)['results']
+        end
+
+        test 'should get :show' do
+          get :show, params: { id: @report.id }, session: set_session_user(@user)
+          assert_response :success
+          assert_equal @report.id, JSON.parse(@response.body)['id']
+        end
+
+        test 'should get :job_invocation' do
+          get :job_invocation, params: { id: @job_invocation.id }, session: set_session_user(@user)
+          assert_response :success
+          assert_not_empty JSON.parse(@response.body)['results']
+        end
+      end
+
+      context 'without :view_job_invocations' do
+        setup do
+          @user = FactoryBot.create(:user, admin: false)
+          setup_user('view', 'hosts', nil, @user)
+        end
+
+        test 'should not get :index' do
+          get :index, session: set_session_user(@user)
+          assert_response :forbidden
+          assert_includes JSON.parse(@response.body)['error']['missing_permissions'], 'view_job_invocations'
+        end
+
+        test 'should not get :show' do
+          get :show, params: { id: @report.id }, session: set_session_user(@user)
+          assert_response :forbidden
+          assert_includes JSON.parse(@response.body)['error']['missing_permissions'], 'view_job_invocations'
+        end
+
+        test 'should not get :job_invocation' do
+          get :job_invocation, params: { id: @job_invocation.id }, session: set_session_user(@user)
+          assert_response :forbidden
+          assert_includes JSON.parse(@response.body)['error']['missing_permissions'], 'view_job_invocations'
+        end
+      end
+
+      context 'without :view_hosts' do
+        setup do
+          @user = FactoryBot.create(:user, admin: false)
+          setup_user('view', 'job_invocations', nil, @user)
+        end
+
+        test 'should not get :index' do
+          get :index, session: set_session_user(@user)
+          assert_response :forbidden
+          assert_includes JSON.parse(@response.body)['error']['missing_permissions'], 'view_hosts'
+        end
+
+        test 'should not get :job_invocation' do
+          get :show, params: { id: @report.id }, session: set_session_user(@user)
+          assert_response :forbidden
+          assert_includes JSON.parse(@response.body)['error']['missing_permissions'], 'view_hosts'
+        end
+
+        test 'should not get :job_invocation' do
+          get :job_invocation, params: { id: @job_invocation.id }, session: set_session_user(@user)
+          assert_response :forbidden
+          assert_includes JSON.parse(@response.body)['error']['missing_permissions'], 'view_hosts'
+        end
+      end
     end
   end
 end

data/test/functional/preupgrade_reports_controller_test.rb

@@ -4,13 +4,36 @@ require 'test_plugin_helper'
 
 class PreupgradeReportsControllerTest < ActionController::TestCase
   setup do
+    @user = FactoryBot.create(:user, admin: false)
     @host = FactoryBot.create :host
     FactoryBot.create :preupgrade_report, host: @host
   end
 
-  test 'should get index' do
-    get :index, session: set_session_user
-    response = ActiveSupport::JSON.decode(@response.body)
-    assert_equal @host.id, response['results'].first['host_id']
+  test 'should get :index' do
+    get :index
+    assert_response :success
+    assert_not_empty JSON.parse(@response.body)['results']
+  end
+
+  test 'should get :index with :view_job_invocations & :view_hosts' do
+    setup_user 'view', 'job_invocations', nil, @user
+    setup_user 'view', 'hosts', nil, @user
+    get :index, session: set_session_user(@user)
+    assert_response :success
+    assert_not_empty JSON.parse(@response.body)['results']
+  end
+
+  test 'should not get :index without :view_job_invocations' do
+    setup_user 'view', 'hosts', nil, @user
+    get :index, session: set_session_user(@user)
+    assert_response :forbidden
+    assert_includes JSON.parse(@response.body)['error']['missing_permissions'], 'view_job_invocations'
+  end
+
+  test 'should not get :index without :view_hosts' do
+    setup_user 'view', 'job_invocations', nil, @user
+    get :index, session: set_session_user(@user)
+    assert_response :forbidden
+    assert_includes JSON.parse(@response.body)['error']['missing_permissions'], 'view_hosts'
   end
 end

data/test/unit/actions/preupgrade_job_test.rb

@@ -11,7 +11,7 @@ module ForemanLeapp
       FactoryBot.create(:job_template, template: 'echo "1"', job_category: 'leapp',
                                        provider_type: 'SSH', name: 'Leapp preupgrade')
     end
-    let(:job_invocation) { FactoryBot.create(:job_invocation, job_category: ::ForemanLeapp::JOB_CATEGORY) }
+    let(:job_invocation) { FactoryBot.create(:job_invocation) }
     let(:template_invocation) do
       FactoryBot.create(:template_invocation, template: job_template, job_invocation: job_invocation)
     end

data/test/unit/helpers/job_helper_test.rb

@@ -5,12 +5,12 @@ require 'test_plugin_helper'
 module Helpers
   class JobHelperTest < ActionView::TestCase
     let(:helper) { ::Helpers::JobHelper }
-    # let(:host) { FactoryBot.create(:host) }
+
     let(:job_template) do
       FactoryBot.create(:job_template, template: 'echo "1"', job_category: 'leapp',
                                        provider_type: 'SSH', name: 'Leapp preupgrade')
     end
-    let(:job_invocation) { FactoryBot.create(:job_invocation, job_category: ::ForemanLeapp::JOB_CATEGORY) }
+    let(:job_invocation) { FactoryBot.create(:job_invocation) }
 
     describe 'correct_feature?' do
       setup do
@@ -18,17 +18,10 @@ module Helpers
         FactoryBot.create(:template_invocation, template: job_template, job_invocation: job_invocation)
       end
 
-      it 'correct category & feature' do
+      it 'correct feature' do
         assert helper.correct_feature?(job_invocation, 'leapp_preupgrade')
       end
 
-      it 'wrong category' do
-        job_invocation = FactoryBot.create(:job_invocation, job_category: 'NOPE')
-        FactoryBot.create(:template_invocation, template: job_template, job_invocation: job_invocation)
-
-        assert_not helper.correct_feature?(job_invocation, 'leapp_preupgrade')
-      end
-
       it 'wrong feature' do
         assert_not helper.correct_feature?(job_invocation, 'leapp_preupgrade2')
       end

data/webpack/__mocks__/foremanReact/common/I18n.js

@@ -1 +1 @@
-export const translate = () => jest.fn();
+export const translate = val => val;

data/webpack/__mocks__/foremanReact/components/common/EmptyState.js

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

data/webpack/components/PreupgradeReports/PreupgradeReports.js

@@ -1,24 +1,118 @@
-import React from 'react';
+import React, { useState } from 'react';
 import MessageBox from 'foremanReact/components/common/MessageBox';
 import { LoadingState, Row } from 'patternfly-react';
 import PropTypes from 'prop-types';
 
 import PreupgradeReportsList from '../PreupgradeReportsList';
-import FixAllButton from './components/FixAllButton';
+import UpgradeAllButton from './components/UpgradeAllButton';
+import EntriesFilter from './components/EntriesFilter';
+import FixSelectedButton from './components/FixSelectedButton';
 
 import {
   flattenEntries,
   isEmpty,
   anyEntriesFixable,
+  filterEntries,
+  idsForInvocationFromEntries,
+  sortEntries,
+  fixableEntries,
 } from './PreupgradeReportsHelpers';
 
+import NoReports from './components/NoReports';
+
 const PreupgradeReports = ({
   preupgradeReports,
-  loading,
-  error,
   csrfToken,
   newJobInvocationUrl,
 }) => {
+  const [filterType, setFilterType] = useState('title');
+  const [filterValue, setFilterValue] = useState('');
+  const [checked, setChecked] = useState([]);
+  const [sort, setSort] = useState({ attribute: '', order: 'desc' });
+
+  const onFilterValueChange = value => {
+    setFilterValue(value);
+  };
+
+  const onFilterValueClear = () => setFilterValue('');
+
+  const onFilterTypeChange = value => {
+    onFilterValueClear();
+    setFilterType(value);
+  };
+
+  const isSelected = entry => checked.some(item => item.id === entry.id);
+
+  const anySelected = checked.length > 0;
+
+  const toggleSelected = (entry, isEntrySelected) => {
+    if (isEntrySelected) {
+      setChecked(checked.filter(item => item.id !== entry.id));
+    } else {
+      setChecked([entry, ...checked]);
+    }
+  };
+
+  const toggleSelectAll = () => {
+    const allFixable = fixableEntries(preupgradeReports);
+
+    if (checked.length === allFixable.length) {
+      setChecked([]);
+    } else {
+      setChecked(allFixable);
+    }
+  };
+
+  const changeSort = value => {
+    setSort({ ...sort, ...value });
+  };
+
+  return (
+    <React.Fragment>
+      <Row>
+        <div className="col-md-8">
+          <EntriesFilter
+            filterType={filterType}
+            onFilterTypeChange={onFilterTypeChange}
+            filterValue={filterValue}
+            onFilterValueChange={onFilterValueChange}
+          />
+        </div>
+        <div className="col-md-4">
+          <div className="btn-toolbar pull-right">
+            <FixSelectedButton
+              postUrl={newJobInvocationUrl}
+              disabled={!anyEntriesFixable(preupgradeReports) || !anySelected}
+              csrfToken={csrfToken}
+              ids={idsForInvocationFromEntries(checked)}
+            />
+            <UpgradeAllButton
+              postUrl={newJobInvocationUrl}
+              csrfToken={csrfToken}
+              preupgradeReports={preupgradeReports}
+            />
+          </div>
+        </div>
+      </Row>
+      <PreupgradeReportsList
+        allEntries={filterEntries(
+          filterType,
+          filterValue,
+          sortEntries(flattenEntries(preupgradeReports), sort)
+        )}
+        isSelected={isSelected}
+        toggleSelected={toggleSelected}
+        sort={sort}
+        changeSort={changeSort}
+        toggleSelectAll={toggleSelectAll}
+      />
+    </React.Fragment>
+  );
+};
+
+const withLoadingState = Component => props => {
+  const { error, loading, preupgradeReports, reportsExpected } = props;
+
   if (!isEmpty(error)) {
     return (
       <MessageBox
@@ -31,30 +125,19 @@ const PreupgradeReports = ({
 
   return (
     <LoadingState loading={loading}>
-      <Row>
-        <div className="title-filter col-md-4">&nbsp;</div>
-        <div id="title_action" className="col-md-8">
-          <div className="btn-toolbar pull-right">
-            <FixAllButton
-              postUrl={newJobInvocationUrl}
-              disabled={!anyEntriesFixable(preupgradeReports)}
-              csrfToken={csrfToken}
-              preupgradeReports={preupgradeReports}
-            />
-          </div>
-        </div>
-      </Row>
-      <PreupgradeReportsList allEntries={flattenEntries(preupgradeReports)} />
+      {preupgradeReports.length > 0 ? (
+        <Component {...props} />
+      ) : (
+        <NoReports reportsExpected={reportsExpected} />
+      )}
     </LoadingState>
   );
 };
 
 PreupgradeReports.propTypes = {
   preupgradeReports: PropTypes.array.isRequired,
-  loading: PropTypes.bool.isRequired,
-  error: PropTypes.object.isRequired,
   csrfToken: PropTypes.string.isRequired,
   newJobInvocationUrl: PropTypes.string.isRequired,
 };
 
-export default PreupgradeReports;
+export default withLoadingState(PreupgradeReports);