foreman-tasks 11.0.5 → 11.0.7

data/locale/pt_BR/foreman_tasks.po

@@ -6,7 +6,7 @@
 # Luiz Henrique Vasconcelos <luizvasconceloss@yahoo.com.br>, 2017-2018
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_tasks 9.2.2\n"
+"Project-Id-Version: foreman-tasks 11.0.5\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-02-12 14:04+0000\n"
 "Last-Translator: Luiz Henrique Vasconcelos <luizvasconceloss@yahoo.com.br>, 20"
@@ -66,7 +66,7 @@ msgid "Action"
 msgstr "Ação"
 
 msgid "Action with sub plans"
-msgstr "Ação com subplanos "
+msgstr ""
 
 msgid "Active"
 msgstr "Ativo"
@@ -318,6 +318,9 @@ msgstr "Erro de inicialização: %s"
 msgid "Input"
 msgstr "Entrada"
 
+msgid "Invalid URL"
+msgstr ""
+
 msgid "Iteration limit"
 msgstr "Limite de iteração"
 

data/locale/ru/foreman_tasks.po

@@ -6,7 +6,7 @@
 # Yulia <yulia.poyarkova@redhat.com>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_tasks 9.2.2\n"
+"Project-Id-Version: foreman-tasks 11.0.5\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-02-12 14:04+0000\n"
 "Last-Translator: Yulia <yulia.poyarkova@redhat.com>, 2016\n"
@@ -66,7 +66,7 @@ msgid "Action"
 msgstr "Действие"
 
 msgid "Action with sub plans"
-msgstr "Действия с подпланами"
+msgstr ""
 
 msgid "Active"
 msgstr "Активно"
@@ -318,6 +318,9 @@ msgstr "Ошибка инициализации: %s"
 msgid "Input"
 msgstr "Вход"
 
+msgid "Invalid URL"
+msgstr ""
+
 msgid "Iteration limit"
 msgstr "Максимальное число итераций"
 

data/locale/zh_CN/foreman_tasks.po

@@ -5,7 +5,7 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_tasks 9.2.2\n"
+"Project-Id-Version: foreman-tasks 11.0.5\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-02-12 14:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -63,7 +63,7 @@ msgid "Action"
 msgstr "操作"
 
 msgid "Action with sub plans"
-msgstr "有子计划的操作"
+msgstr ""
 
 msgid "Active"
 msgstr "活跃"
@@ -148,7 +148,7 @@ msgid "Cannot update a cancelled Recurring Logic."
 msgstr "无法更新一个已取消的周期性逻辑。"
 
 msgid "Changing request id %{request_id} to saved id %{saved_id}"
-msgstr "将请求 id %%{request_id} 改为保存的 id %%{saved_id}"
+msgstr "将请求 id %{request_id} 改为保存的 id %%{saved_id}"
 
 msgid "Check for long running tasks"
 msgstr "检查长时间运行的任务"
@@ -241,7 +241,7 @@ msgid "Errors:"
 msgstr "错误："
 
 msgid "Event delivered by request %{request_id}"
-msgstr "由请求 %%{request_id} 发送的事件"
+msgstr "由请求 %{request_id} 发送的事件"
 
 msgid "Exception"
 msgstr "例外"
@@ -315,6 +315,9 @@ msgstr "初始化错误：%s"
 msgid "Input"
 msgstr "输入"
 
+msgid "Invalid URL"
+msgstr ""
+
 msgid "Iteration limit"
 msgstr "重述限制"
 
@@ -548,7 +551,7 @@ msgid "Schedule future execution"
 msgstr "调度未来的执行"
 
 msgid "Scheduled"
-msgstr "调度的"
+msgstr "调度"
 
 msgid "Search query"
 msgstr "搜索查询"
@@ -804,7 +807,7 @@ msgid "is hour (range: 0-23)"
 msgstr "小时（范围：0-23）"
 
 msgid "is in the past"
-msgstr ""
+msgstr "在过去"
 
 #. TRANSLATORS: this translation is referring to an option which is a time interval
 msgid "is minute (range: 0-59)"
@@ -824,10 +827,10 @@ msgid "mode"
 msgstr "模式"
 
 msgid "mode has to be one of %{allowed_modes}"
-msgstr "模式必须是 %%{allowed_modes} 之一"
+msgstr "模式必须是 %{allowed_modes} 之一"
 
 msgid "must be set"
-msgstr ""
+msgstr "必须设置"
 
 msgid "older"
 msgstr "较老"

