foreman_ansible 7.1.3 → 7.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2754fa1c5a9834d8b174906f4848ce5ba7e5699a9c757e6761b24c1ced021f52
-  data.tar.gz: b9c7d3e372fbde5eb5a6e5b94af335293ec660b81511c23f4cd519868632988a
+  metadata.gz: 6988da0b98785b524a517950e7af3143cb869a83a4880e07930c5db47a466d8c
+  data.tar.gz: 6cdfa6a0f7dce34cae4b4c39004d9dea499e3f70d9b0687784c3acc45e548bf1
 SHA512:
-  metadata.gz: 933f56fb3c7eb0389397067189f9b64f7fc2ec44fb631e26b0943748b80c80f51b23e2897f4175ff4e8f28b5dbd1232e51641a429b07de1fd2786ba7d44fc4bc
-  data.tar.gz: d9c4973117fa530f4dfbd93720692a9331c1172b120f66aa6df4cb59f9dfe3162b2004c5f7e2e9b1f3bf99283524154fb2e1fe4a8045839c97823895a446a8e6
+  metadata.gz: e56067be85f66f973b8f4ebc1244f17e052539977cb022df27e0206087844d6aef590c4a5ab7d4b69265d7e2b1a21285363f01676d5e563b03749208628a2173
+  data.tar.gz: a92d028988fd669b325492b8fb7c01dbf8b266bb1f9e53fb7a69d461133f5d8c93114da3606369f8ab36590d6ae6d1af2453a9416236465455c98ff342a15996

data/lib/foreman_ansible/version.rb

@@ -4,5 +4,5 @@
 # This way other parts of Foreman can just call ForemanAnsible::VERSION
 # and detect what version the plugin is running.
 module ForemanAnsible
-  VERSION = '7.1.3'
+  VERSION = '7.1.5'
 end

data/webpack/components/AnsibleHostDetail/components/AnsibleVariableOverrides/AnsibleVariableOverridesTableHelper.js

@@ -85,12 +85,16 @@ const validateRegexp = (variable, value) => {
 };
 
 const validateList = (variable, value) => {
-  if (variable.validatorRule.split(',').find(item => item.trim() === value)) {
+  let { validatorRule } = variable;
+  if (typeof validatorRule !== 'string') {
+    validatorRule = validatorRule.toString();
+  }
+  if (validatorRule.split(',').find(item => item.trim() === value)) {
     return validationSuccess;
   }
   return {
     key: 'error',
-    msg: sprintf(__('Invalid, expected one of: %s'), variable.validatorRule),
+    msg: sprintf(__('Invalid, expected one of: %s'), validatorRule),
   };
 };
 

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.5
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-25 00:00:00.000000000 Z
+date: 2023-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -42,30 +42,30 @@ dependencies:
   name: foreman_remote_execution
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 7.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 7.2.2
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.0.3
 description: Ansible integration with Foreman
 email:
 - elobatocs@gmail.com
@@ -458,7 +458,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.26
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Ansible integration with Foreman (theforeman.org)
@@ -469,16 +469,16 @@ test_files:
 - test/factories/host_ansible_enhancements.rb
 - test/fixtures/insights_playbook.yaml
 - test/fixtures/playbooks_example_output.json
-- test/fixtures/report.json
 - test/fixtures/sample_facts.json
 - test/fixtures/sample_playbooks.json
+- test/fixtures/report.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/ansible_inventories_controller_test.rb
 - test/functional/api/v2/hostgroups_controller_test.rb
 - test/functional/api/v2/hosts_controller_test.rb
 - test/functional/hosts_controller_test.rb
@@ -487,9 +487,6 @@ test_files:
 - 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
@@ -510,3 +507,6 @@ 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/actions/run_ansible_job_test.rb
+- test/unit/actions/run_proxy_ansible_command_test.rb
+- test/unit/ansible_provider_test.rb