foreman_ansible 6.1.1 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '059c70bd67d597c230eea6135f738afd7c203c27cb1e1d1a7d5b3b88bada984f'
-  data.tar.gz: 2509eb475c69a745d46f726700a5308ee128823f90aaa8e852067b941797141e
+  metadata.gz: d95899e15050cbf3f25d75a8f3c9bc5a3059a9dd0ffa90f4690ce84cf49d3408
+  data.tar.gz: 466754ac90d1e80046fca70ca8db372e90d2b61a0d26a726f0807f7e81227728
 SHA512:
-  metadata.gz: 212613afe4068af042fcb9340bddab879afd4c0b7ced2a6748861561cd76ed185609d2582fed69b03af76f7753b83cb5a18923f2d2170480a1deb3e17fb34338
-  data.tar.gz: 4134c4f15af8a5567ddc319978f5c1538e982bc83923d9ba8a1c45a524fb0d7628f236079d6355c9ab5f5d5ca931a85f1bd1c52673efb2ae2e7f2ed8a21d4b9d
+  metadata.gz: 9f79b560e9e01e8719c6e705ff5fef6a9f9e7b91bc9ec1b9b79c81750b572c4de6929d2ab07049caefdf4f555a5087c31eb76543d52b87622038107a1e02ea63
+  data.tar.gz: 357b61ffdb94b61a37ecf87afba07f7e0c2158d4af14d39b701fb31152803692a8feaac09294bb2bc8c0ae8fe8d9daa66eb8eb6f0869c4901315dca688f06dab

data/app/helpers/foreman_ansible/ansible_reports_helper.rb

@@ -42,10 +42,7 @@ module ForemanAnsible
     end
 
     def report_json_viewer(json)
-      uid = "reportjson-viewer-#{json.object_id}"
-      viewer = content_tag :div, '', :id => uid
-      viewer << mount_react_component('ReportJsonViewer',
-                                      "##{uid}", json.to_json)
+      react_component('ReportJsonViewer', data: json)
     end
 
     private

data/app/services/foreman_ansible/operating_system_parser.rb

@@ -80,7 +80,7 @@ module ForemanAnsible
         facts[:ansible_os_name].tr(" \n\t", '') ||
           facts[:ansible_distribution].tr(" \n\t", '')
       else
-        distribution = facts[:ansible_distribution] || facts[:ansible_lsb].try(:[], 'id')
+        distribution = facts[:ansible_lsb].try(:[], 'id') || facts[:ansible_distribution]
 
         if distribution == 'RedHat' &&
            facts[:ansible_lsb].try(:[], 'id') == 'RedHatEnterpriseWorkstation'

data/app/services/foreman_ansible/variables_importer.rb

@@ -51,7 +51,8 @@ module ForemanAnsible
           :key => variable_name,
           :ansible_role_id => role.id
         )