data/locale/zh_TW/foreman_tasks.po

@@ -5,7 +5,7 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_tasks 9.2.2\n"
+"Project-Id-Version: foreman-tasks 11.0.5\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-02-12 14:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -63,7 +63,7 @@ msgid "Action"
 msgstr "動作"
 
 msgid "Action with sub plans"
-msgstr "有子計畫的動作"
+msgstr ""
 
 msgid "Active"
 msgstr "啟用中"
@@ -315,6 +315,9 @@ msgstr "初始化錯誤：%s"
 msgid "Input"
 msgstr "輸入"
 
+msgid "Invalid URL"
+msgstr ""
+
 msgid "Iteration limit"
 msgstr "重述限制"
 

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

@@ -1,7 +1,11 @@
-import React from 'react';
+import React, { useState } from 'react';
 import { Grid, Row } from 'patternfly-react';
+import PropTypes from 'prop-types';
 import TaskInfo from './TaskInfo';
-import { ForceUnlockModal, UnlockModal } from '../../TaskActions/UnlockModals';
+import {
+  ForceUnlockConfirmationModal,
+  UnlockConfirmationModal,
+} from '../../common/ClickConfirmation';
 import { TaskButtons } from './TaskButtons';
 
 const Task = props => {
@@ -25,13 +29,29 @@ const Task = props => {
     }
     unlockTaskRequest(id, action);
   };
+  const [unlockModalOpen, setUnlockModalOpen] = useState(false);
+  const [forceUnlockModalOpen, setForceUnlockModalOpen] = useState(false);
+
   return (
     <React.Fragment>
-      <UnlockModal onClick={unlock} />
-      <ForceUnlockModal onClick={forceUnlock} />
+      <UnlockConfirmationModal
+        onClick={unlock}
+        isOpen={unlockModalOpen}
+        setModalClosed={() => setUnlockModalOpen(false)}
+      />
+      <ForceUnlockConfirmationModal
+        onClick={forceUnlock}
+        isOpen={forceUnlockModalOpen}
+        setModalClosed={() => setForceUnlockModalOpen(false)}
+      />
       <Grid>
         <Row>
-          <TaskButtons taskReloadStart={taskReloadStart} {...props} />
+          <TaskButtons
+            taskReloadStart={taskReloadStart}
+            setUnlockModalOpen={setUnlockModalOpen}
+            setForceUnlockModalOpen={setForceUnlockModalOpen}
+            {...props}
+          />
         </Row>
         <TaskInfo {...props} />
       </Grid>
@@ -40,13 +60,21 @@ const Task = props => {
 };
 
 Task.propTypes = {
-  ...TaskInfo.PropTypes,
-  ...TaskButtons.PropTypes,
+  taskReload: PropTypes.bool,
+  id: PropTypes.string,
+  forceCancelTaskRequest: PropTypes.func,
+  unlockTaskRequest: PropTypes.func,
+  action: PropTypes.string,
+  taskReloadStart: PropTypes.func,
 };
 
 Task.defaultProps = {
-  ...TaskInfo.defaultProps,
-  ...TaskButtons.defaultProps,
+  taskReload: false,
+  id: '',
+  forceCancelTaskRequest: () => null,
+  unlockTaskRequest: () => null,
+  action: '',
+  taskReloadStart: () => null,
 };
 
 export default Task;

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

@@ -1,12 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Col, Button } from 'patternfly-react';
-import { useForemanModal } from 'foremanReact/components/ForemanModal/ForemanModalHooks';
 import { translate as __ } from 'foremanReact/common/I18n';
