implemented suggestions

Author: Saksham-Sirohi

app/eventyay/base/services/room.py

@@ -127,7 +127,9 @@ def key(r):
             return sys.maxsize, r.sorting_priority, r.name
 
     all_rooms = list(
-        event.rooms.filter(deleted=False).only("id", "name", "sorting_priority")
+        event.rooms.filter(deleted=False)
+        .only("id", "name", "sorting_priority")
+        .order_by("sorting_priority", "name", "id")
     )
     all_rooms.sort(key=key)
     to_update = []

app/eventyay/webapp/src/App.vue

@@ -43,7 +43,7 @@
 	.fatal-error(v-if="currentFatalError") {{ currentFatalError.message || currentFatalError.code }}
 </template>
 <script>
-import { mapState } from 'vuex'
+import { mapState, mapGetters } from 'vuex'
 import AppBar from 'components/AppBar'
 import RoomsSidebar from 'components/RoomsSidebar'
 import MediaSource from 'components/MediaSource'
@@ -67,6 +67,7 @@ export default {
 		...mapState(['fatalConnectionError', 'fatalError', 'connected', 'socketCloseCode', 'world', 'rooms', 'user', 'mediaSourcePlaceholderRect', 'userLocale', 'userTimezone', 'roomFatalErrors']),
 		...mapState('notifications', ['askingPermission']),
 		...mapState('chat', ['call']),
+		...mapGetters(['visibleRooms']),
 		currentFatalError() {
 			if (this.room && this.roomFatalErrors?.[this.room.id]) {
 				return this.roomFatalErrors[this.room.id]
@@ -77,10 +78,6 @@ export default {
 			}
 			return this.fatalError?.roomId ? (this.room && this.fatalError.roomId === this.room.id ? this.fatalError : null) : this.fatalError
 		},
-		visibleRooms() {
-			if (!this.rooms) return []
-			return this.rooms.filter(room => !room.hidden && !room.sidebar_hidden && room.setup_complete)
-		},
 		room() {
 			const routeName = this.$route?.name
 			if (!routeName) return
@@ -281,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.rooms.includes(this.backgroundRoom)) {
 				this.backgroundRoom = null
 			}
 		}

app/eventyay/webapp/src/components/RoomsSidebar.vue

@@ -114,7 +114,7 @@ export default {
 		...mapState('schedule', ['schedule']),
 		...mapState('chat', ['joinedChannels', 'call']),
 		...mapState('exhibition', ['staffedExhibitions']),
-		...mapGetters(['hasPermission']),
+		...mapGetters(['hasPermission', 'visibleRooms']),
 		...mapGetters('chat', ['hasUnreadMessages', 'notificationCount']),
 		...mapGetters('schedule', ['sessions', 'currentSessionPerRoom']),
 		// showAdminConfigLink no longer needed; link is always visible and backend will enforce access
@@ -124,10 +124,6 @@ export default {
 				transform: `translateX(${this.pointerMovementX}px)`
 			}
 		},
-		visibleRooms() {
-			if (!this.rooms) return []
-			return this.rooms.filter(room => !room.hidden && !room.sidebar_hidden && room.setup_complete)
-		},
 		homeRoom() {
 			return this.visibleRooms[0] || null
 		},

app/eventyay/webapp/src/store/index.js

@@ -55,6 +55,10 @@ export default new Vuex.Store({
 				lookup[room.id] = room
 				return lookup
 			}, {})
+		},
+		visibleRooms(state) {
+			if (!state.rooms) return []
+			return state.rooms.filter(room => !room.hidden && !room.sidebar_hidden && room.setup_complete)
 		}
 	},
 	mutations: {

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

@@ -101,22 +101,8 @@ export default {
 			immediate: true,
 			handler(config) {
 				if (!config) return
-				if (config.hidden === undefined) config.hidden = false
-				if (config.sidebar_hidden === undefined) {
-					config.sidebar_hidden = !config.setup_complete
-				}
-			}
-		},
-		'config.hidden'(value) {
-			if (value) {
-				this.config.sidebar_hidden = true
-			} else if (!this.config.setup_complete) {
-				this.config.sidebar_hidden = true
-			}
-		},
-		'config.setup_complete'(value) {
-			if (!value) {
-				this.config.sidebar_hidden = true
+				this.applyVisibilityDefaults(config)
+				this.syncSidebarHidden()
 			}
 		},
 		inferredType(newType) {
@@ -140,6 +126,9 @@ 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
 		},
@@ -178,6 +167,18 @@ export default {
 		return { config }
 	},
 	methods: {
+		applyVisibilityDefaults(config) {
+			if (config.hidden === undefined) config.hidden = false
+			if (config.sidebar_hidden === undefined) {
+				config.sidebar_hidden = !config.setup_complete
+			}
+		},
+		syncSidebarHidden() {
+			if (!this.config) return
+			if (this.config.hidden || !this.config.setup_complete) {
+				this.config.sidebar_hidden = true
+			}
+		},
 		selectType(typeId) {
 			const type = this.roomTypes.find(t => t.id === typeId)
 			if (!type) return