From 1358937fa9743e7ce80448f389c62d1323ec7b5d Mon Sep 17 00:00:00 2001
From: Matt Hill <mattnine@protonmail.com>
Date: Wed, 18 Mar 2026 15:55:56 -0600
Subject: [PATCH] fix private domain dns ip and hide private domaains for wg
 gateways

---
 .../shared/src/i18n/dictionaries/de.ts        |  1 +
 .../shared/src/i18n/dictionaries/en.ts        |  1 +
 .../shared/src/i18n/dictionaries/es.ts        |  1 +
 .../shared/src/i18n/dictionaries/fr.ts        |  3 +-
 .../shared/src/i18n/dictionaries/pl.ts        |  1 +
 .../addresses/addresses.component.ts          | 45 ++++++++++++-------
 .../addresses/private-dns.component.ts        |  9 +++-
 .../interfaces/interface.service.ts           |  2 +
 8 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/web/projects/shared/src/i18n/dictionaries/de.ts b/web/projects/shared/src/i18n/dictionaries/de.ts
index cd5a0de58..3215c61d6 100644
--- a/web/projects/shared/src/i18n/dictionaries/de.ts
+++ b/web/projects/shared/src/i18n/dictionaries/de.ts
@@ -725,4 +725,5 @@ export default {
   802: 'Die Übersetzungen auf Betriebssystemebene sind bereits aktiv. Ein Neustart ist erforderlich, damit die Übersetzungen auf Dienstebene wirksam werden.',
   803: 'Dieses Laufwerk verwendet ext4 und wird automatisch in btrfs konvertiert. Ein Backup wird dringend empfohlen, bevor Sie fortfahren.',
   804: 'Ich habe ein Backup meiner Daten',
+  805: 'Öffentliche Domain hinzufügen',
 } satisfies i18n
diff --git a/web/projects/shared/src/i18n/dictionaries/en.ts b/web/projects/shared/src/i18n/dictionaries/en.ts
index 4310e53a7..957f839df 100644
--- a/web/projects/shared/src/i18n/dictionaries/en.ts
+++ b/web/projects/shared/src/i18n/dictionaries/en.ts
@@ -726,4 +726,5 @@ export const ENGLISH: Record<string, number> = {
   'OS-level translations are already in effect. A restart is required for service-level translations to take effect.': 802,
   'This drive uses ext4 and will be automatically converted to btrfs. A backup is strongly recommended before proceeding.': 803,
   'I have a backup of my data': 804,
+  'Add Public Domain': 805,
 }
diff --git a/web/projects/shared/src/i18n/dictionaries/es.ts b/web/projects/shared/src/i18n/dictionaries/es.ts
index e25fb3f0c..1382c1be5 100644
--- a/web/projects/shared/src/i18n/dictionaries/es.ts
+++ b/web/projects/shared/src/i18n/dictionaries/es.ts
@@ -725,4 +725,5 @@ export default {
   802: 'Las traducciones a nivel del sistema operativo ya están en vigor. Se requiere un reinicio para que las traducciones a nivel de servicio surtan efecto.',
   803: 'Esta unidad usa ext4 y se convertirá automáticamente a btrfs. Se recomienda encarecidamente hacer una copia de seguridad antes de continuar.',
   804: 'Tengo una copia de seguridad de mis datos',
+  805: 'Agregar dominio público',
 } satisfies i18n
diff --git a/web/projects/shared/src/i18n/dictionaries/fr.ts b/web/projects/shared/src/i18n/dictionaries/fr.ts
index c3376b9f4..7fac66a9d 100644
--- a/web/projects/shared/src/i18n/dictionaries/fr.ts
+++ b/web/projects/shared/src/i18n/dictionaries/fr.ts
@@ -723,6 +723,7 @@ export default {
   800: 'Lorsque vous y êtes invité, entrez votre mot de passe StartOS',
   801: "Votre système a Secure Boot activé, ce qui exige que tous les modules du noyau soient signés avec une clé de confiance. Certains pilotes matériels \u2014 comme ceux des GPU NVIDIA \u2014 ne sont pas signés par la clé de distribution par défaut. L'enregistrement de la clé de signature StartOS permet à votre firmware de faire confiance à ces modules afin que votre matériel puisse être pleinement utilisé.",
   802: "Les traductions au niveau du système d'exploitation sont déjà en vigueur. Un redémarrage est nécessaire pour que les traductions au niveau des services prennent effet.",
-  803: "Ce disque utilise ext4 et sera automatiquement converti en btrfs. Il est fortement recommandé de faire une sauvegarde avant de continuer.",
+  803: 'Ce disque utilise ext4 et sera automatiquement converti en btrfs. Il est fortement recommandé de faire une sauvegarde avant de continuer.',
   804: "J'ai une sauvegarde de mes données",
+  805: 'Ajouter un domaine public',
 } satisfies i18n
diff --git a/web/projects/shared/src/i18n/dictionaries/pl.ts b/web/projects/shared/src/i18n/dictionaries/pl.ts
index 770aa4588..2c412f701 100644
--- a/web/projects/shared/src/i18n/dictionaries/pl.ts
+++ b/web/projects/shared/src/i18n/dictionaries/pl.ts
@@ -725,4 +725,5 @@ export default {
   802: 'Tłumaczenia na poziomie systemu operacyjnego są już aktywne. Wymagane jest ponowne uruchomienie, aby tłumaczenia na poziomie usług zaczęły obowiązywać.',
   803: 'Ten dysk używa ext4 i zostanie automatycznie skonwertowany na btrfs. Zdecydowanie zaleca się wykonanie kopii zapasowej przed kontynuowaniem.',
   804: 'Mam kopię zapasową moich danych',
+  805: 'Dodaj domenę publiczną',
 } satisfies i18n
