artin/sourcegraph
1
0
Fork 0
mirror of https://github.com/sourcegraph/sourcegraph.git synced 2026-02-06 16:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Svelte: welcome banner followups (#64222)

Browse Source
This commit is contained in:
Camden Cheek 2024-08-01 15:12:06 -06:00 committed by GitHub
parent e073ae59cf
commit eb1a76ee7a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/web-sveltekit/src/routes/+layout.svelte
View File

@ -90,6 +90,7 @@
: undefined
$: welcomeOverlayDismissed = $temporarySettingsStorage.get('webNext.welcomeOverlay.dismissed', false)
$: showWelcomeOverlay = !$welcomeOverlayDismissed ?? false
function handleDismissWelcomeOverlay() {
$temporarySettingsStorage.set('webNext.welcomeOverlay.dismissed', true)
}
@ -111,10 +112,7 @@
<slot />
</main>
<WelcomeOverlay
show={(process.env.PW_TEST === 'true' && !$welcomeOverlayDismissed) ?? false}
handleDismiss={handleDismissWelcomeOverlay}
/>
<WelcomeOverlay show={showWelcomeOverlay} handleDismiss={handleDismissWelcomeOverlay} />
<FuzzyFinderContainer />

2
client/web-sveltekit/src/routes/WelcomeOverlay.svelte
View File

@ -83,7 +83,7 @@
background: var(--color-background, #f9fafb);
}
:global(.theme-dark) & {
background: var(--color-background, #f9fafb);
background: var(--color-background, #0f111a);
}
}

5
client/web-sveltekit/src/testing/integration.ts
View File

@ -45,7 +45,7 @@ const defaultMocks: TypeMocks = {
}),
TemporarySettings: () => ({
// Ensure this is valid JSON
contents: '{}',
contents: '{"webNext.welcomeOverlay.dismissed": true}',
}),
GitBlob: () => ({
highlight: {
@ -117,6 +117,9 @@ class Sourcegraph {
},
})
})
await this.page.addInitScript(() =>
window.localStorage.setItem('temporarySettings', '{"webNext.welcomeOverlay.dismissed": true}')
)
}
// mock graphql calls
await this.page.route(/\.api\/graphql/, route => {

5
client/web/src/sveltekit/SvelteKitNavItem.tsx
View File

@ -16,7 +16,7 @@ export const SvelteKitNavItem: FC<{ userID?: string }> = ({ userID }) => {
const location = useLocation()
const client = useApolloClient()
const [departureDismissed, setDepartureDismissed] = useTemporarySetting('webNext.departureMessage.dismissed', false)
const [_welcomeDismissed, setWelcomeDismissed] = useTemporarySetting('webNext.welcomeOverlay.dismissed', false)
const [welcomeDismissed, setWelcomeDismissed] = useTemporarySetting('webNext.welcomeOverlay.dismissed', false)
const departureRef = useRef<HTMLDivElement | null>(null)
@ -40,7 +40,8 @@ export const SvelteKitNavItem: FC<{ userID?: string }> = ({ userID }) => {
return null
}
const showDeparture = !departureDismissed
// only show if the welcome message has been dismissed so we know they have been introduced to the new webapp
const showDeparture = !departureDismissed && welcomeDismissed
const popoverProps = showDeparture ? { isOpen: true, onOpenChange: () => {} } : {}
return (