Skip to content

Commit 1a36f90

Browse files
authored
Merge pull request #272 from fractal-analytics-platform/270-add-confirmation-dialog-for-delete-task-operation
270 add confirmation dialog for delete task operation
2 parents 0fe3ac5 + 1de7d3a commit 1a36f90

File tree

3 files changed

+15
-8
lines changed

3 files changed

+15
-8
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
# Unreleased
55

6+
* Added confirmation dialog for delete task operation (\#272).
67
* Enabled task info tab and rendered docs info from markdown (\#271).
78
* Update import-workflow feature (\#269).
89
* Revamp home page and user-related layout (\#259).

src/routes/projects/[projectId]/workflows/[workflowId]/+page.svelte

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@
516516
<li class="list-group-item list-group-item-light fw-bold">Name</li>
517517
<li class="list-group-item">{selectedWorkflowTask.task.name}</li>
518518
<li class="list-group-item list-group-item-light fw-bold">Version</li>
519-
<li class="list-group-item">{selectedWorkflowTask.task.version || '-'}</li>
519+
<li class="list-group-item">{selectedWorkflowTask.task.version || ''}</li>
520520
<li class='list-group-item list-group-item-light fw-bold'>Docs Link</li>
521521
<li class='list-group-item'>
522522
{#if selectedWorkflowTask.task.docs_link}
@@ -534,7 +534,7 @@
534534
{/if}
535535
</li>
536536
<li class="list-group-item list-group-item-light fw-bold">Owner</li>
537-
<li class="list-group-item">{selectedWorkflowTask.task.owner || '-'}</li>
537+
<li class="list-group-item">{selectedWorkflowTask.task.owner || ''}</li>
538538
<li class="list-group-item list-group-item-light fw-bold">Command</li>
539539
<li class='list-group-item'><code>{selectedWorkflowTask.task.command}</code></li>
540540
<li class='list-group-item list-group-item-light fw-bold'>Source</li>
@@ -548,7 +548,7 @@
548548
<code>{selectedWorkflowTask.task.output_type}</code>
549549
</li>
550550
<li class='list-group-item list-group-item-light fw-bold'>Args Schema Version</li>
551-
<li class='list-group-item'>{selectedWorkflowTask.task.args_schema_version || '-'}</li>
551+
<li class='list-group-item'>{selectedWorkflowTask.task.args_schema_version || ''}</li>
552552
<li class='list-group-item list-group-item-light fw-bold'>Args Schema</li>
553553
<li class='list-group-item'>
554554
{#if selectedWorkflowTask.task.args_schema}

src/routes/tasks/+page.svelte

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import TaskInfoModal from '$lib/components/tasks/TaskInfoModal.svelte';
1010
import TaskCollection from '$lib/components/tasks/TaskCollection.svelte';
1111
import StandardErrorAlert from '$lib/components/common/StandardErrorAlert.svelte';
12+
import ConfirmActionButton from '$lib/components/common/ConfirmActionButton.svelte';
1213
1314
// Error property to be set in order to show errors in UI
1415
let errorReasons = undefined;
@@ -218,7 +219,7 @@
218219
{#each tasks as task}
219220
<tr>
220221
<td class="col-3">{task.name}</td>
221-
<td class="col-1">{task.version || "-"}</td>
222+
<td class="col-1">{task.version || ""}</td>
222223
<td class='col-1'>{task.owner || ""}</td>
223224
<td class="col-2">
224225
<button
@@ -242,10 +243,15 @@
242243
<i class="bi bi-pencil" />
243244
Edit
244245
</button>
245-
<button class="btn btn-danger" on:click={() => handleDeleteTask(task.id)}>
246-
<i class="bi bi-trash" />
247-
Delete
248-
</button>
246+
<ConfirmActionButton
247+
modalId="confirmTaskDeleteModal{task.id}"
248+
style={'danger'}
249+
btnStyle="danger"
250+
buttonIcon="trash"
251+
label={'Delete'}
252+
message={`Delete task ${task.name}`}
253+
callbackAction={() => handleDeleteTask(task.id)}
254+
/>
249255
</td>
250256
</tr>
251257
{/each}

0 commit comments

Comments
 (0)