From c6985087a8b51d6e1d8fb71b1eb8a659b8ed34e6 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Sat, 30 Jan 2021 17:05:19 +0100 Subject: [PATCH 1/5] =?UTF-8?q?=E2=9C=A8=20layout=20for=20Import=20from=20?= =?UTF-8?q?RunnerOverview?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ref #15 --- src/components/ImportRunnerModal.svelte | 36 ++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/src/components/ImportRunnerModal.svelte b/src/components/ImportRunnerModal.svelte index 6fa5f316..70336769 100644 --- a/src/components/ImportRunnerModal.svelte +++ b/src/components/ImportRunnerModal.svelte @@ -5,7 +5,11 @@ import { clickOutside } from "./outsideclick"; import { focusTrap } from "svelte-focus-trap"; import Toastify from "toastify-js"; - import { ImportService } from "@odit/lfk-client-js"; + import { + ImportService, + RunnerTeamService, + RunnerOrganizationService, + } from "@odit/lfk-client-js"; import { createEventDispatcher } from "svelte"; export let opened_from; export let passed_org; @@ -29,6 +33,14 @@ } }; })(); + let orgs = []; + RunnerOrganizationService.runnerOrganizationControllerGetAll().then((val) => { + orgs = val; + }); + let teams = []; + RunnerTeamService.runnerTeamControllerGetAll().then((val) => { + teams = val; + }); let selected_org; let files; let recent_processed = true; @@ -192,6 +204,24 @@

{$_('bitte-bestaetige-diese-laeufer-fuer-den-import')}

