foreman-tasks 0.15.6 → 0.15.7

data/test/controllers/api/tasks_controller_test.rb

@@ -25,6 +25,13 @@ module ForemanTasks
           assert_response :missing
           assert_includes @response.body, 'Resource task not found by id'
         end
+
+        it 'does not show task the user is not allowed to see' do
+          setup_user('view', 'foreman_tasks', 'owner.id = current_user')
+          get :show, params: { id: FactoryBot.create(:some_task).id },
+                     session: set_session_user(User.current)
+          assert_response :not_found
+        end
       end
 
       describe 'GET /api/tasks/summary' do
@@ -41,24 +48,41 @@ module ForemanTasks
               suspend
             end
           end
+
+          def self.while_suspended
+            triggered = ForemanTasks.trigger(DummyTestSummaryAction, true)
+            wait_for { ForemanTasks::Task.find_by(external_id: triggered.id).state == 'running' }
+            wait_for do
+              w = ForemanTasks.dynflow.world
+              w.persistence.load_step(triggered.id, 2, w).state == :suspended
+            end
+            yield
+            ForemanTasks.dynflow.world.event(triggered.id, 2, nil)
+            triggered.finished.wait
+          end
         end
 
         test_attributes :pid => 'bdcab413-a25d-4fe1-9db4-b50b5c31ebce'
         it 'get tasks summary' do
-          triggered = ForemanTasks.trigger(DummyTestSummaryAction, true)
-          wait_for { ForemanTasks::Task.find_by(external_id: triggered.id).state == 'running' }
-          wait_for do
-            w = ForemanTasks.dynflow.world
-            w.persistence.load_step(triggered.id, 2, w).state == :suspended
+          DummyTestSummaryAction.while_suspended do
+            get :summary
+            assert_response :success
+            response = JSON.parse(@response.body)
+            assert_kind_of Array, response
+            assert_not response.empty?
+            assert_kind_of Hash, response[0]
+          end
+        end
+
+        it 'gets tasks summary only for tasks the user is allowed to see' do
+          DummyTestSummaryAction.while_suspended do
+            setup_user('view', 'foreman_tasks', 'owner.id = current_user')
+            get :summary
+            assert_response :success
+            response = JSON.parse(@response.body)
+            assert_kind_of Array, response
+            assert response.empty?
           end
-          get :summary
-          assert_response :success
-          response = JSON.parse(@response.body)
-          assert_kind_of Array, response
-          assert_not response.empty?
-          assert_kind_of Hash, response[0]
-          ForemanTasks.dynflow.world.event(triggered.id, 2, nil)
-          triggered.finished.wait
         end
       end
 

data/test/controllers/tasks_controller_test.rb

@@ -32,6 +32,15 @@ module ForemanTasks
           response = JSON.parse(@response.body)
           assert response['running']
         end
+
+        it 'shows summary only for the tasks the user is allowed to see' do
+          setup_user('view', 'foreman_tasks', 'owner.id = current_user')
+          FactoryBot.create(:some_task)
+          get(:summary, params: { recent_timeframe: 24 }, session: set_session_user(User.current))
+          assert_response :success
+          response = JSON.parse(@response.body)
+          assert_equal 0, response['stopped']['total']
+        end
       end
 
       it 'supports csv export' do
@@ -42,6 +51,24 @@ module ForemanTasks
         assert_include response.body.lines[1], 'Some action'
       end
 
+      describe 'show' do
+        it 'does not allow user without permissions to see task details' do
+          setup_user('view', 'foreman_tasks', 'owner.id = current_user')
+          get :show, params: { id: FactoryBot.create(:some_task).id },
+                     session: set_session_user(User.current)
+          assert_response :not_found
+        end
+      end
+
+      describe 'sub_tasks' do
+        it 'does not allow user without permissions to see task details' do
+          setup_user('view', 'foreman_tasks', 'owner.id = current_user')
+          get :sub_tasks, params: { id: FactoryBot.create(:some_task).id },
+                          session: set_session_user(User.current)
+          assert_response :not_found
+        end
+      end
+
       describe 'taxonomy scoping' do
         let(:organizations) { (0..1).map { FactoryBot.create(:organization) } }
         let(:tasks) { organizations.map { |o| linked_task(o) } + [FactoryBot.create(:some_task)] }

data/test/unit/actions/recurring_action_test.rb

@@ -34,6 +34,14 @@ module ForemanTasks
         logic
       end
 
