diff --git a/src/components/ImportRunnerModal.svelte b/src/components/ImportRunnerModal.svelte index d2675139..f2ddd6e7 100644 --- a/src/components/ImportRunnerModal.svelte +++ b/src/components/ImportRunnerModal.svelte @@ -7,6 +7,8 @@ import Toastify from "toastify-js"; import { ImportService } from "@odit/lfk-client-js"; import { createEventDispatcher } from "svelte"; + export let opened_from; + export let passed_orgs; export let import_modal_open; $: searchvalue = ""; const dispatch = createEventDispatcher(); @@ -25,6 +27,7 @@ } }; })(); + let selected_org; let files; let recent_processed = true; $: json_output = []; @@ -74,18 +77,28 @@ }; }); console.log(mapped); - ImportService.importControllerPostOrgsJson(1, mapped) + ImportService.importControllerPostOrgsJson(parseInt(selected_org), mapped) .then((resp) => { - console.log("demo passed"); - console.log(resp); + // console.log("demo passed"); + // console.log(resp); + setTimeout(() => { + toast.hideToast(); + recent_processed = true; + }, 500); + Toastify({ + text: "Import finished", + duration: 500, + backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)", + }).showToast(); + cancelModal(); }) .catch((err) => { console.log(err); + setTimeout(() => { + toast.hideToast(); + recent_processed = true; + }, 500); }); - setTimeout(() => { - toast.hideToast(); - recent_processed = true; - }, 500); } } @@ -145,6 +158,17 @@ {/if} {#if json_output.length > 0} + {#if opened_from === 'OrgOverview'} +
{$_('import__target-organization')}
+ + {/if}Bitte bestätige diese Läufer für den Import
- Läufer importieren + {$_('import-runners')} {/if} @@ -43,5 +43,7 @@ on:cancelDelete={(event) => { import_modal_open = false; }} + passed_orgs={current_organizations} + opened_from="OrgOverview" bind:import_modal_open /> {/if} diff --git a/src/locales/en.json b/src/locales/en.json index f19eb613..7898db96 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -85,6 +85,7 @@ "hallo": "hello", "icon-image-credits": "We also want to thank these projects for illustrations and icons:", "import-runners": "Import runners", + "import__target-organization": "Target Organization", "installed-version": "Installed version", "invalid-mail-reset": "the provided email is invalid", "last-name": "Last name",