foreman_patch 1.1.1 → 1.1.3

data/webpack/components/Invocations/index.js

@@ -1,6 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import PropTypes from 'prop-types';
+import { Grid } from 'patternfly-react';
 
 import { 
   withInterval,
@@ -8,7 +9,13 @@ import {
 } from 'foremanReact/redux/middlewares/IntervalMiddleware';
 import { get } from 'foremanReact/redux/API';
 import { useForemanSettings } from 'foremanReact/Root/Context/ForemanContext';
+import { getControllerSearchProps } from 'foremanReact/constants';
+import { translate as __ } from 'foremanReact/common/I18n';
+import SearchBar from 'foremanReact/components/SearchBar';
+import Pagination from 'foremanReact/components/Pagination/PaginationWrapper';
+import { ActionButtons } from 'foremanReact/components/common/ActionButtons/ActionButtons';
 
+import Invocations from './Invocations';
 import {
   selectItems,
   selectTotal,
@@ -18,7 +25,8 @@ import {
 } from './InvocationsSelectors';
 import { getUrl } from './InvocationsHelpers';
 import { INVOCATIONS } from './InvocationsConstants';
-import InvocationsPage from './InvocationsPage';
+
+import './Invocations.scss';
 
 const WrappedInvocations = ({ round }) => {
   const dispatch = useDispatch();
@@ -36,6 +44,9 @@ const WrappedInvocations = ({ round }) => {
   });
   const [url, setUrl] = useState(getUrl(round, searchQuery, pagination));
   const intervalExists = useSelector(selectIntervalExists);
+  const [selectedItems, setSelectedItems] = useState([]);
+  const [recentSelectedItemIndex, setRecentSelectedRowIndex] = useState(null);
+  const [shifting, setShifting] = useState(false);
 
   const handleSearch = query => {
     const defaultPagination = { page: 1, perPage: pagination.perPage };
@@ -52,6 +63,32 @@ const WrappedInvocations = ({ round }) => {
     setUrl(getUrl(round, searchQuery, args));
   };
 
+  const selectAll = (isSelecting) => setSelectedItems(isSelecting ? items.map(item => item.id) : []);
+
+  const areAllSelected = selectedItems.length == items.length;
+
+  const setItemSelected = (item, isSelecting) => 
+    setSelectedItems(prevSelected => {
+      const otherSelectedItems = prevSelected.filter(i => i !== item.id);
+      return isSelecting ? [...otherSelectedItems, item.id] : otherSelectedItems;
+    });
+
+  const onSelect = (item, rowIndex, isSelecting) => {
+    if (shifting && recentSelectedRowIndex !== null) {
+      const numberSelected = rowIndex - recentSelectedRowIndex;
+      const intermediateIndexes =
+        numberSelected > 0
+        ? Array.from(new Array(numberSelected + 1), (_x, i) => i + recentSelectedRowIndex)
+        : Array.from(new Array(Math.abs(numberSelected) + 1), (_x, i) => i + rowIndex);
+      intermediateIndexes.forEach(index, setItemSelected(items[index], isSelecting));
+    } else {
+      setItemSelected(item, isSelecting);
+    }
+    setRecentSelectedRowIndex(rowIndex);
+  };
+
+  const isSelected = item => selectedItems.includes(item.id);
+
   const stopApiInterval = () => {
     if (intervalExists) {
       dispatch(stopInterval(INVOCATIONS));
@@ -67,27 +104,73 @@ const WrappedInvocations = ({ round }) => {
   }), 5000);
 
   useEffect(() => {
+    const onKeyDown = (e) => {
+      if (e.key === 'Shift') {
+        setShifting(true);
+      }
+    };
+    const onKeyUp = (e) => {
+      if (e.key === 'Shift') {
+        setShifting(false);
+      }
+    };
+
     dispatch(getData(url));
 
     if (!autoRefresh) {
       dispatch(stopInterval(INVOCATIONS));
     }
 
+    document.addEventListener('keydown', onKeyDown);
+    document.addEventListener('keyup', onKeyUp);
+
     return () => {
       dispatch(stopInterval(INVOCATIONS));
+      document.removeEventListener('keydown', onKeyDown);
+      document.removeEventListener('keyup', onKeyUp);
     };
   }, [dispatch, url, autoRefresh]);
 
   return (
-    <InvocationsPage
-      status={status}
-      items={items}
-      total={total}
-      searchQuery={searchQuery}
-      handleSearch={handleSearch}
-      pagination={pagination}
-      handlePagination={handlePagination}
-    />
+    <React.Fragment>
+      <Grid.Row>
+        <Grid.Col md={6} className="title_filter">
+          <SearchBar
+            onSearch={handleSearch}
+            data={{
+              ...getControllerSearchProps('foreman_patch/invocations'),
+              autocomplete: {
+                id: 'invocations_search',
+                searchQuery,
+                url: '/foreman_patch/invocations/auto_complete_search',
+                useKeyShortcuts: true,
+              },
+              bookmarks: {},
+            }}
+          />
+        </Grid.Col>
+        <Grid.Col md={6}>
+          <ActionButtons buttons={actions} />
+        </Grid.Col>
+      </Grid.Row>
+      <br />
+      <Invocations
+        status={status}
+        items={items}
+        selectAll={selectAll}
+        areAllSelected={areAllSelected}
+        isSelected={isSelected}
+        onSelect={onSelect}
+      />
+      <Pagination
+        viewType="table"
+        itemCount={total}
+        pagination={pagination}
+        onChange={handlePagination}
+        dropdownButtonId="invocations-pagination-dropdown"
+        className="invocations-pagination"
+      />
+    </React.Fragment>
   );
 };
 

data/webpack/components/RoundProgress/AggregateStatus.js

@@ -19,7 +19,7 @@ const AggregateStatus = ({ progress }) => (
       <span className="card-pf-aggregate-status-notification">
         <span id="failed_count">
           <span className="pficon pficon-error-circle-o" />
-          {progress.failed}
+          {progress.error}
         </span>
       </span>
       <span className="card-pf-aggregate-status-notification">
@@ -31,7 +31,7 @@ const AggregateStatus = ({ progress }) => (
       <span className="card-pf-aggregate-status-notification">
         <span id="pending_count">
           <span className="pficon pficon-pending" />
-          {progress.pending}
+          {progress.pending + progress.planned}
         </span>
       </span>
       <span className="card-pf-aggregate-status-notification">
@@ -46,11 +46,12 @@ const AggregateStatus = ({ progress }) => (
 
 AggregateStatus.propTypes = {
   progress: PropTypes.shape({
+    planned: PropTypes.number,
+    pending: PropTypes.number,
+    running: PropTypes.number,
     success: PropTypes.number,
     warning: PropTypes.number,
-    failed: PropTypes.number,
-    running: PropTypes.number,
-    pending: PropTypes.number,
+    error: PropTypes.number,
     cancelled: PropTypes.number,
   }).isRequired,
 };

data/webpack/components/RoundProgress/RoundProgress.js

@@ -11,14 +11,14 @@ const RoundProgress = ({ progress }) => {
   const data = [
     [__('Success'), progress.success, '#5CB85C'],
     [__('Warning'), progress.warning, '#DB843D'],
-    [__('Failed'), progress.failed, '#D9534F'],
+    [__('Failed'), progress.error, '#D9534F'],
     [__('Running'), progress.running, '#3D96AE'],
-    [__('Pending'), progress.pending, '#DEDEDE'],
+    [__('Pending'), progress.pending + progress.planned, '#DEDEDE'],
     [__('Cancelled'), progress.cancelled, '#B7312D'],
   ];
 
   const iMax = data.reduce((im, e, i, arr) => 
-    (e[1] > arr[im][i] ? i : im), 0);
+    (e[1] > arr[im][1] ? i : im), 0);
 
   return (
     <div id="round_progress">
@@ -36,11 +36,12 @@ const RoundProgress = ({ progress }) => {
 
 RoundProgress.propTypes = {
   progress: PropTypes.shape({
+    pending: PropTypes.number,
+    planned: PropTypes.number,
+    running: PropTypes.number,
     success: PropTypes.number,
     warning: PropTypes.number,
-    failed: PropTypes.number,
-    running: PropTypes.number,
-    pending: PropTypes.number,
+    error: PropTypes.number,
     cancelled: PropTypes.number,
   }).isRequired,
 };

data/webpack/components/RoundProgress/RoundProgressSelectors.js

@@ -8,9 +8,10 @@ import { ROUND_PROGRESS } from './RoundProgressConstants';
 const defaultProgress = {
   success: 0,
   warning: 0,
-  failed: 0,
+  error: 0,
   running: 0,
   pending: 0,
+  planned: 0,
   cancelled: 0,
 };
 
@@ -18,7 +19,7 @@ export const selectProgress = state =>
   selectAPIResponse(state, ROUND_PROGRESS).progress || defaultProgress;
 
 export const selectAutoRefresh = state =>
-  !selectAPIResponse(state, ROUND_PROGRESS).complete;
+  selectAPIResponse(state, ROUND_PROGRESS).status != 'complete';
 
 export const selectStatus = state =>
   selectAPIStatus(state, ROUND_PROGRESS);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_patch
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors:
 - Jason Galens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-10 00:00:00.000000000 Z
+date: 2023-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
@@ -31,9 +31,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -41,9 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: foreman_remote_execution
   requirement: !ruby/object:Gem::Requirement
@@ -51,9 +45,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -61,23 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: rake-version
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -141,11 +115,8 @@ files:
 - app/lib/actions/foreman_patch/cycle/prepare_content.rb
 - app/lib/actions/foreman_patch/host/reschedule.rb
 - app/lib/actions/foreman_patch/invocation/action.rb
-- app/lib/actions/foreman_patch/invocation/ensure_services.rb
 - app/lib/actions/foreman_patch/invocation/patch.rb
 - app/lib/actions/foreman_patch/invocation/reschedule.rb
-- app/lib/actions/foreman_patch/invocation/restart.rb
-- app/lib/actions/foreman_patch/invocation/update_packages.rb
 - app/lib/actions/foreman_patch/invocation/wait_for_host.rb
 - app/lib/actions/foreman_patch/round/add_missing_hosts.rb
 - app/lib/actions/foreman_patch/round/create.rb
@@ -157,8 +128,6 @@ files:
 - app/lib/actions/foreman_patch/window/plan.rb
 - app/lib/actions/foreman_patch/window/publish.rb
 - app/lib/actions/foreman_patch/window/resolve_hosts.rb
-- app/lib/actions/helpers/failure_notification.rb
-- app/lib/actions/helpers/with_feature_action.rb
 - app/lib/actions/middleware/check_exit_status.rb
 - app/mailers/foreman_patch/cycle_mailer.rb
 - app/mailers/foreman_patch/group_mailer.rb
@@ -325,24 +294,6 @@ files:
 - public/assets/foreman_patch/foreman_patch.json
 - public/assets/foreman_patch/plan_edit_windows-e656ba411642a7f983b51958ab30ac49c056322d19295a603cff4d5e6c71c8ed.js
 - public/assets/foreman_patch/plan_edit_windows-e656ba411642a7f983b51958ab30ac49c056322d19295a603cff4d5e6c71c8ed.js.gz
-- public/webpack/foreman_patch/bundle-200e97f4e2ad9ed413ea.css
-- public/webpack/foreman_patch/bundle-200e97f4e2ad9ed413ea.css.gz
-- public/webpack/foreman_patch/bundle-200e97f4e2ad9ed413ea.js
-- public/webpack/foreman_patch/bundle-200e97f4e2ad9ed413ea.js.gz
-- public/webpack/foreman_patch/bundle-200e97f4e2ad9ed413ea.js.map
-- public/webpack/foreman_patch/bundle-200e97f4e2ad9ed413ea.js.map.gz
-- public/webpack/foreman_patch/foreman_patch-1e4f2d5e6f040a27aa7a.css
-- public/webpack/foreman_patch/foreman_patch-1e4f2d5e6f040a27aa7a.css.gz
-- public/webpack/foreman_patch/foreman_patch-1e4f2d5e6f040a27aa7a.js
-- public/webpack/foreman_patch/foreman_patch-1e4f2d5e6f040a27aa7a.js.gz
-- public/webpack/foreman_patch/foreman_patch-1e4f2d5e6f040a27aa7a.js.map
-- public/webpack/foreman_patch/foreman_patch-1e4f2d5e6f040a27aa7a.js.map.gz
-- public/webpack/foreman_patch/manifest.json
-- public/webpack/foreman_patch/manifest.json.gz
-- public/webpack/foreman_patch/vendor-4b77c91f1e9103179596.js
-- public/webpack/foreman_patch/vendor-4b77c91f1e9103179596.js.gz
-- public/webpack/foreman_patch/vendor-4b77c91f1e9103179596.js.map
-- public/webpack/foreman_patch/vendor-4b77c91f1e9103179596.js.map.gz
 - test/factories/foreman_patch_factories.rb
 - test/test_plugin_helper.rb
 - test/unit/foreman_patch_test.rb
@@ -363,12 +314,12 @@ files:
 - webpack/components/Invocation/InvocationSelectors.js
 - webpack/components/Invocation/index.js
 - webpack/components/Invocations/Invocations.js
+- webpack/components/Invocations/Invocations.scss
 - webpack/components/Invocations/InvocationsConstants.js
 - webpack/components/Invocations/InvocationsHelpers.js
 - webpack/components/Invocations/InvocationsPage.js
-- webpack/components/Invocations/InvocationsPage.scss
 - webpack/components/Invocations/InvocationsSelectors.js
-- webpack/components/Invocations/components/InvocationItem.js
+- webpack/components/Invocations/components/InvocationActions.js
 - webpack/components/Invocations/components/InvocationStatus.js
 - webpack/components/Invocations/index.js
 - webpack/components/Plan/Plan.js
@@ -428,7 +379,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.25
 signing_key: 
 specification_version: 4
 summary: Foreman Plugin for Managing Patching

data/app/lib/actions/foreman_patch/invocation/ensure_services.rb

@@ -1,47 +0,0 @@
-module Actions
-  module ForemanPatch
-    module Invocation
-      class EnsureServices < Actions::EntryAction
-        include Actions::Helpers::WithFeatureAction
-
-        def resource_locks
-          :link
-        end
-
-        def plan(host)
-          action_subject(host)
-
-          sequence do
-            plan_feature_action('ensure_services', host)
-            plan_self
-          end
-        end
-
-        def run
-          if exit_status != 0
-            users = ::User.select { |user| user.receives?(:patch_invocation_failure) }.compact
-
-            begin
-              MailNotification[:patch_invocation_failure].deliver(users: users, host: host, output: live_output) unless users.blank?
-            rescue => error
-              message = _('Unable to send patch invocation failure: %{error}') % {error: error}
-              Rails.logger.error(message)
-            end
-
-            fail _('Ensure services failed')
-          end
-        end
-
-        def rescue_strategy
-          ::Dynflow::Action::Rescue::Skip
-        end
-
-        def host
-          @host ||= ::Host.find(input[:host][:id])
-        end
-
-      end
-    end
-  end
-end
-

data/app/lib/actions/foreman_patch/invocation/restart.rb

@@ -1,101 +0,0 @@
-module Actions
-  module ForemanPatch
-    module Invocation
-      class Restart < Actions::EntryAction
-        include Actions::Helpers::WithFeatureAction
-        include Dynflow::Action::Polling
-
-        def plan(host)
-          action_subject(host)
-
-          sequence do
-            plan_feature_action('power_action', host, action: 'restart')
-            plan_self
-          end
-        end
-
-        def done?
-          external_task[:status] == :running
-        end
-
-        def invoke_external_task
-          if exit_status != 0
-            send_failure_notification
-            fail(_('Restart command failed to execute'))
-          end
-
-          schedule_timeout(Setting[:host_max_wait_for_up]) if Setting[:host_max_wait_for_up]
-          
-          { status: :stopping }
-        end
-
-        def poll_external_task
-          socket = TCPSocket.new(host.ip, Setting[:remote_execution_ssh_port])
-          socket.close
-
-          if external_task[:status] == :stopping
-            log_poll_result(_('Server status: stopping'))
-            { status: :stopping }
-          else
-            log_poll_result(_('Server status: running'))
-            { status: :running }
-          end
-        rescue
-          log_poll_result(_('Server status: starting'))
-
-          { status: :starting }
-        end
-
-        def poll_intervals
-          case external_task[:status]
-          when :stopping
-            [1]
-          when :starting
-            [10]
-          else
-            super
-          end
-        end
-
-        def process_timeout
-          continuous_output.add_output(_('Server did not respond within alloted time after restart.'))
-
-          send_failure_notification
-
-          fail("Timeout exceeded.")
-        end
-
-        def log_poll_result(status)
-          results = delegated_output.fetch('result', [])
-
-          results << {
-            'output_type' => 'debug',
-            'output' => status,
-            'timestamp' => Time.now.getlocal
-          }
-        end
-
-        def send_failure_notification
-          users = ::User.select { |user| user.receives?(:patch_invocation_failure) }.compact
-
-          begin
-            MailNotification[:patch_invocation_failure].deliver(user: users, host: host, output: live_output) unless users.blank?
-          rescue => error
-            message = _('Unable to send patch invocation failure: %{error}') % {error: error}
-            Rails.logger.error(message)
-          end
-        end
-
-        def rescue_strategy
-          ::Dynflow::Action::Rescue::Fail
-        end
-
-        def host
-          @host ||= ::Host.find(input[:host][:id])
-        end
-
-      end
-    end
-  end
-end
-

data/app/lib/actions/foreman_patch/invocation/update_packages.rb

@@ -1,52 +0,0 @@
-module Actions
-  module ForemanPatch
-    module Invocation
-      class UpdatePackages < Actions::EntryAction
-        include Actions::Helpers::WithFeatureAction
-
-        def resource_locks
-          :link
-        end
-
-        def plan(host)
-          action_subject(host)
-
-          sequence do
-            plan_feature_action('katello_package_update', host, 
-                                pre_script: 'yum clean all; subscription-manager refresh',
-                                package: Setting[:skip_broken_patches] ? '--skip-broken' : nil)
-            plan_self
-          end
-        end
-
-        def run
-          if exit_status != 0
-            users = ::User.select { |user| user.receives?(:patch_invocation_failure) }.compact
-
-            begin
-              MailNotification[:patch_invocation_failure].deliver(users: users, host: host, output: live_output) unless users.blank?
-            rescue => error
-              message = _('Unable to send patch invocation failure: %{error}') % {error: error}
-              Rails.logger.error(message)
-            end
-
-            fail _('Package update failed')
-          else
-            host.group_facet.last_patched_at = Time.current
-            host.group_facet.save!
-          end
-        end
-
-        def rescue_strategy
-          ::Dynflow::Action::Rescue::Fail
-        end
-
-        def host
-          @host ||= ::Host.find(input[:host][:id])
-        end
-
-      end
-    end
-  end
-end
-

data/app/lib/actions/helpers/failure_notification.rb

@@ -1,20 +0,0 @@
-module Actions
-  module Helpers
-    module FailureNotification
-
-      def send_failure_notification
-        users = ::User.select { |user| user.receives?(:patch_invocation_failure) }.compact
-
-        MailNotification[:patch_invocation_failure].deliver(
-          users: users,
-          host: host,
-          output: live_output
-        ) unless users.blank?
-      rescue => error
-        message = _('Unable to send patch invocation failure: %{error}') % {error: error}
-        Rails.logger.error(message)
-      end
-
-    end
-  end
-end