foreman_leapp 0.0.5 → 0.0.6

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

@@ -0,0 +1,9 @@
+@import '~@theforeman/vendor/scss/variables';
+
+.top-padded {
+  padding-top: 8px;
+}
+
+.pre-wrap{
+    white-space: pre-wrap;
+  }

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

@@ -1,28 +1,156 @@
 import React from 'react';
-
+import { Grid, ListView, Badge, Icon } from 'patternfly-react';
 import EmptyInfoItem from './EmptyInfoItem';
-import StringInfoItem from './StringInfoItem';
 
 export const itemIteratorId = (entry, ...rest) =>
   `${entry.id}-${entry.preupgradeReportId}-${rest.join('-')}`;
 
-export const additionalInfo = entry => {
-  const infoAttrs = ['title', 'severity'];
-
-  return infoAttrs.map(attr => {
-    const key = itemIteratorId(entry, attr);
-
-    if (!entry[attr]) {
-      return <EmptyInfoItem entry={entry} attr={attr} key={key} />;
-    }
-
-    switch (attr) {
-      case 'title':
-        return <StringInfoItem entry={entry} attr={attr} key={key} />;
-      case 'severity':
-        return <StringInfoItem entry={entry} attr={attr} key={key} />;
-      default:
-        return '';
-    }
-  });
+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">
+      {attr}
+    </Badge>
+  ));
+
+export const hasRemediations = entry => {
+  const key = itemIteratorId(entry, `rm${entry.id}`);
+  if (entry.detail && entry.detail.remediations) {
+    return (
+      <ListView.InfoItem key={key}>
+        <Icon type="pf" name="warning-triangle-o" /> Has Remediation
+      </ListView.InfoItem>
+    );
+  }
+
+  return <EmptyInfoItem key={key} entry={entry} attr="remediation" />;
+};
+
+export const getTitle = entry => {
+  if (entry.title) {
+    return (
+      <Grid.Row>
+        <Grid.Col md={1}>
+          <strong>Title</strong>
+        </Grid.Col>
+        <Grid.Col md={8}>{entry.title}</Grid.Col>
+      </Grid.Row>
+    );
+  }
+  return <div />;
+};
+
+export const getSeverity = entry => {
+  if (entry.severity) {
+    return (
+      <Grid.Row className="top-padded">
+        <Grid.Col md={1}>
+          <strong>Risk Factor</strong>
+        </Grid.Col>
+        <Grid.Col md={8}>
+          <Icon
+            type="pf"
+            name="resources-full"
+            style={{ color: presentSeverity(entry.severity) }}
+          />{' '}
+          {entry.severity}
+        </Grid.Col>
+      </Grid.Row>
+    );
+  }
+  return <div />;
+};
+
+export const getSummary = entry => {
+  if (entry.summary) {
+    return (
+      <Grid.Row className="top-padded">
+        <Grid.Col md={1}>
+          <strong>Summary</strong>
+        </Grid.Col>
+        <Grid.Col md={8} className="pre-wrap">
+          {entry.summary}
+        </Grid.Col>
+      </Grid.Row>
+    );
+  }
+  return <div />;
+};
+
+export const getTags = entry => {
+  if (entry.tags) {
+    return (
+      <Grid.Row className="top-padded">
+        <Grid.Col md={1}>
+          <strong>Tags</strong>
+        </Grid.Col>
+        <Grid.Col md={8}>{tagInfo(entry.tags)}</Grid.Col>
+      </Grid.Row>
+    );
+  }
+  return <div />;
+};
+
+export const getExternals = entry => {
+  if (entry.detail && entry.detail.external) {
+    return entry.detail.external.map(attr => {
+      const key = itemIteratorId(entry, attr);
+      return (
+        <Grid.Row className="top-padded" key={key}>
+          <Grid.Col md={1}>
+            <strong>Links</strong>
+          </Grid.Col>
+          <Grid.Col md={8}>
+            <a href={attr.url}>{attr.title}</a>
+          </Grid.Col>
+        </Grid.Row>
+      );
+    });
+  }
+  return <div />;
+};
+
+export const getRemediations = entry => {
+  if (entry.detail && entry.detail.remediations) {
+    return entry.detail.remediations.map(attr => {
+      const key = itemIteratorId(entry, attr);
+      if (attr.type === 'hint') {
+        return (
+          <Grid.Row className="top-padded" key={key}>
+            <Grid.Col md={1}>
+              <strong>Hint</strong>
+            </Grid.Col>
+            <Grid.Col md={8}>{attr.context}</Grid.Col>
+          </Grid.Row>
+        );
+      }
+      if (attr.type === 'command') {
+        return (
+          <Grid.Row className="top-padded" key={key}>
+            <Grid.Col md={1}>
+              <strong>Command</strong>
+            </Grid.Col>
+            <Grid.Col md={8}>
+              <code>{attr.context.join(' ')}</code>
+            </Grid.Col>
+          </Grid.Row>
+        );
+      }
+
+      return <div />;
+    });
+  }
+  return <div />;
 };

