foreman-tasks 4.1.0 → 4.1.4

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,6 +39,9 @@ export const TasksTableQueryReducer = (state = initialState, action) => {
           perPage: Number(perPageString),
         },
         selectedRows: [],
+        permissions: {
+          edit: canEdit,
+        },
       });
     case SELECT_ROWS:
       return state.set('selectedRows', union(payload, state.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__/TasksTableHelpers.test.js

@@ -32,7 +32,7 @@ describe('getCSVurl', () => {
     const url = '/foreman_tasks/tasks';
     const query = { state: 'stopped' };
     expect(getCSVurl(url, query)).toEqual(
-      '/foreman_tasks/tasks.csv?state=stopped'
+      '/foreman_tasks/tasks.csv?search=%28state%3Dstopped%29'
     );
   });
   it('should return currect url for subtasks', () => {

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

@@ -92,7 +92,7 @@ exports[`TasksTablePage rendering render with Breadcrubs and edit permissions 1`
         />
         <ExportButton
           title="Export All"
-          url="/foreman_tasks/tasks.csv?action=%22some-name%22&state=stopped"
+          url="/foreman_tasks/tasks.csv?search=%28state%3Dstopped%29"
         />
         <ActionSelectButton
           disabled={true}
@@ -126,6 +126,11 @@ exports[`TasksTablePage rendering render with Breadcrubs and edit permissions 1`
         }
       }
       parentTaskID={null}
+      permissions={
+        Object {
+          "edit": false,
+        }
+      }
       reloadPage={[MockFunction]}
       results={
         Array [
@@ -227,7 +232,7 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
         />
         <ExportButton
           title="Export All"
-          url="/foreman_tasks/tasks.csv?action=%22some-name%22&state=stopped"
+          url="/foreman_tasks/tasks.csv?search=%28state%3Dstopped%29"
         />
         <ActionSelectButton
           disabled={true}
@@ -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 [],
   },
 }

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.0
+  version: 4.1.4
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-09 00:00:00.000000000 Z
+date: 2021-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow
@@ -138,6 +138,7 @@ files:
 - app/assets/javascripts/foreman_tasks/trigger_form.js
 - app/assets/stylesheets/foreman_tasks/foreman_tasks.css
 - app/assets/stylesheets/foreman_tasks/trigger_form.css
+- app/controllers/concerns/foreman_tasks/find_tasks_common.rb
 - app/controllers/foreman_tasks/api/recurring_logics_controller.rb
 - app/controllers/foreman_tasks/api/tasks_controller.rb
 - app/controllers/foreman_tasks/concerns/hosts_controller_extension.rb
@@ -166,6 +167,7 @@ files:
 - app/lib/actions/middleware/keep_current_taxonomies.rb
 - app/lib/actions/middleware/keep_current_timezone.rb
 - app/lib/actions/middleware/keep_current_user.rb
+- app/lib/actions/middleware/load_setting_values.rb
 - app/lib/actions/middleware/proxy_batch_triggering.rb
 - app/lib/actions/middleware/rails_executor_wrap.rb
 - app/lib/actions/middleware/recurring_logic.rb
@@ -196,7 +198,6 @@ files:
 - app/models/foreman_tasks/task_groups/recurring_logic_task_group.rb
 - app/models/foreman_tasks/triggering.rb
 - app/models/setting/foreman_tasks.rb
-- app/services/foreman_tasks/dashboard_table_filter.rb
 - app/services/foreman_tasks/proxy_selector.rb
 - app/services/foreman_tasks/troubleshooting_help_generator.rb
 - app/services/ui_notifications/tasks.rb
@@ -333,7 +334,6 @@ files:
 - test/unit/actions/recurring_action_test.rb
 - test/unit/cleaner_test.rb
 - test/unit/config/environment.rb
-- test/unit/dashboard_table_filter_test.rb
 - test/unit/dynflow_console_authorizer_test.rb
 - test/unit/locking_test.rb
 - test/unit/otp_manager_test.rb
@@ -648,7 +648,6 @@ test_files:
 - test/unit/actions/recurring_action_test.rb
 - test/unit/cleaner_test.rb
 - test/unit/config/environment.rb
-- test/unit/dashboard_table_filter_test.rb
 - test/unit/dynflow_console_authorizer_test.rb
 - test/unit/locking_test.rb
 - test/unit/otp_manager_test.rb

data/app/services/foreman_tasks/dashboard_table_filter.rb

@@ -1,56 +0,0 @@
-module ForemanTasks
-  # narrows the scope for the tasks table based on params coming from tasks dashboard
-  #
-  # Supported filters:
-  #
-  #  * :result
-  #  * :state
-  #  * :time_horizon - expected format of Hxy, where the xy is the time horizon in hours we're interested in
-  #      :time_mode can be set to 'recent' to filter the recent tasks, or 'older' (default) to filter earlier ones
-  class DashboardTableFilter
-    def initialize(scope, params)
-      @scope = scope
-      @params = params
-    end
-
-    def scope
-      @new_scope = @scope
-      scope_by(:result)
-      scope_by(:state)
-      scope_by_time
-      @new_scope
-    end
-
-    private
-
-    def scope_by(field)
-      if (field == :result) && (@params[field] == 'other')
-        @new_scope = @new_scope.where(:result => ['cancelled', 'pending'])
-      elsif @params[field].present?
-        @new_scope = @new_scope.where(field => @params[field])
-      end
-    end
-
-    def scope_by_time
-      return if @params[:time_horizon].blank?
-      hours = if @params[:time_horizon].casecmp('week') == 0
-                24 * 7
-              else
-                @params[:time_horizon][/\AH(\d{1,2})$/i, 1]
-              end
-
-      unless hours
-        raise Foreman::Exception, 'Unexpected format of time: should be in form of "H24" or equal to "week"'
-      end
-      timestamp = Time.now.utc - hours.to_i.hours
-      case @params[:time_mode]
-      when 'recent'
-        operator = '>'
-      else
-        operator = '<'
-        search_suffix = 'OR state_updated_at IS NULL'
-      end
-      @new_scope = @new_scope.where("state_updated_at #{operator} ? #{search_suffix}", timestamp)
-    end
-  end
-end

data/test/unit/dashboard_table_filter_test.rb

@@ -1,77 +0,0 @@
-require 'foreman_tasks_test_helper'
-
-class DashboardTableFilterTest < ActiveSupport::TestCase
-  before do
-    ::ForemanTasks::Task.delete_all
-  end
-
-  describe ForemanTasks::DashboardTableFilter do
-    before do
-      @tasks_builder = HistoryTasksBuilder.new
-      @scope = ForemanTasks::Task.all
-      @tasks_builder.build
-    end
-
-    let :subject do
-      ForemanTasks::DashboardTableFilter.new(@scope, params)
-    end
-
-    let :filtered_scope do
-      subject.scope
-    end
-
-    describe 'by result' do
-      let(:params) { { result: 'warning' } }
-
-      it 'filters' do
-        _(filtered_scope.count).must_equal @tasks_builder.distribution['stopped'][:by_result]['warning'][:total]
-      end
-    end
-
-    describe 'by state' do
-      let(:params) { { state: 'running' } }
-
-      it 'filters' do
-        _(filtered_scope.count).must_equal @tasks_builder.distribution['running'][:total]
-      end
-    end
-
-    describe 'recent' do
-      let(:params) do
-        { state: 'running',
-          time_horizon: 'H24',
-          time_mode: 'recent' }
-      end
-
-      it 'filters' do
-        _(filtered_scope.count).must_equal @tasks_builder.distribution['running'][:recent]
-      end
-    end
-
-    describe 'recent week time horizon' do
-      let(:params) do
-        { state: 'running',
-          time_horizon: 'week',
-          time_mode: 'recent' }
-      end
-
-      it 'filters' do
-        _(filtered_scope.count).must_equal @tasks_builder.distribution['running'][:recent]
-      end
-    end
-
-    describe 'older' do
-      let(:params) do
-        { state: 'running',
-          time_horizon: 'H24',
-          time_mode: 'older' }
-      end
-
-      it 'filters' do
-        old_tasks_count = @tasks_builder.distribution['running'][:total] -
-                          @tasks_builder.distribution['running'][:recent]
-        _(filtered_scope.count).must_equal old_tasks_count
-      end
-    end
-  end
-end