foreman-tasks 0.16.0 → 0.16.1

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

@@ -39,6 +39,7 @@ const TasksDonutCard = ({
         'selected-tasks-card':
           focusedOn !== TASKS_DONUT_CHART_FOCUSED_ON_OPTIONS.NORMAL &&
           focusedOn !== TASKS_DONUT_CHART_FOCUSED_ON_OPTIONS.NONE,
+        'not-focused': focusedOn === TASKS_DONUT_CHART_FOCUSED_ON_OPTIONS.NONE,
       })}
       {...props}
     >

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

@@ -1,4 +1,10 @@
 .tasks-donut-card {
+  &.not-focused {
+    .card-pf-title,
+    .card-pf-body {
+      opacity: 0.6;
+    }
+  }
   .card-pf-title {
     text-align: center;
     font-size: 180%;

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

@@ -1,7 +1,4 @@
 .tasks-donut-chart {
-  .c3.not-focused {
-    opacity: 0.3;
-  }
   .c3-chart-arcs-title {
     cursor: pointer;
 

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

@@ -1,4 +1,4 @@
-@import '~patternfly/dist/sass/patternfly/_color-variables.scss';
+@import '~@theforeman/vendor/scss/variables';
 
 .tasks-labels-row {
   margin: 0;

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

@@ -1,5 +1,5 @@
-@import '~bootstrap-sass/assets/stylesheets/bootstrap/_variables';
-@import '~bootstrap-sass/assets/stylesheets/bootstrap/_mixins';
+@import '~@theforeman/vendor/scss/variables';
+@import '~@theforeman/vendor/scss/mixins';
 
 @mixin create-tasks-dashboard-column($columns: 12, $screen-min: 0, $gutter: $grid-gutter-width) {
   @media (min-width: $screen-min) {

data/webpack/ForemanTasks/Components/common/ClickConfirmation/index.js

@@ -0,0 +1,83 @@
+import { Modal, Button } from 'patternfly-react';
+import PropTypes from 'prop-types';
+import React from 'react';
+import { translate as __ } from 'foremanReact/common/I18n';
+
+export class ClickConfirmation extends React.Component {
+  state = { disableConfirm: true };
+  render() {
+    const { disableConfirm } = this.state;
+    const {
+      title,
+      body,
+      confirmationMessage,
+      confirmAction,
+      path,
+      confirmType,
+      closeModal,
+      showModal,
+    } = this.props;
+    const icon = confirmType === 'warning' ? confirmType : 'exclamation';
+    return (
+      <Modal show={showModal} onHide={closeModal}>
+        <Modal.Header>
+          <Button
+            className="close"
+            onClick={closeModal}
+            aria-hidden="true"
+            aria-label="Close"
+          >
+            &times;
+          </Button>
+          <Modal.Title>
+            <span className={`glyphicon glyphicon-${icon}-sign`} />
+            {` ${title}`}
+          </Modal.Title>
+        </Modal.Header>
+        <Modal.Body>
+          {body}
+          <div>
+            <input
+              onChange={e => {
+                this.setState({
+                  disableConfirm: !e.target.checked,
+                });
+              }}
+              type="checkbox"
+            />
+            {` ${confirmationMessage}`}
+          </div>
+        </Modal.Body>
+        <Modal.Footer>
+          <Button onClick={closeModal}>{__('Cancel')}</Button>
+          <Button
+            href={path}
+            data-method="post"
+            bsStyle={confirmType}
+            disabled={disableConfirm}
+          >
+            {confirmAction}
+          </Button>
+        </Modal.Footer>
+      </Modal>
+    );
+  }
+}
+
+ClickConfirmation.propTypes = {
+  showModal: PropTypes.bool,
+  title: PropTypes.string.isRequired,
+  body: PropTypes.string.isRequired,
+  confirmationMessage: PropTypes.string.isRequired,
+  confirmAction: PropTypes.string.isRequired,
+  path: PropTypes.string.isRequired,
+  confirmType: PropTypes.oneOf(['warning', 'danger']),
+  closeModal: PropTypes.func.isRequired,
+};
+
+ClickConfirmation.defaultProps = {
+  showModal: false,
+  confirmType: 'warning',
+};
+
+export default ClickConfirmation;

data/webpack/ForemanTasks/ForemanTasksReducers.js

@@ -1,9 +1,11 @@
 import { combineReducers } from 'redux';
 import { reducers as tasksDashboardReducers } from './Components/TasksDashboard';
+import { reducers as taskDetailsReducers } from './Components/TaskDetails';
 
 const reducers = {
   foremanTasks: combineReducers({
     ...tasksDashboardReducers,
+    ...taskDetailsReducers,
   }),
 };
 

data/webpack/__mocks__/foremanReact/common/I18n.js

@@ -3,3 +3,5 @@ export { sprintf } from 'jed';
 export const translate = s => s;
 
 export const ngettext = s => s;
+
+export const documentLocale = () => 'en';

data/webpack/__mocks__/foremanReact/components/Layout/LayoutActions.js

@@ -0,0 +1,2 @@
+export const showLoading = () => null;
+export const hideLoading = () => null;

data/webpack/index.js

@@ -6,6 +6,7 @@ import { registerReducer } from 'foremanReact/common/MountingService';
 import reducers from './ForemanTasks/ForemanTasksReducers';
 import ForemanTasks from './ForemanTasks';
 import TasksDashboard from './ForemanTasks/Components/TasksDashboard';
+import TaskDetails from './ForemanTasks/Components/TaskDetails';
 
 // register reducers
 Object.entries(reducers).forEach(([key, reducer]) =>
@@ -21,3 +22,7 @@ componentRegistry.register({
   name: 'TasksDashboard',
   type: TasksDashboard,
 });
+componentRegistry.register({
+  name: 'TaskDetails',
+  type: TaskDetails,
+});

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-16 00:00:00.000000000 Z
+date: 2019-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks-core
@@ -193,6 +193,7 @@ files:
 - app/views/foreman_tasks/api/recurring_logics/main.json.rabl
 - app/views/foreman_tasks/api/recurring_logics/show.json.rabl
 - app/views/foreman_tasks/api/recurring_logics/update.json.rabl
+- app/views/foreman_tasks/api/tasks/details.json.rabl
 - app/views/foreman_tasks/api/tasks/show.json.rabl
 - app/views/foreman_tasks/layouts/react.html.erb
 - app/views/foreman_tasks/recurring_logics/_tab_related.html.erb
@@ -202,11 +203,6 @@ files:
 - app/views/foreman_tasks/task_groups/_detail.html.erb
 - app/views/foreman_tasks/task_groups/_tab_related.html.erb
 - app/views/foreman_tasks/task_groups/recurring_logic_task_groups/_recurring_logic_task_group.html.erb
-- app/views/foreman_tasks/tasks/_details.html.erb
-- app/views/foreman_tasks/tasks/_errors.html.erb
-- app/views/foreman_tasks/tasks/_locks.html.erb
-- app/views/foreman_tasks/tasks/_raw.html.erb
-- app/views/foreman_tasks/tasks/_running_steps.html.erb
 - app/views/foreman_tasks/tasks/dashboard/_latest_tasks_in_error_warning.html.erb
 - app/views/foreman_tasks/tasks/dashboard/_tasks_status.html.erb
 - app/views/foreman_tasks/tasks/index.html.erb
@@ -281,6 +277,7 @@ files:
 - test/factories/triggering_factory.rb
 - test/foreman_tasks_core_test_helper.rb
 - test/foreman_tasks_test_helper.rb
+- test/helpers/foreman_tasks/foreman_tasks_helper_test.rb
 - test/helpers/foreman_tasks/tasks_helper_test.rb
 - test/lib/actions/middleware/keep_current_request_id_test.rb
 - test/lib/actions/middleware/keep_current_taxonomies_test.rb
@@ -313,6 +310,44 @@ files:
 - test/unit/troubleshooting_help_generator_test.rb
 - test/unit/ui_notifications_test.rb
 - webpack/ForemanTasks/Components/Chart/Chart.js
+- webpack/ForemanTasks/Components/TaskDetails/Components/Errors.js
+- webpack/ForemanTasks/Components/TaskDetails/Components/Locks.js
+- webpack/ForemanTasks/Components/TaskDetails/Components/Raw.js
+- webpack/ForemanTasks/Components/TaskDetails/Components/RunningSteps.js
+- webpack/ForemanTasks/Components/TaskDetails/Components/Task.js
+- webpack/ForemanTasks/Components/TaskDetails/Components/TaskHelper.js
+- webpack/ForemanTasks/Components/TaskDetails/Components/TaskInfo.js
+- webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/Errors.test.js
+- webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/Locks.test.js
+- webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/Raw.test.js
+- webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/RunningSteps.test.js
+- webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/Task.test.js
+- webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/TaskHelper.test.js
+- webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/TaskInfo.test.js
+- webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/__snapshots__/Errors.test.js.snap
+- webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/__snapshots__/Locks.test.js.snap
+- webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/__snapshots__/Raw.test.js.snap
+- webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/__snapshots__/RunningSteps.test.js.snap
+- webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/__snapshots__/Task.test.js.snap
+- webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/__snapshots__/TaskHelper.test.js.snap
+- webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/__snapshots__/TaskInfo.test.js.snap
+- webpack/ForemanTasks/Components/TaskDetails/TaskDetails.js
+- webpack/ForemanTasks/Components/TaskDetails/TaskDetails.scss
+- webpack/ForemanTasks/Components/TaskDetails/TaskDetails.stories.js
+- webpack/ForemanTasks/Components/TaskDetails/TaskDetailsActions.js
+- webpack/ForemanTasks/Components/TaskDetails/TaskDetailsConstants.js
+- webpack/ForemanTasks/Components/TaskDetails/TaskDetailsReducer.js
+- webpack/ForemanTasks/Components/TaskDetails/TaskDetailsSelectors.js
+- webpack/ForemanTasks/Components/TaskDetails/TasksDetailsHelper.js
+- webpack/ForemanTasks/Components/TaskDetails/__tests__/TaskDetails.test.js
+- webpack/ForemanTasks/Components/TaskDetails/__tests__/TaskDetailsActions.test.js
+- webpack/ForemanTasks/Components/TaskDetails/__tests__/TaskDetailsReducer.test.js
+- webpack/ForemanTasks/Components/TaskDetails/__tests__/__snapshots__/TaskDetails.test.js.snap
+- webpack/ForemanTasks/Components/TaskDetails/__tests__/__snapshots__/TaskDetailsActions.test.js.snap
+- webpack/ForemanTasks/Components/TaskDetails/__tests__/__snapshots__/TaskDetailsReducer.test.js.snap
+- webpack/ForemanTasks/Components/TaskDetails/__tests__/__snapshots__/integration.test.js.snap
+- webpack/ForemanTasks/Components/TaskDetails/__tests__/integration.test.js
+- webpack/ForemanTasks/Components/TaskDetails/index.js
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/PausedTasksCard/PausedTasksCard.js
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/PausedTasksCard/PausedTasksCard.stories.js
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/PausedTasksCard/PausedTasksCard.test.js
@@ -382,6 +417,7 @@ files:
 - webpack/ForemanTasks/Components/TasksDashboard/__tests__/__snapshots__/TasksDashboardActions.test.js.snap
 - webpack/ForemanTasks/Components/TasksDashboard/__tests__/__snapshots__/TasksDashboardReducer.test.js.snap
 - webpack/ForemanTasks/Components/TasksDashboard/index.js
+- webpack/ForemanTasks/Components/common/ClickConfirmation/index.js
 - webpack/ForemanTasks/ForemanTasks.js
 - webpack/ForemanTasks/ForemanTasks.test.js
 - webpack/ForemanTasks/ForemanTasksReducers.js
@@ -407,6 +443,7 @@ files:
 - webpack/__mocks__/foremanReact/API.js
 - webpack/__mocks__/foremanReact/common/I18n.js
 - webpack/__mocks__/foremanReact/common/helpers.js
+- webpack/__mocks__/foremanReact/components/Layout/LayoutActions.js
 - webpack/index.js
 - webpack/stories/decorators/index.js
 - webpack/stories/decorators/withCardsDecorator.js
@@ -431,8 +468,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Foreman plugin for showing tasks information for resources and users
@@ -449,6 +485,7 @@ test_files:
 - test/factories/triggering_factory.rb
 - test/foreman_tasks_core_test_helper.rb
 - test/foreman_tasks_test_helper.rb
+- test/helpers/foreman_tasks/foreman_tasks_helper_test.rb
 - test/helpers/foreman_tasks/tasks_helper_test.rb
 - test/lib/actions/middleware/keep_current_request_id_test.rb
 - test/lib/actions/middleware/keep_current_taxonomies_test.rb

data/app/views/foreman_tasks/tasks/_details.html.erb

@@ -1,195 +0,0 @@
-<p>
-  <%= link_to(_('Auto Reload'), '', class: %w(btn btn-sm btn-default reload-button hidden)) %>
-  <% if authorized_for(:permission => :edit_foreman_tasks, :auth_object => @task) %>
-    <%= link_to(_('Dynflow console'),
-                format((defined?(Rails) ? request.script_name : '') + '/foreman_tasks/dynflow/%s', @task.external_id),
-                class: %w(btn btn-sm btn-default), target: '_blank') if Setting['dynflow_enable_console'] %>
-
-    <%= link_to(_('Resume'),
-                resume_foreman_tasks_task_path(@task),
-                class:  ['btn', 'btn-sm', 'btn-primary', ('disabled' unless @task.resumable?)].compact,
-                method: :post) %>
-    <%= link_to(_('Cancel'),
-                cancel_foreman_tasks_task_path(@task),
-                class:  ['btn', 'btn-sm', 'btn-primary', ('disabled' unless @task.cancellable?)].compact,
-                method: :post) %>
-    <% if @task.parent_task %>
-      <%= link_to(_("Parent task"), foreman_tasks_task_path(@task.parent_task), class: ['btn', 'btn-sm', 'btn-default']) %>
-    <% end %>
-    <% if @task.sub_tasks.any? %>
-      <%= link_to(_("Sub tasks"), sub_tasks_foreman_tasks_task_path(@task), class: ['btn', 'btn-sm', 'btn-default']) %>
-  <% end %>
-    <% if Setting['dynflow_allow_dangerous_actions'] %>
-      <%= link_to(_('Unlock'),
-                  '',
-                  class:         ['btn', 'btn-sm', 'btn-warning', 'reload-button-stop', ('disabled' unless @task.state == 'paused')].compact,
-                  :'data-toggle' => "modal",
-                  :'data-target' => "#unlock_modal") %>
-
-      <%= link_to(_('Force Unlock'),
-                  '',
-                  class:         ['btn', 'btn-sm', 'btn-danger', 'reload-button-stop', ('disabled' if @task.state == 'stopped')].compact,
-                  :'data-toggle' => "modal",
-                  :'data-target' => "#force_unlock_modal") %>
-    <% end %>
-  <% end %>
-</p>
-
-<div class="modal fade" id="unlock_modal" tabindex="-1" role="dialog" aria-labelledby="Deploy" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h2 class="modal-title" id="deploy_modal_label">
-          <span class="glyphicon glyphicon-warning-sign"></span>
-          <%= _("Unlock") %>
-        </h2>
-      </div>
-      <div class="modal-body">
-        <%= _("This will unlock the resources that the task is running against. Please note that this might lead to inconsistent state and should be used with caution, after making sure that the task can't be resumed.") %>
-        <div>
-          <input class="disable-unlock" type="checkbox"/>
-          <%= _("I understand that this may cause harm and have working database backups of all backend services.") %>
-        </div>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal"><%= _("Cancel") %></button>
-        <%= link_to(_("Unlock"), unlock_foreman_tasks_task_path(@task), method: :post, class: 'btn btn-warning modal-submit disabled') %>
-      </div>
-    </div>
-  </div>
-</div>
-
-<div class="modal fade" id="force_unlock_modal" tabindex="-1" role="dialog" aria-labelledby="Deploy" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h2 class="modal-title" id="deploy_modal_label">
-          <span class="glyphicon glyphicon-exclamation-sign"></span>
-          <%= _("Force Unlock") %>
-        </h2>
-      </div>
-      <div class="modal-body">
-        <%= _("Resources will be unlocked and will not prevent other tasks from being run. As the task might be still running, it should be avoided to use this unless you are really sure the task got stuck") %>
-        <div>
-          <input class="disable-unlock" type="checkbox"/>
-          <%= _("I understand that this may cause harm and have working database backups of all backend services.") %>
-        </div>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal"><%= _("Cancel") %></button>
-        <%= link_to(_("Force Unlock"), force_unlock_foreman_tasks_task_path(@task), method: :post, class: 'btn btn-danger modal-submit disabled') %>
-      </div>
-    </div>
-  </div>
-</div>
-
-<div class="row">
-  <div class="col-md-6">
-    <div>
-      <span class="param-name list-group-item-heading"><%= _("Name") %>:</span>
-      <% task_label = format_task_input(@task) %>
-      <span class="param-value" data-original-title="<%= task_label %>" rel="twipsy"> <%= truncate(task_label, :length => 50) %></span>
-    </div>
-    <div>
-      <span class="param-name list-group-item-heading"><%= _("Result") %>:</span>
-      <span class="param-value">
-        <% if @task.state != 'stopped' %>
-          <%= content_tag(:i, '&nbsp;'.html_safe, :class => 'task-status pficon-help') %>
-        <% else %>
-          <%= content_tag(:i, '&nbsp;'.html_safe, :class => task_result_icon_class(@task)) + content_tag(:span, @task.result) %>
-        <% end %>
-      </span>
-    </div>
-    <div>
-      <span class="param-name list-group-item-heading"><%= _("Triggered by") %>:</span>
-      <span class="param-value">
-        <% if @task.owner.present? && @task.username != User::ANONYMOUS_API_ADMIN && @task.username != User::ANONYMOUS_ADMIN %>
-          <%= link_to_if_authorized(@task.username, hash_for_edit_user_path(@task.owner)) %>
-        <% else %>
-          <%= @task.username %>
-        <% end %>
-      </span>
-    </div>
-    <div>
-      <span class="param-name list-group-item-heading"><%= _("Execution type") %>:</span>
-      <span class="param-value"><%= _(@task.execution_type) %> <%= _("(Disabled)") if @task.frozen %></span>
-    </div>
-  </div>
-
-  <div class="col-md-6">
-    <div>
-      <span class="param-name list-group-item-heading"><%= _("Start at") %>:</span>
-      <span class="param-value"><%= @task.start_at.nil? ? '-' : time_in_words_span(@task.start_at) %></span>
-    </div>
-    <div>
-      <span class="param-name list-group-item-heading"><%= _("Started at") %>:</span>
-      <span class="param-value"><%= time_in_words_span @task.started_at.try(:in_time_zone) %></span>
-    </div>
-    <div>
-      <span class="param-name list-group-item-heading"><%= _("Ended at") %>:</span>
-      <span class="param-value"><%= time_in_words_span @task.ended_at.try(:in_time_zone) %></span>
-    </div>
-    <div>
-      <span class="param-name list-group-item-heading"><%= _("Start before") %>:</span>
-      <span class="param-value"><%= @task.start_before.nil? ? '-' : time_in_words_span(@task.start_before) %></span>
-    </div>
-  </div>
-</div>
-
-<br />
-
-<div class="row">
-  <div class="col-xs-12">
-    <% progress = 100 * @task.progress %>
-    <% progress_class = if @task.state == 'running'
-                          nil
-                        else
-                          case @task.result
-                            when 'success'
-                              'progress-bar-success'
-                            when 'error'
-                              'progress-bar-danger'
-                            when 'warning'
-                              'progress-bar-warning'
-                            else
-                              nil
-                          end
-                        end %>
-
-    <div class="progress-description <%= 'active' if @task.state == 'running' %>">
-      <span class="list-group-item-heading">State:</span>  <%= @task.state %>
-    </div>
-    <div class="progress progress-striped progress-label-top-right">
-      <div class="progress-bar <%= progress_class %>"
-           role="progressbar"
-           aria-valuenow="<%= progress %>"
-           aria-valuemin="0"
-           aria-valuemax="100"
-           style="width: <%= progress %>%;">
-        <span><%= progress.round %>% Complete</span>
-      </div>
-    </div>
-  </div>
-</div>
-
-<%= troubleshooting_info %>
-
-<% unless @task.humanized[:output].blank? %>
-<div>
-  <span class="param-name list-group-item-heading"><%= _("Output") %>:</span>
-  <span class="param-value">
-    <pre><%= @task.humanized[:output] %></pre>
-  </span>
-</div>
-<% end %>
-
-<% unless @task.humanized[:errors].blank? %>
-<div>
-  <span class="param-name"><b><%= _("Errors") %>:</b></span>
-  <span class="param-value">
-    <pre><%=Array(@task.humanized[:errors]).join("\n") %></pre>
-  </span>
-</div>
-<% end %>