foreman_remote_execution 5.0.3 → 5.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6101dc3457c93144c655cae80d5d7be64f420cb878166e025a527940d287a41
-  data.tar.gz: 1840f3bf32f56c644de27c082a18c3241b145e4ac3d1696e672ffaa2cffd4099
+  metadata.gz: 0cf673db2c0b2db74e694d30821e53c7f49c54c9e055444d569d0fce165f4b73
+  data.tar.gz: f509f61d2bc18105f5c503372932f21b4c68449b2313e76e831aed128ce581ae
 SHA512:
-  metadata.gz: f8f65034a64aa88c9ca2565b8e6543735dd726974751c5adb0a848192fe1098aee310d31b81c6d64862c91120d21766a7b204fe3c6d8b629faa6fa3452e70f79
-  data.tar.gz: 5a440b76b2b4f7fd4f2dc5685e2e141fa9cf5811c271d1b067ab5b1d343826e97f6ce177f327cba9e2a4e76b53b7b1b50d1b2fa87873e782998d8aed0234a7e1
+  metadata.gz: 1fcb7c8c0f50e1cf5f82103555fc8ca87260b5a0da6fe92b6cc610d157776fa99349c38c9629cc283f7969191734d8dd46c0255a7bb9f847739a2bf941a4c2e0
+  data.tar.gz: 8a2af329625cf05dd0509837390a35cf2dc2b8ffabbdfb7d7d3588db4cf7cc01009d75687d0890a0472763c90c2b24316b2f1d362083e8668abe839acf01cd4f

data/app/controllers/foreman_remote_execution/concerns/api/v2/registration_controller_extensions.rb

@@ -13,6 +13,7 @@ module ForemanRemoteExecution
 
       def host_setup_extension
         remote_execution_interface
+        reset_host_known_keys! unless @host.new_record?
         super
       end
 
@@ -21,6 +22,10 @@ module ForemanRemoteExecution
 
         @host.set_execution_interface(params['remote_execution_interface'])
       end
+
+      def reset_host_known_keys!
+        @host.host_proxy_invocations.destroy_all
+      end
     end
   end
 end

data/app/models/concerns/foreman_remote_execution/host_extensions.rb

@@ -46,6 +46,10 @@ module ForemanRemoteExecution
       end
     end
 
+    def cockpit_url
+      SSHExecutionProvider.cockpit_url_for_host(self.name)
+    end
+
     def execution_status(options = {})
       @execution_status ||= get_status(HostStatus::ExecutionStatus).to_status(options)
     end

data/app/models/concerns/foreman_remote_execution/nic_extensions.rb

@@ -3,16 +3,18 @@ module ForemanRemoteExecution
     extend ActiveSupport::Concern
 
     included do
-      before_validation :set_execution_flag
       validate :exclusive_execution_interface
+      before_validation :move_execution_flag
     end
 
     private
 
-    def set_execution_flag
-      return unless primary? && host.present?
+    def move_execution_flag
+      return unless host && self.execution?
 
-      self.execution = true if host.interfaces.detect(&:execution).nil?
+      host.interfaces
+          .select { |i| i.execution? && i != self }
+          .each { |i| i.execution = false }
     end
 
     def exclusive_execution_interface

data/app/models/job_invocation_composer.rb

@@ -217,7 +217,7 @@ class JobInvocationComposer
     def format_datetime(datetime)
       return datetime if datetime.blank?
 
-      Time.parse(datetime).utc.strftime('%Y-%m-%d %H:%M')
+      Time.parse(datetime).in_time_zone.strftime('%Y-%m-%d %H:%M')
     end
   end
 

data/app/views/api/v2/host/main.rabl

@@ -0,0 +1 @@
+attributes :cockpit_url

data/app/views/templates/ssh/package_action.erb

@@ -69,8 +69,11 @@ handle_zypp_res_codes () {
 
   if [ "${ZYPP_RES_CODES[$RETVAL]}" != "" ]; then
     echo ${ZYPP_RES_CODES[$RETVAL]}
+  fi
+  if [[ $RETVAL -ge 100 && $RETVAL -le 103 ]]; then
     RETVAL=0
   fi
+
   return $RETVAL
 }
 <% end -%>

data/jsconfig.json

@@ -0,0 +1,8 @@
+{
+  "compilerOptions": {
+    "target": "es6",
+    "paths": {
+      "foremanReact/*": ["../foreman/webpack/assets/javascripts/react_app/*"]
+    }
+  }
+}

