foreman-tasks 4.1.3 → 4.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba89e76b07357c27678169c5350b13a80ea346896e681e7061da8c9ff5c6d2ce
-  data.tar.gz: c0a597c5a7db439fcd6627460b0fa91ed9e5bf0ef2d5308f356d35582c141b9d
+  metadata.gz: 113adfd7bfb8197852703d6bb8ca03e724b355a55723b8a0146c016607bb0024
+  data.tar.gz: 9117207fc628934e82528eb2238f0bcb010e3f92654b621675485ca4f1a59f9e
 SHA512:
-  metadata.gz: 3f873f26387eb89860543bca5f888b017c2ac692c986873b97b48506f30429172d49e926450937262a9dcb06c26c45d7eefabdb7f3cce0b8c70ce6786ea7e4ad
-  data.tar.gz: b021241e11f9db347960eb55e2497112cf996f1e77e48d92f593fa47b735c0268532ec61e2779bd35fc01768178037eaedf8248b59dfc178031dd56fb1340b6f
+  metadata.gz: 0b8228f8d1ea657cf35106884d1d1b537f0ac910af82c1d74f43a2eb28d2337c6a76cd4f89d927a7731af222453acd6439110b92281a9acbadf1696d1dd55ff4
+  data.tar.gz: 365c53bf9ce1c3e3e15a9632828f867a83d74ecad2fdd7c1c7ce1b3ecd4d6d6f6775adef6f1e02fb6eff79cf6a6c437663e0a4c8e1cd773c9dded48445138cee

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/app/controllers/foreman_tasks/tasks_controller.rb

@@ -72,17 +72,15 @@ module ForemanTasks
     def unlock
       task = find_dynflow_task
       if task.paused?
-        task.state = :stopped
-        task.save!
-        render json: { statusText: 'OK' }
+        force_unlock(task)
       else
         render json: {}, status: :bad_request
       end
     end
 
-    def force_unlock
-      task       = find_dynflow_task
+    def force_unlock(task = find_dynflow_task)
       task.state = :stopped
+      task.locks.destroy_all
       task.save!
       render json: { statusText: 'OK' }
     end

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '4.1.3'.freeze
+  VERSION = '4.1.6'.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/TasksTable.js

@@ -27,6 +27,7 @@ const TasksTable = ({
   openClickedModal,
   openModal,
   allRowsSelected,
+  permissions,
 }) => {
   const { search, pathname } = history.location;
   const url = pathname + search;
@@ -59,6 +60,7 @@ const TasksTable = ({
       },
       isSelected: ({ rowData }) =>
         allRowsSelected || selectedRows.includes(rowData.id),
+      permissions,
     };
   };
 
@@ -162,6 +164,9 @@ TasksTable.propTypes = {
   unselectRow: PropTypes.func.isRequired,
   openModal: PropTypes.func.isRequired,
   allRowsSelected: PropTypes.bool,
+  permissions: PropTypes.shape({
+    edit: PropTypes.bool,
+  }),
 };
 
 TasksTable.defaultProps = {
@@ -173,6 +178,9 @@ TasksTable.defaultProps = {
   },
   selectedRows: [],
   allRowsSelected: false,
+  permissions: {
+    edit: false,
+  },
 };
 
 export default TasksTable;

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

