From 392e1abd1f1eb8f6012a4b51289ce5e928581d5a Mon Sep 17 00:00:00 2001
From: Rotimi Best <best@classroomio.com>
Date: Sat, 23 Aug 2025 00:35:29 +0100
Subject: [PATCH] fix: allow user navigate to profile settings after coming to
 org settings first

---
 .../lib/components/Org/Settings/index.svelte  | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/apps/dashboard/src/lib/components/Org/Settings/index.svelte b/apps/dashboard/src/lib/components/Org/Settings/index.svelte
index e9c439a3..a4065c82 100644
--- a/apps/dashboard/src/lib/components/Org/Settings/index.svelte
+++ b/apps/dashboard/src/lib/components/Org/Settings/index.svelte
@@ -1,4 +1,4 @@
-<script>
+<script lang="ts">
   import { page } from '$app/stores';
   import { Tabs, Tab, TabContent } from 'carbon-components-svelte';
   import Profile from './Profile.svelte';
@@ -6,25 +6,32 @@
   // import Account from './Account.svelte';
   import OrgSettings from './OrgSettings.svelte';
   import Billing from './Billing.svelte';
-  import { onMount } from 'svelte';
   import { browser } from '$app/environment';
   import { goto } from '$app/navigation';
   import { isOrgAdmin } from '$lib/utils/store/org';
   import Integrations from './Integrations.svelte';
   import { t } from '$lib/utils/functions/translations';
 
+  interface TabItem {
+    key: number;
+    label: string;
+    tabKey: string;
+    href: string;
+    disabled: boolean;
+  }
+
   let selected = 0;
   let query = new URLSearchParams($page.url.search);
   let tabKey = query.get('tab') || '';
 
-  let tabs = [];
+  let tabs: TabItem[] = [];
 
-  function getSelectedByTab(tabKey = '') {
-    const tab = tabs.find((t) => t.tabKey === tabKey);
+  function getSelectedByTab(_tabs: TabItem[], tabKey = '') {
+    const tab = _tabs.find((t) => t.tabKey === tabKey);
     return tab ? tab.key : 0;
   }
 
-  function onTabChange(e) {
+  function onTabChange(e: CustomEvent<number>) {
     const key = e.detail;
     const tab = tabs.find((t) => t.key === key);
     if (tab) {
@@ -35,7 +42,7 @@
   $: if (browser) {
     query = new URLSearchParams($page.url.search);
     tabKey = query.get('tab') || '';
-    selected = getSelectedByTab(tabKey);
+    selected = getSelectedByTab(tabs, tabKey);
   }
 
   $: {