refactor(client-core)(instanceserver service): remove action receptor…

… usage (#8307)

packages/client-core/src/admin/services/InstanceserverService.ts

@@ -25,14 +25,11 @@ Ethereal Engine. All Rights Reserved.
 
 import { InstanceServerPatch } from '@etherealengine/common/src/interfaces/Instance'
 import multiLogger from '@etherealengine/common/src/logger'
-import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils'
-import { defineAction, defineState, dispatchAction, getMutableState } from '@etherealengine/hyperflux'
-
-import { API } from '../../API'
+import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine'
+import { defineState, getMutableState } from '@etherealengine/hyperflux'
 
 const logger = multiLogger.child({ component: 'client-core:InstanceserverService' })
 
-//State
 export const AdminInstanceServerState = defineState({
   name: 'AdminInstanceServerState',
   initial: () => ({
@@ -42,50 +39,18 @@ export const AdminInstanceServerState = defineState({
   })
 })
 
-const patchInstanceserverReceptor = (action: typeof AdminInstanceserverActions.patchInstanceserver.matches._TYPE) => {
-  const state = getMutableState(AdminInstanceServerState)
-  return state.merge({
-    patch: undefined,
-    fetched: false
-  })
-}
-
-const patchedInstanceserverReceptor = (
-  action: typeof AdminInstanceserverActions.patchedInstanceserver.matches._TYPE
-) => {
-  const state = getMutableState(AdminInstanceServerState)
-  return state.merge({
-    patch: action.patch,
-    fetched: true,
-    lastFetched: Date.now()
-  })
-}
-
-export const InstanceServerSettingReceptors = {
-  patchInstanceserverReceptor,
-  patchedInstanceserverReceptor
-}
-
-//Service
 export const InstanceserverService = {
   patchInstanceserver: async (locationId: string, count: number) => {
     try {
-      dispatchAction(AdminInstanceserverActions.patchInstanceserver({}))
-      const patch = await API.instance.client.service('instanceserver-provision').patch({ locationId, count })
-      dispatchAction(AdminInstanceserverActions.patchedInstanceserver({ patch }))
+      const patch = await Engine.instance.api.service('instanceserver-provision').patch({ locationId, count })
+
+      getMutableState(AdminInstanceServerState).merge({
+        patch,
+        fetched: true,
+        lastFetched: Date.now()
+      })
     } catch (error) {
       logger.error(error)
     }
   }
 }
-
-//Action
-export class AdminInstanceserverActions {
-  static patchInstanceserver = defineAction({
-    type: 'ee.client.AdminInstanceserver.INSTANCESERVER_PATCH' as const
-  })
-  static patchedInstanceserver = defineAction({
-    type: 'ee.client.AdminInstanceserver.INSTANCESERVER_PATCHED' as const,
-    patch: matches.object as Validator<unknown, InstanceServerPatch>
-  })
-}

packages/client-core/src/systems/AdminSystem.tsx

@@ -33,7 +33,6 @@ import { AdminBotCommandActions, AdminBotsCommandReceptors } from '../admin/serv
 import { AdminBotsActions, AdminBotServiceReceptors } from '../admin/services/BotsService'
 import { AdminBuildStatusActions, AdminBuildStatusReceptors } from '../admin/services/BuildStatusService'
 import { AdminGroupActions, AdminGroupServiceReceptors } from '../admin/services/GroupService'
-import { AdminInstanceserverActions, InstanceServerSettingReceptors } from '../admin/services/InstanceserverService'
 import {
   AdminInstanceActions,
   AdminInstanceReceptors,
@@ -95,8 +94,6 @@ const fetchedHelmQueue = defineActionQueue(AdminHelmSettingActions.helmSettingRe
 const patchedHelmQueue = defineActionQueue(AdminHelmSettingActions.helmSettingPatched.matches)
 const fetchedHelmMainVersionsQueue = defineActionQueue(AdminHelmSettingActions.helmMainVersionsRetrieved.matches)
 const fetchedHelmBuilderVersionsQueue = defineActionQueue(AdminHelmSettingActions.helmBuilderVersionsRetrieved.matches)
-const patchInstanceserverQueue = defineActionQueue(AdminInstanceserverActions.patchInstanceserver.matches)
-const patchedInstanceserverQueue = defineActionQueue(AdminInstanceserverActions.patchedInstanceserver.matches)
 const projectSettingFetchedQueue = defineActionQueue(AdminProjectSettingsActions.projectSettingFetched.matches)
 const fetchedSeverInfoQueue = defineActionQueue(AdminServerSettingActions.fetchedSeverInfo.matches)
 const serverSettingPatchedQueue = defineActionQueue(AdminServerSettingActions.serverSettingPatched.matches)
@@ -193,9 +190,6 @@ const execute = () => {
   for (const action of fetchedHelmMainVersionsQueue()) HelmSettingReceptors.helmMainVersionsRetrievedReceptor(action)
   for (const action of fetchedHelmBuilderVersionsQueue())
     HelmSettingReceptors.helmBuilderVersionsRetrievedReceptor(action)
-  for (const action of patchInstanceserverQueue()) InstanceServerSettingReceptors.patchInstanceserverReceptor(action)
-  for (const action of patchedInstanceserverQueue())
-    InstanceServerSettingReceptors.patchedInstanceserverReceptor(action)
   for (const action of projectSettingFetchedQueue()) ProjectSettingReceptors.projectSettingFetchedReceptor(action)
   for (const action of fetchedSeverInfoQueue()) ServerSettingReceptors.fetchedSeverInfoReceptor(action)
   for (const action of serverSettingPatchedQueue()) ServerSettingReceptors.serverSettingPatchedReceptor(action)