From 2886f0d0407f411b875743721e7332fa29ad19ed Mon Sep 17 00:00:00 2001 From: Jesper Kristensen Date: Mon, 8 Sep 2025 14:59:38 +0200 Subject: [PATCH 1/3] 5419: Combined frontend changes --- backend/open_webui/config.py | 26 +++++++++++++++++++++ backend/open_webui/main.py | 29 ++++++++++++++++++++++++ src/lib/components/layout/Sidebar.svelte | 13 ++++++++++- src/lib/stores/index.ts | 12 ++++++++++ src/routes/auth/+page.svelte | 19 +++++++++++++++- 5 files changed, 97 insertions(+), 2 deletions(-) diff --git a/backend/open_webui/config.py b/backend/open_webui/config.py index 57f4712027c..eb54adb2242 100644 --- a/backend/open_webui/config.py +++ b/backend/open_webui/config.py @@ -2494,6 +2494,32 @@ def reachable(host: str, port: int) -> bool: (False if not WEBUI_AUTH else os.getenv('ENABLE_SIGNUP', 'True').lower() == 'true'), ) + +# PATCH EXTRA LOGIN INFO +SYSTEM_REGISTER_URL = PersistentConfig( + "SYSTEM_REGISTER_URL", + "ui.SYSTEM_REGISTER_URL", + os.environ.get("SYSTEM_REGISTER_URL", ""), +) + + +SYSTEM_REGISTER_GUIDE_URL = PersistentConfig( + "SYSTEM_REGISTER_GUIDE_URL", + "ui.SYSTEM_REGISTER_GUIDE_URL", + os.environ.get("SYSTEM_REGISTER_GUIDE_URL", ""), +) +# /PATCH EXTRA LOGIN INFO + + +# PATCH ADD LOGO TO SIDEBAR +LOGO_URL = PersistentConfig( + "LOGO_URL", + "ui.LOGO_URL", + os.environ.get("LOGO_URL", ""), +) +# /PATCH ADD LOGO TO SIDEBAR + + ENABLE_LOGIN_FORM = ConfigVar( 'ENABLE_LOGIN_FORM', 'ui.enable_login_form', diff --git a/backend/open_webui/main.py b/backend/open_webui/main.py index e05497c6165..c13d2c0a9e8 100644 --- a/backend/open_webui/main.py +++ b/backend/open_webui/main.py @@ -143,6 +143,13 @@ DEFAULT_MODEL_PARAMS, DEFAULT_MODELS, DEFAULT_PINNED_MODELS, + # PATCH EXTRA LOGIN INFO + SYSTEM_REGISTER_URL, + SYSTEM_REGISTER_GUIDE_URL, + # /PATCH EXTRA LOGIN INFO + # PATCH ADD LOGO TO SIDEBAR + LOGO_URL, + # /PATCH ADD LOGO TO SIDEBAR DEFAULT_PROMPT_SUGGESTIONS, DEFAULT_RAG_TEMPLATE, DEFAULT_USER_ROLE, @@ -892,6 +899,18 @@ async def lifespan(app: FastAPI): app.state.config.DEFAULT_USER_ROLE = DEFAULT_USER_ROLE app.state.config.DEFAULT_GROUP_ID = DEFAULT_GROUP_ID + +# PATCH EXTRA LOGIN INFO +app.state.config.SYSTEM_REGISTER_URL = SYSTEM_REGISTER_URL +app.state.config.SYSTEM_REGISTER_GUIDE_URL = SYSTEM_REGISTER_GUIDE_URL +# /PATCH EXTRA LOGIN INFO + + +# PATCH ADD LOGO TO SIDEBAR +app.state.config.LOGO_URL = LOGO_URL +# /PATCH ADD LOGO TO SIDEBAR + + app.state.config.PENDING_USER_OVERLAY_CONTENT = PENDING_USER_OVERLAY_CONTENT app.state.config.PENDING_USER_OVERLAY_TITLE = PENDING_USER_OVERLAY_TITLE @@ -2406,6 +2425,16 @@ async def get_app_config(request: Request): 'providers': {name: config.get('name', name) for name, config in OAUTH_PROVIDERS.items()}, 'auto_redirect': app.state.config.OAUTH_AUTO_REDIRECT, }, + # Environment variables for patches + 'extended_features': { + # PATCH EXTRA LOGIN INFO + 'system_register_url': app.state.config.SYSTEM_REGISTER_URL, + 'system_register_guide_url': app.state.config.SYSTEM_REGISTER_GUIDE_URL, + # /PATCH EXTRA LOGIN INFO + # PATCH ADD LOGO TO SIDEBAR + 'logo_url': app.state.config.LOGO_URL, + # /PATCH ADD LOGO TO SIDEBAR + }, 'features': { # --- Public: required by login/signup page pre-auth --- 'auth': WEBUI_AUTH, diff --git a/src/lib/components/layout/Sidebar.svelte b/src/lib/components/layout/Sidebar.svelte index f2329273aa2..cefc392c505 100644 --- a/src/lib/components/layout/Sidebar.svelte +++ b/src/lib/components/layout/Sidebar.svelte @@ -1593,7 +1593,9 @@ -
+ +
+
@@ -1642,6 +1644,15 @@
+ +
+
+
+ +
+
+
+ {#if !$mobile} diff --git a/src/lib/stores/index.ts b/src/lib/stores/index.ts index b87303c0b0e..23f3928039e 100644 --- a/src/lib/stores/index.ts +++ b/src/lib/stores/index.ts @@ -303,6 +303,18 @@ type Config = { enable_version_update_check: boolean; folder_max_file_count?: number; }; + + // Environment variables for patches + extended_features: { + // PATCH EXTRA LOGIN INFO + system_register_url: string; + system_register_guide_url: string; + // /PATCH EXTRA LOGIN INFO + // PATCH ADD LOGO TO SIDEBAR + logo_url: string; + // /PATCH ADD LOGO TO SIDEBAR + }; + oauth: { providers: { [key: string]: string; diff --git a/src/routes/auth/+page.svelte b/src/routes/auth/+page.svelte index e1bae7c3b7f..9e5c6d74bc5 100644 --- a/src/routes/auth/+page.svelte +++ b/src/routes/auth/+page.svelte @@ -27,6 +27,10 @@ import SensitiveInput from '$lib/components/common/SensitiveInput.svelte'; import { redirect } from '@sveltejs/kit'; + // PATCH EXTRA LOGIN INFO + import Banner from '$lib/components/common/Banner.svelte'; + // /PATCH EXTRA LOGIN INFO + const i18n = getContext('i18n'); let loaded = false; @@ -436,7 +440,20 @@ {/if} - + + {#if $config?.extended_features?.system_register_url && $config?.extended_features?.system_register_guide_url} + Du skal have adgang til AI-Platform i Aarhus Kommunes Systemregister.
Anmod om adgang i systemregistret
.
Du kan hente en vejledning til hvordan man anmoder om adgang til systemregistret
` + }} + > + {/if} + {#if Object.keys($config?.oauth?.providers ?? {}).length > 0}
From d3da3f64df7862f817c84882991a8f250a8c15a6 Mon Sep 17 00:00:00 2001 From: Jesper Kristensen Date: Mon, 8 Sep 2025 16:39:27 +0200 Subject: [PATCH 2/3] 5419: Updated to matched current frontend release --- src/lib/components/layout/Sidebar.svelte | 31 +++++++++++++++++++++--- src/routes/auth/+page.svelte | 2 +- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/src/lib/components/layout/Sidebar.svelte b/src/lib/components/layout/Sidebar.svelte index cefc392c505..6dc6b9ea515 100644 --- a/src/lib/components/layout/Sidebar.svelte +++ b/src/lib/components/layout/Sidebar.svelte @@ -675,6 +675,25 @@ }; const isWindows = /Windows/i.test(navigator.userAgent); + + // PATCH ADD LOGO TO SIDEBAR + function IsJson(str) { + try { + JSON.parse(str); + } catch (e) { + return false; + } + return true; + } + + function getUrl(str) { + if (IsJson(str)) { + return JSON.parse(str); + } else { + return str; + } + } + // /PATCH ADD LOGO TO SIDEBAR
-
-
+
+
- +
diff --git a/src/routes/auth/+page.svelte b/src/routes/auth/+page.svelte index 9e5c6d74bc5..4833bbfcd0b 100644 --- a/src/routes/auth/+page.svelte +++ b/src/routes/auth/+page.svelte @@ -449,7 +449,7 @@ id: '1', dismissible: false, title: 'Vigtigt før du logger ind første gang!', - content: `
Du skal have adgang til AI-Platform i Aarhus Kommunes Systemregister.
Anmod om adgang i systemregistret
.
Du kan hente en vejledning til hvordan man anmoder om adgang til systemregistret
` + content: `
Du skal have adgang til AI-Platform i Aarhus Kommunes Systemregister.
Anmod om adgang i systemregistret
.
Du kan hente en vejledning til hvordan man anmoder om adgang til systemregistret
` }} > {/if} From e691faa6b6cd34d0b7f3a7745c94f50d5e107fe5 Mon Sep 17 00:00:00 2001 From: Jesper Kristensen Date: Mon, 8 Sep 2025 16:50:27 +0200 Subject: [PATCH 3/3] 5419: Updated to matched current frontend release - login banner --- backend/open_webui/config.py | 6 ++--- src/routes/auth/+page.svelte | 49 +++++++++++++++++++++++++----------- 2 files changed, 38 insertions(+), 17 deletions(-) diff --git a/backend/open_webui/config.py b/backend/open_webui/config.py index eb54adb2242..ecb809b8502 100644 --- a/backend/open_webui/config.py +++ b/backend/open_webui/config.py @@ -2496,14 +2496,14 @@ def reachable(host: str, port: int) -> bool: # PATCH EXTRA LOGIN INFO -SYSTEM_REGISTER_URL = PersistentConfig( +SYSTEM_REGISTER_URL = ConfigVar( "SYSTEM_REGISTER_URL", "ui.SYSTEM_REGISTER_URL", os.environ.get("SYSTEM_REGISTER_URL", ""), ) -SYSTEM_REGISTER_GUIDE_URL = PersistentConfig( +SYSTEM_REGISTER_GUIDE_URL = ConfigVar( "SYSTEM_REGISTER_GUIDE_URL", "ui.SYSTEM_REGISTER_GUIDE_URL", os.environ.get("SYSTEM_REGISTER_GUIDE_URL", ""), @@ -2512,7 +2512,7 @@ def reachable(host: str, port: int) -> bool: # PATCH ADD LOGO TO SIDEBAR -LOGO_URL = PersistentConfig( +LOGO_URL = ConfigVar( "LOGO_URL", "ui.LOGO_URL", os.environ.get("LOGO_URL", ""), diff --git a/src/routes/auth/+page.svelte b/src/routes/auth/+page.svelte index 4833bbfcd0b..dfbf740774d 100644 --- a/src/routes/auth/+page.svelte +++ b/src/routes/auth/+page.svelte @@ -27,10 +27,6 @@ import SensitiveInput from '$lib/components/common/SensitiveInput.svelte'; import { redirect } from '@sveltejs/kit'; - // PATCH EXTRA LOGIN INFO - import Banner from '$lib/components/common/Banner.svelte'; - // /PATCH EXTRA LOGIN INFO - const i18n = getContext('i18n'); let loaded = false; @@ -442,16 +438,41 @@ {#if $config?.extended_features?.system_register_url && $config?.extended_features?.system_register_guide_url} - Du skal have adgang til AI-Platform i Aarhus Kommunes Systemregister.
Anmod om adgang i systemregistret
.
Du kan hente en vejledning til hvordan man anmoder om adgang til systemregistret
` - }} - > +
+
+
+ {$i18n.t('Info')} +
+
+
+ Du skal anmode om adgang til AarhusAI (AI-platform) i Aarhus Kommunes + systemregister, før du logger på første gang. +
+
+ Anmod om adgang i Systemregisteret. +
+
+ Vejledning til at anmode om adgang i Systemregisteret på Serviceportalen. +
+
+
+
{/if} {#if Object.keys($config?.oauth?.providers ?? {}).length > 0}