data/lib/foreman_remote_execution/engine.rb

@@ -265,6 +265,7 @@ module ForemanRemoteExecution
         extend_rabl_template 'api/v2/smart_proxies/main', 'api/v2/smart_proxies/pubkey'
         extend_rabl_template 'api/v2/interfaces/main', 'api/v2/interfaces/execution_flag'
         extend_rabl_template 'api/v2/subnets/show', 'api/v2/subnets/remote_execution_proxies'
+        extend_rabl_template 'api/v2/hosts/main', 'api/v2/host/main'
         parameter_filter ::Subnet, :remote_execution_proxy_ids
         describe_host { overview_buttons_provider :host_overview_buttons }
 

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '5.0.3'.freeze
+  VERSION = '5.0.6'.freeze
 end

data/package.json

@@ -21,20 +21,19 @@
   },
   "devDependencies": {
     "@babel/core": "^7.7.0",
-    "@theforeman/builder": "^8.16.0",
-    "@theforeman/eslint-plugin-foreman": "^8.16.0",
-    "@theforeman/stories": "^8.16.0",
-    "@theforeman/test": "^8.16.0",
-    "@theforeman/vendor-dev": "^8.16.0",
+    "@theforeman/builder": "^10.1.0",
+    "@theforeman/eslint-plugin-foreman": "^10.1.0",
+    "@theforeman/stories": "^10.1.0",
+    "@theforeman/test": "^10.1.0",
+    "@theforeman/vendor-dev": "^10.1.0",
     "babel-eslint": "^10.0.0",
     "eslint": "^6.8.0",
     "prettier": "^1.19.1",
-    "@patternfly/react-catalog-view-extension": "^4.8.126",
     "redux-mock-store": "^1.2.2",
     "graphql-tag": "^2.11.0",
     "graphql": "^15.5.0"
   },
   "peerDependencies": {
-    "@theforeman/vendor": "^8.16.0"
+    "@theforeman/vendor": "^10.1.0"
   }
 }

data/test/unit/concerns/host_extensions_test.rb

@@ -67,7 +67,8 @@ class ForemanRemoteExecutionHostExtensionsTest < ActiveSupport::TestCase
     it 'should only have one execution interface' do
       host.interfaces << FactoryBot.build(:nic_managed)
       host.interfaces.each { |interface| interface.execution = true }
-      _(host).wont_be :valid?
+      _(host).must_be :valid?
+      _(host.interfaces.count(&:execution?)).must_equal 1
     end
 
     it 'returns the execution interface' do

data/webpack/JobWizard/steps/form/GroupedSelectField.js

