-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #262 from fractal-analytics-platform/172-add-delet…
…e-task-feature Implemented editing and deletion of tasks
- Loading branch information
Showing
9 changed files
with
353 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,164 @@ | ||
| <script> | ||
| import { originalTaskStore, taskStore } from '$lib/stores/taskStores'; | ||
| import StandardErrorAlert from '$lib/components/common/StandardErrorAlert.svelte'; | ||
| import { getOnlyModifiedProperties, unsetEmptyStrings } from '$lib/common/component_utilities'; | ||
| export let updateEditedTask; | ||
| $: task = $taskStore; | ||
| $: originalTask = $originalTaskStore; | ||
| $: updateEnabled = task && task.name && task.command && task.input_type && task.output_type; | ||
| async function handleEditTask() { | ||
| let taskProperties = unsetEmptyStrings(task); | ||
| taskProperties = getOnlyModifiedProperties(originalTask, taskProperties); | ||
| const response = await fetch('/tasks/' + task.id, { | ||
| method: 'PATCH', | ||
| credentials: 'include', | ||
| body: JSON.stringify(taskProperties) | ||
| }); | ||
| if (response.ok) { | ||
| console.log('Task updated successfully'); | ||
| updateEditedTask(task); | ||
| // eslint-disable-next-line no-undef | ||
| const modal = bootstrap.Modal.getInstance( | ||
| document.getElementById('taskEditModal') | ||
| ); | ||
| modal.hide(); | ||
| } else { | ||
| new StandardErrorAlert({ | ||
| target: document.getElementById('editTaskErrorAlert'), | ||
| props: { | ||
| error: await response.json() | ||
| } | ||
| }); | ||
| } | ||
| } | ||
| async function undoChangesAndClose() { | ||
| for (let key in originalTask) { | ||
| task[key] = originalTask[key]; | ||
| } | ||
| // eslint-disable-next-line no-undef | ||
| const modal = bootstrap.Modal.getInstance( | ||
| document.getElementById('taskEditModal') | ||
| ); | ||
| modal.hide(); | ||
| } | ||
| </script> | ||
|
|
||
| <div class="modal modal-xl" id="taskEditModal" data-bs-backdrop="static"> | ||
| <div class="modal-dialog"> | ||
| {#if task} | ||
| <div class="modal-content"> | ||
| <div class="modal-header"> | ||
| <h1 class="h5 modal-title">Task {task.name}</h1> | ||
| </div> | ||
| <div class="modal-body"> | ||
| <div class="row mb-3"> | ||
| <div class="col-12"> | ||
| <p class="lead">Task properties</p> | ||
|
|
||
| <span id="editTaskErrorAlert"></span> | ||
|
|
||
| <div class="mb-2 row"> | ||
| <label for="taskName" class="col-2 col-form-label text-end">Name</label> | ||
| <div class="col-10"> | ||
| <input id="taskName" type="text" bind:value={task.name} class="form-control" class:is-invalid={!task.name}> | ||
| {#if !task.name} | ||
| <div class="invalid-feedback">Required field</div> | ||
| {/if} | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="mb-2 row"> | ||
| <label for="version" class="col-2 col-form-label text-end">Version</label> | ||
| <div class="col-10"> | ||
| <input id="version" type="text" bind:value={task.version} class="form-control"> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="mb-2 row"> | ||
| <label for="owner" class="col-2 col-form-label text-end">Owner</label> | ||
| <div class="col-10"> | ||
| <input id="owner" type="text" bind:value={task.owner} disabled class="form-control"> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="mb-2 row"> | ||
| <label for="command" class="col-2 col-form-label text-end">Command</label> | ||
| <div class="col-10"> | ||
| <input id="command" type="text" bind:value={task.command} class="form-control" class:is-invalid={!task.command}> | ||
| {#if !task.command} | ||
| <div class="invalid-feedback">Required field</div> | ||
| {/if} | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="mb-2 row"> | ||
| <label for="source" class="col-2 col-form-label text-end">Source</label> | ||
| <div class="col-10"> | ||
| <input id="source" type="text" bind:value={task.source} disabled class="form-control"> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="mb-2 row"> | ||
| <label for="inputType" class="col-2 col-form-label text-end">Input Type</label> | ||
| <div class="col-10"> | ||
| <input id="inputType" type="text" bind:value={task.input_type} class="form-control" class:is-invalid={!task.input_type}> | ||
| {#if !task.input_type} | ||
| <div class="invalid-feedback">Required field</div> | ||
| {/if} | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="mb-2 row"> | ||
| <label for="outputType" class="col-2 col-form-label text-end">Output Type</label> | ||
| <div class="col-10"> | ||
| <input id="outputType" type="text" bind:value={task.output_type} class="form-control" class:is-invalid={!task.output_type}> | ||
| {#if !task.output_type} | ||
| <div class="invalid-feedback">Required field</div> | ||
| {/if} | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="mb-2 row"> | ||
| <label for="argsSchemaVersion" class="col-2 col-form-label text-end">Args Schema Version</label> | ||
| <div class="col-10"> | ||
| <input id="ar$gsSchemaVersion" type="text" bind:value={task.args_schema_version} disabled class="form-control"> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="mb-2 row"> | ||
| <label for="argsSchema" class="col-2 col-form-label text-end">Args Schema</label> | ||
| <div class="col-10"> | ||
| <textarea name="argsSchema" value={JSON.stringify(task.args_schema, null, 2)} disabled class="form-control" rows="10"></textarea> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="mb-2 row"> | ||
| <label for="docsLink" class="col-2 col-form-label text-end">Docs Link</label> | ||
| <div class="col-10"> | ||
| <input id="docsLink" type="text" bind:value={task.docs_link} disabled class="form-control"> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="mb-2 row"> | ||
| <label for="docsInfo" class="col-2 col-form-label text-end">Docs Info</label> | ||
| <div class="col-10"> | ||
| <textarea id="docsInfo" type="text" bind:value={task.docs_info} disabled class="form-control" rows="5"></textarea> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="modal-footer"> | ||
| <button class="btn btn-primary" on:click={handleEditTask} disabled={!updateEnabled}>Update</button> | ||
| <button class="btn btn-secondary" on:click={undoChangesAndClose}>Close</button> | ||
| </div> | ||
| </div> | ||
| {/if} | ||
| </div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| import { writable } from 'svelte/store'; | ||
|
|
||
| export const taskModal = writable(undefined); | ||
| export const taskStore = writable(undefined); | ||
| export const originalTaskStore = writable(undefined); | ||
| export const modalTaskCollectionId = writable(undefined); |
Oops, something went wrong.