From ec4bcd093b6c94f2e3597de6de98db5ca47c5876 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Sun, 24 Jan 2021 17:16:49 +0100 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=90=9E=20[bugfix]=20RunnerDetail=20up?= =?UTF-8?q?date?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ref #13 --- src/components/RunnerDetail.svelte | 38 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/components/RunnerDetail.svelte b/src/components/RunnerDetail.svelte index e5fdef7e..39e0a5f5 100644 --- a/src/components/RunnerDetail.svelte +++ b/src/components/RunnerDetail.svelte @@ -5,26 +5,25 @@ import { RunnerService } from "@odit/lfk-client-js"; import Toastify from "toastify-js"; import PromiseError from "./PromiseError.svelte"; + import isEmail from "validator/es/lib/isEmail"; export let params; const runner_promise = RunnerService.runnerControllerGetOne(params.runnerid); let data_loaded = false; $: delete_triggered = false; $: original_data = {}; - $: editable_userdata = {}; + $: editable = {}; runner_promise.then((data) => { - console.log(data); data_loaded = true; original_data = Object.assign(original_data, data); - editable_userdata = data; + editable = data; }); - $: changes_performed = !lodashIsEqual(original_data, editable_userdata); + $: changes_performed = !lodashIsEqual(original_data, editable); - import isEmail from "validator/es/lib/isEmail"; $: isEmailValid = - (editable_userdata.email || "") === "" || - (editable_userdata.email && isEmail(editable_userdata.email || "")); - $: isFirstnameValid = editable_userdata.firstname !== ""; - $: isLastnameValid = editable_userdata.lastname !== ""; + (editable.email || "") === "" || + (editable.email && isEmail(editable.email || "")); + $: isFirstnameValid = editable.firstname !== ""; + $: isLastnameValid = editable.lastname !== ""; $: save_enabled = changes_performed && isFirstnameValid && isLastnameValid && isEmailValid; function submit() { @@ -33,11 +32,12 @@ text: "Updating runner...", duration: 2500, }).showToast(); - RunnerService.runnerControllerPut(original_data.id, editable_userdata) + editable.group = editable.group.id; + RunnerService.runnerControllerPut(original_data.id, editable) .then((resp) => { - Object.assign(original_data, editable_userdata); - original_data = editable_userdata; - Object.assign(original_data, editable_userdata); + Object.assign(original_data, editable); + original_data = editable; + Object.assign(original_data, editable); // Toastify({ text: "Runner updated!", @@ -108,7 +108,7 @@ {original_data.firstname} {original_data.middlename || ''} {original_data.lastname} - + {#if store.state.jwtinfo.userdetails.permissions.includes('RUNNER:DELETE')} {#if delete_triggered} + class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:ml-3 sm:w-auto sm:text-sm">{$_('confirm-deletion')} + class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:ml-3 sm:w-auto sm:text-sm">{$_('delete-runner')} {/if} {/if} {#if !delete_triggered} @@ -228,7 +225,7 @@ class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
- Distance + {$_('distance')}
{original_data.distance} km
diff --git a/src/locales/en.json b/src/locales/en.json index 15a862ef..d86f9a13 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -14,6 +14,7 @@ "changelog": "Changelog", "close": "Close", "confirm-delete": "Confirm Delete", + "confirm-deletion": "Confirm Deletion", "contact": "Contact", "count_organizations": "# Organizations", "count_teams": "# Teams", @@ -45,9 +46,11 @@ "an_error_happened_while_fetching_the_data": "An error happened while fetching the data" }, "delete-organization": "Delete Organization", + "delete-runner": "Delete Runner", "delete-team": "Delete Team", "delete-user": "Delete User", "dependency_name": "Name", + "distance": "Distance", "dont-have-your-email-connected": "Don't have your email connected?", "dont-panic-were-resetting-it": "Don't panic, we're resetting it ✌", "drag-and-drop-your-files-or": "Drag & Drop your files or",