foreman_leapp 0.0.6 → 0.1.4

data/webpack/components/PreupgradeReportsList/components/__tests__/SortableHeaderItem.test.js

@@ -0,0 +1,29 @@
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+
+import SortableHeaderItem from '../SortableHeaderItem';
+
+const changeSort = () => {};
+
+const fixtures = {
+  'should render when not selected': {
+    changeSort,
+    sort: { attribute: '', order: 'asc' },
+    value: 'severity',
+    title: 'severity',
+  },
+  'should render when selected and sorting asc': {
+    changeSort,
+    sort: { attribute: 'severity', order: 'asc' },
+    value: 'severity',
+    title: 'Severity',
+  },
+  'should render when selected and sorting desc': {
+    changeSort,
+    sort: { attribute: 'severity', order: 'desc' },
+    value: 'severity',
+    title: 'Severity',
+  },
+};
+
+describe('SortableHeaderItem', () =>
+  testComponentSnapshotsWithFixtures(SortableHeaderItem, fixtures));

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

@@ -0,0 +1,32 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`InhibitorInfoItem should render when inhibitor 1`] = `
+<InfoItem
+  itemId="inhibitor-5"
+  tooltipText="This issue inhibits the upgrade."
+>
+  <span>
+    <Icon
+      className="severity-high"
+      name="security"
+      type="pf"
+    />
+    Inhibitor
+  </span>
+</InfoItem>
+`;
+
+exports[`InhibitorInfoItem should render when not inhibitor 1`] = `
+<EmptyInfoItem
+  attr="inhibitor"
+  entry={
+    Object {
+      "flags": Array [],
+      "id": 5,
+      "preupgradeReportId": 7,
+      "severity": "low",
+      "title": "no title",
+    }
+  }
+/>
+`;

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

@@ -19,16 +19,11 @@ exports[`PreupgradeReportEntry should render 1`] = `
         className=""
         stacked={false}
       >
-        <Icon
-          name="resources-full"
-          style={
-            Object {
-              "color": "#39a5dc",
-            }
-          }
-          type="pf"
+        <img
+          alt="Low Risk Factor"
+          className="severity-img"
+          src={[Function]}
         />
-        low
       </ListViewInfoItem>,
       <EmptyInfoItem
         attr="remediation"
@@ -41,11 +36,25 @@ exports[`PreupgradeReportEntry should render 1`] = `
           }
         }
       />,
+      <InhibitorInfoItem
+        entry={
+          Object {
+            "id": 5,
+            "preupgradeReportId": 7,
+            "severity": "low",
+            "title": "no title",
+          }
+        }
+      />,
     ]
   }
   checkboxInput={
     <input
+      checked={false}
+      disabled={true}
+      onChange={[Function]}
       type="checkbox"
+      value={false}
     />
   }
   compoundExpand={false}