-import {
-  UNLOCK_MODAL,
-  FORCE_UNLOCK_MODAL,
-} from '../../TaskActions/TaskActionsConstants';
 
 export const TaskButtons = ({
   canEdit,
@@ -24,13 +19,9 @@ export const TaskButtons = ({
   parentTask,
   cancelTaskRequest,
   resumeTaskRequest,
+  setUnlockModalOpen,
+  setForceUnlockModalOpen,
 }) => {
-  const unlockModalActions = useForemanModal({
-    id: UNLOCK_MODAL,
-  });
-  const forceUnlockModalActions = useForemanModal({
-    id: FORCE_UNLOCK_MODAL,
-  });
   const editActionsTitle = canEdit
     ? undefined
     : __('You do not have permission');
@@ -114,7 +105,9 @@ export const TaskButtons = ({
         className="unlock-button"
         bsSize="small"
         disabled={!canEdit || state !== 'paused'}
-        onClick={unlockModalActions.setModalOpen}
+        onClick={() => {
+          setUnlockModalOpen(true);
+        }}
         title={editActionsTitle}
         data-original-title={editActionsTitle}
       >
@@ -124,7 +117,7 @@ export const TaskButtons = ({
         className="force-unlock-button"
         bsSize="small"
         disabled={!canEdit || state === 'stopped'}
-        onClick={forceUnlockModalActions.setModalOpen}
+        onClick={() => setForceUnlockModalOpen(true)}
         title={editActionsTitle}
         data-original-title={editActionsTitle}
       >
@@ -134,7 +127,7 @@ export const TaskButtons = ({
   );
 };
 
-TaskButtons.propTypes = {
+export const TaskButtonspropTypes = {
   canEdit: PropTypes.bool,
   dynflowEnableConsole: PropTypes.bool,
   taskReloadStart: PropTypes.func.isRequired,
@@ -151,8 +144,7 @@ TaskButtons.propTypes = {
   cancelTaskRequest: PropTypes.func,
   resumeTaskRequest: PropTypes.func,
 };
-
-TaskButtons.defaultProps = {
+export const TaskButtonsdefaultProps = {
   canEdit: false,
   dynflowEnableConsole: false,
   taskReload: false,
@@ -166,3 +158,14 @@ TaskButtons.defaultProps = {
   cancelTaskRequest: () => null,
   resumeTaskRequest: () => null,
 };
+
+TaskButtons.propTypes = {
+  ...TaskButtonspropTypes,
+  setUnlockModalOpen: PropTypes.func,
+  setForceUnlockModalOpen: PropTypes.func,
+};
+TaskButtons.defaultProps = {
+  setUnlockModalOpen: () => null,
+  setForceUnlockModalOpen: () => null,
+  ...TaskButtonsdefaultProps,
+};

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

@@ -1,45 +1,160 @@
 import React from 'react';
-import {
-  testComponentSnapshotsWithFixtures,
-  mount,
-  shallow,
-} from '@theforeman/test';
-import { useForemanModal } from 'foremanReact/components/ForemanModal/ForemanModalHooks';
+import { render, screen, fireEvent } from '@testing-library/react';
+import '@testing-library/jest-dom';
 import { STATUS } from 'foremanReact/constants';
 import { TaskButtons } from '../TaskButtons';
-import {
-  UNLOCK_MODAL,
-  FORCE_UNLOCK_MODAL,
-} from '../../../TaskActions/TaskActionsConstants';
-
-const fixtures = {
-  'render with minimal Props': {
-    id: 'test',
-    taskReloadStart: jest.fn(),
-    taskProgressToggle: jest.fn(),
-  },
-  'render with some Props': {
-    id: 'test',
-    state: 'paused',
-    hasSubTasks: true,
-    dynflowEnableConsole: true,
-    parentTask: 'parent-id',
-    taskReload: true,
-    canEdit: true,
-    status: STATUS.RESOLVED,
-    taskReloadStart: jest.fn(),
-    taskProgressToggle: jest.fn(),
-  },
+
+const setUnlockModalOpen = jest.fn();
+const setForceUnlockModalOpen = jest.fn();
+
+const defaultProps = {
+  id: 'test',
+  taskReloadStart: jest.fn(),
+  taskProgressToggle: jest.fn(),
+  cancelTaskRequest: jest.fn(),
+  resumeTaskRequest: jest.fn(),
+  setUnlockModalOpen,
+  setForceUnlockModalOpen,
 };
 
-describe('Task', () => {
-  describe('rendering', () =>
-    testComponentSnapshotsWithFixtures(TaskButtons, fixtures));
-  describe('click test', () => {
-    const setModalOpen = jest.fn();
-    useForemanModal.mockImplementation(id => ({
-      setModalOpen: () => setModalOpen(id),
-    }));
+describe('TaskButtons', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('rendering', () => {
+    it('renders reload button with correct text when taskReload is false', () => {
+      render(<TaskButtons {...defaultProps} taskReload={false} />);
+      expect(
+        screen.getByRole('button', { name: /start auto-reloading/i })
+      ).toBeInTheDocument();
+      expect(
+        screen.queryByRole('button', { name: /stop auto-reloading/i })
+      ).not.toBeInTheDocument();
+    });
+
+    it('renders reload button with correct text when taskReload is true', () => {
+      render(<TaskButtons {...defaultProps} taskReload />);
+      expect(
+        screen.getByRole('button', { name: /stop auto-reloading/i })
+      ).toBeInTheDocument();
+      expect(
+        screen.queryByRole('button', { name: /start auto-reloading/i })
+      ).not.toBeInTheDocument();
+    });
+
+    it('renders dynflow console link with correct href when externalId is provided', () => {
+      render(<TaskButtons {...defaultProps} externalId="external-123" />);
+      const dynflowLink = screen.getByRole('link', {
+        name: /dynflow console/i,
+      });
+      expect(dynflowLink).toHaveAttribute(
+        'href',
+        '/foreman_tasks/dynflow/external-123'
+      );
+      expect(dynflowLink).toHaveAttribute('target', '_blank');
+      expect(dynflowLink).toHaveAttribute('rel', 'noopener noreferrer');
+    });
+
+    it('disables dynflow console link when dynflowEnableConsole is false', () => {
+      render(<TaskButtons {...defaultProps} dynflowEnableConsole={false} />);
+      const dynflowLink = screen.getByRole('link', {
+        name: /dynflow console/i,
+      });
+      expect(dynflowLink).toHaveClass('disabled');
+    });
+
+    it('enables dynflow console link when dynflowEnableConsole is true', () => {
+      render(
+        <TaskButtons
+          {...defaultProps}
+          dynflowEnableConsole
+          externalId="external-123"
+        />
+      );
+      const dynflowLink = screen.getByRole('link', {
+        name: /dynflow console/i,
+      });
+      expect(dynflowLink).not.toHaveClass('disabled');
+    });
+
+    it('disables resume and cancel buttons when canEdit is false', () => {
+      render(<TaskButtons {...defaultProps} canEdit={false} />);
+      expect(screen.getByRole('button', { name: /resume/i })).toBeDisabled();
+      expect(screen.getByRole('button', { name: /cancel/i })).toBeDisabled();
+    });
+
+    it('disables resume button when resumable is false', () => {
+      render(<TaskButtons {...defaultProps} canEdit resumable={false} />);
+      expect(screen.getByRole('button', { name: /resume/i })).toBeDisabled();
+    });
+
+    it('disables cancel button when cancellable is false', () => {
+      render(<TaskButtons {...defaultProps} canEdit cancellable={false} />);
+      expect(screen.getByRole('button', { name: /cancel/i })).toBeDisabled();
+    });
+
+    it('disables unlock button when state is not paused', () => {
+      render(<TaskButtons {...defaultProps} canEdit state="running" />);
+      expect(screen.getByRole('button', { name: /^unlock$/i })).toBeDisabled();
+    });
+
+    it('enables unlock button when state is paused and canEdit is true', () => {
+      render(<TaskButtons {...defaultProps} canEdit state="paused" />);
+      expect(
+        screen.getByRole('button', { name: /^unlock$/i })
+      ).not.toBeDisabled();
+    });
+
+    it('disables force unlock button when state is stopped', () => {
+      render(<TaskButtons {...defaultProps} canEdit state="stopped" />);
+      expect(
+        screen.getByRole('button', { name: /force unlock/i })
+      ).toBeDisabled();
+    });
+
+    it('enables force unlock button when state is not stopped and canEdit is true', () => {
+      render(<TaskButtons {...defaultProps} canEdit state="running" />);
+      expect(
+        screen.getByRole('button', { name: /force unlock/i })
+      ).not.toBeDisabled();
+    });
+
+    it('renders parent task button when parentTask is provided', () => {
+      render(<TaskButtons {...defaultProps} parentTask="parent-123" />);
+      const parentButton = screen.getByRole('link', { name: /parent task/i });
+      expect(parentButton).toBeInTheDocument();
+      expect(parentButton).toHaveAttribute(
+        'href',
+        '/foreman_tasks/tasks/parent-123'
+      );
+    });
+
+    it('does not render parent task button when parentTask is not provided', () => {
+      render(<TaskButtons {...defaultProps} />);
+      expect(
+        screen.queryByRole('link', { name: /parent task/i })
+      ).not.toBeInTheDocument();
+    });
+
+    it('renders sub tasks button when hasSubTasks is true', () => {
+      render(<TaskButtons {...defaultProps} hasSubTasks id="task-123" />);
+      const subTasksButton = screen.getByRole('link', { name: /sub tasks/i });
+      expect(subTasksButton).toBeInTheDocument();
+      expect(subTasksButton).toHaveAttribute(
+        'href',
+        '/foreman_tasks/tasks/task-123/sub_tasks'
+      );
+    });
+
+    it('does not render sub tasks button when hasSubTasks is false', () => {
+      render(<TaskButtons {...defaultProps} hasSubTasks={false} />);
+      expect(
+        screen.queryByRole('link', { name: /sub tasks/i })
+      ).not.toBeInTheDocument();
+    });
+  });
+  describe('user interactions', () => {
     const cancelTaskRequest = jest.fn();
     const resumeTaskRequest = jest.fn();
     const taskProgressToggle = jest.fn();
@@ -47,6 +162,7 @@ describe('Task', () => {
     const id = 'some-id';
     const action = 'some-action';
     const props = {
+      ...defaultProps,
       taskReload: false,
       id,
       action,
@@ -55,41 +171,51 @@ describe('Task', () => {
       taskProgressToggle,
       taskReloadStart,
       status: STATUS.RESOLVED,
+      canEdit: true,
+      resumable: true,
+      cancellable: true,
+      state: 'paused',
     };
-    afterEach(() => {
-      jest.clearAllMocks();
-    });
-    it('reload', () => {
-      const component = mount(<TaskButtons {...props} />);
-      const reloadButton = component.find('.reload-button').at(0);
-      reloadButton.simulate('click');
-      expect(taskProgressToggle).toBeCalled();
-    });
-    it('resume', () => {
-      const component = shallow(<TaskButtons {...props} />);
-      const resumeButton = component.find('.resume-button').at(0);
-      resumeButton.props().onClick();
-      expect(taskReloadStart).toBeCalled();
-      expect(resumeTaskRequest).toBeCalledWith(id, action);
-    });
-    it('cancel', () => {
-      const component = shallow(<TaskButtons {...props} />);
-      const cancelButton = component.find('.cancel-button').at(0);
-      cancelButton.props().onClick();
-      expect(taskReloadStart).toBeCalled();
-      expect(cancelTaskRequest).toBeCalledWith(id, action);
-    });
-    it('unlock', () => {
-      const component = shallow(<TaskButtons {...props} />);
-      const unlockButton = component.find('.unlock-button').at(0);
-      unlockButton.props().onClick();
-      expect(setModalOpen).toBeCalledWith({ id: UNLOCK_MODAL });
-    });
-    it('focrce unlock', () => {
-      const component = shallow(<TaskButtons {...props} />);
-      const forceUnlockButton = component.find('.force-unlock-button').at(0);
-      forceUnlockButton.props().onClick();
-      expect(setModalOpen).toBeCalledWith({ id: FORCE_UNLOCK_MODAL });
+
+    it('calls taskProgressToggle when reload button is clicked', () => {
+      render(<TaskButtons {...props} />);
+      const reloadButton = screen.getByRole('button', {
+        name: /start auto-reloading/i,
+      });
+      fireEvent.click(reloadButton);
+      expect(taskProgressToggle).toHaveBeenCalled();
+    });
+
+    it('calls taskReloadStart and resumeTaskRequest when resume button is clicked', () => {
+      render(<TaskButtons {...props} />);
+      const resumeButton = screen.getByRole('button', { name: /resume/i });
+      fireEvent.click(resumeButton);
+      expect(taskReloadStart).toHaveBeenCalledWith(id);
+      expect(resumeTaskRequest).toHaveBeenCalledWith(id, action);
+    });
+
+    it('calls taskReloadStart and cancelTaskRequest when cancel button is clicked', () => {
+      render(<TaskButtons {...props} />);
+      const cancelButton = screen.getByRole('button', { name: /cancel/i });
+      fireEvent.click(cancelButton);
+      expect(taskReloadStart).toHaveBeenCalledWith(id);
+      expect(cancelTaskRequest).toHaveBeenCalledWith(id, action);
+    });
+
+    it('calls setUnlockModalOpen when unlock button is clicked', () => {
+      render(<TaskButtons {...props} />);
+      const unlockButton = screen.getByRole('button', { name: /^unlock$/i });
+      fireEvent.click(unlockButton);
+      expect(setUnlockModalOpen).toHaveBeenCalledWith(true);
+    });
+
+    it('calls setForceUnlockModalOpen when force unlock button is clicked', () => {
+      render(<TaskButtons {...props} />);
+      const forceUnlockButton = screen.getByRole('button', {
+        name: /force unlock/i,
+      });
+      fireEvent.click(forceUnlockButton);
+      expect(setForceUnlockModalOpen).toHaveBeenCalledWith(true);
     });
   });
 });