foreman_remote_execution 6.0.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61d64bd14e3ce43367e26ad39ec10408baf8ec7920f45aa4ea1353340d3cf742
-  data.tar.gz: 0ab68114a29368fa4c2a269287b875368cdcc31db63dd481df223a1f91a36cef
+  metadata.gz: 910d4fd508188efbad4cfb121085171d077d65881e7ef8b5c9f1dea4092aa182
+  data.tar.gz: af7a5ca195d2b0d6ba269962bb3d726cd19dd6cc23358e6e6dc21cc77b36b3b2
 SHA512:
-  metadata.gz: 5d908f4f766c2b55bf6814035058b5faea29ba1ae3c61729275d2492e62b5f5aba2f60838d0b8383b9075f75daed15788d34ae1b2b9e091fea3ec26f812c670a
-  data.tar.gz: 05d63bba759d31d2b85030bc8cb4e39faeb9af50e784374e016edb4637d84906f6527b533efd5600da969a1b2315f34392f5f994d1ae17bbc840f5a2dfdf04a9
+  metadata.gz: 030ed44dd17a6da7b334f3c3621d34cec9d4afc6323f2cbacd1054716520dc4f955f5da4d0aa5bfb93b0f83699c6dd15a3d75a9ff770fa1b9c5d6df2afbba440
+  data.tar.gz: 80d41c53f5e1620919069e08a97b23d22d884406275ad426b49ee08c97dc92c958762fe79ff5bb703b63859f1551fb3cfad838f1b63e75cbc143983dc864e7fd

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/controllers/ui_job_wizard_controller.rb

@@ -40,7 +40,7 @@ class UiJobWizardController < ApplicationController
   end
 
   def with_katello
-    !!defined?(::Katello)
+    ::Foreman::Plugin.installed? 'katello'
   end
 
   def resource_class

data/app/helpers/remote_execution_helper.rb

@@ -1,6 +1,6 @@
 module RemoteExecutionHelper
   def providers_options
-    RemoteExecutionProvider.providers.map { |key, provider| [ key, _(provider.humanized_name) ] }
+    RemoteExecutionProvider.providers.reject { |key, _provider| key == 'SSH' }.map { |key, provider| [ key, _(provider.humanized_name) ] }
   end
 
   def job_hosts_authorizer
@@ -147,9 +147,10 @@ module RemoteExecutionHelper
     end
   end
 
-  def invocation_description(invocation)
+  def invocation_description(invocation, keep_tooltip: true)
     description = invocation.description.try(:capitalize) || invocation.job_category
-    trunc_with_tooltip(description, 80)
+    description = trunc_with_tooltip(description, 80) if keep_tooltip
+    description
   end
 
   def invocation_result(invocation, key)

data/app/lib/actions/remote_execution/run_host_job.rb

@@ -40,7 +40,7 @@ module Actions
         provider = template_invocation.template.provider
         proxy_selector = provider.required_proxy_selector_for(template_invocation.template) || proxy_selector
 
-        provider_type = template_invocation.template.provider_type.to_s
+        provider_type = provider.proxy_feature
         proxy = determine_proxy!(proxy_selector, provider_type, host)
         link!(proxy)
         input[:proxy_id] = proxy.id

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/remote_execution_provider.rb

@@ -4,7 +4,16 @@ class RemoteExecutionProvider
 
   class << self
     def provider_for(type)
-      providers[type.to_s] || providers[:SSH]
+      providers[type.to_s] || providers[:script]
+    end
+
+    def registered_name
+      klass = self
+      providers.key(klass)
+    end
+
+    def proxy_feature
+      registered_name
     end
 
     def providers

data/app/models/ssh_execution_provider.rb

