refactor(client-core)(scope-type): remove action receptor usage (#8328)

Co-authored-by: HexaField <joshfield999@gmail.com>

Author: aditya-mitra

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

@@ -26,13 +26,11 @@ Ethereal Engine. All Rights Reserved.
 import { Paginated } from '@feathersjs/feathers'
 
 import { AdminScopeType } from '@etherealengine/common/src/interfaces/AdminScopeType'
-import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils'
-import { defineAction, defineState, dispatchAction, getMutableState } from '@etherealengine/hyperflux'
+import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine'
+import { defineState, getMutableState } from '@etherealengine/hyperflux'
 
-import { API } from '../../API'
 import { NotificationService } from '../../common/services/NotificationService'
 
-//State
 export const SCOPE_PAGE_LIMIT = 100
 
 export const AdminScopeTypeState = defineState({
@@ -50,48 +48,30 @@ export const AdminScopeTypeState = defineState({
   })
 })
 
-const getScopeTypesReceptor = (action: typeof AdminScopeTypeActions.getScopeTypes.matches._TYPE) => {
-  const state = getMutableState(AdminScopeTypeState)
-  return state.merge({
-    scopeTypes: action.adminScopeTypeResult.data,
-    skip: action.adminScopeTypeResult.skip,
-    limit: action.adminScopeTypeResult.limit,
-    total: action.adminScopeTypeResult.total,
-    retrieving: false,
-    fetched: true,
-    updateNeeded: false,
-    lastFetched: Date.now()
-  })
-}
-
-export const AdminScopeTypeReceptor = {
-  getScopeTypesReceptor
-}
-
-//Service
 export const AdminScopeTypeService = {
-  getScopeTypeService: async (incDec?: 'increment' | 'decrement') => {
+  getScopeTypeService: async (page = 0) => {
     const scopeState = getMutableState(AdminScopeTypeState)
-    const skip = scopeState.skip.value
-    const limit = scopeState.limit.value
+    const $limit = scopeState.limit.value
+    const $skip = page * $limit
     try {
-      const result = (await API.instance.client.service('scope-type').find({
+      const result = (await Engine.instance.api.service('scope-type').find({
         query: {
-          $skip: incDec === 'increment' ? skip + limit : incDec === 'decrement' ? skip - limit : skip,
-          $limit: limit
+          $skip,
+          $limit
         }
       })) as Paginated<AdminScopeType>
-      dispatchAction(AdminScopeTypeActions.getScopeTypes({ adminScopeTypeResult: result }))
+      getMutableState(AdminScopeTypeState).merge({
+        scopeTypes: result.data,
+        skip: result.skip,
+        limit: result.limit,
+        total: result.total,
+        retrieving: false,
+        fetched: true,
+        updateNeeded: false,
+        lastFetched: Date.now()
+      })
     } catch (err) {
       NotificationService.dispatchNotify(err.message, { variant: 'error' })
     }
   }
 }
-
-//Action
-export class AdminScopeTypeActions {
-  static getScopeTypes = defineAction({
-    type: 'ee.client.AdminScopeType.SCOPE_TYPES_RETRIEVED' as const,
-    adminScopeTypeResult: matches.object as Validator<unknown, Paginated<AdminScopeType>>
-  })
-}

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

@@ -36,7 +36,6 @@ import { AdminLocationActions, AdminLocationReceptors } from '../admin/services/
 import { AdminPartyActions, AdminPartyReceptors } from '../admin/services/PartyService'
 import { AdminResourceActions, AdminResourceReceptors } from '../admin/services/ResourceService'
 import { AdminSceneActions, AdminSceneReceptors } from '../admin/services/SceneService'
-import { AdminScopeTypeActions, AdminScopeTypeReceptor } from '../admin/services/ScopeTypeService'
 import { AdminServerLogsActions, AdminServerLogsReceptors } from '../admin/services/ServerLogsService'
 // import { AuthSettingsActions, AuthSettingsReceptors } from '../admin/services/Setting/AuthSettingService'
 import { AdminAwsSettingActions, AwsSettingReceptors } from '../admin/services/Setting/AwsSettingService'
@@ -76,8 +75,6 @@ const fetchedHelmBuilderVersionsQueue = defineActionQueue(AdminHelmSettingAction
 const projectSettingFetchedQueue = defineActionQueue(AdminProjectSettingsActions.projectSettingFetched.matches)
 const fetchedSeverInfoQueue = defineActionQueue(AdminServerSettingActions.fetchedSeverInfo.matches)
 const serverSettingPatchedQueue = defineActionQueue(AdminServerSettingActions.serverSettingPatched.matches)
-const getScopeTypesQueue = defineActionQueue(AdminScopeTypeActions.getScopeTypes.matches)
-
 const resourceFiltersFetchedQueue = defineActionQueue(AdminResourceActions.resourceFiltersFetched.matches)
 const resourcesFetchedQueue = defineActionQueue(AdminResourceActions.resourcesFetched.matches)
 const setSelectedMimeTypesQueue = defineActionQueue(AdminResourceActions.setSelectedMimeTypes.matches)
@@ -141,7 +138,6 @@ const execute = () => {
   for (const action of projectSettingFetchedQueue()) ProjectSettingReceptors.projectSettingFetchedReceptor(action)
   for (const action of fetchedSeverInfoQueue()) ServerSettingReceptors.fetchedSeverInfoReceptor(action)
   for (const action of serverSettingPatchedQueue()) ServerSettingReceptors.serverSettingPatchedReceptor(action)
-  for (const action of getScopeTypesQueue()) AdminScopeTypeReceptor.getScopeTypesReceptor(action)
   for (const action of resourceFiltersFetchedQueue()) AdminResourceReceptors.resourceFiltersFetchedReceptor(action)
   for (const action of resourcesFetchedQueue()) AdminResourceReceptors.resourcesFetchedReceptor(action)
   for (const action of setSelectedMimeTypesQueue()) AdminResourceReceptors.setSelectedMimeTypesReceptor(action)