foreman_remote_execution 1.8.3 → 1.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '088390c13c651a79849a384d7745fad23975bacbedf7913be50d6bed8d66db60'
-  data.tar.gz: 6138f9a4c9cdc374e21254c739ec3c45b5dd95ebd87bd04e40dce2b346874380
+  metadata.gz: d463927fc0e280ab5b2cc94d4ce6222e3d6f802cb14c47823b467c555a4d725b
+  data.tar.gz: ae0540c25b3f25feba35363e8685200d92722cd19c4ec3a79ec52151185f4177
 SHA512:
-  metadata.gz: c866a3ae708c68f9e2176817d74b27c185558cba82e5d3e0c9777fe6e32a538742fac1ff60c472ed8deda93890db3b81e7b0c38af3102dbe0b56590342559a0c
-  data.tar.gz: c4a1f91be44fb15b78ce1b4ff262b885bb3b325caa7a0ac6078203f3c3011e1ff93e97082869806e14a4428e95b0476cc451d267188bc41ab0b2c4e2eaba1bd3
+  metadata.gz: b67d6d69a3ea5464695b7f5b4bce3059dc91b36c9612c69ef5b773e7cfc288b4a0ab8f066c5a61d98b6c70bff75164a53ae6b324a85d11767e408c8b0e990a0a
+  data.tar.gz: 491f93734cd5b2c8dbab24f02f00619a747720e2aebc96c783feba8f6909a167816d3d7872f4cac418be23ca28a635d9ad64adf8a529c4b053ed03f7ebab4534

data/app/controllers/api/v2/job_invocations_controller.rb

@@ -198,6 +198,11 @@ module Api
       def delayed_task_output(task, default: nil)
         { :complete => false, :refresh => true, :output => default, :delayed => true, :start_at => task.start_at }
       end
+
+      # Do not try to scope JobInvocations by taxonomies
+      def parent_scope
+        resource_class.where(nil)
+      end
     end
   end
 end

data/app/controllers/job_invocations_controller.rb

@@ -100,11 +100,11 @@ class JobInvocationsController < ApplicationController
     result = @job_invocation.cancel(params[:force])
 
     if result
-      flash[:notice] = if params[:force]
-                         _('Trying to abort the job')
-                       else
-                         _('Trying to cancel the job')
-                       end
+      flash[:info] = if params[:force]
+                       _('Trying to abort the job')
+                     else
+                       _('Trying to cancel the job')
+                     end
     else
       flash[:warning] = if params[:force]
                           _('The job cannot be aborted at the moment.')

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '1.8.3'.freeze
+  VERSION = '1.8.4'.freeze
 end

data/test/functional/api/v2/job_invocations_controller_test.rb

@@ -28,6 +28,12 @@ module Api
         assert_equal template['job_category'], @invocation.job_category
       end
 
+      test 'should get invocation detail when taxonomies are set' do
+        taxonomy_params = %w(organization location).reduce({}) { |acc, cur| acc.merge("#{cur}_id" => FactoryBot.create(cur)) }
+        get :show, params: taxonomy_params.merge(:id => @invocation.id)
+        assert_response :success
+      end
+
       context 'creation' do
         setup do
           @attrs = { :job_category => @template.job_category,

data/webpack/react_app/components/jobInvocations/index.js

@@ -40,18 +40,21 @@ const mapStateToProps = (state) => {
 
 JobInvocationContainer.propTypes = {
   startJobInvocationsPolling: PropTypes.func,
-  data: PropTypes.string,
-  jobInvocations: PropTypes.arrayOf(PropTypes.arrayOf(
-    PropTypes.string,
-    PropTypes.number,
-    PropTypes.string,
-  )),
-  statuses: PropTypes.shape({}),
+  data: PropTypes.shape({
+    url: PropTypes.string,
+  }),
+  jobInvocations: PropTypes.arrayOf(PropTypes.array),
+  statuses: PropTypes.shape({
+    cancelled: PropTypes.number,
+    failed: PropTypes.number,
+    pending: PropTypes.number,
+    success: PropTypes.number,
+  }),
 };
 
 JobInvocationContainer.defaultProps = {
   startJobInvocationsPolling: JobInvocationActions.startJobInvocationsPolling,
-  data: '',
+  data: {},
   jobInvocations: [['property', 3, 'color']],
   statuses: {},
 };

data/webpack/react_app/redux/reducers/jobInvocations/index.fixtures.js

@@ -3,13 +3,13 @@ import Immutable from 'seamless-immutable';
 export const initialState = Immutable({
   isPolling: false,
   jobInvocations: [],
-  statuses: [],
+  statuses: {},
 });
 
 export const pollingStarted = Immutable({
   isPolling: true,
   jobInvocations: [],
-  statuses: [],
+  statuses: {},
 });
 
 export const jobInvocationsPayload = Immutable({

data/webpack/react_app/redux/reducers/jobInvocations/index.js

@@ -9,7 +9,7 @@ import {
 const initialState = Immutable({
   isPolling: false,
   jobInvocations: [],
-  statuses: [],
+  statuses: {},
 });
 
 export default (state = initialState, action) => {

data/webpack/react_app/redux/reducers/jobInvocations/index.test.js

@@ -25,7 +25,7 @@ describe('job invocations chart reducer', () => {
   it('should stop polling given JOB_FINISHED', () => {
     expect(reducer(pollingStarted, {
       type: JOB_INVOCATIONS_JOB_FINISHED,
-      payload: { jobInvocations: { job_invocations: [], statuses: [] } },
+      payload: { jobInvocations: { job_invocations: [], statuses: {} } },
     })).toEqual(initialState);
   });
   it('should receive job invocations given GET_JOB_INVOCATIONS', () => {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.4
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-18 00:00:00.000000000 Z
+date: 2019-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -427,8 +427,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A plugin bringing remote execution to the Foreman, completing the config