Skip to content

Fix alerts when wizard is open #1943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 30, 2025
Merged

Fix alerts when wizard is open #1943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e515b55
fix: alerts when the wizard is being shown.
ItzNotABug May 30, 2025
ae73d16
misc: ocd driven minor cleanup.
ItzNotABug May 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/lib/layout/shell.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { beforeNavigate } from '$app/navigation';
import { Navbar, Sidebar } from '$lib/components';
import type { NavbarProject } from '$lib/components/navbar.svelte';
import { wizard } from '$lib/stores/wizard';
import { isNewWizardStatusOpen, wizard } from '$lib/stores/wizard';
import { activeHeaderAlert } from '$routes/(console)/store';
import { setContext } from 'svelte';
import { writable } from 'svelte/store';
Expand Down Expand Up @@ -131,7 +131,7 @@

<svelte:window on:resize={handleResize} />
<svelte:body use:style={$bodyStyle} />
{#if $activeHeaderAlert?.show}
{#if $activeHeaderAlert?.show && !$isNewWizardStatusOpen}
<svelte:component this={$activeHeaderAlert.component} />
{/if}
<main
Expand Down
9 changes: 7 additions & 2 deletions src/lib/layout/wizard.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<script lang="ts">
import { goto } from '$app/navigation';
import { onDestroy, onMount } from 'svelte';
import { Layout } from '@appwrite.io/pink-svelte';
import { trackEvent } from '$lib/actions/analytics';
import WizardExitModal from './wizardExitModal.svelte';
import { goto } from '$app/navigation';
import { wizard } from '$lib/stores/wizard';
import { isNewWizardStatusOpen, wizard } from '$lib/stores/wizard';

type $$Props =
| {
Expand Down Expand Up @@ -56,6 +57,10 @@
}
}
}

onMount(() => ($isNewWizardStatusOpen = true));

onDestroy(() => ($isNewWizardStatusOpen = false));
</script>

<svelte:window on:keydown={handleKeydown} />
Expand Down
2 changes: 2 additions & 0 deletions src/lib/stores/wizard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ function createWizardStore() {

export const wizard = createWizardStore();

export const isNewWizardStatusOpen = writable(false);

export function updateStepStatus(map: WizardStepsType, key: number, status: boolean) {
const updatedComponent = {
...map.get(key),
Expand Down
10 changes: 5 additions & 5 deletions src/routes/(console)/project-[region]-[project]/sites/create-site/finish/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

export let data;

let showConnectRepositry = false;
let showOpenOnMobile = false;
let showConnectRepository = false;
let showInviteCollaborator = false;

const siteURL = data.proxyRuleList.rules[0].domain;
Expand All @@ -31,7 +31,7 @@
page.url.searchParams.has('connectRepo') &&
page.url.searchParams.get('connectRepo') === 'true'
) {
showConnectRepositry = true;
showConnectRepository = true;
}
});

Expand Down Expand Up @@ -106,7 +106,7 @@
<Card.Button
radius="s"
padding="s"
on:click={() => (showConnectRepositry = true)}>
on:click={() => (showConnectRepository = true)}>
<Layout.Stack gap="s" style="height: 100%">
<Layout.Stack
direction="row"
Expand Down Expand Up @@ -206,11 +206,11 @@
</svelte:fragment>
</Wizard>

{#if showConnectRepositry}
{#if showConnectRepository}
<ConnectRepoModal
bind:show={showConnectRepositry}
{connect}
product="sites"
bind:show={showConnectRepository}
callbackState={{ connectRepo: 'true' }} />
{/if}

Expand Down