foreman-tasks 3.0.0 → 4.0.0

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

@@ -57,17 +57,20 @@ exports[`TasksCardsGrid render with minimal props 1`] = `
         className=""
         data={
           Object {
-            "error": Object {
-              "last": 0,
-              "total": 0,
-            },
-            "success": Object {
-              "last": 0,
-              "total": 0,
-            },
-            "warning": Object {
-              "last": 0,
-              "total": 0,
+            "other": 0,
+            "results": Object {
+              "error": Object {
+                "last": 0,
+                "total": 0,
+              },
+              "success": Object {
+                "last": 0,
+                "total": 0,
+              },
+              "warning": Object {
+                "last": 0,
+                "total": 0,
+              },
             },
           }
         }

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

@@ -11,6 +11,7 @@ export const TASKS_DASHBOARD_AVAILABLE_QUERY_RESULTS = {
   ERROR: 'error',
   WARNING: 'warning',
   SUCCESS: 'success',
+  OTHER: 'other',
 };
 
 export const TASKS_DASHBOARD_AVAILABLE_QUERY_MODES = {
@@ -44,6 +45,7 @@ export const TASKS_DASHBOARD_QUERY_VALUES_TEXT = {
   [TASKS_DASHBOARD_AVAILABLE_QUERY_RESULTS.ERROR]: __('error'),
   [TASKS_DASHBOARD_AVAILABLE_QUERY_RESULTS.WARNING]: __('warning'),
   [TASKS_DASHBOARD_AVAILABLE_QUERY_RESULTS.SUCCESS]: __('success'),
+  [TASKS_DASHBOARD_AVAILABLE_QUERY_RESULTS.OTHER]: __('other'),
   [TASKS_DASHBOARD_AVAILABLE_QUERY_MODES.LAST]: __('last'),
   [TASKS_DASHBOARD_AVAILABLE_QUERY_MODES.OLDER]: __('older'),
   [TASKS_DASHBOARD_AVAILABLE_TIMES.H24]: __('24h'),

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

@@ -12,6 +12,9 @@ export const selectTime = state =>
 
 export const selectQuery = state => selectTasksDashboard(state).query || {};
 
+export const calcStoppedOther = data =>
+  (data?.cancelled?.total || 0) + (data?.pending?.total || 0);
+
 export const selectTasksSummary = state => {
   const { running, paused, stopped, scheduled } =
     selectTasksDashboard(state).tasksSummary || TASKS_SUMMARY_ZERO;
@@ -26,18 +29,21 @@ export const selectTasksSummary = state => {
       older: paused.total - paused.recent,
     },
     stopped: {
-      error: {
-        total: stopped.by_result.error.total,
-        last: stopped.by_result.error.recent,
-      },
-      warning: {
-        total: stopped.by_result.warning.total,
-        last: stopped.by_result.warning.recent,
-      },
-      success: {
-        total: stopped.by_result.success.total,
-        last: stopped.by_result.success.recent,
+      results: {
+        error: {
+          total: stopped.by_result.error.total,
+          last: stopped.by_result.error.recent,
+        },
+        warning: {
+          total: stopped.by_result.warning.total,
+          last: stopped.by_result.warning.recent,
+        },
+        success: {
+          total: stopped.by_result.success.total,
+          last: stopped.by_result.success.recent,
+        },
       },
+      other: calcStoppedOther(stopped.by_result),
     },
     scheduled: scheduled.total,
   };

data/webpack/ForemanTasks/Components/TasksDashboard/__tests__/TasksDashboardSelectors.test.js

@@ -4,8 +4,32 @@ import {
   selectTime,
   selectQuery,
   selectTasksSummary,
+  calcStoppedOther,
 } from '../TasksDashboardSelectors';
 
+const stoppedResult = {
+  error: {
+    total: 9,
+    recent: 1,
+  },
+  warning: {
+    total: 8,
+    recent: 2,
+  },
+  success: {
+    total: 7,
+    recent: 3,
+  },
+  cancelled: {
+    total: 5,
+    recent: 3,
+  },
+  pending: {
+    total: 11,
+    recent: 4,
+  },
+};
+
 const state = {
   foremanTasks: {
     tasksDashboard: {
@@ -21,20 +45,7 @@ const state = {
           total: 9,
         },
         stopped: {
-          by_result: {
-            error: {
-              total: 9,
-              recent: 1,
-            },
-            warning: {
-              total: 8,
-              recent: 2,
-            },
-            success: {
-              total: 7,
-              recent: 3,
-            },
-          },
+          by_result: stoppedResult,
         },
         scheduled: {
           total: 6,
@@ -55,6 +66,7 @@ const fixtures = {
   'should select tasks-summary': () => selectTasksSummary(state),
   'should select tasks-summary when state is empty': () =>
     selectTasksSummary({}),
+  'should calcStoppedOther': () => calcStoppedOther(stoppedResult),
 };
 
 describe('TasksDashboard - Selectors', () =>

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

@@ -24,17 +24,20 @@ exports[`TasksDashboard rendering render without Props 1`] = `
         },
         "scheduled": 0,
         "stopped": Object {
-          "error": Object {
-            "last": 0,
-            "total": 0,
-          },
-          "success": Object {
-            "last": 0,
-            "total": 0,
-          },
-          "warning": Object {
-            "last": 0,
-            "total": 0,
+          "other": 0,
+          "results": Object {
+            "error": Object {
+              "last": 0,
+              "total": 0,
+            },
+            "success": Object {
+              "last": 0,
+              "total": 0,
+            },
+            "warning": Object {
+              "last": 0,
+              "total": 0,
+            },
           },
         },
       }

