From cbcce336d68b0752daeaf4b5608c43ff6fa11c0d Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Fri, 15 Jan 2021 23:02:40 +0100 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=94=92=20ConfirmTeamDeletion=20in=20T?= =?UTF-8?q?eamsOverview?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ref #14 --- src/components/ConfirmTeamDeletion.svelte | 97 +++++++++++++++++++++++ src/components/TeamsOverview.svelte | 19 ++++- 2 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 src/components/ConfirmTeamDeletion.svelte diff --git a/src/components/ConfirmTeamDeletion.svelte b/src/components/ConfirmTeamDeletion.svelte new file mode 100644 index 00000000..7d7c8e3b --- /dev/null +++ b/src/components/ConfirmTeamDeletion.svelte @@ -0,0 +1,97 @@ + + +{#if modal_open} +
+
+ +
+{/if} diff --git a/src/components/TeamsOverview.svelte b/src/components/TeamsOverview.svelte index d8400b8d..71e2143b 100644 --- a/src/components/TeamsOverview.svelte +++ b/src/components/TeamsOverview.svelte @@ -7,9 +7,12 @@ import { users as usersstore } from "../store.js"; import store from "../store"; import TeamsEmptyState from "./TeamsEmptyState.svelte"; + import ConfirmTeamDeletion from "./ConfirmTeamDeletion.svelte"; $: searchvalue = ""; $: active_deletes = []; export let current_teams = []; + let modal_open = false; + let delete_team = {}; usersstore.subscribe((val) => { current_teams = val; }); @@ -18,6 +21,13 @@ }); + { + modal_open = false; + active_deletes[event.detail.id] = false; + }} + bind:modal_open + bind:delete_team /> {#if store.state.jwtinfo.userdetails.permissions.includes('TEAM:GET')} {#await teams_promise}
{ current_teams = current_teams.filter((obj) => obj.id !== t.id); + Toastify({ + text: 'Organization deleted', + duration: 500, + backgroundColor: + 'linear-gradient(to right, #00b09b, #96c93d)', + }).showToast(); }) .catch((err) => { - // error deleting user + modal_open = true; + delete_team = t; }); }} tabindex="0" -- 2.47.2 From 489244f1a9636b9807e751073443f1c767f7b8ca Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Fri, 15 Jan 2021 23:05:36 +0100 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=94=92=20ConfirmTeamDeletion=20in=20T?= =?UTF-8?q?eamDetail?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ref #14 --- src/components/TeamDetail.svelte | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/components/TeamDetail.svelte b/src/components/TeamDetail.svelte index 7ae6fe8f..f558332e 100644 --- a/src/components/TeamDetail.svelte +++ b/src/components/TeamDetail.svelte @@ -7,6 +7,7 @@ import Toastify from "toastify-js"; import store from "../store"; import PromiseError from "./PromiseError.svelte"; + import ConfirmTeamDeletion from "./ConfirmTeamDeletion.svelte"; $: delete_triggered = false; $: save_enabled = !data_changed; export let params; @@ -22,6 +23,8 @@ original = Object.assign(original, value); }); $: orgs = []; + let modal_open = false; + let delete_team = {}; const orgs_promise = RunnerOrganisationService.runnerOrganisationControllerGetAll().then( (val) => { console.log(val); @@ -34,9 +37,17 @@ function deleteTeam() { RunnerTeamService.runnerTeamControllerRemove(original.id, true) .then((resp) => { + Toastify({ + text: "Organization deleted", + duration: 500, + backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)", + }).showToast(); location.replace("./"); }) - .catch((err) => {}); + .catch((err) => { + modal_open = true; + delete_team = original; + }); } function submit() { if (data_loaded === true && save_enabled) { @@ -63,6 +74,7 @@ } + {#if data_loaded}
-- 2.47.2 From 7654b795c756ca198bad77068823032714408535 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Sat, 16 Jan 2021 16:21:56 +0100 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=A7=B9=20TeamDetail=20cleanup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ref #14 --- src/components/TeamDetail.svelte | 45 ++++++++++++++++---------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/src/components/TeamDetail.svelte b/src/components/TeamDetail.svelte index f558332e..c7d2e8a2 100644 --- a/src/components/TeamDetail.svelte +++ b/src/components/TeamDetail.svelte @@ -8,13 +8,19 @@ import store from "../store"; import PromiseError from "./PromiseError.svelte"; import ConfirmTeamDeletion from "./ConfirmTeamDeletion.svelte"; + export let params; + let [teamdata, original, delete_team, orgs, modal_open] = [ + {}, + {}, + {}, + [], + false, + ]; $: delete_triggered = false; $: save_enabled = !data_changed; - export let params; - let teamdata = {}; - let original = {}; $: data_loaded = false; $: data_changed = JSON.stringify(teamdata) === JSON.stringify(original); + // const promise = RunnerTeamService.runnerTeamControllerGetOne( params.teamid ).then((value) => { @@ -22,18 +28,9 @@ teamdata = Object.assign(teamdata, value); original = Object.assign(original, value); }); - $: orgs = []; - let modal_open = false; - let delete_team = {}; - const orgs_promise = RunnerOrganisationService.runnerOrganisationControllerGetAll().then( - (val) => { - console.log(val); - orgs = val; - val.forEach((t) => { - console.log(t.name); - }); - } - ); + RunnerOrganisationService.runnerOrganisationControllerGetAll().then((val) => { + orgs = val; + }); function deleteTeam() { RunnerTeamService.runnerTeamControllerRemove(original.id, true) .then((resp) => { @@ -205,13 +202,17 @@ name="contact" 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 dark:bg-gray-900 dark:text-gray-100 rounded-md p-2" />
- +
+ + +
{:else} {#await promise} -- 2.47.2 From e3943d868a6131ea561c4000159b77ff70a4af8b Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Sat, 16 Jan 2021 16:27:06 +0100 Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=90=9E=20fix=20deletion=20in=20TeamDe?= =?UTF-8?q?tail=20+=20TeamsOverview?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ref #14 --- src/components/TeamDetail.svelte | 2 +- src/components/TeamsOverview.svelte | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/TeamDetail.svelte b/src/components/TeamDetail.svelte index c7d2e8a2..e32a781a 100644 --- a/src/components/TeamDetail.svelte +++ b/src/components/TeamDetail.svelte @@ -32,7 +32,7 @@ orgs = val; }); function deleteTeam() { - RunnerTeamService.runnerTeamControllerRemove(original.id, true) + RunnerTeamService.runnerTeamControllerRemove(original.id, false) .then((resp) => { Toastify({ text: "Organization deleted", diff --git a/src/components/TeamsOverview.svelte b/src/components/TeamsOverview.svelte index 71e2143b..eadf531d 100644 --- a/src/components/TeamsOverview.svelte +++ b/src/components/TeamsOverview.svelte @@ -124,7 +124,7 @@ Delete