+      let(:past_recurring_logic) do
+        cronline = "* * * * *"
+        logic = ForemanTasks::RecurringLogic.new_from_cronline(cronline)
+        logic.state = 'active'
+        logic.save!
+        logic
+      end
+
       let(:args) { [false, [1, 2, 3]] }
 
       let(:recurring_task) do
@@ -103,6 +111,19 @@ module ForemanTasks
           ::Logging.mdc['request'] = old_id
         end
       end
+
+      specify 'it does not trigger tasks in the past' do
+        delay_options = past_recurring_logic.generate_delay_options
+        delay_options[:start_at] = Time.zone.now - 1.week
+        task = ForemanTasks.delay HookedAction, delay_options, *args
+        past_recurring_logic.tasks.count.must_equal 1
+
+        task.execution_plan.delay_record.plan
+        # Post planning, a new task should be scheduled
+        past_recurring_logic.tasks.count.must_equal 2
+        # The scheduled task should have the start date according to cron in future.
+        assert_equal (Time.zone.now + 1.minute).change(:sec => 0), past_recurring_logic.tasks.where(:state => "scheduled").first.start_at
+      end
     end
   end
 end

data/test/unit/dashboard_table_filter_test.rb

@@ -48,6 +48,18 @@ class DashboardTableFilterTest < ActiveSupport::TestCase
       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',

data/test/unit/summarizer_test.rb

@@ -12,7 +12,7 @@ class SummarizerTest < ActiveSupport::TestCase
     end
 
     let :subject do
-      ForemanTasks::Task::Summarizer.new
+      ForemanTasks::Task::Summarizer.new(ForemanTasks::Task)
     end
 
     let :expected do

data/webpack/ForemanTasks/Components/Chart/Chart.js