@@ -106,14 +115,11 @@ exports[`PreupgradeReportEntry should render 1`] = `
         componentClass="div"
         md={8}
       >
-        <Icon
-          name="resources-full"
-          style={
-            Object {
-              "color": "#39a5dc",
-            }
-          }
-          type="pf"
+        <img
+          alt="Low Risk Factor"
+          className="severity-img"
+          key="5-7-sv5"
+          src={[Function]}
         />
          
         low

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

@@ -0,0 +1,113 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`PreupgradeReportsListHeader should render 1`] = `
+<ListViewItem
+  actions={null}
+  additionalInfo={
+    Array [
+      <InfoItem
+        itemId="0"
+        tooltipText=""
+      >
+        <strong>
+          <SortableHeaderItem
+            changeSort={[Function]}
+            sort={
+              Object {
+                "attribute": "",
+                "order": "asc",
+              }
+            }
+            title="Host"
+            value="hostname"
+          />
+        </strong>
+      </InfoItem>,
+      <InfoItem
+        itemId="1"
+        tooltipText=""
+      >
+        <strong>
+          <SortableHeaderItem
+            changeSort={[Function]}
+            sort={
+              Object {
+                "attribute": "",
+                "order": "asc",
+              }
+            }
+            title="Risk Factor"
+            value="severity"
+          />
+        </strong>
+      </InfoItem>,
+      <InfoItem
+        itemId="2"
+        tooltipText=""
+      >
+        <strong>
+          <SortableHeaderItem
+            changeSort={[Function]}
+            sort={
+              Object {
+                "attribute": "",
+                "order": "asc",
+              }
+            }
+            title="Has Remediation?"
+            value="fix"
+          />
+        </strong>
+      </InfoItem>,
+      <InfoItem
+        itemId="3"
+        tooltipText=""
+      >
+        <strong>
+          <SortableHeaderItem
+            changeSort={[Function]}
+            sort={
+              Object {
+                "attribute": "",
+                "order": "asc",
+              }
+            }
+            title="Inhibitor?"
+            value="inhibitor"
+          />
+        </strong>
+      </InfoItem>,
+    ]
+  }
+  checkboxInput={
+    <input
+      onClick={[Function]}
+      type="checkbox"
+    />
+  }
+  className="list-view-header"
+  compoundExpand={false}
+  compoundExpanded={false}
+  description={
+    <SortableHeaderItem
+      changeSort={[Function]}
+      sort={
+        Object {
+          "attribute": "",
+          "order": "asc",
+        }
+      }
+      title="Title"
+      value="title"
+    />
+  }
+  heading={null}
+  hideCloseIcon={true}
+  initExpanded={false}
+  leftContent={null}
+  onCloseCompoundExpand={[Function]}
+  onExpand={[Function]}
+  onExpandClose={[Function]}
+  stacked={true}
+/>
+`;

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

@@ -0,0 +1,36 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`SortableHeaderItem should render when not selected 1`] = `
+<span
+  className="sortable-header "
+  onClick={[Function]}
+>
+  severity
+</span>
+`;
+
+exports[`SortableHeaderItem should render when selected and sorting asc 1`] = `
+<span
+  className="sortable-header active"
+  onClick={[Function]}
+>
+  <Icon
+    name="angle-up"
+    type="fa"
+  />
+  Severity
+</span>
+`;
+
+exports[`SortableHeaderItem should render when selected and sorting desc 1`] = `
+<span
+  className="sortable-header active"
+  onClick={[Function]}
+>
+  <Icon
+    name="angle-down"
+    type="fa"
+  />
+  Severity
+</span>
+`;

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

@@ -44,8 +44,6 @@ Array [
 ]
 `;
 
-exports[`PreupgradeReportList/helpers should return hex for severity 1`] = `"#39a5dc"`;
-
 exports[`PreupgradeReportList/helpers should return remediations 1`] = `
 Array [
   <Row
@@ -93,14 +91,10 @@ exports[`PreupgradeReportList/helpers should return severity 1`] = `
     componentClass="div"
     md={8}
   >
-    <Icon
-      name="resources-full"
-      style={
-        Object {
-          "color": "#cc0000",
-        }
-      }
-      type="pf"
+    <img
+      alt="High Risk Factor"
+      className="severity-img"
+      src={[Function]}
     />
      
     high

data/webpack/components/PreupgradeReportsList/components/__tests__/helpers.test.js

