foreman_ansible 7.1.0 → 8.0.0

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/AllRolesModal/AllRolesTable.js

@@ -15,7 +15,7 @@ import Pagination from 'foremanReact/components/Pagination';
 import withLoading from '../../../../withLoading';
 
 const AllRolesTable = ({ allAnsibleRoles, totalCount }) => {
-  const columns = [__('Name'), __('Source')];
+  const columns = [__('Name'), __('Variables'), __('Source')];
 
   return (
     <React.Fragment>
@@ -37,6 +37,16 @@ const AllRolesTable = ({ allAnsibleRoles, totalCount }) => {
               <Tr key={`${role.id}-all`} id={role.id}>
                 <Td />
                 <Td>{role.name}</Td>
+                <Td>
+                  <a
+                    href={`/ansible/ansible_variables?search=ansible_role=${role.name}`}
+                    target="_blank"
+                    rel="noreferrer"
+                  >
+                    {role.ansibleVariables.totalCount}
+                  </a>
+                </Td>
+
                 <Td>
                   {role.inherited
                     ? __('Inherited from Hostgroup')

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

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState } from 'react';
 import { translate as __ } from 'foremanReact/common/I18n';
 import PropTypes from 'prop-types';
 
@@ -21,17 +21,17 @@ const EditRolesForm = props => {
     actions,
   } = props;
 
-  const [formState, setFormState] = useState({
-    availableOptions: [],
-    chosenOptions: [],
-  });
+  const [availableOptions, setAvailableOptions] = useState(
+    availableRoles.map(item => item.name)
+  );
+  const [chosenOptions, setChosenOptions] = useState(
+    assignedRoles.map(item => item.name)
+  );
 
-  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,7 +42,7 @@ const EditRolesForm = props => {
 
   const variables = {
     id: encodeId('Host', hostId),
-    ansibleRoleIds: roleNamesToIds(allRoles, formState.chosenOptions),
+    ansibleRoleIds: roleNamesToIds(allRoles, chosenOptions),
   };
 
   const formActions = [
@@ -65,14 +65,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 +75,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

@@ -54,6 +54,7 @@ const EditRolesModal = ({
 
   const renameData = data => ({
     availableRoles: data.host.availableAnsibleRoles.nodes,
+    assignedRoles,
   });
 
   return (
@@ -64,7 +65,7 @@ const EditRolesModal = ({
       baseModalProps={baseModalProps}
       fetchFn={useFetchFn}
       renameData={renameData}
-      renamedDataPath="availableRoles"
+      renamedDataPath="availableRoles.assignedRoles"
       assignedRoles={assignedRoles}
       closeModal={closeModal}
       hostId={hostId}

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

@@ -27,7 +27,7 @@ const RolesTable = ({
   hostGlobalId,
   canEditHost,
 }) => {
-  const columns = [__('Name')];
+  const columns = [__('Name'), __('Variables')];
 
   const editBtn = canEditHost ? (
     <FlexItem>
@@ -72,6 +72,15 @@ const RolesTable = ({
                   <Td>
                     <a href={role.path}>{role.name}</a>
                   </Td>
+                  <Td>
+                    <a
+                      href={`/ansible/ansible_variables?search=ansible_role=${role.name}`}
+                      target="_blank"
+                      rel="noreferrer"
+                    >
+                      {role.ansibleVariables.totalCount}
+                    </a>
+                  </Td>
                 </Tr>
               ))}
             </Tbody>

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

@@ -35,6 +35,9 @@ const role1 = {
   id: 'MDE6QW5zaWJsZVJvbGUtMw==',
   name: 'aardvaark.cube',
   path: '/ansible/ansible_roles/search="name = aardvaark.cube"',
+  ansibleVariables: {
+    totalCount: 1,
+  },
 };
 
 const role2 = {
@@ -42,6 +45,9 @@ const role2 = {
   id: 'MDE6QW5zaWJsZVJvbGUtNQ==',
   name: 'aardvaark.sphere',
   path: '/ansible/ansible_roles/search="name = aardvaark.sphere"',
+  ansibleVariables: {
+    totalCount: 2,
+  },
 };
 
 const role3 = {
@@ -49,6 +55,9 @@ const role3 = {
   id: 'MDE6QW5zaWJsZVJvbGUtMzA=',
   name: 'another.role',
   path: '/ansible/ansible_roles/search="name = another.role"',
+  ansibleVariables: {
+    totalCount: 3,
+  },
 };
 
 const role4 = {
@@ -56,6 +65,9 @@ const role4 = {
   id: 'MDE6QW5zaWJsZVJvbGUtMzk=',
   name: 'geerlingguy.ceylon',
   path: '/ansible/ansible_roles/search="name = geerlingguy.ceylon"',
+  ansibleVariables: {
+    totalCount: 4,
+  },
 };
 
 const ansibleRolesMock = {
@@ -77,30 +89,45 @@ const availableRoles = {
       name: 'theforeman.foreman_scap_client',
       path:
         '/ansible/ansible_roles/search="name = theforeman.foreman_scap_client"',
+      ansibleVariables: {
+        totalCount: 23,
+      },
     },
     {
       __typename: 'AnsibleRole',
       id: 'MDE6QW5zaWJsZVJvbGUtMg==',
       name: 'adriagalin.motd',
       path: '/ansible/ansible_roles/search="name = adriagalin.motd"',
+      ansibleVariables: {
+        totalCount: 23,
+      },
     },
     {
       __typename: 'AnsibleRole',
       id: 'MDE6QW5zaWJsZVJvbGUtMjI=',
       name: 'geerlingguy.php',
       path: '/ansible/ansible_roles/search="name = geerlingguy.php"',
+      ansibleVariables: {
+        totalCount: 23,
+      },
     },
     {
       __typename: 'AnsibleRole',
       id: 'MDE6QW5zaWJsZVJvbGUtNTc=',
       name: 'robertdebock.epel',
       path: '/ansible/ansible_roles/search="name = robertdebock.epel"',
+      ansibleVariables: {
+        totalCount: 23,
+      },
     },
     {
       __typename: 'AnsibleRole',
       id: 'MDE6QW5zaWJsZVJvbGUtNTg=',
       name: 'geerlingguy.nfs',
       path: '/ansible/ansible_roles/search="name = geerlingguy.nfs"',
+      ansibleVariables: {
+        totalCount: 23,
+      },
     },
   ],
 };
@@ -118,6 +145,9 @@ export const allRolesMocks = allAnsibleRolesMockFactory(
           name: 'adriagalin.motd',
           path: '/ansible/ansible_roles/search="name = adriagalin.motd"',
           inherited: true,
+          ansibleVariables: {
+            totalCount: 23,
+          },
         },
         { ...role1, inherited: false },
         { ...role2, inherited: 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 = {

data/webpack/components/AnsibleRolesSwitcher/components/AnsibleRole.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { ListView, Tooltip, OverlayTrigger } from 'patternfly-react';
+import { ListView } from 'patternfly-react';
+import { Tooltip } from '@patternfly/react-core';
 import classNames from 'classnames';
 import { translate as __ } from 'foremanReact/common/I18n';
 
@@ -13,12 +14,6 @@ const AnsibleRole = ({ role, icon, onClick, resourceName, index }) => {
       ? __('This Ansible role is inherited from parent host group')
       : __('This Ansible role is inherited from host group');
 
-  const tooltip = (
-    <Tooltip id={role.id}>
-      <span>{text}</span>
-    </Tooltip>
-  );
-
   const clickHandler = (onClickFn, ansibleRole) => event => {
     event.preventDefault();
     onClickFn(ansibleRole);
@@ -48,11 +43,7 @@ const AnsibleRole = ({ role, icon, onClick, resourceName, index }) => {
   );
 
   if (role.inherited) {
-    return (
-      <OverlayTrigger overlay={tooltip} placement="top">
-        {listItem()}
-      </OverlayTrigger>
-    );
+    return <Tooltip content={<span>{text}</span>}>{listItem()}</Tooltip>;
   }
 
   return listItem(clickHandler);

data/webpack/components/AnsibleRolesSwitcher/components/OrderedRolesTooltip.js

@@ -1,22 +1,21 @@
 import React from 'react';
 import { translate as __ } from 'foremanReact/common/I18n';
-import { Tooltip, Icon, OverlayTrigger } from 'patternfly-react';
+import { Tooltip } from '@patternfly/react-core';
+import { InfoCircleIcon } from '@patternfly/react-icons';
 
 const OrderedRolesTooltip = props => {
-  const tooltip = (
-    <Tooltip id="assigned-ansible-roles-tooltip">
-      <span>
-        {__(
-          'Use drag and drop to change order of the roles. Ordering of roles is respected for Ansible runs, inherited roles are always before those assigned directly'
-        )}
-      </span>
-    </Tooltip>
+  const content = (
+    <span>
+      {__(
+        'Use drag and drop to change order of the roles. Ordering of roles is respected for Ansible runs, inherited roles are always before those assigned directly'
+      )}
+    </span>
   );
 
   return (
-    <OverlayTrigger overlay={tooltip} trigger={['hover', 'focus']}>
-      <Icon type="pf" name="info" style={{ 'margin-right': '10px' }} />
-    </OverlayTrigger>
+    <Tooltip content={content}>
+      <InfoCircleIcon style={{ marginRight: '10px' }} />
+    </Tooltip>
   );
 };
 

data/webpack/components/AnsibleRolesSwitcher/components/__snapshots__/AnsibleRole.test.js.snap

@@ -65,25 +65,11 @@ exports[`AnsibleRole should render a role to remove 1`] = `
 `;
 
 exports[`AnsibleRole should render inherited role to remove 1`] = `
-<OverlayTrigger
-  defaultOverlayShown={false}
-  overlay={
-    <Tooltip
-      bsClass="tooltip"
-      id={5}
-      placement="right"
-    >
-      <span>
-        This Ansible role is inherited from host group
-      </span>
-    </Tooltip>
-  }
-  placement="top"
-  trigger={
-    Array [
-      "hover",
-      "focus",
-    ]
+<Tooltip
+  content={
+    <span>
+      This Ansible role is inherited from host group
+    </span>
   }
 >
   <ListViewItem
@@ -104,5 +90,5 @@ exports[`AnsibleRole should render inherited role to remove 1`] = `
     onExpandClose={[Function]}
     stacked={true}
   />
-</OverlayTrigger>
+</Tooltip>
 `;

data/webpack/components/withLoading.js

@@ -13,14 +13,12 @@ import {
 } from '../permissionsHelper';
 import ErrorState from './ErrorState';
 
-const pluckData = (data, path) => {
+const getResultsLength = (data, path) => {
   const split = path.split('.');
-  return split.reduce((memo, item) => {
-    if (item) {
-      return memo[item];
-    }
-    throw new Error('Unexpected empty segment in response data path');
-  }, data);
+  return split.reduce(
+    (prevValue, currentValue) => prevValue + data[currentValue]?.length || 0,
+    0
+  );
 };
 
 const withLoading = Component => {
@@ -79,12 +77,9 @@ const withLoading = Component => {
     }
 
     const renamedData = renameData(data);
-    const result = pluckData(renamedData, renamedDataPath);
+    const resultLength = getResultsLength(renamedData, renamedDataPath);
 
-    if (
-      showEmptyState &&
-      ((Array.isArray(result) && result.length === 0) || !result)
-    ) {
+    if (showEmptyState && !resultLength) {
       return emptyWrapper(
         <EmptyState
           {...{

data/webpack/graphql/queries/allAnsibleRoles.gql

@@ -7,6 +7,9 @@ query($id: String!, $first: Int, $last: Int){
         id
         name
         inherited
+        ansibleVariables {
+          totalCount
+        }
       }
     }
   }

data/webpack/graphql/queries/hostAnsibleRoles.gql

@@ -9,6 +9,9 @@ query($id: String!, $first: Int, $last: Int) {
         id
         name
         path
+        ansibleVariables {
+          totalCount
+        }
       }
     }
   }