foreman-tasks 4.1.6 → 5.0.0

data/test/graphql/queries/recurring_logics_query_test.rb

@@ -0,0 +1,30 @@
+require 'foreman_tasks_test_helper'
+
+module Queries
+  class RecurringLogicsTest < GraphQLQueryTestCase
+    let(:query) do
+      <<-GRAPHQL
+      query {
+        recurringLogics {
+          nodes {
+            id
+            cronLine
+          }
+        }
+      }
+      GRAPHQL
+    end
+
+    let(:data) { result['data']['recurringLogics'] }
+
+    setup do
+      FactoryBot.create_list(:recurring_logic, 2)
+    end
+
+    test "should fetch recurring logics" do
+      assert_empty result['errors']
+      expected_count = ::ForemanTasks::RecurringLogic.count
+      assert_not_equal 0, expected_count
+    end
+  end
+end

data/test/graphql/queries/task_query_test.rb

@@ -0,0 +1,33 @@
+require 'foreman_tasks_test_helper'
+
+module Queries
+  class TaskQueryTest < GraphQLQueryTestCase
+    let(:query) do
+      <<-GRAPHQL
+      query (
+        $id: String!
+      ) {
+        task(id: $id) {
+          id
+          action
+          result
+        }
+      }
+      GRAPHQL
+    end
+
+    let(:res) { 'inconclusive' }
+    let(:task) { FactoryBot.create(:some_task, :result => res) }
+
+    let(:global_id) { Foreman::GlobalId.for(task) }
+    let(:variables) { { id: global_id } }
+    let(:data) { result['data']['task'] }
+
+    test 'should fetch task data' do
+      assert_empty result['errors']
+
+      assert_equal global_id, data['id']
+      assert_equal task.result, data['result']
+    end
+  end
+end

data/test/graphql/queries/tasks_query_test.rb

@@ -0,0 +1,31 @@
+require 'foreman_tasks_test_helper'
+
+module Queries
+  class TasksQueryTest < GraphQLQueryTestCase
+    let(:query) do
+      <<-GRAPHQL
+      query {
+        tasks {
+          nodes {
+            id
+            action
+            result
+          }
+        }
+      }
+      GRAPHQL
+    end
+
+    let(:data) { result['data']['tasks'] }
+
+    setup do
+      FactoryBot.create_list(:some_task, 2)
+    end
+
+    test "should fetch recurring logics" do
+      assert_empty result['errors']
+      expected_count = ::ForemanTasks::Task.count
+      assert_not_equal 0, expected_count
+    end
+  end
+end

data/test/unit/dashboard_table_filter_test.rb

@@ -0,0 +1,77 @@
+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

data/test/unit/task_test.rb

@@ -296,12 +296,12 @@ class TasksTest < ActiveSupport::TestCase
   end
 
   describe 'search for resource_ids' do
-    it 'finds tasks' do
-      label = 'label1'
-      resource_ids = [1, 2]
-      resource_type = 'restype1'
+    label = 'label1'
+    resource_ids = [1, 2]
+    resource_type = 'restype1'
 
