Misc JS tidy (hestiacp#4877)

Author: AlecRust

docs/.vitepress/theme/components/InstallBuilder.vue

@@ -107,20 +107,20 @@ const toggleOption = (option) => {
 const installCommand = ref("bash hst-install.sh");
 watchEffect(() => {
 	let cmd = "bash hst-install.sh";
-	let quoteshellarg = function (str) {
+	const quoteshellarg = (str) => {
 		if (!str) return "''";
-		return "'" + str.replace(/'/g, "'\\''") + "'";
+		return `'${str.replace(/'/g, "'\\''")}'`;
 	};
 	for (const [key, { enabled, value }] of Object.entries(selectedOptions.value)) {
 		const opt = options.find((o) => o.flag === key);
 		if (opt.flag == "force" && enabled) {
-			cmd += ` --force`;
+			cmd += " --force";
 		} else if (!opt.type || opt.type === "checkbox") {
 			if (enabled !== (opt.default === "yes")) {
 				cmd += ` --${key} ${enabled ? "yes" : "no"}`;
 			}
 		} else if (enabled && value !== opt.default) {
-			let value_quoted = quoteshellarg(value);
+			const value_quoted = quoteshellarg(value);
 			cmd += ` --${key} ${value_quoted}`;
 		}
 	}

src/deb/web-terminal/server.js

@@ -15,7 +15,7 @@ const { config } = JSON.parse(
 );
 
 const wss = new WebSocketServer({
-	port: parseInt(config.WEB_TERMINAL_PORT, 10),
+	port: Number.parseInt(config.WEB_TERMINAL_PORT, 10),
 	verifyClient: async (info, cb) => {
 		if (!info.req.headers.cookie.includes(sessionName)) {
 			cb(false, 401, 'Unauthorized');
@@ -83,8 +83,8 @@ wss.on('connection', (ws, req) => {
 	// Spawn shell as logged in user
 	const pty = spawn(shell, [], {
 		name: 'xterm-color',
-		uid: parseInt(uid, 10),
-		gid: parseInt(gid, 10),
+		uid: Number.parseInt(uid, 10),
+		gid: Number.parseInt(gid, 10),
 		cwd: homedir,
 		env: {
 			SHELL: shell,

web/js/src/dnsRecordHint.js

@@ -8,7 +8,7 @@ export default function handleDnsRecordHint() {
 		return;
 	}
 
-	if (recordInput.value.trim() != '') {
+	if (recordInput.value.trim() !== '') {
 		updateHint(recordInput);
 	}
 

web/js/src/formSubmit.js

@@ -1,6 +1,6 @@
-import { enableUnlimitedInputs } from './unlimitedInput';
+import { delay, isDesktopSafari, showSpinner } from './helpers';
 import { updateAdvancedTextarea } from './toggleAdvanced';
-import { isDesktopSafari, showSpinner, delay } from './helpers';
+import { enableUnlimitedInputs } from './unlimitedInput';
 
 export default function handleFormSubmit() {
 	const mainForm = document.querySelector('#main-form');

web/js/src/ftpAccountHints.js

@@ -46,7 +46,7 @@ function updateFtpPathHint(pathInput, path) {
 function normalizePath(path) {
 	// Add leading slash
 	if (path[0] !== '/') {
-		path = '/' + path;
+		path = `/${path}`;
 	}
 
 	// Remove double slashes

web/js/src/listSorting.js

@@ -29,7 +29,7 @@ export default function handleListSorting() {
 
 	// Inner dropdown sorting behavior
 	sortingMenu.querySelectorAll('span').forEach((span) => {
-		span.addEventListener('click', function () {
+		span.addEventListener('click', () => {
 			sortingMenu.classList.add('u-hidden');
 
 			// Skip if the clicked sort is already active

web/js/src/listUnitSelect.js

@@ -25,7 +25,9 @@ export default function handleListUnitSelect() {
 
 	selectAllCheckbox.addEventListener('change', () => {
 		const isChecked = selectAllCheckbox.checked;
-		checkboxes.forEach((checkbox) => (checkbox.checked = isChecked));
+		checkboxes.forEach((checkbox) => {
+			checkbox.checked = isChecked;
+		});
 		units.forEach((unit) => updateUnitSelection(unit, isChecked));
 	});
 }

web/js/src/nameServerInput.js

@@ -33,6 +33,8 @@ function addNsInput(addNsButton) {
 function removeNsInput(removeNsElement) {
 	removeNsElement.parentElement.remove();
 	const currentNsInputs = document.querySelectorAll('input[name^=v_ns]');
-	currentNsInputs.forEach((input, index) => (input.name = `v_ns${index + 1}`));
+	currentNsInputs.forEach((input, index) => {
+		input.name = `v_ns${index + 1}`;
+	});
 	document.querySelector('.js-add-ns').classList.remove('u-hidden');
 }

web/js/src/navigation.js

@@ -23,9 +23,10 @@ export function moveFocusUp() {
 
 // Navigate to whatever item has been selected in the UI by other shortcuts
 export function enterFocused() {
-	const activeMainMenuItem = document.querySelector(state.menu_selector + '.focus a');
+	const activeMainMenuItem = document.querySelector(`${state.menu_selector}.focus a`);
 	if (activeMainMenuItem) {
-		return (location.href = activeMainMenuItem.getAttribute('href'));
+		location.href = activeMainMenuItem.getAttribute('href');
+		return;
 	}
 
 	const activeUnit = document.querySelector(
@@ -53,7 +54,7 @@ function moveFocusLeftRight(direction) {
 	const activeSelector = state.menu_active_selector;
 	const menuItems = Array.from(document.querySelectorAll(menuSelector));
 	const currentFocused = document.querySelector(`${menuSelector}.focus`);
-	const currentActive = document.querySelector(menuSelector + activeSelector);
+	const currentActive = document.querySelector(`${menuSelector}${activeSelector}`);
 	let index = menuItems.indexOf(currentFocused);
 
 	if (index === -1) {

web/js/src/passwordInput.js

@@ -1,5 +1,5 @@
 import { passwordStrength } from 'check-password-strength';
-import { randomPassword, debounce } from './helpers';
+import { debounce, randomPassword } from './helpers';
 
 // Adds listeners to password inputs (to monitor strength) and generate password buttons
 export default function handlePasswordInput() {
@@ -30,7 +30,8 @@ function recalculatePasswordStrength(input) {
 
 	if (meter) {
 		if (password === '') {
-			return (meter.value = 0);
+			meter.value = 0;
+			return;
 		}
 
 		meter.value = passwordStrength(password).id + 1;