foreman-tasks 4.1.4 → 4.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3152af7ac771946d9090d5a1b867c6843ff6657ab2434c4daba986c60c83579e
-  data.tar.gz: 4d3cd7b0d58af7f59a5d7745e1b75444dc43066089c60854344c49dc1d58ed43
+  metadata.gz: 6602d0bac71ecbcf69cecc38a00ab4ef145832318576aadcda9a1eda9fed543b
+  data.tar.gz: 4b04eef7b87ba5542fd89576671e2bcf90d81ebad475adcc797dfc916bc30f1a
 SHA512:
-  metadata.gz: 528a33eb7ef2128cdc476411c705762b3b63ba22d8a3ff3ca70755a42247c5a538494b1b248eee547a2a7ffa49821612f05f0f53e42ef026a70e107e064246f1
-  data.tar.gz: 85033e3dd3c84eb6aa8dd99e837ad024acd42639c1351f518883ef431b9b95c9ddb833f11e6708bda488113c1a33faf7959ac4a11bbeb4ea16e29a32c955e670
+  metadata.gz: 96c669db27581e60652ece6e49fe9bfa1db1d1313b0c89a9a8c9124c897d2c73b9bb7ab5db47045a26651cabdb745779cfcdad45375ea606190774b00544bd8e
+  data.tar.gz: cb9100d6621dbda92e4c25c5e87df96ee2fefd6de1dc556ce44031ee45732cd545671624a51864e38d8c5a177b302d843f897d98de7f4f7b68d5484c84bdf7f4

data/app/controllers/foreman_tasks/api/tasks_controller.rb

@@ -260,7 +260,7 @@ module ForemanTasks
             raise BadRequest,
                   _('Resource search_params requires resource_type and resource_id to be specified')
           end
-          scope.joins(:locks).where(foreman_tasks_locks:
+          scope.joins(:links).where(foreman_tasks_links:
                                         { resource_type: search_params[:resource_type],
                                           resource_id:   search_params[:resource_id] })
         when 'task'

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '4.1.4'.freeze
+  VERSION = '4.1.5'.freeze
 end

data/test/controllers/api/tasks_controller_test.rb

@@ -68,6 +68,17 @@ module ForemanTasks
           data = JSON.parse(response.body)
           _(data[0]['results'][0]['id']).must_equal task.id
         end
+
+        it 'can search for a specific resource' do
+          org = FactoryBot.create(:organization)
+          task = FactoryBot.create(:task_with_links, resource_id: org.id, resource_type: 'Organization')
+
+          post :bulk_search, params: { :searches => [{ :type => 'resource', :resource_id => org.id, :resource_type => 'Organization' }] }
+
+          assert_response :success
+          data = JSON.parse(response.body)
+          _(data[0]['results'][0]['id']).must_equal task.id
+        end
       end
 
       describe 'GET /api/tasks/show' do

data/webpack/ForemanTasks/Components/TasksTable/TasksTableReducer.js

@@ -48,20 +48,13 @@ export const TasksTableQueryReducer = (state = initialState, action) => {
     case OPEN_SELECT_ALL:
       return state.set('showSelectAll', true);
     case UNSELECT_ROWS:
-      if (state.allRowsSelected) {
-        // User can unselect rows if only the page rows are selected
-        return state
-          .set(
-            'selectedRows',
-            payload.results.map(row => row.id).filter(row => row !== payload.id)
-          )
-          .set('allRowsSelected', false)
-          .set('showSelectAll', false);
-      }
-      return state.set(
-        'selectedRows',
-        state.selectedRows.filter(row => row !== payload.id)
-      );
+      return state
+        .set(
+          'selectedRows',
+          state.selectedRows.filter(row => row !== payload.id)
+        )
+        .set('showSelectAll', false)
+        .set('allRowsSelected', false);
     case UNSELECT_ALL_ROWS:
       return state
         .set('selectedRows', [])

data/webpack/ForemanTasks/Components/TasksTable/__tests__/TasksTableReducer.test.js

@@ -73,7 +73,9 @@ const fixtures = {
     },
   },
   'should handle UNSELECT_ROWS with all rows selected': {
-    state: Immutable({ tasksTableQuery: { allRowsSelected: true } }),
+    state: Immutable({
+      tasksTableQuery: { allRowsSelected: true, selectedRows: [3, 4, 5] },
+    }),
     action: {
       type: UNSELECT_ROWS,
       payload: { id: [4], results: [{ id: 3 }, { id: 4 }, { id: 5 }] },

data/webpack/ForemanTasks/Components/TasksTable/__tests__/__snapshots__/TasksTableReducer.test.js.snap

@@ -80,7 +80,9 @@ Object {
 exports[`TasksTableReducer reducer should handle UNSELECT_ROWS 1`] = `
 Object {
   "tasksTableQuery": Object {
+    "allRowsSelected": false,
     "selectedRows": Array [],
+    "showSelectAll": false,
   },
 }
 `;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 4.1.4
+  version: 4.1.5
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-17 00:00:00.000000000 Z
+date: 2021-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow