diff --git a/chart/templates/ingress.yaml b/chart/templates/ingress.yaml index a13b7f4..91c4ba7 100644 --- a/chart/templates/ingress.yaml +++ b/chart/templates/ingress.yaml @@ -10,6 +10,9 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: + {{- if .Values.ingress.className }} + ingressClassName: {{ .Values.ingress.className }} + {{- end }} {{- if .Values.ingress.tls }} tls: {{- toYaml .Values.ingress.tls | nindent 4 }} diff --git a/chart/values.yaml b/chart/values.yaml index 68cf274..52dfccf 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -97,6 +97,7 @@ resources: ingress: enabled: false + className: "" annotations: {} hosts: - host: chart-example.local diff --git a/client/src/pages/TripPlannerPage.tsx b/client/src/pages/TripPlannerPage.tsx index 256714a..f369696 100644 --- a/client/src/pages/TripPlannerPage.tsx +++ b/client/src/pages/TripPlannerPage.tsx @@ -719,7 +719,7 @@ export default function TripPlannerPage(): React.ReactElement | null { reservations={reservations} lat={geoPlace?.lat} lng={geoPlace?.lng} - onClose={() => setShowDayDetail(null)} + onClose={() => { setShowDayDetail(null); handleSelectDay(null) }} onAccommodationChange={loadAccommodations} leftWidth={isMobile ? 0 : (leftCollapsed ? 0 : leftWidth)} rightWidth={isMobile ? 0 : (rightCollapsed ? 0 : rightWidth)} diff --git a/server/src/services/immichService.ts b/server/src/services/immichService.ts index 9d8e9c3..c969bb1 100644 --- a/server/src/services/immichService.ts +++ b/server/src/services/immichService.ts @@ -69,7 +69,7 @@ export async function saveImmichSettings( export async function testConnection( immichUrl: string, immichApiKey: string -): Promise<{ connected: boolean; error?: string; user?: { name?: string; email?: string } }> { +): Promise<{ connected: boolean; error?: string; user?: { name?: string; email?: string }; canonicalUrl?: string }> { const ssrf = await checkSsrf(immichUrl); if (!ssrf.allowed) return { connected: false, error: ssrf.error ?? 'Invalid Immich URL' }; try { @@ -79,7 +79,23 @@ export async function testConnection( }); if (!resp.ok) return { connected: false, error: `HTTP ${resp.status}` }; const data = await resp.json() as { name?: string; email?: string }; - return { connected: true, user: { name: data.name, email: data.email } }; + + // Detect http → https upgrade only: same host/port, protocol changed to https + let canonicalUrl: string | undefined; + if (resp.url) { + const finalUrl = new URL(resp.url); + const inputUrl = new URL(immichUrl); + if ( + inputUrl.protocol === 'http:' && + finalUrl.protocol === 'https:' && + finalUrl.hostname === inputUrl.hostname && + finalUrl.port === inputUrl.port + ) { + canonicalUrl = finalUrl.origin; + } + } + + return { connected: true, user: { name: data.name, email: data.email }, canonicalUrl }; } catch (err: unknown) { return { connected: false, error: err instanceof Error ? err.message : 'Connection failed' }; }