From 6fb97ef61b06bdd933d9f9123bc296cd79fd87f3 Mon Sep 17 00:00:00 2001
From: theMackabu <theMackabu@gmail.com>
Date: Fri, 28 Jun 2024 21:18:45 -0700
Subject: [PATCH] minor bugfixes

---
 src/daemon/mod.rs                         |  2 +-
 src/main.rs                               |  2 +-
 src/webui/src/components/react/index.tsx  |  4 +++-
 src/webui/src/components/react/modal.tsx  |  4 ++--
 src/webui/src/components/react/rename.tsx |  6 ++++--
 src/webui/src/components/react/view.tsx   | 13 ++++++++++---
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/daemon/mod.rs b/src/daemon/mod.rs
index 819d644..d2b1c21 100644
--- a/src/daemon/mod.rs
+++ b/src/daemon/mod.rs
@@ -304,7 +304,7 @@ pub fn reset() {
 
     match largest {
         Some(id) => runner.set_id(Id::from(str!(id.to_string()))),
-        None => println!("{} Cannot reset index, no ID found", *helpers::FAIL),
+        None => runner.set_id(Id::new(0)),
     }
 
     println!("{} PMC Successfully reset (index={})", *helpers::SUCCESS, runner.id);
diff --git a/src/main.rs b/src/main.rs
index f3bdd00..06d1b3a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -68,7 +68,7 @@ enum Server {
         format: String,
     },
     /// Remove server
-    #[command(visible_alias = "rm")]
+    #[command(visible_alias = "rm", visible_alias = "delete")]
     Remove {
         /// Server name
         name: String,
diff --git a/src/webui/src/components/react/index.tsx b/src/webui/src/components/react/index.tsx
index eb0c81b..65ed5b9 100644
--- a/src/webui/src/components/react/index.tsx
+++ b/src/webui/src/components/react/index.tsx
@@ -31,7 +31,9 @@ const Index = (props: { base: string }) => {
 	const isRunning = (status: string): bool => (status == 'stopped' ? false : status == 'crashed' ? false : true);
 	const action = (id: number, name: string) => api.post(`${props.base}/process/${id}/action`, { json: { method: name } }).then(() => fetch());
 
-	useEffect(() => fetch(), []);
+	useEffect(() => {
+		fetch();
+	}, []);
 
 	return (
 		<ul role="list" className="grid grid-cols-1 gap-x-6 gap-y-8 lg:grid-cols-4 xl:gap-x-8">
diff --git a/src/webui/src/components/react/modal.tsx b/src/webui/src/components/react/modal.tsx
index d34a637..1d5a787 100644
--- a/src/webui/src/components/react/modal.tsx
+++ b/src/webui/src/components/react/modal.tsx
@@ -1,5 +1,5 @@
 import { Fragment } from 'react';
-import { Dialog, DialogTitle, Transition, TransitionChild } from '@headlessui/react';
+import { Dialog, DialogTitle, DialogBackdrop, Transition, TransitionChild } from '@headlessui/react';
 
 const Modal = (props: { show: boolean; callback: any; title: string; children: any }) => {
 	return (
@@ -14,7 +14,7 @@ const Modal = (props: { show: boolean; callback: any; title: string; children: a
 						leave="ease-in duration-200"
 						leaveFrom="opacity-100"
 						leaveTo="opacity-0">
-						<Dialog.Overlay className="fixed inset-0 bg-black bg-opacity-60 transition-opacity" style={{ backdropFilter: 'blur(5px)' }} />
+						<DialogBackdrop className="fixed inset-0 bg-black bg-opacity-60 transition-opacity" style={{ backdropFilter: 'blur(5px)' }} />
 					</TransitionChild>
 					<span className="hidden sm:inline-block sm:align-middle sm:h-screen" aria-hidden="true">
 						&#8203;
diff --git a/src/webui/src/components/react/rename.tsx b/src/webui/src/components/react/rename.tsx
index df30ccb..aa4f22c 100644
--- a/src/webui/src/components/react/rename.tsx
+++ b/src/webui/src/components/react/rename.tsx
@@ -16,7 +16,9 @@ const Rename = (props: { base: string; process: number; callback: any; old: stri
 		});
 	};
 
-	useEffect(() => setFormData(props.old), []);
+	useEffect(() => {
+		setFormData(props.old);
+	}, []);
 
 	return (
 		<Fragment>
@@ -27,7 +29,7 @@ const Rename = (props: { base: string; process: number; callback: any; old: stri
 			</a>
 			<Modal show={open} title="Rename this process" callback={(close: boolean) => setOpen(close)}>
 				<form onSubmit={handleSubmit}>
-					<div className="relative border border-zinc-300 rounded-lg px-3 py-3 focus-within:ring-1 focus-within:ring-zinc-300 focus-within:border-zinc-300 w-[29rem] focus-within:shadow-sm transition bg-zinc-900">
+					<div className="relative border border-zinc-700 rounded-lg px-3 py-3 focus-within:ring-1 focus-within:ring-zinc-300 focus-within:border-zinc-300 w-[29rem] focus-within:shadow-sm transition bg-zinc-900">
 						<input
 							type="text"
 							name="name"
diff --git a/src/webui/src/components/react/view.tsx b/src/webui/src/components/react/view.tsx
index 7fe824d..e31ca2a 100644
--- a/src/webui/src/components/react/view.tsx
+++ b/src/webui/src/components/react/view.tsx
@@ -152,8 +152,13 @@ const LogViewer = (props: { server: string | null; base: string; id: number }) =
 			.finally(() => setLoaded(true));
 	};
 
-	useEffect(() => (props.server != null ? loadLogsRemote(logType.name) : loadLogs(logType.name)), [logType]);
-	useEffect(() => lastRow.current?.scrollIntoView(), [loaded]);
+	useEffect(() => {
+		props.server != null ? loadLogsRemote(logType.name) : loadLogs(logType.name);
+	}, [logType]);
+
+	useEffect(() => {
+		lastRow.current?.scrollIntoView();
+	}, [loaded]);
 
 	if (!loaded) {
 		return <Loader />;
@@ -255,7 +260,9 @@ const View = (props: { id: string; base: string }) => {
 	const isRunning = (status: string): bool => (status == 'stopped' ? false : status == 'crashed' ? false : true);
 	const action = (id: number, name: string) => api.post(`${props.base}/process/${id}/action`, { json: { method: name } }).then(() => fetch());
 
-	useEffect(() => (server != null ? fetchRemote() : fetch()), []);
+	useEffect(() => {
+		server != null ? fetchRemote() : fetch();
+	}, []);
 
 	if (!loaded) {
 		return <Loader />;
-- 
GitLab