added suggestions by copilot

Author: Saksham-Sirohi

app/eventyay/base/migrations/0002_room_visibility_fields.py

@@ -4,11 +4,21 @@
 def set_initial_visibility(apps, schema_editor):
     Room = apps.get_model("base", "Room")
     batch = []
-    for room in Room.objects.all().iterator():
+    batch_size = 1000
+    for room in Room.objects.all().iterator(chunk_size=batch_size):
         has_modules = bool(room.module_config)
         room.setup_complete = has_modules
         room.sidebar_hidden = not has_modules
         batch.append(room)
+        if len(batch) >= batch_size:
+            Room.objects.bulk_update(
+                batch,
+                fields=[
+                    "setup_complete",
+                    "sidebar_hidden",
+                ],
+            )
+            batch = []
     if batch:
         Room.objects.bulk_update(
             batch,

app/eventyay/base/models/room.py

@@ -206,6 +206,8 @@ class Room(VersionedModel, OrderedModel, PretalxModel):
     force_join = models.BooleanField(default=False)
     setup_complete = models.BooleanField(default=False)
     hidden = models.BooleanField(default=False)
+    # Default is True (hidden) for safety - rooms should be hidden until configured.
+    # The _create_room function and migration explicitly set this based on module_config.
     sidebar_hidden = models.BooleanField(default=True)
 
     objects = RoomQuerySet.as_manager()

app/eventyay/base/services/room.py

@@ -122,9 +122,9 @@ def delete_room(event, room, by_user):
 def reorder_rooms(event, id_list, by_user):
     def key(r):
         try:
-            return id_list.index(str(r.id)), r.sorting_priority, r.name
+            return id_list.index(str(r.id)), r.sorting_priority, r.name, r.id
         except Exception:
-            return sys.maxsize, r.sorting_priority, r.name
+            return sys.maxsize, r.sorting_priority, r.name, r.id
 
     all_rooms = list(
         event.rooms.filter(deleted=False)

app/eventyay/webapp/src/App.vue

@@ -278,7 +278,7 @@ export default {
 			if (this.room && !this.visibleRooms.includes(this.room)) {
 				this.$router.push('/').catch(() => {})
 			}
-			if (this.backgroundRoom && !this.rooms.includes(this.backgroundRoom)) {
+			if (this.backgroundRoom && !this.visibleRooms.includes(this.backgroundRoom)) {
 				this.backgroundRoom = null
 			}
 		}

app/eventyay/webapp/src/views/admin/rooms/EditForm.vue

@@ -27,14 +27,16 @@
 				.visibility-controls
 					h3 Visibility
 					bunt-checkbox(name="hidden", v-model="config.hidden", class="visibility-option") Hide this room from schedule-editor
-					bunt-checkbox(
-						name="sidebar_hidden",
-						v-model="config.sidebar_hidden",
-						:disabled="sidebarHiddenDisabled",
-						class="visibility-option"
-					) Hide from Sidebar
-					small(v-if="!config.setup_complete") Hidden from the sidebar until setup is complete.
-					small(v-else-if="config.hidden") Hidden rooms are always removed from the sidebar.
+					template(v-if="config.setup_complete")
+						bunt-checkbox(
+							name="sidebar_hidden",
+							v-model="config.sidebar_hidden",
+							:disabled="config.hidden",
+							class="visibility-option"
+						) Hide from Sidebar
+						small(v-if="config.hidden") Hidden rooms are always removed from the sidebar.
+					template(v-else)
+						small Hidden from the sidebar until setup is complete.
 			template(v-if="inferredType && typeComponents[inferredType.id]")
 				.video-settings(v-if="showVideoSettingsTitle")
 					h3 Video Settings
@@ -126,12 +128,6 @@ export default {
 			const videoTypes = ['stage', 'channel-bbb', 'channel-janus', 'channel-zoom', 'channel-roulette']
 			return videoTypes.includes(this.inferredType?.id)
 		},
-		visibilityDependencies() {
-			return [this.config?.hidden, this.config?.setup_complete]
-		},
-		sidebarHiddenDisabled() {
-			return !this.config.setup_complete || this.config.hidden
-		},
 		localizedName: {
 			get() {
 				return this.$localize(this.config.name)
@@ -168,14 +164,15 @@ export default {
 	},
 	methods: {
 		applyVisibilityDefaults(config) {
-			if (config.hidden === undefined) config.hidden = false
-			if (config.sidebar_hidden === undefined) {
+			if (config.hidden == null) config.hidden = false
+			if (config.sidebar_hidden == null) {
 				config.sidebar_hidden = !config.setup_complete
 			}
 		},
 		syncSidebarHidden() {
 			if (!this.config) return
-			if (this.config.hidden || !this.config.setup_complete) {
+			// Enforce business rule: sidebar_hidden must be true if hidden is true or setup is incomplete
+			if ((this.config.hidden || !this.config.setup_complete) && !this.config.sidebar_hidden) {
 				this.config.sidebar_hidden = true
 			}
 		},

app/eventyay/webapp/src/views/admin/rooms/RoomListItem.vue

@@ -24,7 +24,10 @@ export default {
 			return this.isConfigured ? 'Configure' : 'Complete Setup'
 		},
 		visibilityIconClass() {
-			return this.room.hidden || this.room.sidebar_hidden || !this.room.setup_complete ? 'fa-eye-slash' : 'fa-eye'
+			if (this.room.hidden) return 'fa-eye-slash hidden-room'
+			if (!this.room.setup_complete) return 'fa-eye-slash setup-incomplete'
+			if (this.room.sidebar_hidden) return 'fa-eye-slash sidebar-hidden'
+			return 'fa-eye visible-room'
 		}
 	},
 	methods: {

app/eventyay/webapp/src/views/admin/rooms/index.vue

@@ -27,7 +27,7 @@
 			)
 				RoomListItem(v-for="(room, index) of rooms" :index="index", :key="room.id", :room="room", :disabled="rooms.length < 2")
 			.table-body(v-else, v-scrollbar.y="")
-				RoomListItem(v-for="room of filteredRooms", :key="room.id", :room="room", :disabled="true")
+				RoomListItem(v-for="room of filteredRooms", :key="room.id", :room="room", :disabled="filteredRooms.length < 2")
 		bunt-progress-circular(v-else, size="huge", :page="true")
 </template>
 <script>
@@ -89,13 +89,15 @@ export default {
 		},
 		async onListSort() {
 			const idList = this.rooms.map(room => String(room.id))
+			const previousOrder = [...this.rooms]
 			try {
 				this.rooms = await api.call('room.config.reorder', idList)
 			} catch (e) {
 				console.error(e)
-				this.fetchRooms()
+				// Rollback to previous order on error
+				this.rooms = previousOrder
+				await this.fetchRooms()
 			}
-			// TODO error handling
 		}
 	}
 }