foreman-tasks 0.17.0 → 0.17.1

data/test/unit/dynflow_console_authorizer_test.rb

@@ -20,7 +20,7 @@ module ForemanTasks
       dynflow_path += task.external_id.to_s if task
       dynflow_rack_env = { 'rack.session' => { 'user' => user.id, 'expires_at' => Time.zone.now + 100 },
                            'PATH_INFO' => dynflow_path }.with_indifferent_access
-      ForemanTasks::Dynflow::ConsoleAuthorizer.new(dynflow_rack_env).allow?
+      ForemanTasks::Dynflow::ConsoleAuthorizer.from_env(dynflow_rack_env).allow?
     end
 
     describe 'admin user' do

data/test/unit/otp_manager_test.rb

@@ -9,6 +9,10 @@ module ForemanTasksCore
       end
     end
 
+    def try_to_authenticate(username, password)
+      TestOtpManager.authenticate(OtpManager.tokenize(username, password))
+    end
+
     before do
       TestOtpManager.reset!
     end
@@ -18,7 +22,7 @@ module ForemanTasksCore
     let(:base64)   { 'bXl1c2VyOjEyMzQ1Njc4OQ==' }
 
     it 'it doesn\'t raise when no passwords were generated yet' do
-      assert_nil TestOtpManager.drop_otp('missing', 'password')
+      assert_not try_to_authenticate('missing', 'password')
     end
 
     it 'generates OTPs using SecureRandom.hex and converts them to strings' do
@@ -27,33 +31,36 @@ module ForemanTasksCore
       TestOtpManager.generate_otp(username).must_equal otp.to_s
     end
 
-    it 'removes OTP only when correct username and password is provided' do
+    it 'provides #drop_otp method that removes OTP only when correct username and password is provided' do
       otp = TestOtpManager.generate_otp(username)
-      assert_nil TestOtpManager.drop_otp('wrong_username', 'wrong_password')
-      assert_nil TestOtpManager.drop_otp(username, 'wrong_password')
-      assert_nil TestOtpManager.drop_otp('wrong_username', otp)
-      TestOtpManager.drop_otp(username, otp).must_equal otp
+      assert_not TestOtpManager.drop_otp('wrong_username', 'wrong_password')
+      assert_not TestOtpManager.drop_otp(username, 'wrong_password')
+      assert_not TestOtpManager.drop_otp('wrong_username', otp)
+      assert TestOtpManager.drop_otp(username, otp)
     end
 
-    it 'parses the hash correctly' do
-      SecureRandom.stubs(:hex).returns(password)
-      TestOtpManager.expects(:drop_otp).with(username, password.to_s)
-      TestOtpManager.authenticate(base64)
+    it 'authenticate removes OTP only when correct username and password is provided' do
+      otp = TestOtpManager.generate_otp(username)
+      assert_not try_to_authenticate('wrong_username', 'wrong_password')
+      assert_not try_to_authenticate(username, 'wrong_password')
+      assert_not try_to_authenticate(username, 'wrong_password')
+      assert_not try_to_authenticate('wrong_username', otp)
+      assert try_to_authenticate(username, otp)
     end
 
     it 'authenticates correctly' do
       SecureRandom.stubs(:hex).returns(password)
-      generated = TestOtpManager.generate_otp(username)
+      TestOtpManager.generate_otp(username)
 
-      TestOtpManager.authenticate(base64).must_equal generated
+      assert TestOtpManager.authenticate(base64)
     end
 
     it 'OTPs can be used only once' do
       SecureRandom.stubs(:hex).returns(password)
-      generated = TestOtpManager.generate_otp(username)
+      TestOtpManager.generate_otp(username)
 
-      TestOtpManager.authenticate(base64).must_equal generated
-      assert_nil TestOtpManager.authenticate(base64)
+      assert TestOtpManager.authenticate(base64)
+      assert_not TestOtpManager.authenticate(base64)
     end
 
     it 'creates token from username and password correctly' do
