foreman_ansible 7.0.4 → 7.1.0

data/webpack/components/AnsibleRolesAndVariables/AnsibleRolesAndVariables.js

@@ -12,9 +12,8 @@ import {
   ToolbarContent,
   ToolbarItem,
   Checkbox,
-  Pagination,
 } from '@patternfly/react-core';
-
+import Pagination from 'foremanReact/components/Pagination';
 import PropTypes from 'prop-types';
 import { DEFAULT_PER_PAGE } from './AnsibleRolesAndVariablesConstants';
 import './AnsibleRolesAndVariables.scss';
@@ -25,6 +24,7 @@ const ImportRolesAndVariablesTable = ({
   proxy,
   onSubmit,
   onCancel,
+  isImporting,
 }) => {
   const columns = columnsData.map(col => ({
     ...col,
@@ -34,10 +34,13 @@ const ImportRolesAndVariablesTable = ({
 
   const [isChecked, setIsChecked] = useState(false);
   const [selectedRowsCount, setSelectRowsCount] = useState(0);
-
-  const [page, setPage] = useState();
-  const [perPage, setPerPage] = useState(DEFAULT_PER_PAGE);
-  const [paginatedRows, setPaginatedRows] = useState(rows.slice(0, perPage));
+  const [pagination, setPagination] = useState({
+    page: 1,
+    per_page: DEFAULT_PER_PAGE,
+  });
+  const [paginatedRows, setPaginatedRows] = useState(
+    rows.slice(0, pagination.per_page)
+  );
 
   const onSelect = (event, isSelected, rowId, row) => {
     const selectableRowLength = rows.filter(
@@ -68,43 +71,22 @@ const ImportRolesAndVariablesTable = ({
     onSelect(null, checked, -1);
   };
 
-  const handleSetPage = (event, newPage) => {
-    const startIdx = (newPage - 1) * perPage;
+  const handleSetPage = args => {
+    const startIdx = (args.page - 1) * args.per_page;
     const endIdx =
-      rows.length < newPage * perPage ? rows.length : newPage * perPage;
-    setPage(newPage);
+      rows.length < args.page * args.per_page
+        ? rows.length
+        : args.page * args.per_page;
+    setPagination(args);
     setPaginatedRows(rows.slice(startIdx, endIdx));
   };
 
-  const handlePerPageSelect = (
-    event,
-    newPerPage,
-    newPage,
-    startIdx,
-    endIdx
-  ) => {
-    setPerPage(newPerPage);
-    setPage(newPage);
-    setPaginatedRows(rows.slice(startIdx, endIdx));
-  };
-
-  const renderPagination = (variant = 'top') => (
+  const renderPagination = () => (
     <Pagination
       isCompact
       itemCount={rows.length}
-      page={page}
-      perPage={perPage}
-      defaultToFullPage
-      onSetPage={handleSetPage}
-      onPerPageSelect={handlePerPageSelect}
-      perPageOptions={[
-        { title: '3', value: 3 },
-        { title: '5', value: 5 },
-        { title: '10', value: 10 },
-      ]}
-      titles={{
-        paginationTitle: `${variant} pagination`,
-      }}
+      perPage={pagination.per_page}
+      onChange={args => handleSetPage(args)}
     />
   );
 
@@ -131,10 +113,15 @@ const ImportRolesAndVariablesTable = ({
     <div className="submit-cancel-btns">
       <br />
       <br />
-      <Button variant="primary" onClick={() => onSubmit(rows, proxy)}>
+      <Button
+        variant="primary"
+        onClick={() => onSubmit(rows, proxy)}
+        isLoading={isImporting}
+        isDisabled={isImporting || selectedRowsCount === 0}
+      >
         Submit
       </Button>
-      <Button variant="secondary" onClick={onCancel}>
+      <Button variant="secondary" onClick={onCancel} isDisabled={isImporting}>
         Cancel
       </Button>
     </div>
@@ -165,6 +152,7 @@ ImportRolesAndVariablesTable.defaultProps = {
   proxy: undefined,
   onSubmit: undefined,
   onCancel: undefined,
+  isImporting: false,
 };
 
 ImportRolesAndVariablesTable.propTypes = {
@@ -173,6 +161,7 @@ ImportRolesAndVariablesTable.propTypes = {
   proxy: PropTypes.number,
   onSubmit: PropTypes.func,
   onCancel: PropTypes.func,
+  isImporting: PropTypes.bool,
 };
 
 export default ImportRolesAndVariablesTable;

data/webpack/components/AnsibleRolesAndVariables/AnsibleRolesAndVariablesActions.js

@@ -4,6 +4,7 @@ import { post } from 'foremanReact/redux/API';
 import { push } from 'connected-react-router';
 import { prepareResult } from './AnsibleRolesAndVariablesHelpers';
 import {
+  IMPORT_ANSIBLE_V_R,
   ANSIBLE_ROLE_CONFIRM_IMPORT_PATH,
   ANSIBLE_ROLES_INDEX,
 } from './AnsibleRolesAndVariablesConstants';
@@ -14,7 +15,7 @@ export const onSubmit = (rows, proxy) => dispatch => {
   const params = prepareResult(rows);
   dispatch(
     post({
-      key: 'import_ansible_v_r',
+      key: IMPORT_ANSIBLE_V_R,
       url: ANSIBLE_ROLE_CONFIRM_IMPORT_PATH,
       params: { changed: params, proxy },
       handleSuccess: () => {

data/webpack/components/AnsibleRolesAndVariables/AnsibleRolesAndVariablesConstants.js

@@ -1,3 +1,4 @@
+export const IMPORT_ANSIBLE_V_R = 'IMPORT_ANSIBLE_V_R';
 export const ANSIBLE_ROLES_INDEX = '/ansible/ansible_roles';
 export const ANSIBLE_ROLE_CONFIRM_IMPORT_PATH =
   '/ansible/ansible_roles/confirm_import';

data/webpack/components/AnsibleRolesAndVariables/AnsibleRolesAndVariablesSelectors.js

@@ -0,0 +1,6 @@
+import { selectAPIStatus } from 'foremanReact/redux/API/APISelectors';
+import { IMPORT_ANSIBLE_V_R } from './AnsibleRolesAndVariablesConstants';
+
+// API statuses
+export const selectApiImportStatus = state =>
+  selectAPIStatus(state, IMPORT_ANSIBLE_V_R);

data/webpack/components/AnsibleRolesAndVariables/index.js

@@ -1,10 +1,13 @@
 import React from 'react';
-import { useDispatch } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import { push } from 'connected-react-router';
 
+import { STATUS } from 'foremanReact/constants';
+
 import ImportRolesAndVariablesTable from './AnsibleRolesAndVariables';
 import { onSubmit } from './AnsibleRolesAndVariablesActions';
 import { ANSIBLE_ROLES_INDEX } from './AnsibleRolesAndVariablesConstants';
+import { selectApiImportStatus } from './AnsibleRolesAndVariablesSelectors';
 
 const WrappedImportRolesAndVariables = props => {
   const cols = [
@@ -19,12 +22,15 @@ const WrappedImportRolesAndVariables = props => {
   const onCancel = () => {
     dispatch(push(ANSIBLE_ROLES_INDEX));
   };
+  const apiImportStatus = useSelector(selectApiImportStatus);
+
   return (
     <ImportRolesAndVariablesTable
       {...props}
       columnsData={cols}
       onSubmit={submit}
       onCancel={onCancel}
+      isImporting={apiImportStatus === STATUS.PENDING}
     />
   );
 };

data/webpack/components/AnsibleRolesSwitcher/components/AvailableRolesList.js

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import { ListView, LoadingState } from 'patternfly-react';
-import PaginationWrapper from 'foremanReact/components/Pagination/PaginationWrapper';
+import Pagination from 'foremanReact/components/Pagination';
 
 import AnsibleRole from './AnsibleRole';
 
@@ -16,7 +16,7 @@ const AvailableRolesList = ({
 }) => (
   <ListView>
     <div className="sticky-pagination">
-      <PaginationWrapper
+      <Pagination
         viewType="list"
         itemCount={itemCount}
         pagination={pagination}

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

@@ -7,21 +7,24 @@ exports[`AvailableRolesList should render 1`] = `
   <div
     className="sticky-pagination"
   >
-    <PaginationWrapper
-      className=""
-      disableNext={false}
-      disablePrev={false}
+    <Pagination
+      className={null}
       dropdownButtonId="available-ansible-roles-pagination-row-dropdown"
       itemCount={2}
+      noSidePadding={false}
       onChange={[Function]}
-      onPageSet={[Function]}
-      onPerPageSelect={[Function]}
+      onPerPageSelect={null}
+      onSetPage={null}
+      page={1}
       pagination={
         Object {
           "page": 1,
           "perPage": 25,
         }
       }
+      perPage={null}
+      updateParamsByUrl={true}
+      variant="bottom"
       viewType="list"
     />
   </div>

data/webpack/helpers/pageParamsHelper.js

@@ -14,7 +14,7 @@ export const addSearch = (basePath, params) => {
 
 export const useCurrentPagination = (
   history,
-  keys = { page: 'page', perPage: 'perPage' }
+  keys = { page: 'page', perPage: 'per_page' }
 ) => {
   const pageParams = parsePageParams(history);
   const uiSettings = useForemanSettings();
@@ -28,7 +28,7 @@ export const useCurrentPagination = (
 
 export const pageToVars = (
   pagination,
-  keys = { page: 'page', perPage: 'perPage' }
+  keys = { page: 'page', perPage: 'per_page' }
 ) => ({
   first: pagination[keys.page] * pagination[keys.perPage],
   last: pagination[keys.perPage],
@@ -36,5 +36,5 @@ export const pageToVars = (
 
 export const useParamsToVars = (
   history,
-  keys = { page: 'page', perPage: 'perPage' }
+  keys = { page: 'page', perPage: 'per_page' }
 ) => pageToVars(useCurrentPagination(history, keys), keys);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 7.0.4
+  version: 7.1.0
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-26 00:00:00.000000000 Z
+date: 2022-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -81,6 +81,7 @@ files:
 - app/controllers/ansible_variables_controller.rb
 - app/controllers/api/v2/ansible_inventories_controller.rb
 - app/controllers/api/v2/ansible_override_values_controller.rb
+- app/controllers/api/v2/ansible_playbooks_controller.rb
 - app/controllers/api/v2/ansible_roles_controller.rb
 - app/controllers/api/v2/ansible_variables_controller.rb
 - app/controllers/concerns/foreman/controller/parameters/ansible_override_value.rb
@@ -113,6 +114,7 @@ files:
 - 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/jobs/sync_playbooks.rb
 - app/jobs/sync_roles_and_variables.rb
 - app/lib/actions/foreman_ansible/helpers/play_roles_description.rb
 - app/lib/proxy_api/ansible.rb
@@ -131,6 +133,8 @@ files:
 - app/services/foreman_ansible/ansible_report_importer.rb
 - app/services/foreman_ansible/ansible_report_scanner.rb
 - app/services/foreman_ansible/api_roles_importer.rb
+- app/services/foreman_ansible/import_playbooks_error_notification.rb
+- app/services/foreman_ansible/import_playbooks_success_notification.rb
 - app/services/foreman_ansible/import_roles_and_variables_error_notification.rb
 - app/services/foreman_ansible/import_roles_and_variables_success_notification.rb
 - app/services/foreman_ansible/insights_notification_builder.rb
@@ -138,6 +142,7 @@ files:
 - app/services/foreman_ansible/inventory_creator.rb
 - app/services/foreman_ansible/override_resolver.rb
 - app/services/foreman_ansible/playbook_creator.rb
+- app/services/foreman_ansible/playbooks_importer.rb
 - app/services/foreman_ansible/proxy_api.rb
 - app/services/foreman_ansible/renderer_methods.rb
 - app/services/foreman_ansible/roles_importer.rb
@@ -152,6 +157,7 @@ files:
 - app/views/ansible_variables/new.html.erb
 - app/views/api/v2/ansible_override_values/index.json.rabl
 - app/views/api/v2/ansible_override_values/show.json.rabl
+- app/views/api/v2/ansible_playbooks/sync.json.rabl
 - app/views/api/v2/ansible_roles/import.json.rabl
 - app/views/api/v2/ansible_roles/index.json.rabl
 - app/views/api/v2/ansible_roles/obsolete.json.rabl
@@ -178,7 +184,9 @@ files:
 - app/views/foreman_ansible/job_templates/ansible_roles_-_ansible_default.erb
 - app/views/foreman_ansible/job_templates/ansible_roles_-_install_from_galaxy.erb
 - 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
@@ -264,12 +272,15 @@ files:
 - test/factories/ansible_variables.rb
 - test/factories/host_ansible_enhancements.rb
 - test/fixtures/insights_playbook.yaml
+- test/fixtures/playbooks_example_output.json
 - test/fixtures/report.json
 - test/fixtures/sample_facts.json
+- test/fixtures/sample_playbooks.json
 - test/foreman_ansible/helpers/ansible_roles_helper_test.rb
 - test/functional/ansible_roles_controller_test.rb
 - test/functional/ansible_variables_controller_test.rb
 - test/functional/api/v2/ansible_inventories_controller_test.rb
+- test/functional/api/v2/ansible_playbooks_controller_test.rb
 - test/functional/api/v2/ansible_roles_controller_test.rb
 - test/functional/api/v2/ansible_variables_controller_test.rb
 - test/functional/api/v2/hostgroups_controller_test.rb
@@ -291,6 +302,7 @@ files:
 - test/unit/host_ansible_role_test.rb
 - test/unit/hostgroup_ansible_role_test.rb
 - test/unit/ignore_roles_test.rb
+- test/unit/import_playbooks_test.rb
 - test/unit/import_roles_and_variables.rb
 - test/unit/lib/proxy_api/ansible_test.rb
 - test/unit/services/ansible_report_importer_test.rb
@@ -352,6 +364,7 @@ files:
 - webpack/components/AnsibleRolesAndVariables/AnsibleRolesAndVariablesActions.js
 - webpack/components/AnsibleRolesAndVariables/AnsibleRolesAndVariablesConstants.js
 - webpack/components/AnsibleRolesAndVariables/AnsibleRolesAndVariablesHelpers.js
+- webpack/components/AnsibleRolesAndVariables/AnsibleRolesAndVariablesSelectors.js
 - webpack/components/AnsibleRolesAndVariables/__test__/AnsibleRolesAndVariablesHelpers.test.js
 - webpack/components/AnsibleRolesAndVariables/__test__/AnsibleRolesAndVariablesImport.test.js
 - webpack/components/AnsibleRolesAndVariables/index.js
@@ -400,7 +413,6 @@ files:
 - webpack/components/ErrorState.js
 - webpack/components/ReportJsonViewer.js
 - webpack/components/withLoading.js
-- webpack/components/withPagination.js
 - webpack/formHelper.js
 - webpack/globalIdHelper.js
 - webpack/global_index.js
@@ -418,7 +430,6 @@ files:
 - webpack/graphql/queries/hostVariableOverrides.gql
 - webpack/graphql/queries/recurringJobs.gql
 - webpack/helpers/pageParamsHelper.js
-- webpack/helpers/paginationHelper.js
 - webpack/index.js
 - webpack/permissionsHelper.js
 - webpack/reducer.js
@@ -447,50 +458,54 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.4
 signing_key:
 specification_version: 4
 summary: Ansible integration with Foreman (theforeman.org)
 test_files:
-- test/factories/ansible_proxy.rb
-- test/factories/ansible_roles.rb
-- test/factories/ansible_variables.rb
-- test/factories/host_ansible_enhancements.rb
-- test/fixtures/insights_playbook.yaml
-- test/fixtures/sample_facts.json
-- test/fixtures/report.json
+- test/functional/ansible_variables_controller_test.rb
 - test/functional/ansible_roles_controller_test.rb
-- test/functional/api/v2/ansible_inventories_controller_test.rb
-- test/functional/api/v2/ansible_roles_controller_test.rb
 - test/functional/api/v2/ansible_variables_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_inventories_controller_test.rb
 - test/functional/api/v2/hosts_controller_test.rb
 - test/functional/ui_ansible_roles_controller_test.rb
-- test/functional/ansible_variables_controller_test.rb
 - test/functional/hosts_controller_test.rb
-- test/test_plugin_helper.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/ansible_role_test.rb
-- test/unit/concerns/config_reports_extensions_test.rb
-- test/unit/concerns/host_managed_extensions_test.rb
-- test/unit/concerns/hostgroup_extensions_test.rb
-- test/unit/helpers/ansible_reports_helper_test.rb
-- test/unit/lib/proxy_api/ansible_test.rb
+- test/unit/services/api_roles_importer_test.rb
+- test/unit/services/ui_roles_importer_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/roles_importer_test.rb
-- test/unit/services/ansible_variables_importer_test.rb
-- test/unit/services/api_roles_importer_test.rb
 - test/unit/services/inventory_creator_test.rb
-- test/unit/services/override_resolver_test.rb
-- test/unit/services/ui_roles_importer_test.rb
-- test/unit/ansible_provider_test.rb
+- test/unit/services/ansible_variables_importer_test.rb
+- test/unit/lib/proxy_api/ansible_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_playbooks_test.rb
 - test/unit/import_roles_and_variables.rb
-- test/foreman_ansible/helpers/ansible_roles_helper_test.rb
-- test/graphql/mutations/hosts/assign_ansible_roles_mutation_test.rb
-- test/graphql/queries/ansible_roles_query_test.rb
+- test/unit/concerns/config_reports_extensions_test.rb
+- test/unit/concerns/host_managed_extensions_test.rb
+- test/unit/concerns/hostgroup_extensions_test.rb
+- test/factories/ansible_proxy.rb
+- test/factories/host_ansible_enhancements.rb
+- test/factories/ansible_variables.rb
+- test/factories/ansible_roles.rb
+- 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

data/webpack/helpers/paginationHelper.js

@@ -1,9 +0,0 @@
-import { addSearch } from './pageParamsHelper';
-
-export const preparePerPageOptions = opts =>
-  opts.map(item => ({ title: item.toString(), value: item }));
-
-export const refreshPage = (history, params = {}) => {
-  const url = addSearch(history.location.pathname, params);
-  history.push(url);
-};