From 79fb72f3cdb756c011f525eaed4af21a7ed69482 Mon Sep 17 00:00:00 2001
From: Mechiel Lukkien <mechiel@ueber.net>
Date: Sun, 17 Mar 2024 07:39:00 +0100
Subject: [PATCH] don't show default domain on admin account page

it is a remnant from the time domains didn't have to be specific in
"Destination" addresses. we still use it for as default selection for adding a
new address to an account. but there's not much point in showing it so
prominently. that raises more questions than it is helpful.

for issue #142 by tabatinga0xffff
---
 webadmin/admin.js |  8 ++------
 webadmin/admin.ts | 11 +----------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/webadmin/admin.js b/webadmin/admin.js
index 78455fa..f330507 100644
--- a/webadmin/admin.js
+++ b/webadmin/admin.js
@@ -1837,7 +1837,7 @@ const account = async (name) => {
 		}
 		return v * mult;
 	};
-	dom._kids(page, crumbs(crumblink('Mox Admin', '#'), crumblink('Accounts', '#accounts'), name), dom.div('Default domain: ', config.Domain ? dom.a(config.Domain, attr.href('#domains/' + config.Domain)) : '(none)'), dom.br(), dom.h2('Addresses'), dom.table(dom.thead(dom.tr(dom.th('Address'), dom.th('Action'))), dom.tbody(Object.keys(config.Destinations || {}).length === 0 ? dom.tr(dom.td(attr.colspan('2'), '(None, login disabled)')) : [], Object.keys(config.Destinations || {}).map(k => {
+	dom._kids(page, crumbs(crumblink('Mox Admin', '#'), crumblink('Accounts', '#accounts'), name), dom.h2('Addresses'), dom.table(dom.thead(dom.tr(dom.th('Address'), dom.th('Action'))), dom.tbody(Object.keys(config.Destinations || {}).length === 0 ? dom.tr(dom.td(attr.colspan('2'), '(None, login disabled)')) : [], Object.keys(config.Destinations || {}).map(k => {
 		let v = k;
 		const t = k.split('@');
 		if (t.length > 1) {
@@ -1859,11 +1859,7 @@ const account = async (name) => {
 			const target = e.target;
 			target.disabled = true;
 			try {
-				let addr = k;
-				if (!addr.includes('@')) {
-					addr += '@' + config.Domain;
-				}
-				await client.AddressRemove(addr);
+				await client.AddressRemove(k);
 			}
 			catch (err) {
 				console.log({ err });
diff --git a/webadmin/admin.ts b/webadmin/admin.ts
index fba7e2c..e97bf32 100644
--- a/webadmin/admin.ts
+++ b/webadmin/admin.ts
@@ -673,11 +673,6 @@ const account = async (name: string) => {
 			crumblink('Accounts', '#accounts'),
 			name,
 		),
-		dom.div(
-			'Default domain: ',
-			config.Domain ? dom.a(config.Domain, attr.href('#domains/'+config.Domain)) : '(none)',
-		),
-		dom.br(),
 		dom.h2('Addresses'),
 		dom.table(
 			dom.thead(
@@ -712,11 +707,7 @@ const account = async (name: string) => {
 								const target = e.target! as HTMLButtonElement
 								target.disabled = true
 								try {
-									let addr = k
-									if (!addr.includes('@')) {
-										addr += '@' + config.Domain
-									}
-									await client.AddressRemove(addr)
+									await client.AddressRemove(k)
 								} catch (err) {
 									console.log({err})
 									window.alert('Error: ' + errmsg(err))