@@ -81,7 +81,10 @@ const TasksTablePage = ({
               title={__('Export All')}
             />
             <ActionSelectButton
-              disabled={!(props.selectedRows.length || props.allRowsSelected)}
+              disabled={
+                !props.permissions.edit ||
+                !(props.selectedRows.length || props.allRowsSelected)
+              }
               onCancel={() => openModal(CANCEL_SELECTED_MODAL)}
               onResume={() => openModal(RESUME_SELECTED_MODAL)}
               onForceCancel={() => openModal(FORCE_UNLOCK_SELECTED_MODAL)}
@@ -94,15 +97,17 @@ const TasksTablePage = ({
         }
       >
         <React.Fragment>
-          {showSelectAll && props.itemCount >= props.pagination.perPage && (
-            <SelectAllAlert
-              itemCount={props.itemCount}
-              perPage={props.pagination.perPage}
-              selectAllRows={selectAllRows}
-              unselectAllRows={props.unselectAllRows}
-              allRowsSelected={props.allRowsSelected}
-            />
-          )}
+          {props.permissions.edit &&
+            showSelectAll &&
+            props.itemCount >= props.pagination.perPage && (
+              <SelectAllAlert
+                itemCount={props.itemCount}
+                perPage={props.pagination.perPage}
+                selectAllRows={selectAllRows}
+                unselectAllRows={props.unselectAllRows}
+                allRowsSelected={props.allRowsSelected}
+              />
+            )}
           <TasksTable history={history} {...props} openModal={openModal} />
         </React.Fragment>
       </PageLayout>
@@ -131,6 +136,9 @@ TasksTablePage.propTypes = {
   showSelectAll: PropTypes.bool,
   unselectAllRows: PropTypes.func.isRequired,
   reloadPage: PropTypes.func.isRequired,
+  permissions: PropTypes.shape({
+    edit: PropTypes.bool,
+  }),
 };
 
 TasksTablePage.defaultProps = {
@@ -146,6 +154,9 @@ TasksTablePage.defaultProps = {
   createHeader: () => __('Tasks'),
   showSelectAll: false,
   modalID: '',
+  permissions: {
+    edit: false,
+  },
 };
 
 export default TasksTablePage;

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

@@ -19,8 +19,13 @@ const initialState = Immutable({
 
 export const TasksTableQueryReducer = (state = initialState, action) => {
   const { type, payload, response } = action;
-  const { subtotal, page, per_page: perPageString, action_name: actionName } =
-    response || {};
+  const {
+    subtotal,
+    page,
+    per_page: perPageString,
+    action_name: actionName,
+    can_edit: canEdit,
+  } = response || {};
   const ACTION_TYPES = createTableActionTypes(TASKS_TABLE_ID);
   switch (type) {
     case SELECT_ALL_ROWS:
@@ -34,26 +39,22 @@ export const TasksTableQueryReducer = (state = initialState, action) => {
           perPage: Number(perPageString),
         },
         selectedRows: [],
+        permissions: {
+          edit: canEdit,
+        },
       });
     case SELECT_ROWS:
       return state.set('selectedRows', union(payload, state.selectedRows));
     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/TasksTableSelectors.js

@@ -24,6 +24,9 @@ export const selectActionName = state =>
 export const selectSelectedRows = state =>
   selectTasksTableQuery(state).selectedRows || [];
 
+export const selectPermissions = state =>
+  selectTasksTableQuery(state).permissions || { edit: false };
+
 export const selectResults = createSelector(
   selectTasksTableContent,
   ({ results }) =>

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__/TasksTablePage.test.js.snap

@@ -126,6 +126,11 @@ exports[`TasksTablePage rendering render with Breadcrubs and edit permissions 1`
         }
       }
       parentTaskID={null}
+      permissions={
+        Object {
+          "edit": false,
+        }
+      }
       reloadPage={[MockFunction]}
       results={
         Array [
@@ -261,6 +266,11 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
         }
       }
       parentTaskID={null}
+      permissions={
+        Object {
+          "edit": false,
+        }
+      }
       reloadPage={[MockFunction]}
       results={
         Array [

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

@@ -59,6 +59,9 @@ Object {
       "page": 3,
       "perPage": 12,
     },
+    "permissions": Object {
+      "edit": undefined,
+    },
     "selectedRows": Array [],
   },
 }
@@ -77,7 +80,9 @@ Object {
 exports[`TasksTableReducer reducer should handle UNSELECT_ROWS 1`] = `
 Object {
   "tasksTableQuery": Object {
+    "allRowsSelected": false,
     "selectedRows": Array [],
+    "showSelectAll": false,
   },
 }
 `;

data/webpack/ForemanTasks/Components/TasksTable/formatters/__test__/__snapshots__/selectionHeaderCellFormatter.test.js.snap

@@ -3,6 +3,7 @@
 exports[`selectionHeaderCellFormatter render 1`] = `
 <TableSelectionHeaderCell
   checked={true}
+  disabled={false}
   id="selectAll"
   label="some-label"
   onChange={[Function]}

data/webpack/ForemanTasks/Components/TasksTable/formatters/__test__/selectionHeaderCellFormatter.test.js

@@ -4,7 +4,7 @@ describe('selectionHeaderCellFormatter', () => {
   it('render', () => {
     expect(
       selectionHeaderCellFormatter(
-        { allPageSelected: () => true },
+        { allPageSelected: () => true, permissions: { edit: true } },
         'some-label'
       )
     ).toMatchSnapshot();

data/webpack/ForemanTasks/Components/TasksTable/formatters/selectionHeaderCellFormatter.js

@@ -5,6 +5,7 @@ export default (selectionController, label) => (
   <TableSelectionHeaderCell
     label={label}
     checked={selectionController.allPageSelected()}
+    disabled={!selectionController.permissions.edit}
     onChange={selectionController.selectPage}
   />
 );

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

@@ -16,6 +16,7 @@ import {
   selectAllRowsSelected,
   selectShowSelectAll,
   selectModalID,
+  selectPermissions,
 } from './TasksTableSelectors';
 
 const mapStateToProps = state => ({
@@ -30,6 +31,7 @@ const mapStateToProps = state => ({
   allRowsSelected: selectAllRowsSelected(state),
   showSelectAll: selectShowSelectAll(state),
   modalID: selectModalID(state),
+  permissions: selectPermissions(state),
 });
 
 const mapDispatchToProps = dispatch =>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 4.1.3
+  version: 4.1.6
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-10 00:00:00.000000000 Z
+date: 2022-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow
@@ -611,7 +611,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Foreman plugin for showing tasks information for resources and users