foreman-tasks 6.0.1 → 6.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fe4afd0fbe9eaa5cb5587310ddddd1538453e733b48b6f927e6bc14fa4ad42e
-  data.tar.gz: 27591131ac0329e66625a15c4b512fa7a24b23b3623abdc1eaef40fee7bdea9a
+  metadata.gz: 67320a79cb65e4905cce8d31974e676c75eec1c665c583f8c9df99e54a426632
+  data.tar.gz: 249a186aea1f6aa781a654d763f213993d977577cef468c90bb8e0b7a6d9734a
 SHA512:
-  metadata.gz: 042c221e1f3c01b2d38b2011165479282165846d9b46923b5ef7cc4fc8f91c3ab6ff5921bd229a4a26dbf661dccff3a9d0f0d474e11eb18b074880fc8fc25870
-  data.tar.gz: 4fdf7dfc1836bd8b4ea0490f8c7a894569c7ccf9eca811945b517f7aedface6b04c0c6bbe9c7f34a7b7bbea77328edaadd27ebb624bc29c4acae2eb86bc25624
+  metadata.gz: 36b628ced0600bcc9e1a31d2325736eccbfd9591aa3a37b03f0e0c2106f3db6dc327d7829733179f24b52d19084abeedfb5f7f7949990d3a15778f6baf069354
+  data.tar.gz: c3ef36b4d8aaa7718f17d821d06b7b6297980a7cddf889a824f3c1bc34e26377cf64dc0579b74ffcf6e9e4d17b2e8f7d88697fc78a6af19b8668fb78bd0d8f55

data/app/models/foreman_tasks/recurring_logic.rb

@@ -90,7 +90,7 @@ module ForemanTasks
     def next_occurrence_time(time = Time.zone.now)
       @parser ||= CronParser.new(cron_line, Time.zone)
       # @parser.next(start_time) is not inclusive of the start_time hence stepping back one run to include checking start_time for the first run.
-      before_next = @parser.next(@parser.last(time))
+      before_next = @parser.next(@parser.last(time.in_time_zone))
       return before_next if before_next >= time && tasks.count == 0
       @parser.next(time)
     end

data/lib/foreman_tasks/engine.rb

@@ -42,17 +42,17 @@ module ForemanTasks
         security_block :foreman_tasks do |_map|
           permission :view_foreman_tasks, { :'foreman_tasks/tasks' => [:auto_complete_search, :sub_tasks, :index, :summary, :summary_sub_tasks, :show],
                                             :'foreman_tasks/react' => [:index],
-                                            :'foreman_tasks/api/tasks' => [:bulk_search, :show, :index, :summary, :summary_sub_tasks, :details, :sub_tasks] }, :resource_type => ForemanTasks::Task.name
+                                            :'foreman_tasks/api/tasks' => [:bulk_search, :show, :index, :summary, :summary_sub_tasks, :details, :sub_tasks] }, :resource_type => 'ForemanTasks::Task'
           permission :edit_foreman_tasks, { :'foreman_tasks/tasks' => [:resume, :unlock, :force_unlock, :cancel_step, :cancel, :abort],
-                                            :'foreman_tasks/api/tasks' => [:bulk_resume, :bulk_cancel, :bulk_stop] }, :resource_type => ForemanTasks::Task.name
+                                            :'foreman_tasks/api/tasks' => [:bulk_resume, :bulk_cancel, :bulk_stop] }, :resource_type => 'ForemanTasks::Task'
 
-          permission :create_recurring_logics, {}, :resource_type => ForemanTasks::RecurringLogic.name
+          permission :create_recurring_logics, {}, :resource_type => 'ForemanTasks::RecurringLogic'
 
           permission :view_recurring_logics, { :'foreman_tasks/recurring_logics' => [:auto_complete_search, :index, :show],
-                                               :'foreman_tasks/api/recurring_logics' => [:index, :show] }, :resource_type => ForemanTasks::RecurringLogic.name
+                                               :'foreman_tasks/api/recurring_logics' => [:index, :show] }, :resource_type => 'ForemanTasks::RecurringLogic'
 
           permission :edit_recurring_logics, { :'foreman_tasks/recurring_logics' => [:cancel, :enable, :disable, :clear_cancelled],
-                                               :'foreman_tasks/api/recurring_logics' => [:cancel, :update, :bulk_destroy] }, :resource_type => ForemanTasks::RecurringLogic.name
+                                               :'foreman_tasks/api/recurring_logics' => [:cancel, :update, :bulk_destroy] }, :resource_type => 'ForemanTasks::RecurringLogic'
         end
 
         add_all_permissions_to_default_roles
