foreman_leapp 0.0.6 → 0.1.0

data/webpack/components/PreupgradeReports/PreupgradeReportsHelpers.js

@@ -1,35 +1,152 @@
+import Immutable from 'seamless-immutable';
+
 export const flattenEntries = reports =>
   reports.reduce((memo, report) => [...memo, ...report.entries], []);
 
-export const entryFixable = entry =>
+const entryWithFixKind = kind => entry =>
   entry.detail &&
   entry.detail.remediations &&
-  entry.detail.remediations.some(remediation => remediation.type === 'command');
+  entry.detail.remediations.some(remediation => remediation.type === kind);
+
+export const entryFixable = entryWithFixKind('command');
+
+export const isInhibitor = entry =>
+  entry.flags && entry.flags.some(flag => flag === 'inhibitor');
+
+export const filterByInhibitor = value => entry => {
+  const inhibitsUpgrade = isInhibitor(entry);
+
+  if (value === 'yes') {
+    return inhibitsUpgrade;
+  }
+
+  if (value === 'no') {
+    return !inhibitsUpgrade;
+  }
+
+  return true;
+};
 
 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];
-          }
+  reportsToEntries(reports, Array.prototype.some, entryFixable);
+
+export const fixableEntries = reports =>
+  reportsToEntries(reports, Array.prototype.filter, entryFixable);
+
+const reportsToEntries = (reports, iterator, predicate) =>
+  iterator.call(flattenEntries(reports), predicate);
+
+export const idsForInvocationFromEntries = entries =>
+  entries.reduce(
+    (memo, entry) => {
+      if (entryFixable(entry)) {
+        memo.entryIds = [...memo.entryIds, entry.id];
+
+        if (!memo.hostIds.includes(entry.hostId)) {
+          memo.hostIds = [...memo.hostIds, entry.hostId];
         }
-      });
+      }
       return memo;
     },
     { hostIds: [], entryIds: [] }
   );
 
+export const idsForInvocationFromReports = reports =>
+  idsForInvocationFromEntries(flattenEntries(reports));
+
 export const entriesPage = (entries, pagination) => {
   const offset = (pagination.page - 1) * pagination.perPage;
 
   return entries.slice(offset, offset + pagination.perPage);
 };
+
+export const filterEntries = (attribute, value, entries) => {
+  if (!value) {
+    return entries;
+  }
+
+  if (attribute === 'fix') {
+    return entries.filter(entryWithFixKind(value));
+  }
+
+  if (attribute === 'inhibitor') {
+    return entries.filter(filterByInhibitor(value));
+  }
+
+  return entries.filter(entry =>
+    entry[attribute].toLowerCase().includes(value.toLowerCase())
+  );
+};
+
+export const byText = attribute => (first, second) => {
+  const firstAttr = first[attribute].toLowerCase();
+  const secondAttr = second[attribute].toLowerCase();
+
+  if (firstAttr < secondAttr) {
+    return -1;
+  }
+
+  if (firstAttr > secondAttr) {
+    return 1;
+  }
+  return 0;
+};
+
+export const bySeverity = attribute => (first, second) => {
+  const sevList = ['info', 'low', 'medium', 'high'];
+
+  const firstAttr = first[attribute].toLowerCase();
+  const secondAttr = second[attribute].toLowerCase();
+
+  return sevList.indexOf(firstAttr) - sevList.indexOf(secondAttr);
+};
+
+export const byFix = (first, second) => {
+  const firstAttr = !!(first.detail && first.detail.remediations);
+  const secondAttr = !!(second.detail && second.detail.remediations);
+  return byBoolComparison(firstAttr, secondAttr);
+};
+
+export const byInhibitor = (first, second) =>
+  byBoolComparison(isInhibitor(first), isInhibitor(second));
+
+const byBoolComparison = (first, second) => {
+  if (first === second) {
+    return 0;
+  }
+
+  if (first) {
+    return -1;
+  }
+  return 1;
+};
+
+export const sortEntries = (entries, sort) => {
+  const entriesCopy = Immutable.asMutable(entries);
+
+  if (!sort.attribute) {
+    return entriesCopy;
+  }
+
+  let sorted;
+
+  if (['title', 'hostname'].includes(sort.attribute)) {
+    sorted = entriesCopy.sort(byText(sort.attribute));
+  }
+
+  if (sort.attribute === 'severity') {
+    sorted = entriesCopy.sort(bySeverity(sort.attribute));
+  }
+
+  if (sort.attribute === 'fix') {
+    sorted = entriesCopy.sort(byFix);
+  }
+
+  if (sort.attribute === 'inhibitor') {
+    sorted = entriesCopy.sort(byInhibitor);
+  }
+
+  return sort.order === 'asc' ? sorted : sorted.reverse();
+};

