foreman_leapp 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac3a9d3e20cffd15a2af9742b3db9f7a85e8b2e431de19f87d7bd4a9a0085126
-  data.tar.gz: 7c4ff5f9d6eef8f247bd24132503dce1cc56e4252e268d68373d8b1ee7d29293
+  metadata.gz: a75680a7afc44c4a8e90727d2319a53b231748a6db1f8a1c3627c319b3483902
+  data.tar.gz: 8506877b49e172205eeadb3a898d9ee5e8e1235525155673d52b98efdfb7441f
 SHA512:
-  metadata.gz: 256603788044ab3fbc6d8ad94c4407dfbddaf6617fc330df1f2bdbee00e89b43652a653e5ac92eb0ed9f5e8480620c701c76eb7431420c2985fc03e6620a0708
-  data.tar.gz: 8c941412d342bf483ce90409c38d2f30ad153c6680168791fc8221d7706c61cd034549c529d88f257d4760b0b95c43f7da196e13fdd1fda914e6cd1a40123785
+  metadata.gz: 18a93546178c2252cd530f913d98633e24808dbf66698ddff5d4249d2eec0c9df2513447a304df59cd55e4b54c0bcefb31cae0713dd002ca1895bb78bb19be28
+  data.tar.gz: 4993f008708cdb78a9defd9cd311cadb7396e75ad16f0827675ab32e0361e5ad5154810d3e8b1d5f9504d1db2849c6aebe9addae16006a9ff8698b70719b2247

data/app/views/foreman_leapp/job_templates/upgrade.erb

@@ -1,9 +1,9 @@
 <%#
 kind: job_template
 name: Run upgrade via Leapp
-job_category: Leapp
+job_category: Ansible Playbook
 description_format: 'Upgrade RHEL 7 host'
-provider_type: SSH
+provider_type: Ansible
 feature: leapp_upgrade
 template_inputs:
 - name: reboot
@@ -12,5 +12,13 @@ template_inputs:
   required: false
   options: "false\ntrue"
 %>
-
-leapp upgrade <%= "--reboot" if input('reboot') == "true" %>
+---
+- hosts: all
+  tasks:
+    - name: Run Leapp Upgrade
+      command: leapp upgrade
+<% if input('reboot') == "true" %>
+    - name: Reboot the machine
+      reboot:
+        reboot_timeout: 1800
+<% end %>

data/app/views/job_invocations/_leapp_preupgrade_report.html.erb

@@ -6,5 +6,6 @@
 <% end %>
 
 <%= react_component('PreupgradeReports', {
-  :url => preupgrade_reports_path(:search => "job_invocation_id = #{@job_invocation.id}")
+  :url => preupgrade_reports_path(:search => "job_invocation_id = #{@job_invocation.id}"),
+  :newJobInvocationUrl => new_job_invocation_path
 }) %>

data/lib/foreman_leapp/version.rb

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

data/webpack/__mocks__/foremanReact/Root/Context/ForemanContext.js

@@ -0,0 +1,4 @@
+export const useForemanSettings = () => ({
+  perPage: 20,
+  perPageOptions: [5, 10, 20, 30, 50],
+});

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

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

data/webpack/components/PreupgradeReports/PreupgradeReports.js

@@ -1,12 +1,25 @@
 import React from 'react';
 import MessageBox from 'foremanReact/components/common/MessageBox';
-import { LoadingState } from 'patternfly-react';
+import { LoadingState, Row } from 'patternfly-react';
 import PropTypes from 'prop-types';
 
 import PreupgradeReportsList from '../PreupgradeReportsList';
+import FixAllButton from './components/FixAllButton';
 