data/webpack/components/PreupgradeReportsList/index.js

@@ -1,26 +1,39 @@
-import React from 'react';
+import React, { useState } from 'react';
 import { ListView } from 'patternfly-react';
 import PropTypes from 'prop-types';
 
+import Pagination from 'foremanReact/components/Pagination/PaginationWrapper';
+import { useForemanSettings } from 'foremanReact/Root/Context/ForemanContext';
+
 import PreupgradeReportEntry from './components/PreupgradeReportEntry';
+import { entriesPage } from '../PreupgradeReports/PreupgradeReportsHelpers';
 
-const PreupgradeReportsList = ({ preupgradeReports }) => {
-  const flatEntries = preupgradeReports.reduce(
-    (memo, report) => [...memo, ...report.entries],
-    []
-  );
+const PreupgradeReportsList = ({ allEntries }) => {
+  const { perPage, perPageOptions } = useForemanSettings();
+  const [pagination, setPagination] = useState({
+    page: 1,
+    perPage,
+    perPageOptions,
+  });
 
   return (
     <ListView>
-      {flatEntries.map((entry, idx) => (
+      {entriesPage(allEntries, pagination).map((entry, idx) => (
         <PreupgradeReportEntry entry={entry} key={idx} />
       ))}
+      <Pagination
+        viewType="list"
+        itemCount={allEntries.length}
+        pagination={pagination}
+        onChange={newPage => setPagination({ ...pagination, ...newPage })}
+        dropdownButtonId="preupgrade-report-entries-pagination-dropdown"
+      />
     </ListView>
   );
 };
 
 PreupgradeReportsList.propTypes = {
-  preupgradeReports: PropTypes.array.isRequired,
+  allEntries: PropTypes.array.isRequired,
 };
 
 export default PreupgradeReportsList;

data/webpack/csrf.js

@@ -0,0 +1,4 @@
+export default () => {
+  const tokenMeta = document.getElementsByName('csrf-token')[0];
+  return tokenMeta && tokenMeta.content;
+};

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_leapp
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Foreman Leapp team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2020-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_remote_execution
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: foreman_ansible
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -107,37 +121,45 @@ files:
 - test/test_plugin_helper.rb
 - test/unit/actions/preupgrade_job_test.rb
 - test/unit/helpers/job_helper_test.rb
+- webpack/__mocks__/foremanReact/Root/Context/ForemanContext.js
 - webpack/__mocks__/foremanReact/common/I18n.js
+- webpack/__mocks__/foremanReact/components/Pagination/PaginationWrapper.js
 - webpack/__mocks__/foremanReact/components/common/MessageBox.js
 - webpack/components/PreupgradeReports/PreupgradeReports.js
 - webpack/components/PreupgradeReports/PreupgradeReportsActions.js
+- webpack/components/PreupgradeReports/PreupgradeReportsHelpers.js
 - webpack/components/PreupgradeReports/PreupgradeReportsReducer.js
 - webpack/components/PreupgradeReports/PreupgradeReportsSelectors.js
 - webpack/components/PreupgradeReports/__tests__/PreupgradeReports.fixtures.js
 - webpack/components/PreupgradeReports/__tests__/PreupgradeReports.test.js
+- webpack/components/PreupgradeReports/__tests__/PreupgradeReportsHelpers.test.js
 - webpack/components/PreupgradeReports/__tests__/PreupgradeReportsReducer.test.js
 - webpack/components/PreupgradeReports/__tests__/PreupgradeReportsSelectors.test.js
 - webpack/components/PreupgradeReports/__tests__/__snapshots__/PreupgradeReports.test.js.snap
+- webpack/components/PreupgradeReports/__tests__/__snapshots__/PreupgradeReportsHelpers.test.js.snap
 - webpack/components/PreupgradeReports/__tests__/__snapshots__/PreupgradeReportsReducer.test.js.snap
 - webpack/components/PreupgradeReports/__tests__/__snapshots__/PreupgradeReportsSelectors.test.js.snap
+- webpack/components/PreupgradeReports/components/FixAllButton.js
+- webpack/components/PreupgradeReports/components/FixAllButton.test.js
+- webpack/components/PreupgradeReports/components/__snapshots__/FixAllButton.test.js.snap
 - webpack/components/PreupgradeReports/index.js
 - webpack/components/PreupgradeReportsList/__tests__/PreupgradeReportsList.test.js
 - webpack/components/PreupgradeReportsList/__tests__/__snapshots__/PreupgradeReportsList.test.js.snap
 - webpack/components/PreupgradeReportsList/components/EmptyInfoItem.js
 - webpack/components/PreupgradeReportsList/components/InfoItem.js
 - webpack/components/PreupgradeReportsList/components/PreupgradeReportEntry.js
-- webpack/components/PreupgradeReportsList/components/StringInfoItem.js
 - webpack/components/PreupgradeReportsList/components/__tests__/EmptyInfoItem.test.js
+- webpack/components/PreupgradeReportsList/components/__tests__/PreupgradeReportEntry.fixtures.js
 - webpack/components/PreupgradeReportsList/components/__tests__/PreupgradeReportEntry.test.js
-- webpack/components/PreupgradeReportsList/components/__tests__/StringInfoItem.test.js
 - webpack/components/PreupgradeReportsList/components/__tests__/__snapshots__/EmptyInfoItem.test.js.snap
 - webpack/components/PreupgradeReportsList/components/__tests__/__snapshots__/PreupgradeReportEntry.test.js.snap
-- webpack/components/PreupgradeReportsList/components/__tests__/__snapshots__/StringInfoItem.test.js.snap
 - webpack/components/PreupgradeReportsList/components/__tests__/__snapshots__/helpers.test.js.snap
 - webpack/components/PreupgradeReportsList/components/__tests__/helpers.test.js
+- webpack/components/PreupgradeReportsList/components/foreman_leapp.scss
 - webpack/components/PreupgradeReportsList/components/helpers.js
 - webpack/components/PreupgradeReportsList/index.js
 - webpack/consts.js
+- webpack/csrf.js
 - webpack/index.js
 - webpack/reducer.js
 - webpack/testSetup.js

data/webpack/components/PreupgradeReportsList/components/StringInfoItem.js

@@ -1,49 +0,0 @@
-import React from 'react';
-import EllipsisWithTooltip from 'react-ellipsis-with-tooltip';
-import PropTypes from 'prop-types';
-import { translate as __ } from 'foremanReact/common/I18n';
-
-import InfoItem from './InfoItem';
-import { itemIteratorId } from './helpers';
-
-const StringInfoItem = ({
-  entry,
-  attr,
-  tooltipText,
-  translate,
-  mapAttr,
-  elipsed,
-}) => {
-  const inner = (
-    <span>{translate ? __(mapAttr(entry, attr)) : mapAttr(entry, attr)}</span>
-  );
-  const innerContent = elipsed ? (
-    <EllipsisWithTooltip placement="top">{inner}</EllipsisWithTooltip>
-  ) : (
-    inner
-  );
-
-  return (
-    <InfoItem itemId={itemIteratorId(entry, attr)} tooltipText={tooltipText}>
-      {innerContent}
-    </InfoItem>
-  );
-};
-
-StringInfoItem.propTypes = {
-  entry: PropTypes.object.isRequired,
-  attr: PropTypes.string.isRequired,
-  tooltipText: PropTypes.string,
-  translate: PropTypes.bool,
-  mapAttr: PropTypes.func,
-  elipsed: PropTypes.bool,
-};
-
-StringInfoItem.defaultProps = {
-  translate: false,
-  mapAttr: (entry, attr) => entry[attr],
-  elipsed: false,
-  tooltipText: undefined,
-};
-
-export default StringInfoItem;

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

@@ -1,13 +0,0 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-
-import StringInfoItem from '../StringInfoItem';
-
-const fixtures = {
-  'should render': {
-    entry: { title: 'no title', severity: 'low', id: 5, preupgradeReportId: 7 },
-    attr: 'title',
-  },
-};
-
-describe('StringInfoItem', () =>
-  testComponentSnapshotsWithFixtures(StringInfoItem, fixtures));

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

@@ -1,12 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`StringInfoItem should render 1`] = `
-<InfoItem
-  itemId="5-7-title"
-  tooltipText=""
->
-  <span>
-    no title
-  </span>
-</InfoItem>
-`;