refactor: Moved useForm callback promise to composable and other tweaks

frontend/src/components/UserLink.vue

@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { ref, onMounted } from "vue";
+import { useWebsocketsStore } from "@/stores/websockets";
 import { useUserAuthStore } from "@/stores/userAuth";
 
 const props = defineProps({
@@ -7,16 +8,16 @@ const props = defineProps({
 	link: { type: Boolean, default: true }
 });
 
-const user = ref({
+const user = ref(<{ name: string; username?: string }>{
-	name: "Unknown",
+	name: "Unknown"
-	username: null
 });
 
+const { socket } = useWebsocketsStore();
 const { getBasicUser } = useUserAuthStore();
 
 onMounted(() => {
-	getBasicUser(props.userId).then(
+	socket.onConnect(() => {
-		(basicUser: { name: string; username: string } | null) => {
+		getBasicUser(props.userId).then(basicUser => {
 			if (basicUser) {
 				const { name, username } = basicUser;
 				user.value = {
@@ -24,8 +25,8 @@ onMounted(() => {
 					username
 				};
 			}
-		}
+		});
-	);
+	});
 });
 </script>
 

frontend/src/components/modals/EditNews.vue

@@ -68,28 +68,27 @@ const { inputs, save, setOriginalValue } = useForm(
 		status: "published",
 		showToNewUsers: false
 	},
-	(status, messages, values) =>
+	({ status, messages, values }, resolve, reject) => {
-		new Promise((resolve, reject) => {
+		if (status === "success") {
-			if (status === "success") {
+			const data = {
-				const data = {
+				title: getTitle(),
-					title: getTitle(),
+				markdown: values.markdown,
-					markdown: values.markdown,
+				status: values.status,
-					status: values.status,
+				showToNewUsers: values.showToNewUsers
-					showToNewUsers: values.showToNewUsers
+			};
-				};
+			const cb = res => {
-				const cb = res => {
+				new Toast(res.message);
-					new Toast(res.message);
+				if (res.status === "success") resolve();
-					if (res.status === "success") resolve();
+				else reject(new Error(res.message));
-					else reject(new Error(res.message));
+			};
-				};
+			if (createNews.value) socket.dispatch("news.create", data, cb);
-				if (createNews.value) socket.dispatch("news.create", data, cb);
+			else socket.dispatch("news.update", newsId.value, data, cb);
-				else socket.dispatch("news.update", newsId.value, data, cb);
+		} else if (status === "unchanged") new Toast(messages.unchanged);
-			} else if (status === "unchanged") new Toast(messages.unchanged);
+		else if (status === "error")
-			else if (status === "error")
+			Object.values(messages).forEach(message => {
-				Object.values(messages).forEach(message => {
+				new Toast({ content: message, timeout: 8000 });
-					new Toast({ content: message, timeout: 8000 });
+			});
-				});
+	},
-		}),
 	{
 		modalUuid: props.modalUuid
 	}

frontend/src/components/modals/EditPlaylist/Tabs/Settings.vue

@@ -54,26 +54,25 @@ const {
 			}
 		}
 	},
-	(status, messages, values) =>
+	({ status, messages, values }, resolve, reject) => {
-		new Promise((resolve, reject) => {
+		if (status === "success")
-			if (status === "success")
+			socket.dispatch(
-				socket.dispatch(
+				"playlists.updateDisplayName",
-					"playlists.updateDisplayName",
+				playlist.value._id,
-					playlist.value._id,
+				values.displayName,
-					values.displayName,
+				res => {
-					res => {
+					playlist.value.displayName = values.displayName;
-						playlist.value.displayName = values.displayName;
+					if (res.status === "success") {
-						if (res.status === "success") {
+						resolve();
-							resolve();
+						new Toast(res.message);
-							new Toast(res.message);
+					} else reject(new Error(res.message));
-						} else reject(new Error(res.message));
+				}
-					}
+			);
-				);
+		else
-			else
+			Object.values(messages).forEach(message => {
-				Object.values(messages).forEach(message => {
+				new Toast({ content: message, timeout: 8000 });
-					new Toast({ content: message, timeout: 8000 });
+			});
-				});
+	},
-		}),
 	{
 		modalUuid: props.modalUuid,
 		preventCloseUnsaved: false
@@ -87,25 +86,24 @@ const {
 	setOriginalValue: setPrivacy
 } = useForm(
 	{ privacy: playlist.value.privacy },
-	(status, messages, values) =>
+	({ status, messages, values }, resolve, reject) => {
-		new Promise((resolve, reject) => {
+		if (status === "success")
-			if (status === "success")
+			socket.dispatch(
-				socket.dispatch(
+				playlist.value.type === "genre"
-					playlist.value.type === "genre"
+					? "playlists.updatePrivacyAdmin"
-						? "playlists.updatePrivacyAdmin"
+					: "playlists.updatePrivacy",
-						: "playlists.updatePrivacy",
+				playlist.value._id,
-					playlist.value._id,
+				values.privacy,
-					values.privacy,
+				res => {
-					res => {
+					playlist.value.privacy = values.privacy;
-						playlist.value.privacy = values.privacy;
+					if (res.status === "success") {
-						if (res.status === "success") {
+						resolve();
-							resolve();
+						new Toast(res.message);
-							new Toast(res.message);
+					} else reject(new Error(res.message));
-						} else reject(new Error(res.message));
+				}
-					}
+			);
-				);
+		else if (messages[status]) new Toast(messages[status]);
-			else if (messages[status]) new Toast(messages[status]);
+	},
-		}),
 	{
 		modalUuid: props.modalUuid,
 		preventCloseUnsaved: false

frontend/src/components/modals/EditSong/index.vue

@@ -386,50 +386,46 @@ const { inputs, unsavedChanges, save, setValue, setOriginalValue } = useForm(
 			required: false
 		}
 	},
-	(status, messages, values) =>
+	({ status, messages, values }, resolve, reject) => {
-		new Promise((resolve, reject) => {
+		const saveButtonRef = saveButtonRefs.value[saveButtonRefName.value];
-			const saveButtonRef = saveButtonRefs.value[saveButtonRefName.value];
+		if (status === "success" || (status === "unchanged" && newSong.value)) {
-			if (
+			const mergedValues = Object.assign(song.value, values);
-				status === "success" ||
+			const cb = res => {
-				(status === "unchanged" && newSong.value)
+				if (res.status === "error") {
-			) {
+					reject(new Error(res.message));
-				const mergedValues = Object.assign(song.value, values);
+					return;
-				const cb = res => {
-					if (res.status === "error") {
-						reject(new Error(res.message));
-						return;
-					}
-					new Toast(res.message);
-					saveButtonRef.handleSuccessfulSave();
-					onSavedSuccess(values.youtubeId);
-					if (newSong.value) loadSong(values.youtubeId, true);
-					else setSong(mergedValues);
-					resolve();
-				};
-				if (newSong.value)
-					socket.dispatch("songs.create", mergedValues, cb);
-				else
-					socket.dispatch(
-						"songs.update",
-						song.value._id,
-						mergedValues,
-						cb
-					);
-			} else {
-				if (status === "unchanged") {
-					new Toast(messages.unchanged);
-					saveButtonRef.handleSuccessfulSave();
-					onSavedSuccess(values.youtubeId);
-				} else {
-					Object.values(messages).forEach(message => {
-						new Toast({ content: message, timeout: 8000 });
-					});
-					saveButtonRef.handleFailedSave();
-					onSavedError(values.youtubeId);
 				}
+				new Toast(res.message);
+				saveButtonRef.handleSuccessfulSave();
+				onSavedSuccess(values.youtubeId);
+				if (newSong.value) loadSong(values.youtubeId, true);
+				else setSong(mergedValues);
 				resolve();
+			};
+			if (newSong.value)
+				socket.dispatch("songs.create", mergedValues, cb);
+			else
+				socket.dispatch(
+					"songs.update",
+					song.value._id,
+					mergedValues,
+					cb
+				);
+		} else {
+			if (status === "unchanged") {
+				new Toast(messages.unchanged);
+				saveButtonRef.handleSuccessfulSave();
+				onSavedSuccess(values.youtubeId);
+			} else {
+				Object.values(messages).forEach(message => {
+					new Toast({ content: message, timeout: 8000 });
+				});
+				saveButtonRef.handleFailedSave();
+				onSavedError(values.youtubeId);
 			}
-		}),
+			resolve();
+		}
+	},
 	{ modalUuid: props.modalUuid, preventCloseUnsaved: false }
 );
 

frontend/src/components/modals/EditUser.vue

@@ -47,26 +47,25 @@ const {
 			}
 		}
 	},
-	(status, messages, values) =>
+	({ status, messages, values }, resolve, reject) => {
-		new Promise((resolve, reject) => {
+		if (status === "success")
-			if (status === "success")
+			socket.dispatch(
-				socket.dispatch(
+				"users.updateUsername",
-					"users.updateUsername",
+				user.value._id,
-					user.value._id,
+				values.username,
-					values.username,
+				res => {
-					res => {
+					user.value.username = values.username;
-						user.value.username = values.username;
+					if (res.status === "success") {
-						if (res.status === "success") {
+						resolve();
-							resolve();
+						new Toast(res.message);
-							new Toast(res.message);
+					} else reject(new Error(res.message));
-						} else reject(new Error(res.message));
+				}
-					}
+			);
-				);
+		else
-			else
+			Object.values(messages).forEach(message => {
-				Object.values(messages).forEach(message => {
+				new Toast({ content: message, timeout: 8000 });
-					new Toast({ content: message, timeout: 8000 });
+			});
-				});
+	},
-		}),
 	{
 		modalUuid: props.modalUuid,
 		preventCloseUnsaved: false
@@ -95,26 +94,25 @@ const {
 			}
 		}
 	},
-	(status, messages, values) =>
+	({ status, messages, values }, resolve, reject) => {
-		new Promise((resolve, reject) => {
+		if (status === "success")
-			if (status === "success")
+			socket.dispatch(
-				socket.dispatch(
+				"users.updateEmail",
-					"users.updateEmail",
+				user.value._id,
-					user.value._id,
+				values.email,
-					values.email,
+				res => {
-					res => {
+					user.value.email.address = values.email;
-						user.value.email.address = values.email;
+					if (res.status === "success") {
-						if (res.status === "success") {
+						resolve();
-							resolve();
+						new Toast(res.message);
-							new Toast(res.message);
+					} else reject(new Error(res.message));
-						} else reject(new Error(res.message));
+				}
-					}
+			);
-				);
+		else
-			else
+			Object.values(messages).forEach(message => {
-				Object.values(messages).forEach(message => {
+				new Toast({ content: message, timeout: 8000 });
-					new Toast({ content: message, timeout: 8000 });
+			});
-				});
+	},
-		}),
 	{
 		modalUuid: props.modalUuid,
 		preventCloseUnsaved: false
@@ -128,26 +126,25 @@ const {
 	setOriginalValue: setRole
 } = useForm(
 	{ role: user.value.role },
-	(status, messages, values) =>
+	({ status, messages, values }, resolve, reject) => {
-		new Promise((resolve, reject) => {
+		if (status === "success")
-			if (status === "success")
+			socket.dispatch(
-				socket.dispatch(
+				"users.updateRole",
-					"users.updateRole",
+				user.value._id,
-					user.value._id,
+				values.role,
-					values.role,
+				res => {
-					res => {
+					user.value.role = values.role;
-						user.value.role = values.role;
+					if (res.status === "success") {
-						if (res.status === "success") {
+						resolve();
-							resolve();
+						new Toast(res.message);
-							new Toast(res.message);
+					} else reject(new Error(res.message));
-						} else reject(new Error(res.message));
+				}
-					}
+			);
-				);
+		else
-			else
+			Object.values(messages).forEach(message => {
-				Object.values(messages).forEach(message => {
+				new Toast({ content: message, timeout: 8000 });
-					new Toast({ content: message, timeout: 8000 });
+			});
-				});
+	},
-		}),
 	{
 		modalUuid: props.modalUuid,
 		preventCloseUnsaved: false
@@ -172,25 +169,24 @@ const {
 		},
 		expiresAt: "1h"
 	},
-	(status, messages, values) =>
+	({ status, messages, values }, resolve, reject) => {
-		new Promise((resolve, reject) => {
+		if (status === "success")
-			if (status === "success")
+			socket.dispatch(
-				socket.dispatch(
+				"users.banUserById",
-					"users.banUserById",
+				user.value._id,
-					user.value._id,
+				values.reason,
-					values.reason,
+				values.expiresAt,
-					values.expiresAt,
+				res => {
-					res => {
+					new Toast(res.message);
-						new Toast(res.message);
+					if (res.status === "success") resolve();
-						if (res.status === "success") resolve();
+					else reject(new Error(res.message));
-						else reject(new Error(res.message));
+				}
-					}
+			);
-				);
+		else
-			else
+			Object.values(messages).forEach(message => {
-				Object.values(messages).forEach(message => {
+				new Toast({ content: message, timeout: 8000 });
-					new Toast({ content: message, timeout: 8000 });
+			});
-				});
+	},
-		}),
 	{
 		modalUuid: props.modalUuid,
 		preventCloseUnsaved: false

frontend/src/components/modals/ManageStation/Settings.vue

@@ -65,47 +65,46 @@ const { inputs, save, setOriginalValue } = useForm(
 		autofillLimit: station.value.autofill.limit,
 		autofillMode: station.value.autofill.mode
 	},
-	(status, messages, values) =>
+	({ status, messages, values }, resolve, reject) => {
-		new Promise((resolve, reject) => {
+		if (status === "success") {
-			if (status === "success") {
+			const oldStation = JSON.parse(JSON.stringify(station.value));
-				const oldStation = JSON.parse(JSON.stringify(station.value));
+			const updatedStation = {
-				const updatedStation = {
+				...oldStation,
-					...oldStation,
+				name: values.name,
-					name: values.name,
+				displayName: values.displayName,
-					displayName: values.displayName,
+				description: values.description,
-					description: values.description,
+				theme: values.theme,
-					theme: values.theme,
+				privacy: values.privacy,
-					privacy: values.privacy,
+				requests: {
-					requests: {
+					...oldStation.requests,
-						...oldStation.requests,
+					enabled: values.requestsEnabled,
-						enabled: values.requestsEnabled,
+					access: values.requestsAccess,
-						access: values.requestsAccess,
+					limit: values.requestsLimit
-						limit: values.requestsLimit
+				},
-					},
+				autofill: {
-					autofill: {
+					...oldStation.autofill,
-						...oldStation.autofill,
+					enabled: values.autofillEnabled,
-						enabled: values.autofillEnabled,
+					limit: values.autofillLimit,
-						limit: values.autofillLimit,
+					mode: values.autofillMode
-						mode: values.autofillMode
+				}
-					}
+			};
-				};
+			socket.dispatch(
-				socket.dispatch(
+				"stations.update",
-					"stations.update",
+				station.value._id,
-					station.value._id,
+				updatedStation,
-					updatedStation,
+				res => {
-					res => {
+					new Toast(res.message);
-						new Toast(res.message);
+					if (res.status === "success") {
-						if (res.status === "success") {
+						editStation(updatedStation);
-							editStation(updatedStation);
+						resolve();
-							resolve();
+					} else reject(new Error(res.message));
-						} else reject(new Error(res.message));
+				}
-					}
+			);
-				);
+		} else
-			} else
+			Object.values(messages).forEach(message => {
-				Object.values(messages).forEach(message => {
+				new Toast({ content: message, timeout: 8000 });
-					new Toast({ content: message, timeout: 8000 });
+			});
-				});
+	},
-		}),
 	{
 		modalUuid: props.modalUuid
 	}

frontend/src/composables/useForm.ts

@@ -11,10 +11,14 @@ export const useForm = (
 			| any;
 	},
 	cb: (
-		status: string,
+		response: {
-		messages: { [key: string]: string },
+			status: string;
-		values: { [key: string]: any }
+			messages: { [key: string]: string };
-	) => Promise<void>,
+			values: { [key: string]: any };
+		},
+		resolve: (value?: undefined) => void,
+		reject: (value: Error) => void
+	) => void,
 	options?: {
 		modalUuid?: string;
 		preventCloseUnsaved?: boolean;
@@ -72,16 +76,22 @@ export const useForm = (
 		status: string,
 		messages?: { [key: string]: string }
 	) =>
-		cb(
+		new Promise((resolve, reject: (reason: Error) => void) => {
-			status,
+			cb(
-			{ ...messages },
+				{
-			Object.fromEntries(
+					status,
-				Object.entries(inputs.value).map(([name, input]) => [
+					messages: { ...messages },
-					name,
+					values: Object.fromEntries(
-					input.value
+						Object.entries(inputs.value).map(([name, input]) => [
-				])
+							name,
-			)
+							input.value
-		);
+						])
+					)
+				},
+				resolve,
+				reject
+			);
+		});
 
 	const resetOriginalValues = () => {
 		inputs.value = Object.fromEntries(

frontend/src/pages/Profile/Tabs/RecentActivity.vue

@@ -74,7 +74,7 @@ onMounted(() => {
 
 	socket.onConnect(() => {
 		if (myUserId.value !== props.userId)
-			getBasicUser(props.userId).then((user: any) => {
+			getBasicUser(props.userId).then(user => {
 				if (user && user.username) username.value = user.username;
 			});
 

frontend/src/stores/userAuth.ts

@@ -5,9 +5,16 @@ import { useWebsocketsStore } from "@/stores/websockets";
 
 export const useUserAuthStore = defineStore("userAuth", {
 	state: () => ({
-		userIdMap: {},
+		userIdMap: <{ [key: string]: { name: string; username: string } }>{},
-		userIdRequested: {},
+		userIdRequested: <{ [key: string]: boolean }>{},
-		pendingUserIdCallbacks: {},
+		pendingUserIdCallbacks: <
+			{
+				[key: string]: ((basicUser: {
+					name: string;
+					username: string;
+				}) => void)[];
+			}
+		>{},
 		loggedIn: false,
 		role: "",
 		username: "",
@@ -174,44 +181,51 @@ export const useUserAuthStore = defineStore("userAuth", {
 				});
 			});
 		},
-		getBasicUser(userId) {
+		getBasicUser(userId: string) {
-			return new Promise(resolve => {
+			return new Promise(
-				if (typeof this.userIdMap[`Z${userId}`] !== "string") {
+				(
-					if (this.userIdRequested[`Z${userId}`] !== true) {
+					resolve: (
-						this.requestingUserId(userId);
+						basicUser: { name: string; username: string } | null
-						const { socket } = useWebsocketsStore();
+					) => void
-						socket.dispatch("users.getBasicUser", userId, res => {
+				) => {
-							if (res.status === "success") {
+					if (typeof this.userIdMap[`Z${userId}`] !== "string") {
-								const user = res.data;
+						if (this.userIdRequested[`Z${userId}`] !== true) {
+							this.requestingUserId(userId);
+							const { socket } = useWebsocketsStore();
+							socket.dispatch(
+								"users.getBasicUser",
+								userId,
+								res => {
+									if (res.status === "success") {
+										const user = res.data;
 
-								this.mapUserId({
+										this.mapUserId({
-									userId,
+											userId,
-									user: {
+											user: {
-										name: user.name,
+												name: user.name,
-										username: user.username
+												username: user.username
-									}
+											}
-								});
+										});
 
-								this.pendingUserIdCallbacks[
+										this.pendingUserIdCallbacks[
-									`Z${userId}`
+											`Z${userId}`
-								].forEach(cb => cb(user));
+										].forEach(cb => cb(user));
 
-								this.clearPendingCallbacks(userId);
+										this.clearPendingCallbacks(userId);
 
-								return resolve(user);
+										return resolve(user);
-							}
+									}
-							return resolve(null);
+									return resolve(null);
-						});
+								}
+							);
+						} else {
+							this.pendingUser(userId, user => resolve(user));
+						}
 					} else {
-						this.pendingUser({
+						resolve(this.userIdMap[`Z${userId}`]);
-							userId,
-							callback: user => resolve(user)
-						});
 					}
-				} else {
-					resolve(this.userIdMap[`Z${userId}`]);
 				}
-			});
+			);
 		},
 		mapUserId(data) {
 			this.userIdMap[`Z${data.userId}`] = data.user;
@@ -222,10 +236,13 @@ export const useUserAuthStore = defineStore("userAuth", {
 			if (!this.pendingUserIdCallbacks[`Z${userId}`])
 				this.pendingUserIdCallbacks[`Z${userId}`] = [];
 		},
-		pendingUser(data) {
+		pendingUser(
-			this.pendingUserIdCallbacks[`Z${data.userId}`].push(data.callback);
+			userId: string,
+			callback: (basicUser: { name: string; username: string }) => void
+		) {
+			this.pendingUserIdCallbacks[`Z${userId}`].push(callback);
 		},
-		clearPendingCallbacks(userId) {
+		clearPendingCallbacks(userId: string) {
 			this.pendingUserIdCallbacks[`Z${userId}`] = [];
 		},
 		authData(data) {

frontend/vite.config.js

@@ -154,7 +154,7 @@ export default {
 		]
 	},
 	define: {
-		__VUE_PROD_DEVTOOLS__: false,
+		__VUE_PROD_DEVTOOLS__: config.get("mode") === "development",
 		MUSARE_VERSION: JSON.stringify(debug.version),
 		MUSARE_GIT_REMOTE: JSON.stringify(debug.git.remote),
 		MUSARE_GIT_REMOTE_URL: JSON.stringify(debug.git.remoteUrl),