From fc2c2907c43e5b1fa192b571cf93b2f2e492158f Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 12 Apr 2023 19:21:01 +0200 Subject: [PATCH 1/4] Disable sort for actions --- src/components/runners/RunnersOverview.svelte | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/runners/RunnersOverview.svelte b/src/components/runners/RunnersOverview.svelte index 55078122..31def979 100644 --- a/src/components/runners/RunnersOverview.svelte +++ b/src/components/runners/RunnersOverview.svelte @@ -89,6 +89,7 @@ }); }, enableColumnFilter: false, + enableSorting: false, }, ]; @@ -216,9 +217,9 @@ header.getContext() )} /> - {#if header.column.getIsSorted().toString() == "asc"} + {#if header.column.getIsSorted().toString() == "asc" && header.column.getCanSort()} 🔼 - {:else if header.column.getIsSorted().toString() == "desc"} + {:else if header.column.getIsSorted().toString() == "desc" && header.column.getCanSort()} 🔽 {/if} From 3e8dac3203f56723a3dad4a35887d60fc03d4ae3 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 12 Apr 2023 19:22:26 +0200 Subject: [PATCH 2/4] Reload table data on delete --- src/components/runners/RunnersOverview.svelte | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/components/runners/RunnersOverview.svelte b/src/components/runners/RunnersOverview.svelte index 09c94c42..5012494c 100644 --- a/src/components/runners/RunnersOverview.svelte +++ b/src/components/runners/RunnersOverview.svelte @@ -124,6 +124,10 @@ async function deleteRunner(delete_runner_id) { await RunnerService.runnerControllerRemove(delete_runner_id, true); current_runners = current_runners.filter((r) => r.id !== delete_runner_id); + options.update((options) => ({ + ...options, + data: current_runners, + })); Toastify({ text: $_("runner-deleted"), duration: 3500, @@ -208,9 +212,13 @@ header.getContext() )} /> - {#if header.column.getIsSorted().toString() == "asc" && header.column.getCanSort()} + {#if header.column + .getIsSorted() + .toString() == "asc" && header.column.getCanSort()} 🔼 - {:else if header.column.getIsSorted().toString() == "desc" && header.column.getCanSort()} + {:else if header.column + .getIsSorted() + .toString() == "desc" && header.column.getCanSort()} 🔽 {/if} From 03b7ada5ef3cbf64f178d3d0d88c448d76a42885 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 12 Apr 2023 19:23:27 +0200 Subject: [PATCH 3/4] Close modal on delete and import toastify --- src/components/runners/DeleteRunnerModal.svelte | 1 + src/components/runners/RunnersOverview.svelte | 1 + 2 files changed, 2 insertions(+) diff --git a/src/components/runners/DeleteRunnerModal.svelte b/src/components/runners/DeleteRunnerModal.svelte index 574a19b9..5b7ea80e 100644 --- a/src/components/runners/DeleteRunnerModal.svelte +++ b/src/components/runners/DeleteRunnerModal.svelte @@ -26,6 +26,7 @@ })(); async function submit() { dispatch("delete", { id: delete_runner.id }); + modal_open=false; } diff --git a/src/components/runners/RunnersOverview.svelte b/src/components/runners/RunnersOverview.svelte index 5012494c..e65e50f2 100644 --- a/src/components/runners/RunnersOverview.svelte +++ b/src/components/runners/RunnersOverview.svelte @@ -24,6 +24,7 @@ import TableActions from "../shared/TableActions.svelte"; import { groupFilter } from "../shared/tablefilters"; import DeleteRunnerModal from "./DeleteRunnerModal.svelte"; + import Toastify from "toastify-js"; $: selectedRunners = $table?.getSelectedRowModel().rows.map((row) => row.original) || []; From d8110580e9a33cfb0c6e9cbdce630262d5b5d4c1 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 12 Apr 2023 19:25:33 +0200 Subject: [PATCH 4/4] Added middle-name --- src/components/runners/RunnersOverview.svelte | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/components/runners/RunnersOverview.svelte b/src/components/runners/RunnersOverview.svelte index e65e50f2..7086edc5 100644 --- a/src/components/runners/RunnersOverview.svelte +++ b/src/components/runners/RunnersOverview.svelte @@ -42,6 +42,17 @@ header: () => $_("first-name"), filterFn: `includesString`, }, + { + accessorKey: "middlename", + header: () => $_("middle-name"), + cell: (info) => { + if (!info || !info.getValue()) { + return ""; + } + return info.getValue(); + }, + filterFn: `includesString`, + }, { accessorKey: "lastname", header: () => $_("last-name"),