foreman_ansible 7.1.0 → 7.1.1

data/test/graphql/queries/host_ansible_roles_query_test.rb

@@ -0,0 +1,61 @@
+require 'test_plugin_helper'
+
+module Queries
+  class HostAnsibleRolesQueryTest < GraphQLQueryTestCase
+    let(:role1) { FactoryBot.create(:ansible_role) }
+    let(:role2) { FactoryBot.create(:ansible_role) }
+    let(:hostgroup) { FactoryBot.create(:hostgroup, ansible_roles: [role1]) }
+    let(:host) { FactoryBot.create(:host, hostgroup: hostgroup, ansible_roles: [role2]) }
+    let(:variables) { { id: Foreman::GlobalId.for(host) } }
+    let(:query) do
+      <<-GRAPHQL
+      query ($id: String!) {
+        host(id: $id) {
+          id
+          allAnsibleRoles {
+            totalCount
+            nodes {
+              id
+              name
+              inherited
+              ansibleVariables {
+                totalCount
+                nodes {
+                  key
+                  override
+                }
+              }
+            }
+          }
+        }
+      }
+      GRAPHQL
+    end
+
+    context 'with admin permissions' do
+      let(:context_user) { FactoryBot.create(:user, :admin) }
+      let(:data) { result['data']['host']['allAnsibleRoles'] }
+
+      it 'allows to fetch inherited roles' do
+        value(data['totalCount']).must_equal(2)
+        r1_data = data['nodes'].first
+        r2_data = data['nodes'].second
+        value(r1_data['name']).must_equal(role1.name)
+        value(r1_data['inherited']).must_equal(true)
+        value(r2_data['name']).must_equal(role2.name)
+        value(r2_data['inherited']).must_equal(false)
+      end
+
+      it 'allow fetching variables' do
+        var1 = FactoryBot.create(:ansible_variable, ansible_role: role1, override: true)
+        FactoryBot.create(:ansible_variable, ansible_role: role1)
+        FactoryBot.create(:ansible_variable, ansible_role: role2, override: true)
+        r1_vars = data['nodes'].first['ansibleVariables']
+        r2_vars = data['nodes'].second['ansibleVariables']
+        value(r1_vars['totalCount']).must_equal(2)
+        value(r2_vars['totalCount']).must_equal(1)
+        value(r1_vars['nodes'].first['key']).must_equal(var1.key)
+      end
+    end
+  end
+end

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/EditRolesModal/EditRolesForm.js

@@ -1,7 +1,7 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState } from 'react';
 import { translate as __ } from 'foremanReact/common/I18n';
 import PropTypes from 'prop-types';
-
+import { isEqual } from 'lodash';
 import { useMutation } from '@apollo/client';
 
 import { Button, Modal, Spinner } from '@patternfly/react-core';
@@ -21,17 +21,15 @@ const EditRolesForm = props => {
     actions,
   } = props;
 
-  const [formState, setFormState] = useState({
-    availableOptions: [],
-    chosenOptions: [],
-  });
+  const initAvailableOpt = availableRoles.map(item => item.name);
+  const initChosenOpt = assignedRoles.map(item => item.name);
+  const [availableOptions, setAvailableOptions] = useState(initAvailableOpt);
+  const [chosenOptions, setChosenOptions] = useState(initChosenOpt);
 
-  useEffect(() => {
-    setFormState({
-      availableOptions: availableRoles.map(item => item.name),
-      chosenOptions: assignedRoles.map(item => item.name) || [],
-    });
-  }, [availableRoles, assignedRoles]);
+  const onListChange = (nextAvailable, nextChosen) => {
+    setAvailableOptions(nextAvailable);
+    setChosenOptions(nextChosen);
+  };
 
   const [callMutation, { loading }] = useMutation(assignAnsibleRoles, {
     onCompleted: onCompleted(closeModal),
@@ -42,15 +40,19 @@ const EditRolesForm = props => {
 
   const variables = {
     id: encodeId('Host', hostId),
-    ansibleRoleIds: roleNamesToIds(allRoles, formState.chosenOptions),
+    ansibleRoleIds: roleNamesToIds(allRoles, chosenOptions),
   };
 
+  const didNotModifyOptions = () =>
+    isEqual(initAvailableOpt.sort(), availableOptions.sort()) &&
+    isEqual(initChosenOpt, chosenOptions); // The order of the chosen options is important.
+
   const formActions = [
     <Button
       key="confirm"
       variant="primary"
       onClick={() => callMutation({ variables })}
-      isDisabled={loading}
+      isDisabled={loading || didNotModifyOptions()}
       aria-label="submit ansible roles"
     >
       {__('Confirm')}
@@ -65,14 +67,9 @@ const EditRolesForm = props => {
   return (
     <Modal {...baseModalProps} actions={formActions}>
       <DualList
-        availableOptions={formState.availableOptions}
-        chosenOptions={formState.chosenOptions}
-        onListChange={(newAvailable, newChosen) =>
-          setFormState({
-            availableOptions: newAvailable,
-            chosenOptions: newChosen,
-          })
-        }
+        availableOptions={availableOptions}
+        chosenOptions={chosenOptions}
+        onListChange={onListChange}
       />
     </Modal>
   );
@@ -80,11 +77,16 @@ const EditRolesForm = props => {
 
 EditRolesForm.propTypes = {
   closeModal: PropTypes.func.isRequired,
-  assignedRoles: PropTypes.array.isRequired,
-  availableRoles: PropTypes.array.isRequired,
+  assignedRoles: PropTypes.array,
+  availableRoles: PropTypes.array,
   actions: PropTypes.array.isRequired,
   hostId: PropTypes.number.isRequired,
   baseModalProps: PropTypes.object.isRequired,
 };
 
+EditRolesForm.defaultProps = {
+  assignedRoles: [],
+  availableRoles: [],
+};
+
 export default withLoading(EditRolesForm);

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

@@ -20,7 +20,7 @@ const EditRolesModal = ({
   canEditHost,
 }) => {
   const baseModalProps = {
-    width: '70%',
+    width: '50%',
     isOpen,
     className: 'foreman-modal',
     showClose: false,

data/webpack/components/AnsibleRolesSwitcher/__tests__/AnsibleRolesSwitcher.test.js

@@ -2,8 +2,6 @@ import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import AnsibleRolesSwitcher from '../AnsibleRolesSwitcher';
 
-jest.mock('foremanReact/components/Pagination/PaginationWrapper');
-
 const noop = () => {};
 
 const fixtures = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 7.1.0
+  version: 7.1.1
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-14 00:00:00.000000000 Z
+date: 2022-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -229,43 +229,79 @@ files:
 - 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
@@ -289,6 +325,7 @@ files:
 - 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
@@ -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,54 +496,55 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.4
+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/ansible_playbooks_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_playbooks_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/import_playbooks_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_playbooks_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/playbooks_example_output.json
 - test/fixtures/report.json
 - test/fixtures/sample_facts.json
 - test/fixtures/insights_playbook.yaml
-- test/fixtures/playbooks_example_output.json
 - test/fixtures/sample_playbooks.json
-- test/test_plugin_helper.rb
+- test/graphql/mutations/hosts/assign_ansible_roles_mutation_test.rb
+- test/graphql/queries/host_ansible_roles_query_test.rb
+- test/graphql/queries/ansible_roles_query_test.rb