foreman-tasks 3.0.6 → 4.0.0

data/webpack/ForemanTasks/Components/TaskDetails/Components/Locks.js

@@ -21,10 +21,10 @@ const Locks = ({ locks }) => (
                     lock.exclusive ? 'fa-lock' : 'fa-unlock-alt'
                   }`}
                 />
-                {lock.name}
+                {lock.resource_type}
               </Card.Title>
               <Card.Body>
-                {`${lock.resource_type} id:${lock.resource_id}`}
+                {`id:${lock.resource_id}`}
                 <br />
               </Card.Body>
             </Card>

data/webpack/ForemanTasks/Components/TaskDetails/Components/TaskInfo.js

@@ -69,6 +69,7 @@ class TaskInfo extends Component {
         {
           title: 'Name',
           value: action || __('N/A'),
+          className: 'details-name',
         },
         {
           title: 'Start at',
@@ -129,7 +130,7 @@ class TaskInfo extends Component {
                 {__(items[0].title)}:
               </span>
             </Col>
-            <Col md={5} sm={6}>
+            <Col md={5} sm={6} className={items[0].className}>
               <span>{items[0].value}</span>
             </Col>
             <Col md={2} sm={6}>
@@ -137,7 +138,7 @@ class TaskInfo extends Component {
                 {__(items[1].title)}:
               </span>
             </Col>
-            <Col md={3} sm={6}>
+            <Col md={3} sm={6} className={items[1].className}>
               {items[1].value}
             </Col>
           </Row>

data/webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/__snapshots__/Locks.test.js.snap

@@ -39,12 +39,12 @@ exports[`Locks rendering render with Props 1`] = `
             <span
               className="fa fa-unlock-alt"
             />
-            task_owner
+            User
           </CardTitle>
           <CardBody
             className=""
           >
-            User id:4
+            id:4
             <br />
           </CardBody>
         </Card>
@@ -71,12 +71,12 @@ exports[`Locks rendering render with Props 1`] = `
             <span
               className="fa fa-unlock-alt"
             />
-            task_owner2
+            User
           </CardTitle>
           <CardBody
             className=""
           >
-            User id:2
+            id:2
             <br />
           </CardBody>
         </Card>

data/webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/__snapshots__/TaskInfo.test.js.snap

@@ -27,6 +27,7 @@ exports[`TaskInfo rendering render with Props 1`] = `
     </Col>
     <Col
       bsClass="col"
+      className="details-name"
       componentClass="div"
       md={5}
       sm={6}
@@ -330,6 +331,7 @@ exports[`TaskInfo rendering render without Props 1`] = `
     </Col>
     <Col
       bsClass="col"
+      className="details-name"
       componentClass="div"
       md={5}
       sm={6}

data/webpack/ForemanTasks/Components/TaskDetails/TaskDetails.js

@@ -19,6 +19,7 @@ const TaskDetails = ({
   failedSteps,
   runningSteps,
   locks,
+  links,
   cancelStep,
   taskReloadStart,
   taskReloadStop,
@@ -87,7 +88,7 @@ const TaskDetails = ({
           <Errors executionPlan={executionPlan} failedSteps={failedSteps} />
         </Tab>
         <Tab eventKey={4} disabled={isLoading} title={__('Locks')}>
-          <Locks locks={locks} />
+          <Locks locks={locks.concat(links)} />
         </Tab>
         <Tab eventKey={5} disabled={isLoading} title={__('Raw')}>
           <Raw
@@ -114,6 +115,7 @@ TaskDetails.propTypes = {
   APIerror: PropTypes.object,
   taskReloadStop: PropTypes.func.isRequired,
   taskReloadStart: PropTypes.func.isRequired,
+  links: PropTypes.array,
   ...Task.propTypes,
   ...Errors.propTypes,
   ...Locks.propTypes,
@@ -124,6 +126,7 @@ TaskDetails.defaultProps = {
   runningSteps: [],
   APIerror: null,
   status: STATUS.PENDING,
+  links: [],
   ...Task.defaultProps,
   ...RunningSteps.defaultProps,
   ...Errors.defaultProps,

data/webpack/ForemanTasks/Components/TaskDetails/TaskDetails.scss

@@ -51,7 +51,7 @@
   }
 
   pre {
-    white-space: pre;
+    white-space: pre-wrap;
     word-break: normal;
   }
 
@@ -59,4 +59,8 @@
     display: inline-block;
     width: 10em;
   }
+
+  .details-name {
+    overflow-wrap: anywhere;
+  }
 }

data/webpack/ForemanTasks/Components/TaskDetails/TaskDetailsSelectors.js

@@ -70,6 +70,9 @@ export const selectHasSubTasks = state =>
 export const selectLocks = state =>
   selectTaskDetailsResponse(state).locks || [];
 
+export const selectLinks = state =>
+  selectTaskDetailsResponse(state).links || [];
+
 export const selectUsernamePath = state =>
   selectTaskDetailsResponse(state)?.username_path;
 

data/webpack/ForemanTasks/Components/TaskDetails/index.js

@@ -9,6 +9,7 @@ import {
   selectStartBefore,
   selectStartedAt,
   selectLocks,
+  selectLinks,
   selectInput,
   selectOutput,
   selectResumable,
@@ -56,6 +57,7 @@ const mapStateToProps = state => ({
   help: selectHelp(state),
   hasSubTasks: selectHasSubTasks(state),
   locks: selectLocks(state),
+  links: selectLinks(state),
   usernamePath: selectUsernamePath(state),
   action: selectAction(state),
   state: selectState(state),

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 {

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 {
@@ -169,7 +169,7 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
   />
   <PageLayout
     beforeToolbarComponent={
-      <UNDEFINED
+      <Memo(Connect(TasksDashboard))
         history={
           Object {
             "location": Object {

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

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

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

@@ -1,10 +1,9 @@
 import React from 'react';
 import { cellFormatter } from 'foremanReact/components/common/table';
-import EllipsisWithTooltip from 'react-ellipsis-with-tooltip';
 
 export const actionNameCellFormatter = url => (value, { rowData: { id } }) =>
   cellFormatter(
-    <a href={`/${url}/${id}`}>
-      <EllipsisWithTooltip>{value}</EllipsisWithTooltip>
+    <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.6
+  version: 4.0.0
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-21 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow
@@ -170,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
@@ -179,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
@@ -204,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
@@ -220,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
@@ -246,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
@@ -327,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
@@ -642,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

data/test/unit/lock_test.rb

@@ -1,22 +0,0 @@
-require 'ostruct'
-require 'foreman_tasks_test_helper'
-
-module ForemanTasks
-  class LockTest < ::ActiveSupport::TestCase
-    describe ::ForemanTasks::Lock::LockConflict do
-      class FakeLockConflict < ForemanTasks::Lock::LockConflict
-        def _(val)
-          val.freeze
-        end
-      end
-
-      it 'does not modify frozen strings' do
-        required_lock = OpenStruct.new(:name => 'my_lock')
-        # Before #21770 the next line would raise
-        #   RuntimeError: can't modify frozen String
-        conflict = FakeLockConflict.new(required_lock, [])
-        assert conflict._('this should be frozen').frozen?
-      end
-    end
-  end
-end