@@ -38,7 +38,14 @@ class C3Chart extends React.Component {
 
   destroyChart() {
     try {
-      this.chart = this.chart.destroy();
+      // A workaround for a case, where the chart might be still in transition
+      // phase while unmounting/destroying - destroying right away leads
+      // to issue described in https://github.com/bcbcarl/react-c3js/issues/22.
+      // Delaying the destroy a bit seems to resolve the issue.
+      // The chart API methods are already bind explicitly, therefore we don't need
+      // any special handling when passing the function.
+      setTimeout(this.chart.destroy, 1000);
+      this.chart = null;
     } catch (err) {
       throw new Error('Internal C3 error', err);
     }

data/webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/StoppedTasksCard/StoppedTasksCard.stories.js

@@ -38,11 +38,6 @@ storiesOf('TasksDashboard/TasksCardsGrid', module)
     );
     return (
       <div>
-        <link
-          rel="stylesheet"
-          type="text/css"
-          href="https://cdnjs.cloudflare.com/ajax/libs/patternfly/3.24.0/css/patternfly-additions.min.css"
-        />
         <StoppedTasksCard
           data={{
             error: {

data/webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/TasksCardsGrid.js

@@ -23,7 +23,7 @@ const TasksCardsGrid = ({ time, query, data, updateQuery }) => (
         [TASKS_DASHBOARD_AVAILABLE_QUERY_STATES.STOPPED, StoppedTasksCard],
         [TASKS_DASHBOARD_AVAILABLE_QUERY_STATES.SCHEDULED, ScheduledTasksCard],
       ].map(([key, Card]) => (
-        <CardGrid.Col sm={6} lg={3} key={key}>
+        <CardGrid.Col key={key}>
           <Card
             matchHeight
             data={data[key]}

data/webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/TasksCardsGrid.stories.js

@@ -37,16 +37,18 @@ storiesOf('TasksDashboard/TasksCardsGrid', module)
     );
 
     return (
-      <TasksCardsGrid
-        time={selectTime}
-        query={{
-          state: selectState,
-          result: selectResult,
-          mode: selectMode,
-          time: selectTime,
-        }}
-        data={object('data', MOCKED_DATA)}
-        updateQuery={action('updateQuery')}
-      />
+      <div>
+        <TasksCardsGrid
+          time={selectTime}
+          query={{
+            state: selectState,
+            result: selectResult,
+            mode: selectMode,
+            time: selectTime,
+          }}
+          data={object('data', MOCKED_DATA)}
+          updateQuery={action('updateQuery')}
+        />
+      </div>
     );
   });

data/webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/__snapshots__/TasksCardsGrid.test.js.snap

@@ -14,8 +14,6 @@ exports[`TasksCardsGrid render with minimal props 1`] = `
       bsClass="col"
       componentClass="div"
       key="running"
-      lg={3}
-      sm={6}
     >
       <RunningTasksCard
         className=""
@@ -35,8 +33,6 @@ exports[`TasksCardsGrid render with minimal props 1`] = `
       bsClass="col"
       componentClass="div"
       key="paused"
-      lg={3}
-      sm={6}
     >
       <PausedTasksCard
         className=""
@@ -56,8 +52,6 @@ exports[`TasksCardsGrid render with minimal props 1`] = `
       bsClass="col"
       componentClass="div"
       key="stopped"
-      lg={3}
-      sm={6}
     >
       <StoppedTasksCard
         className=""
@@ -87,8 +81,6 @@ exports[`TasksCardsGrid render with minimal props 1`] = `
       bsClass="col"
       componentClass="div"
       key="scheduled"
-      lg={3}
-      sm={6}
     >
       <ScheduledTasksCard
         className=""
@@ -117,8 +109,6 @@ exports[`TasksCardsGrid render with props 1`] = `
       bsClass="col"
       componentClass="div"
       key="running"
-      lg={3}
-      sm={6}
     >
       <RunningTasksCard
         className=""
@@ -142,8 +132,6 @@ exports[`TasksCardsGrid render with props 1`] = `
       bsClass="col"
       componentClass="div"
       key="paused"
-      lg={3}
-      sm={6}
     >
       <PausedTasksCard
         className=""
@@ -167,8 +155,6 @@ exports[`TasksCardsGrid render with props 1`] = `
       bsClass="col"
       componentClass="div"
       key="stopped"
-      lg={3}
-      sm={6}
     >
       <StoppedTasksCard
         className=""
@@ -202,8 +188,6 @@ exports[`TasksCardsGrid render with props 1`] = `
       bsClass="col"
       componentClass="div"
       key="scheduled"
-      lg={3}
-      sm={6}
     >
       <ScheduledTasksCard
         className=""

data/webpack/ForemanTasks/Components/TasksDashboard/TasksDashboard.scss

@@ -1,6 +1,26 @@
+@import '~bootstrap-sass/assets/stylesheets/bootstrap/_variables';
+@import '~bootstrap-sass/assets/stylesheets/bootstrap/_mixins';
+
+@mixin create-tasks-dashboard-column($columns: 12, $screen-min: 0, $gutter: $grid-gutter-width) {
+  @media (min-width: $screen-min) {
+    width: percentage(($columns / $grid-columns));
+    float: left;
+    position: relative;
+    min-height: 1px;
+    padding-right: ($gutter / 2);
+    padding-left: ($gutter / 2);
+  }
+}
+
 .tasks-dashboard-grid {
   min-height: 200px;
-  background-color: #F5F5F5;
+  background-color: #f5f5f5;
   margin: 5px -60px 20px -60px;
   padding: 20px 50px;
+
+  .row > div {
+    @include create-tasks-dashboard-column(12, 0);
+    @include create-tasks-dashboard-column(6, 900px);
+    @include create-tasks-dashboard-column(3, 1500px);
+  }
 }

data/webpack/ForemanTasks/Components/TasksDashboard/TasksDashboardHelper.js

@@ -73,6 +73,23 @@ export const resolveQuery = query => {
   const { search } = uri.query(true);
 
   const data = { search, ...uriQuery, page: 1 };
+  const { $, tfm } = window;
+
   uri.query(URI.buildQuery(data, true));
-  window.location.href = uri.toString();
+  tfm.tools.showSpinner();
+  $.ajax({
+    type: 'get',
+    url: uri.toString(),
+    success(result) {
+      const res = $(`<div>${result}</div>`);
+
+      $('#tasks-table').html(res.find('#tasks-table'));
+    },
+    error({ statusText }) {
+      $('#tasks-table').html(statusText);
+    },
+    complete(result) {
+      tfm.tools.hideSpinner();
+    },
+  });
 };

data/webpack/stories/index.scss

@@ -4,3 +4,4 @@ $icon-font-path: '~patternfly/dist/fonts/';
 
 @import '~patternfly/dist/sass/patternfly';
 @import '~patternfly-react/dist/sass/patternfly-react';
+@import '~font-awesome-sass/assets/stylesheets/_font-awesome';

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.15.6
+  version: 0.15.7
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-31 00:00:00.000000000 Z
+date: 2019-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks-core