foreman_ansible 7.0.0 → 7.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76cdda389998bc85d45534a8feeb54fde36c671401665e5b337101b952efeae4
-  data.tar.gz: df707b59de63cd0cf66f553765a9e9a8e659cf2bdb4049198ce12eaff58f12fd
+  metadata.gz: 7a8c4f263992d803c31386bc301ce1e032c680ada845db8bf07e71162c003384
+  data.tar.gz: 628c7b6952499ef5dfe912370bec8d3e936926a004acf5b7693d7706fe461ea9
 SHA512:
-  metadata.gz: d54c5b84429025c6f2f8be0914ab870d8f5945ea97430cdb7129dbff4ceaffc3812608c6a020a0284b454c54542dd61d4682bcdab1532bc6a012b30ef0c48cbe
-  data.tar.gz: 16628e25e09230f8deeabf013bc0cc4277c271f8efde4d5691fab8a925ba1bac3c94b6b79c929e13dedded52bcd7a6406d474db10f5dd39619991227d9fd00c8
+  metadata.gz: '09f3fd7b961edcb7abee1f6dd6de4fbf0bb80130668c39724d6c8658c2ca1570109ab6b7d172d2f9b963c6e4e5aebaa3280ebf199f9fe5ff86580ab1d8f06c7e'
+  data.tar.gz: 924b85ee81562a848c07417fd0788520c000292901f63ef45f8adbfc99ec32dae21858589c83688f461d19e49a4c6491801d53f611032a1c291ba941e9068133

data/app/graphql/resolvers/ansible_role/path.rb

@@ -0,0 +1,11 @@
+module Resolvers
+  module AnsibleRole
+    class Path < Resolvers::BaseResolver
+      type String, null: false
+
+      def resolve
+        Rails.application.routes.url_helpers.ansible_roles_path(search: "name = #{object.name}")
+      end
+    end
+  end
+end

data/app/graphql/resolvers/ansible_variable/path.rb

@@ -0,0 +1,11 @@
+module Resolvers
+  module AnsibleVariable
+    class Path < Resolvers::BaseResolver
+      type String, null: false
+
+      def resolve
+        Rails.application.routes.url_helpers.edit_ansible_variable_path(object.ansible_variable)
+      end
+    end
+  end
+end

data/app/graphql/types/ansible_role.rb

@@ -5,5 +5,6 @@ module Types
     global_id_field :id
 
     field :name, String, :null => false
+    field :path, resolver: Resolvers::AnsibleRole::Path
   end
 end

data/app/graphql/types/ansible_variable.rb

@@ -5,6 +5,7 @@ module Types
     global_id_field :id
 
     field :key, String
+    field :path, resolver: Resolvers::AnsibleVariable::Path
     field :override, Boolean
     field :description, String
     field :hidden_value, Boolean

data/app/models/foreman_ansible/ansible_provider.rb

