fix saving hooks + env vars (#7176)

apps/app-frontend/src/pages/instance/components/settings-modal/hooks-settings.vue

@@ -11,7 +11,7 @@ import { computed, ref, watch } from 'vue'
 import { edit } from '@/helpers/instance'
 import { get } from '@/helpers/settings.ts'
 
-import type { AppSettings, Hooks } from '../../../../helpers/types'
+import type { AppSettings } from '../../../../helpers/types'
 import { injectInstanceSettings } from './instance-settings-context'
 
 const { handleError } = injectNotificationManager()
@@ -26,23 +26,31 @@ const overrideHooks = ref(
 		!!instance.value.hooks.wrapper ||
 		!!instance.value.hooks.post_exit,
 )
-const hooks = ref(instance.value.hooks ?? globalSettings.hooks)
-
-const editInstanceObject = computed(() => {
-	const editInstancePatch: {
-		hooks?: Hooks
-	} = {}
-
-	// When hooks are not overridden per-instance, we want to clear them
-	editInstancePatch.hooks = overrideHooks.value ? hooks.value : {}
-
-	return editInstancePatch
+const hooksRaw = instance.value.hooks ?? globalSettings.hooks
+const hooks = ref({
+	pre_launch: hooksRaw.pre_launch ?? '',
+	wrapper: hooksRaw.wrapper ?? '',
+	post_exit: hooksRaw.post_exit ?? '',
 })
 
+const editInstanceObject = computed(() => ({
+	hooks: overrideHooks.value
+		? {
+				pre_launch: hooks.value.pre_launch ?? '',
+				wrapper: hooks.value.wrapper ?? '',
+				post_exit: hooks.value.post_exit ?? '',
+			}
+		: {
+				pre_launch: '',
+				wrapper: '',
+				post_exit: '',
+			},
+}))
+
 watch(
 	[overrideHooks, hooks],
 	async () => {
-		await edit(instance.value.id, editInstanceObject.value)
+		await edit(instance.value.id, editInstanceObject.value).catch(handleError)
 	},
 	{ deep: true },
 )

apps/app-frontend/src/pages/instance/components/settings-modal/java-settings.vue

@@ -24,7 +24,7 @@ import JavaDetectionModal from '@/components/ui/JavaDetectionModal.vue'
 import useJavaTest from '@/composables/useJavaTest'
 import useMemorySlider from '@/composables/useMemorySlider'
 import { edit, get_optimal_jre_key } from '@/helpers/instance'
-import { get } from '@/helpers/settings.ts'
+import { get, parseEnvVars, serializeEnvVars } from '@/helpers/settings.ts'
 
 import type { AppSettings } from '../../../../helpers/types'
 import { injectInstanceSettings } from './instance-settings-context'
@@ -92,9 +92,7 @@ const javaArgs = ref(
 
 const overrideEnvVars = ref((instance.value.custom_env_vars?.length ?? 0) > 0)
 const envVars = ref(
-	(instance.value.custom_env_vars ?? globalSettings.custom_env_vars)
-		.map((x) => x.join('='))
-		.join(' '),
+	serializeEnvVars(instance.value.custom_env_vars ?? globalSettings.custom_env_vars),
 )
 
 const overrideMemorySettings = ref(!!instance.value.memory)
@@ -113,13 +111,7 @@ const editInstanceObject = computed(() => {
 		extra_launch_args: overrideJavaArgs.value
 			? javaArgs.value.trim().split(/\s+/).filter(Boolean)
 			: null,
-		custom_env_vars: overrideEnvVars.value
-			? envVars.value
-					.trim()
-					.split(/\s+/)
-					.filter(Boolean)
-					.map((x) => x.split('=').filter(Boolean))
-			: null,
+		custom_env_vars: overrideEnvVars.value ? parseEnvVars(envVars.value) : null,
 		memory: overrideMemorySettings.value ? memory.value : null,
 	}
 })
@@ -136,7 +128,7 @@ watch(
 		memory,
 	],
 	async () => {
-		await edit(instance.value.id, editInstanceObject.value)
+		await edit(instance.value.id, editInstanceObject.value).catch(handleError)
 	},
 	{ deep: true },
 )