-        variable.assign_attributes(:default_value => variable_default,
+        variable.assign_attributes(:hidden_value => false,
+                                   :default_value => variable_default,
                                    :key_type => infer_key_type(variable_default))
         variable.imported = true if variable.new_record?
         variable.valid? ? variable : nil
@@ -80,6 +81,8 @@ module ForemanAnsible
         variable = AnsibleVariable.new(
           JSON.parse(attrs)
         )
+        # Make sure, newly created variables are not hidden
+        variable.hidden_value = false
         variable.ansible_role = ::AnsibleRole.find_by(:name => role)
         variable.save
         memo << variable
@@ -89,6 +92,8 @@ module ForemanAnsible
     def update_variables(variables)
       iterate_over_variables(variables) do |_role, memo, attrs|
         attributes = JSON.parse(attrs)
+        # Make sure to let the flag if a variable is hidden untouched
+        attributes.delete('hidden_value')
         var = AnsibleVariable.find attributes['id']
         var.update(attributes)
         memo << var

data/app/views/foreman_ansible/ansible_roles/_select_tab_content.html.erb

@@ -4,20 +4,12 @@
 <div class='tab-pane' id='ansible_roles'>
   <% roles = f.object.is_a?(Hostgroup) ? roles_attrs(f.object.inherited_and_own_ansible_roles) : roles_attrs(f.object.all_ansible_roles) %>
   <% class_name = f.object.is_a?(Hostgroup) ? 'Hostgroup' : 'Host' %>
-  <%= content_tag(:div, '',
-                  :id => 'ansible_roles_switcher',
-                  'data-roles' => {
-                    :initialAssignedRoles => roles,
-                    :inheritedRoleIds => f.object.inherited_ansible_roles.map(&:id),
-                    :availableRolesUrl => ui_ansible_roles_path,
-                    :resourceId => f.object.id,
-                    :resourceName => class_name,
-                    :canView => User.current.can?(:view_ansible_roles)
-                  }.to_json
-  ) %>
-  <% unless request.xhr? %>
-    <script type="text/javascript">
-      tfm.initAnsibleRoleSwitcher();
-    </script>
-  <% end %>
+  <%= react_component('AnsibleRolesSwitcher', {
+                                                :initialAssignedRoles => roles,
+                                                :inheritedRoleIds => f.object.inherited_ansible_roles.map(&:id),
+                                                :availableRolesUrl => ui_ansible_roles_path,
+                                                :resourceId => f.object.id,
+                                                :resourceName => class_name,
+                                                :canView => User.current.can?(:view_ansible_roles)
+                                              }) %>
 </div>

data/app/views/foreman_ansible/job_templates/ansible_roles_-_install_from_galaxy.erb

@@ -25,7 +25,7 @@ model: JobTemplate
 ---
 - hosts: all
   tasks:
-    - command: ansible-galaxy install {{ item }} <% "-p #{input('location')}" if input('location').present? %>
+    - command: ansible-galaxy install {{ item }} -p <%= input('location').present? ? input('location') : '/etc/ansible/roles' %>
       register: out
       with_items:
         - <%= input('ansible_roles_list') %>

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 = '6.1.1'
+  VERSION = '6.2.0'
 end

data/package.json

@@ -7,33 +7,24 @@
     "test": "test"
   },
   "peerDependencies": {
-    "@theforeman/vendor": ">= 3.3.2"
+    "@theforeman/vendor": ">= 6.0.0"
   },
   "dependencies": {
     "react-json-tree": "^0.11.0"
   },
   "devDependencies": {
     "@babel/core": "^7.7.0",
-    "@theforeman/builder": "^4.0.2",
-    "@theforeman/vendor-dev": "^3.3.2",
-    "babel-eslint": "^10.0.0",
-    "babel-jest": "^24.9.0",
-    "enzyme": "^3.7.0",
-    "enzyme-adapter-react-16": "^1.7.0",
-    "enzyme-to-json": "^3.3.5",
-    "eslint": "^6.0.0",
-    "eslint-plugin-patternfly-react": "^0.2.1",
-    "identity-obj-proxy": "^3.0.0",
-    "jest": "^24.9.0",
-    "prettier": "^1.19.0",
-    "react-redux": "^5.0.7",
-    "react-redux-test-utils": "^0.1.1",
-    "redux": "^3.7.2",
-    "redux-thunk": "^2.3.0"
+    "@theforeman/builder": "^6.0.0",
+    "@theforeman/eslint-plugin-foreman": "6.0.0",
+    "@theforeman/test": "^6.0.0",
+    "@theforeman/vendor-dev": "^6.0.0",
+    "babel-eslint": "^10.0.3",
+    "eslint": "^6.7.2",
+    "prettier": "^1.13.5"
   },
   "scripts": {
-    "test": "node node_modules/.bin/jest webpack",
-    "lint": "eslint ./webpack"
+    "test": "tfm-test --plugin",
+    "lint": "tfm-lint --plugin -d webpack"
   },
   "repository": {
     "type": "git",
@@ -44,27 +35,5 @@
   "bugs": {
     "url": "https://projects.theforeman.org/projects/ansible"
   },
-  "homepage": "https://theforeman.org/plugins/foreman_ansible/",
-  "jest": {
-    "verbose": true,
-    "moduleDirectories": [
-      "node_modules/@theforeman/vendor-core/node_modules",
-      "node_modules",
-      "webpack"
-    ],
-    "transform": {
-      "^.+\\.js$": "babel-jest"
-    },
-    "setupFiles": [
-      "raf/polyfill",
-      "./webpack/test_setup.js"
-    ],
-    "testPathIgnorePatterns": [
-      "/node_modules/",
-      "<rootDir>/foreman/"
-    ],
-    "moduleNameMapper": {
-      "^.+\\.(css|scss)$": "identity-obj-proxy"
-    }
-  }
+  "homepage": "https://theforeman.org/plugins/foreman_ansible/"
 }

data/test/unit/services/ansible_variables_importer_test.rb

@@ -59,6 +59,19 @@ class AnsibleVariablesImporterTest < ActiveSupport::TestCase
       assert_empty changes['update']
     end
 
+    test 'sets hidden value to false by default' do
+      role = FactoryBot.create(:ansible_role)
+      variable = FactoryBot.create(:ansible_variable)
+      api_response = {
+        role.name => { variable.key => 'new value' }
+      }
+      changes = importer.import_variables(api_response, [role.name])
+      assert_empty changes['update']
+      assert_not_empty changes['new']
+      assert_equal variable.key, changes['new'].first.key
+      assert_not changes['new'].first.hidden_value?
+    end
+
     test 'reimports variable with same key for different role' do
       role = FactoryBot.create(:ansible_role)
       variable = FactoryBot.create(:ansible_variable)