@@ -63,8 +70,8 @@ module ForemanTasksCore
     it 'overwrites old OTP when generating a new one for the same username' do
       old = TestOtpManager.generate_otp(username)
       new = TestOtpManager.generate_otp(username)
-      assert_nil TestOtpManager.drop_otp(username, old)
-      TestOtpManager.drop_otp(username, new).must_equal new
+      assert_not try_to_authenticate(username, old)
+      assert try_to_authenticate(username, new)
     end
   end
 end

data/test/unit/task_test.rb

@@ -30,20 +30,66 @@ class TasksTest < ActiveSupport::TestCase
       assert_equal [@task_one], ForemanTasks::Task.search_for("user = #{@user_one.login}")
     end
 
+    test 'cannot search by arbitrary key' do
+      proc { ForemanTasks::Task.search_for('user.my_key ~ 5') }.must_raise(ScopedSearch::QueryNotSupported)
+      proc { ForemanTasks::Task.search_for('user. = 5') }.must_raise(ScopedSearch::QueryNotSupported)
+    end
+
+    test 'can search the tasks by negated user' do
+      assert_equal [@task_one], ForemanTasks::Task.search_for("user != #{@user_two.login}")
+      assert_equal [@task_one], ForemanTasks::Task.search_for("user <> #{@user_two.login}")
+      SecureRandom.stubs(:hex).returns('abc')
+      assert_equal ForemanTasks::Task.search_for("user != #{@user_two.login}").to_sql,
+                   ForemanTasks::Task.search_for("user <> #{@user_two.login}").to_sql
+    end
+
     test 'can search the tasks by user\'s id' do
       assert_equal [@task_one], ForemanTasks::Task.search_for("user.id = #{@user_one.id}")
       assert_equal [@task_one], ForemanTasks::Task.search_for("owner.id = #{@user_one.id}")
+      assert_equal [@task_one], ForemanTasks::Task.search_for("user.id != #{@user_two.id}")
+      assert_equal [@task_one], ForemanTasks::Task.search_for("owner.id != #{@user_two.id}")
+    end
+
+    test 'can search by array of user ids' do
+      assert_equal [@task_one], ForemanTasks::Task.search_for("user.id ^ (#{@user_one.id})")
+      assert_equal [@task_one], ForemanTasks::Task.search_for("owner.id ^ (#{@user_one.id})")
+      assert_equal [@task_one], ForemanTasks::Task.search_for("user.id !^ (#{@user_two.id})")
+      assert_equal [@task_one], ForemanTasks::Task.search_for("owner.id !^ (#{@user_two.id})")
+    end
+
+    test 'cannot glob on user\'s id' do
+      proc { ForemanTasks::Task.search_for("user.id ~ something") }.must_raise(ScopedSearch::QueryNotSupported)
+      proc { ForemanTasks::Task.search_for("user.id ~ 5") }.must_raise(ScopedSearch::QueryNotSupported)
     end
 
     test 'can search the tasks by user with wildcards' do
-      glob = '*' + @user_one.login[1..-1] # search for '*ser1' if login is 'user1'
-      assert_equal [@task_one], ForemanTasks::Task.search_for("user ~ #{glob}")
+      part = @user_one.login[1..-1] # search for '*ser1' if login is 'user1'
+      # The following two should be equivalent
+      assert_equal [@task_one], ForemanTasks::Task.search_for("user ~ #{part}")
+      assert_equal [@task_one], ForemanTasks::Task.search_for("user ~ *#{part}*")
+      SecureRandom.stubs(:hex).returns('abc')
+      assert_equal ForemanTasks::Task.search_for("user ~ #{part}").to_sql,
+                   ForemanTasks::Task.search_for("user ~ *#{part}*").to_sql
+    end
+
+    test 'can search the tasks by user with negated wildcards' do
+      part = @user_two.login[1..-1] # search for '*ser1' if login is 'user1'
+      # The following two should be equivalent
+      assert_equal [@task_one], ForemanTasks::Task.search_for("user !~ #{part}")
+      assert_equal [@task_one], ForemanTasks::Task.search_for("user !~ *#{part}*")
+      SecureRandom.stubs(:hex).returns('abc')
+      assert_equal ForemanTasks::Task.search_for("user !~ #{part}").to_sql,
+                   ForemanTasks::Task.search_for("user !~ *#{part}*").to_sql
     end
 
     test 'can search the tasks by array' do
       assert_equal [@task_one], ForemanTasks::Task.search_for("user ^ (this_user, #{@user_one.login}, that_user)")
     end
 
