foreman_remote_execution 5.0.4 → 6.1.0

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/components/TargetingHosts/TargetingHostsHelpers.js

@@ -4,7 +4,7 @@ export const getApiUrl = (searchQuery, pagination) => {
   const baseUrl = getURI()
     .search('')
     .addQuery('page', pagination.page)
-    .addQuery('per_page', pagination.perPage);
+    .addQuery('per_page', pagination.per_page);
 
   return searchQuery ? baseUrl.addQuery('search', searchQuery) : baseUrl;
 };

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

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { Grid } from 'patternfly-react';
 
 import SearchBar from 'foremanReact/components/SearchBar';
-import Pagination from 'foremanReact/components/Pagination/PaginationWrapper';
+import Pagination from 'foremanReact/components/Pagination';
 import { getControllerSearchProps } from 'foremanReact/constants';
 
 import TargetingHosts from './TargetingHosts';
@@ -15,7 +15,6 @@ const TargetingHostsPage = ({
   apiStatus,
   items,
   totalHosts,
-  pagination,
   handlePagination,
 }) => (
   <div id="targeting_hosts">
@@ -39,11 +38,8 @@ const TargetingHostsPage = ({
     <br />
     <TargetingHosts apiStatus={apiStatus} items={items} />
     <Pagination
-      viewType="table"
       itemCount={totalHosts}
-      pagination={pagination}
       onChange={args => handlePagination(args)}
-      dropdownButtonId="targeting-hosts-pagination-dropdown"
       className="targeting-hosts-pagination"
     />
   </div>
@@ -55,7 +51,6 @@ TargetingHostsPage.propTypes = {
   apiStatus: PropTypes.string,
   items: PropTypes.array.isRequired,
   totalHosts: PropTypes.number.isRequired,
-  pagination: PropTypes.object.isRequired,
   handlePagination: PropTypes.func.isRequired,
 };
 

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

@@ -52,18 +52,10 @@ exports[`TargetingHostsPage renders 1`] = `
       ]
     }
   />
-  <PaginationWrapper
+  <Pagination
     className="targeting-hosts-pagination"
-    dropdownButtonId="targeting-hosts-pagination-dropdown"
     itemCount={1}
     onChange={[Function]}
-    pagination={
-      Object {
-        "page": 1,
-        "perPage": 20,
-      }
-    }
-    viewType="table"
   />
 </div>
 `;

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

@@ -30,14 +30,14 @@ const WrappedTargetingHosts = () => {
   const [searchQuery, setSearchQuery] = useState('');
   const [pagination, setPagination] = useState({
     page: 1,
-    perPage,
+    per_page: perPage,
     perPageOptions,
   });
   const [apiUrl, setApiUrl] = useState(getApiUrl(searchQuery, pagination));
   const intervalExists = useSelector(selectIntervalExists);
 
   const handleSearch = query => {
-    const defaultPagination = { page: 1, perPage: pagination.perPage };
+    const defaultPagination = { page: 1, per_page: pagination.per_page };
     stopApiInterval();
 
     setApiUrl(getApiUrl(query, defaultPagination));
@@ -88,7 +88,6 @@ const WrappedTargetingHosts = () => {
       apiStatus={apiStatus}
       items={items}
       totalHosts={totalHosts}
-      pagination={pagination}
       handlePagination={handlePagination}
     />
   );

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.4
+  version: 6.1.0
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-01 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,18 +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/README.md
-- 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
@@ -322,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
@@ -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
@@ -463,7 +465,7 @@ files:
 - webpack/__mocks__/foremanReact/common/helpers.js
 - webpack/__mocks__/foremanReact/components/AutoComplete/AutoCompleteActions.js
 - webpack/__mocks__/foremanReact/components/AutoComplete/AutoCompleteConstants.js
-- webpack/__mocks__/foremanReact/components/Pagination/PaginationWrapper.js
+- webpack/__mocks__/foremanReact/components/Pagination.js
 - webpack/__mocks__/foremanReact/components/SearchBar.js
 - webpack/__mocks__/foremanReact/components/common/ActionButtons/ActionButtons.js
 - webpack/__mocks__/foremanReact/constants.js
@@ -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.2.26
 signing_key:
 specification_version: 4
 summary: A plugin bringing remote execution to the Foreman, completing the config

data/app/views/templates/README.md

@@ -1,6 +0,0 @@
-# Job Templates
-
-**IMPORTANT** Do not submit pull requests here, these templates are only
-updated during the release process.  The
-[community-templates](https://github.com/theforeman/community-templates) repos
-is the canonical source for job templates.

data/webpack/__mocks__/foremanReact/components/Pagination/PaginationWrapper.js

@@ -1,2 +0,0 @@
-const PaginationWrapper = () => jest.fn();
-export default PaginationWrapper;