From b3b1d68cc9478779131cb37403f4e323da3228f4 Mon Sep 17 00:00:00 2001
From: pa <maplenagisa@gmail.com>
Date: Fri, 27 Mar 2026 11:14:22 +0900
Subject: [PATCH] fix: new instance dialog user ID handling for legacy
 instances

---
 .../NewInstanceDialog/NewInstanceDialog.vue     |  6 +++---
 .../NewInstanceDialog/useNewInstanceBuilder.js  | 17 ++++++++---------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/components/dialogs/NewInstanceDialog/NewInstanceDialog.vue b/src/components/dialogs/NewInstanceDialog/NewInstanceDialog.vue
index 586199f3..5574679c 100644
--- a/src/components/dialogs/NewInstanceDialog/NewInstanceDialog.vue
+++ b/src/components/dialogs/NewInstanceDialog/NewInstanceDialog.vue
@@ -1,6 +1,6 @@
 <template>
     <Dialog v-model:open="newInstanceDialog.visible">
-        <DialogContent>
+        <DialogContent class="sm:max-w-2xl">
             <DialogHeader>
                 <DialogTitle>{{ t('dialog.new_instance.header') }}</DialogTitle>
                 <DialogDescription class="sr-only">{{ t('dialog.new_instance.header') }}</DialogDescription>
@@ -374,7 +374,7 @@
                             <FieldLabel>{{ t('dialog.new_instance.instance_creator') }}</FieldLabel>
                             <FieldContent>
                                 <VirtualCombobox
-                                    v-model="newInstanceDialog.userId"
+                                    v-model="newInstanceDialog.legacyUserId"
                                     :groups="creatorPickerGroups"
                                     :placeholder="t('dialog.new_instance.instance_creator_placeholder')"
                                     :search-placeholder="t('dialog.new_instance.instance_creator_placeholder')"
@@ -512,7 +512,7 @@
                     variant="outline"
                     :disabled="
                         (newInstanceDialog.accessType === 'friends' || newInstanceDialog.accessType === 'invite') &&
-                        newInstanceDialog.userId !== currentUser.id
+                        newInstanceDialog.legacyUserId !== currentUser.id
                     "
                     @click="showInviteDialog(newInstanceDialog.location)"
                     >{{ t('dialog.new_instance.invite') }}</Button
diff --git a/src/components/dialogs/NewInstanceDialog/useNewInstanceBuilder.js b/src/components/dialogs/NewInstanceDialog/useNewInstanceBuilder.js
index 22be3e1c..5526a425 100644
--- a/src/components/dialogs/NewInstanceDialog/useNewInstanceBuilder.js
+++ b/src/components/dialogs/NewInstanceDialog/useNewInstanceBuilder.js
@@ -34,6 +34,7 @@ export function useNewInstanceBuilder(locationTagRef) {
         instanceId: '',
         instanceName: '',
         userId: '',
+        legacyUserId: '',
         accessType: 'public',
         region: 'US West',
         groupRegion: '',
@@ -68,7 +69,7 @@ export function useNewInstanceBuilder(locationTagRef) {
 
         configRepository
             .getString('instanceDialogUserId', '')
-            .then((value) => (newInstanceDialog.value.userId = value));
+            .then((value) => (newInstanceDialog.value.legacyUserId = value));
 
         configRepository
             .getString('instanceDialogAccessType', 'public')
@@ -102,7 +103,7 @@ export function useNewInstanceBuilder(locationTagRef) {
             accessType,
             region,
             instanceName,
-            userId,
+            legacyUserId,
             groupId,
             groupAccessType,
             queueEnabled,
@@ -115,7 +116,7 @@ export function useNewInstanceBuilder(locationTagRef) {
         configRepository.setString('instanceDialogInstanceName', instanceName);
         configRepository.setString(
             'instanceDialogUserId',
-            userId === currentUser.value.id ? '' : userId
+            legacyUserId === currentUser.value.id ? '' : legacyUserId
         );
         configRepository.setString('instanceDialogGroupId', groupId);
         configRepository.setString(
@@ -188,9 +189,7 @@ export function useNewInstanceBuilder(locationTagRef) {
         D.instanceId = '';
         D.shortName = '';
         D.secureOrShortName = '';
-        if (!D.userId) {
-            D.userId = currentUser.value.id;
-        }
+        D.userId = currentUser.value.id;
         refreshGroupRoles(D);
         saveNewInstanceDialog();
     }
@@ -205,8 +204,8 @@ export function useNewInstanceBuilder(locationTagRef) {
         if (D.instanceName) {
             D.instanceName = D.instanceName.replace(/[^A-Za-z0-9]/g, '');
         }
-        if (!D.userId) {
-            D.userId = currentUser.value.id;
+        if (!D.legacyUserId) {
+            D.legacyUserId = currentUser.value.id;
         }
         if (D.accessType !== 'invite' && D.accessType !== 'friends') {
             D.strict = false;
@@ -218,7 +217,7 @@ export function useNewInstanceBuilder(locationTagRef) {
 
         D.instanceId = buildLegacyInstanceTag({
             instanceName,
-            userId: D.userId,
+            userId: D.legacyUserId,
             accessType: D.accessType,
             groupId: D.groupId,
             groupAccessType: D.groupAccessType,