diff --git a/web/projects/ui/src/app/routes/portal/components/interfaces/addresses/addresses.component.ts b/web/projects/ui/src/app/routes/portal/components/interfaces/addresses/addresses.component.ts
index 96479816a..3a8688556 100644
--- a/web/projects/ui/src/app/routes/portal/components/interfaces/addresses/addresses.component.ts
+++ b/web/projects/ui/src/app/routes/portal/components/interfaces/addresses/addresses.component.ts
@@ -34,23 +34,34 @@ import { InterfaceAddressItemComponent } from './item.component'
   template: `
     <header>
       {{ 'Gateway' | i18n }}: {{ gatewayGroup().gatewayName }}
-      <button
-        tuiDropdown
-        tuiButton
-        iconStart="@tui.plus"
-        [style.margin-inline-start]="'auto'"
-        [(tuiDropdownOpen)]="addOpen"
-      >
-        {{ 'Add Domain' | i18n }}
-        <tui-data-list *tuiDropdown (click)="addOpen.set(false)">
-          <button tuiOption (click)="addPublicDomain()">
-            {{ 'Public Domain' | i18n }}
-          </button>
-          <button tuiOption (click)="addPrivateDomain()">
-            {{ 'Private Domain' | i18n }}
-          </button>
-        </tui-data-list>
-      </button>
+      @if (gatewayGroup().isWireguard) {
+        <button
+          tuiButton
+          iconStart="@tui.plus"
+          [style.margin-inline-start]="'auto'"
+          (click)="addPublicDomain()"
+        >
+          {{ 'Add Public Domain' | i18n }}
+        </button>
+      } @else {
+        <button
+          tuiDropdown
+          tuiButton
+          iconStart="@tui.plus"
+          [style.margin-inline-start]="'auto'"
+          [(tuiDropdownOpen)]="addOpen"
+        >
+          {{ 'Add Domain' | i18n }}
+          <tui-data-list *tuiDropdown (click)="addOpen.set(false)">
+            <button tuiOption (click)="addPublicDomain()">
+              {{ 'Public Domain' | i18n }}
+            </button>
+            <button tuiOption (click)="addPrivateDomain()">
+              {{ 'Private Domain' | i18n }}
+            </button>
+          </tui-data-list>
+        </button>
+      }
     </header>
     <table
       [appTable]="[
diff --git a/web/projects/ui/src/app/routes/portal/components/interfaces/addresses/private-dns.component.ts b/web/projects/ui/src/app/routes/portal/components/interfaces/addresses/private-dns.component.ts
index 4d3080a1d..c0033e59e 100644
--- a/web/projects/ui/src/app/routes/portal/components/interfaces/addresses/private-dns.component.ts
+++ b/web/projects/ui/src/app/routes/portal/components/interfaces/addresses/private-dns.component.ts
@@ -5,6 +5,7 @@ import {
   signal,
 } from '@angular/core'
 import { ErrorService, i18nPipe } from '@start9labs/shared'
+import { utils } from '@start9labs/start-sdk'
 import { TuiButton, TuiDialogContext, TuiIcon, TuiLoader } from '@taiga-ui/core'
 import { TuiButtonLoading } from '@taiga-ui/kit'
 import { injectContext, PolymorpheusComponent } from '@taiga-ui/polymorpheus'
@@ -22,7 +23,7 @@ export type PrivateDnsValidationData = {
   template: `
     @let gatewayName =
       context.data.gateway.name || context.data.gateway.ipInfo.name;
-    @let internalIp = context.data.gateway.ipInfo.lanIp[0] || ('Error' | i18n);
+    @let internalIp = lanIp || ('Error' | i18n);
 
     <h2>{{ 'DNS Server Config' | i18n }}</h2>
     <p>
@@ -146,6 +147,12 @@ export class PrivateDnsValidationComponent {
   readonly context =
     injectContext<TuiDialogContext<void, PrivateDnsValidationData>>()
 
+  get lanIp() {
+    return this.context.data.gateway.ipInfo.subnets
+      .map(s => utils.IpNet.parse(s))
+      .find(s => s.isIpv4())?.address
+  }
+
   readonly loading = signal(false)
   readonly pass = signal<boolean | undefined>(undefined)
 
diff --git a/web/projects/ui/src/app/routes/portal/components/interfaces/interface.service.ts b/web/projects/ui/src/app/routes/portal/components/interfaces/interface.service.ts
index 7a084ed25..4cca72cad 100644
--- a/web/projects/ui/src/app/routes/portal/components/interfaces/interface.service.ts
+++ b/web/projects/ui/src/app/routes/portal/components/interfaces/interface.service.ts
@@ -158,6 +158,7 @@ export class InterfaceService {
         return {
           gatewayId: g.id,
           gatewayName: g.name,
+          isWireguard: g.ipInfo?.deviceType === 'wireguard',
           addresses,
         }
       })
@@ -313,6 +314,7 @@ export type GatewayAddress = {
 export type GatewayAddressGroup = {
   gatewayId: string
   gatewayName: string
+  isWireguard: boolean
   addresses: GatewayAddress[]
 }