@@ -1,7 +1,6 @@
 import { testSelectorsSnapshotWithFixtures } from '@theforeman/test';
 
 import {
-  presentSeverity,
   tagInfo,
   hasRemediations,
   getTitle,
@@ -15,7 +14,6 @@ import {
 import { reportEntry } from './PreupgradeReportEntry.fixtures';
 
 const fixtures = {
-  'should return hex for severity': () => presentSeverity('low'),
   'should return tag info': () => tagInfo(reportEntry.tags),
   'should detect if has remediations': () => hasRemediations(reportEntry),
   'should return title': () => getTitle(reportEntry),

data/webpack/components/PreupgradeReportsList/components/foreman_leapp.scss

@@ -6,4 +6,10 @@
 
 .pre-wrap{
     white-space: pre-wrap;
-  }
+  }
+
+.severity-img{
+  width: 18px;
+  height: 18px;
+  margin-right: 10px;
+}

data/webpack/components/PreupgradeReportsList/components/helpers.js

@@ -1,23 +1,13 @@
 import React from 'react';
 import { Grid, ListView, Badge, Icon } from 'patternfly-react';
 import EmptyInfoItem from './EmptyInfoItem';
+import SeverityHigh from './images/i_severity-high.svg';
+import SeverityMedium from './images/i_severity-med.svg';
+import SeverityLow from './images/i_severity-low.svg';
 
 export const itemIteratorId = (entry, ...rest) =>
   `${entry.id}-${entry.preupgradeReportId}-${rest.join('-')}`;
 
-export const presentSeverity = severity => {
-  switch (severity) {
-    case 'low':
-      return '#39a5dc';
-    case 'medium':
-      return '#f0ab00';
-    case 'high':
-      return '#cc0000';
-    default:
-      return '#39a5dc';
-  }
-};
-
 export const tagInfo = tags =>
   tags.map(attr => (
     <Badge key={attr} variant="pill primary">
@@ -25,6 +15,49 @@ export const tagInfo = tags =>
     </Badge>
   ));
 
+export const getSeverityImg = entry => {
+  const key = itemIteratorId(entry, `sv${entry.id}`);
+
+  switch (entry.severity) {
+    case 'low':
+      return (
+        <img
+          key={key}
+          src={SeverityLow}
+          alt="Low Risk Factor"
+          className="severity-img"
+        />
+      );
+    case 'medium':
+      return (
+        <img
+          key={key}
+          src={SeverityMedium}
+          alt="Medium Risk Factor"
+          className="severity-img"
+        />
+      );
+    case 'high':
+      return (
+        <img
+          key={key}
+          src={SeverityHigh}
+          alt="High Risk Factor"
+          className="severity-img"
+        />
+      );
+    default:
+      return (
+        <img
+          key={key}
+          src={SeverityLow}
+          alt="Low Risk Factor"
+          className="severity-img"
+        />
+      );
+  }
+};
+
 export const hasRemediations = entry => {
   const key = itemIteratorId(entry, `rm${entry.id}`);
   if (entry.detail && entry.detail.remediations) {
@@ -60,12 +93,7 @@ export const getSeverity = entry => {
           <strong>Risk Factor</strong>
         </Grid.Col>
         <Grid.Col md={8}>
-          <Icon
-            type="pf"
-            name="resources-full"
-            style={{ color: presentSeverity(entry.severity) }}
-          />{' '}
-          {entry.severity}
+          {getSeverityImg(entry)} {entry.severity}
         </Grid.Col>
       </Grid.Row>
     );

data/webpack/components/PreupgradeReportsList/components/images/i_severity-critical.svg

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 146 166"
+   style="enable-background:new 0 0 146 166;"
+   xml:space="preserve"
+   sodipodi:docname="i_critical.svg"
+   inkscape:version="0.92.1 r"><metadata
+     id="metadata4612"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs4610" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1055"
+     id="namedview4608"
+     showgrid="false"
+     inkscape:zoom="1.4216867"
+     inkscape:cx="73"
+     inkscape:cy="83"
+     inkscape:window-x="0"
+     inkscape:window-y="1050"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><style
+     type="text/css"
+     id="style4593">
+	.st0{fill:#808080;}
+	.st1{fill:#CC0000;}
+</style><g
+     id="g4605"><path
+       class="st1"
+       d="M114.6,143.3H31c-7.2,0-13-4.8-13-10.6l0,0c0-5.9,5.9-10.6,13-10.6h83.6c7.2,0,13,4.8,13,10.6l0,0   C127.7,138.5,121.8,143.3,114.6,143.3z"
+       id="path4597" /><path
+       class="st1"
+       d="M114.6,110.2H31c-7.2,0-13-4.8-13-10.6l0,0C18,93.7,23.9,89,31,89h83.6c7.2,0,13,4.8,13,10.6l0,0   C127.7,105.4,121.8,110.2,114.6,110.2z"
+       id="path4599" /><path
+       class="st1"
+       d="M115,77.1H31.4c-7.2,0-13-4.8-13-10.6l0,0c0-5.9,5.9-10.6,13-10.6H115c7.2,0,13,4.8,13,10.6l0,0   C128,72.3,122.1,77.1,115,77.1z"
+       id="path4601" /><path
+       class="st1"
+       d="M114.6,44H31c-7.2,0-13-4.8-13-10.6l0,0c0-5.9,5.9-10.7,13-10.7h83.6c7.2,0,13,4.8,13,10.6l0,0   C127.7,39.2,121.8,44,114.6,44z"
+       id="path4603" /></g></svg>