@@ -88,7 +88,7 @@ if defined? ForemanRemoteExecution
             :children => [
               {
                 :name => :tags,
-                :type => Array,
+                :type => String,
                 :opts => { :required => false, :desc => N_('A comma separated list of tags to use for Ansible run') }
               },
               {
@@ -115,7 +115,8 @@ if defined? ForemanRemoteExecution
         end
 
         def proxy_batch_size
-          Setting['foreman_ansible_proxy_batch_size']
+          value = Setting['foreman_ansible_proxy_batch_size']
+          value.presence && value.to_i
         end
 
         private

data/app/services/foreman_ansible/ansible_report_importer.rb

@@ -18,10 +18,6 @@ module ForemanAnsible
         partial_hostname_match(hostname)
       end
 
-      def self.authorized_smart_proxy_features
-        super + ['Ansible']
-      end
-
       def partial_hostname_match(hostname)
         return @host unless @host.new_record?
         hosts = Host.where(Host.arel_table[:name].matches("#{hostname}.%"))

data/lib/foreman_ansible/engine.rb

@@ -75,6 +75,7 @@ module ForemanAnsible
       ::Api::V2::HostgroupsController.include ForemanAnsible::Api::V2::HostgroupsControllerExtensions
       ::Api::V2::HostgroupsController.include ForemanAnsible::Api::V2::HostgroupsParamGroupExtensions
       ::ConfigReportImporter.include ForemanAnsible::AnsibleReportImporter
+      ReportImporter.register_smart_proxy_feature('Ansible')
     rescue StandardError => e
       Rails.logger.warn "Foreman Ansible: skipping engine hook (#{e})"
     end

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.0.0'
+  VERSION = '7.0.3'
 end

data/test/unit/ansible_provider_test.rb

@@ -47,4 +47,16 @@ class AnsibleProviderTest < ActiveSupport::TestCase
         proxy_command_options(template_invocation, dummyhost)
     end
   end
+
+  describe '#proxy_batch_size' do
+    it 'returns integer if setting is string' do
+      Setting.expects(:[]).with('foreman_ansible_proxy_batch_size').returns('10')
+      _(ForemanAnsible::AnsibleProvider.proxy_batch_size).must_equal(10)
+    end
+
+    it 'returns nil if setting is empty' do
+      Setting.expects(:[]).with('foreman_ansible_proxy_batch_size').returns('')
+      _(ForemanAnsible::AnsibleProvider.proxy_batch_size).must_equal(nil)
+    end
+  end
 end

data/webpack/components/AnsibleHostDetail/AnsibleHostDetail.js

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

data/webpack/components/AnsibleHostDetail/AnsibleHostDetail.scss

@@ -4,3 +4,7 @@
   background-color: $pf-color-white;
   padding: 1.8rem;
 }
+
+.ansible-host-details-tabs {
+  margin: 0 24px;
+}

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

@@ -63,7 +63,7 @@ const AnsibleVariableOverridesTable = ({
 }) => {
   const columns = [
     __('Name'),
-    __('Ansible Role'),
+    __('Ansible role'),
     __('Type'),
     __('Value'),
     __('Source attribute'),
@@ -131,7 +131,7 @@ const AnsibleVariableOverridesTable = ({
     onClick: () => {
       dispatch(
         openConfirmModal({
-          title: __('Delete Ansible Variable Override'),
+          title: __('Delete Ansible variable override'),
           message:
             variable &&
             sprintf(
@@ -187,7 +187,9 @@ const AnsibleVariableOverridesTable = ({
         <Tbody>
           {variables.map((variable, idx) => (
             <Tr key={idx}>
-              <Td>{variable.key}</Td>
+              <Td>
+                <a href={variable.path}>{variable.key}</a>
+              </Td>
               <Td>{variable.ansibleRoleName}</Td>
               <Td>{variable.parameterType}</Td>
               <Td>

data/webpack/components/AnsibleHostDetail/components/AnsibleVariableOverrides/__test__/AnsibleVariableOverrides.fixtures.js

@@ -29,6 +29,7 @@ const withFqdnOverride = canEdit => ({
   },
   id: ansibleVariableId,
   key: 'rectangle',
+  path: '/ansible/ansible_variables/1/edit',
   defaultValue: 17,
   parameterType: 'integer',
   ansibleRoleName: 'test.role',
@@ -62,6 +63,7 @@ const withDomainOverride = canEdit => ({
   },
   id: 'MDE6QW5zaWJsZVZhcmlhYmxlLTc4',
   key: 'circle',
+  path: '/ansible/ansible_variables/2/edit',
   defaultValue: 'd',
   parameterType: 'string',
   ansibleRoleName: 'test.role',
@@ -133,6 +135,7 @@ export const mocks = [
                 },
                 id: barVariableGlobalId,
                 key: 'bar',
+                path: '/ansible/ansible_variables/11/edit',
                 defaultValue: 'a',
                 parameterType: 'string',
                 ansibleRoleName: 'test.role',
@@ -160,6 +163,7 @@ export const mocks = [
                 },
                 id: 'MDE6QW5zaWJsZVZhcmlhYmxlLTY1',
                 key: 'square',
+                path: '/ansible/ansible_variables/12/edit',
                 defaultValue: true,
                 parameterType: 'boolean',
                 ansibleRoleName: 'test.role',
@@ -179,6 +183,7 @@ export const mocks = [
                 },
                 id: 'MDE6QW5zaWJsZVZhcmlhYmxlLTc4',
                 key: 'circle',
+                path: '/ansible/ansible_variables/13/edit',
                 defaultValue: 'd',
                 parameterType: 'string',
                 ansibleRoleName: 'test.role',
@@ -203,6 +208,7 @@ export const mocks = [
                 },
                 id: 'MDE6QW5zaWJsZVZhcmlhYmxlLTc5',
                 key: 'ellipse',
+                path: '/ansible/ansible_variables/14/edit',
                 defaultValue: ['seven', 'eight'],
                 parameterType: 'array',
                 ansibleRoleName: 'test.role',
@@ -227,6 +233,7 @@ export const mocks = [
                 },
                 id: 'MDE6QW5zaWJsZVZhcmlhYmxlLTY2Ng==',
                 key: 'spiral',
+                path: '/ansible/ansible_variables/15/edit',
                 defaultValue: { one: 'one', two: 'two' },
                 parameterType: 'hash',
                 ansibleRoleName: 'test.role',
@@ -246,6 +253,7 @@ export const mocks = [
                 },
                 id: 'MDE6QW5zaWJsZVZhcmlhYmxlLTY3Mg==',
                 key: 'sun',
+                path: '/ansible/ansible_variables/16/edit',
                 defaultValue: "{ one: 'one', two: 'two' }",
                 parameterType: 'json',
                 ansibleRoleName: 'test.role',
@@ -265,6 +273,7 @@ export const mocks = [
                 },
                 id: 'MDE6QW5zaWJsZVZhcmlhYmxlLTY3Mw==',
                 key: 'moon',
+                path: '/ansible/ansible_variables/17/edit',
                 defaultValue: [
                   { hosts: 'all', become: 'true', roles: ['foo'] },
                 ],

data/webpack/components/AnsibleHostDetail/components/AnsibleVariableOverrides/__test__/AnsibleVariableOverridesDelete.test.js

@@ -37,12 +37,12 @@ describe('AnsibleVariableOverrides', () => {
     userEvent.click(screen.getByText('Delete'));
     await waitFor(tick);
     expect(
-      screen.getByText('Delete Ansible Variable Override')
+      screen.getByText('Delete Ansible variable override')
     ).toBeInTheDocument();
     userEvent.click(screen.getByText('Cancel'));
     await waitFor(tick);
     expect(
-      screen.queryByText('Delete Ansible Variable Override')
+      screen.queryByText('Delete Ansible variable override')
     ).not.toBeInTheDocument();
   });
   it('should delete override', async () => {

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

@@ -41,7 +41,10 @@ const AnsibleVariableOverrides = ({ hostId, hostAttrs, history }) => {
       renameData={renameData}
       fetchFn={useFetchFn}
       renamedDataPath="variables"
-      emptyStateTitle={__('No Ansible Variables found for Host')}
+      emptyStateProps={{
+        header: __('No Ansible variables found for Host'),
+        description: __('Only variables marked to Override are shown here.'),
+      }}
       permissions={['view_ansible_variables']}
       pagination={pagination}
       history={history}

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

@@ -7,21 +7,36 @@ import { showToast } from '../../../../toastHelper';
 export const ansiblePurpose = (resourceName, resourceId) =>
   `ansible-${resourceName}-${resourceId}`;
 
-const jobSearch = (resourceName, resourceId, statusSearch) =>
-  `recurring = true && pattern_template_name = "Ansible Roles - Ansible Default" && ${statusSearch} && recurring_logic.purpose = ${ansiblePurpose(
+const jobSearch = (resourceName, resourceId, status, hostGroupId) => {
+  const search = `recurring = true && pattern_template_name = "Ansible Roles - Ansible Default"`;
+  const searchStatus = ` && ${status}`;
+  const searchHost = ` && recurring_logic.purpose = ${ansiblePurpose(
     resourceName,
     resourceId
   )}`;
+  const searchHostGroup = hostGroupId
+    ? ` or recurring_logic.purpose = ${ansiblePurpose(
+        'hostgroup',
+        hostGroupId
+      )}`
+    : '';
 
-export const scheduledJobsSearch = (resourceName, resourceId) =>
-  jobSearch(resourceName, resourceId, 'status = queued');
-export const previousJobsSearch = (resourceName, resourceId) =>
-  jobSearch(resourceName, resourceId, 'status != queued');
+  return search + searchStatus + searchHost + searchHostGroup;
+};
+
+export const scheduledJobsSearch = (resourceName, resourceId, hostGroupId) =>
+  jobSearch(resourceName, resourceId, 'status = queued', hostGroupId);
+export const previousJobsSearch = (resourceName, resourceId, hostGroupId) =>
+  jobSearch(resourceName, resourceId, 'status != queued', hostGroupId);
 
 const fetchJobsFn = (searchFn, pagination = {}) => componentProps =>
   useQuery(jobsQuery, {
     variables: {
-      search: searchFn(componentProps.resourceName, componentProps.resourceId),
+      search: searchFn(
+        componentProps.resourceName,
+        componentProps.resourceId,
+        componentProps.hostGroupId
+      ),
       ...pagination,
     },
   });
@@ -77,3 +92,30 @@ export const useCancelMutation = (resourceName, resourceId) =>
       },
     ],
   });
+
+export const readableCron = (cron = '') => {
+  if (cron.match(/(\d+ \* \* \* \*)/)) {
+    return 'hourly';
+  }
+
+  if (cron.match(/(\d+ \d+ \* \* \*)/)) {
+    return 'daily';
+  }
+
+  if (cron.match(/(\d+ \d+ \* \* \d+)/)) {
+    return 'weekly';
+  }
+
+  if (cron.match(/(\d+ \d+ \d+ \* \*)/)) {
+    return 'monthly';
+  }
+
+  return 'custom';
+};
+
+export const readablePurpose = (purpose = '') => {
+  if (window.location.href.match(/ansible\/hostgroup/)) {
+    return '';
+  }
+  return purpose.match(/hostgroup/) ? __('(from host group)') : '';
+};

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

@@ -17,6 +17,7 @@ import { Flex, FlexItem, Pagination } from '@patternfly/react-core';
 
 import { decodeId } from '../../../../globalIdHelper';
 import withLoading from '../../../withLoading';
+import { readableCron, readablePurpose } from './JobsTabHelper';
 import {
   preparePerPageOptions,
   refreshPage,
@@ -78,13 +79,15 @@ const PreviousJobsTable = ({ history, totalCount, jobs, pagination }) => {
                 >
                   {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>{job.recurringLogic.cronLine}</Td>
+              <Td>{readableCron(job.recurringLogic.cronLine)}</Td>
             </Tr>
           ))}
         </Tbody>

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/JobsTab/RecurringJobsTable.js

@@ -14,11 +14,20 @@ import {
   Td,
 } from '@patternfly/react-table';
 
-import { useCancelMutation } from './JobsTabHelper';
+import {
+  useCancelMutation,
+  readableCron,
+  readablePurpose,
+} from './JobsTabHelper';
 import withLoading from '../../../withLoading';
 import { decodeId } from '../../../../globalIdHelper';
 
-const RecurringJobsTable = ({ jobs, resourceName, resourceId }) => {
+const RecurringJobsTable = ({
+  jobs,
+  resourceName,
+  resourceId,
+  hostGroupId,
+}) => {
   const columns = [__('Description'), __('Schedule'), __('Next Run')];
   const dispatch = useDispatch();
 
@@ -73,8 +82,10 @@ const RecurringJobsTable = ({ jobs, resourceName, resourceId }) => {
                 >
                   {job.description}
                 </a>
+                &nbsp;
+                {readablePurpose(job.recurringLogic.purpose)}
               </Td>
-              <Td>{job.recurringLogic.cronLine}</Td>
+              <Td>{readableCron(job.recurringLogic.cronLine)}</Td>
               <Td>
                 <RelativeDateTime date={job.startAt} />
               </Td>
@@ -91,6 +102,11 @@ RecurringJobsTable.propTypes = {
   jobs: PropTypes.array.isRequired,
   resourceId: PropTypes.number.isRequired,
   resourceName: PropTypes.string.isRequired,
+  hostGroupId: PropTypes.number,
+};
+
+RecurringJobsTable.defaultProps = {
+  hostGroupId: undefined,
 };
 
 export default withLoading(RecurringJobsTable);

data/webpack/components/AnsibleHostDetail/components/JobsTab/__test__/JobsTab.fixtures.js

@@ -23,10 +23,12 @@ const viewer = userFactory('viewer', [
 
 const firstRecurringLogicGlobalId =
   'MDE6Rm9yZW1hblRhc2tzOjpSZWN1cnJpbmdMb2dpYy0x';
+
 const firstRecurringLogic = {
   __typename: 'ForemanTasks::RecurringLogic',
   id: firstRecurringLogicGlobalId,
   cronLine: toCron(futureDate, 'weekly'),
+  purpose: '',
   meta: {
     canEdit: true,
   },
@@ -66,6 +68,7 @@ export const secondJob = {
     __typename: 'ForemanTasks::RecurringLogic',
     id: 'MDE6Rm9yZW1hblRhc2tzOjpSZWN1cnJpbmdMb2dpYy0yMw==',
     cronLine: '54 10 15 * *',
+    purpose: '',
     meta: {
       canEdit: true,
     },

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

@@ -18,6 +18,7 @@ import {
 import * as toasts from '../../../../../toastHelper';
 
 import { toCron } from '../NewRecurringJobHelper';
+import { readableCron } from '../JobsTabHelper';
 
 import {
   tick,
@@ -49,8 +50,10 @@ describe('JobsTab', () => {
       .map(element => expect(element).toBeInTheDocument());
     expect(screen.getByText('Scheduled recurring jobs')).toBeInTheDocument();
     expect(screen.getByText('Previously executed jobs')).toBeInTheDocument();
-    expect(screen.getByText(toCron(futureDate, 'weekly'))).toBeInTheDocument();
-    expect(screen.getByText('54 10 15 * *')).toBeInTheDocument();
+    expect(
+      screen.getByText(readableCron(toCron(futureDate, 'weekly')))
+    ).toBeInTheDocument();
+    expect(screen.getByText('monthly')).toBeInTheDocument();
   });
   it('should show empty state', async () => {
     render(
@@ -129,7 +132,9 @@ describe('JobsTab', () => {
       message: 'Ansible job was successfully created.',
     });
     await waitFor(tick);
-    expect(screen.getByText(toCron(futureDate, 'weekly'))).toBeInTheDocument();
+    expect(
+      screen.getByText(readableCron(toCron(futureDate, 'weekly')))
+    ).toBeInTheDocument();
     expect(screen.getByText('in 3 days')).toBeInTheDocument();
     expect(
       screen.queryByText('No config job for Ansible roles scheduled')

data/webpack/components/AnsibleHostDetail/components/JobsTab/__test__/JobsTabHelper.test.js

@@ -0,0 +1,11 @@
+import { readableCron } from '../JobsTabHelper';
+
+describe('JobTabsHelper', () => {
+  it('readableCron', () => {
+    expect(readableCron('01 * * * *')).toBe('hourly');
+    expect(readableCron('01 01 * * *')).toBe('daily');
+    expect(readableCron('01 01 * * 01')).toBe('weekly');
+    expect(readableCron('01 01 01 * *')).toBe('monthly');
+    expect(readableCron()).toBe('custom');
+  });
+});

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

@@ -15,7 +15,7 @@ import RecurringJobsTable from './RecurringJobsTable';
 import PreviousJobsTable from './PreviousJobsTable';
 import NewRecurringJobModal from './NewRecurringJobModal';
 
-const JobsTab = ({ resourceName, resourceId, history }) => {
+const JobsTab = ({ resourceName, resourceId, hostGroupId, history }) => {
   const [modalOpen, setModalOpen] = useState(false);
   const toggleModal = () => setModalOpen(!modalOpen);
 
@@ -44,6 +44,7 @@ const JobsTab = ({ resourceName, resourceId, history }) => {
         <RecurringJobsTable
           resourceId={resourceId}
           resourceName={resourceName}
+          hostGroupId={hostGroupId}
           fetchFn={fetchRecurringFn}
           renameData={renameData}
           renamedDataPath="jobs"
@@ -59,6 +60,7 @@ const JobsTab = ({ resourceName, resourceId, history }) => {
         <PreviousJobsTable
           resourceId={resourceId}
           resourceName={resourceName}
+          hostGroupId={hostGroupId}
           fetchFn={fetchPreviousFn(useParamsToVars(history))}
           renameData={renameData}
           emptyWrapper={() => null}
@@ -81,8 +83,13 @@ const JobsTab = ({ resourceName, resourceId, history }) => {
 
 JobsTab.propTypes = {
   resourceName: PropTypes.string.isRequired,
+  hostGroupId: PropTypes.number,
   resourceId: PropTypes.number.isRequired,
   history: PropTypes.object.isRequired,
 };
 
+JobsTab.defaultProps = {
+  hostGroupId: undefined,
+};
+
 export default JobsTab;

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

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { useQuery } from '@apollo/client';
 import { translate as __ } from 'foremanReact/common/I18n';
 
-import { Modal, Button, ModalVariant } from '@patternfly/react-core';
+import { Modal, ModalVariant } from '@patternfly/react-core';
 
 import allAnsibleRolesQuery from '../../../../../graphql/queries/allAnsibleRoles.gql';
 import AllRolesTable from './AllRolesTable';
@@ -17,25 +17,19 @@ const AllRolesModal = ({ hostGlobalId, onClose, history }) => {
   const baseModalProps = {
     variant: ModalVariant.large,
     isOpen: true,
+    onClose,
     className: 'foreman-modal',
-    showClose: false,
-    title: __('All Ansible Roles'),
+    showClose: true,
+    title: __('All assigned Ansible roles'),
     disableFocusTrap: true,
+    description: __(
+      'This list consists of host assigned roles and group assigned roles. Group assigned roles will always be executed prior to host assigned roles'
+    ),
   };
 
   const paginationKeys = { page: 'allPage', perPage: 'allPerPage' };
 
-  const actions = [
-    <Button variant="link" onClick={onClose} key="close">
-      {__('Close')}
-    </Button>,
-  ];
-
-  const wrapper = child => (
-    <Modal {...baseModalProps} actions={actions}>
-      {child}
-    </Modal>
-  );
+  const wrapper = child => <Modal {...baseModalProps}>{child}</Modal>;
 
   const loadingWrapper = child => <Modal {...baseModalProps}>{child}</Modal>;
 

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

@@ -2,7 +2,7 @@ import React from 'react';
 import { translate as __ } from 'foremanReact/common/I18n';
 import PropTypes from 'prop-types';
 
-import { Modal, Button, ModalVariant } from '@patternfly/react-core';
+import { Modal, Button } from '@patternfly/react-core';
 import { useQuery } from '@apollo/client';
 
 import EditRolesForm from './EditRolesForm';
@@ -20,12 +20,15 @@ const EditRolesModal = ({
   canEditHost,
 }) => {
   const baseModalProps = {
-    variant: ModalVariant.large,
+    width: '70%',
     isOpen,
     className: 'foreman-modal',
     showClose: false,
     title: __('Edit Ansible Roles'),
     disableFocusTrap: true,
+    description: __(
+      'Add, remove or reorder host assigned Ansible roles. This host has also group assigned roles that are not displayed here and will always be executed prior to host assigned roles'
+    ),
   };
 
   const actions = [

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

@@ -48,7 +48,7 @@ const RolesTable = ({
     <FlexItem>
       <Link to="/Ansible/roles/edit">
         <Button aria-label="edit ansible roles">
-          {__('Edit Ansible Roles')}
+          {__('Edit Ansible roles')}
         </Button>
       </Link>
     </FlexItem>
@@ -90,7 +90,9 @@ const RolesTable = ({
         <Tbody>
           {ansibleRoles.map(role => (
             <Tr key={role.id}>
-              <Td>{role.name}</Td>
+              <Td>
+                <a href={role.path}>{role.name}</a>
+              </Td>
             </Tr>
           ))}
         </Tbody>

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

@@ -39,7 +39,7 @@ describe('assigning Ansible roles', () => {
     userEvent.click(screen.getByRole('button', { name: 'edit ansible roles' }));
     await waitFor(tick);
     await waitFor(tick);
-    expect(screen.getByText('Available options')).toBeInTheDocument();
+    expect(screen.getByText('Available Ansible roles')).toBeInTheDocument();
     userEvent.click(screen.getAllByText('another.role')[1]);
     userEvent.click(screen.getByRole('button', { name: 'Remove selected' }));
     userEvent.click(screen.getByText('geerlingguy.ceylon'));
@@ -67,7 +67,7 @@ describe('assigning Ansible roles', () => {
     await waitFor(tick);
     userEvent.click(screen.getByRole('button', { name: 'edit ansible roles' }));
     await waitFor(tick);
-    expect(screen.getByText('Available options')).toBeInTheDocument();
+    expect(screen.getByText('Available Ansible roles')).toBeInTheDocument();
     userEvent.click(screen.getAllByText('another.role')[1]);
     userEvent.click(screen.getByRole('button', { name: 'Remove selected' }));
     userEvent.click(screen.getByText('geerlingguy.ceylon'));

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

@@ -34,24 +34,28 @@ const role1 = {
   __typename: 'AnsibleRole',
   id: 'MDE6QW5zaWJsZVJvbGUtMw==',
   name: 'aardvaark.cube',
+  path: '/ansible/ansible_roles/search="name = aardvaark.cube"',
 };
 
 const role2 = {
   __typename: 'AnsibleRole',
   id: 'MDE6QW5zaWJsZVJvbGUtNQ==',
   name: 'aardvaark.sphere',
+  path: '/ansible/ansible_roles/search="name = aardvaark.sphere"',
 };
 
 const role3 = {
   __typename: 'AnsibleRole',
   id: 'MDE6QW5zaWJsZVJvbGUtMzA=',
   name: 'another.role',
+  path: '/ansible/ansible_roles/search="name = another.role"',
 };
 
 const role4 = {
   __typename: 'AnsibleRole',
   id: 'MDE6QW5zaWJsZVJvbGUtMzk=',
   name: 'geerlingguy.ceylon',
+  path: '/ansible/ansible_roles/search="name = geerlingguy.ceylon"',
 };
 
 const ansibleRolesMock = {
@@ -71,26 +75,32 @@ const availableRoles = {
       __typename: 'AnsibleRole',
       id: 'MDE6QW5zaWJsZVJvbGUtMQ==',
       name: 'theforeman.foreman_scap_client',
+      path:
+        '/ansible/ansible_roles/search="name = theforeman.foreman_scap_client"',
     },
     {
       __typename: 'AnsibleRole',
       id: 'MDE6QW5zaWJsZVJvbGUtMg==',
       name: 'adriagalin.motd',
+      path: '/ansible/ansible_roles/search="name = adriagalin.motd"',
     },
     {
       __typename: 'AnsibleRole',
       id: 'MDE6QW5zaWJsZVJvbGUtMjI=',
       name: 'geerlingguy.php',
+      path: '/ansible/ansible_roles/search="name = geerlingguy.php"',
     },
     {
       __typename: 'AnsibleRole',
       id: 'MDE6QW5zaWJsZVJvbGUtNTc=',
       name: 'robertdebock.epel',
+      path: '/ansible/ansible_roles/search="name = robertdebock.epel"',
     },
     {
       __typename: 'AnsibleRole',
       id: 'MDE6QW5zaWJsZVJvbGUtNTg=',
       name: 'geerlingguy.nfs',
+      path: '/ansible/ansible_roles/search="name = geerlingguy.nfs"',
     },
   ],
 };
@@ -106,6 +116,7 @@ export const allRolesMocks = allAnsibleRolesMockFactory(
         {
           id: 'MDE6QW5zaWJsZVJvbGUtMg==',
           name: 'adriagalin.motd',
+          path: '/ansible/ansible_roles/search="name = adriagalin.motd"',
           inherited: true,
         },
         { ...role1, inherited: false },

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

@@ -38,14 +38,18 @@ describe('RolesTab', () => {
     );
     await waitFor(tick);
     expect(screen.getByText('view all assigned roles')).toBeInTheDocument();
-    expect(screen.queryByText('All Ansible Roles')).not.toBeInTheDocument();
+    expect(
+      screen.queryByText('All assigned Ansible roles')
+    ).not.toBeInTheDocument();
     userEvent.click(screen.getByText('view all assigned roles'));
     await waitFor(tick);
-    expect(screen.getByText('All Ansible Roles')).toBeInTheDocument();
+    expect(screen.getByText('All assigned Ansible roles')).toBeInTheDocument();
     expect(screen.getByText('Inherited from Hostgroup')).toBeInTheDocument();
     userEvent.click(screen.getByRole('button', { name: 'Close' }));
     await waitFor(tick);
-    expect(screen.queryByText('All Ansible Roles')).not.toBeInTheDocument();
+    expect(
+      screen.queryByText('All assigned Ansible roles')
+    ).not.toBeInTheDocument();
   });
   it('should load Ansible Roles as viewer', async () => {
     render(

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

@@ -1,6 +1,7 @@
-import React from 'react';
+import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import { useQuery } from '@apollo/client';
+import { Button } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 
 import ansibleRolesQuery from '../../../../graphql/queries/hostAnsibleRoles.gql';
@@ -10,11 +11,12 @@ import {
   useParamsToVars,
   useCurrentPagination,
 } from '../../../../helpers/pageParamsHelper';
+import EditRolesModal from './EditRolesModal';
 
 const RolesTab = ({ hostId, history, canEditHost }) => {
   const hostGlobalId = encodeId('Host', hostId);
   const pagination = useCurrentPagination(history);
-
+  const [assignModal, setAssignModal] = useState(false);
   const renameData = data => ({
     ansibleRoles: data.host.ownAnsibleRoles.nodes,
     totalCount: data.host.ownAnsibleRoles.totalCount,
@@ -26,19 +28,41 @@ const RolesTab = ({ hostId, history, canEditHost }) => {
       fetchPolicy: 'network-only',
     });
 
+  const editBtn = canEditHost ? (
+    <Button
+      onClick={() => setAssignModal(true)}
+      aria-label="edit ansible roles"
+    >
+      {__('Assign Ansible roles')}
+    </Button>
+  ) : null;
   return (
-    <RolesTable
-      fetchFn={useFetchFn}
-      renamedDataPath="ansibleRoles"
-      renameData={renameData}
-      permissions={['view_ansible_roles']}
-      history={history}
-      hostGlobalId={hostGlobalId}
-      emptyStateProps={{ title: __('No Ansible roles assigned') }}
-      pagination={pagination}
-      canEditHost={canEditHost}
-      hostId={hostId}
-    />
+    <>
+      <RolesTable
+        fetchFn={useFetchFn}
+        renamedDataPath="ansibleRoles"
+        renameData={renameData}
+        permissions={['view_ansible_roles']}
+        history={history}
+        hostGlobalId={hostGlobalId}
+        emptyStateProps={{
+          header: __('No Ansible roles assigned'),
+          action: editBtn,
+        }}
+        pagination={pagination}
+        canEditHost={canEditHost}
+        hostId={hostId}
+      />
+      {assignModal && (
+        <EditRolesModal
+          closeModal={() => setAssignModal(false)}
+          isOpen={assignModal}
+          assignedRoles={[]}
+          hostId={hostId}
+          canEditHost={canEditHost}
+        />
+      )}
+    </>
   );
 };
 

data/webpack/components/AnsibleHostDetail/components/SecondaryTabRoutes.js

@@ -44,6 +44,7 @@ const SecondaryTabRoutes = ({ response, router, history }) => (
         <JobsTab
           resourceId={response.id}
           resourceName="host"
+          hostGroupId={response.hostgroup_id}
           history={history}
         />
       </TabLayout>

data/webpack/components/DualList/index.js

@@ -63,7 +63,7 @@ const DualList = props => {
   return (
     <div className="pf-c-dual-list-selector">
       <ListPane
-        title={__('Available options')}
+        title={__('Available Ansible roles')}
         items={props.availableOptions}
         paneClass="pf-m-available"
         onItemClick={onItemClick('availableSelected')}
@@ -81,7 +81,7 @@ const DualList = props => {
         removeSelectedDisabled={selectState.chosenSelected.length === 0}
       />
       <ListPane
-        title={__('Chosen options')}
+        title={__('Host assigned Ansible roles')}
         items={props.chosenOptions}
         paneClass="pf-m-chosen"
         draggable

data/webpack/formHelper.js

@@ -7,7 +7,7 @@ import {
   DatePicker,
   TimePicker,
 } from '@patternfly/react-core';
-import ExclamationCircleIcon from '@patternfly/react-icons/dist/js/icons/exclamation-circle-icon';
+import { ExclamationCircleIcon } from '@patternfly/react-icons';
 
 const wrapFieldProps = fieldProps => {
   const { onChange } = fieldProps;

data/webpack/graphql/queries/hostAnsibleRoles.gql

@@ -8,6 +8,7 @@ query($id: String!, $first: Int, $last: Int) {
       nodes {
         id
         name
+        path
       }
     }
   }

data/webpack/graphql/queries/hostVariableOverrides.gql

@@ -8,6 +8,7 @@ query($id: String!, $match: String, $first: Int, $last: Int) {
       nodes {
         id
         key
+        path
         meta {
           canEdit
         }

data/webpack/graphql/queries/recurringJobs.gql

@@ -14,6 +14,7 @@ query($search: String, $first: Int, $last: Int) {
         meta {
           canEdit
         }
+        purpose
       }
       task {
         id

data/webpack/routes/HostgroupJobs/__test__/HostgroupJobs.test.js

@@ -24,6 +24,7 @@ import {
 } from '../../../testHelper';
 
 import { toCron } from '../../../components/AnsibleHostDetail/components/JobsTab/NewRecurringJobHelper';
+import { readableCron } from '../../../components/AnsibleHostDetail/components/JobsTab/JobsTabHelper';
 
 const TestComponent = withRedux(withRouter(withMockedProvider(HostgroupJobs)));
 
@@ -46,7 +47,7 @@ describe('HostgroupJobs', () => {
       .map(element => expect(element).toBeInTheDocument());
     expect(screen.getByText('Scheduled recurring jobs')).toBeInTheDocument();
     expect(screen.getByText('Previously executed jobs')).toBeInTheDocument();
-    expect(screen.getByText('54 10 15 * *')).toBeInTheDocument();
+    expect(screen.getByText(readableCron('54 10 15 * *'))).toBeInTheDocument();
   });
   it('should show empty state', async () => {
     render(
@@ -103,7 +104,9 @@ describe('HostgroupJobs', () => {
       type: 'success',
       message: 'Ansible job was successfully created.',
     });
-    expect(screen.getByText(toCron(futureDate, 'weekly'))).toBeInTheDocument();
+    expect(
+      screen.getByText(readableCron(toCron(futureDate, 'weekly')))
+    ).toBeInTheDocument();
     expect(screen.getByText('in 3 days')).toBeInTheDocument();
     expect(
       screen.queryByText('No config job for Ansible roles scheduled')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.0.3
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-07 00:00:00.000000000 Z
+date: 2022-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -101,6 +101,8 @@ files:
 - app/graphql/mutations/hosts/assign_ansible_roles.rb
 - app/graphql/presenters/ansible_role_presenter.rb
 - app/graphql/presenters/overriden_ansible_variable_presenter.rb
+- app/graphql/resolvers/ansible_role/path.rb
+- app/graphql/resolvers/ansible_variable/path.rb
 - app/graphql/types/ansible_role.rb
 - app/graphql/types/ansible_variable.rb
 - app/graphql/types/ansible_variable_override.rb
@@ -325,9 +327,11 @@ 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
+- webpack/components/AnsibleHostDetail/components/JobsTab/__test__/JobsTabHelper.test.js
 - webpack/components/AnsibleHostDetail/components/JobsTab/index.js
 - webpack/components/AnsibleHostDetail/components/RolesTab/AllRolesModal/AllRolesTable.js
 - webpack/components/AnsibleHostDetail/components/RolesTab/AllRolesModal/index.js
@@ -445,50 +449,50 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Ansible integration with Foreman (theforeman.org)
 test_files:
-- test/functional/ansible_variables_controller_test.rb
-- test/functional/ansible_roles_controller_test.rb
-- test/functional/api/v2/ansible_variables_controller_test.rb
+- test/functional/api/v2/hosts_controller_test.rb
 - test/functional/api/v2/ansible_roles_controller_test.rb
 - test/functional/api/v2/hostgroups_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/hosts_controller_test.rb
-- test/functional/ui_ansible_roles_controller_test.rb
 - test/functional/hosts_controller_test.rb
-- test/graphql/mutations/hosts/assign_ansible_roles_mutation_test.rb
-- test/graphql/queries/ansible_roles_query_test.rb
-- test/foreman_ansible/helpers/ansible_roles_helper_test.rb
-- test/unit/actions/run_ansible_job_test.rb
-- test/unit/actions/run_proxy_ansible_command_test.rb
-- test/unit/services/api_roles_importer_test.rb
-- test/unit/services/ui_roles_importer_test.rb
+- test/functional/ansible_roles_controller_test.rb
+- test/functional/ansible_variables_controller_test.rb
+- test/functional/ui_ansible_roles_controller_test.rb
+- test/unit/services/inventory_creator_test.rb
 - test/unit/services/ansible_report_importer_test.rb
-- test/unit/services/insights_plan_runner_test.rb
-- test/unit/services/override_resolver_test.rb
+- test/unit/services/ui_roles_importer_test.rb
 - test/unit/services/roles_importer_test.rb
-- test/unit/services/inventory_creator_test.rb
 - test/unit/services/ansible_variables_importer_test.rb
-- test/unit/lib/proxy_api/ansible_test.rb
+- test/unit/services/override_resolver_test.rb
+- test/unit/services/api_roles_importer_test.rb
+- test/unit/services/insights_plan_runner_test.rb
 - test/unit/ansible_role_test.rb
-- test/unit/hostgroup_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/helpers/ansible_reports_helper_test.rb
 - test/unit/ansible_provider_test.rb
-- test/unit/ignore_roles_test.rb
-- test/unit/import_roles_and_variables.rb
-- test/unit/concerns/config_reports_extensions_test.rb
 - test/unit/concerns/host_managed_extensions_test.rb
+- test/unit/concerns/config_reports_extensions_test.rb
 - test/unit/concerns/hostgroup_extensions_test.rb
+- test/unit/ignore_roles_test.rb
+- test/unit/ansible_variable_test.rb
+- test/unit/import_roles_and_variables.rb
+- test/unit/lib/proxy_api/ansible_test.rb
+- test/unit/actions/run_ansible_job_test.rb
+- test/unit/actions/run_proxy_ansible_command_test.rb
+- test/foreman_ansible/helpers/ansible_roles_helper_test.rb
+- test/test_plugin_helper.rb
 - test/factories/ansible_proxy.rb
-- test/factories/host_ansible_enhancements.rb
 - test/factories/ansible_variables.rb
+- test/factories/host_ansible_enhancements.rb
 - test/factories/ansible_roles.rb
 - test/fixtures/report.json
 - test/fixtures/sample_facts.json
 - test/fixtures/insights_playbook.yaml
-- test/test_plugin_helper.rb
+- test/graphql/mutations/hosts/assign_ansible_roles_mutation_test.rb
+- test/graphql/queries/ansible_roles_query_test.rb