@@ -69,6 +69,8 @@ export const GroupedSelectField = ({
         className="without_select2"
         onClear={onClear}
         menuAppendTo={() => document.body}
+        aria-labelledby={fieldId}
+        toggleAriaLabel={`${label} toggle`}
         {...props}
       >
         {options}

data/webpack/global_index.js

@@ -2,9 +2,13 @@ import { registerRoutes } from 'foremanReact/routes/RoutingService';
 import routes from './Routes/routes';
 import fillregistrationAdvanced from './react_app/extend/fillregistrationAdvanced';
 import fillRecentJobsCard from './react_app/extend/fillRecentJobsCard';
+import fillFeaturesDropdown from './react_app/extend/fillRexFeaturesDropdown';
+import fillKebabItems from './react_app/extend/fillKebabItems';
 import registerReducers from './react_app/extend/reducers';
 
 registerReducers();
 registerRoutes('foreman_remote_execution', routes);
+fillFeaturesDropdown();
 fillRecentJobsCard();
 fillregistrationAdvanced();
+fillKebabItems();

data/webpack/react_app/components/FeaturesDropdown/actions.js

@@ -0,0 +1,13 @@
+import { foremanUrl } from 'foremanReact/common/helpers';
+import { sprintf, translate as __ } from 'foremanReact/common/I18n';
+import { post } from 'foremanReact/redux/API';
+
+export const runFeature = (hostId, feature, label) => dispatch => {
+  const url = foremanUrl(
+    `/job_invocations?feature=${feature}&host_ids%5B%5D=${hostId}`
+  );
+
+  const successToast = () => sprintf(__('%s job has been invoked'), label);
+  const errorToast = ({ message }) => message;
+  dispatch(post({ key: feature.toUpperCase(), url, successToast, errorToast }));
+};

data/webpack/react_app/components/FeaturesDropdown/constant.js

@@ -0,0 +1,2 @@
+export const REX_FEATURES_API = '/api/remote_execution_features';
+export const NEW_JOB_PAGE = '/job_invocations/new?host_ids%5B%5D';

data/webpack/react_app/components/FeaturesDropdown/index.js

@@ -0,0 +1,74 @@
+import PropTypes from 'prop-types';
+import React, { useState } from 'react';
+import { useDispatch } from 'react-redux';
+import {
+  DropdownItem,
+  Dropdown,
+  DropdownToggle,
+  DropdownToggleAction,
+} from '@patternfly/react-core';
+import { push } from 'connected-react-router';
+
+import { useAPI } from 'foremanReact/common/hooks/API/APIHooks';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { foremanUrl } from 'foremanReact/common/helpers';
+import { STATUS } from 'foremanReact/constants';
+
+import { REX_FEATURES_API, NEW_JOB_PAGE } from './constant';
+import { runFeature } from './actions';
+
+const FeaturesDropdown = ({ hostId }) => {
+  const [isOpen, setIsOpen] = useState(false);
+  const {
+    response: { results: features },
+    status,
+  } = useAPI('get', foremanUrl(REX_FEATURES_API));
+
+  const dispatch = useDispatch();
+  const dropdownItems = features
+    ?.filter(feature => feature.host_action_button)
+    ?.map(({ name, label, id, description }) => (
+      <DropdownItem
+        onClick={() => dispatch(runFeature(hostId, label, name))}
+        key={id}
+        description={description}
+      >
+        {name}
+      </DropdownItem>
+    ));
+  const scheduleJob = [
+    <DropdownToggleAction
+      onClick={() => dispatch(push(`${NEW_JOB_PAGE}=${hostId}`))}
+      key="schedule-job-action"
+    >
+      {__('Schedule a job')}
+    </DropdownToggleAction>,
+  ];
+
+  return (
+    <Dropdown
+      alignments={{ default: 'right' }}
+      onSelect={() => setIsOpen(false)}
+      toggle={
+        <DropdownToggle
+          splitButtonItems={scheduleJob}
+          toggleVariant="primary"
+          onToggle={() => setIsOpen(prev => !prev)}
+          isDisabled={status === STATUS.PENDING}
+          splitButtonVariant="action"
+        />
+      }
+      isOpen={isOpen}
+      dropdownItems={dropdownItems}
+    />
+  );
+};
+
+FeaturesDropdown.propTypes = {
+  hostId: PropTypes.number,
+};
+FeaturesDropdown.defaultProps = {
+  hostId: undefined,
+};
+
+export default FeaturesDropdown;

data/webpack/react_app/components/HostKebab/KebabItems.js

@@ -0,0 +1,22 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
+import { DropdownItem } from '@patternfly/react-core';
+import { CodeIcon } from '@patternfly/react-icons';
+import { selectAPIResponse } from 'foremanReact/redux/API/APISelectors';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { HOST_DETAILS_KEY } from 'foremanReact/components/HostDetails/consts';
+
+const HostKebabItems = () => {
+  const { cockpit_url: consoleUrl } = useSelector(state =>
+    selectAPIResponse(state, HOST_DETAILS_KEY)
+  );
+
+  if (!consoleUrl) return null;
+  return (
+    <DropdownItem icon={<CodeIcon />} href={consoleUrl}>
+      {__('Web Console')}
+    </DropdownItem>
+  );
+};
+
+export default HostKebabItems;

data/webpack/react_app/components/RecentJobsCard/RecentJobsCard.js

@@ -52,7 +52,12 @@ const RecentJobsCard = ({ hostDetails: { name, id } }) => {
         </DropdownItem>,
       ]}
     >
-      <Tabs mountOnEnter activeKey={activeTab} onSelect={handleTabClick}>
+      <Tabs
+        mountOnEnter
+        unmountOnExit
+        activeKey={activeTab}
+        onSelect={handleTabClick}
+      >
         <Tab
           eventKey={FINISHED_TAB}
           title={<TabTitleText>{__('Finished')}</TabTitleText>}

data/webpack/react_app/components/RecentJobsCard/RecentJobsTable.js

@@ -19,7 +19,7 @@ import { translate as __ } from 'foremanReact/common/I18n';
 import { foremanUrl } from 'foremanReact/common/helpers';
 
 import JobStatusIcon from './JobStatusIcon';
-import { JOB_API_URL, JOBS_IN_CARD } from './constants';
+import { JOB_API_URL, JOBS_IN_CARD, RECENT_JOBS_KEY } from './constants';
 
 const RecentJobsTable = ({ status, hostId }) => {
   const jobsUrl =
@@ -30,7 +30,7 @@ const RecentJobsTable = ({ status, hostId }) => {
   const {
     response: { results: jobs },
     status: responseStatus,
-  } = useAPI('get', jobsUrl);
+  } = useAPI('get', jobsUrl, RECENT_JOBS_KEY);
 
   return (
     <DataList aria-label="recent-jobs-table" isCompact>

data/webpack/react_app/components/RecentJobsCard/constants.js

@@ -10,3 +10,4 @@ export const JOB_BASE_URL = '/job_invocations?search=host+%3D+';
 export const JOB_API_URL =
   '/api/job_invocations?order=start_at+DESC&search=targeted_host_id%3D';
 export const JOBS_IN_CARD = 3;
+export const RECENT_JOBS_KEY = { key: 'RECENT_JOBS_KEY' };

data/webpack/react_app/extend/fillKebabItems.js

@@ -0,0 +1,11 @@
+import React from 'react';
+import { addGlobalFill } from 'foremanReact/components/common/Fill/GlobalFill';
+import KebabItems from '../components/HostKebab/KebabItems';
+
+export default () =>
+  addGlobalFill(
+    'host-details-kebab',
+    'rex-host-details-kebab-job',
+    <KebabItems key="rex-host-details-kebab-job" />,
+    100
+  );

data/webpack/react_app/extend/fillRexFeaturesDropdown.js

@@ -0,0 +1,11 @@
+import React from 'react';
+import { addGlobalFill } from 'foremanReact/components/common/Fill/GlobalFill';
+import FeaturesDropdown from '../components/FeaturesDropdown';
+
+export default () =>
+  addGlobalFill(
+    '_rex-host-features',
+    '_rex-host-features',
+    <FeaturesDropdown key="_rex-host-features" />,
+    1000
+  );

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 5.0.6
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-22 00:00:00.000000000 Z
+date: 2022-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -201,6 +201,7 @@ files:
 - app/views/api/v2/foreign_input_sets/index.json.rabl
 - app/views/api/v2/foreign_input_sets/main.json.rabl
 - app/views/api/v2/foreign_input_sets/show.json.rabl
+- app/views/api/v2/host/main.rabl
 - app/views/api/v2/interfaces/execution_flag.json.rabl
 - app/views/api/v2/job_invocations/base.json.rabl
 - app/views/api/v2/job_invocations/create.json.rabl
@@ -334,6 +335,7 @@ files:
 - extra/cockpit/foreman-cockpit.service
 - extra/cockpit/settings.yml.example
 - foreman_remote_execution.gemspec
+- jsconfig.json
 - lib/foreman_remote_execution.rb
 - lib/foreman_remote_execution/engine.rb
 - lib/foreman_remote_execution/version.rb
@@ -476,6 +478,10 @@ files:
 - webpack/global_index.js
 - webpack/helpers.js
 - webpack/index.js
+- webpack/react_app/components/FeaturesDropdown/actions.js
+- webpack/react_app/components/FeaturesDropdown/constant.js
+- webpack/react_app/components/FeaturesDropdown/index.js
+- webpack/react_app/components/HostKebab/KebabItems.js
 - webpack/react_app/components/RecentJobsCard/JobStatusIcon.js
 - webpack/react_app/components/RecentJobsCard/RecentJobsCard.js
 - webpack/react_app/components/RecentJobsCard/RecentJobsTable.js
@@ -508,7 +514,9 @@ files:
 - webpack/react_app/components/jobInvocations/AggregateStatus/index.js
 - webpack/react_app/components/jobInvocations/AggregateStatus/index.test.js
 - webpack/react_app/components/jobInvocations/index.js
+- webpack/react_app/extend/fillKebabItems.js
 - webpack/react_app/extend/fillRecentJobsCard.js
+- webpack/react_app/extend/fillRexFeaturesDropdown.js
 - webpack/react_app/extend/fillregistrationAdvanced.js
 - webpack/react_app/extend/reducers.js
 - webpack/react_app/redux/actions/jobInvocations/index.js
@@ -537,7 +545,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: A plugin bringing remote execution to the Foreman, completing the config