foreman_leapp 4.2.1 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0359af6f2c4932799583af33c20403b69f2049602d4303d9706a75519403f31
-  data.tar.gz: 4ff2b28bd32baaa3d498db1e585c87e085a3360162e13569641e082ecbe3c79a
+  metadata.gz: 2b21b7465db5f87cfccd517c018e30bb3aa5f6c7878cbef6e314c981b5c21870
+  data.tar.gz: dd0f2a71a7d5c5858aa3c6336d4d92fafb6ebd3c890404265262491ce2311057
 SHA512:
-  metadata.gz: 4e83c9106bac61b096e6ac2014175d18a62d0b73061e4c9c67ede19cb2ecd3b96a5045c329462d94f384ebf816ca067e808e1f09bd12d9943a8e8fcb97123e8b
-  data.tar.gz: 0c88e19804100c24fcaadd216729714e2e56c3403fa7f664ee7e0bd212cd22d251d8e760363fb385037dca994c82a3090f3a8485ec3d3e839df02c68f514a539
+  metadata.gz: c6e3d0c62affb53415a88dc5fd5ab55f44a9a3dfa601964a8fdf85bf7264f6a3e41622e63f8a213547197f7f23b5bcb139ed3f034df27ac25e564c915c0a622e
+  data.tar.gz: 021af94cf62a318c7aadace3ed71f8171862f2820a5f7d67dcd800ffc8d52ef0caeb4df53be11a8a7bad4c722db43486095e1f10184234f7c8b84c873a8764da

data/config/routes.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 Rails.application.routes.draw do
-  resources :preupgrade_reports, only: %i[index]
-
   namespace :api, defaults: { format: 'json' } do
     scope '(:apiv)', module: :v2, defaults: { apiv: 'v2' }, apiv: /v2/,
       constraints: ApiConstraints.new(version: 2, default: true) do

data/lib/foreman_leapp/engine.rb

@@ -26,19 +26,8 @@ module ForemanLeapp
           extend_rabl_template 'api/v2/job_invocations/main',
                                'api/v2/job_invocations/leapp_preupgrade_report'
 
-          extend_page 'job_invocations/show' do |cx|
-            cx.add_pagelet :main_tabs,
-                          partial: 'job_invocations/leapp_preupgrade_report',
-                          name: _('Leapp preupgrade report'),
-                          id: 'leapp_preupgrade_report',
-                          onlyif: proc { |subject|
-                            ::Helpers::JobHelper.with_leapp_report(subject)
-                          }
-          end
-
           security_block :foreman_leapp do
-            permission :view_job_invocations, { :preupgrade_reports => %i[index show job_invocation],
-                                                'api/v2/preupgrade_reports' => %i[index show job_invocation] },
+            permission :view_job_invocations, { 'api/v2/preupgrade_reports' => %i[index show job_invocation] },
                                               :resource_type => 'JobInvocation'
           end
 

data/lib/foreman_leapp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanLeapp
-  VERSION = '4.2.1'
+  VERSION = '4.3.0'
 end

data/package.json

@@ -33,7 +33,6 @@
     "@theforeman/vendor-dev": ">= 12.0.1",
     "babel-eslint": "^10.0.0",
     "eslint": "^6.8.0",
-    "jest-svg-transformer": "^1.0.0",
     "prettier": "^1.19.1"
   }
 }

data/webpack/components/PreupgradeReportsTable/index.js

@@ -29,10 +29,16 @@ import { getControllerSearchProps, STATUS } from 'foremanReact/constants';
 import SearchBar from 'foremanReact/components/SearchBar';
 import { APIActions } from 'foremanReact/redux/API';
 import { usePreupgradeTableState } from './PreupgradeReportsTableHelpers';
-import { entryFixable } from '../PreupgradeReports/PreupgradeReportsHelpers';
 import ReportDetails, { renderSeverityLabel } from './ReportDetails';
 import './PreupgradeReportsTable.scss';
 