+    test 'can search the tasks by negated array' do
+      assert_equal [@task_one], ForemanTasks::Task.search_for("user !^ (this_user, #{@user_two.login}, that_user)")
+    end
+
     test 'properly returns username' do
       assert_equal @task_one.username, @user_one.login
     end

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

@@ -4,6 +4,8 @@ import { Grid, Row, Col, Button } from 'patternfly-react';
 import { translate as __ } from 'foremanReact/common/I18n';
 import TaskInfo from './TaskInfo';
 import { ClickConfirmation } from '../../common/ClickConfirmation';
+import { ResumeButton } from '../../common/ActionButtons/ResumeButton';
+import { CancelButton } from '../../common/ActionButtons/CancelButton';
 
 class Task extends Component {
   taskProgressToggle = () => {
@@ -37,6 +39,9 @@ class Task extends Component {
       showForceUnlockModal,
       toggleUnlockModal,
       toggleForceUnlockModal,
+      cancelTaskRequest,
+      resumeTaskRequest,
+      action,
     } = this.props;
     const modalUnlock = (
       <ClickConfirmation
@@ -97,24 +102,28 @@ class Task extends Component {
               >
                 {__('Dynflow console')}
               </Button>
-              <Button
-                bsSize="small"
-                bsStyle="primary"
-                data-method="post"
-                href={`/foreman_tasks/tasks/${id}/resume`}
+              <ResumeButton
+                id={id}
+                onClick={() => {
+                  if (!taskReload) {
+                    this.taskProgressToggle();
+                  }
+                  resumeTaskRequest(id, action);
+                }}
+                name={action}
                 disabled={!resumable}
-              >
-                {__('Resume')}
-              </Button>
-              <Button
-                bsSize="small"
-                data-method="post"
-                href={`/foreman_tasks/tasks/${id}/cancel`}
+              />
+              <CancelButton
+                id={id}
+                name={action}
                 disabled={!cancellable}
-              >
-                {__('Cancel')}
-              </Button>
-
+                onClick={() => {
+                  if (!taskReload) {
+                    this.taskProgressToggle();
+                  }
+                  cancelTaskRequest(id, action);
+                }}
+              />
               {parentTask && (
                 <Button
                   bsSize="small"
@@ -177,6 +186,8 @@ Task.propTypes = {
   showForceUnlockModal: PropTypes.bool,
   toggleUnlockModal: PropTypes.func,
   toggleForceUnlockModal: PropTypes.func,
+  cancelTaskRequest: PropTypes.func,
+  resumeTaskRequest: PropTypes.func,
 };
 
 Task.defaultProps = {
@@ -197,6 +208,8 @@ Task.defaultProps = {
   showForceUnlockModal: false,
   toggleUnlockModal: () => null,
   toggleForceUnlockModal: () => null,
+  cancelTaskRequest: () => null,
+  resumeTaskRequest: () => null,
 };
 
 export default Task;

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

@@ -1,29 +1,15 @@
 import { translate as __, documentLocale } from 'foremanReact/common/I18n';
-import React from 'react';
-import { FormattedRelative } from 'react-intl';
+import { isoCompatibleDate } from 'foremanReact/common/helpers';
 import humanizeDuration from 'humanize-duration';
 
-const formatDate = date => {
-  // Firefox doesnt format dd-mm-yyyy type strings to date
-  if (typeof date === 'string' || date instanceof String)
-    return new Date(date.replace(/-/, '/').replace(/-/, '/'));
-  return date;
-};
-
-export const timeInWords = time => {
-  if (!time) return __('N/A');
-  time = formatDate(time);
-  return <FormattedRelative value={time} />;
-};
-
 export const durationInWords = (
   start,
   finish,
   selectedLocale = documentLocale()
 ) => {
   if (!start) return __('N/A');
-  start = formatDate(start).getTime();
-  finish = formatDate(finish).getTime();
+  start = new Date(isoCompatibleDate(start)).getTime();
+  finish = new Date(isoCompatibleDate(finish)).getTime();
   return {
     text: humanizeDuration(new Date(finish - start).getTime(), {
       largest: 1,

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

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { Grid, Row, Col, ProgressBar } from 'patternfly-react';
 import { translate as __ } from 'foremanReact/common/I18n';
 import EllipsisWithTooltip from 'react-ellipsis-with-tooltip';
-import { timeInWords } from './TaskHelper';
+import RelativeDateTime from 'foremanReact/components/common/dates/RelativeDateTime';
 
 class TaskInfo extends Component {
   isDelayed = () => {
@@ -73,7 +73,10 @@ class TaskInfo extends Component {
             <EllipsisWithTooltip>{action || __('N/A')}</EllipsisWithTooltip>
           ),
         },
-        { title: 'Start at', value: timeInWords(startAt) },
+        {
+          title: 'Start at',
+          value: <RelativeDateTime defaultValue={__('N/A')} date={startAt} />,
+        },
       ],
       [
         {
@@ -85,7 +88,10 @@ class TaskInfo extends Component {
             </React.Fragment>
           ),
         },
-        { title: 'Started at', value: timeInWords(startedAt) },
+        {
+          title: 'Started at',
+          value: <RelativeDateTime defaultValue={__('N/A')} date={startedAt} />,
+        },
       ],
       [
         {
@@ -96,7 +102,10 @@ class TaskInfo extends Component {
             username || ''
           ),
         },
-        { title: 'Ended at', value: timeInWords(endedAt) },
+        {
+          title: 'Ended at',
+          value: <RelativeDateTime defaultValue={__('N/A')} date={endedAt} />,
+        },
       ],
       [
         {
@@ -105,7 +114,11 @@ class TaskInfo extends Component {
         },
         {
           title: 'Start before',
-          value: startBefore ? timeInWords(startBefore) : '-',
+          value: startBefore ? (
+            <RelativeDateTime defaultValue={__('N/A')} date={startBefore} />
+          ) : (
+            '-'
+          ),
         },
       ],
     ];

data/webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/TaskHelper.test.js

@@ -1,59 +1,4 @@
-import React from 'react';
-import { mount } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import { IntlProvider } from 'react-intl';
-import { timeInWords, durationInWords } from '../TaskHelper';
-
-describe('timeInWords', () => {
-  it('should work for past minutes', () => {
-    const component = mount(
-      <IntlProvider locale="en">
-        {timeInWords(new Date().getTime() - 1000 * 60 * 5)}
-      </IntlProvider>
-    );
-    expect(toJson(component.render())).toMatchSnapshot();
-  });
-  it('should work for past hours', () => {
-    const component = mount(
-      <IntlProvider locale="en">
-        {timeInWords(new Date().getTime() - 1000 * 60 * 60 * 5)}
-      </IntlProvider>
-    );
-    expect(toJson(component.render())).toMatchSnapshot();
-  });
-  it('should work for past days', () => {
-    const component = mount(
-      <IntlProvider locale="en">
-        {timeInWords(new Date().getTime() - 1000 * 60 * 60 * 24 * 5)}
-      </IntlProvider>
-    );
-    expect(toJson(component.render())).toMatchSnapshot();
-  });
-  it('should work for future minutes', () => {
-    const component = mount(
-      <IntlProvider locale="en">
-        {timeInWords(new Date().getTime() + 1000 * 60 * 5)}
-      </IntlProvider>
-    );
-    expect(toJson(component.render())).toMatchSnapshot();
-  });
-  it('should work for future hours', () => {
-    const component = mount(
-      <IntlProvider locale="en">
-        {timeInWords(new Date().getTime() + 1000 * 60 * 60 * 5)}
-      </IntlProvider>
-    );
-    expect(toJson(component.render())).toMatchSnapshot();
-  });
-  it('should work for future days', () => {
-    const component = mount(
-      <IntlProvider locale="en">
-        {timeInWords(new Date().getTime() + 1000 * 60 * 60 * 24 * 5)}
-      </IntlProvider>
-    );
-    expect(toJson(component.render())).toMatchSnapshot();
-  });
-});
+import { durationInWords } from '../TaskHelper';
 
 describe('durationInWords', () => {
   it('should work for seconds', () => {

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

@@ -63,30 +63,18 @@ exports[`Task rendering render with some Props 1`] = `
         >
           Dynflow console
         </Button>
-        <Button
-          active={false}
-          block={false}
-          bsClass="btn"
-          bsSize="small"
-          bsStyle="primary"
-          data-method="post"
+        <ResumeButton
           disabled={true}
-          href="/foreman_tasks/tasks/test/resume"
-        >
-          Resume
-        </Button>
-        <Button
-          active={false}
-          block={false}
-          bsClass="btn"
-          bsSize="small"
-          bsStyle="default"
-          data-method="post"
+          id="test"
+          name=""
+          onClick={[Function]}
+        />
+        <CancelButton
           disabled={true}
-          href="/foreman_tasks/tasks/test/cancel"
-        >
-          Cancel
-        </Button>
+          id="test"
+          name=""
+          onClick={[Function]}
+        />
         <Button
           active={false}
           block={false}
@@ -125,6 +113,7 @@ exports[`Task rendering render with some Props 1`] = `
     <TaskInfo
       action=""
       allowDangerousActions={true}
+      cancelTaskRequest={[Function]}
       cancellable={false}
       endedAt=""
       error={Array []}
@@ -138,6 +127,7 @@ exports[`Task rendering render with some Props 1`] = `
       refetchTaskDetails={[Function]}
       result="error"
       resumable={false}
+      resumeTaskRequest={[Function]}
       showForceUnlockModal={false}
       showUnlockModal={false}
       startAt=""
@@ -220,35 +210,24 @@ exports[`Task rendering render without Props 1`] = `
         >
           Dynflow console
         </Button>
-        <Button
-          active={false}
-          block={false}
-          bsClass="btn"
-          bsSize="small"
-          bsStyle="primary"
-          data-method="post"
+        <ResumeButton
           disabled={true}
-          href="/foreman_tasks/tasks/test/resume"
-        >
-          Resume
-        </Button>
-        <Button
-          active={false}
-          block={false}
-          bsClass="btn"
-          bsSize="small"
-          bsStyle="default"
-          data-method="post"
+          id="test"
+          name=""
+          onClick={[Function]}
+        />
+        <CancelButton
           disabled={true}
-          href="/foreman_tasks/tasks/test/cancel"
-        >
-          Cancel
-        </Button>
+          id="test"
+          name=""
+          onClick={[Function]}
+        />
       </Col>
     </Row>
     <TaskInfo
       action=""
       allowDangerousActions={false}
+      cancelTaskRequest={[Function]}
       cancellable={false}
       endedAt=""
       error={Array []}
@@ -262,6 +241,7 @@ exports[`Task rendering render without Props 1`] = `
       refetchTaskDetails={[Function]}
       result="error"
       resumable={false}
+      resumeTaskRequest={[Function]}
       showForceUnlockModal={false}
       showUnlockModal={false}
       startAt=""