diff --git a/src/routes/(app)/+page.svelte b/src/routes/(app)/+page.svelte
index 99b18442..d459a9ba 100644
--- a/src/routes/(app)/+page.svelte
+++ b/src/routes/(app)/+page.svelte
@@ -8,9 +8,13 @@
{m.dashboard_welcome()}
-
- {#if data.bookmarks || data.bookmarksFailed}
-
+
+ {#if data.bookmarks || data.bookmarksFailed || data.globalBookmarks.length > 0}
+
{/if}
diff --git a/src/routes/(app)/layout.server.test.ts b/src/routes/(app)/layout.server.test.ts
index 885c95ee..b6dfe0e9 100644
--- a/src/routes/(app)/layout.server.test.ts
+++ b/src/routes/(app)/layout.server.test.ts
@@ -4,9 +4,21 @@ const { listBookmarks } = vi.hoisted(() => ({ listBookmarks: vi.fn() }));
vi.mock('$lib/server/dashboard/bookmarks-db.js', () => ({ listBookmarks }));
vi.mock('$lib/server/feature-flags.js', () => ({ storageBrowserEnabled: false }));
+vi.mock('$lib/server/dashboard/config.js', () => ({ globalBookmarks: [GLOBAL_BOOKMARK] }));
import { load } from './+layout.server.js';
+const { GLOBAL_BOOKMARK } = vi.hoisted(() => ({
+ GLOBAL_BOOKMARK: {
+ id: 'global-0',
+ productId: 'custom',
+ name: 'Team Wiki',
+ environment: '',
+ url: 'https://wiki.example.com',
+ pinned: true
+ }
+}));
+
const BOOKMARK = {
id: '00000000-0000-0000-0000-000000000001',
productId: 'trino',
@@ -33,15 +45,23 @@ describe('(app) layout load', () => {
const data = await load(event);
- expect(data).toMatchObject({ bookmarks: [BOOKMARK], bookmarksFailed: false });
+ expect(data).toMatchObject({
+ bookmarks: [BOOKMARK],
+ bookmarksFailed: false,
+ globalBookmarks: [GLOBAL_BOOKMARK]
+ });
expect(listBookmarks).toHaveBeenCalledWith('user-1');
expect(event.depends).toHaveBeenCalledWith('app:bookmarks');
});
- it('has no bookmarks without a signed-in user', async () => {
+ it('has only the global bookmarks without a signed-in user', async () => {
const data = await load(mockEvent(undefined));
- expect(data).toMatchObject({ bookmarks: null, bookmarksFailed: false });
+ expect(data).toMatchObject({
+ bookmarks: null,
+ bookmarksFailed: false,
+ globalBookmarks: [GLOBAL_BOOKMARK]
+ });
expect(listBookmarks).not.toHaveBeenCalled();
});
@@ -51,7 +71,11 @@ describe('(app) layout load', () => {
const data = await load(event);
- expect(data).toMatchObject({ bookmarks: null, bookmarksFailed: true });
+ expect(data).toMatchObject({
+ bookmarks: null,
+ bookmarksFailed: true,
+ globalBookmarks: [GLOBAL_BOOKMARK]
+ });
expect(event.locals.logger.error).toHaveBeenCalled();
});
});
diff --git a/src/routes/(app)/page.svelte.spec.ts b/src/routes/(app)/page.svelte.spec.ts
index 2f1ce1a8..a18519e7 100644
--- a/src/routes/(app)/page.svelte.spec.ts
+++ b/src/routes/(app)/page.svelte.spec.ts
@@ -1,12 +1,30 @@
import { page } from 'vitest/browser';
import { describe, expect, it } from 'vitest';
import { render } from 'vitest-browser-svelte';
-import type { Bookmark } from '$lib/dashboard/types';
+import type { Bookmark, BookmarkLink } from '$lib/dashboard/types';
import Page from './+page.svelte';
-const renderPage = (bookmarks: Bookmark[] | null = [], bookmarksFailed = false) =>
+const globalBookmark: BookmarkLink = {
+ id: 'global-0',
+ productId: 'custom',
+ name: 'Team Wiki',
+ environment: '',
+ url: 'https://wiki.example.com',
+ pinned: false
+};
+
+const renderPage = (
+ bookmarks: Bookmark[] | null = [],
+ { globalBookmarks = [] as BookmarkLink[], bookmarksFailed = false } = {}
+) =>
render(Page, {
- data: { user: undefined, storageBrowserEnabled: false, bookmarks, bookmarksFailed }
+ data: {
+ user: undefined,
+ storageBrowserEnabled: false,
+ bookmarks,
+ bookmarksFailed,
+ globalBookmarks
+ }
} as unknown as Parameters
>[1]);
describe('/(app)/+page.svelte', () => {
@@ -23,7 +41,7 @@ describe('/(app)/+page.svelte', () => {
});
it('says so when loading the bookmarks failed', async () => {
- renderPage(null, true);
+ renderPage(null, { bookmarksFailed: true });
await expect
.element(page.getByText('Bookmarks could not be loaded. Please reload the page later.'))
@@ -33,7 +51,16 @@ describe('/(app)/+page.svelte', () => {
.not.toBeInTheDocument();
});
- it('hides everything bookmark-related without a signed-in user', async () => {
+ it('shows the global bookmarks when the user’s are unavailable', async () => {
+ renderPage(null, { globalBookmarks: [globalBookmark] });
+
+ await expect.element(page.getByRole('link', { name: 'Team Wiki' })).toBeVisible();
+ await expect
+ .element(page.getByRole('button', { name: /add bookmark/i }))
+ .not.toBeInTheDocument();
+ });
+
+ it('hides everything bookmark-related without a user or global bookmarks', async () => {
renderPage(null);
await expect.element(page.getByRole('heading', { level: 2 })).toBeInTheDocument();