+const entryWithFixKind = kind => entry =>
+  entry.detail &&
+  entry.detail.remediations &&
+  entry.detail.remediations.some(remediation => remediation.type === kind);
+
+const entryFixable = entryWithFixKind('command');
+
 const isRowFixable = entryFixable;
 
 const submitJobInvocation = (

data/webpack/index.js

@@ -1,13 +0,0 @@
-import componentRegistry from 'foremanReact/components/componentRegistry';
-
-import injectReducer from 'foremanReact/redux/reducers/registerReducer';
-
-import PreupgradeReports from './components/PreupgradeReports';
-import reducer from './reducer';
-
-componentRegistry.register({
-  name: 'PreupgradeReports',
-  type: PreupgradeReports,
-});
-
-injectReducer('foremanLeapp', reducer);

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foreman_leapp
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.3.0
 platform: ruby
 authors:
 - Foreman Leapp team
 bindir: bin
 cert_chain: []
-date: 2026-10-12 00:00:00.000000000 Z
+date: 2026-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_remote_execution
@@ -58,7 +58,6 @@ files:
 - app/controllers/api/v2/preupgrade_reports_controller.rb
 - app/controllers/concerns/api/v2/api_authorizer.rb
 - app/controllers/concerns/foreman_leapp/preupgrade_report_entry_bulk_remediate.rb
-- app/controllers/preupgrade_reports_controller.rb
 - app/helpers/foreman_leapp/hosts_helper.rb
 - app/helpers/foreman_leapp/template_helper.rb
 - app/lib/actions/foreman_leapp/preupgrade_job.rb
@@ -78,10 +77,6 @@ files:
 - 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
-- app/views/preupgrade_reports/show.json.rabl
 - config/routes.rb
 - db/migrate/20200320104040_preupgrade_report_entries.rb
 - db/migrate/20200326142259_add_job_id_to_report.rb
@@ -114,7 +109,6 @@ files:
 - test/functional/api/v2/job_invocations_controller_test.rb
 - test/functional/api/v2/preupgrade_report_entries_controller_test.rb
 - test/functional/api/v2/preupgrade_reports_controller_test.rb
-- test/functional/preupgrade_reports_controller_test.rb
 - test/helpers/template_helper_test.rb
 - test/models/preupgrade_report_entry_test.rb
 - test/models/preupgrade_report_test.rb
@@ -122,70 +116,13 @@ files:
 - test/unit/actions/preupgrade_job_test.rb
 - test/unit/helpers/job_helper_test.rb
 - webpack/__mocks__/foremanReact/Root/Context/ForemanContext.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__/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__/UpgradeAllButton.test.js.snap
-- webpack/components/PreupgradeReports/index.js
-- webpack/components/PreupgradeReportsList/PreupgradeReportList.scss
-- webpack/components/PreupgradeReportsList/__tests__/PreupgradeReportsList.test.js
-- 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/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__/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__/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/components/PreupgradeReportsTable/PreupgradeReportsTable.scss
 - webpack/components/PreupgradeReportsTable/PreupgradeReportsTableHelpers.js
 - webpack/components/PreupgradeReportsTable/ReportDetails.js
 - webpack/components/PreupgradeReportsTable/__tests__/PreupgradeReportsTable.test.js
 - webpack/components/PreupgradeReportsTable/index.js
-- webpack/consts.js
-- webpack/csrf.js
 - webpack/global_index.js
 - webpack/index.js
-- webpack/reducer.js
 - webpack/testSetup.js
 - webpack/test_setup.js
 homepage: https://github.com/theforeman/foreman_leapp
@@ -214,7 +151,6 @@ test_files:
 - test/functional/api/v2/job_invocations_controller_test.rb
 - test/functional/api/v2/preupgrade_report_entries_controller_test.rb
 - test/functional/api/v2/preupgrade_reports_controller_test.rb
-- test/functional/preupgrade_reports_controller_test.rb
 - test/helpers/template_helper_test.rb
 - test/models/preupgrade_report_entry_test.rb
 - test/models/preupgrade_report_test.rb

data/app/controllers/preupgrade_reports_controller.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-class PreupgradeReportsController < ::Api::V2::BaseController
-  include Api::V2::ApiAuthorizer
-
-  def index
-    @preupgrade_reports = resource_scope.includes(:preupgrade_report_entries).search_for(*search_options)
-  end
-
-  private
-
-  # By overriding :path_to_authenticate we can require REX's :view_job_invocations permission
-  def path_to_authenticate
-    Foreman::AccessControl.normalize_path_hash params.slice(:action, :id, :user_id)
-                                                     .merge({ controller: 'job_invocations' })
-  end
-end

data/app/views/job_invocations/_leapp_preupgrade_report.html.erb

@@ -1,11 +0,0 @@
-<% content_for(:javascripts) do %>
-  <%= webpacked_plugins_js_for :foreman_leapp %>
-<% end %>
-<% content_for(:stylesheets) do %>
-  <%= webpacked_plugins_css_for :foreman_leapp %>
-<% end %>
-
-<%= react_component('PreupgradeReports', {
-  :url => preupgrade_reports_path(:search => "job_invocation_id = #{@job_invocation.id}"),
-  :newJobInvocationUrl => new_job_invocation_path
-}) %>

data/app/views/preupgrade_report_entries/base.json.rabl

@@ -1,4 +0,0 @@
-object @preupgrade_report_entry
-
-extends "api/v2/preupgrade_report_entries/base"
-attribute :detail

data/app/views/preupgrade_reports/index.json.rabl

@@ -1,3 +0,0 @@
-collection @preupgrade_reports
-
-extends 'preupgrade_reports/show'

data/app/views/preupgrade_reports/show.json.rabl

@@ -1,7 +0,0 @@
-object @preupgrade_report
-
-extends "api/v2/preupgrade_reports/base"
-
-child :preupgrade_report_entries => :entries do
-  extends "preupgrade_report_entries/base"
-end

data/test/functional/preupgrade_reports_controller_test.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require 'test_plugin_helper'
-
-class PreupgradeReportsControllerTest < ActionController::TestCase
-  setup do
-    @user = FactoryBot.create(:user, admin: false)
-    @host = FactoryBot.create :host
-    FactoryBot.create :preupgrade_report, host: @host
-  end
-
-  test 'should get :index' do
-    get :index
-    assert_response :success
-    assert_not_empty JSON.parse(@response.body)['results']
-  end
-
-  test 'should get :index with :view_job_invocations & :view_hosts' do
-    setup_user 'view', 'job_invocations', nil, @user
-    setup_user 'view', 'hosts', nil, @user
-    get :index, session: set_session_user(@user)
-    assert_response :success
-    assert_not_empty JSON.parse(@response.body)['results']
-  end
-
-  test 'should not get :index without :view_job_invocations' do
-    setup_user 'view', 'hosts', nil, @user
-    get :index, session: set_session_user(@user)
-    assert_response :forbidden
-    assert_includes JSON.parse(@response.body)['error']['missing_permissions'], 'view_job_invocations'
-  end
-
-  test 'should not get :index without :view_hosts' do
-    setup_user 'view', 'job_invocations', nil, @user
-    get :index, session: set_session_user(@user)
-    assert_response :forbidden
-    assert_includes JSON.parse(@response.body)['error']['missing_permissions'], 'view_hosts'
-  end
-end

data/webpack/components/PreupgradeReports/PreupgradeReports.js

@@ -1,154 +0,0 @@
-import React, { useState } from 'react';
-import { Icon } from '@patternfly/react-core';
-import { ExclamationCircleIcon } from '@patternfly/react-icons';
-import EmptyState from 'foremanReact/components/common/EmptyState';
-import { LoadingState, Row } from 'patternfly-react';
-import PropTypes from 'prop-types';
-import { sprintf, translate as __ } from 'foremanReact/common/I18n';
-
-import PreupgradeReportsList from '../PreupgradeReportsList';
-import UpgradeAllButton from './components/UpgradeAllButton';
-import EntriesFilter from './components/EntriesFilter';
-import FixSelectedButton from './components/FixSelectedButton';
-
-import {
-  flattenEntries,
-  isEmpty,
-  anyEntriesFixable,
-  filterEntries,
-  idsForInvocationFromEntries,
-  sortEntries,
-  fixableEntries,
-} from './PreupgradeReportsHelpers';
-
-import NoReports from './components/NoReports';
-
-const PreupgradeReports = ({
-  preupgradeReports,
-  csrfToken,
-  newJobInvocationUrl,
-}) => {
-  const [filterType, setFilterType] = useState('title');
-  const [filterValue, setFilterValue] = useState('');
-  const [checked, setChecked] = useState([]);
-  const [sort, setSort] = useState({ attribute: '', order: 'desc' });
-
-  const onFilterValueChange = value => {
-    setFilterValue(value);
-  };
-
-  const onFilterValueClear = () => setFilterValue('');
-
-  const onFilterTypeChange = value => {
-    onFilterValueClear();
-    setFilterType(value);
-  };
-
-  const isSelected = entry => checked.some(item => item.id === entry.id);
-
-  const anySelected = checked.length > 0;
-
-  const toggleSelected = (entry, isEntrySelected) => {
-    if (isEntrySelected) {
-      setChecked(checked.filter(item => item.id !== entry.id));
-    } else {
-      setChecked([entry, ...checked]);
-    }
-  };
-
-  const toggleSelectAll = () => {
-    const allFixable = fixableEntries(preupgradeReports);
-
-    if (checked.length === allFixable.length) {
-      setChecked([]);
-    } else {
-      setChecked(allFixable);
-    }
-  };
-
-  const changeSort = value => {
-    setSort({ ...sort, ...value });
-  };
-
-  return (
-    <React.Fragment>
-      <Row>
-        <div className="col-md-8">
-          <EntriesFilter
-            filterType={filterType}
-            onFilterTypeChange={onFilterTypeChange}
-            filterValue={filterValue}
-            onFilterValueChange={onFilterValueChange}
-          />
-        </div>
-        <div className="col-md-4">
-          <div className="btn-toolbar pull-right">
-            <FixSelectedButton
-              postUrl={newJobInvocationUrl}
-              disabled={!anyEntriesFixable(preupgradeReports) || !anySelected}
-              csrfToken={csrfToken}
-              ids={idsForInvocationFromEntries(checked)}
-            />
-            <UpgradeAllButton
-              postUrl={newJobInvocationUrl}
-              csrfToken={csrfToken}
-              preupgradeReports={preupgradeReports}
-            />
-          </div>
-        </div>
-      </Row>
-      <PreupgradeReportsList
-        allEntries={filterEntries(
-          filterType,
-          filterValue,
-          sortEntries(flattenEntries(preupgradeReports), sort)
-        )}
-        isSelected={isSelected}
-        toggleSelected={toggleSelected}
-        sort={sort}
-        changeSort={changeSort}
-        toggleSelectAll={toggleSelectAll}
-      />
-    </React.Fragment>
-  );
-};
-
-const withLoadingState = Component => componentProps => {
-  const { error, loading, preupgradeReports, reportsExpected } = componentProps;
-
-  if (!isEmpty(error)) {
-    return (
-      <EmptyState
-        key="preupgrade-reports-error"
-        variant="xs"
-        icon={
-          <Icon iconSize="lg">
-            <ExclamationCircleIcon />
-          </Icon>
-        }
-        header={sprintf(__('Could not retrieve data: %(status)s - %(msg)s'), {
-          status: error.statusText,
-          msg: error.errorMsg,
-        })}
-      />
-    );
-  }
-
-  return (
-    <LoadingState loading={loading}>
-      {preupgradeReports.length > 0 ? (
-        <Component {...componentProps} />
-      ) : (
-        <NoReports reportsExpected={reportsExpected} />
-      )}
-    </LoadingState>
-  );
-};
-
-PreupgradeReports.propTypes = {
-  preupgradeReports: PropTypes.array.isRequired,
-  csrfToken: PropTypes.string.isRequired,
-  newJobInvocationUrl: PropTypes.string.isRequired,
-};
-
-export default withLoadingState(PreupgradeReports);

data/webpack/components/PreupgradeReports/PreupgradeReportsActions.js

@@ -1,31 +0,0 @@
-import api from 'foremanReact/API';
-import { deepPropsToCamelCase } from 'foremanReact/common/helpers';
-import { translate as __ } from 'foremanReact/common/I18n';
-
-import {
-  PREUPGRADE_REPORTS_REQUEST,
-  PREUPGRADE_REPORTS_SUCCESS,
-  PREUPGRADE_REPORTS_FAILURE,
-} from '../../consts';
-
-export const getPreupgradeReportsAction = url => async dispatch => {
-  dispatch({ type: PREUPGRADE_REPORTS_REQUEST });
-
-  try {
-    const { data } = await api.get(url);
-    return dispatch({
-      type: PREUPGRADE_REPORTS_SUCCESS,
-      payload: deepPropsToCamelCase(data),
-    });
-  } catch (error) {
-    return dispatch(errorHandler(PREUPGRADE_REPORTS_FAILURE, error));
-  }
-};
-
-const errorHandler = (msg, err) => {
-  const error = {
-    errorMsg: __('Failed to fetch preupgrade reports from server.'),
-    statusText: err.response.statusText,
-  };
-  return { type: msg, payload: { error } };
-};

data/webpack/components/PreupgradeReports/PreupgradeReportsHelpers.js

@@ -1,152 +0,0 @@
-import Immutable from 'seamless-immutable';
-
-export const flattenEntries = reports =>
-  reports.reduce((memo, report) => [...memo, ...report.entries], []);
-
-const entryWithFixKind = kind => entry =>
-  entry.detail &&
-  entry.detail.remediations &&
-  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 =>
-  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();
-};