Merge pull request #2840 from swaterkamp/startSchedTask

Show StartIcon for scheduled tasks on task listpage
greenbone · Apr 7, 2021 · c22a231 · c22a231
2 parents e6c1de0 + ecfa869
commit c22a231
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Added the CVSS v3.1 BaseScore calculator to the `/cvsscalculator` page in the Help section. [#2536](https://github.com/greenbone/gsa/pull/2536)
 
 ### Changed
+- Show StartIcon for scheduled tasks [#2840](https://github.com/greenbone/gsa/pull/2840)
 - Move error message and adjust design on login page [#2780](https://github.com/greenbone/gsa/pull/2780)
 - Refactored useFormValidation hook [#2704](https://github.com/greenbone/gsa/pull/2704)
 - Updated copyright and footer layout [#2687](https://github.com/greenbone/gsa/pull/2687)

diff --git a/gsa/src/web/pages/tasks/__tests__/actions.js b/gsa/src/web/pages/tasks/__tests__/actions.js
@@ -518,9 +518,10 @@ describe('Task Actions tests', () => {
       'View Details of Schedule schedule1 (Next due: over)',
     );
 
-    fireEvent.click(icons[1]);
+    fireEvent.click(icons[2]);
     expect(handleTaskResume).not.toHaveBeenCalled();
-    expect(icons[1]).toHaveAttribute('title', 'Task is scheduled');
+    expect(icons[1]).toHaveAttribute('title', 'Start');
+    expect(icons[2]).toHaveAttribute('title', 'Task is scheduled');
   });
 
   test('should call click handlers for container task', () => {

diff --git a/gsa/src/web/pages/tasks/actions.js b/gsa/src/web/pages/tasks/actions.js
@@ -52,11 +52,10 @@ const Actions = ({
   onTaskStopClick,
 }) => (
   <IconDivider align={['center', 'center']} grow>
-    {isDefined(entity.schedule) ? (
+    {isDefined(entity.schedule) && (
       <ScheduleIcon schedule={entity.schedule} links={links} />
-    ) : (
-      <StartIcon task={entity} onClick={onTaskStartClick} />
     )}
+    <StartIcon task={entity} onClick={onTaskStartClick} />
 
     <ImportReportIcon task={entity} onClick={onReportImportClick} />