foreman_ansible 9.0.1 → 10.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf08e369d1c4b9a445123a9fab3a02b1da8c3bfe9261b7027693959d90e1e1a3
-  data.tar.gz: 13ac8e3cb9b88bf5167a2fdeb9e95409ad9a93c6f4dce12f0500cc5c5bd787a9
+  metadata.gz: 3141b6325f66438c16c630fc728eb9bb7f381ade6987491cbc62fa98d911e83b
+  data.tar.gz: 68f84c9a0251af1aa1a284c5ae509008d24c9d68802097b50aa700f407d5cabb
 SHA512:
-  metadata.gz: 8c515c517add1b91f020c63a50b6b58eaafdacfe08d52d39286ae79efd034cb8ca0ffc8ef4aa8aa2f5be9e5dcc6a797910dd9b32f444e61e525077c8239e3e56
-  data.tar.gz: 18fac58f8a1d119af822b6be9f28ce33b626b0951791d5c3ca201d6e2475f2399c52d21ba92b19335f267a183306e568cbc384910942f1d7d0de9d1d74a88ef2
+  metadata.gz: d62e5e435516a8cef1dc345663d735a767b0b2150ac2c0938fd278e1466d7d1c15428cad48b9313d86902ac10acc00bb34fdadc2337456ed5bf52acb1aaad94e
+  data.tar.gz: 881639c08f95a3cf8771bbf20d74d3410b2caef5e25c4f000e414faf7d4292f365ed4a22ec8edebc3c357d89efd10f8b3ae41bfbb7eeca4e9ea894867c020b0f

data/app/helpers/foreman_ansible/ansible_hostgroups_helper.rb

@@ -4,7 +4,7 @@ module ForemanAnsible
   module AnsibleHostgroupsHelper
     def ansible_hostgroups_actions(hostgroup)
       play_roles = if hostgroup.all_ansible_roles.empty?
-                     { action: (link_to _('Run all Ansible roles'), 'javascript:void(0);', disabled: true, title: 'No Roles assigned'), priority: 31 }
+                     { action: { content: (link_to _('Run all Ansible roles'), 'javascript:void(0);', disabled: true, title: 'No roles assigned', class: 'disabled'), options: { class: 'disabled' } }, priority: 31 }
                    else
                      { action: display_link_if_authorized(_('Run all Ansible roles'), hash_for_play_roles_hostgroup_path(id: hostgroup), 'data-no-turbolink': true, title: _('Run all Ansible roles on hosts belonging to this host group')), priority: 31 }
                    end

data/lib/foreman_ansible/register.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Foreman::Plugin.register :foreman_ansible do
-  requires_foreman '>= 3.4'
+  requires_foreman '>= 3.5'
 
   settings do
     category :ansible, N_('Ansible') do

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 = '9.0.1'
+  VERSION = '10.0.0'
 end

data/package.json

@@ -21,7 +21,6 @@
     "@theforeman/stories": "^10.0",
     "@theforeman/test": "^10.0",
     "@theforeman/vendor-dev": "^10.0",
-    "@testing-library/user-event": "^13.2.1",
     "babel-eslint": "^10.0.3",
     "eslint": "^6.7.2",
     "prettier": "^1.13.5"

data/test/integration/hostgroup_js_test.rb

@@ -0,0 +1,30 @@
+require_relative '../test_plugin_helper'
+require 'integration_test_helper'
+
+class HostgroupJsTest < IntegrationTestWithJavascript
+  let(:hostgroup) { FactoryBot.create(:hostgroup, :name => 'HostgroupWithoutRoles') }
+  let(:hostgroup_with_roles) { FactoryBot.create(:hostgroup, :with_ansible_roles, :name => 'HostgroupWithRoles') }
+
+  setup do
+    FactoryBot.create(:host, :hostgroup_id => hostgroup.id)
+    FactoryBot.create(:host, :hostgroup_id => hostgroup_with_roles.id)
+  end
+
+  test 'hostgroup without roles should have disabled link' do
+    visit hostgroups_path(search: hostgroup.name)
+
+    first_row = page.find('table > tbody > tr:nth-child(1)')
+    first_row.find('td:nth-child(4) > div > a').click
+
+    assert_includes first(:link, 'Run all Ansible roles')[:class], 'disabled'
+  end
+
+  test 'hostgroup with roles should have clickable link' do
+    visit hostgroups_path(search: hostgroup_with_roles.name)
+
+    first_row = page.find('table > tbody > tr:nth-child(1)')
+    first_row.find('td:nth-child(4) > div > a').click
+
+    assert_not first(:link, 'Run all Ansible roles')[:class].include?('disabled')
+  end
+end

