foreman_leapp 0.0.5 → 0.1.3

data/webpack/components/PreupgradeReportsList/index.js

@@ -1,26 +1,64 @@
-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 PreupgradeReportsListHeader from './components/PreupgradeReportsListHeader';
+import { entriesPage } from '../PreupgradeReports/PreupgradeReportsHelpers';
 
-const PreupgradeReportsList = ({ preupgradeReports }) => {
-  const flatEntries = preupgradeReports.reduce(
-    (memo, report) => [...memo, ...report.entries],
-    []
-  );
+import './PreupgradeReportList.scss';
+
+const PreupgradeReportsList = ({
+  allEntries,
+  isSelected,
+  toggleSelected,
+  sort,
+  changeSort,
+  toggleSelectAll,
+}) => {
+  const { perPage, perPageOptions } = useForemanSettings();
+  const [pagination, setPagination] = useState({
+    page: 1,
+    perPage,
+    perPageOptions,
+  });
 
   return (
-    <ListView>
-      {flatEntries.map((entry, idx) => (
-        <PreupgradeReportEntry entry={entry} key={idx} />
+    <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}
+          isEntrySelected={isSelected(entry)}
+          toggleSelected={toggleSelected}
+        />
       ))}
+      <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,
+  isSelected: PropTypes.func.isRequired,
+  toggleSelected: PropTypes.func.isRequired,
+  sort: PropTypes.object.isRequired,
+  changeSort: PropTypes.func.isRequired,
+  toggleSelectAll: PropTypes.func.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.1.3
 platform: ruby
 authors:
 - Foreman Leapp team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2020-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_remote_execution
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
+- !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
@@ -63,6 +77,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/controllers/api/v2/concerns/api_authorizer.rb
 - app/controllers/api/v2/preupgrade_reports_controller.rb
 - app/controllers/preupgrade_reports_controller.rb
 - app/helpers/concerns/foreman_leapp/hosts_helper_extensions.rb
@@ -76,10 +91,12 @@ files:
 - app/views/api/v2/preupgrade_report_entries/base.json.rabl
 - app/views/api/v2/preupgrade_reports/base.json.rabl
 - app/views/api/v2/preupgrade_reports/index.json.rabl
+- app/views/api/v2/preupgrade_reports/job_invocation.json.rabl
 - app/views/api/v2/preupgrade_reports/show.json.rabl
-- app/views/foreman_leapp/job_templates/preupgrade.erb
-- app/views/foreman_leapp/job_templates/remediation.erb
-- app/views/foreman_leapp/job_templates/upgrade.erb
+- app/views/foreman_leapp/job_templates/leapp_check.erb
+- app/views/foreman_leapp/job_templates/leapp_preupgrade.erb
+- app/views/foreman_leapp/job_templates/leapp_remediation.erb
+- app/views/foreman_leapp/job_templates/leapp_upgrade.erb
 - app/views/job_invocations/_leapp_preupgrade_report.html.erb
 - app/views/preupgrade_report_entries/base.json.rabl
 - app/views/preupgrade_reports/index.json.rabl
@@ -88,6 +105,7 @@ files:
 - db/migrate/20200320104040_preupgrade_report_entries.rb
 - db/migrate/20200326142259_add_job_id_to_report.rb
 - db/migrate/20200327091009_add_host_to_report.rb
+- db/migrate/20200429080939_report_entries_flags.rb
 - db/seeds.d/10_leapp_preupgrade.rb
 - lib/foreman_leapp.rb
 - lib/foreman_leapp/engine.rb
@@ -107,37 +125,70 @@ 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/EmptyState.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/EntriesFilter.js
+- webpack/components/PreupgradeReports/components/EntriesFilter.scss
+- webpack/components/PreupgradeReports/components/EntriesFilter.test.js
+- webpack/components/PreupgradeReports/components/FixSelectedButton.js
+- webpack/components/PreupgradeReports/components/FixSelectedButton.test.js
+- webpack/components/PreupgradeReports/components/NoReports.js
+- webpack/components/PreupgradeReports/components/NoReports.test.js
+- webpack/components/PreupgradeReports/components/UpgradeAllButton.js
+- webpack/components/PreupgradeReports/components/UpgradeAllButton.test.js
+- webpack/components/PreupgradeReports/components/__snapshots__/EntriesFilter.test.js.snap
+- webpack/components/PreupgradeReports/components/__snapshots__/FixSelectedButton.test.js.snap
+- webpack/components/PreupgradeReports/components/__snapshots__/NoReports.test.js.snap
+- webpack/components/PreupgradeReports/components/__snapshots__/UpgradeAllButton.test.js.snap
 - webpack/components/PreupgradeReports/index.js
+- webpack/components/PreupgradeReportsList/PreupgradeReportList.scss
 - 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/InhibitorInfoItem.js
 - webpack/components/PreupgradeReportsList/components/PreupgradeReportEntry.js
-- webpack/components/PreupgradeReportsList/components/StringInfoItem.js
+- webpack/components/PreupgradeReportsList/components/PreupgradeReportsListHeader.js
+- webpack/components/PreupgradeReportsList/components/SortableHeaderItem.js
 - webpack/components/PreupgradeReportsList/components/__tests__/EmptyInfoItem.test.js
+- webpack/components/PreupgradeReportsList/components/__tests__/InhibitorInfoItem.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__/PreupgradeReportsListHeader.test.js
+- webpack/components/PreupgradeReportsList/components/__tests__/SortableHeaderItem.test.js
 - webpack/components/PreupgradeReportsList/components/__tests__/__snapshots__/EmptyInfoItem.test.js.snap
+- webpack/components/PreupgradeReportsList/components/__tests__/__snapshots__/InhibitorInfoItem.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__/PreupgradeReportsListHeader.test.js.snap
+- webpack/components/PreupgradeReportsList/components/__tests__/__snapshots__/SortableHeaderItem.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/components/images/i_severity-critical.svg
+- webpack/components/PreupgradeReportsList/components/images/i_severity-high.svg
+- webpack/components/PreupgradeReportsList/components/images/i_severity-low.svg
+- webpack/components/PreupgradeReportsList/components/images/i_severity-med.svg
 - webpack/components/PreupgradeReportsList/index.js
 - webpack/consts.js
+- webpack/csrf.js
 - webpack/index.js
 - webpack/reducer.js
 - webpack/testSetup.js

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

@@ -1,17 +0,0 @@
-<%#
-kind: job_template
-name: Remediation plan
-job_category: Leapp
-description_format: 'Run Remediation plan with Leapp'
-provider_type: SSH
-feature: leapp_remediation_plan
-template_inputs:
-- name: remediation_ids
-  required: true
-  advanced: true
-  input_type: user
-  value_type: plain
-  description: List of remediation ids
-%>
-
-<%= build_remediation_plan(input('remediation_ids').split(','), @host) %>

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

@@ -1,16 +0,0 @@
-<%#
-kind: job_template
-name: Run upgrade via Leapp
-job_category: Leapp
-description_format: 'Upgrade RHEL 7 host'
-provider_type: SSH
-feature: leapp_upgrade
-template_inputs:
-- name: reboot
-  description: reboot the vm automaticaly to continue with the upgrade
-  input_type: user
-  required: false
-  options: "false\ntrue"
-%>
-
-leapp upgrade <%= "--reboot" if input('reboot') == "true" %>

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>
-`;