@@ -1,4 +1,4 @@
-class SSHExecutionProvider < RemoteExecutionProvider
+class ScriptExecutionProvider < RemoteExecutionProvider
   class << self
     def proxy_command_options(template_invocation, host)
       super.merge(:ssh_user => ssh_user(host),
@@ -9,7 +9,7 @@ class SSHExecutionProvider < RemoteExecutionProvider
     end
 
     def humanized_name
-      _('SSH')
+      _('Script')
     end
 
     def supports_effective_user?
@@ -53,6 +53,10 @@ class SSHExecutionProvider < RemoteExecutionProvider
       Setting[:remote_execution_cockpit_url] % { :host => host } if Setting[:remote_execution_cockpit_url].present?
     end
 
+    def proxy_feature
+      'SSH'
+    end
+
     private
 
     def ssh_user(host)
@@ -64,3 +68,5 @@ class SSHExecutionProvider < RemoteExecutionProvider
     end
   end
 end
+
+SSHExecutionProvider = ScriptExecutionProvider

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

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

data/app/views/dashboard/_latest-jobs.html.erb

@@ -10,7 +10,7 @@
     </tr>
     <% JobInvocation.latest_jobs.each do |invocation| %>
       <tr>
-        <td class="ellipsis"><%= link_to_if_authorized invocation_description(invocation), hash_for_job_invocation_path(invocation).merge(:auth_object => invocation, :permission => :view_job_invocations, :authorizer => authorizer) %></td>
+        <td class="ellipsis"><%= link_to_if_authorized invocation_description(invocation, keep_tooltip: false), hash_for_job_invocation_path(invocation).merge(:auth_object => invocation, :permission => :view_job_invocations, :authorizer => authorizer) %></td>
         <td><%= link_to_invocation_task_if_authorized(invocation) %></td>
         <td><%= time_in_words_span(invocation.start_at) %></td>
       </tr>

data/app/views/templates/{ssh → script}/check_update.erb

@@ -1,10 +1,10 @@
 <%#
 kind: job_template
-name: Check Update - SSH Default
+name: Check Update - Script Default
 model: JobTemplate
 job_category: Packages
 description_format: "Check for package updates"
-provider_type: SSH
+provider_type: script
 %>
 
 <%

data/app/views/templates/{ssh → script}/module_action.erb

@@ -1,10 +1,10 @@
 <%#
 kind: job_template
-name: Module Action - SSH Default
+name: Module Action - Script Default
 model: JobTemplate
 job_category: Modules
 description_format: "Module %{action} %{module_spec}"
-provider_type: SSH
+provider_type: script
 template_inputs:
 - name: pre_script
   description: A script to run prior to the module action

data/app/views/templates/{ssh → script}/package_action.erb

@@ -1,10 +1,10 @@
 <%#
 kind: job_template
-name: Package Action - SSH Default
+name: Package Action - Script Default
 model: JobTemplate
 job_category: Packages
 description_format: "%{action} package(s) %{package}"
-provider_type: SSH
+provider_type: script
 template_inputs:
 - name: pre_script
   description: A script to run prior to the package action
@@ -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/app/views/templates/{ssh → script}/power_action.erb

@@ -1,10 +1,10 @@
 <%#
 kind: job_template
-name: Power Action - SSH Default
+name: Power Action - Script Default
 model: JobTemplate
 job_category: Power
 description_format: '%{action} host'
-provider_type: SSH
+provider_type: script
 template_inputs:
 - name: action
   description: Action to perform on the service

data/app/views/templates/{ssh → script}/puppet_agent_disable.erb

@@ -1,5 +1,5 @@
 <%#
-name: Puppet Agent Disable - SSH Default
+name: Puppet Agent Disable - Script Default
 model: JobTemplate
 job_category: Puppet
 description_format: Disable Puppet agent
@@ -10,7 +10,7 @@ template_inputs:
   input_type: user
   description: Reason for disabling the Puppet agent
   advanced: false
-provider_type: SSH
+provider_type: script
 kind: job_template
 -%>
 <% if @host.operatingsystem.family == 'Debian' -%>

data/app/views/templates/{ssh → script}/puppet_agent_enable.erb

@@ -1,10 +1,10 @@
 <%#
-name: Puppet Agent Enable - SSH Default
+name: Puppet Agent Enable - Script Default
 model: JobTemplate
 job_category: Puppet
 description_format: Enable Puppet agent
 snippet: false
-provider_type: SSH
+provider_type: script
 kind: job_template
 -%>
 <% if @host.operatingsystem.family == 'Debian' -%>

data/app/views/templates/{ssh → script}/puppet_install_modules_from_forge.erb

@@ -1,5 +1,5 @@
 <%#
-name: Puppet Module - Install from forge - SSH Default
+name: Puppet Module - Install from forge - Script Default
 model: JobTemplate
 job_category: Puppet
 description_format: Install Puppet Module "%{puppet_module}" from forge
@@ -30,7 +30,7 @@ template_inputs:
   input_type: user
   description: Do not attempt to install dependencies. Type "true" to ignore dependencies.
   advanced: true
-provider_type: SSH
+provider_type: script
 kind: job_template
 -%>
 <% if @host.operatingsystem.family == 'Debian' -%>

data/app/views/templates/{ssh → script}/puppet_install_modules_from_git.erb

@@ -1,5 +1,5 @@
 <%#
-name: Puppet Module - Install from git - SSH Default
+name: Puppet Module - Install from git - Script Default
 model: JobTemplate
 job_category: Puppet
 description_format: Install Puppet Module "%{puppet_module}" from git
@@ -15,7 +15,7 @@ template_inputs:
   input_type: user
   description: For example, '/etc/puppetlabs/code/environments/production/modules/puppet'.
   advanced: false
-provider_type: SSH
+provider_type: script
 kind: job_template
 -%>
 git clone <%= input('git_repository') %> <%= input('target_dir') %>

data/app/views/templates/{ssh → script}/puppet_run_once.erb

@@ -1,10 +1,10 @@
 <%#
 kind: job_template
-name: Puppet Run Once - SSH Default
+name: Puppet Run Once - Script Default
 model: JobTemplate
 job_category: Puppet
 description_format: 'Run Puppet once with "%{puppet_options}"'
-provider_type: SSH
+provider_type: script
 template_inputs:
 - name: puppet_options
   description: Additional options to pass to puppet

data/app/views/templates/{ssh → script}/run_command.erb

@@ -1,10 +1,10 @@
 <%#
 kind: job_template
-name: Run Command - SSH Default
+name: Run Command - Script Default
 model: JobTemplate
 job_category: Commands
 description_format: "Run %{command}"
-provider_type: SSH
+provider_type: script
 template_inputs:
 - name: command
   description: Command to run on the host

data/app/views/templates/{ssh → script}/service_action.erb

@@ -1,10 +1,10 @@
 <%#
 kind: job_template
-name: Service Action - SSH Default
+name: Service Action - Script Default
 model: JobTemplate
 job_category: Services
 description_format: '%{action} service %{service}'
-provider_type: SSH
+provider_type: script
 template_inputs:
 - name: action
   description: Action to perform on the service

data/db/migrate/20220321101835_rename_ssh_provider_to_script.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class RenameSshProviderToScript < ActiveRecord::Migration[6.0]
+
+  def do_change(from, to, from_re, new_label)
+    setting = Setting.find_by(:name => 'remote_execution_form_job_template')
+    default_template = nil
+
+    Template.where(:provider_type => from).each do |t|
+      default_template = t if t.name == setting&.value
+      t.provider_type = to
+      t.name = t.name.gsub(from_re, new_label)
+      t.save!
+    end
+
+    if default_template
+      setting.value = default_template.name
+      setting.save!
+    end
+  end
+
+  def up
+    do_change 'SSH', 'script', /SSH Default$/, 'Script Default'
+  end
+
+  def down
+    do_change 'script', 'SSH', /Script Default$/, 'SSH Default'
+  end
+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

@@ -146,7 +146,7 @@ module ForemanRemoteExecution
             setting 'remote_execution_form_job_template',
               type: :string,
               description: N_('Choose a job template that is pre-selected in job invocation form'),
-              default: 'Run Command - SSH Default',
+              default: 'Run Command - Script Default',
               full_name: N_('Form Job Template'),
               collection: proc { Hash[JobTemplate.unscoped.map { |template| [template.name, template.name] }] }
             setting 'remote_execution_job_invocation_report_template',
@@ -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 }
 
