LocationID addition (#9217)

      * Aidan's fix

* LocationID #7094
- Addition to LocationID because of previous miss

* Remove pending tag if there's no renderer instance (#9215)

* Remove pending tag if there's no renderer instance

* remove log.

---------

Co-authored-by: lonedevr <[email protected]>

Author: AmadeusSlabu

packages/client-core/src/social/services/LocationService.ts

@@ -36,7 +36,7 @@ import { API } from '../../API'
 import { NotificationService } from '../../common/services/NotificationService'
 
 export const LocationSeed: LocationType = {
-  id: '',
+  id: '' as LocationID,
   name: '',
   slugifiedName: '',
   maxUsersPerInstance: 10,

packages/engine/src/schemas/social/location.schema.ts

@@ -46,7 +46,7 @@ export type LocationID = OpaqueType<'LocationID'> & string
 // Main data model schema
 export const locationSchema = Type.Object(
   {
-    id: Type.String({
+    id: TypedString<LocationID>({
       format: 'uuid'
     }),
     name: Type.String(),

packages/server-core/src/social/location/location.hooks.ts

@@ -237,7 +237,7 @@ const updateLocation = async (context: HookContext<LocationService>) => {
   await context.params
     .transaction!.trx!.from<LocationDatabaseType>(locationPath)
     .update(context.updateData)
-    .where({ id: context.id?.toString() })
+    .where({ id: context.id?.toString() as LocationID })
 }
 
 const updateLocationSetting = async (context: HookContext<LocationService>) => {

packages/server-core/src/social/location/location.resolvers.ts

@@ -77,7 +77,7 @@ export const locationExternalResolver = resolve<LocationType, HookContext>({
 
 export const locationDataResolver = resolve<LocationType, HookContext>({
   id: async () => {
-    return v4()
+    return v4() as LocationID
   },
   locationSetting: async (value, location) => {
     return {

packages/server-core/src/social/location/location.seed.ts

@@ -25,15 +25,19 @@ Ethereal Engine. All Rights Reserved.
 
 import { Knex } from 'knex'
 
-import { LocationDatabaseType, locationPath } from '@etherealengine/engine/src/schemas/social/location.schema'
+import {
+  LocationDatabaseType,
+  LocationID,
+  locationPath
+} from '@etherealengine/engine/src/schemas/social/location.schema'
 import appConfig from '@etherealengine/server-core/src/appconfig'
 
 import { SceneID } from '@etherealengine/engine/src/schemas/projects/scene.schema'
 import { getDateTimeSql } from '../../util/datetime-sql'
 
 export const locationSeedData = [
   {
-    id: '98cbcc30-fd2d-11ea-bc7c-cd4cac9a8d60',
+    id: '98cbcc30-fd2d-11ea-bc7c-cd4cac9a8d60' as LocationID,
     name: 'Default',
     slugifiedName: 'default',
     maxUsersPerInstance: 30,
@@ -42,7 +46,7 @@ export const locationSeedData = [
     isLobby: false
   },
   {
-    id: '98cbcc30-fd2d-11ea-bc7c-cd4cac9a8d62',
+    id: '98cbcc30-fd2d-11ea-bc7c-cd4cac9a8d62' as LocationID,
     name: 'Sky Station',
     slugifiedName: 'sky-station',
     maxUsersPerInstance: 30,
@@ -51,7 +55,7 @@ export const locationSeedData = [
     isLobby: false
   },
   {
-    id: '98cbcc30-fd2d-11ea-bc7c-cd4cac9a8d63',
+    id: '98cbcc30-fd2d-11ea-bc7c-cd4cac9a8d63' as LocationID,
     name: 'Apartment',
     slugifiedName: 'apartment',
     maxUsersPerInstance: 30,