{/if} + {#if opened_from === 'RunnerOverview'} +

Group

+ + {/if} {#if opened_from === 'OrgDetail'}

{$_('runnerimport_verify_runners_org', { @@ -225,7 +255,7 @@ class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider"> {$_('csv_import__lastname')} - {#if opened_from !== 'TeamDetail'} + {#if opened_from !== 'TeamDetail' && opened_from !== 'RunnerOverview'} @@ -250,7 +280,7 @@ {runner[`${$_('csv_import__lastname')}`]} - {#if opened_from !== 'TeamDetail'} + {#if opened_from !== 'TeamDetail' && opened_from !== 'RunnerOverview'} {runner[`${$_('csv_import__team')}`] || runner[`${$_('csv_import__class')}`] || '---'} -- 2.47.2 From 80c3a90d6fd14f1946b1e4ecd5e19314ca952c2d Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Sat, 30 Jan 2021 17:14:20 +0100 Subject: [PATCH 2/5] =?UTF-8?q?=E2=8F=AB=20client=20library=20bump?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ref #15 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d8874e53..ee217e40 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "licenses:export": "license-exporter --json -o public" }, "dependencies": { - "@odit/lfk-client-js": "0.3.0", + "@odit/lfk-client-js": "0.4.1", "csvtojson": "^2.0.10", "filepond": "4.25.1", "gridjs": "3.2.2", -- 2.47.2 From acf0562851a77b9122473ffb1753a94b4272e53b Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Sat, 30 Jan 2021 17:27:51 +0100 Subject: [PATCH 3/5] ImportRunnerModal - differenciate between team and org import ref #15 --- src/components/ImportRunnerModal.svelte | 56 +++++++++++++++++++++++-- src/components/OrgDetail.svelte | 1 + src/components/Orgs.svelte | 1 + src/components/Runners.svelte | 3 +- src/components/TeamDetail.svelte | 1 + 5 files changed, 58 insertions(+), 4 deletions(-) diff --git a/src/components/ImportRunnerModal.svelte b/src/components/ImportRunnerModal.svelte index 70336769..b3790c25 100644 --- a/src/components/ImportRunnerModal.svelte +++ b/src/components/ImportRunnerModal.svelte @@ -15,6 +15,7 @@ export let passed_org; export let passed_orgs; export let passed_team; + export let current_runners; export let import_modal_open; $: searchvalue = ""; const dispatch = createEventDispatcher(); @@ -36,12 +37,15 @@ let orgs = []; RunnerOrganizationService.runnerOrganizationControllerGetAll().then((val) => { orgs = val; + console.log(val); }); let teams = []; RunnerTeamService.runnerTeamControllerGetAll().then((val) => { teams = val; + console.log(val); }); let selected_org; + let selected_org_or_team; let files; let recent_processed = true; $: json_output = []; @@ -130,6 +134,52 @@ recent_processed = true; }); } + if (opened_from === "RunnerOverview") { + if (selected_org_or_team.includes("ORG_")) { + selected_org_or_team = selected_org_or_team.split("_")[1]; + ImportService.importControllerPostOrgsJson( + selected_org_or_team, + mapped + ) + .then((resp) => { + toast.hideToast(); + recent_processed = true; + Toastify({ + text: "Import finished", + duration: 500, + backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)", + }).showToast(); + cancelModal(); + current_runners = current_runners.concat(mapped); + }) + .catch((err) => { + toast.hideToast(); + recent_processed = true; + }); + } + if (selected_org_or_team.includes("TEAM_")) { + selected_org_or_team = selected_org_or_team.split("_")[1]; + ImportService.importControllerPostTeamsJson( + selected_org_or_team, + mapped + ) + .then((resp) => { + toast.hideToast(); + recent_processed = true; + Toastify({ + text: "Import finished", + duration: 500, + backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)", + }).showToast(); + cancelModal(); + current_runners = current_runners.concat(mapped); + }) + .catch((err) => { + toast.hideToast(); + recent_processed = true; + }); + } + } } } @@ -208,17 +258,17 @@

Group

{/if} diff --git a/src/components/OrgDetail.svelte b/src/components/OrgDetail.svelte index d9b4812d..df23936c 100644 --- a/src/components/OrgDetail.svelte +++ b/src/components/OrgDetail.svelte @@ -72,6 +72,7 @@ on:cancelDelete={(event) => { import_modal_open = false; }} + current_runners={[]} passed_team={{}} passed_orgs={[]} passed_org={orgdata} diff --git a/src/components/Orgs.svelte b/src/components/Orgs.svelte index 09d8dfc4..abecc713 100644 --- a/src/components/Orgs.svelte +++ b/src/components/Orgs.svelte @@ -47,5 +47,6 @@ passed_org={{}} passed_orgs={current_organizations} opened_from="OrgOverview" + current_runners={[]} bind:import_modal_open /> {/if} diff --git a/src/components/Runners.svelte b/src/components/Runners.svelte index 4e4f3eee..9ad8ee0c 100644 --- a/src/components/Runners.svelte +++ b/src/components/Runners.svelte @@ -4,7 +4,7 @@ import AddRunnerModal from "./AddRunnerModal.svelte"; import ImportRunnerModal from "./ImportRunnerModal.svelte"; import RunnersOverview from "./RunnersOverview.svelte"; - let current_runners = []; + $: current_runners = []; export let modal_open = false; export let import_modal_open = false; @@ -43,6 +43,7 @@ passed_team={{}} passed_orgs={[]} passed_org={{}} + current_runners={current_runners} opened_from="RunnerOverview" bind:import_modal_open /> {/if} diff --git a/src/components/TeamDetail.svelte b/src/components/TeamDetail.svelte index 243c69b8..fec053dd 100644 --- a/src/components/TeamDetail.svelte +++ b/src/components/TeamDetail.svelte @@ -74,6 +74,7 @@ { import_modal_open = false; }} -- 2.47.2 From 7dd0881d293a7c46133cccd947e668178058ddd8 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Sat, 30 Jan 2021 17:45:12 +0100 Subject: [PATCH 4/5] working import binding ref #15 --- src/components/ImportRunnerModal.svelte | 6 ++---- src/components/Runners.svelte | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/components/ImportRunnerModal.svelte b/src/components/ImportRunnerModal.svelte index b3790c25..b2b8e4b7 100644 --- a/src/components/ImportRunnerModal.svelte +++ b/src/components/ImportRunnerModal.svelte @@ -37,12 +37,10 @@ let orgs = []; RunnerOrganizationService.runnerOrganizationControllerGetAll().then((val) => { orgs = val; - console.log(val); }); let teams = []; RunnerTeamService.runnerTeamControllerGetAll().then((val) => { teams = val; - console.log(val); }); let selected_org; let selected_org_or_team; @@ -142,6 +140,7 @@ mapped ) .then((resp) => { + current_runners = current_runners.concat(resp); toast.hideToast(); recent_processed = true; Toastify({ @@ -150,7 +149,6 @@ backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)", }).showToast(); cancelModal(); - current_runners = current_runners.concat(mapped); }) .catch((err) => { toast.hideToast(); @@ -164,6 +162,7 @@ mapped ) .then((resp) => { + current_runners = current_runners.concat(resp); toast.hideToast(); recent_processed = true; Toastify({ @@ -172,7 +171,6 @@ backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)", }).showToast(); cancelModal(); - current_runners = current_runners.concat(mapped); }) .catch((err) => { toast.hideToast(); diff --git a/src/components/Runners.svelte b/src/components/Runners.svelte index 9ad8ee0c..f8c784f4 100644 --- a/src/components/Runners.svelte +++ b/src/components/Runners.svelte @@ -43,7 +43,7 @@ passed_team={{}} passed_orgs={[]} passed_org={{}} - current_runners={current_runners} + bind:current_runners opened_from="RunnerOverview" bind:import_modal_open /> {/if} -- 2.47.2 From b5013426e6d4b92f56a8b7a42f4f13411c2cf61c Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Sat, 30 Jan 2021 17:50:16 +0100 Subject: [PATCH 5/5] reactivity in import table ref #15 --- src/components/ImportRunnerModal.svelte | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/ImportRunnerModal.svelte b/src/components/ImportRunnerModal.svelte index b2b8e4b7..f5df9e1e 100644 --- a/src/components/ImportRunnerModal.svelte +++ b/src/components/ImportRunnerModal.svelte @@ -43,7 +43,7 @@ teams = val; }); let selected_org; - let selected_org_or_team; + $: selected_org_or_team = ""; let files; let recent_processed = true; $: json_output = []; @@ -303,7 +303,7 @@ class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider"> {$_('csv_import__lastname')} - {#if opened_from !== 'TeamDetail' && opened_from !== 'RunnerOverview'} + {#if (opened_from !== 'TeamDetail' && opened_from !== 'RunnerOverview') || (opened_from === 'RunnerOverview' && selected_org_or_team.includes('ORG_'))} @@ -328,7 +328,7 @@ {runner[`${$_('csv_import__lastname')}`]} - {#if opened_from !== 'TeamDetail' && opened_from !== 'RunnerOverview'} + {#if (opened_from !== 'TeamDetail' && opened_from !== 'RunnerOverview') || (opened_from === 'RunnerOverview' && selected_org_or_team.includes('ORG_'))} {runner[`${$_('csv_import__team')}`] || runner[`${$_('csv_import__class')}`] || '---'} -- 2.47.2