foreman_ansible 7.1.2 → 9.0.0

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/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/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/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
+        }
       }
     }
   }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 7.1.2
+  version: 9.0.0
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-04 00:00:00.000000000 Z
+date: 2022-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -109,11 +109,12 @@ files:
 - app/graphql/types/ansible_variable_override.rb
 - app/graphql/types/inherited_ansible_role.rb
 - app/graphql/types/overriden_ansible_variable.rb
+- app/helpers/foreman_ansible/ansible_hostgroups_helper.rb
 - app/helpers/foreman_ansible/ansible_plugin_helper.rb
 - app/helpers/foreman_ansible/ansible_reports_helper.rb
 - app/helpers/foreman_ansible/ansible_roles_data_preparations.rb
 - app/helpers/foreman_ansible/ansible_roles_helper.rb
-- app/helpers/foreman_ansible/hosts_helper_extensions.rb
+- app/helpers/foreman_ansible/hosts_helper.rb
 - app/jobs/sync_playbooks.rb
 - app/jobs/sync_roles_and_variables.rb
 - app/lib/actions/foreman_ansible/helpers/play_roles_description.rb
@@ -127,7 +128,6 @@ files:
 - app/models/hostgroup_ansible_role.rb
 - app/overrides/ansible_roles_tab.rb
 - app/overrides/hostgroup_ansible_roles_tab.rb
-- app/overrides/hostgroup_play_roles.rb
 - app/overrides/report_output.rb
 - app/services/foreman_ansible/ansible_info.rb
 - app/services/foreman_ansible/ansible_report_importer.rb
@@ -171,7 +171,6 @@ files:
 - app/views/api/v2/ansible_variables/show.json.rabl
 - app/views/api/v2/hostgroups/ansible_roles.json.rabl
 - app/views/api/v2/hosts/ansible_roles.json.rabl
-- app/views/foreman_ansible/ansible_roles/_hostgroup_ansible_roles_button.erb
 - app/views/foreman_ansible/ansible_roles/_select_tab_content.html.erb
 - app/views/foreman_ansible/ansible_roles/_select_tab_title.html.erb
 - app/views/foreman_ansible/api/v2/ansible_roles/import.json.rabl
@@ -186,7 +185,6 @@ files:
 - app/views/foreman_ansible/job_templates/ansible_roles_-_install_from_git.erb
 - app/views/foreman_ansible/job_templates/ansible_windows_updates.erb
 - app/views/foreman_ansible/job_templates/capsule_upgrade_-_ansible_default.erb
-- app/views/foreman_ansible/job_templates/configure_cloud_connector_-_ansible_default.erb
 - app/views/foreman_ansible/job_templates/convert_to_rhel.erb
 - app/views/foreman_ansible/job_templates/maintenance_plan.erb
 - app/views/foreman_ansible/job_templates/module_action_-_ansible_default.erb

data/app/helpers/foreman_ansible/hosts_helper_extensions.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-module ForemanAnsible
-  # Chained methods to extend the hosts menu with Ansible actions
-  module HostsHelperExtensions
-    extend ActiveSupport::Concern
-
-    module Overrides
-      def multiple_actions
-        actions = super
-        if User.current.can?(:create_job_invocations) &&
-           User.current.can?(:play_roles_on_host)
-          actions += [[_('Run all Ansible roles'),
-                       multiple_play_roles_hosts_path,
-                       false]]
-        end
-        actions
-      end
-    end
-
-    included do
-      prepend Overrides
-    end
-
-    def ansible_roles_present?(host)
-      host.ansible_roles.present? ||
-        host.inherited_ansible_roles.present?
-    end
-  end
-end

data/app/overrides/hostgroup_play_roles.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-# Displays Ansible roles button in host group action buttons
-Deface::Override.new(
-  :virtual_path => 'hostgroups/index',
-  :name => 'hostgroup_ansible_roles_button',
-  :replace => "erb[loud]:contains('action_buttons')",
-  :partial => 'foreman_ansible/ansible_roles/hostgroup_ansible_roles_button'
-)

data/app/views/foreman_ansible/ansible_roles/_hostgroup_ansible_roles_button.erb

@@ -1,19 +0,0 @@
-<%=
-  play_roles = if hostgroup.all_ansible_roles.empty?
-    link_to _('Run all Ansible roles'), 'javascript:void(0);', disabled: true, title: 'No Roles assigned'
-  else
-    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'))
-  end
-
-  assign_jobs = link_to(_("Configure Ansible Job"), "/ansible/hostgroups/#{hostgroup.id}", { class: 'la' })
-
-  actions = [
-    display_link_if_authorized(_('Nest'),    hash_for_nest_hostgroup_path(:id => hostgroup)),
-    display_link_if_authorized(_('Clone'),   hash_for_clone_hostgroup_path(:id => hostgroup))
-  ]
-  actions.push play_roles if User.current.can?(:create_job_invocations)
-  actions.push assign_jobs if User.current.can?(:view_job_invocations) && User.current.can?(:view_recurring_logics)
-  actions.push display_delete_if_authorized(hash_for_hostgroup_path(:id => hostgroup).merge(:auth_object => hostgroup, :authorizer => authorizer), :data => { :confirm => warning_message(hostgroup) })
-
-  action_buttons(*actions)
-%>

data/app/views/foreman_ansible/job_templates/configure_cloud_connector_-_ansible_default.erb

@@ -1,37 +0,0 @@
-<%#
-name: Configure Cloud Connector
-snippet: false
-template_inputs:
-- name: satellite_user
-  required: true
-  input_type: user
-  advanced: false
-  value_type: plain
-  hidden_value: false
-- name: satellite_password
-  required: true
-  input_type: user
-  advanced: false
-  value_type: plain
-  hidden_value: true
-- name: http_proxy
-  required: false
-  input_type: user
-  advanced: true
-  value_type: plain
-  hidden_value: false
-  description: You can specify a HTTP proxy address that should be used for Cloud Connector connection to the cloud.redhat.com. Note that it must be HTTP proxy, not HTTPS. The tunelling of SSL (secured web socket connection) in SSL (HTTPS proxy) is currently unsupported.
-model: JobTemplate
-job_category: Maintenance Operations
-description_format: "%{template_name}"
-provider_type: Ansible
-kind: job_template
-feature: ansible_configure_cloud_connector
-%>
-
----
-- hosts: all
-  vars:
-    satellite_url: "<%= foreman_server_url %>"
-  roles:
-    - project-receptor.satellite_receptor_installer