From 5448e773d8e71050a099c3f17394d98cc148060b Mon Sep 17 00:00:00 2001
From: Cory McWilliams <cory@unprompted.com>
Date: Wed, 17 Apr 2024 20:56:33 -0400
Subject: [PATCH] Rejiggled error display.

---
 apps/issues/script.js |  4 +---
 core/app.js           | 21 ++++++++++++-----
 core/client.js        | 55 +++++++++++++++++++++++++++++++------------
 core/core.js          | 37 +++++++++++++++--------------
 4 files changed, 75 insertions(+), 42 deletions(-)

diff --git a/apps/issues/script.js b/apps/issues/script.js
index b7ffc0bc..7ccf746a 100644
--- a/apps/issues/script.js
+++ b/apps/issues/script.js
@@ -207,9 +207,7 @@ class TfIssuesAppElement extends LitElement {
 	}
 
 	render() {
-		let header = html`
-			<h1>Tilde Friends Issues</h1>
-		`;
+		let header = html` <h1>Tilde Friends Issues</h1> `;
 		if (this.selected) {
 			return html`
 				${header}
diff --git a/core/app.js b/core/app.js
index 3ac5e7cf..b4bd6f62 100644
--- a/core/app.js
+++ b/core/app.js
@@ -141,12 +141,21 @@ function socket(request, response, client) {
 					}
 				}
 				response.send(
-					JSON.stringify(Object.assign({
-						action: 'session',
-						credentials: credentials,
-						parentApp: parentApp,
-						id: blobId,
-					}, await core.getIdentityInfo(credentials?.session?.name, packageOwner, packageName))),
+					JSON.stringify(
+						Object.assign(
+							{
+								action: 'session',
+								credentials: credentials,
+								parentApp: parentApp,
+								id: blobId,
+							},
+							await core.getIdentityInfo(
+								credentials?.session?.name,
+								packageOwner,
+								packageName
+							)
+						)
+					),
 					0x1
 				);
 
diff --git a/core/client.js b/core/client.js
index 50a5db88..870f4b40 100644
--- a/core/client.js
+++ b/core/client.js
@@ -169,15 +169,35 @@ class TfNavigationElement extends LitElement {
 						style="text-overflow: ellipsis; overflow: hidden; white-space: nowrap; max-width: 100%"
 						@click=${self.toggle_id_dropdown}
 					>
-						${self.names[this.identity]}${self.names[this.identity] === this.identity ? '' : html` - ${this.identity}`} ▾
+						${self.names[this.identity]}${self.names[this.identity] ===
+						this.identity
+							? ''
+							: html` - ${this.identity}`}
+						▾
 					</button>
-					<div id="id_dropdown" class="w3-dropdown-content w3-bar-block w3-card-4" style="max-width: 100%">
-						<button class="w3-bar-item w3-button w3-border" @click=${() => window.location.href = "/~core/identity"}>Manage Identities...</button>
-						<button class="w3-bar-item w3-button w3-border" @click=${self.edit_profile}>Edit Profile...</button>
+					<div
+						id="id_dropdown"
+						class="w3-dropdown-content w3-bar-block w3-card-4"
+						style="max-width: 100%"
+					>
+						<button
+							class="w3-bar-item w3-button w3-border"
+							@click=${() => (window.location.href = '/~core/identity')}
+						>
+							Manage Identities...
+						</button>
+						<button
+							class="w3-bar-item w3-button w3-border"
+							@click=${self.edit_profile}
+						>
+							Edit Profile...
+						</button>
 						${this.identities.map(
 							(x) => html`
 								<button
-									class="w3-bar-item w3-button ${x === self.identity ? 'w3-cyan' : ''}"
+									class="w3-bar-item w3-button ${x === self.identity
+										? 'w3-cyan'
+										: ''}"
 									@click=${() => self.set_active_identity(x)}
 									style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap"
 								>
@@ -243,6 +263,10 @@ class TfNavigationElement extends LitElement {
 		}
 	}
 
+	clear_error() {
+		this.status = {};
+	}
+
 	/**
 	 * TODOC
 	 * @returns
@@ -319,22 +343,23 @@ class TfNavigationElement extends LitElement {
 					@click=${() => (self.show_permissions = !self.show_permissions)}
 					>🎛️</a
 				>
-				${status.message
-					? html`
-							<span
-								class="w3-bar-item"
-								style="vertical-align: top; white-space: pre; color: ${this
-									.status.color ?? kErrorColor}"
-								>${this.status.message}</span
-							>
-						`
-					: undefined}
 				${this.render_permissions()}
 				${Object.keys(this.spark_lines)
 					.sort()
 					.map((x) => this.spark_lines[x])}
 				${this.render_login()} ${this.render_identity()}
 			</div>
+				${this.status.message
+					? html`
+						<link type="text/css" rel="stylesheet" href="/static/w3.css" />
+						<div class="w3-model w3-animate-top" style="position: absolute; left: 50%; transform: translate(-50%); z-index: 1">
+							<dijv class="w3-modal-content w3-card-4" style="display: block; padding: 1em">
+								<span @click=${self.clear_error} class="w3-button w3-display-topright">&times;</span>
+								<div style="color: ${this.status.color ?? kErrorColor}"><b>ERROR:</b><p style="white-space: pre">${this.status.message}</p></div>
+							</div>
+						</div>
+						`
+					: undefined}
 		`;
 	}
 }
diff --git a/core/core.js b/core/core.js
index 55065f47..f64c8d49 100644
--- a/core/core.js
+++ b/core/core.js
@@ -540,13 +540,18 @@ async function getProcessBlob(blobId, key, options) {
 				},
 			};
 			process.sendIdentities = async function () {
-				process.app.send(Object.assign({
-					action: 'identities',
-				}, await getIdentityInfo(
-					process?.credentials?.session?.name,
-					options?.packageOwner,
-					options?.packageName
-				)));
+				process.app.send(
+					Object.assign(
+						{
+							action: 'identities',
+						},
+						await getIdentityInfo(
+							process?.credentials?.session?.name,
+							options?.packageOwner,
+							options?.packageName
+						)
+					)
+				);
 			};
 			process.setActiveIdentity = async function (identity) {
 				if (
@@ -586,7 +591,7 @@ async function getProcessBlob(blobId, key, options) {
 								process.credentials?.session?.name,
 								options.packageOwner,
 								options.packageName
-							)
+							),
 						]
 					);
 					return id;
@@ -1555,14 +1560,13 @@ async function getActiveIdentity(user, packageOwner, packageName) {
 }
 
 async function getIdentityInfo(user, packageOwner, packageName) {
-	let identities = await ssb.getIdentities(
-		user
-	);
+	let identities = await ssb.getIdentities(user);
 	let names = new Object();
 	for (let identity of identities) {
 		names[identity] = identity;
 	}
-	await ssb.sqlAsync(`
+	await ssb.sqlAsync(
+		`
 		SELECT author, name FROM (
 			SELECT
 				messages.author,
@@ -1577,15 +1581,12 @@ async function getIdentityInfo(user, packageOwner, packageName) {
 		[JSON.stringify(identities)],
 		function (row) {
 			names[row.author] = row.name;
-		});
+		}
+	);
 
 	return {
 		identities: identities,
-		identity: await getActiveIdentity(
-			user,
-			packageOwner,
-			packageName
-		),
+		identity: await getActiveIdentity(user, packageOwner, packageName),
 		names: names,
 	};
 }