Added (Semi) Unique Identifier for Logger

src/components/NotificationManager/NotificationContext.tsx

@@ -44,7 +44,7 @@ export function useNotification() {
 		}
 		return context;
 	} catch (error) {
-		Logger.error("Error using notification:", error);
+		Logger.error("NotificationContext.tsx", "Error using notification:", error);
 		return { showNotification: () => { }, showBannerNotification: () => { }, hideNotification: () => { } };
 	}
 }

src/components/ProjectSwitcher/ProjectSwitcher.tsx

@@ -93,7 +93,7 @@ const ProjectSwitcher = (): React.ReactElement => {
 			setModalData(data);
 			setIsModalOpen(true); // Open the modal
 		} catch (error) {
-			Logger.error(error);
+			Logger.error("ProjectSwitcher.tsx", error);
 			notification.showNotification("Error", "Something went wrong.", "error");
 		}
 	};

src/components/TitleBar/utils.tsx

@@ -21,7 +21,7 @@ export const renderSysButtons = (): React.JSX.Element => {
 			return <MacStyle />;
 		}
 	} catch (error) {
-		Logger.error("Error while rendering sysButtons", error);
+		Logger.error("TitleBar/utils.tsx", "Error while rendering sysButtons", error);
 		return <MacStyle />;
 	}
 };

src/config/auth.ts

@@ -10,7 +10,7 @@ export const getAuthDetails = (): AuthDetails | null => {
 	};
 
 	if (!authDetails.baseurl || !authDetails.username || !authDetails.apitoken) {
-		Logger.error("Missing auth details. Is Onboarding complete?");
+		Logger.error("config/auth.ts", "Missing auth details. Is Onboarding complete?");
 		return null;
 	}
 

src/helpers/Logger.ts

@@ -5,11 +5,11 @@ import { ErrorInfo } from "react";
 import { LOGS_FILE } from "../config/constants";
 
 const Logger = {
-	info: <T extends unknown[]>(...messages: T) => logMessage("INFO", "color: #3b82f6;", ...messages),
-	debug: <T extends unknown[]>(...messages: T) => logMessage("DEBUG", "color: #7c3aed;", ...messages),
-	warning: <T extends unknown[]>(...messages: T) => logMessage("WARNING", "color: #d97706;", ...messages),
-	error: <T extends unknown[]>(...messages: T) => logMessage("ERROR", "color: #ef4444;", ...messages),
-	fatal: <T extends unknown[]>(...messages: T) => logMessage("FATAL", "color: #ef4444; background: black", ...messages),
+	info: <T extends unknown[]>(suffix: string, ...messages: T) => logMessage("INFO - " + suffix, "color: #3b82f6;", ...messages),
+	debug: <T extends unknown[]>(suffix: string, ...messages: T) => logMessage("DEBUG - " + suffix, "color: #7c3aed;", ...messages),
+	warning: <T extends unknown[]>(suffix: string, ...messages: T) => logMessage("WARNING - " + suffix, "color: #d97706;", ...messages),
+	error: <T extends unknown[]>(suffix: string, ...messages: T) => logMessage("ERROR - " + suffix, "color: #ef4444;", ...messages),
+	fatal: <T extends unknown[]>(suffix: string, ...messages: T) => logMessage("FATAL - " + suffix, "color: #ef4444; background: black", ...messages),
 	clearLogfile
 } as const;
 
@@ -56,7 +56,7 @@ export async function writeEmergencyLog(error: Error, errorInfo: ErrorInfo): Pro
 		writeToLog("EMERGENCY", `An Emergency Log was created. Check the file: ${emergency_log_file_name} for more details.`);
 	} catch (error) {
 		alert(`An Error occured while trying to write an Emergency Log: ${JSON.stringify(error)}`);
-		Logger.error("An Error occured while trying to write an Emergency Log: ", error);
+		Logger.error("helpers/Logger.ts", "An Error occured while trying to write an Emergency Log: ", error);
 	}
 	return await appDataDir() + emergency_log_file_name;
 }
@@ -71,7 +71,7 @@ export async function clearLogfile(): Promise<boolean> {
 		return true;
 	} catch (error) {
 		alert(`An Error occured while trying to clear the Log File: ${JSON.stringify(error)}`);
-		Logger.error("An Error occured while trying to clear the Log File: ", error);
+		Logger.error("helpers/Logger.ts", "An Error occured while trying to clear the Log File: ", error);
 	}
 
 	return false;

src/helpers/StorageManager.ts

@@ -55,7 +55,7 @@ const StorageManager = {
 			}
 			localStorage.setItem(key, value);
 		} catch (error) {
-			Logger.error(error);
+			Logger.error("helpers/StorageManager.ts", error);
 			return false;
 		}
 		return true;
