foreman_leapp 0.0.6 → 0.1.0

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="Severity"
+            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 Severity"
+      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 Severity"
+          className="severity-img"
+        />
+      );
+    case 'medium':
+      return (
+        <img
+          key={key}
+          src={SeverityMedium}
+          alt="Medium Severity"
+          className="severity-img"
+        />
+      );
+    case 'high':
+      return (
+        <img
+          key={key}
+          src={SeverityHigh}
+          alt="High Severity"
+          className="severity-img"
+        />
+      );
+    default:
+      return (
+        <img
+          key={key}
+          src={SeverityLow}
+          alt="Low Severity"
+          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>

data/webpack/components/PreupgradeReportsList/components/images/i_severity-high.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_high.svg"
+   inkscape:version="0.92.1 r"><metadata
+     id="metadata6016"><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="defs6014" /><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="namedview6012"
+     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="style5999">
+	.st0{fill:#808080;}
+	.st1{fill:#F39800;}
+	.st2{fill:#CCCCCC;}
+</style><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="path6003" /><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="path6005" /><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="path6007" /><path
+     class="st2"
+     d="M99.6,40.2H46c-4.6,0-8.4-3.1-8.4-6.8l0,0c0-3.8,3.8-6.9,8.4-6.9h53.7c4.6,0,8.4,3.1,8.4,6.8l0,0  C108.1,37.1,104.3,40.2,99.6,40.2z"
+     id="path6009" /></svg>

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

@@ -0,0 +1,62 @@
+<?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_low.svg"
+   inkscape:version="0.92.1 r"><metadata
+     id="metadata6693"><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="defs6691" /><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="namedview6689"
+     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="style6674">
+	.st0{fill:#808080;}
+	.st1{fill:#94D400;}
+	.st2{fill:#CCCCCC;}
+</style><g
+     id="g6678" /><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="path6680" /><path
+     class="st2"
+     d="M99.6,40.2H46c-4.6,0-8.4-3.1-8.4-6.8l0,0c0-3.8,3.8-6.9,8.4-6.9h53.7c4.6,0,8.4,3.1,8.4,6.8l0,0  C108.1,37.1,104.3,40.2,99.6,40.2z"
+     id="path6682" /><path
+     class="st2"
+     d="M99.6,73.3H46c-4.6,0-8.4-3.1-8.4-6.8l0,0c0-3.8,3.8-6.9,8.4-6.9h53.7c4.6,0,8.4,3.1,8.4,6.8l0,0  C108.1,70.2,104.3,73.3,99.6,73.3z"
+     id="path6684" /><path
+     class="st2"
+     d="M99.6,106.4H46c-4.6,0-8.4-3.1-8.4-6.8l0,0c0-3.8,3.8-6.9,8.4-6.9h53.7c4.6,0,8.4,3.1,8.4,6.8l0,0  C108.1,103.3,104.3,106.4,99.6,106.4z"
+     id="path6686" /></svg>

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

@@ -0,0 +1,62 @@
+<?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_med.svg"
+   inkscape:version="0.92.1 r"><metadata
+     id="metadata7574"><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="defs7572" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="834"
+     inkscape:window-height="480"
+     id="namedview7570"
+     showgrid="false"
+     inkscape:zoom="1.4216867"
+     inkscape:cx="73"
+     inkscape:cy="83"
+     inkscape:window-x="0"
+     inkscape:window-y="1050"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layer_1" /><style
+     type="text/css"
+     id="style7555">
+	.st0{fill:#808080;}
+	.st1{fill:#DEC800;}
+	.st2{fill:#CCCCCC;}
+</style><g
+     id="g7559" /><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="path7561" /><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="path7563" /><path
+     class="st2"
+     d="M99.6,40.2H46c-4.6,0-8.4-3.1-8.4-6.8l0,0c0-3.8,3.8-6.9,8.4-6.9h53.7c4.6,0,8.4,3.1,8.4,6.8l0,0  C108.1,37.1,104.3,40.2,99.6,40.2z"
+     id="path7565" /><path
+     class="st2"
+     d="M99.6,73.3H46c-4.6,0-8.4-3.1-8.4-6.8l0,0c0-3.8,3.8-6.9,8.4-6.9h53.7c4.6,0,8.4,3.1,8.4,6.8l0,0  C108.1,70.2,104.3,73.3,99.6,73.3z"
+     id="path7567" /></svg>

data/webpack/components/PreupgradeReportsList/index.js

@@ -6,9 +6,19 @@ import Pagination from 'foremanReact/components/Pagination/PaginationWrapper';
 import { useForemanSettings } from 'foremanReact/Root/Context/ForemanContext';
 
 import PreupgradeReportEntry from './components/PreupgradeReportEntry';
+import PreupgradeReportsListHeader from './components/PreupgradeReportsListHeader';
 import { entriesPage } from '../PreupgradeReports/PreupgradeReportsHelpers';
 
-const PreupgradeReportsList = ({ allEntries }) => {
+import './PreupgradeReportList.scss';
+
+const PreupgradeReportsList = ({
+  allEntries,
+  isSelected,
+  toggleSelected,
+  sort,
+  changeSort,
+  toggleSelectAll,
+}) => {
   const { perPage, perPageOptions } = useForemanSettings();
   const [pagination, setPagination] = useState({
     page: 1,
@@ -17,9 +27,19 @@ const PreupgradeReportsList = ({ allEntries }) => {
   });
 
   return (
-    <ListView>
+    <ListView id="preupgrade-report-entries-list-view">
+      <PreupgradeReportsListHeader
+        sort={sort}
+        changeSort={changeSort}
+        toggleSelectAll={toggleSelectAll}
+      />
       {entriesPage(allEntries, pagination).map((entry, idx) => (
-        <PreupgradeReportEntry entry={entry} key={idx} />
+        <PreupgradeReportEntry
+          entry={entry}
+          key={idx}
+          isEntrySelected={isSelected(entry)}
+          toggleSelected={toggleSelected}
+        />
       ))}
       <Pagination
         viewType="list"
@@ -34,6 +54,11 @@ const PreupgradeReportsList = ({ allEntries }) => {
 
 PreupgradeReportsList.propTypes = {
   allEntries: PropTypes.array.isRequired,
+  isSelected: PropTypes.func.isRequired,
+  toggleSelected: PropTypes.func.isRequired,
+  sort: PropTypes.object.isRequired,
+  changeSort: PropTypes.func.isRequired,
+  toggleSelectAll: PropTypes.func.isRequired,
 };
 
 export default PreupgradeReportsList;