@@ -328,7 +329,8 @@ module ForemanRemoteExecution
       require_dependency 'foreman_tasks/task'
       ForemanTasks::Task.include ForemanRemoteExecution::ForemanTasksTaskExtensions
       ForemanTasks::Cleaner.include ForemanRemoteExecution::ForemanTasksCleanerExtensions
-      RemoteExecutionProvider.register(:SSH, SSHExecutionProvider)
+      RemoteExecutionProvider.register(:SSH, ::SSHExecutionProvider)
+      RemoteExecutionProvider.register(:script, ::ScriptExecutionProvider)
 
       ForemanRemoteExecution.register_rex_feature
 

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '6.0.0'.freeze
+  VERSION = '6.1.0'.freeze
 end

data/locale/action_names.rb

@@ -2,4 +2,4 @@
 _("Remote action:")
 _("»Import facts«")
 _("»Import Puppet classes«")
-_("»Action with sub plans«")
+_("»Action with sub plans«")

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/test/unit/remote_execution_provider_test.rb

@@ -6,9 +6,11 @@ class RemoteExecutionProviderTest < ActiveSupport::TestCase
     it { _(providers).must_be_kind_of HashWithIndifferentAccess }
     it 'makes providers accessible using symbol' do
       _(providers[:SSH]).must_equal SSHExecutionProvider