data/webpack/components/AnsibleHostDetail/AnsibleHostDetail.js

@@ -22,6 +22,7 @@ const AnsibleHostDetail = ({
         <>
           <Tabs
             className="ansible-host-details-tabs"
+            ouiaId="ansible-host-details-tabs"
             onSelect={(evt, subTab) => hashHistory.push(subTab)}
             activeKey={pathname?.split('/')[2]}
             isSecondary

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

@@ -148,12 +148,17 @@ const AnsibleVariableOverridesTable = ({
     <React.Fragment>
       <Flex direction={{ default: 'column' }}>
         <FlexItem align={{ default: 'alignRight' }}>
-          <Pagination updateParamsByUrl itemCount={totalCount} variant="top" />
+          <Pagination
+            ouiaId="pagination-top"
+            updateParamsByUrl
+            itemCount={totalCount}
+            variant="top"
+          />
         </FlexItem>
         <FlexItem>
-          <TableComposable variant="compact">
+          <TableComposable ouiaId="table-composable-compact" variant="compact">
             <Thead>
-              <Tr>
+              <Tr ouiaId="row-header">
                 {columns.map(col => (
                   <Th key={col}>{col}</Th>
                 ))}
@@ -162,7 +167,7 @@ const AnsibleVariableOverridesTable = ({
             </Thead>
             <Tbody>
               {variables.map((variable, idx) => (
-                <Tr key={idx}>
+                <Tr key={idx} ouiaId={`row-${idx}`}>
                   <Td>
                     <a href={variable.path}>{variable.key}</a>
                   </Td>
@@ -202,6 +207,7 @@ const AnsibleVariableOverridesTable = ({
         </FlexItem>
         <FlexItem align={{ default: 'alignRight' }}>
           <Pagination
+            ouiaId="pagination-bottom"
             updateParamsByUrl
             itemCount={totalCount}
             variant="bottom"

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

@@ -111,6 +111,7 @@ const EditableAction = ({
             onClick={onClose}
             isDisabled={state.working}
             aria-label="Cancel editing override button"
+            ouiaId="cancel-editing-override-button"
           >
             <TimesIcon />
           </Button>
@@ -119,6 +120,7 @@ const EditableAction = ({
             onClick={onSubmit}
             isDisabled={state.working || hasError(state)}
             aria-label="Submit editing override button"
+            ouiaId="submit-editing-override-button"
           >
             <CheckIcon />
           </Button>
@@ -136,6 +138,7 @@ const EditableAction = ({
             onClick={onOpen}
             variant="plain"
             aria-label="Edit override button"
+            ouiaId="edit-override-button"
           >
             <PencilAltIcon />
           </Button>

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

@@ -23,7 +23,11 @@ const withFormGroup = Component => componentProps => {
 export const SelectField = componentProps => {
   const { selectItems, ...rest } = componentProps;
   return (
-    <FormSelect className="without_select2" {...rest}>
+    <FormSelect
+      className="without_select2"
+      ouiaId="without-form-select"
+      {...rest}
+    >
       {selectItems.map(item => (
         <FormSelectOption key={item.id} value={item.value} label={item.name} />
       ))}

data/webpack/components/AnsibleHostDetail/components/JobsTab/NewRecurringJobModal.js

@@ -57,6 +57,7 @@ const NewRecurringJobModal = props => {
         const actions = [
           <Button
             aria-label="submit creating job"
+            ouiaId="submit-creating-job"
             key="confirm"
             variant="primary"
             onClick={formProps.handleSubmit}
@@ -66,6 +67,7 @@ const NewRecurringJobModal = props => {
           </Button>,
           <Button
             aria-label="cancel creating job"
+            ouiaId="cancel-creating-job"
             key="cancel"
             variant="link"
             onClick={onClose}
@@ -83,6 +85,7 @@ const NewRecurringJobModal = props => {
           <Modal
             variant={ModalVariant.large}
             title="Create New Recurring Ansible Run"
+            ouiaId="modal-recurring-ansible-run"
             isOpen={props.isOpen}
             className="foreman-modal modal-high"
             showClose={false}

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

@@ -32,12 +32,17 @@ const PreviousJobsTable = ({ history, totalCount, jobs, pagination }) => {
       <h3>{__('Previously executed jobs')}</h3>
       <Flex direction={{ default: 'column' }} className="pf-u-pt-md">
         <FlexItem align={{ default: 'alignRight' }}>
-          <Pagination updateParamsByUrl itemCount={totalCount} variant="top" />
+          <Pagination
+            ouiaId="pagination-top"
+            updateParamsByUrl
+            itemCount={totalCount}
+            variant="top"
+          />
         </FlexItem>
         <FlexItem>
-          <TableComposable variant="compact">
+          <TableComposable ouiaId="table-composable-compact" variant="compact">
             <Thead>
-              <Tr>
+              <Tr ouiaId="row-header">
                 {columns.map(col => (
                   <Th key={col}>{col}</Th>
                 ))}
@@ -45,7 +50,7 @@ const PreviousJobsTable = ({ history, totalCount, jobs, pagination }) => {
             </Thead>
             <Tbody>
               {jobs.map(job => (
-                <Tr key={job.id}>
+                <Tr key={job.id} ouiaId={`row-${job.id}`}>
                   <Td>
                     <a
                       onClick={() =>
@@ -72,6 +77,7 @@ const PreviousJobsTable = ({ history, totalCount, jobs, pagination }) => {
         </FlexItem>
         <FlexItem align={{ default: 'alignRight' }}>
           <Pagination
+            ouiaId="pagination-bottom"
             updateParamsByUrl
             itemCount={totalCount}
             variant="bottom"

data/webpack/components/AnsibleHostDetail/components/JobsTab/RecurringJobsTable.js

@@ -60,9 +60,9 @@ const RecurringJobsTable = ({
   return (
     <React.Fragment>
       <h3>{__('Scheduled recurring jobs')}</h3>
-      <TableComposable variant="compact">
+      <TableComposable ouiaId="table-composable-compact" variant="compact">
         <Thead>
-          <Tr>
+          <Tr ouiaId="row-header">
             {columns.map(col => (
               <Th key={col}>{col}</Th>
             ))}
@@ -71,7 +71,7 @@ const RecurringJobsTable = ({
         </Thead>
         <Tbody>
           {jobs.map(job => (
-            <Tr key={job.id}>
+            <Tr key={job.id} ouiaId={`row-${job.id}`}>
               <Td>
                 <a
                   onClick={() =>

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

@@ -33,7 +33,11 @@ const JobsTab = ({ resourceName, resourceId, hostGroupId, history }) => {
   ];
 
   const scheduleBtn = (
-    <Button aria-label="schedule recurring job" onClick={toggleModal}>
+    <Button
+      aria-label="schedule recurring job"
+      ouiaId="schedule-recurring-job"
+      onClick={toggleModal}
+    >
       {__('Schedule recurring job')}
     </Button>
   );

data/webpack/components/AnsibleHostDetail/components/RolesTab/AllRolesModal/AllRolesTable.js

@@ -21,11 +21,16 @@ const AllRolesTable = ({ allAnsibleRoles, totalCount }) => {
     <React.Fragment>
       <Flex direction={{ default: 'column' }} className="pf-u-pt-md">
         <FlexItem align={{ default: 'alignRight' }}>
-          <Pagination updateParamsByUrl itemCount={totalCount} variant="top" />
+          <Pagination
+            ouiaId="pagination-top"
+            updateParamsByUrl
+            itemCount={totalCount}
+            variant="top"
+          />
         </FlexItem>
-        <TableComposable variant="compact">
+        <TableComposable ouiaId="table-composable-compact" variant="compact">
           <Thead>
-            <Tr>
+            <Tr ouiaId="row-header">
               <Th />
               {columns.map(col => (
                 <Th key={`${col}-all`}>{col}</Th>
@@ -34,7 +39,7 @@ const AllRolesTable = ({ allAnsibleRoles, totalCount }) => {
           </Thead>
           <Tbody>
             {allAnsibleRoles.map(role => (
-              <Tr key={`${role.id}-all`} id={role.id}>
+              <Tr key={`${role.id}-all`} id={role.id} ouiaId={`row-${role.id}`}>
                 <Td />
                 <Td>{role.name}</Td>
                 <Td>
@@ -58,6 +63,7 @@ const AllRolesTable = ({ allAnsibleRoles, totalCount }) => {
         </TableComposable>
         <FlexItem align={{ default: 'alignRight' }}>
           <Pagination
+            ouiaId="pagination-bottom"
             updateParamsByUrl
             itemCount={totalCount}
             variant="bottom"

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

@@ -15,6 +15,7 @@ import {
 
 const AllRolesModal = ({ hostGlobalId, onClose, history }) => {
   const baseModalProps = {
+    ouiaId: 'modal-ansible-roles',
     variant: ModalVariant.large,
     isOpen: true,
     onClose,

data/webpack/components/AnsibleHostDetail/components/RolesTab/EditRolesModal/EditRolesForm.js

@@ -54,6 +54,7 @@ const EditRolesForm = props => {
       onClick={() => callMutation({ variables })}
       isDisabled={loading || didNotModifyOptions()}
       aria-label="submit ansible roles"
+      ouiaId="submit-ansible-roles-button"
     >
       {__('Confirm')}
     </Button>,
@@ -65,7 +66,7 @@ const EditRolesForm = props => {
   }
 
   return (
-    <Modal {...baseModalProps} actions={formActions}>
+    <Modal ouiaId="modal-edit-roles" {...baseModalProps} actions={formActions}>
       <DualList
         availableOptions={availableOptions}
         chosenOptions={chosenOptions}

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

@@ -20,6 +20,7 @@ const EditRolesModal = ({
   canEditHost,
 }) => {
   const baseModalProps = {
+    ouiaId: 'edit-ansible-roles-modal',
     width: '50%',
     isOpen,
     className: 'foreman-modal',
@@ -32,7 +33,12 @@ const EditRolesModal = ({
   };
 
   const actions = [
-    <Button variant="link" onClick={event => closeModal()} key="close">
+    <Button
+      ouiaId="close-button"
+      variant="link"
+      onClick={event => closeModal()}
+      key="close"
+    >
       {__('Close')}
     </Button>,
   ];

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

@@ -32,7 +32,10 @@ const RolesTable = ({
   const editBtn = canEditHost ? (
     <FlexItem>
       <Link to="/Ansible/roles/edit">
-        <Button aria-label="edit ansible roles">
+        <Button
+          aria-label="edit ansible roles"
+          ouiaId="edit-ansible-roles-button"
+        >
           {__('Edit Ansible roles')}
         </Button>
       </Link>
@@ -53,14 +56,19 @@ const RolesTable = ({
       <Flex>
         <FlexItem>{editBtn}</FlexItem>
         <FlexItem align={{ default: 'alignRight' }}>
-          <Pagination updateParamsByUrl itemCount={totalCount} variant="top" />
+          <Pagination
+            ouiaId="pagination-top"
+            updateParamsByUrl
+            itemCount={totalCount}
+            variant="top"
+          />
         </FlexItem>
       </Flex>
       <Flex direction={{ default: 'column' }}>
         <FlexItem>
-          <TableComposable variant="compact">
+          <TableComposable variant="compact" ouiaId="table-composable-compact">
             <Thead>
-              <Tr>
+              <Tr ouiaId="row-header">
                 {columns.map(col => (
                   <Th key={col}>{col}</Th>
                 ))}
@@ -68,7 +76,7 @@ const RolesTable = ({
             </Thead>
             <Tbody>
               {ansibleRoles.map(role => (
-                <Tr key={role.id}>
+                <Tr key={role.id} ouiaId={`row-${role.id}`}>
                   <Td>
                     <a href={role.path}>{role.name}</a>
                   </Td>
@@ -88,6 +96,7 @@ const RolesTable = ({
         </FlexItem>
         <FlexItem align={{ default: 'alignRight' }}>
           <Pagination
+            ouiaId="pagination-bottom"
             updateParamsByUrl
             itemCount={totalCount}
             variant="bottom"

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);
@@ -32,10 +36,30 @@ const RolesTab = ({ hostId, history, canEditHost }) => {
     <Button
       onClick={() => setAssignModal(true)}
       aria-label="edit ansible roles"
+      ouiaId="edit-ansible-roles-button"
     >
-      {__('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 +70,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/components/AnsibleHostDetail/components/SecondaryTabRoutes.js

@@ -12,7 +12,7 @@ import { ANSIBLE_KEY } from '../constants';
 import { route } from '../helpers';
 
 const SecondaryTabRoutes = ({ response, router, history }) => (
-  <Switch>
+  <Switch ouiaId="switch">
     <Route exact path={`/${ANSIBLE_KEY}`}>
       <Redirect to={route('roles')} />
     </Route>

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>