Skip to content

Commit 749b41a

Browse files
committed
fix: wrongly selected sidebar option.
1 parent 936f888 commit 749b41a

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

src/lib/components/sidebar.svelte

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@
8181
{ name: 'Storage', icon: IconFolder, slug: 'storage', category: 'build' },
8282
{ name: 'Sites', icon: IconGlobeAlt, slug: 'sites', category: 'deploy', badge: 'New' }
8383
];
84+
85+
const isSelected = (service: string): boolean => {
86+
return page.route.id?.includes(service);
87+
}
8488
</script>
8589

8690
<div
@@ -145,7 +149,7 @@
145149
<a
146150
href={`/console/project-${project.region}-${project.$id}/overview/platforms`}
147151
class="link"
148-
class:active={page.url.pathname.includes('overview')}
152+
class:active={isSelected('overview')}
149153
on:click={() => {
150154
trackEvent(Click.MenuOverviewClick);
151155
sideBarIsOpen = false;
@@ -175,7 +179,7 @@
175179
<a
176180
href={`/console/project-${project.region}-${project.$id}/${projectOption.slug}`}
177181
class="link"
178-
class:active={page.url.pathname.includes(projectOption.slug)}
182+
class:active={isSelected(projectOption.slug)}
179183
on:click={() => {
180184
trackEvent(`click_menu_${projectOption.slug}`);
181185
sideBarIsOpen = false;
@@ -206,7 +210,7 @@
206210
<a
207211
href={`/console/project-${project.region}-${project.$id}/${projectOption.slug}`}
208212
class="link"
209-
class:active={page.url.pathname.includes(projectOption.slug)}
213+
class:active={isSelected(projectOption.slug)}
210214
on:click={() => {
211215
trackEvent(`click_menu_${projectOption.slug}`);
212216
sideBarIsOpen = false;
@@ -299,8 +303,7 @@
299303
on:click={() => {
300304
trackEvent('click_menu_settings');
301305
}}
302-
class:active={page.url.pathname.includes('/settings') &&
303-
!page.url.pathname.includes('sites')}
306+
class:active={isSelected('/settings') && !isSelected('sites')}
304307
><span class="link-icon"><Icon icon={IconCog} size="s" /></span><span
305308
class:no-text={state === 'icons'}
306309
class:has-text={state === 'open'}

0 commit comments

Comments
 (0)