-
-
-
-
-
- {#if sqliteStorageWarning && ($userStore?.isAdmin || user?.isAdmin)}
-
+
+
diff --git a/frontend/src/routes/settings/+layout.ts b/frontend/src/routes/settings/+layout.ts
index 5e72d1e5..062ca237 100644
--- a/frontend/src/routes/settings/+layout.ts
+++ b/frontend/src/routes/settings/+layout.ts
@@ -1,3 +1,4 @@
+import { checkApiRows } from '#lib/components/shell/nav-items.ts';
import StorageService from '#lib/services/storage-service.ts';
import VersionService from '#lib/services/version-service.ts';
import WebAuthnService from '#lib/services/webauthn-service.ts';
@@ -5,17 +6,21 @@ import type { AppVersionInformation } from '#lib/types/application-configuration
import { redirect } from '@sveltejs/kit';
import type { LayoutLoad } from './$types';
-export const load: LayoutLoad = async ({ url }) => {
+export const load: LayoutLoad = async ({ url, parent, untrack }) => {
const versionService = new VersionService();
const storageService = new StorageService();
const webauthnService = new WebAuthnService();
const currentVersion = versionService.getCurrentVersion();
- const [newestVersion, sqliteStorageWarning, passkeys] = await Promise.all([
+ const [newestVersion, sqliteStorageWarning, passkeys, apiRows] = await Promise.all([
versionService.getNewestVersion().catch(() => null),
storageService.getSqliteStorageWarning().catch(() => false),
- webauthnService.listCredentials()
+ webauthnService.listCredentials(),
+ // A tracked parent() would rerun this load on every navigation, because the root load reads the pathname
+ untrack(() => parent()).then(({ user }) =>
+ user?.isAdmin ? checkApiRows() : { apis: false, apiKeys: false }
+ )
]);
// If newestVersion is empty, it means the check is disabled or failed.
@@ -39,6 +44,7 @@ export const load: LayoutLoad = async ({ url }) => {
return {
versionInformation,
sqliteStorageWarning,
- passkeys
+ passkeys,
+ apiRows
};
};
diff --git a/tests/specs/navigation.spec.ts b/tests/specs/navigation.spec.ts
index 5e1fdf6e..0314fd37 100644
--- a/tests/specs/navigation.spec.ts
+++ b/tests/specs/navigation.spec.ts
@@ -3,22 +3,22 @@ import { cleanupBackend } from '../utils/cleanup.util';
test.beforeEach(async () => await cleanupBackend());
-test('settings sidebar has an accessible name', async ({ page }) => {
+test('main navigation has an accessible name', async ({ page }) => {
await page.goto('/settings/account');
- const nav = page.getByRole('navigation', { name: 'Settings' });
+ const nav = page.getByRole('navigation', { name: 'Main' }).first();
await expect(nav).toBeVisible();
});
test('keyboard focus stays on sidebar link after navigating', async ({ page }) => {
await page.goto('/settings/account');
- const auditLog = page.getByRole('link', { name: 'Audit Log' });
- await auditLog.focus();
+ const activity = page.getByRole('link', { name: 'Activity' }).first();
+ await activity.focus();
await page.keyboard.press('Enter');
await page.waitForURL('**/settings/audit-log');
- await expect(auditLog).toBeFocused();
+ await expect(activity).toBeFocused();
});
test('unsaved changes block navigation until they are discarded', async ({ page }) => {
@@ -29,7 +29,7 @@ test('unsaved changes block navigation until they are discarded', async ({ page
await displayName.fill('Pending navigation');
await expect(page.getByText('You have unsaved changes', { exact: true })).toBeVisible();
- const myApps = page.getByRole('link', { name: 'My Apps' });
+ const myApps = page.getByRole('link', { name: 'My Apps' }).first();
await myApps.click();
await expect(page).toHaveURL(/\/settings\/account$/);
+
-
+
+
+ {#if sqliteStorageWarning && isAdmin}
+
-
-
-
- {m.powered_by()} - Pocket ID - ({versionInformation.currentVersion}) -
+