foreman_remote_execution 6.2.0 → 7.1.1

data/webpack/react_app/components/TargetingHosts/TargetingHostsPage.js

@@ -7,6 +7,7 @@ import Pagination from 'foremanReact/components/Pagination';
 import { getControllerSearchProps } from 'foremanReact/constants';
 
 import TargetingHosts from './TargetingHosts';
+import { TARGETING_HOSTS_AUTOCOMPLETE } from './TargetingHostsConsts';
 import './TargetingHostsPage.scss';
 
 const TargetingHostsPage = ({
@@ -16,6 +17,7 @@ const TargetingHostsPage = ({
   items,
   totalHosts,
   handlePagination,
+  page,
 }) => (
   <div id="targeting_hosts">
     <Grid.Row>
@@ -23,24 +25,26 @@ const TargetingHostsPage = ({
         <SearchBar
           onSearch={query => handleSearch(query)}
           data={{
-            ...getControllerSearchProps('hosts'),
+            ...getControllerSearchProps('hosts', TARGETING_HOSTS_AUTOCOMPLETE),
             autocomplete: {
-              id: 'targeting_hosts_search',
+              id: TARGETING_HOSTS_AUTOCOMPLETE,
               searchQuery,
               url: '/hosts/auto_complete_search',
               useKeyShortcuts: true,
             },
-            bookmarks: {},
           }}
+          onBookmarkClick={handleSearch}
         />
       </Grid.Col>
     </Grid.Row>
     <br />
     <TargetingHosts apiStatus={apiStatus} items={items} />
     <Pagination
+      page={page}
       itemCount={totalHosts}
       onChange={args => handlePagination(args)}
       className="targeting-hosts-pagination"
+      updateParamsByUrl={false}
     />
   </div>
 );
@@ -52,6 +56,7 @@ TargetingHostsPage.propTypes = {
   items: PropTypes.array.isRequired,
   totalHosts: PropTypes.number.isRequired,
   handlePagination: PropTypes.func.isRequired,
+  page: PropTypes.number.isRequired,
 };
 
 TargetingHostsPage.defaultProps = {

data/webpack/react_app/components/TargetingHosts/__tests__/__snapshots__/TargetingHostsPage.test.js.snap

@@ -23,10 +23,16 @@ exports[`TargetingHostsPage renders 1`] = `
               "url": "/hosts/auto_complete_search",
               "useKeyShortcuts": true,
             },
-            "bookmarks": Object {},
+            "bookmarks": Object {
+              "canCreate": true,
+              "documentationUrl": "4.1.5Searching",
+              "id": "targeting_hosts_search",
+              "url": "/api/bookmarks",
+            },
             "controller": "hosts",
           }
         }
+        onBookmarkClick={[Function]}
         onChange={[Function]}
         onSearch={[Function]}
       />
@@ -56,6 +62,8 @@ exports[`TargetingHostsPage renders 1`] = `
     className="targeting-hosts-pagination"
     itemCount={1}
     onChange={[Function]}
+    page={1}
+    updateParamsByUrl={false}
   />
 </div>
 `;

data/webpack/react_app/components/TargetingHosts/__tests__/fixtures.js

@@ -50,10 +50,7 @@ export const TargetingHostsPageFixtures = {
     apiStatus: 'RESOLVED',
     items,
     totalHosts: 1,
-    pagination: {
-      page: 1,
-      perPage: 20,
-    },
+    page: 1,
     handlePagination: () => {},
   },
 };

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

@@ -89,6 +89,7 @@ const WrappedTargetingHosts = () => {
       items={items}
       totalHosts={totalHosts}
       handlePagination={handlePagination}
+      page={pagination.page}
     />
   );
 };

data/webpack/react_app/extend/Fills.js

@@ -0,0 +1,48 @@
+import React from 'react';
+import { addGlobalFill } from 'foremanReact/components/common/Fill/GlobalFill';
+
+import FeaturesDropdown from '../components/FeaturesDropdown';
+import RexInterface from '../components/RegistrationExtension/RexInterface';
+import RecentJobsCard from '../components/RecentJobsCard';
+import KebabItems from '../components/HostKebab/KebabItems';
+
+const fills = [
+  {
+    slot: 'host-details-kebab',
+    name: 'kebab-items',
+    component: props => <KebabItems {...props} />,
+    weight: 500,
+  },
+  {
+    slot: 'host-overview-cards',
+    name: 'latest-jobs',
+    component: props => <RecentJobsCard {...props} />,
+    weight: 500,
+  },
+  {
+    slot: 'registrationAdvanced',
+    name: 'interface',
+    component: props => <RexInterface {...props} />,
+    weight: 500,
+  },
+  {
+    slot: '_rex-host-features',
+    name: '_rex-host-features',
+    component: props => <FeaturesDropdown {...props} />,
+    weight: 1000,
+  },
+];
+
+const registerFills = () => {
+  fills.forEach(({ slot, id, component: Component, weight, metadata }) =>
+    addGlobalFill(
+      slot,
+      id,
+      <Component key={`rex-fill-${id}`} />,
+      weight,
+      metadata
+    )
+  );
+};
+
+export default registerFills;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 7.1.1
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-19 00:00:00.000000000 Z
+date: 2022-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -142,8 +142,8 @@ files:
 - app/graphql/types/recurrence_input.rb
 - app/graphql/types/scheduling_input.rb
 - app/graphql/types/targeting_enum.rb
-- app/helpers/concerns/foreman_remote_execution/hosts_helper_extensions.rb
 - app/helpers/concerns/foreman_remote_execution/job_templates_extensions.rb
+- app/helpers/hosts_extensions_helper.rb
 - app/helpers/job_invocation_output_helper.rb
 - app/helpers/job_invocations_chart_helper.rb
 - app/helpers/job_invocations_helper.rb
@@ -323,6 +323,7 @@ files:
 - 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/migrate/20220331112719_add_ssh_user_to_job_invocation.rb
 - db/seeds.d/100-assign_features_with_templates.rb
 - db/seeds.d/20-permissions.rb
 - db/seeds.d/50-notification_blueprints.rb
@@ -388,6 +389,7 @@ files:
 - test/test_plugin_helper.rb
 - test/unit/actions/run_host_job_test.rb
 - test/unit/actions/run_hosts_job_test.rb
+- test/unit/api_params_test.rb
 - test/unit/concerns/foreman_tasks_cleaner_extensions_test.rb
 - test/unit/concerns/host_extensions_test.rb
 - test/unit/concerns/nic_extensions_test.rb
@@ -462,6 +464,7 @@ files:
 - webpack/Routes/routes.js
 - webpack/__mocks__/foremanReact/Root/Context/ForemanContext/index.js
 - webpack/__mocks__/foremanReact/common/I18n.js
+- webpack/__mocks__/foremanReact/common/globalIdHelpers.js
 - webpack/__mocks__/foremanReact/common/helpers.js
 - webpack/__mocks__/foremanReact/components/AutoComplete/AutoCompleteActions.js
 - webpack/__mocks__/foremanReact/components/AutoComplete/AutoCompleteConstants.js
@@ -514,10 +517,7 @@ 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/Fills.js
 - webpack/react_app/extend/reducers.js
 - webpack/react_app/redux/actions/jobInvocations/index.js
 - webpack/react_app/redux/consts.js
@@ -545,7 +545,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.26
 signing_key:
 specification_version: 4
 summary: A plugin bringing remote execution to the Foreman, completing the config
@@ -572,6 +572,7 @@ test_files:
 - test/test_plugin_helper.rb
 - test/unit/actions/run_host_job_test.rb
 - test/unit/actions/run_hosts_job_test.rb
+- test/unit/api_params_test.rb
 - test/unit/concerns/foreman_tasks_cleaner_extensions_test.rb
 - test/unit/concerns/host_extensions_test.rb
 - test/unit/concerns/nic_extensions_test.rb

data/app/helpers/concerns/foreman_remote_execution/hosts_helper_extensions.rb

@@ -1,62 +0,0 @@
-module ForemanRemoteExecution
-  module HostsHelperExtensions
-    def host_overview_buttons(host)
-      [
-        { :button => link_to_if_authorized(_("Jobs"), hash_for_job_invocations_path(search: "host=#{host.name}"), :title => _("Job invocations"), :class => 'btn btn-default'), :priority => 200 },
-      ]
-    end
-
-    def multiple_actions
-      res = super
-      res += [ [_('Schedule Remote Job'), new_job_invocation_path, false] ] if can_schedule_jobs?
-      res
-    end
-
-    def schedule_job_multi_button(*args)
-      host_features = rex_host_features(*args)
-
-      if host_features.present?
-        action_buttons(schedule_job_button(*args), *host_features)
-      else
-        schedule_job_button(*args)
-      end
-    end
-
-    def rex_host_features(host, *_rest)
-      return [] unless can_execute_on_host?(host)
-      RemoteExecutionFeature.with_host_action_button.order(:label).map do |feature|
-        link_to(_('%s') % feature.name, job_invocations_path(:host_ids => [host.id], :feature => feature.label), :method => :post)
-      end
-    end
-
-    def schedule_job_button(host, *_rest)
-      return unless can_execute_on_host?(host)
-      link_to(_('Schedule Remote Job'), new_job_invocation_path(:host_ids => [host.id]), :id => :run_button, :class => 'btn btn-default')
-    end
-
-    def web_console_button(host, *args)
-      return if !authorized_for(permission: 'cockpit_hosts', auth_object: host) || !can_execute_on_infrastructure_host?(host)
-
-      url = SSHExecutionProvider.cockpit_url_for_host(host.name)
-      url ? link_to(_('Web Console'), url, :class => 'btn btn-default', :id => :'web-console-button', :target => '_new') : nil
-    end
-
-    def host_title_actions(*args)
-      title_actions(button_group(schedule_job_multi_button(*args)),
-        button_group(web_console_button(*args)))
-      super(*args)
-    end
-
-    def can_schedule_jobs?
-      authorized_for(controller: :job_invocations, action: :create)
-    end
-
-    def can_execute_on_host?(host)
-      can_schedule_jobs? && can_execute_on_infrastructure_host?(host)
-    end
-
-    def can_execute_on_infrastructure_host?(host)
-      !host.infrastructure_host? || User.current.can?(:execute_jobs_on_infrastructure_hosts)
-    end
-  end
-end

data/webpack/react_app/extend/fillKebabItems.js

@@ -1,11 +0,0 @@
-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/fillRecentJobsCard.js

@@ -1,11 +0,0 @@
-import React from 'react';
-import { addGlobalFill } from 'foremanReact/components/common/Fill/GlobalFill';
-import RecentJobsCard from '../components/RecentJobsCard';
-
-export default () =>
-  addGlobalFill(
-    'details-cards',
-    'rex-host-details-latest-jobs',
-    <RecentJobsCard key="rex-host-details-latest-jobs" />,
-    1000
-  );

data/webpack/react_app/extend/fillRexFeaturesDropdown.js

@@ -1,11 +0,0 @@
-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
-  );

data/webpack/react_app/extend/fillregistrationAdvanced.js

@@ -1,11 +0,0 @@
-import React from 'react';
-import { addGlobalFill } from 'foremanReact/components/common/Fill/GlobalFill';
-import RexInterface from '../components/RegistrationExtension/RexInterface';
-
-export default () =>
-  addGlobalFill(
-    'registrationAdvanced',
-    'foreman-remote-exectuion-rex-interface',
-    <RexInterface key="registration-rex-interface" />,
-    100
-  );