Compare commits

..

No commits in common. "b2e51fea48dfb83845168f65b3119c0927b4c003" and "526688935f6601031fd20ec572a03d7fab74628a" have entirely different histories.

4 changed files with 16 additions and 37 deletions

View File

@ -11,9 +11,6 @@
import isMobilePhone from "validator/es/lib/isMobilePhone"; import isMobilePhone from "validator/es/lib/isMobilePhone";
import Toastify from "toastify-js"; import Toastify from "toastify-js";
import Select from "svelte-select"; import Select from "svelte-select";
import { createEventDispatcher } from "svelte";
const dispatch = createEventDispatcher();
export let modal_open; export let modal_open;
export let current_runners; export let current_runners;
$: selected_team = undefined; $: selected_team = undefined;
@ -110,7 +107,8 @@
duration: 500, duration: 500,
backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)", backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
}).showToast(); }).showToast();
dispatch("created", { runners: [result] }); current_runners.push(result);
current_runners = current_runners;
}) })
.catch((err) => { .catch((err) => {
// //

View File

@ -16,6 +16,7 @@
export let passed_org; export let passed_org;
export let passed_orgs; export let passed_orgs;
export let passed_team; export let passed_team;
export let current_runners;
export let import_modal_open; export let import_modal_open;
$: searchvalue = ""; $: searchvalue = "";
$: importButtonEnabled = $: importButtonEnabled =
@ -168,7 +169,7 @@
mapped mapped
) )
.then((resp) => { .then((resp) => {
dispatch("created", { runners: resp }); current_runners = current_runners.concat(resp);
toast.hideToast(); toast.hideToast();
recent_processed = true; recent_processed = true;
Toastify({ Toastify({
@ -197,7 +198,7 @@
mapped mapped
) )
.then((resp) => { .then((resp) => {
dispatch("created", { runners: resp }); current_runners = current_runners.concat(resp);
toast.hideToast(); toast.hideToast();
recent_processed = true; recent_processed = true;
Toastify({ Toastify({

View File

@ -7,43 +7,35 @@
$: current_runners = []; $: current_runners = [];
export let modal_open = false; export let modal_open = false;
export let import_modal_open = false; export let import_modal_open = false;
let addRunners;
</script> </script>
<section class="container p-5"> <section class="container p-5">
<span class="mb-1 text-3xl font-extrabold leading-tight"> <span class="mb-1 text-3xl font-extrabold leading-tight">
{$_("runners")} {$_('runners')}
{#if store.state.jwtinfo.userdetails.permissions.includes("RUNNER:CREATE")} {#if store.state.jwtinfo.userdetails.permissions.includes('RUNNER:CREATE')}
<button <button
on:click={() => { on:click={() => {
modal_open = true; modal_open = true;
}} }}
type="button" type="button"
class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm" class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm">
> {$_('laeufer-hinzufuegen')}
{$_("laeufer-hinzufuegen")}
</button> </button>
<button <button
on:click={() => { on:click={() => {
import_modal_open = true; import_modal_open = true;
}} }}
type="button" type="button"
class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm" class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm">
> {$_('import-runners')}
{$_("import-runners")}
</button> </button>
{/if} {/if}
</span> </span>
<RunnersOverview bind:current_runners bind:addRunners /> <RunnersOverview bind:current_runners />
</section> </section>
{#if store.state.jwtinfo.userdetails.permissions.includes("RUNNER:CREATE")} {#if store.state.jwtinfo.userdetails.permissions.includes('RUNNER:CREATE')}
<AddRunnerModal <AddRunnerModal bind:current_runners bind:modal_open />
bind:modal_open
on:created={(event) => {
addRunners(event.detail.runners);
}}
/>
<ImportRunnerModal <ImportRunnerModal
on:cancelDelete={(event) => { on:cancelDelete={(event) => {
import_modal_open = false; import_modal_open = false;
@ -51,10 +43,7 @@
passed_team={{}} passed_team={{}}
passed_orgs={[]} passed_orgs={[]}
passed_org={{}} passed_org={{}}
bind:current_runners
opened_from="RunnerOverview" opened_from="RunnerOverview"
bind:import_modal_open bind:import_modal_open />
on:created={(event) => {
addRunners(event.detail.runners);
}}
/>
{/if} {/if}

View File

@ -42,15 +42,6 @@
$: teams = []; $: teams = [];
$: orgs = []; $: orgs = [];
export const addRunners = (runners) => {
current_runners = current_runners.concat(...runners);
options.update((options) => ({
...options,
data: current_runners,
}));
};
//Section table //Section table
const columns = [ const columns = [
{ {