data/webpack/components/AnsibleRolesSwitcher/AnsibleRolesSwitcher.js

@@ -17,7 +17,7 @@ class AnsibleRolesSwitcher extends React.Component {
       inheritedRoleIds,
       resourceId,
       resourceName,
-    } = this.props.data;
+    } = this.props;
 
     this.props.getAnsibleRoles(
       availableRolesUrl,
@@ -52,7 +52,7 @@ class AnsibleRolesSwitcher extends React.Component {
       inheritedRoleIds,
       resourceId,
       resourceName,
-    } = this.props.data;
+    } = this.props;
 
     const onListingChange = paginationArgs =>
       getAnsibleRoles(
@@ -104,13 +104,11 @@ class AnsibleRolesSwitcher extends React.Component {
 }
 
 AnsibleRolesSwitcher.propTypes = {
-  data: PropTypes.shape({
-    initialAssignedRoles: PropTypes.arrayOf(PropTypes.object),
-    availableRolesUrl: PropTypes.string,
-    inheritedRoleIds: PropTypes.arrayOf(PropTypes.number),
-    resourceId: PropTypes.number,
-    resourceName: PropTypes.string,
-  }).isRequired,
+  initialAssignedRoles: PropTypes.arrayOf(PropTypes.object),
+  availableRolesUrl: PropTypes.string.isRequired,
+  inheritedRoleIds: PropTypes.arrayOf(PropTypes.number),
+  resourceId: PropTypes.number,
+  resourceName: PropTypes.string,
   getAnsibleRoles: PropTypes.func.isRequired,
   loading: PropTypes.bool.isRequired,
   pagination: PropTypes.shape({
@@ -137,6 +135,10 @@ AnsibleRolesSwitcher.propTypes = {
 
 AnsibleRolesSwitcher.defaultProps = {
   error: {},
+  resourceId: null,
+  resourceName: '',
+  initialAssignedRoles: [],
+  inheritedRoleIds: [],
 };
 
 export default AnsibleRolesSwitcher;

data/webpack/components/AnsibleRolesSwitcher/AnsibleRolesSwitcherActions.js

@@ -21,7 +21,7 @@ export const getAnsibleRoles = (
   resourceName,
   pagination,
   search
-) => dispatch => {
+) => async dispatch => {
   dispatch({ type: ANSIBLE_ROLES_REQUEST });
 
   const params = {
@@ -30,19 +30,19 @@ export const getAnsibleRoles = (
     ...propsToSnakeCase({ resourceId, resourceName }),
   };
 
-  return api
-    .get(url, {}, params)
-    .then(({ data }) =>
-      dispatch({
-        type: ANSIBLE_ROLES_SUCCESS,
-        payload: {
-          initialAssignedRoles,
-          inheritedRoleIds,
-          ...propsToCamelCase(data),
-        },
-      })
-    )
-    .catch(error => dispatch(errorHandler(ANSIBLE_ROLES_FAILURE, error)));
+  try {
+    const res = await api.get(url, {}, params);
+    return dispatch({
+      type: ANSIBLE_ROLES_SUCCESS,
+      payload: {
+        initialAssignedRoles,
+        inheritedRoleIds,
+        ...propsToCamelCase(res.data),
+      },
+    });
+  } catch (error) {
+    return dispatch(errorHandler(ANSIBLE_ROLES_FAILURE, error));
+  }
 };
 
 const errorHandler = (msg, err) => {

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

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import AnsibleRolesSwitcher from '../AnsibleRolesSwitcher';
 
@@ -19,10 +19,10 @@ const fixtures = {
     assignedRolesCount: 2,
     assignedRoles: [],
     unassignedRoles: [],
-    data: {
-      initialAssignedRoles: [],
-    },
+    initialAssignedRoles: [],
     error: { statusText: '', errorMsg: '' },
+    allAssignedRoles: [],
+    availableRolesUrl: 'http://test/roles',
   },
 };
 

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

@@ -1,4 +1,4 @@
-import { testReducerSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testReducerSnapshotWithFixtures } from '@theforeman/test';
 
 import reducer, { initialState } from '../AnsibleRolesSwitcherReducer';
 import { ansibleRolesLong } from '../__fixtures__/ansibleRolesData.fixtures';

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

@@ -1,4 +1,4 @@
-import { testSelectorsSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testSelectorsSnapshotWithFixtures } from '@theforeman/test';
 
 import {
   selectUnassignedRoles,

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

@@ -61,6 +61,7 @@ exports[`AnsibleRolesSwitcher should render 1`] = `
         </h2>
       </div>
       <AssignedRolesList
+        allAssignedRoles={Array []}
         assignedRoles={Array []}
         itemCount={2}
         onPaginationChange={[Function]}

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

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 import AnsiblePermissionDenied from './AnsiblePermissionDenied';
 
 jest.mock('foremanReact/components/common/EmptyState');

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

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import AnsibleRole from './AnsibleRole';
 

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

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import AssignedRolesList from './AssignedRolesList';
 

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

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import AvailableRolesList from './AvailableRolesList';
 

data/webpack/components/AnsibleRolesSwitcher/index.js

@@ -37,5 +37,5 @@ const mapDispatchToProps = dispatch =>
 export default withProtectedView(
   connect(mapStateToProps, mapDispatchToProps)(AnsibleRolesSwitcher),
   AnsiblePermissionDenied,
-  props => props.data && props.data.canView
+  props => props.canView
 );

data/webpack/index.js

@@ -1,12 +1,9 @@
-import $ from 'jquery';
 import componentRegistry from 'foremanReact/components/componentRegistry';
 import injectReducer from 'foremanReact/redux/reducers/registerReducer';
 import ReportJsonViewer from './components/ReportJsonViewer';
 import AnsibleRolesSwitcher from './components/AnsibleRolesSwitcher';
 import reducer from './reducer';
 
-const { tfm } = window;
-
 componentRegistry.register({
   name: 'ReportJsonViewer',
   type: ReportJsonViewer,
@@ -17,13 +14,3 @@ componentRegistry.register({
 });
 
 injectReducer('foremanAnsible', reducer);
-
-tfm.initAnsibleRoleSwitcher = () => {
-  $(document).on('ContentLoad', evt => {
-    tfm.reactMounter.mount(
-      'AnsibleRolesSwitcher',
-      '#ansible_roles_switcher',
-      $('#ansible_roles_switcher').data('roles')
-    );
-  });
-};

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 6.2.0
 platform: ruby
 authors:
 - Daniel Lobato Garcia
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-22 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_ansible_core
@@ -328,12 +328,11 @@ files:
 - webpack/components/ReportJsonViewer.js
 - webpack/index.js
 - webpack/reducer.js
-- webpack/test_setup.js
 homepage: https://github.com/theforeman/foreman_ansible
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -349,25 +348,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key:
+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/ansible_roles.rb
 - test/fixtures/insights_playbook.yaml
 - test/fixtures/report.json
 - test/fixtures/sample_facts.json
 - 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_roles_controller_test.rb
 - test/functional/api/v2/ansible_variables_controller_test.rb
 - test/functional/api/v2/hostgroups_controller_test.rb
 - test/functional/api/v2/hosts_controller_test.rb
-- test/functional/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/unit/actions/run_ansible_job_test.rb
 - test/unit/actions/run_proxy_ansible_command_test.rb
@@ -377,14 +376,11 @@ test_files:
 - 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/host_ansible_role_test.rb
-- test/unit/hostgroup_ansible_role_test.rb
 - test/unit/lib/foreman_ansible_core/command_creator_test.rb
 - test/unit/lib/foreman_ansible_core/ansible_runner_test.rb
 - test/unit/lib/foreman_ansible_core/playbook_runner_test.rb
 - test/unit/lib/proxy_api/ansible_test.rb
 - test/unit/services/ansible_report_importer_test.rb
-- test/unit/services/ansible_variables_importer_test.rb
 - test/unit/services/api_roles_importer_test.rb
 - test/unit/services/fact_importer_test.rb
 - test/unit/services/fact_parser_test.rb
@@ -392,6 +388,9 @@ test_files:
 - test/unit/services/insights_plan_runner_test.rb
 - test/unit/services/roles_importer_test.rb
 - test/unit/services/structured_fact_importer_test.rb
-- test/unit/services/ui_roles_importer_test.rb
+- test/unit/services/ansible_variables_importer_test.rb
 - test/unit/services/inventory_creator_test.rb
+- test/unit/services/ui_roles_importer_test.rb
 - test/unit/ansible_provider_test.rb
+- test/unit/host_ansible_role_test.rb
+- test/unit/hostgroup_ansible_role_test.rb

data/webpack/test_setup.js

@@ -1,12 +0,0 @@
-import 'core-js/shim';
-import 'regenerator-runtime/runtime';
-
-import { configure } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
-
-configure({ adapter: new Adapter() });
-
-// Mocking translation function
-global.__ = str => str;
-global.n__ = str => str;
-global.Jed = { sprintf: str => str };