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 })} /> - - - state.merge({ faceStreamingEnabled: e.target.checked })} - /> - - state.merge({ isLobby: e.target.checked })} - /> - - state.merge({ isFeatured: e.target.checked })} - /> - - 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({ 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),