foreman_ansible 7.1.3 → 7.1.4

data/webpack/components/AnsibleHostDetail/components/JobsTab/PreviousJobsTable.js.orig

@@ -0,0 +1,151 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { usePaginationOptions } from 'foremanReact/components/Pagination/PaginationHooks';
+
+import RelativeDateTime from 'foremanReact/components/common/dates/RelativeDateTime';
+
+import {
+  TableComposable,
+  Thead,
+  Tbody,
+  Tr,
+  Th,
+  Td,
+} from '@patternfly/react-table';
+import { Flex, FlexItem, Pagination } from '@patternfly/react-core';
+
+import { decodeId } from '../../../../globalIdHelper';
+import withLoading from '../../../withLoading';
+<<<<<<< HEAD
+import { readableCron } from './JobsTabHelper';
+import {
+  preparePerPageOptions,
+  refreshPage,
+} from '../../../../helpers/paginationHelper';
+=======
+import { readableCron, readablePurpose } from './JobsTabHelper';
+>>>>>>> 5b01704 (Fixes #34458 - Show Hostgroup jobs on the Host Detail page)
+
+const PreviousJobsTable = ({ history, totalCount, jobs, pagination }) => {
+  const columns = [
+    __('Description'),
+    __('Result'),
+    __('State'),
+    __('Executed at'),
+    __('Schedule'),
+  ];
+
+  const handlePerPageSelected = (event, perPage) => {
+    refreshPage(history, { page: 1, perPage });
+  };
+
+  const handlePageSelected = (event, page) => {
+    refreshPage(history, { ...pagination, page });
+  };
+
+  const perPageOptions = preparePerPageOptions(usePaginationOptions());
+
+  return (
+    <React.Fragment>
+      <h3>{__('Previously executed jobs')}</h3>
+<<<<<<< HEAD
+      <Flex className="pf-u-pt-md">
+=======
+      <Flex direction={{ default: 'column' }} className="pf-u-pt-md">
+        <FlexItem align={{ default: 'alignRight' }}>
+          <Pagination updateParamsByUrl itemCount={totalCount} variant="top" />
+        </FlexItem>
+        <FlexItem>
+          <TableComposable variant="compact">
+            <Thead>
+              <Tr>
+                {columns.map(col => (
+                  <Th key={col}>{col}</Th>
+                ))}
+              </Tr>
+            </Thead>
+            <Tbody>
+              {jobs.map(job => (
+                <Tr key={job.id}>
+                  <Td>
+                    <a
+                      onClick={() =>
+                        window.tfm.nav.pushUrl(
+                          `/job_invocations/${decodeId(job.id)}`
+                        )
+                      }
+                    >
+                      {job.description}
+                    </a>
+                    &nbsp;
+                    {readablePurpose(job.recurringLogic.purpose)}
+                  </Td>
+                  <Td>{job.task.result}</Td>
+                  <Td>{job.task.state}</Td>
+                  <Td>
+                    <RelativeDateTime date={job.startAt} />
+                  </Td>
+                  <Td>{readableCron(job.recurringLogic.cronLine)}</Td>
+                </Tr>
+              ))}
+            </Tbody>
+          </TableComposable>
+        </FlexItem>
+>>>>>>> 5b01704 (Fixes #34458 - Show Hostgroup jobs on the Host Detail page)
+        <FlexItem align={{ default: 'alignRight' }}>
+          <Pagination
+            itemCount={totalCount}
+            page={pagination.page}
+            perPage={pagination.perPage}
+            onSetPage={handlePageSelected}
+            onPerPageSelect={handlePerPageSelected}
+            perPageOptions={perPageOptions}
+            variant="top"
+          />
+        </FlexItem>
+      </Flex>
+      <TableComposable variant="compact">
+        <Thead>
+          <Tr>
+            {columns.map(col => (
+              <Th key={col}>{col}</Th>
+            ))}
+          </Tr>
+        </Thead>
+        <Tbody>
+          {jobs.map(job => (
+            <Tr key={job.id}>
+              <Td>
+                <a
+                  onClick={() =>
+                    window.tfm.nav.pushUrl(
+                      `/job_invocations/${decodeId(job.id)}`
+                    )
+                  }
+                >
+                  {job.description}
+                </a>
+              </Td>
+              <Td>{job.task.result}</Td>
+              <Td>{job.task.state}</Td>
+              <Td>
+                <RelativeDateTime date={job.startAt} />
+              </Td>
+              <Td>{readableCron(job.recurringLogic.cronLine)}</Td>
+            </Tr>
+          ))}
+        </Tbody>
+      </TableComposable>
+    </React.Fragment>
+  );
+};
+
+PreviousJobsTable.propTypes = {
+  jobs: PropTypes.array.isRequired,
+  history: PropTypes.object.isRequired,
+  totalCount: PropTypes.number.isRequired,
+  pagination: PropTypes.object.isRequired,
+};
+
+export default withLoading(PreviousJobsTable);

data/webpack/components/AnsibleHostDetail/components/RolesTab/__test__/EditRoles.test.js

@@ -21,7 +21,8 @@ import {
   assignRolesErrorMock,
 } from './RolesTab.fixtures';
 
-const TestComponent = withReactRouter(withRedux(withMockedProvider(RolesTab)));
+jest.mock('axios');
+const TestComponent = withRedux(withReactRouter(withMockedProvider(RolesTab)));
 
 describe('assigning Ansible roles', () => {
   it('should assign Ansible roles', async () => {

data/webpack/components/AnsibleHostDetail/components/RolesTab/__test__/RolesTab.test.js

@@ -6,6 +6,7 @@ import {
   tick,
   withMockedProvider,
   withReactRouter,
+  withRedux,
 } from '../../../../../testHelper';
 
 import {
@@ -18,7 +19,8 @@ import {
 
 import RolesTab from '../';
 
-const TestComponent = withReactRouter(withMockedProvider(RolesTab));
+jest.mock('axios');
+const TestComponent = withRedux(withReactRouter(withMockedProvider(RolesTab)));
 
 describe('RolesTab', () => {
   it('should load Ansible Roles as admin', async () => {

data/webpack/components/AnsibleHostDetail/components/RolesTab/index.js

@@ -2,7 +2,10 @@ import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import { useQuery } from '@apollo/client';
 import { Button } from '@patternfly/react-core';
+import { Link, Route } from 'react-router-dom';
 import { translate as __ } from 'foremanReact/common/I18n';
+import { foremanUrl } from 'foremanReact/common/helpers';
+import { useAPI } from 'foremanReact/common/hooks/API/APIHooks';
 
 import ansibleRolesQuery from '../../../../graphql/queries/hostAnsibleRoles.gql';
 import { encodeId } from '../../../../globalIdHelper';
@@ -12,6 +15,7 @@ import {
   useCurrentPagination,
 } from '../../../../helpers/pageParamsHelper';
 import EditRolesModal from './EditRolesModal';
+import AllRolesModal from './AllRolesModal';
 
 const RolesTab = ({ hostId, history, canEditHost }) => {
   const hostGlobalId = encodeId('Host', hostId);
@@ -33,9 +37,28 @@ const RolesTab = ({ hostId, history, canEditHost }) => {
       onClick={() => setAssignModal(true)}
       aria-label="edit ansible roles"
     >
-      {__('Assign Ansible roles')}
+      {__('Assign roles directly to the host')}
     </Button>
   ) : null;
+
+  const url = hostId && foremanUrl(`/api/v2/hosts/${hostId}/ansible_roles`);
+  const { response: allAnsibleRoles } = useAPI('get', url, {
+    key: 'ANSIBLE_ROLES',
+  });
+  const emptyStateDescription = allAnsibleRoles.length > 0 && (
+    <>
+      <Route path="/Ansible/roles/all">
+        <AllRolesModal
+          onClose={() => history.push('/Ansible/roles')}
+          isOpen
+          hostGlobalId={hostGlobalId}
+          history={history}
+        />
+      </Route>
+      <Link to="/Ansible/roles/all">{__('View inherited roles')}</Link>
+    </>
+  );
+
   return (
     <>
       <RolesTable
@@ -46,8 +69,9 @@ const RolesTab = ({ hostId, history, canEditHost }) => {
         history={history}
         hostGlobalId={hostGlobalId}
         emptyStateProps={{
-          header: __('No Ansible roles assigned'),
+          header: __('No roles assigned directly to the host'),
           action: editBtn,
+          description: emptyStateDescription,
         }}
         pagination={pagination}
         canEditHost={canEditHost}

data/webpack/testHelper.js

@@ -1,15 +1,24 @@
 import React from 'react';
 import { Provider } from 'react-redux';
+import thunk from 'redux-thunk';
+import { applyMiddleware, createStore, compose, combineReducers } from 'redux';
 import { MockedProvider } from '@apollo/react-testing';
 import { Router, MemoryRouter } from 'react-router-dom';
 import { createMemoryHistory } from 'history';
 
-import store from 'foremanReact/redux';
-import ConfirmModal from 'foremanReact/components/ConfirmModal';
+import { reducers as apiReducer, APIMiddleware } from 'foremanReact/redux/API';
+import ConfirmModal, {
+  reducers as confirmModalReducers,
+} from 'foremanReact/components/ConfirmModal';
 import { getForemanContext } from 'foremanReact/Root/Context/ForemanContext';
 
+const reducers = combineReducers({ ...apiReducer, ...confirmModalReducers });
+
+export const generateStore = () =>
+  createStore(reducers, compose(applyMiddleware(thunk, APIMiddleware)));
+
 export const withRedux = Component => props => (
-  <Provider store={store}>
+  <Provider store={generateStore()}>
     <Component {...props} />
     <ConfirmModal />
   </Provider>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 7.1.3
+  version: 7.1.4
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-25 00:00:00.000000000 Z
+date: 2022-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -223,48 +223,85 @@ files:
 - lib/foreman_ansible.rb
 - lib/foreman_ansible/engine.rb
 - lib/foreman_ansible/register.rb
+- lib/foreman_ansible/register.rb.orig
 - lib/foreman_ansible/remote_execution.rb
 - lib/foreman_ansible/version.rb
 - locale/Makefile
 - locale/action_names.rb
 - locale/ca/LC_MESSAGES/foreman_ansible.mo
+- locale/ca/foreman_ansible.edit.po
 - locale/ca/foreman_ansible.po
+- locale/ca/foreman_ansible.po.time_stamp
 - locale/cs_CZ/LC_MESSAGES/foreman_ansible.mo
+- locale/cs_CZ/foreman_ansible.edit.po
 - locale/cs_CZ/foreman_ansible.po
+- locale/cs_CZ/foreman_ansible.po.time_stamp
 - locale/de/LC_MESSAGES/foreman_ansible.mo
+- locale/de/foreman_ansible.edit.po
 - locale/de/foreman_ansible.po
+- locale/de/foreman_ansible.po.time_stamp
 - locale/en/LC_MESSAGES/foreman_ansible.mo
+- locale/en/foreman_ansible.edit.po
 - locale/en/foreman_ansible.po
+- locale/en/foreman_ansible.po.time_stamp
 - locale/en_GB/LC_MESSAGES/foreman_ansible.mo
+- locale/en_GB/foreman_ansible.edit.po
 - locale/en_GB/foreman_ansible.po
+- locale/en_GB/foreman_ansible.po.time_stamp
 - locale/es/LC_MESSAGES/foreman_ansible.mo
+- locale/es/foreman_ansible.edit.po
 - locale/es/foreman_ansible.po
+- locale/es/foreman_ansible.po.time_stamp
 - locale/foreman_ansible.pot
 - locale/fr/LC_MESSAGES/foreman_ansible.mo
+- locale/fr/foreman_ansible.edit.po
 - locale/fr/foreman_ansible.po
+- locale/fr/foreman_ansible.po.time_stamp
 - locale/gemspec.rb
 - locale/gl/LC_MESSAGES/foreman_ansible.mo
+- locale/gl/foreman_ansible.edit.po
 - locale/gl/foreman_ansible.po
+- locale/gl/foreman_ansible.po.time_stamp
 - locale/it/LC_MESSAGES/foreman_ansible.mo
+- locale/it/foreman_ansible.edit.po
 - locale/it/foreman_ansible.po
+- locale/it/foreman_ansible.po.time_stamp
 - locale/ja/LC_MESSAGES/foreman_ansible.mo
+- locale/ja/foreman_ansible.edit.po
 - locale/ja/foreman_ansible.po
+- locale/ja/foreman_ansible.po.time_stamp
 - locale/ko/LC_MESSAGES/foreman_ansible.mo
+- locale/ko/foreman_ansible.edit.po
 - locale/ko/foreman_ansible.po
+- locale/ko/foreman_ansible.po.time_stamp
 - locale/nl_NL/LC_MESSAGES/foreman_ansible.mo
+- locale/nl_NL/foreman_ansible.edit.po
 - locale/nl_NL/foreman_ansible.po
+- locale/nl_NL/foreman_ansible.po.time_stamp
 - locale/pl/LC_MESSAGES/foreman_ansible.mo
+- locale/pl/foreman_ansible.edit.po
 - locale/pl/foreman_ansible.po
+- locale/pl/foreman_ansible.po.time_stamp
 - locale/pt_BR/LC_MESSAGES/foreman_ansible.mo
+- locale/pt_BR/foreman_ansible.edit.po
 - locale/pt_BR/foreman_ansible.po
+- locale/pt_BR/foreman_ansible.po.time_stamp
 - locale/ru/LC_MESSAGES/foreman_ansible.mo
+- locale/ru/foreman_ansible.edit.po
 - locale/ru/foreman_ansible.po
+- locale/ru/foreman_ansible.po.time_stamp
 - locale/sv_SE/LC_MESSAGES/foreman_ansible.mo
+- locale/sv_SE/foreman_ansible.edit.po
 - locale/sv_SE/foreman_ansible.po
+- locale/sv_SE/foreman_ansible.po.time_stamp
 - locale/zh_CN/LC_MESSAGES/foreman_ansible.mo
+- locale/zh_CN/foreman_ansible.edit.po
 - locale/zh_CN/foreman_ansible.po
+- locale/zh_CN/foreman_ansible.po.time_stamp
 - locale/zh_TW/LC_MESSAGES/foreman_ansible.mo
+- locale/zh_TW/foreman_ansible.edit.po
 - locale/zh_TW/foreman_ansible.po
+- locale/zh_TW/foreman_ansible.po.time_stamp
 - package.json
 - test/factories/ansible_proxy.rb
 - test/factories/ansible_roles.rb
@@ -338,6 +375,7 @@ files:
 - webpack/components/AnsibleHostDetail/components/JobsTab/NewRecurringJobModal.js
 - webpack/components/AnsibleHostDetail/components/JobsTab/NewRecurringJobModal.scss
 - webpack/components/AnsibleHostDetail/components/JobsTab/PreviousJobsTable.js
+- webpack/components/AnsibleHostDetail/components/JobsTab/PreviousJobsTable.js.orig
 - webpack/components/AnsibleHostDetail/components/JobsTab/RecurringJobsTable.js
 - webpack/components/AnsibleHostDetail/components/JobsTab/__test__/JobsTab.fixtures.js
 - webpack/components/AnsibleHostDetail/components/JobsTab/__test__/JobsTab.test.js
@@ -458,7 +496,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.26
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Ansible integration with Foreman (theforeman.org)
@@ -473,34 +511,25 @@ test_files:
 - test/fixtures/sample_facts.json
 - test/fixtures/sample_playbooks.json
 - test/foreman_ansible/helpers/ansible_roles_helper_test.rb
-- test/functional/ansible_roles_controller_test.rb
-- test/functional/ansible_variables_controller_test.rb
 - test/functional/api/v2/ansible_inventories_controller_test.rb
 - test/functional/api/v2/ansible_playbooks_controller_test.rb
 - test/functional/api/v2/ansible_roles_controller_test.rb
 - test/functional/api/v2/ansible_variables_controller_test.rb
 - test/functional/api/v2/hostgroups_controller_test.rb
 - test/functional/api/v2/hosts_controller_test.rb
+- test/functional/ansible_roles_controller_test.rb
+- test/functional/ansible_variables_controller_test.rb
 - test/functional/hosts_controller_test.rb
 - test/functional/ui_ansible_roles_controller_test.rb
 - test/graphql/mutations/hosts/assign_ansible_roles_mutation_test.rb
 - test/graphql/queries/ansible_roles_query_test.rb
 - test/graphql/queries/host_ansible_roles_query_test.rb
-- test/test_plugin_helper.rb
 - test/unit/actions/run_ansible_job_test.rb
 - test/unit/actions/run_proxy_ansible_command_test.rb
-- test/unit/ansible_provider_test.rb
-- test/unit/ansible_role_test.rb
-- test/unit/ansible_variable_test.rb
 - test/unit/concerns/config_reports_extensions_test.rb
 - test/unit/concerns/host_managed_extensions_test.rb
 - test/unit/concerns/hostgroup_extensions_test.rb
 - test/unit/helpers/ansible_reports_helper_test.rb
-- test/unit/host_ansible_role_test.rb
-- test/unit/hostgroup_ansible_role_test.rb
-- test/unit/ignore_roles_test.rb
-- test/unit/import_playbooks_test.rb
-- test/unit/import_roles_and_variables.rb
 - test/unit/lib/proxy_api/ansible_test.rb
 - test/unit/services/ansible_report_importer_test.rb
 - test/unit/services/ansible_variables_importer_test.rb
@@ -510,3 +539,12 @@ test_files:
 - test/unit/services/override_resolver_test.rb
 - test/unit/services/roles_importer_test.rb
 - test/unit/services/ui_roles_importer_test.rb
+- test/unit/ansible_provider_test.rb
+- test/unit/ansible_role_test.rb
+- test/unit/ansible_variable_test.rb
+- test/unit/host_ansible_role_test.rb
+- test/unit/hostgroup_ansible_role_test.rb
+- test/unit/ignore_roles_test.rb
+- test/unit/import_playbooks_test.rb
+- test/unit/import_roles_and_variables.rb
+- test/test_plugin_helper.rb