Fix admin delete & reset buttons

server/src/redis.ts

@@ -24,7 +24,7 @@ const expireAt = promisify(cache.expireat).bind(cache)
 const del = promisify(cache.del).bind(cache)
 
 const addToSet = promisify(cache.sadd).bind(cache)
-const removeFromSet = promisify(cache.srem).bind(cache)
+const removeFromSet: (key: string, member: string) => void = promisify(cache.srem).bind(cache)
 const getSet = promisify(cache.smembers).bind(cache)
 
 const redisKeys = promisify(cache.keys).bind(cache)
@@ -391,7 +391,7 @@ const Redis: RedisInternal = {
   },
 
   async deleteRoomData (roomId: string): Promise<void> {
-    await removeFromSet(roomId)
+    await removeFromSet(roomIdsKey, roomId)
     return await del(roomDataKey(roomId))
   },
 

src/admin/components/RoomList.tsx

@@ -12,8 +12,8 @@ export default function (props: {roomIds: string[]}) {
   const roomIds = _.sortBy(props.roomIds || [])
 
   const clickedResetData = async () => {
-    if (!confirm("Are you sure you'd like to reset room data?")) return
-    await resetRoomData()
+    if (!confirm("Are you sure you'd like to reset room data? This may cause irrevocable data loss. (will also force a page refresh sorry)")) return
+    await resetRoomData(true)
     await getAllRooms()
   }
 

src/admin/components/RoomOptionsView.tsx

@@ -12,10 +12,11 @@ export default function (props: {roomId: string, updateRoom: () => void, createR
   }
 
   const clickedDelete = async () => {
-    if (!confirm('Are you SURE you want to delete this? This will delete it from the server memory, and you will only be able to restore it if it is saved on disk.')) return
+    if (!confirm('Are you SURE you want to delete this? This will delete it from the server memory, and you will only be able to restore it if it is saved on disk. (Will also cause a page refresh)')) return
 
     await deleteRoom(props.roomId)
-    // TODO: Remove roomId from local list
+    // TODO: Remove roomId from local list in a less silly way
+    window.location.reload()
   }
 
   const clickedSave = () => {

src/components/ServerSettingsView.tsx

@@ -58,8 +58,8 @@ export default function ServerSettingsView (props: { serverSettings: ServerSetti
   }
 
   const clickedResetRoomData = async () => {
-    if (!confirm("Are you sure you'd like to reset room data?")) return
-    await resetRoomData()
+    if (!confirm("Are you sure you'd like to reset room data? This may cause irrevocable data loss.")) return
+    await resetRoomData(false)
   }
 
   const clickedResetBadges = async () => {

src/networking.ts

@@ -305,10 +305,15 @@ export async function fetchProfile (userId: string) {
   }
 }
 
-export async function resetRoomData () {
+export async function resetRoomData (isFromAdminPanel: boolean) {
   const response = await callAzureFunction('resetRoomData')
   if (response.roomData) {
-    myDispatch(UpdatedRoomDataAction(convertServerRoomData(response.roomData)))
+    if (isFromAdminPanel) {
+      // Admin panel doesn't have the same state tracking and you can't dispatch
+      window.location.reload()
+    } else {
+      myDispatch(UpdatedRoomDataAction(convertServerRoomData(response.roomData)))
+    }
   }
 }