data/webpack/ForemanTasks/Components/TasksDashboard/__tests__/__snapshots__/TasksDashboardSelectors.test.js.snap

@@ -1,5 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`TasksDashboard - Selectors should calcStoppedOther 1`] = `16`;
+
 exports[`TasksDashboard - Selectors should select query 1`] = `"some-query"`;
 
 exports[`TasksDashboard - Selectors should select query when state is empty 1`] = `Object {}`;
@@ -21,10 +23,18 @@ Object {
     },
     "stopped": Object {
       "by_result": Object {
+        "cancelled": Object {
+          "recent": 3,
+          "total": 5,
+        },
         "error": Object {
           "recent": 1,
           "total": 9,
         },
+        "pending": Object {
+          "recent": 4,
+          "total": 11,
+        },
         "success": Object {
           "recent": 3,
           "total": 7,
@@ -54,17 +64,20 @@ Object {
   },
   "scheduled": 6,
   "stopped": Object {
-    "error": Object {
-      "last": 1,
-      "total": 9,
-    },
-    "success": Object {
-      "last": 3,
-      "total": 7,
-    },
-    "warning": Object {
-      "last": 2,
-      "total": 8,
+    "other": 16,
+    "results": Object {
+      "error": Object {
+        "last": 1,
+        "total": 9,
+      },
+      "success": Object {
+        "last": 3,
+        "total": 7,
+      },
+      "warning": Object {
+        "last": 2,
+        "total": 8,
+      },
     },
   },
 }
@@ -82,17 +95,20 @@ Object {
   },
   "scheduled": 0,
   "stopped": Object {
-    "error": Object {
-      "last": 0,
-      "total": 0,
-    },
-    "success": Object {
-      "last": 0,
-      "total": 0,
-    },
-    "warning": Object {
-      "last": 0,
-      "total": 0,
+    "other": 0,
+    "results": Object {
+      "error": Object {
+        "last": 0,
+        "total": 0,
+      },
+      "success": Object {
+        "last": 0,
+        "total": 0,
+      },
+      "warning": Object {
+        "last": 0,
+        "total": 0,
+      },
     },
   },
 }

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

@@ -14,14 +14,6 @@ export const getApiPathname = url => {
   return uri.pathname().replace('foreman_tasks/', 'foreman_tasks/api/');
 };
 
-export const resolveSearchQuery = (search, history) => {
-  const uriQuery = {
-    search,
-    page: 1,
-  };
-  updateURlQuery(uriQuery, history);
-};
-
 export const getCSVurl = (path, query) => {
   let url = new URI(path);
   url = url.pathname(`${url.pathname()}.csv`);

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

@@ -1,5 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import URI from 'urijs';
 import { getURIsearch } from 'foremanReact/common/urlHelpers';
 import { Spinner, Button, Icon } from 'patternfly-react';
 import PageLayout from 'foremanReact/routes/common/PageLayout/PageLayout';
@@ -10,7 +11,7 @@ import { STATUS } from 'foremanReact/constants';
 import { useForemanModal } from 'foremanReact/components/ForemanModal/ForemanModalHooks';
 import TasksDashboard from '../TasksDashboard';
 import TasksTable from './TasksTable';
-import { resolveSearchQuery, getCSVurl } from './TasksTableHelpers';
+import { getCSVurl, updateURlQuery } from './TasksTableHelpers';
 import ConfirmModal from './Components/ConfirmModal/';
 import {
   TASKS_SEARCH_PROPS,
@@ -35,8 +36,17 @@ const TasksTablePage = ({
 }) => {
   const url = history.location.pathname + history.location.search;
   const uriQuery = getURIQuery(url);
-  const onSearch = searchQuery => {
-    resolveSearchQuery(searchQuery, history);
+  const onSearch = search => {
+    const uri = new URI(url);
+    if (uri.search(true).search === search && uri.search(true).page === '1') {
+      props.getTableItems(uri);
+    } else {
+      const newUriQuery = {
+        search,
+        page: 1,
+      };
+      updateURlQuery(newUriQuery, history);
+    }
   };
 
   const { setModalOpen, setModalClosed } = useForemanModal({
@@ -60,7 +70,6 @@ const TasksTablePage = ({
         onSearch={onSearch}
         header={createHeader(props.actionName)}
         breadcrumbOptions={getBreadcrumbs(props.actionName)}
-        toastNotifications="foreman-tasks-cancel"
         toolbarButtons={
           <React.Fragment>
             <Button onClick={() => props.reloadPage(url, props.parentTaskID)}>

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

@@ -1,8 +1,9 @@
-.tasks-pagination {
-  margin-top: -6px;
-}
 .tasks-table {
   margin-bottom: 70px;
+
+  .action-name-tasks-table {
+    overflow-wrap: anywhere;
+  }
 }
 
 .tasks-table-wrapper {
@@ -14,16 +15,6 @@
   }
 }
 
-.param-name {
-  display: inline-block;
-  width: 10em;
-}
-
-.task-details pre {
-  white-space: pre;
-  word-break: normal;
-}
-
 .tasks-time-row .time-label {
   float: left;
 }

data/webpack/ForemanTasks/Components/TasksTable/__tests__/__snapshots__/TasksTablePage.test.js.snap

@@ -17,7 +17,7 @@ exports[`TasksTablePage rendering render with Breadcrubs and edit permissions 1`
   />
   <PageLayout
     beforeToolbarComponent={
-      <UNDEFINED
+      <Memo(Connect(TasksDashboard))
         history={
           Object {
             "location": Object {
@@ -66,7 +66,6 @@ exports[`TasksTablePage rendering render with Breadcrubs and edit permissions 1`
     }
     searchQuery="a=b"
     searchable={true}
-    toastNotifications="foreman-tasks-cancel"
     toolbarButtons={
       <React.Fragment>
         <Button
@@ -170,7 +169,7 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
   />
   <PageLayout
     beforeToolbarComponent={
-      <UNDEFINED
+      <Memo(Connect(TasksDashboard))
         history={
           Object {
             "location": Object {
@@ -202,7 +201,6 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
     }
     searchQuery="a=b"
     searchable={true}
-    toastNotifications="foreman-tasks-cancel"
     toolbarButtons={
       <React.Fragment>
         <Button

data/webpack/ForemanTasks/Components/TasksTable/formatters/__test__/__snapshots__/actionNameCellFormatter.test.js.snap

@@ -2,6 +2,7 @@
 
 exports[`actionNameCellFormatter render 1`] = `
 <a
+  className="action-name-tasks-table"
   href="/some-url/some-id"
 >
   action-name

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

@@ -2,4 +2,8 @@ import React from 'react';
 import { cellFormatter } from 'foremanReact/components/common/table';
 
 export const actionNameCellFormatter = url => (value, { rowData: { id } }) =>
-  cellFormatter(<a href={`/${url}/${id}`}>{value}</a>);
+  cellFormatter(
+    <a href={`/${url}/${id}`} className="action-name-tasks-table">
+      {value}
+    </a>
+  );

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Ivan Nečas
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-01 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow
@@ -137,7 +137,6 @@ files:
 - app/assets/javascripts/foreman_tasks/foreman_tasks.js
 - app/assets/javascripts/foreman_tasks/trigger_form.js
 - app/assets/stylesheets/foreman_tasks/foreman_tasks.css
-- app/assets/stylesheets/foreman_tasks/tasks.scss
 - app/assets/stylesheets/foreman_tasks/trigger_form.css
 - app/controllers/foreman_tasks/api/recurring_logics_controller.rb
 - app/controllers/foreman_tasks/api/tasks_controller.rb
@@ -171,6 +170,7 @@ files:
 - app/lib/actions/middleware/rails_executor_wrap.rb
 - app/lib/actions/middleware/recurring_logic.rb
 - app/lib/actions/middleware/watch_delegated_proxy_sub_tasks.rb
+- app/lib/actions/observable_action.rb
 - app/lib/actions/proxy_action.rb
 - app/lib/actions/recurring_action.rb
 - app/lib/actions/serializers/active_record_serializer.rb
@@ -180,6 +180,7 @@ files:
 - app/models/foreman_tasks/concerns/action_triggering.rb
 - app/models/foreman_tasks/concerns/host_action_subject.rb
 - app/models/foreman_tasks/concerns/user_extensions.rb
+- app/models/foreman_tasks/link.rb
 - app/models/foreman_tasks/lock.rb
 - app/models/foreman_tasks/recurring_logic.rb
 - app/models/foreman_tasks/recurring_logic_cancelled_exception.rb
@@ -205,6 +206,7 @@ files:
 - app/services/ui_notifications/tasks/task_paused_admin.rb
 - app/services/ui_notifications/tasks/task_paused_owner.rb
 - app/views/common/_trigger_form.html.erb
+- app/views/foreman_tasks/api/locks/show.json.rabl
 - app/views/foreman_tasks/api/recurring_logics/base.json.rabl
 - app/views/foreman_tasks/api/recurring_logics/index.json.rabl
 - app/views/foreman_tasks/api/recurring_logics/main.json.rabl
@@ -221,6 +223,7 @@ 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/_lock_card.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/show.html.erb
@@ -247,6 +250,10 @@ files:
 - db/migrate/20180216092715_use_uuid.rb
 - db/migrate/20180927120509_add_user_id.foreman_tasks.rb
 - db/migrate/20181019135324_add_remote_task_operation.rb
+- db/migrate/20181206123910_create_foreman_tasks_links.foreman_tasks.rb
+- db/migrate/20181206124952_migrate_non_exclusive_locks_to_links.foreman_tasks.rb
+- db/migrate/20181206131436_drop_old_locks.foreman_tasks.rb
+- db/migrate/20181206131627_make_locks_exclusive.foreman_tasks.rb
 - db/migrate/20190318153925_add_task_state_updated_at.foreman_tasks.rb
 - db/migrate/20200517215015_rename_bookmarks_controller.rb
 - db/migrate/20200519093217_drop_dynflow_allow_dangerous_actions_setting.foreman_tasks.rb
@@ -328,7 +335,7 @@ files:
 - test/unit/config/environment.rb
 - test/unit/dashboard_table_filter_test.rb
 - test/unit/dynflow_console_authorizer_test.rb
-- test/unit/lock_test.rb
+- test/unit/locking_test.rb
 - test/unit/otp_manager_test.rb
 - test/unit/proxy_selector_test.rb
 - test/unit/recurring_logic_test.rb
@@ -399,12 +406,17 @@ files:
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/ScheduledTasksCard/ScheduledTasksCard.stories.js
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/ScheduledTasksCard/ScheduledTasksCard.test.js
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/ScheduledTasksCard/__snapshots__/ScheduledTasksCard.test.js.snap
+- webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/StoppedTasksCard/OtherInfo.js
+- webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/StoppedTasksCard/OtherInfo.test.js
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/StoppedTasksCard/StoppedTasksCard.js
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/StoppedTasksCard/StoppedTasksCard.scss
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/StoppedTasksCard/StoppedTasksCard.stories.js
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/StoppedTasksCard/StoppedTasksCard.test.js
-- webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/StoppedTasksCard/StoppedTasksCardHelper.js
+- webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/StoppedTasksCard/StoppedTasksCardTable.js
+- webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/StoppedTasksCard/StoppedTasksCardTable.test.js
+- webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/StoppedTasksCard/__snapshots__/OtherInfo.test.js.snap
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/StoppedTasksCard/__snapshots__/StoppedTasksCard.test.js.snap
+- webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/StoppedTasksCard/__snapshots__/StoppedTasksCardTable.test.js.snap
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/TasksDonutCard/TasksDonutCard.js
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/TasksDonutCard/TasksDonutCard.scss
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/TasksDonutCard/TasksDonutCard.stories.js
@@ -581,9 +593,10 @@ files:
 - webpack/stories/decorators/index.js
 - webpack/stories/decorators/withCardsDecorator.js
 homepage: https://github.com/theforeman/foreman-tasks
-licenses: []
+licenses:
+- GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -598,8 +611,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Foreman plugin for showing tasks information for resources and users
 test_files:
@@ -637,7 +650,7 @@ test_files:
 - test/unit/config/environment.rb
 - test/unit/dashboard_table_filter_test.rb
 - test/unit/dynflow_console_authorizer_test.rb
-- test/unit/lock_test.rb
+- test/unit/locking_test.rb
 - test/unit/otp_manager_test.rb
 - test/unit/proxy_selector_test.rb
 - test/unit/recurring_logic_test.rb