@@ -80,7 +80,7 @@ const StorageManager = {
 		try {
 			localStorage.clear();
 		} catch (error) {
-			Logger.error(error);
+			Logger.error("helpers/StorageManager.ts", error);
 			return false;
 		}
 		return true;
@@ -95,7 +95,7 @@ const StorageManager = {
 		try {
 			localStorage.removeItem(key);
 		} catch (error) {
-			Logger.error(error);
+			Logger.error("helpers/StorageManager.ts", error);
 			return false;
 		}
 		return true;

src/screens/App/App.tsx

@@ -17,7 +17,7 @@ const App: React.FC = () => {
 		const startApp = async () => {
 			// Set default window size
 			let abortStartup = false;
-			Logger.info("App started");
+			Logger.info("App.tsx", "App started");
 			appWindow.setSize(new LogicalSize(270, 350));
 			appWindow.center();
 
@@ -27,7 +27,7 @@ const App: React.FC = () => {
 				await initUpdateChecker();
 			} catch (error) {
 				setSpecificLoadingMessage("An error occured while checking for updates");
-				Logger.error("An error occured while checking for updates", error);
+				Logger.error("App.tsx", "An error occured while checking for updates", error);
 			}
 
 			try {
@@ -36,7 +36,7 @@ const App: React.FC = () => {
 				await createPathsIfNotExists();
 			} catch (error) {
 				setSpecificLoadingMessage("An error occured while creating paths");
-				Logger.error("An error occured while creating paths", error);
+				Logger.error("App.tsx", "An error occured while creating paths", error);
 			}
 
 			try {
@@ -45,7 +45,7 @@ const App: React.FC = () => {
 				await checkLogFile();
 			} catch (error) {
 				setSpecificLoadingMessage("An error occured while checking logfile size");
-				Logger.error("An error occured while checking logfile size", error);
+				Logger.error("App.tsx", "An error occured while checking logfile size", error);
 			}
 
 			try {
@@ -60,7 +60,7 @@ const App: React.FC = () => {
 					checkPermissions();
 				}
 			} catch (error) {
-				Logger.error("An error occured while checking jenkins connection", error);
+				Logger.error("App.tsx", "An error occured while checking jenkins connection", error);
 			}
 
 			// Navigate to onboarding or jarvis
@@ -81,10 +81,10 @@ const App: React.FC = () => {
 		const onboardState = StorageManager.get("onboardState");
 
 		if (onboardState !== "true") {
-			Logger.info("Onboarding not completed, redirecting to onboarding");
+			Logger.info("App.tsx", "Onboarding not completed, redirecting to onboarding");
 			return "/onboarding";
 		}
-		Logger.info("Onboarding completed, redirecting to Jarvis");
+		Logger.info("App.tsx", "Onboarding completed, redirecting to Jarvis");
 		return "/jarvis";
 	};
 

src/screens/App/AppUtils.ts

@@ -11,7 +11,7 @@ export const initUpdateChecker = async () => {
 	const updateState = await checkForUpdates();
 
 	if (updateState) {
-		Logger.info("Update available, opening update window");
+		Logger.info("AppUtils.tsx", "Update available, opening update window");
 		const webview = new WebviewWindow("checkUpdate", {
 			url: "/updateAvailable",
 			title: "Update Available",
@@ -24,11 +24,11 @@ export const initUpdateChecker = async () => {
 		webview.center();
 
 		webview.once("tauri://created", () => {
-			Logger.info("Webview created");
+			Logger.info("AppUtils.tsx", "Webview created");
 		});
 
 		webview.once("tauri://error", (e) => {
-			Logger.error(`Error in webview: ${e}`);
+			Logger.error("AppUtils.tsx", `Error in webview: ${e}`);
 		});
 	}
 };
@@ -40,10 +40,10 @@ export const initUpdateChecker = async () => {
 export const initJenkinsConnectionCheck = async () => {
 	const initJenkinsConnectionCheck = await checkJenkinsConnection();
 	if (initJenkinsConnectionCheck) {
-		Logger.info("Jenkins is available");
+		Logger.info("AppUtils.tsx", "Jenkins is available");
 		return true;
 	} else {
-		Logger.info("Jenkins is not available. Opening Window.");
+		Logger.info("AppUtils.tsx", "Jenkins is not available. Opening Window.");
 		const webview = new WebviewWindow("restartOnboardingMaybe", {
 			url: "/jenkinsUnavailable",
 			title: "Jenkins Unavailable",
@@ -56,11 +56,11 @@ export const initJenkinsConnectionCheck = async () => {
 		webview.center();
 
 		webview.once("tauri://created", () => {
-			Logger.info("Webview created");
+			Logger.info("AppUtils.tsx", "Webview created");
 		});
 
 		webview.once("tauri://error", (e) => {
-			Logger.error(`Error in webview: ${e}`);
+			Logger.error("AppUtils.tsx", `Error in webview: ${e}`);
 		});
 		return false;
 	}
@@ -71,10 +71,10 @@ export const checkPermissions = async (): Promise<void> => {
 		const permission = await requestPermission();
 		if (permission === "granted") {
 			StorageManager.save("notificationPermission", "granted");
-			Logger.info("Notification permission granted");
+			Logger.info("AppUtils.tsx", "Notification permission granted");
 		} else {
 			StorageManager.save("notificationPermission", "denied");
-			Logger.info("Notification permission denied");
+			Logger.info("AppUtils.tsx", "Notification permission denied");
 		}
 	}
 };
@@ -88,7 +88,7 @@ export const checkLogFile = async (): Promise<boolean> => {
 
 	// if log file is bigger than 5MB
 	if (logFileSize > MAX_LOG_FILE_SIZE) {
-		Logger.info("Log file is bigger than " + MAX_LOG_FILE_SIZE + " MB. Clearing log file.");
+		Logger.info("AppUtils.tsx", "Log file is bigger than " + MAX_LOG_FILE_SIZE + " MB. Clearing log file.");
 		// clear log file
 		const cleared = await Logger.clearLogfile();
 		return cleared;
@@ -106,7 +106,7 @@ export const createPathsIfNotExists = async () => {
 	const logsFileExists = await exists(LOGS_FILE, { dir: BaseDirectory.AppData });
 
 	if (!logsFileExists) {
-		Logger.info("Logs file does not exist. Creating it.");
+		Logger.info("AppUtils.tsx", "Logs file does not exist. Creating it.");
 		await writeTextFile(LOGS_FILE, "", { dir: BaseDirectory.AppData });
 	}
 };

src/screens/App/JenkinsConnectionChecker/JenkinsConnectionChecker.ts

@@ -6,7 +6,7 @@ export const checkJenkinsConnection = async (): Promise<boolean> => {
 		const response = await fetchUtils.fetchJenkinsData();
 		if (response) return true;
 	} catch (error) {
-		Logger.error("Error while trying to get Jenkins Data", error);
+		Logger.error("JenkinsConnectionChecker.ts", "Error while trying to get Jenkins Data", error);
 	}
 	return false;
 };

src/screens/App/updateChecker/updateChecker.ts

@@ -14,12 +14,12 @@ export const checkForUpdates = async () => {
 	const data: ReleaseInfo = await response.json();
 
 	if (data.error) {
-		Logger.error("Error while trying to get Update Data, this occured on the Backend", data.error);
+		Logger.error("updateChecker.tsx", "Error while trying to get Update Data, this occured on the Backend", data.error);
 		throw new Error(data.error);
 	}
 
-	Logger.info(`Current version: ${currentVersion}`);
-	Logger.info(`Latest version: ${data.version}`);
+	Logger.info("updateChecker.tsx", `Current version: ${currentVersion}`);
+	Logger.info("updateChecker.tsx", `Latest version: ${data.version}`);
 
 	const latestVersion = data.version;
 	return currentVersion !== latestVersion;
@@ -33,7 +33,7 @@ export const getUpdateInfo = async (): Promise<ReleaseInfo> => {
 
 	// if data .error is defined, then there was an error
 	if (data.error) {
-		Logger.error("Error while trying to get Update Data, this occured on the Backend", data.error);
+		Logger.error("updateChecker.tsx", "Error while trying to get Update Data, this occured on the Backend", data.error);
 		throw new Error(data.error);
 	}
 

src/screens/ErrorBoundary/ErrorBoundary.tsx

@@ -22,7 +22,7 @@ class ErrorBoundary extends Component<ErrorBoundaryProps, ErrorBoundaryState> {
 	}
 
 	async componentDidCatch(error: Error, errorInfo: ErrorInfo): Promise<void> {
-		Logger.error("ErrorBoundary", error);
+		Logger.error("ErrorBoundary.tsx", error);
 		const path = await writeEmergencyLog(error, errorInfo);
 		this.setState({
 			hasError: true, error, errorInfo, file_path: path,

src/screens/Jarvis/JarvisMain.tsx

@@ -72,10 +72,10 @@ function JarvisMain(): React.ReactElement {
 	 * aka. Jarvis is started.
 	 */
 	useEffect(() => {
-		Logger.info("STARTUP: Running startup tasks for", storedProjectName);
+		Logger.info("JarvisMain.tsx", "STARTUP: Running startup tasks for", storedProjectName);
 		jarvisUtils.startJarvis();
 		return () => {
-			Logger.info("CLEANUP: Clearing interval for", storedProjectName);
+			Logger.info("JarvisMain.tsx", "CLEANUP: Clearing interval for", storedProjectName);
 			jarvisUtils.stopJarvis();
 		};
 	}, [storedProjectName, setProjectData]);
@@ -90,7 +90,7 @@ function JarvisMain(): React.ReactElement {
 				setFeatureButtons(await miniUtils.createFeatureButtons(activeJobBuild));
 				setParameterDefinition(await fetchUtils.fetchParameterDefinition(storedProjectName));
 			} catch (error) {
-				Logger.error("Error while updating job card props", error);
+				Logger.error("JarvisMain.tsx", "Error while updating job card props", error);
 			}
 		};