foreman-tasks 8.3.3 → 9.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ebc4e91c21d0b6ff3f297beabd416059d1dfe3f7bcb99895e9676b4d73bd87e
-  data.tar.gz: 39c307472cee9bacfd5e4a29026de6aebfe6e03937d461d511f673ced82f2f1e
+  metadata.gz: c07047587cf02128c555096e198c263c44e0309511968150c6ffad1014611ccc
+  data.tar.gz: 0a67b8fa80f6a9c6ab2d15659adea5c067fc2ccff70ae1fab6df679580fc28cc
 SHA512:
-  metadata.gz: 2781937dceeafdb7e25c039a4d584b2612ff0bfb7b1cd60804d961d52a2b84bfc52ee1a2d9232624ad7b79344f6926b1b18d35a93c45a819d1cac0d22382897c
-  data.tar.gz: a5d383bc4ba5ff5fcaf8160eb2b227ac5e63f97a777062a6cfa75bc67117d13545d759b0a6edd16b0c688b426d3c7a0c2e8d19a966719a0e5b387fa931b725aa
+  metadata.gz: 1144a9f0f759891f5e99ecffbae42f9342f20eb6bd63adfeea0c7ded40cc38254be051024dbf344e3cebc40191098b4aa4ffe7d2d005c73e28b06fbd0e4a9349
+  data.tar.gz: ba9a9c54f9c924a0ccb49f93b9cb22bad9132e4665b1d7a764667f3209d2cc26d6edff9d5e58a818b70500fe604d6074b2dc92a0aba3b0acdfab4b7078f3869e

data/app/views/foreman_tasks/api/recurring_logics/base.json.rabl

@@ -6,4 +6,4 @@ attributes :id, :cron_line, :end_time, :iteration, :task_group_id, :state,
 node(:task_count) { |rl| rl.tasks.count }
 node(:action) { |rl| rl.tasks.first.try(:action) }
 node(:last_occurence) { |rl| rl.last_task&.started_at }
-node(:next_occurence) { |rl| rl.next_task&.start_at }
+node(:next_occurence) { |rl| rl.next_task&.start_at if rl.state == 'active' }

data/lib/foreman_tasks/engine.rb

@@ -18,7 +18,7 @@ module ForemanTasks
 
     initializer 'foreman_tasks.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :"foreman-tasks" do
-        requires_foreman '>= 3.7.0'
+        requires_foreman '>= 3.9'
         divider :top_menu, :parent => :monitor_menu, :last => true, :caption => N_('Foreman Tasks')
         menu :top_menu, :tasks,
              :url_hash => { :controller => 'foreman_tasks/tasks', :action => :index },

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '8.3.3'.freeze
+  VERSION = '9.0.1'.freeze
 end

data/lib/tasks/gettext.rake

@@ -10,12 +10,18 @@ if gettext_find_task
       storage_file = "#{locale_path}/action_names.rb"
       puts "writing action translations to: #{storage_file}"
 
+      klasses = Actions::EntryAction
+                .subclasses
+                .uniq
+                .select do |action|
+        src, = Object.const_source_location(action.to_s)
+        src.start_with? @engine.root.to_s
+      end
+
       File.write storage_file,
                  "# Autogenerated!\n" +
-                 Actions::EntryAction
-                 .all_action_names
-                 .uniq
-                 .map { |n| %[_("#{n}")] }
+                 klasses
+                 .map { |klass| %[_("#{klass.allocate.humanized_name}")] }
                  .sort
                  .join("\n") + "\n"
     end

data/locale/foreman_tasks.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_tasks 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-01 11:07+0100\n"
-"PO-Revision-Date: 2023-11-01 11:07+0100\n"
+"POT-Creation-Date: 2023-11-28 22:09+0100\n"
+"PO-Revision-Date: 2023-11-28 22:09+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -165,8 +165,7 @@ msgstr ""
 #: ../db/seeds.d/30-notification_blueprints.rb:54
 #: ../lib/foreman_tasks/engine.rb:25 ../lib/foreman_tasks/engine.rb:54
 #: ../webpack/ForemanTasks/Components/TasksTable/SubTasksPage.js:10
-#: ../webpack/ForemanTasks/Components/TasksTable/TasksIndexPage.js:7
-#: ../webpack/ForemanTasks/Components/TasksTable/TasksTablePage.js:150
+#: ../webpack/ForemanTasks/Components/TasksTable/TasksTablePage.js:151
 msgid "Tasks"
 msgstr ""
 
@@ -317,11 +316,11 @@ msgstr ""
 msgid "Bulk action"
 msgstr ""
 
-#: ../app/lib/actions/bulk_action.rb:59
+#: ../app/lib/actions/bulk_action.rb:62
 msgid "Empty bulk action"
 msgstr ""
 
-#: ../app/lib/actions/bulk_action.rb:61
+#: ../app/lib/actions/bulk_action.rb:64
 msgid "The targets are of different types"
 msgstr ""
 

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

@@ -1,10 +1,4 @@
 import React from 'react';
-import { translate as __ } from 'foremanReact/common/I18n';
 import TasksTablePage from './';
 
-export const TasksIndexPage = props => {
-  const getBreadcrumbs = () => ({
-    breadcrumbItems: [{ caption: __('Tasks'), url: `/foreman_tasks/tasks` }],
-  });
-  return <TasksTablePage getBreadcrumbs={getBreadcrumbs} {...props} />;
-};
+export const TasksIndexPage = props => <TasksTablePage {...props} />;

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

@@ -123,7 +123,7 @@ TasksTablePage.propTypes = {
   selectAllRows: PropTypes.func.isRequired,
   results: PropTypes.array.isRequired,
   getTableItems: PropTypes.func.isRequired,
-  getBreadcrumbs: PropTypes.func.isRequired,
+  getBreadcrumbs: PropTypes.func,
   actionName: PropTypes.string,
   status: PropTypes.oneOf(Object.keys(STATUS)),
   history: PropTypes.object.isRequired,
@@ -143,6 +143,7 @@ TasksTablePage.propTypes = {
 TasksTablePage.defaultProps = {
   perPage: 20,
   allRowsSelected: false,
+  getBreadcrumbs: () => null,
   actionName: '',
   status: STATUS.PENDING,
   selectedRows: [],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 8.3.3
+  version: 9.0.1
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-23 00:00:00.000000000 Z
+date: 2024-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow