From aafb121bf27d80b6f24b18107b8076438f798493 Mon Sep 17 00:00:00 2001 From: vegard Date: Mon, 16 Mar 2026 05:19:23 +0100 Subject: [PATCH] Skill server-admin fra workspace-admin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Server-admin (/server-admin): systemvide innstillinger (AI, kanaler) — kun for owners. Workspace-admin (/admin): workspace-spesifikke innstillinger (sider, entiteter) — for owner/admin i gjeldende workspace. - Ny rute /server-admin med egen layout-gate (owner-rolle) - Flytt AI og kanaler fra /admin til /server-admin - Workspace-admin gate sjekker nå rolle i gjeldende workspace - Sidebar: workspace-admin-lenker under separator, server-admin-nav i server-admin-modus - WorkspaceSwitcher: "Admin (server)" kun for owners - Kanaler: trekkspill gruppert etter workspace - Config-API: owners kan endre kanaler på tvers av workspaces - Migrasjon: ai_prompts-tabell Co-Authored-By: Claude Opus 4.6 --- migrations/0008_ai_prompts.sql | 40 ++++ web/src/lib/components/Sidebar.svelte | 46 ++-- .../lib/components/WorkspaceSwitcher.svelte | 32 ++- web/src/routes/+layout.server.ts | 9 + web/src/routes/+layout.svelte | 13 +- web/src/routes/admin/+layout.server.ts | 21 ++ web/src/routes/admin/+page.svelte | 52 +++++ .../api/channels/[id]/config/+server.ts | 31 ++- web/src/routes/server-admin/+layout.server.ts | 19 ++ web/src/routes/server-admin/+page.svelte | 52 +++++ .../ai/+page.server.ts | 13 +- .../{admin => server-admin}/ai/+page.svelte | 161 +++++++++++++- .../channels/+page.server.ts | 12 +- .../channels/+page.svelte | 208 +++++++++++------- 14 files changed, 594 insertions(+), 115 deletions(-) create mode 100644 migrations/0008_ai_prompts.sql create mode 100644 web/src/routes/admin/+layout.server.ts create mode 100644 web/src/routes/admin/+page.svelte create mode 100644 web/src/routes/server-admin/+layout.server.ts create mode 100644 web/src/routes/server-admin/+page.svelte rename web/src/routes/{admin => server-admin}/ai/+page.server.ts (76%) rename web/src/routes/{admin => server-admin}/ai/+page.svelte (77%) rename web/src/routes/{admin => server-admin}/channels/+page.server.ts (57%) rename web/src/routes/{admin => server-admin}/channels/+page.svelte (58%) diff --git a/migrations/0008_ai_prompts.sql b/migrations/0008_ai_prompts.sql new file mode 100644 index 0000000..d356e37 --- /dev/null +++ b/migrations/0008_ai_prompts.sql @@ -0,0 +1,40 @@ +-- AI Prompts: redigerbare system-prompts for AI-tekstbehandling +CREATE TABLE ai_prompts ( + action TEXT PRIMARY KEY, + system_prompt TEXT NOT NULL, + description TEXT, + updated_at TIMESTAMPTZ NOT NULL DEFAULT now() +); + +-- Seed med nåværende hardkodede prompts +INSERT INTO ai_prompts (action, system_prompt, description) VALUES + ('fix_text', 'Fiks denne teksten. Output på norsk. +- Returner KUN den fiksede teksten — ingen innledning, kommentar eller meta-tekst +- Fiks skrivefeil og grammatikk +- Start med en kort oppsummering av det viktigste (2–3 setninger) +- Fjern metainformasjon, navigasjon, annonser og annen støy fra innlimt webinnhold +- Dersom det er tydelig hva kilden er, oppgi den etter innledende oppsummering +- Behold saklig innhold og fakta intakt +- Bruk markdown-formatering der det gir bedre lesbarhet', 'Fikser skrivefeil, fjerner støy, oppsummerer'), + + ('extract_facts', 'Analyser denne teksten og trekk ut fakta. Output på norsk. +- Returner KUN faktalisten — ingen innledning, kommentar eller meta-tekst +- Identifiser konkrete påstander, tall, sitater og fakta +- List dem opp som punktliste +- For hver fakta: noter hvilken person eller organisasjon den gjelder (bruk #Navn-format) +- Ignorer meninger og spekulasjoner — kun verifiserbare påstander +- Behold kildehenvisninger der de finnes', 'Trekker ut fakta som punktliste'), + + ('rewrite', 'Skriv om denne teksten til artikkelformat. Output på norsk. +- Returner KUN artikkelen — ingen innledning, kommentar eller meta-tekst +- Lag en tittel som fanger essensen +- Skriv en ingress på 2–3 setninger +- Strukturer resten med mellomtitler der det er naturlig +- Hold deg til fakta fra originalteksten — ikke legg til informasjon +- Bruk markdown-formatering', 'Skriver om til artikkelformat'), + + ('translate', 'Oversett denne teksten til norsk. +- Returner KUN oversettelsen — ingen innledning, kommentar eller meta-tekst +- Behold formatering og struktur +- Oversett fagtermer korrekt, behold engelske termer i parentes der det er vanlig +- Behold egennavn uoversatt', 'Oversetter til norsk'); diff --git a/web/src/lib/components/Sidebar.svelte b/web/src/lib/components/Sidebar.svelte index c7dade7..e47e7cd 100644 --- a/web/src/lib/components/Sidebar.svelte +++ b/web/src/lib/components/Sidebar.svelte @@ -2,18 +2,23 @@ import type { Workspace } from '$lib/server/db'; import type { PageConfig } from '$lib/types/pages'; import WorkspaceSwitcher from './WorkspaceSwitcher.svelte'; + import { page } from '$app/state'; let { open = $bindable(false), user, workspace, workspaces, + isServerAdmin = false, + isWorkspaceAdmin = false, authProvider }: { open: boolean; user: { id: string; name: string; email: string; image?: string }; workspace: Workspace | null; workspaces: Workspace[]; + isServerAdmin?: boolean; + isWorkspaceAdmin?: boolean; authProvider: string; } = $props(); @@ -81,6 +86,9 @@ ((workspace?.settings as Record)?.pages as PageConfig[]) ?? [] ); + let isOnAdmin = $derived(page.url.pathname.startsWith('/admin')); + let isOnServerAdmin = $derived(page.url.pathname.startsWith('/server-admin')); + // Beregn transform basert på state let sidebarTransform = $derived.by(() => { if (swiping) { @@ -130,22 +138,34 @@ - +
diff --git a/web/src/lib/components/WorkspaceSwitcher.svelte b/web/src/lib/components/WorkspaceSwitcher.svelte index 6aad9d9..cbe314c 100644 --- a/web/src/lib/components/WorkspaceSwitcher.svelte +++ b/web/src/lib/components/WorkspaceSwitcher.svelte @@ -1,21 +1,35 @@ {#if workspaces.length > 0}
- {#if open && workspaces.length > 1} + {#if open && hasDropdownItems}
- + +
+

System-prompts

+
+
+ Action + Beskrivelse + Tegn + Oppdatert + +
+ + {#each prompts as prompt (prompt.action)} +
+ {prompt.action} + {prompt.description ?? '—'} + {prompt.system_prompt.length} + {new Date(prompt.updated_at).toLocaleDateString('nb-NO')} + + {#if saving === prompt.action} + ... + {:else if saved === prompt.action} + OK + {:else} + + {/if} + +
+ + {#if editingPrompt === prompt.action} +
+ +
+ {editPromptText.length} tegn +
+ + +
+
+
+ {/if} + {/each} +
+
+ +

Tokenforbruk (siste 30 dager)

{#if usage.length === 0} @@ -390,7 +481,7 @@ {/if}
- +

Konfigurasjon

@@ -665,4 +756,70 @@ font-size: 0.8rem; font-style: italic; } + + /* Prompt-seksjon */ + .prompt-row { + grid-template-columns: 1.5fr 2.5fr 60px 90px 70px; + } + + .col-action { + font-family: monospace; + } + + .col-chars { + text-align: right; + font-variant-numeric: tabular-nums; + color: #8b92a5; + font-size: 0.75rem; + } + + .col-updated { + color: #8b92a5; + font-size: 0.75rem; + } + + .col-edit { + text-align: center; + } + + .prompt-editor { + background: #0f1117; + padding: 0.75rem; + border-bottom: 1px solid #2d3148; + } + + .prompt-editor textarea { + width: 100%; + background: #161822; + border: 1px solid #2d3148; + border-radius: 4px; + color: #e1e4e8; + padding: 0.5rem; + font-size: 0.8rem; + font-family: monospace; + line-height: 1.5; + resize: vertical; + } + + .prompt-editor textarea:focus { + outline: none; + border-color: #3b82f6; + } + + .prompt-editor-footer { + display: flex; + justify-content: space-between; + align-items: center; + margin-top: 0.5rem; + } + + .prompt-char-count { + color: #8b92a5; + font-size: 0.75rem; + } + + .prompt-editor-actions { + display: flex; + gap: 0.5rem; + } diff --git a/web/src/routes/admin/channels/+page.server.ts b/web/src/routes/server-admin/channels/+page.server.ts similarity index 57% rename from web/src/routes/admin/channels/+page.server.ts rename to web/src/routes/server-admin/channels/+page.server.ts index 93be758..688aad4 100644 --- a/web/src/routes/admin/channels/+page.server.ts +++ b/web/src/routes/server-admin/channels/+page.server.ts @@ -1,23 +1,19 @@ -import { error } from '@sveltejs/kit'; import type { PageServerLoad } from './$types'; import { sql } from '$lib/server/db'; -export const load: PageServerLoad = async ({ locals }) => { - if (!locals.workspace) error(404); - +export const load: PageServerLoad = async () => { const channels = await sql` SELECT c.id, c.name, c.config, - pn.node_type AS parent_name, + w.name AS workspace_name, (SELECT count(*)::int FROM messages m WHERE m.channel_id = c.id) AS message_count, (SELECT max(m.created_at) FROM messages m WHERE m.channel_id = c.id) AS last_message_at FROM channels c JOIN nodes n ON n.id = c.id - LEFT JOIN nodes pn ON pn.id = c.parent_id - WHERE n.workspace_id = ${locals.workspace.id} - ORDER BY c.name + JOIN workspaces w ON w.id = n.workspace_id + ORDER BY w.name, c.name `; return { channels }; diff --git a/web/src/routes/admin/channels/+page.svelte b/web/src/routes/server-admin/channels/+page.svelte similarity index 58% rename from web/src/routes/admin/channels/+page.svelte rename to web/src/routes/server-admin/channels/+page.svelte index 756adbe..220d416 100644 --- a/web/src/routes/admin/channels/+page.svelte +++ b/web/src/routes/server-admin/channels/+page.svelte @@ -9,7 +9,7 @@ id: string; name: string; config: Record; - parent_name: string | null; + workspace_name: string; message_count: number; last_message_at: string | null; } @@ -19,6 +19,29 @@ let saved = $state(null); let errorMsg = $state(''); + // Grupper kanaler etter workspace + let grouped = $derived.by(() => { + const map = new Map(); + for (const ch of channels) { + const list = map.get(ch.workspace_name) ?? []; + list.push(ch); + map.set(ch.workspace_name, list); + } + return [...map.entries()].sort(([a], [b]) => a.localeCompare(b, 'nb')); + }); + + // Alle workspaces er åpne som standard + let expandedWorkspaces = $state>(new Set(grouped.map(([name]) => name))); + + function toggleWorkspace(name: string) { + if (expandedWorkspaces.has(name)) { + expandedWorkspaces.delete(name); + } else { + expandedWorkspaces.add(name); + } + expandedWorkspaces = new Set(expandedWorkspaces); + } + function getWarmupMode(config: Record): WarmupMode { return (config.warmup_mode as WarmupMode) ?? 'all'; } @@ -40,15 +63,6 @@ return d.toLocaleDateString('nb-NO', { day: 'numeric', month: 'short', year: 'numeric' }); } - function modeLabel(mode: WarmupMode): string { - switch (mode) { - case 'all': return 'Alt'; - case 'messages': return 'Siste N meldinger'; - case 'days': return 'Siste N dager'; - case 'none': return 'Ingen'; - } - } - async function saveConfig(channel: ChannelRow) { saving = channel.id; errorMsg = ''; @@ -103,62 +117,73 @@
{errorMsg}
{/if} -
-
- Kanal - Tilhører - Meldinger - Siste aktivitet - Warmup - Verdi - + {#each grouped as [wsName, wsChannels] (wsName)} + {@const wsActive = wsChannels.filter(c => getWarmupMode(c.config) !== 'none').length} +
+ + + {#if expandedWorkspaces.has(wsName)} +
+
+ Kanal + Meldinger + Siste aktivitet + Warmup + Verdi + +
+ + {#each wsChannels as channel (channel.id)} + {@const mode = getWarmupMode(channel.config)} + {@const value = getWarmupValue(channel.config)} +
+ {channel.name} + {channel.message_count} + {formatDate(channel.last_message_at)} + + + + + {#if mode === 'messages' || mode === 'days'} + setValue(channel, parseInt((e.target as HTMLInputElement).value) || 100)} + /> + {:else} + {mode === 'all' ? 'Alt' : '—'} + {/if} + + + {#if saving === channel.id} + ... + {:else if saved === channel.id} + OK + {/if} + +
+ {/each} +
+ {/if}
+ {/each} - {#each channels as channel (channel.id)} - {@const mode = getWarmupMode(channel.config)} - {@const value = getWarmupValue(channel.config)} -
- {channel.name} - {channel.parent_name ?? '—'} - {channel.message_count} - {formatDate(channel.last_message_at)} - - - - - {#if mode === 'messages' || mode === 'days'} - setValue(channel, parseInt((e.target as HTMLInputElement).value) || 100)} - /> - {:else} - {mode === 'all' ? 'Alt' : '—'} - {/if} - - - {#if saving === channel.id} - ... - {:else if saved === channel.id} - OK - {/if} - -
- {/each} - - {#if channels.length === 0} -

Ingen kanaler funnet i dette workspacet.

- {/if} -
+ {#if channels.length === 0} +

Ingen kanaler funnet.

+ {/if}
Warmup-moduser @@ -203,19 +228,59 @@ font-size: 0.85rem; } + .workspace-group { + margin-bottom: 0.75rem; + } + + .workspace-header { + display: flex; + align-items: center; + gap: 0.5rem; + width: 100%; + padding: 0.6rem 0.75rem; + background: #1a1d2e; + border: 1px solid #2d3148; + border-radius: 6px; + color: #e1e4e8; + cursor: pointer; + font-size: 0.9rem; + text-align: left; + } + + .workspace-header:hover { + border-color: #3b82f6; + } + + .workspace-chevron { + font-size: 0.65rem; + color: #8b92a5; + width: 1em; + } + + .workspace-name { + font-weight: 600; + flex: 1; + } + + .workspace-stats { + font-size: 0.75rem; + color: #8b92a5; + } + .channel-list { display: flex; flex-direction: column; gap: 1px; background: #2d3148; border: 1px solid #2d3148; - border-radius: 6px; + border-top: none; + border-radius: 0 0 6px 6px; overflow: hidden; } .channel-row { display: grid; - grid-template-columns: 2fr 1.5fr 80px 120px 160px 80px 40px; + grid-template-columns: 2fr 80px 120px 160px 80px 40px; align-items: center; gap: 0.5rem; padding: 0.5rem 0.75rem; @@ -242,13 +307,6 @@ white-space: nowrap; } - .col-parent { - color: #8b92a5; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - } - .col-count { text-align: right; font-variant-numeric: tabular-nums; @@ -303,6 +361,8 @@ padding: 1.5rem; text-align: center; background: #161822; + border: 1px solid #2d3148; + border-radius: 6px; } .info-box { @@ -341,7 +401,7 @@ .channel-row--header { display: none; } - .col-parent, .col-last { + .col-last { display: none; } }