foreman-tasks 5.0.0 → 5.1.0

data/webpack/ForemanTasks/Components/TaskActions/TaskActionHelpers.js

@@ -15,22 +15,29 @@ export const convertDashboardQuery = query => {
     state,
     result,
     search,
+    ...rest
   } = query;
 
   const hours = timeToHoursNumber(timeHorizon);
   const timestamp = new Date(new Date() - hours * 60 * 60 * 1000);
   let dashboardTime = '';
   const stateQuery = state ? `state=${state}` : '';
-  const resultQuery = result ? `result=${result}` : '';
+  let resultQuery = '';
+  if (result === 'other') {
+    resultQuery = 'result ^ (pending, cancelled)';
+  } else {
+    resultQuery = result ? `result=${result}` : '';
+  }
   if (timeMode === TASKS_DASHBOARD_JS_QUERY_MODES.RECENT) {
-    dashboardTime = `(state_updated_at>${timestamp.toISOString()} or state_updated_at = NULL)`;
+    dashboardTime = `state_updated_at>${timestamp.toISOString()} or null? state_updated_at`;
   } else if (timeMode === TASKS_DASHBOARD_JS_QUERY_MODES.OLDER) {
-    dashboardTime = `(state_updated_at>${timestamp.toISOString()})`;
+    dashboardTime = `state_updated_at<=${timestamp.toISOString()}`;
   }
   const newQuery = [stateQuery, resultQuery, search, dashboardTime]
     .filter(Boolean)
+    .map(q => `(${q})`)
     .join(' and ');
-  return newQuery;
+  return newQuery ? { search: newQuery, ...rest } : rest;
 };
 
 export const resumeToastInfo = {

data/webpack/ForemanTasks/Components/TaskActions/TaskActionHelpers.test.js

@@ -27,9 +27,18 @@ describe('convertDashboardQuery', () => {
       result: 'error',
       search: 'action~job',
     };
-    expect(convertDashboardQuery(query)).toEqual(
-      'state=stopped and result=error and action~job and (state_updated_at>2020-05-01T11:01:58.135Z or state_updated_at = NULL)'
-    );
+    const expected =
+      '(state=stopped) and (result=error) and (action~job) and (state_updated_at>2020-05-01T11:01:58.135Z or null? state_updated_at)';
+
+    expect(convertDashboardQuery(query)).toEqual({ search: expected });
+
+    const query2 = {
+      ...query,
+      time_mode: TASKS_DASHBOARD_JS_QUERY_MODES.OLDER,
+    };
+    const expected2 =
+      '(state=stopped) and (result=error) and (action~job) and (state_updated_at<=2020-05-01T11:01:58.135Z)';
+    expect(convertDashboardQuery(query2)).toEqual({ search: expected2 });
     // Cleanup
     global.Date = realDate;
   });
@@ -37,10 +46,23 @@ describe('convertDashboardQuery', () => {
     const query = {
       search: 'action~job',
     };
-    expect(convertDashboardQuery(query)).toEqual('action~job');
+    expect(convertDashboardQuery(query)).toEqual({ search: '(action~job)' });
   });
   it('convertDashboardQuery should work with no query', () => {
     const query = {};
-    expect(convertDashboardQuery(query)).toEqual('');
+    expect(convertDashboardQuery(query)).toEqual({});
+  });
+  it('convertDashboardQuery should not override unknown keys', () => {
+    const query = { weather: 'nice', search: 'okay', number: 7 };
+    expect(convertDashboardQuery(query)).toEqual({
+      ...query,
+      search: '(okay)',
+    });
+  });
+  it('convertDashboardQuery should expand other result', () => {
+    const query = { result: 'other' };
+    expect(convertDashboardQuery(query)).toEqual({
+      search: '(result ^ (pending, cancelled))',
+    });
   });
 });

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/TasksTableActions.js

@@ -18,9 +18,14 @@ import {
   resumeTaskRequest,
   forceCancelTaskRequest,
 } from '../TaskActions';
+import { convertDashboardQuery } from '../TaskActions/TaskActionHelpers';
 
 export const getTableItems = url =>
-  getTableItemsAction(TASKS_TABLE_ID, getURIQuery(url), getApiPathname(url));
+  getTableItemsAction(
+    TASKS_TABLE_ID,
+    convertDashboardQuery(getURIQuery(url)),
+    getApiPathname(url)
+  );
 
 export const reloadPage = (url, parentTaskID) => dispatch => {
   dispatch(getTableItems(url));

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

@@ -2,6 +2,7 @@ import URI from 'urijs';
 import { translate as __, documentLocale } from 'foremanReact/common/I18n';
 import humanizeDuration from 'humanize-duration';
 import { isoCompatibleDate } from 'foremanReact/common/helpers';
+import { convertDashboardQuery } from '../TaskActions/TaskActionHelpers';
 
 export const updateURlQuery = (query, history) => {
   const uri = new URI(history.location.pathname + history.location.search);
@@ -17,7 +18,7 @@ export const getApiPathname = url => {
 export const getCSVurl = (path, query) => {
   let url = new URI(path);
   url = url.pathname(`${url.pathname()}.csv`);
-  url.addSearch(query);
+  url.addSearch(convertDashboardQuery(query));
   return url.toString();
 };
 

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

@@ -77,11 +77,14 @@ const TasksTablePage = ({
             </Button>
             {props.status === STATUS.PENDING && <Spinner size="md" loading />}
             <ExportButton
-              url={getCSVurl(url, uriQuery)}
+              url={getCSVurl(history.location.pathname, uriQuery)}
               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__/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__/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

@@ -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 [],
   },
 }
@@ -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: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-15 00:00:00.000000000 Z
+date: 2021-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow
@@ -165,6 +165,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/trigger_proxy_batch.rb
 - app/lib/foreman_tasks/concerns/polling_action_extensions.rb
 - app/lib/proxy_api/foreman_dynflow/dynflow_proxy.rb
 - app/models/foreman_tasks/concerns/action_subject.rb
@@ -187,7 +188,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
@@ -249,6 +249,7 @@ 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/20210720115251_add_purpose_to_recurring_logic.rb
 - db/seeds.d/20-foreman_tasks_permissions.rb
 - db/seeds.d/30-notification_blueprints.rb
 - db/seeds.d/60-dynflow_proxy_feature.rb
@@ -257,6 +258,8 @@ files:
 - deploy/foreman-tasks.sysconfig
 - extra/dynflow-debug.sh
 - extra/dynflow-executor.example
+- extra/foreman-tasks-cleanup.sh
+- extra/foreman-tasks-export.sh
 - foreman-tasks.gemspec
 - gemfile.d/foreman-tasks.rb
 - lib/foreman-tasks.rb
@@ -323,9 +326,9 @@ files:
 - test/unit/actions/bulk_action_test.rb
 - test/unit/actions/proxy_action_test.rb
 - test/unit/actions/recurring_action_test.rb
+- test/unit/actions/trigger_proxy_batch_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/proxy_selector_test.rb
@@ -637,9 +640,9 @@ test_files:
 - test/unit/actions/bulk_action_test.rb
 - test/unit/actions/proxy_action_test.rb
 - test/unit/actions/recurring_action_test.rb
+- test/unit/actions/trigger_proxy_batch_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/proxy_selector_test.rb