@@ -116,7 +116,7 @@ module ForemanTasks
         register_graphql_query_field :recurring_logic, '::Types::RecurringLogic', :record_field
         register_graphql_query_field :recurring_logics, '::Types::RecurringLogic', :collection_field
 
-        register_graphql_mutation_field :cancel_recurring_logic, ::Mutations::RecurringLogics::Cancel
+        register_graphql_mutation_field :cancel_recurring_logic, '::Mutations::RecurringLogics::Cancel'
 
         logger :dynflow, :enabled => true
         logger :action, :enabled => true

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '6.0.1'.freeze
+  VERSION = '6.0.2'.freeze
 end

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

@@ -2,7 +2,8 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
-import { Icon, Button, OverlayTrigger, Tooltip } from 'patternfly-react';
+import { Button, Tooltip, TooltipPosition } from '@patternfly/react-core';
+import { InfoCircleIcon } from '@patternfly/react-icons';
 import { translate as __ } from 'foremanReact/common/I18n';
 import {
   TASKS_DASHBOARD_AVAILABLE_QUERY_STATES,
@@ -10,30 +11,26 @@ import {
 } from '../../../../TasksDashboardConstants';
 import { queryPropType } from '../../../../TasksDashboardPropTypes';
 
-const tooltip = (
-  <Tooltip id="stopped-tooltip">
-    {__('Other includes all stopped tasks that are cancelled or pending')}
-  </Tooltip>
-);
-
 export const OtherInfo = ({ updateQuery, otherCount, query }) => {
   const { OTHER } = TASKS_DASHBOARD_AVAILABLE_QUERY_RESULTS;
   const { STOPPED } = TASKS_DASHBOARD_AVAILABLE_QUERY_STATES;
   const active = query.state === STOPPED && query.result === OTHER;
   return (
     <span className={classNames(active && 'other-active')}>
-      <OverlayTrigger
-        overlay={tooltip}
-        trigger={['hover', 'focus']}
-        placement="bottom"
+      <Tooltip
+        id="stopped-tooltip"
+        content={__(
+          'Other includes all stopped tasks that are cancelled or pending'
+        )}
+        position={TooltipPosition.bottom}
       >
         <span>
-          <Icon type="pf" name="info" />
+          <InfoCircleIcon className="pficon" />
           <span>{__('Other:')} </span>
         </span>
-      </OverlayTrigger>
+      </Tooltip>
       <Button
-        bsStyle="link"
+        variant="link"
         onClick={() =>
           updateQuery({
             state: STOPPED,

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

@@ -4,43 +4,27 @@ exports[`OtherInfo render 1`] = `
 <span
   className=""
 >
-  <OverlayTrigger
-    defaultOverlayShown={false}
-    overlay={
-      <Tooltip
-        bsClass="tooltip"
-        id="stopped-tooltip"
-        placement="right"
-      >
-        Other includes all stopped tasks that are cancelled or pending
-      </Tooltip>
-    }
-    placement="bottom"
-    trigger={
-      Array [
-        "hover",
-        "focus",
-      ]
-    }
+  <Tooltip
+    content="Other includes all stopped tasks that are cancelled or pending"
+    id="stopped-tooltip"
+    position="bottom"
   >
     <span>
-      <Icon
-        name="info"
-        type="pf"
+      <InfoCircleIcon
+        className="pficon"
+        color="currentColor"
+        noVerticalAlign={false}
+        size="sm"
       />
       <span>
         Other:
          
       </span>
     </span>
-  </OverlayTrigger>
+  </Tooltip>
   <Button
-    active={false}
-    block={false}
-    bsClass="btn"
-    bsStyle="link"
-    disabled={false}
     onClick={[Function]}
+    variant="link"
   >
     7
   </Button>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.0.2
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-01 00:00:00.000000000 Z
+date: 2022-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow
@@ -608,7 +608,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.26
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Foreman plugin for showing tasks information for resources and users