data/webpack/components/PreupgradeReports/PreupgradeReportsReducer.js

@@ -8,6 +8,7 @@ import {
 
 export const initialState = Immutable({
   loadingPreupgradeReports: false,
+  reportsExpected: false,
   preupgradeReports: [],
   error: {},
 });
@@ -21,6 +22,7 @@ const reducer = (state = initialState, action) => {
       return state.merge({
         loadingPreupgradeReports: false,
         preupgradeReports: payload.results,
+        reportsExpected: true,
       });
     case PREUPGRADE_REPORTS_FAILURE:
       return state.merge({

data/webpack/components/PreupgradeReports/PreupgradeReportsSelectors.js

@@ -6,3 +6,13 @@ export const selectPreupgradeReports = state =>
 export const selectLoadingPreupgradeReports = state =>
   selectPreupgrade(state).loadingPreupgradeReports;
 export const selectError = state => selectPreupgrade(state).error;
+
+export const selectReportsExpected = state =>
+  selectPreupgrade(state).reportsExpected;
+
+export const selectRexState = state => state.foremanRemoteExecutionReducers;
+
+export const selectJobInvocations = state =>
+  selectRexState(state).jobInvocations;
+export const selectJobInvocationsPolling = state =>
+  selectJobInvocations(state).isPolling;

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

@@ -2,21 +2,59 @@ export const preupgradeReports = [
   {
     hostId: 5,
     entries: [
-      { title: 'Fix me!', severity: 'Too severe to talk about', id: 42 },
-      { title: 'I am broken too', severity: 'medium', id: 43 },
+      {
+        title: 'Fix me!',
+        severity: 'info',
+        id: 42,
+        hostname: 'host.example.com',
+        flags: [],
+      },
+      {
+        title: 'I am broken too',
+        severity: 'medium',
+        id: 43,
+        hostname: 'host.example.com',
+        flags: [],
+      },
     ],
   },
   {
     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: 'Octocat is not happy',
+        severity: 'high',
+        id: 44,
+        hostname: 'foo.example.com',
+        flags: ['inhibitor'],
+      },
+      {
+        title: 'Not enough credits',
+        severity: 'low',
+        id: 45,
+        hostname: 'foo.example.com',
+        flags: [],
+      },
+      {
+        title: 'SELinux is turned off',
+        severity: 'medium',
+        id: 46,
+        hostname: 'foo.example.com',
+        flags: [],
+      },
+      {
+        title: 'Root password is too short',
+        severity: 'medium',
+        id: 47,
+        hostname: 'foo.example.com',
+        flags: [],
+      },
       {
         title: 'No chocolate chip cookies in cookie jar',
         severity: 'high',
         id: 49,
+        hostname: 'foo.example.com',
+        flags: [],
       },
     ],
   },
@@ -28,7 +66,7 @@ export const reportsWithRemediations = [
     entries: [
       {
         title: 'Fix me!',
-        severity: 'Too severe to talk about',
+        severity: 'info',
         detail: { remediations: [{ type: 'hint' }] },
       },
       { title: 'I am broken too', severity: 'medium' },

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

@@ -6,14 +6,26 @@ import { preupgradeReports } from './PreupgradeReports.fixtures';
 
 const csrfToken = 'xyz';
 const newJobInvocationUrl = '/job_invocations/new';
+const getPreupgradeReports = () => {};
 
 const fixtures = {
-  'should render when loaded': {
+  'should render when loaded with reports': {
     loading: false,
     error: {},
     preupgradeReports,
     csrfToken,
     newJobInvocationUrl,
+    getPreupgradeReports,
+    reportsExpected: true,
+  },
+  'should render when loaded without reports': {
+    loading: false,
+    error: {},
+    preupgradeReports: [],
+    csrfToken,
+    newJobInvocationUrl,
+    getPreupgradeReports,
+    reportsExpected: true,
   },
   'should render when loading': {
     loading: true,
@@ -21,6 +33,8 @@ const fixtures = {
     preupgradeReports: [],
     csrfToken,
     newJobInvocationUrl,
+    getPreupgradeReports,
+    reportsExpected: false,
   },
   'should render error': {
     loading: false,
@@ -31,6 +45,8 @@ const fixtures = {
     preupgradeReports: [],
     csrfToken,
     newJobInvocationUrl,
+    getPreupgradeReports,
+    reportsExpected: false,
   },
 };
 

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

@@ -10,8 +10,11 @@ import {
   isEmpty,
   entryFixable,
   anyEntriesFixable,
-  idsForInvocation,
+  idsForInvocationFromReports,
   entriesPage,
+  filterEntries,
+  fixableEntries,
+  sortEntries,
 } from '../PreupgradeReportsHelpers';
 
 const fixtures = {
@@ -28,10 +31,47 @@ const fixtures = {
     anyEntriesFixable(preupgradeReports),
   'should detect a fixable entry in reports': () =>
     anyEntriesFixable(reportsWithRemediations),
-  'should collect ids for job invocation': () =>
-    idsForInvocation(preupgradeReports),
+  'should collect ids for job invocation from reports': () =>
+    idsForInvocationFromReports(preupgradeReports),
   'should return entries page': () =>
     entriesPage(flattenEntries(preupgradeReports), { page: 2, perPage: 3 }),
+  'should filter entries by title': () =>
+    filterEntries('title', 'broken', flattenEntries(preupgradeReports)),
+  'should filter entries by severity': () =>
+    filterEntries('severity', 'medium', flattenEntries(preupgradeReports)),
+  'should filter entries by host': () =>
+    filterEntries('hostname', 'foo', flattenEntries(preupgradeReports)),
+  'should filter entries by remediations': () =>
+    filterEntries('fix', 'command', flattenEntries(reportsWithRemediations)),
+  'should filter entries by inhibitor': () =>
+    filterEntries('inhibitor', 'yes', flattenEntries(preupgradeReports)),
+  'should return fixable entries': () =>
+    fixableEntries(reportsWithRemediations),
+  'should sort entries by title in ascending order': () =>
+    sortEntries(flattenEntries(preupgradeReports), {
+      attribute: 'title',
+      order: 'asc',
+    }),
+  'should sort entries by title in descending order': () =>
+    sortEntries(flattenEntries(preupgradeReports), {
+      attribute: 'title',
+      order: 'desc',
+    }),
+  'should sort entries by hostname': () =>
+    sortEntries(flattenEntries(preupgradeReports), {
+      attribute: 'hostname',
+      order: 'asc',
+    }),
+  'should sort entries by severity': () =>
+    sortEntries(flattenEntries(preupgradeReports), {
+      attribute: 'severity',
+      order: 'asc',
+    }),
+  'should sort entries by remediations': () =>
+    sortEntries(flattenEntries(reportsWithRemediations), {
+      attribute: 'fix',
+      order: 'asc',
+    }),
 };
 
 describe('PreupgradeReportsHelpers', () =>

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

@@ -8,7 +8,7 @@ exports[`PreupgradeReports should render error 1`] = `
 />
 `;
 
-exports[`PreupgradeReports should render when loaded 1`] = `
+exports[`PreupgradeReports should render when loaded with reports 1`] = `
 <LoadingState
   additionalClasses=""
   loading={false}
@@ -16,119 +16,92 @@ 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
-    allEntries={
+  <PreupgradeReports
+    csrfToken="xyz"
+    error={Object {}}
+    getPreupgradeReports={[Function]}
+    loading={false}
+    newJobInvocationUrl="/job_invocations/new"
+    preupgradeReports={
       Array [
         Object {
-          "id": 42,
-          "severity": "Too severe to talk about",
-          "title": "Fix me!",
+          "entries": Array [
+            Object {
+              "flags": Array [],
+              "hostname": "host.example.com",
+              "id": 42,
+              "severity": "info",
+              "title": "Fix me!",
+            },
+            Object {
+              "flags": Array [],
+              "hostname": "host.example.com",
+              "id": 43,
+              "severity": "medium",
+              "title": "I am broken too",
+            },
+          ],
+          "hostId": 5,
         },
         Object {
-          "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",
+          "entries": Array [
+            Object {
+              "flags": Array [
+                "inhibitor",
+              ],
+              "hostname": "foo.example.com",
+              "id": 44,
+              "severity": "high",
+              "title": "Octocat is not happy",
+            },
+            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",
+            },
+            Object {
+              "flags": Array [],
+              "hostname": "foo.example.com",
+              "id": 49,
+              "severity": "high",
+              "title": "No chocolate chip cookies in cookie jar",
+            },
+          ],
+          "hostId": 6,
         },
       ]
     }
+    reportsExpected={true}
+  />
+</LoadingState>
+`;
+
+exports[`PreupgradeReports should render when loaded without reports 1`] = `
+<LoadingState
+  additionalClasses=""
+  loading={false}
+  loadingText="Loading"
+  size="lg"
+  timeout={300}
+>
+  <NoReports
+    reportsExpected={true}
   />
 </LoadingState>
 `;
@@ -141,33 +114,8 @@ 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
-    allEntries={Array []}
+  <NoReports
+    reportsExpected={false}
   />
 </LoadingState>
 `;