-const PreupgradeReports = ({ preupgradeReports, loading, error }) => {
-  if (Object.keys(error).length > 0) {
+import {
+  flattenEntries,
+  isEmpty,
+  anyEntriesFixable,
+} from './PreupgradeReportsHelpers';
+
+const PreupgradeReports = ({
+  preupgradeReports,
+  loading,
+  error,
+  csrfToken,
+  newJobInvocationUrl,
+}) => {
+  if (!isEmpty(error)) {
     return (
       <MessageBox
         key="preupgrade-reports-error"
@@ -18,7 +31,20 @@ const PreupgradeReports = ({ preupgradeReports, loading, error }) => {
 
   return (
     <LoadingState loading={loading}>
-      <PreupgradeReportsList preupgradeReports={preupgradeReports} />
+      <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)} />
     </LoadingState>
   );
 };
@@ -27,6 +53,8 @@ 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;

data/webpack/components/PreupgradeReports/PreupgradeReportsHelpers.js

@@ -0,0 +1,35 @@
+export const flattenEntries = reports =>
+  reports.reduce((memo, report) => [...memo, ...report.entries], []);
+
+export const entryFixable = entry =>
+  entry.detail &&
+  entry.detail.remediations &&
+  entry.detail.remediations.some(remediation => remediation.type === 'command');
+
+export const isEmpty = obj => Object.keys(obj).length === 0;
+
+export const anyEntriesFixable = reports =>
+  flattenEntries(reports).some(entryFixable);
+
+export const idsForInvocation = reports =>
+  reports.reduce(
+    (memo, report) => {
+      report.entries.forEach(entry => {
+        if (entryFixable(entry)) {
+          memo.entryIds = [...memo.entryIds, entry.id];
+
+          if (!memo.hostIds.includes(report.hostId)) {
+            memo.hostIds = [...memo.hostIds, report.hostId];
+          }
+        }
+      });
+      return memo;
+    },
+    { hostIds: [], entryIds: [] }
+  );
+
+export const entriesPage = (entries, pagination) => {
+  const offset = (pagination.page - 1) * pagination.perPage;
+
+  return entries.slice(offset, offset + pagination.perPage);
+};

data/webpack/components/PreupgradeReports/PreupgradeReportsSelectors.js

@@ -2,6 +2,7 @@ export const selectPreupgrade = state => state.foremanLeapp.preupgrade;
 
 export const selectPreupgradeReports = state =>
   selectPreupgrade(state).preupgradeReports;
+
 export const selectLoadingPreupgradeReports = state =>
   selectPreupgrade(state).loadingPreupgradeReports;
 export const selectError = state => selectPreupgrade(state).error;

data/webpack/components/PreupgradeReports/__tests__/PreupgradeReports.fixtures.js

@@ -2,14 +2,46 @@ export const preupgradeReports = [
   {
     hostId: 5,
     entries: [
-      { title: 'Fix me!', severity: 'Too severe to talk about' },
+      { title: 'Fix me!', severity: 'Too severe to talk about', id: 42 },
+      { title: 'I am broken too', severity: 'medium', id: 43 },
+    ],
+  },
+  {
+    hostId: 6,
+    entries: [
+      { title: 'Octocat is not happy', severity: 'high', id: 44 },
+      { title: 'Not enough credits', severity: 'low', id: 45 },
+      { title: 'SELinux is turned off', severity: 'medium', id: 46 },
+      { title: 'Root password is too short', severity: 'medium', id: 47 },
+      {
+        title: 'No chocolate chip cookies in cookie jar',
+        severity: 'high',
+        id: 49,
+      },
+    ],
+  },
+];
+
+export const reportsWithRemediations = [
+  {
+    hostId: 5,
+    entries: [
+      {
+        title: 'Fix me!',
+        severity: 'Too severe to talk about',
+        detail: { remediations: [{ type: 'hint' }] },
+      },
       { title: 'I am broken too', severity: 'medium' },
     ],
   },
   {
     hostId: 6,
     entries: [
-      { title: 'Octocat is not happy', severity: 'high' },
+      {
+        title: 'Octocat is not happy',
+        severity: 'high',
+        detail: { remediations: [{ type: 'command' }] },
+      },
       { title: 'Not enough credits', severity: 'low' },
     ],
   },

data/webpack/components/PreupgradeReports/__tests__/PreupgradeReports.test.js

@@ -4,16 +4,23 @@ import PreupgradeReports from '../PreupgradeReports';
 
 import { preupgradeReports } from './PreupgradeReports.fixtures';
 
+const csrfToken = 'xyz';
+const newJobInvocationUrl = '/job_invocations/new';
+
 const fixtures = {
   'should render when loaded': {
     loading: false,
     error: {},
     preupgradeReports,
+    csrfToken,
+    newJobInvocationUrl,
   },
   'should render when loading': {
     loading: true,
     error: {},
     preupgradeReports: [],
+    csrfToken,
+    newJobInvocationUrl,
   },
   'should render error': {
     loading: false,
@@ -22,6 +29,8 @@ const fixtures = {
       errorMsg: 'Well, this is embarassing',
     },
     preupgradeReports: [],
+    csrfToken,
+    newJobInvocationUrl,
   },
 };
 

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

@@ -0,0 +1,38 @@
+import { testSelectorsSnapshotWithFixtures } from '@theforeman/test';
+
+import {
+  preupgradeReports,
+  reportsWithRemediations,
+} from './PreupgradeReports.fixtures';
+
+import {
+  flattenEntries,
+  isEmpty,
+  entryFixable,
+  anyEntriesFixable,
+  idsForInvocation,
+  entriesPage,
+} from '../PreupgradeReportsHelpers';
+
+const fixtures = {
+  'should return flattened entrues': () => flattenEntries(preupgradeReports),
+  'should detect empty object': () => isEmpty({}),
+  'should detect non-empty object': () => isEmpty({ foo: 'bar' }),
+  'should detect entry is fixable': () =>
+    entryFixable({ detail: { remediations: [{ type: 'command' }] } }),
+  'should detect entry is not fixable when not having a command': () =>
+    entryFixable({ detail: { remediations: [{ type: 'hint' }] } }),
+  'should detect entry is not fixable when not having remediations': () =>
+    !!entryFixable({ detail: {} }),
+  'should detect no entry is fixable': () =>
+    anyEntriesFixable(preupgradeReports),
+  'should detect a fixable entry in reports': () =>
+    anyEntriesFixable(reportsWithRemediations),
+  'should collect ids for job invocation': () =>
+    idsForInvocation(preupgradeReports),
+  'should return entries page': () =>
+    entriesPage(flattenEntries(preupgradeReports), { page: 2, perPage: 3 }),
+};
+
+describe('PreupgradeReportsHelpers', () =>
+  testSelectorsSnapshotWithFixtures(fixtures));

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

@@ -16,34 +16,116 @@ exports[`PreupgradeReports should render when loaded 1`] = `
   size="lg"
   timeout={300}
 >
+  <Row
+    bsClass="row"
+    componentClass="div"
+  >
+    <div
+      className="title-filter col-md-4"
+    >
+       
+    </div>
+    <div
+      className="col-md-8"
+      id="title_action"
+    >
+      <div
+        className="btn-toolbar pull-right"
+      >
+        <FixAllButton
+          csrfToken="xyz"
+          disabled={true}
+          postUrl="/job_invocations/new"
+          preupgradeReports={
+            Array [
+              Object {
+                "entries": Array [
+                  Object {
+                    "id": 42,
+                    "severity": "Too severe to talk about",
+                    "title": "Fix me!",
+                  },
+                  Object {
+                    "id": 43,
+                    "severity": "medium",
+                    "title": "I am broken too",
+                  },
+                ],
+                "hostId": 5,
+              },
+              Object {
+                "entries": Array [
+                  Object {
+                    "id": 44,
+                    "severity": "high",
+                    "title": "Octocat is not happy",
+                  },
+                  Object {
+                    "id": 45,
+                    "severity": "low",
+                    "title": "Not enough credits",
+                  },
+                  Object {
+                    "id": 46,
+                    "severity": "medium",
+                    "title": "SELinux is turned off",
+                  },
+                  Object {
+                    "id": 47,
+                    "severity": "medium",
+                    "title": "Root password is too short",
+                  },
+                  Object {
+                    "id": 49,
+                    "severity": "high",
+                    "title": "No chocolate chip cookies in cookie jar",
+                  },
+                ],
+                "hostId": 6,
+              },
+            ]
+          }
+        />
+      </div>
+    </div>
+  </Row>
   <PreupgradeReportsList
-    preupgradeReports={
+    allEntries={
       Array [
         Object {
-          "entries": Array [
-            Object {
-              "severity": "Too severe to talk about",
-              "title": "Fix me!",
-            },
-            Object {
-              "severity": "medium",
-              "title": "I am broken too",
-            },
-          ],
-          "hostId": 5,
+          "id": 42,
+          "severity": "Too severe to talk about",
+          "title": "Fix me!",
         },
         Object {
-          "entries": Array [
-            Object {
-              "severity": "high",
-              "title": "Octocat is not happy",
-            },
-            Object {
-              "severity": "low",
-              "title": "Not enough credits",
-            },
-          ],
-          "hostId": 6,
+          "id": 43,
+          "severity": "medium",
+          "title": "I am broken too",
+        },
+        Object {
+          "id": 44,
+          "severity": "high",
+          "title": "Octocat is not happy",
+        },
+        Object {
+          "id": 45,
+          "severity": "low",
+          "title": "Not enough credits",
+        },
+        Object {
+          "id": 46,
+          "severity": "medium",
+          "title": "SELinux is turned off",
+        },
+        Object {
+          "id": 47,
+          "severity": "medium",
+          "title": "Root password is too short",
+        },
+        Object {
+          "id": 49,
+          "severity": "high",
+          "title": "No chocolate chip cookies in cookie jar",
         },
       ]
     }
@@ -59,8 +141,33 @@ exports[`PreupgradeReports should render when loading 1`] = `
   size="lg"
   timeout={300}
 >
+  <Row
+    bsClass="row"
+    componentClass="div"
+  >
+    <div
+      className="title-filter col-md-4"
+    >
+       
+    </div>
+    <div
+      className="col-md-8"
+      id="title_action"
+    >
+      <div
+        className="btn-toolbar pull-right"
+      >
+        <FixAllButton
+          csrfToken="xyz"
+          disabled={true}
+          postUrl="/job_invocations/new"
+          preupgradeReports={Array []}
+        />
+      </div>
+    </div>
+  </Row>
   <PreupgradeReportsList
-    preupgradeReports={Array []}
+    allEntries={Array []}
   />
 </LoadingState>
 `;