+      _(providers[:script]).must_equal ScriptExecutionProvider
     end
     it 'makes providers accessible using string' do
       _(providers['SSH']).must_equal SSHExecutionProvider
+      _(providers['script']).must_equal ScriptExecutionProvider
     end
   end
 

data/webpack/JobWizard/JobWizard.js

@@ -21,6 +21,7 @@ import {
   selectJobTemplate,
   selectIsSubmitting,
   selectRouterSearch,
+  selectIsLoading,
 } from './JobWizardSelectors';
 import Schedule from './steps/Schedule/';
 import HostsAndInputs from './steps/HostsAndInputs/';
@@ -130,9 +131,14 @@ export const JobWizard = () => {
   const templateError = !!useSelector(selectTemplateError);
   const templateResponse = useSelector(selectJobTemplate);
   const isSubmitting = useSelector(selectIsSubmitting);
+  const isTemplatesLoading = useSelector(state =>
+    selectIsLoading(state, JOB_TEMPLATE)
+  );
   const isTemplate =
-    !templateError && !!jobTemplateID && templateResponse.job_template;
-
+    !isTemplatesLoading &&
+    !templateError &&
+    !!jobTemplateID &&
+    templateResponse.job_template;
   const steps = [
     {
       name: WIZARD_TITLES.categoryAndTemplate,

data/webpack/JobWizard/steps/CategoryAndTemplate/CategoryAndTemplate.js

@@ -1,11 +1,13 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { useSelector } from 'react-redux';
 import { Text, TextVariants, Form, Alert } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { SelectField } from '../form/SelectField';
 import { GroupedSelectField } from '../form/GroupedSelectField';
 import { WizardTitle } from '../form/WizardTitle';
-import { WIZARD_TITLES } from '../../JobWizardConstants';
+import { WIZARD_TITLES, JOB_TEMPLATES } from '../../JobWizardConstants';
+import { selectIsLoading } from '../../JobWizardSelectors';
 
 export const CategoryAndTemplate = ({
   jobCategories,
@@ -17,18 +19,23 @@ export const CategoryAndTemplate = ({
   errors,
 }) => {
   const templatesGroups = {};
-  jobTemplates.forEach(template => {
-    if (templatesGroups[template.provider_type]?.options)
-      templatesGroups[template.provider_type].options.push({
-        label: template.name,
-        value: template.id,
-      });
-    else
-      templatesGroups[template.provider_type] = {
-        options: [{ label: template.name, value: template.id }],
-        groupLabel: template.provider_type,
-      };
-  });
+  const isTemplatesLoading = useSelector(state =>
+    selectIsLoading(state, JOB_TEMPLATES)
+  );
+  if (!isTemplatesLoading) {
+    jobTemplates.forEach(template => {
+      if (templatesGroups[template.provider_type]?.options)
+        templatesGroups[template.provider_type].options.push({
+          label: template.name,
+          value: template.id,
+        });
+      else
+        templatesGroups[template.provider_type] = {
+          options: [{ label: template.name, value: template.id }],
+          groupLabel: template.provider_type,
+        };
+    });
+  }
 
   const selectedTemplate = jobTemplates.find(
     template => template.id === selectedTemplateID
@@ -60,8 +67,10 @@ export const CategoryAndTemplate = ({
           fieldId="job_template"
           groups={Object.values(templatesGroups)}
           setSelected={setJobTemplate}
-          selected={selectedTemplate}
-          isDisabled={!!(categoryError || allTemplatesError)}
+          selected={isTemplatesLoading ? [] : selectedTemplate}
+          isDisabled={
+            !!(categoryError || allTemplatesError || isTemplatesLoading)
+          }
           placeholderText={allTemplatesError ? __('Error') : ''}
         />
         {isError && (

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}
@@ -81,7 +83,11 @@ GroupedSelectField.propTypes = {
   label: PropTypes.string.isRequired,
   fieldId: PropTypes.string.isRequired,
   groups: PropTypes.array,
-  selected: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  selected: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.number,
+    PropTypes.array,
+  ]),
   setSelected: PropTypes.func.isRequired,
 };
 

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: 6.0.0
+  version: 6.1.0
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-17 00:00:00.000000000 Z
+date: 2022-03-31 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
@@ -263,17 +264,17 @@ files:
 - app/views/template_invocations/_refresh.js.erb
 - app/views/template_invocations/show.html.erb
 - app/views/template_invocations/show.js.erb
-- app/views/templates/ssh/check_update.erb
-- app/views/templates/ssh/module_action.erb
-- app/views/templates/ssh/package_action.erb
-- app/views/templates/ssh/power_action.erb
-- app/views/templates/ssh/puppet_agent_disable.erb
-- app/views/templates/ssh/puppet_agent_enable.erb
-- app/views/templates/ssh/puppet_install_modules_from_forge.erb
-- app/views/templates/ssh/puppet_install_modules_from_git.erb
-- app/views/templates/ssh/puppet_run_once.erb
-- app/views/templates/ssh/run_command.erb
-- app/views/templates/ssh/service_action.erb
+- app/views/templates/script/check_update.erb
+- app/views/templates/script/module_action.erb
+- app/views/templates/script/package_action.erb
+- app/views/templates/script/power_action.erb
+- app/views/templates/script/puppet_agent_disable.erb
+- app/views/templates/script/puppet_agent_enable.erb
+- app/views/templates/script/puppet_install_modules_from_forge.erb
+- app/views/templates/script/puppet_install_modules_from_git.erb
+- app/views/templates/script/puppet_run_once.erb
+- app/views/templates/script/run_command.erb
+- app/views/templates/script/service_action.erb
 - config/routes.rb
 - db/migrate/20150612121541_add_job_template_to_template.rb
 - db/migrate/20150708133241_add_targeting.rb
@@ -321,6 +322,7 @@ files:
 - db/migrate/20210312074713_add_provider_inputs.rb
 - db/migrate/2021051713291621250977_add_host_proxy_invocations.rb
 - db/migrate/20210816100932_rex_setting_category_to_dsl.rb
+- db/migrate/20220321101835_rename_ssh_provider_to_script.rb
 - db/seeds.d/100-assign_features_with_templates.rb
 - db/seeds.d/20-permissions.rb
 - db/seeds.d/50-notification_blueprints.rb
@@ -333,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
@@ -475,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
@@ -507,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
@@ -536,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.2.26
 signing_key:
 specification_version: 4
 summary: A plugin bringing remote execution to the Foreman, completing the config