parent
80c3a90d6f
commit
acf0562851
@ -15,6 +15,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 = "";
|
||||||
const dispatch = createEventDispatcher();
|
const dispatch = createEventDispatcher();
|
||||||
@ -36,12 +37,15 @@
|
|||||||
let orgs = [];
|
let orgs = [];
|
||||||
RunnerOrganizationService.runnerOrganizationControllerGetAll().then((val) => {
|
RunnerOrganizationService.runnerOrganizationControllerGetAll().then((val) => {
|
||||||
orgs = val;
|
orgs = val;
|
||||||
|
console.log(val);
|
||||||
});
|
});
|
||||||
let teams = [];
|
let teams = [];
|
||||||
RunnerTeamService.runnerTeamControllerGetAll().then((val) => {
|
RunnerTeamService.runnerTeamControllerGetAll().then((val) => {
|
||||||
teams = val;
|
teams = val;
|
||||||
|
console.log(val);
|
||||||
});
|
});
|
||||||
let selected_org;
|
let selected_org;
|
||||||
|
let selected_org_or_team;
|
||||||
let files;
|
let files;
|
||||||
let recent_processed = true;
|
let recent_processed = true;
|
||||||
$: json_output = [];
|
$: json_output = [];
|
||||||
@ -130,6 +134,52 @@
|
|||||||
recent_processed = true;
|
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;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
@ -208,17 +258,17 @@
|
|||||||
<p>Group</p>
|
<p>Group</p>
|
||||||
<select
|
<select
|
||||||
name="team"
|
name="team"
|
||||||
bind:value={selected_org}
|
bind:value={selected_org_or_team}
|
||||||
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">
|
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">
|
||||||
{#each teams as team}
|
{#each teams as team}
|
||||||
<option value={team.id}>
|
<option value="TEAM_{team.id}">
|
||||||
{team.parentGroup.name}
|
{team.parentGroup.name}
|
||||||
>
|
>
|
||||||
{team.name}
|
{team.name}
|
||||||
</option>
|
</option>
|
||||||
{/each}
|
{/each}
|
||||||
{#each orgs as org}
|
{#each orgs as org}
|
||||||
<option value={org.id}>{org.name}</option>
|
<option value="ORG_{org.id}">{org.name}</option>
|
||||||
{/each}
|
{/each}
|
||||||
</select>
|
</select>
|
||||||
{/if}
|
{/if}
|
||||||
|
@ -72,6 +72,7 @@
|
|||||||
on:cancelDelete={(event) => {
|
on:cancelDelete={(event) => {
|
||||||
import_modal_open = false;
|
import_modal_open = false;
|
||||||
}}
|
}}
|
||||||
|
current_runners={[]}
|
||||||
passed_team={{}}
|
passed_team={{}}
|
||||||
passed_orgs={[]}
|
passed_orgs={[]}
|
||||||
passed_org={orgdata}
|
passed_org={orgdata}
|
||||||
|
@ -47,5 +47,6 @@
|
|||||||
passed_org={{}}
|
passed_org={{}}
|
||||||
passed_orgs={current_organizations}
|
passed_orgs={current_organizations}
|
||||||
opened_from="OrgOverview"
|
opened_from="OrgOverview"
|
||||||
|
current_runners={[]}
|
||||||
bind:import_modal_open />
|
bind:import_modal_open />
|
||||||
{/if}
|
{/if}
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
import AddRunnerModal from "./AddRunnerModal.svelte";
|
import AddRunnerModal from "./AddRunnerModal.svelte";
|
||||||
import ImportRunnerModal from "./ImportRunnerModal.svelte";
|
import ImportRunnerModal from "./ImportRunnerModal.svelte";
|
||||||
import RunnersOverview from "./RunnersOverview.svelte";
|
import RunnersOverview from "./RunnersOverview.svelte";
|
||||||
let 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;
|
||||||
</script>
|
</script>
|
||||||
@ -43,6 +43,7 @@
|
|||||||
passed_team={{}}
|
passed_team={{}}
|
||||||
passed_orgs={[]}
|
passed_orgs={[]}
|
||||||
passed_org={{}}
|
passed_org={{}}
|
||||||
|
current_runners={current_runners}
|
||||||
opened_from="RunnerOverview"
|
opened_from="RunnerOverview"
|
||||||
bind:import_modal_open />
|
bind:import_modal_open />
|
||||||
{/if}
|
{/if}
|
||||||
|
@ -74,6 +74,7 @@
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<ImportRunnerModal
|
<ImportRunnerModal
|
||||||
|
current_runners={[]}
|
||||||
on:cancelDelete={(event) => {
|
on:cancelDelete={(event) => {
|
||||||
import_modal_open = false;
|
import_modal_open = false;
|
||||||
}}
|
}}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user