From 023d8d2acdf0354d38af0cdb2ddf5f54b1c856f4 Mon Sep 17 00:00:00 2001
From: Arman <arman@appwrite.io>
Date: Tue, 6 Sep 2022 11:21:22 +0200
Subject: [PATCH] fix: redirect after or delete

---
 .../_deleteOrganization.svelte                  | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/routes/console/organization-[organization]/_deleteOrganization.svelte b/src/routes/console/organization-[organization]/_deleteOrganization.svelte
index dfd3fab9d..8efe40619 100644
--- a/src/routes/console/organization-[organization]/_deleteOrganization.svelte
+++ b/src/routes/console/organization-[organization]/_deleteOrganization.svelte
@@ -3,22 +3,27 @@
     import { Button, Form } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
     import { sdkForConsole } from '$lib/stores/sdk';
-    import { organization, organizationList } from '$lib/stores/organization';
+    import { newOrgModal, organization, organizationList } from '$lib/stores/organization';
+    import { goto } from '$app/navigation';
+    import { base } from '$app/paths';
 
     export let showDelete = false;
 
-    const deleteUser = async () => {
+    const deleteOrg = async () => {
         try {
             await sdkForConsole.teams.delete($organization.$id);
-            showDelete = false;
             addNotification({
                 type: 'success',
                 message: `${$organization.name} has been deleted`
             });
-            if ($organizationList?.total) {
+            if ($organizationList?.total > 1) {
                 await organizationList.load();
-                organization.set($organizationList.teams[0]);
+                goto(`${base}/console/organization-${$organizationList.teams[0].$id}`);
+            } else {
+                newOrgModal.set(true);
+                goto(`${base}/console`);
             }
+            showDelete = false;
         } catch (error) {
             addNotification({
                 type: 'error',
@@ -28,7 +33,7 @@
     };
 </script>
 
-<Form on:submit={deleteUser}>
+<Form on:submit={deleteOrg}>
     <Modal bind:show={showDelete} warning>
         <svelte:fragment slot="header">Delete Organization</svelte:fragment>
         <p>