-      task1_old = FactoryBot.create(
+    let(:task1_old) do
+      FactoryBot.create(
         :task_with_links,
         started_at: '2019-10-01 11:15:55',
         ended_at: '2019-10-01 11:15:57',
@@ -309,7 +309,9 @@ class TasksTest < ActiveSupport::TestCase
         label: label,
         resource_type: resource_type
       )
-      task1_new = FactoryBot.create(
+    end
+    let(:task1_new) do
+      FactoryBot.create(
         :task_with_links,
         started_at: '2019-10-02 11:15:55',
         ended_at: '2019-10-02 11:15:57',
@@ -317,7 +319,9 @@ class TasksTest < ActiveSupport::TestCase
         label: label,
         resource_type: resource_type
       )
-      task2 = FactoryBot.create(
+    end
+    let(:task2) do
+      FactoryBot.create(
         :task_with_links,
         started_at: '2019-10-03 11:15:55',
         ended_at: '2019-10-03 11:15:57',
@@ -325,7 +329,9 @@ class TasksTest < ActiveSupport::TestCase
         label: label,
         resource_type: resource_type
       )
-      task3 = FactoryBot.create(
+    end
+    let(:task3) do
+      FactoryBot.create(
         :task_with_links,
         started_at: '2019-10-03 11:15:55',
         ended_at: '2019-10-03 11:15:57',
@@ -333,6 +339,13 @@ class TasksTest < ActiveSupport::TestCase
         label: label,
         resource_type: 'another_type'
       )
+    end
+
+    it 'finds tasks' do
+      task1_old
+      task1_new
+      task2
+      task3
 
       result = ForemanTasks::Task.search_for(
         "resource_id ^ (#{resource_ids.join(',')}) and resource_type = #{resource_type}"
@@ -343,5 +356,23 @@ class TasksTest < ActiveSupport::TestCase
       assert_includes result, task2
       assert_not_includes result, task3
     end
+
+    it 'finds latest task for each resource_id' do
+      task1_old
+      task1_new
+      task2
+      task3
+
+      result = ForemanTasks::Task.latest_tasks_by_resource_ids(
+        label,
+        resource_type,
+        resource_ids
+      )
+      assert_equal 2, result.length
+      assert_equal resource_ids, result.keys.sort
+      assert_equal task1_new, result[1]
+      assert_equal task2, result[2]
+      assert_not_includes result.values, task3
+    end
   end
 end

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

@@ -15,29 +15,22 @@ 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}` : '';
-  let resultQuery = '';
-  if (result === 'other') {
-    resultQuery = 'result ^ (pending, cancelled)';
-  } else {
-    resultQuery = result ? `result=${result}` : '';
-  }
+  const resultQuery = result ? `result=${result}` : '';
   if (timeMode === TASKS_DASHBOARD_JS_QUERY_MODES.RECENT) {
-    dashboardTime = `state_updated_at>${timestamp.toISOString()} or null? state_updated_at`;
+    dashboardTime = `(state_updated_at>${timestamp.toISOString()} or state_updated_at = NULL)`;
   } 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 ? { search: newQuery, ...rest } : rest;
+  return newQuery;
 };
 
 export const resumeToastInfo = {

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

@@ -27,18 +27,9 @@ describe('convertDashboardQuery', () => {
       result: 'error',
       search: 'action~job',
     };
-    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 });
+    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)'
+    );
     // Cleanup
     global.Date = realDate;
   });
@@ -46,23 +37,10 @@ describe('convertDashboardQuery', () => {
     const query = {
       search: 'action~job',
     };
-    expect(convertDashboardQuery(query)).toEqual({ search: '(action~job)' });
+    expect(convertDashboardQuery(query)).toEqual('action~job');
   });
   it('convertDashboardQuery should work with no query', () => {
     const query = {};
-    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))',
-    });
+    expect(convertDashboardQuery(query)).toEqual('');
   });
 });

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

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

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

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

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

@@ -2,7 +2,6 @@ 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);
@@ -18,7 +17,7 @@ export const getApiPathname = url => {
 export const getCSVurl = (path, query) => {
   let url = new URI(path);
   url = url.pathname(`${url.pathname()}.csv`);
-  url.addSearch(convertDashboardQuery(query));
+  url.addSearch(query);
   return url.toString();
 };
 

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

@@ -77,14 +77,11 @@ const TasksTablePage = ({
             </Button>
             {props.status === STATUS.PENDING && <Spinner size="md" loading />}
             <ExportButton
-              url={getCSVurl(history.location.pathname, uriQuery)}
+              url={getCSVurl(url, uriQuery)}
               title={__('Export All')}
             />
             <ActionSelectButton
-              disabled={
-                !props.permissions.edit ||
-                !(props.selectedRows.length || props.allRowsSelected)
-              }
+              disabled={!(props.selectedRows.length || props.allRowsSelected)}
               onCancel={() => openModal(CANCEL_SELECTED_MODAL)}
               onResume={() => openModal(RESUME_SELECTED_MODAL)}
               onForceCancel={() => openModal(FORCE_UNLOCK_SELECTED_MODAL)}
@@ -97,17 +94,15 @@ const TasksTablePage = ({
         }
       >
         <React.Fragment>
-          {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}
-              />
-            )}
+          {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>
@@ -136,9 +131,6 @@ TasksTablePage.propTypes = {
   showSelectAll: PropTypes.bool,
   unselectAllRows: PropTypes.func.isRequired,
   reloadPage: PropTypes.func.isRequired,
-  permissions: PropTypes.shape({
-    edit: PropTypes.bool,
-  }),
 };
 
 TasksTablePage.defaultProps = {
@@ -154,9 +146,6 @@ TasksTablePage.defaultProps = {
   createHeader: () => __('Tasks'),
   showSelectAll: false,
   modalID: '',
-  permissions: {
-    edit: false,
-  },
 };
 
 export default TasksTablePage;

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

@@ -19,13 +19,8 @@ const initialState = Immutable({
 
 export const TasksTableQueryReducer = (state = initialState, action) => {
   const { type, payload, response } = action;
-  const {
-    subtotal,
-    page,
-    per_page: perPageString,
-    action_name: actionName,
-    can_edit: canEdit,
-  } = response || {};
+  const { subtotal, page, per_page: perPageString, action_name: actionName } =
+    response || {};
   const ACTION_TYPES = createTableActionTypes(TASKS_TABLE_ID);
   switch (type) {
     case SELECT_ALL_ROWS:
@@ -39,22 +34,26 @@ 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:
-      return state
-        .set(
-          'selectedRows',
-          state.selectedRows.filter(row => row !== payload.id)
-        )
-        .set('showSelectAll', false)
-        .set('allRowsSelected', false);
+      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)
+      );
     case UNSELECT_ALL_ROWS:
       return state
         .set('selectedRows', [])

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

@@ -24,9 +24,6 @@ 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?search=%28state%3Dstopped%29'
+      '/foreman_tasks/tasks.csv?state=stopped'
     );
   });
   it('should return currect url for subtasks', () => {

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

@@ -73,9 +73,7 @@ const fixtures = {
     },
   },
   'should handle UNSELECT_ROWS with all rows selected': {
-    state: Immutable({
-      tasksTableQuery: { allRowsSelected: true, selectedRows: [3, 4, 5] },
-    }),
+    state: Immutable({ tasksTableQuery: { allRowsSelected: true } }),
     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?search=%28state%3Dstopped%29"
+          url="/foreman_tasks/tasks.csv?action=%22some-name%22&state=stopped"
         />
         <ActionSelectButton
           disabled={true}
@@ -126,11 +126,6 @@ exports[`TasksTablePage rendering render with Breadcrubs and edit permissions 1`
         }
       }
       parentTaskID={null}
-      permissions={
-        Object {
-          "edit": false,
-        }
-      }
       reloadPage={[MockFunction]}
       results={
         Array [
@@ -232,7 +227,7 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
         />
         <ExportButton
           title="Export All"
-          url="/foreman_tasks/tasks.csv?search=%28state%3Dstopped%29"
+          url="/foreman_tasks/tasks.csv?action=%22some-name%22&state=stopped"
         />
         <ActionSelectButton
           disabled={true}
@@ -266,11 +261,6 @@ 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,9 +59,6 @@ Object {
       "page": 3,
       "perPage": 12,
     },
-    "permissions": Object {
-      "edit": undefined,
-    },
     "selectedRows": Array [],
   },
 }
@@ -80,9 +77,7 @@ 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,7 +3,6 @@
 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, permissions: { edit: true } },
+        { allPageSelected: () => true },
         'some-label'
       )
     ).toMatchSnapshot();

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

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