foreman-tasks 5.2.2 → 6.0.1

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

@@ -4,7 +4,7 @@ import { Table } from 'foremanReact/components/common/table';
 import { STATUS } from 'foremanReact/constants';
 import MessageBox from 'foremanReact/components/common/MessageBox';
 import { translate as __ } from 'foremanReact/common/I18n';
-import Pagination from 'foremanReact/components/Pagination/PaginationWrapper';
+import Pagination from 'foremanReact/components/Pagination';
 import { getURIQuery } from 'foremanReact/common/helpers';
 import createTasksTableSchema from './TasksTableSchema';
 import { updateURlQuery } from './TasksTableHelpers';
@@ -18,7 +18,6 @@ const TasksTable = ({
   results,
   history,
   itemCount,
-  pagination,
   selectedRows,
   selectPage,
   unselectAllRows,
@@ -82,16 +81,6 @@ const TasksTable = ({
     return <span>{__('No Tasks')}</span>;
   }
 
-  const changeTablePage = ({ page, perPage }) => {
-    updateURlQuery(
-      {
-        page,
-        per_page: perPage,
-      },
-      history
-    );
-  };
-
   const setSortHistory = (by, order) => {
     updateURlQuery({ sort_by: by, sort_order: order }, history);
   };
@@ -133,14 +122,7 @@ const TasksTable = ({
         )}
         rows={results}
       />
-      <Pagination
-        className="tasks-pagination"
-        viewType="table"
-        itemCount={itemCount}
-        pagination={pagination}
-        onChange={changeTablePage}
-        dropdownButtonId="tasks-table-dropdown"
-      />
+      <Pagination itemCount={itemCount} />
     </div>
   );
 };
@@ -151,10 +133,6 @@ TasksTable.propTypes = {
   status: PropTypes.oneOf(Object.keys(STATUS)),
   error: PropTypes.instanceOf(Error),
   itemCount: PropTypes.number.isRequired,
-  pagination: PropTypes.shape({
-    page: PropTypes.number,
-    perPage: PropTypes.number,
-  }),
   history: PropTypes.object.isRequired,
   openClickedModal: PropTypes.func.isRequired,
   selectedRows: PropTypes.array,
@@ -172,10 +150,6 @@ TasksTable.propTypes = {
 TasksTable.defaultProps = {
   status: STATUS.PENDING,
   error: null,
-  pagination: {
-    page: 1,
-    perPage: 20,
-  },
   selectedRows: [],
   allRowsSelected: false,
   permissions: {

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

@@ -99,10 +99,10 @@ const TasksTablePage = ({
         <React.Fragment>
           {props.permissions.edit &&
             showSelectAll &&
-            props.itemCount >= props.pagination.perPage && (
+            props.itemCount >= props.perPage && (
               <SelectAllAlert
                 itemCount={props.itemCount}
-                perPage={props.pagination.perPage}
+                perPage={props.perPage}
                 selectAllRows={selectAllRows}
                 unselectAllRows={props.unselectAllRows}
                 allRowsSelected={props.allRowsSelected}
@@ -118,9 +118,8 @@ const TasksTablePage = ({
 TasksTablePage.propTypes = {
   allRowsSelected: PropTypes.bool,
   itemCount: PropTypes.number.isRequired,
-  pagination: PropTypes.shape({
-    perPage: PropTypes.number,
-  }),
+  perPage: PropTypes.number,
+
   selectAllRows: PropTypes.func.isRequired,
   results: PropTypes.array.isRequired,
   getTableItems: PropTypes.func.isRequired,
@@ -142,10 +141,7 @@ TasksTablePage.propTypes = {
 };
 
 TasksTablePage.defaultProps = {
-  pagination: {
-    page: 1,
-    perPage: 20,
-  },
+  perPage: 20,
   allRowsSelected: false,
   actionName: '',
   status: STATUS.PENDING,

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

@@ -21,7 +21,6 @@ export const TasksTableQueryReducer = (state = initialState, action) => {
   const { type, payload, response } = action;
   const {
     subtotal,
-    page,
     per_page: perPageString,
     action_name: actionName,
     can_edit: canEdit,
@@ -34,10 +33,7 @@ export const TasksTableQueryReducer = (state = initialState, action) => {
       return Immutable.merge(state, {
         itemCount: subtotal,
         actionName,
-        pagination: {
-          page: Number(page),
-          perPage: Number(perPageString),
-        },
+        perPage: Number(perPageString),
         selectedRows: [],
         permissions: {
           edit: canEdit,

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

@@ -12,8 +12,8 @@ export const selectTasksTableContent = state =>
 export const selectTasksTableQuery = state =>
   selectTasksTable(state).tasksTableQuery || {};
 
-export const selectPagitation = state =>
-  selectTasksTableQuery(state).pagination || {};
+export const selectPerPage = state =>
+  selectTasksTableQuery(state).perPage || 20;
 
 export const selectItemCount = state =>
   selectTasksTableQuery(state).itemCount || 0;

data/webpack/ForemanTasks/Components/TasksTable/__tests__/TasksTable.fixtures.js

@@ -11,10 +11,7 @@ export const minProps = {
   unselectRow: jest.fn(),
   reloadPage: jest.fn(),
   selectedRows: [],
-  pagination: {
-    page: 1,
-    perPage: 10,
-  },
+  perPage: 10,
   history: { location: { search: '' } },
   results: ['a', 'b'],
   sort: {

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

@@ -23,13 +23,8 @@ exports[`SubTasksPage rendering render with minimal props 1`] = `
   openClickedModal={[MockFunction]}
   openModal={[MockFunction]}
   openModalAction={[MockFunction]}
-  pagination={
-    Object {
-      "page": 1,
-      "perPage": 10,
-    }
-  }
   parentTaskID="some-id"
+  perPage={10}
   reloadPage={[MockFunction]}
   results={
     Array [

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

@@ -15,12 +15,7 @@ exports[`TasksIndexPage rendering render with minimal props 1`] = `
   openClickedModal={[MockFunction]}
   openModal={[MockFunction]}
   openModalAction={[MockFunction]}
-  pagination={
-    Object {
-      "page": 1,
-      "perPage": 10,
-    }
-  }
+  perPage={10}
   reloadPage={[MockFunction]}
   results={
     Array [

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

@@ -20,18 +20,8 @@ exports[`TasksTable rendering render with loading Props 1`] = `
       ]
     }
   />
-  <PaginationWrapper
-    className="tasks-pagination"
-    dropdownButtonId="tasks-table-dropdown"
+  <Pagination
     itemCount={2}
-    onChange={[Function]}
-    pagination={
-      Object {
-        "page": 1,
-        "perPage": 10,
-      }
-    }
-    viewType="table"
   />
 </div>
 `;
@@ -49,18 +39,8 @@ exports[`TasksTable rendering render with minimal Props 1`] = `
       ]
     }
   />
-  <PaginationWrapper
-    className="tasks-pagination"
-    dropdownButtonId="tasks-table-dropdown"
+  <Pagination
     itemCount={2}
-    onChange={[Function]}
-    pagination={
-      Object {
-        "page": 1,
-        "perPage": 10,
-      }
-    }
-    viewType="table"
   />
 </div>
 `;

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

@@ -119,13 +119,8 @@ exports[`TasksTablePage rendering render with Breadcrubs and edit permissions 1`
       itemCount={2}
       openClickedModal={[MockFunction]}
       openModal={[Function]}
-      pagination={
-        Object {
-          "page": 1,
-          "perPage": 10,
-        }
-      }
       parentTaskID={null}
+      perPage={10}
       permissions={
         Object {
           "edit": false,
@@ -259,13 +254,8 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
       itemCount={2}
       openClickedModal={[MockFunction]}
       openModal={[Function]}
-      pagination={
-        Object {
-          "page": 1,
-          "perPage": 10,
-        }
-      }
       parentTaskID={null}
+      perPage={10}
       permissions={
         Object {
           "edit": false,

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

@@ -55,10 +55,7 @@ Object {
   "tasksTableQuery": Object {
     "actionName": undefined,
     "itemCount": 120,
-    "pagination": Object {
-      "page": 3,
-      "perPage": 12,
-    },
+    "perPage": 12,
     "permissions": Object {
       "edit": undefined,
     },

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

@@ -8,7 +8,7 @@ import {
   selectStatus,
   selectError,
   selectResults,
-  selectPagitation,
+  selectPerPage,
   selectItemCount,
   selectSort,
   selectActionName,
@@ -24,7 +24,7 @@ const mapStateToProps = state => ({
   error: selectError(state),
   sort: selectSort(state),
   results: selectResults(state),
-  pagination: selectPagitation(state),
+  perPage: selectPerPage(state),
   itemCount: selectItemCount(state),
   actionName: selectActionName(state),
   selectedRows: selectSelectedRows(state),

data/webpack/__mocks__/foremanReact/components/Pagination/index.js

@@ -0,0 +1,2 @@
+const Pagination = () => jest.fn();
+export default Pagination;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 5.2.2
+  version: 6.0.1
 platform: ruby
 authors:
 - Ivan Nečas
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: get_process_mem
   requirement: !ruby/object:Gem::Requirement
@@ -166,6 +166,7 @@ files:
 - app/lib/actions/proxy_action.rb
 - app/lib/actions/recurring_action.rb
 - app/lib/actions/serializers/active_record_serializer.rb
+- app/lib/actions/task_synchronization.rb
 - app/lib/actions/trigger_proxy_batch.rb
 - app/lib/foreman_tasks/concerns/polling_action_extensions.rb
 - app/lib/proxy_api/foreman_dynflow/dynflow_proxy.rb
@@ -188,7 +189,6 @@ files:
 - app/models/foreman_tasks/task_group_member.rb
 - 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/proxy_selector.rb
 - app/services/foreman_tasks/troubleshooting_help_generator.rb
 - app/services/ui_notifications/tasks.rb
@@ -250,7 +250,9 @@ files:
 - db/migrate/20200517215015_rename_bookmarks_controller.rb
 - db/migrate/20200519093217_drop_dynflow_allow_dangerous_actions_setting.foreman_tasks.rb
 - db/migrate/20200611090846_add_task_lock_index_on_resource_type_and_task_id.rb
+- db/migrate/20210708123832_add_parent_task_id_to_remote_tasks.foreman_tasks.rb
 - db/migrate/20210720115251_add_purpose_to_recurring_logic.rb
+- db/migrate/20211123170430_tasks_settings_to_dsl_category.rb
 - db/seeds.d/20-foreman_tasks_permissions.rb
 - db/seeds.d/30-notification_blueprints.rb
 - db/seeds.d/60-dynflow_proxy_feature.rb
@@ -271,7 +273,6 @@ files:
 - lib/foreman_tasks/dynflow.rb
 - lib/foreman_tasks/dynflow/configuration.rb
 - lib/foreman_tasks/dynflow/console_authorizer.rb
-- lib/foreman_tasks/dynflow/persistence.rb
 - lib/foreman_tasks/engine.rb
 - lib/foreman_tasks/task_error.rb
 - lib/foreman_tasks/tasks/cleanup.rake
@@ -571,7 +572,8 @@ files:
 - webpack/__mocks__/foremanReact/components/ForemanModal/ForemanModalHooks.js
 - webpack/__mocks__/foremanReact/components/ForemanModal/index.js
 - webpack/__mocks__/foremanReact/components/Layout/LayoutActions.js
-- webpack/__mocks__/foremanReact/components/Pagination/PaginationWrapper.js
+- webpack/__mocks__/foremanReact/components/Pagination/index.js
+- webpack/__mocks__/foremanReact/components/ToastsList/index.js
 - webpack/__mocks__/foremanReact/components/common/ActionButtons/ActionButtons.js
 - webpack/__mocks__/foremanReact/components/common/MessageBox.js
 - webpack/__mocks__/foremanReact/components/common/dates/LongDateTime.js
@@ -581,7 +583,6 @@ files:
 - webpack/__mocks__/foremanReact/constants.js
 - webpack/__mocks__/foremanReact/redux/API/APISelectors.js
 - webpack/__mocks__/foremanReact/redux/API/index.js
-- webpack/__mocks__/foremanReact/redux/actions/toasts.js
 - webpack/__mocks__/foremanReact/redux/middlewares/IntervalMiddleware.js
 - webpack/__mocks__/foremanReact/routes/common/PageLayout/PageLayout.js
 - webpack/__mocks__/foremanReact/routes/common/PageLayout/components/ExportButton/ExportButton.js

data/app/models/setting/foreman_tasks.rb

@@ -1,29 +0,0 @@
-class Setting::ForemanTasks < Setting
-  def self.default_settings
-    [
-      set('foreman_tasks_sync_task_timeout', N_('Number of seconds to wait for synchronous task to finish.'), 120, N_('Sync task timeout')),
-      set('dynflow_enable_console', N_('Enable the dynflow console (/foreman_tasks/dynflow) for debugging'), true, N_('Enable dynflow console')),
-      set('dynflow_console_require_auth', N_('Require user to be authenticated as user with admin rights when accessing dynflow console'), true, N_('Require auth for dynflow console')),
-      set('foreman_tasks_proxy_action_retry_count', N_('Number of attempts to start a task on the smart proxy before failing'), 4, N_('Proxy action retry count')),
-      set('foreman_tasks_proxy_action_retry_interval', N_('Time in seconds between retries'), 15, N_('Proxy action retry interval')),
-      set('foreman_tasks_proxy_batch_trigger', N_('Allow triggering tasks on the smart proxy in batches'), true, N_('Allow proxy batch tasks')),
-      set('foreman_tasks_proxy_batch_size', N_('Number of tasks which should be sent to the smart proxy in one request, if foreman_tasks_proxy_batch_trigger is enabled'), 100, N_('Proxy tasks batch size')),
-      set('foreman_tasks_troubleshooting_url',
-          N_('Url pointing to the task troubleshooting documentation. '\
-             'It should contain %{label} placeholder, that will be replaced with normalized task label '\
-             '(restricted to only alphanumeric characters)). %{version} placeholder is also available.'),
-          nil, N_('Tasks troubleshooting URL')),
-      set('foreman_tasks_polling_multiplier',
-          N_('Polling multiplier which is used to multiply the default polling intervals. '\
-             'This can be used to prevent polling too frequently for long running tasks.'),
-          1,
-          N_("Polling intervals multiplier")),
-    ]
-  end
-
-  def self.load_defaults
-    Setting::BLANK_ATTRS.push('foreman_tasks_troubleshooting_url')
-    Setting::NONZERO_ATTRS.push('foreman_tasks_polling_multiplier')
-    super
-  end
-end

data/lib/foreman_tasks/dynflow/persistence.rb

@@ -1,46 +0,0 @@
-module ForemanTasks
-  # Wrap the Dynflow persistence to reflect the changes to execution plan
-  # in the Task model. This is probably a temporary solution and
-  # Dynflow will probably get more events-based API but it should be enought
-  # for start, until the requiements on the API are clear enough.
-  class Dynflow::Persistence < ::Dynflow::PersistenceAdapters::Sequel
-    def save_execution_plan(execution_plan_id, value)
-      # clear connection only if not running in some active record transaction already
-      clear_connections = ActiveRecord::Base.connection.open_transactions.zero?
-      super.tap do
-        on_execution_plan_save(execution_plan_id, value)
-      rescue => e
-        Foreman::Logging.exception('Error on on_execution_plan_save event', e,
-                                   :logger => 'dynflow')
-      end
-    ensure
-      ::ActiveRecord::Base.clear_active_connections! if clear_connections
-    end
-
-    def on_execution_plan_save(execution_plan_id, data)
-      # We can load the data unless the execution plan was properly planned and saved
-      # including its steps
-      case data[:state]
-      when :pending
-        task = ForemanTasks::Task::DynflowTask.new_for_execution_plan(execution_plan_id, data)
-        task.start_at ||= Time.zone.now
-        task.save!
-      when :scheduled
-        delayed_plan = load_delayed_plan(execution_plan_id)
-        raise Foreman::Exception, 'Plan is delayed but the delay record is missing' if delayed_plan.nil?
-        task = ::ForemanTasks::Task::DynflowTask.find_by!(:external_id => execution_plan_id)
-        task.update_from_dynflow(data.merge(:start_at => delayed_plan[:start_at],
-                                            :start_before => delayed_plan[:start_before]))
-      when :planning
-        task = ::ForemanTasks::Task::DynflowTask.where(:external_id => execution_plan_id).first
-        task.update_from_dynflow(data)
-      else
-        if (task = ::ForemanTasks::Task::DynflowTask.where(:external_id => execution_plan_id).first)
-          unless task.state.to_s == data[:state].to_s
-            task.update_from_dynflow(data)
-          end
-        end
-      end
-    end
-  end
-end

data/webpack/__mocks__/foremanReact/components/Pagination/PaginationWrapper.js

@@ -1,2 +0,0 @@
-const PaginationWrapper = () => jest.fn();
-export default PaginationWrapper;