From 0c9d129a26b7e4c771ab9e990ef1694494ddf57a Mon Sep 17 00:00:00 2001
From: HexaField <joshfield999@gmail.com>
Date: Fri, 29 Dec 2023 14:07:17 +1100
Subject: [PATCH] cleanup available location settings

---
 .../components/Location/LocationDrawer.tsx    | 57 +++++--------------
 .../schemas/social/location-setting.schema.ts |  2 +
 .../src/schemas/social/location.schema.ts     |  2 +
 3 files changed, 19 insertions(+), 42 deletions(-)

diff --git a/packages/client-core/src/admin/components/Location/LocationDrawer.tsx b/packages/client-core/src/admin/components/Location/LocationDrawer.tsx
index 5210e9c921f..d5e8a3c4ca5 100644
--- a/packages/client-core/src/admin/components/Location/LocationDrawer.tsx
+++ b/packages/client-core/src/admin/components/Location/LocationDrawer.tsx
@@ -66,15 +66,15 @@ interface Props {
 
 const defaultState = {
   name: '',
-  maxUsers: 10,
+  maxUsers: 20,
   scene: '',
-  type: 'private',
-  videoEnabled: false,
-  audioEnabled: false,
-  screenSharingEnabled: false,
-  faceStreamingEnabled: false,
-  isLobby: false,
-  isFeatured: false,
+  type: 'public',
+  videoEnabled: true,
+  audioEnabled: true,
+  screenSharingEnabled: true,
+  // faceStreamingEnabled: false,
+  // isLobby: false,
+  // isFeatured: false,
   formErrors: {
     name: '',
     maxUsers: '',
@@ -129,10 +129,10 @@ const LocationDrawer = ({ open, mode, selectedLocation, onClose }: Props) => {
         type: selectedLocation.locationSetting?.locationType,
         videoEnabled: selectedLocation.locationSetting?.videoEnabled,
         audioEnabled: selectedLocation.locationSetting?.audioEnabled,
-        screenSharingEnabled: selectedLocation.locationSetting?.screenSharingEnabled,
-        faceStreamingEnabled: selectedLocation.locationSetting?.faceStreamingEnabled,
-        isLobby: selectedLocation.isLobby,
-        isFeatured: selectedLocation.isFeatured
+        screenSharingEnabled: selectedLocation.locationSetting?.screenSharingEnabled
+        // faceStreamingEnabled: selectedLocation.locationSetting?.faceStreamingEnabled,
+        // isLobby: selectedLocation.isLobby,
+        // isFeatured: selectedLocation.isFeatured
       })
     }
   }
@@ -184,13 +184,13 @@ const LocationDrawer = ({ open, mode, selectedLocation, onClose }: Props) => {
         locationType: state.type.value as 'private' | 'public' | 'showroom',
         audioEnabled: state.audioEnabled.value,
         screenSharingEnabled: state.screenSharingEnabled.value,
-        faceStreamingEnabled: state.faceStreamingEnabled.value,
+        faceStreamingEnabled: false, //state.faceStreamingEnabled.value,
         videoEnabled: state.videoEnabled.value,
         createdAt: '',
         updatedAt: ''
       },
-      isLobby: state.isLobby.value,
-      isFeatured: state.isFeatured.value
+      isLobby: false, //state.isLobby.value,
+      isFeatured: false //state.isFeatured.value
     }
 
     state.formErrors.merge({
@@ -289,33 +289,6 @@ const LocationDrawer = ({ open, mode, selectedLocation, onClose }: Props) => {
               onChange={(e) => state.merge({ screenSharingEnabled: e.target.checked })}
             />
           </Grid>
-          <Grid item xs={6} style={{ display: 'flex' }}>
-            <div style={{ marginLeft: 'auto' }}>
-              <InputSwitch
-                name="faceStreamingEnabled"
-                label={t('admin:components.location.lbl-fe')}
-                checked={state?.value?.faceStreamingEnabled}
-                disabled={viewMode}
-                onChange={(e) => state.merge({ faceStreamingEnabled: e.target.checked })}
-              />
-
-              <InputSwitch
-                name="isLobby"
-                label={t('admin:components.location.lbl-lobby')}
-                checked={state?.value?.isLobby}
-                disabled={viewMode}
-                onChange={(e) => state.merge({ isLobby: e.target.checked })}
-              />
-
-              <InputSwitch
-                name="isFeatured"
-                label={t('admin:components.location.lbl-featured')}
-                checked={state?.value?.isFeatured}
-                disabled={viewMode}
-                onChange={(e) => state.merge({ isFeatured: e.target.checked })}
-              />
-            </div>
-          </Grid>
         </Grid>
         <DialogActions>
           <Button className={styles.outlinedButton} onClick={handleCancel}>
diff --git a/packages/engine/src/schemas/social/location-setting.schema.ts b/packages/engine/src/schemas/social/location-setting.schema.ts
index 50810ecd079..5d2098201af 100644
--- a/packages/engine/src/schemas/social/location-setting.schema.ts
+++ b/packages/engine/src/schemas/social/location-setting.schema.ts
@@ -43,9 +43,11 @@ export const locationSettingSchema = Type.Object(
     locationId: TypedString<LocationID>({
       format: 'uuid'
     }),
+    /** @todo review */
     locationType: StringEnum(['private', 'public', 'showroom']),
     audioEnabled: Type.Boolean(),
     screenSharingEnabled: Type.Boolean(),
+    /** @todo review */
     faceStreamingEnabled: Type.Boolean(),
     videoEnabled: Type.Boolean(),
     createdAt: Type.String({ format: 'date-time' }),
diff --git a/packages/engine/src/schemas/social/location.schema.ts b/packages/engine/src/schemas/social/location.schema.ts
index b56acf9f12c..ea832effb60 100644
--- a/packages/engine/src/schemas/social/location.schema.ts
+++ b/packages/engine/src/schemas/social/location.schema.ts
@@ -54,7 +54,9 @@ export const locationSchema = Type.Object(
       format: 'uuid'
     }),
     slugifiedName: Type.String(),
+    /** @todo review */
     isLobby: Type.Boolean(),
+    /** @todo review */
     isFeatured: Type.Boolean(),
     maxUsersPerInstance: Type.Number(),
     locationSetting: Type.Ref(locationSettingSchema),