lfk/frontend
2
0
Fork 0
Code Issues 4 Pull Requests Actions Projects Releases Wiki Activity

feat: improved ConfirmOrgDeletionModal
All checks were successful
Build Latest and dev images / build-container (push) Successful in 1m2s
Details

Browse Source
This commit is contained in:
Philipp Dormann
2025-03-28 11:11:21 +01:00
parent 18a4623e71
commit fecf3b59a3
4 changed files with 140 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/components/orgs/OrgDetail.svelte
View File

@@ -13,8 +13,7 @@
import GenerateRunnerCertificates from "../pdf_generation/GenerateRunnerCertificates.svelte";
import GenerateSponsoringContracts from "../pdf_generation/GenerateSponsoringContracts.svelte";
import ImportRunnerModal from "../runners/ImportRunnerModal.svelte";
import ConfirmOrgDeletion from "./ConfirmOrgDeletion.svelte";
$: delete_triggered = false;
import ConfirmOrgDeletionModal from "./ConfirmOrgDeletionModal.svelte";
$: address_valid_or_none =
(isAddress1Valid && iszipcodevalid && iscityvalid) ||
editable.address_checked === false;
@@ -79,10 +78,7 @@
toast($_("organization-deleted"));
location.replace("./");
})
.catch((err) => {
modal_open = true;
delete_org = original_object;
});
.catch((err) => {});
}
function submit() {
if (data_loaded === true && save_enabled) {
@@ -142,7 +138,7 @@
opened_from="OrgDetail"
bind:import_modal_open
/>
<ConfirmOrgDeletion bind:modal_open bind:delete_org />
<ConfirmOrgDeletionModal bind:modal_open bind:delete_org />
{#if data_loaded}
<section class="container p-5">
<div class="flex flex-row mb-4">
@@ -192,41 +188,24 @@
</button>
{/if}
{#if store.state.jwtinfo.userdetails.permissions.includes("RUNNER:DELETE")}
{#if delete_triggered}
<button
on:click={deleteOrganization}
class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:w-auto sm:text-sm"
>{$_("confirm-delete")}</button
>
<button
on:click={() => {
delete_triggered = !delete_triggered;
}}
class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-400 text-base font-medium text-white sm:w-auto sm:text-sm"
>{$_("cancel")}</button
>
{/if}
{#if !delete_triggered}
<button
on:click={() => {
delete_triggered = true;
}}
type="button"
class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:w-auto sm:text-sm"
>{$_("delete-organization")}</button
>
{/if}
{/if}
{#if !delete_triggered}
<button
on:click={submit}
disabled={!save_enabled}
class:opacity-50={!save_enabled}
on:click={() => {
modal_open = true;
delete_org = original_object;
}}
type="button"
class="w-full 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:w-auto sm:text-sm mb-1 lg:mb-0"
>{$_("save-changes")}</button
class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:w-auto sm:text-sm"
>{$_("delete-organization")}</button
>
{/if}
<button
on:click={submit}
disabled={!save_enabled}
class:opacity-50={!save_enabled}
type="button"
class="w-full 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:w-auto sm:text-sm mb-1 lg:mb-0"
>{$_("save-changes")}</button
>
</div>
</div>
<div class="text-sm w-full mt-2">