Skip to content
This repository has been archived by the owner on Aug 21, 2024. It is now read-only.

refactor(client-core)(party service): remove action receptor usage #8319

Merged
merged 2 commits into from
Jul 20, 2023
Merged

refactor(client-core)(party service): remove action receptor usage #8319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41254ff
refactor(client-core)(party service): remove action receptor usage
aditya-mitra Jul 20, 2023
8f7deb1
Merge branch 'dev' into refactor/party-service-state
HexaField Jul 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 21 additions & 80 deletions packages/client-core/src/admin/services/PartyService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,12 @@ Ethereal Engine. All Rights Reserved.
import { Paginated } from '@feathersjs/feathers'

import { Party, PatchParty } from '@etherealengine/common/src/interfaces/Party'
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'
import { AuthState } from '../../user/services/AuthService'
import { userIsAdmin } from '../../user/userHasAccess'

//State
export const PARTY_PAGE_LIMIT = 100

export const AdminPartyState = defineState({
Expand All @@ -50,61 +48,20 @@ export const AdminPartyState = defineState({
})
})

const partyRetrievedReceptor = (action: typeof AdminPartyActions.partyRetrieved.matches._TYPE) => {
const state = getMutableState(AdminPartyState)
return state.merge({
parties: action.party.data,
updateNeeded: false,
skip: action.party.skip,
limit: action.party.limit,
total: action.party.total,
fetched: true,
lastFetched: Date.now()
})
}

const partyAdminCreatedReceptor = (action: typeof AdminPartyActions.partyAdminCreated.matches._TYPE) => {
const state = getMutableState(AdminPartyState)
return state.merge({ updateNeeded: true })
}

const partyRemovedReceptor = (action: typeof AdminPartyActions.partyRemoved.matches._TYPE) => {
const state = getMutableState(AdminPartyState)
return state.merge({ updateNeeded: true })
}

const partyPatchedReceptor = (action: typeof AdminPartyActions.partyPatched.matches._TYPE) => {
const state = getMutableState(AdminPartyState)
return state.merge({ updateNeeded: true })
}

export const AdminPartyReceptors = {
partyRetrievedReceptor,
partyAdminCreatedReceptor,
partyRemovedReceptor,
partyPatchedReceptor
}

//Service
export const AdminPartyService = {
createAdminParty: async (data) => {
try {
const party = (await API.instance.client.service('party').create(data)) as Party
dispatchAction(AdminPartyActions.partyAdminCreated({ party }))
await Engine.instance.api.service('party').create(data)
getMutableState(AdminPartyState).merge({ updateNeeded: true })
} catch (err) {
NotificationService.dispatchNotify(err.message, { variant: 'error' })
}
},
fetchAdminParty: async (value: string | null = null, skip = 0, sortField = 'maxMembers', orderBy = 'asc') => {
const user = getMutableState(AuthState).user

try {
if (user.scopes?.value?.find((scope) => scope.type === 'admin:admin')) {
let sortData = {}
if (sortField.length > 0) {
sortData[sortField] = orderBy === 'desc' ? 0 : 1
}
const party = (await API.instance.client.service('party').find({
if (userIsAdmin()) {
const sortData = sortField.length > 0 ? { [sortField]: orderBy === 'desc' ? 0 : 1 } : {}
const party = (await Engine.instance.api.service('party').find({
query: {
$sort: {
...sortData
Expand All @@ -116,46 +73,30 @@ export const AdminPartyService = {
}
})) as Paginated<Party>

dispatchAction(AdminPartyActions.partyRetrieved({ party }))
getMutableState(AdminPartyState).merge({
parties: party.data,
updateNeeded: false,
skip: party.skip,
limit: party.limit,
total: party.total,
fetched: true,
lastFetched: Date.now()
})
}
} catch (err) {
NotificationService.dispatchNotify(err.message, { variant: 'error' })
}
},
removeParty: async (id: string) => {
const party = (await API.instance.client.service('party').remove(id)) as Party
dispatchAction(AdminPartyActions.partyRemoved({ party }))
await Engine.instance.api.service('party').remove(id)
getMutableState(AdminPartyState).merge({ updateNeeded: true })
},
patchParty: async (id: string, party: PatchParty) => {
try {
const result = (await API.instance.client.service('party').patch(id, party)) as Party
dispatchAction(AdminPartyActions.partyPatched({ party: result }))
await Engine.instance.api.service('party').patch(id, party)
getMutableState(AdminPartyState).merge({ updateNeeded: true })
} catch (err) {
NotificationService.dispatchNotify(err.message, { variant: 'error' })
}
}
}

//Action

export class AdminPartyActions {
static partyAdminCreated = defineAction({
type: 'ee.client.AdminParty.PARTY_ADMIN_CREATED' as const,
party: matches.object as Validator<unknown, Party>
})

static partyRetrieved = defineAction({
type: 'ee.client.AdminParty.PARTY_ADMIN_DISPLAYED' as const,
party: matches.object as Validator<unknown, Paginated<Party>>
})

static partyRemoved = defineAction({
type: 'ee.client.AdminParty.ADMIN_PARTY_REMOVED' as const,
party: matches.object as Validator<unknown, Party>
})

static partyPatched = defineAction({
type: 'ee.client.AdminParty.ADMIN_PARTY_PATCHED' as const,
party: matches.object as Validator<unknown, Party>
})
}
9 changes: 0 additions & 9 deletions packages/client-core/src/systems/AdminSystem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import { defineActionQueue } from '@etherealengine/hyperflux'

import { AdminActiveRouteActions, AdminActiveRouteReceptors } from '../admin/services/ActiveRouteService'
import { AdminLocationActions, AdminLocationReceptors } from '../admin/services/LocationService'
import { AdminPartyActions, AdminPartyReceptors } from '../admin/services/PartyService'
import { AdminResourceActions, AdminResourceReceptors } from '../admin/services/ResourceService'
import { AdminSceneActions, AdminSceneReceptors } from '../admin/services/SceneService'
import { AdminServerLogsActions, AdminServerLogsReceptors } from '../admin/services/ServerLogsService'
Expand Down Expand Up @@ -82,10 +81,6 @@ const locationCreatedQueue = defineActionQueue(AdminLocationActions.locationCrea
const locationPatchedQueue = defineActionQueue(AdminLocationActions.locationPatched.matches)
const locationRemovedQueue = defineActionQueue(AdminLocationActions.locationRemoved.matches)
const locationTypesRetrievedQueue = defineActionQueue(AdminLocationActions.locationTypesRetrieved.matches)
const partyRetrievedQueue = defineActionQueue(AdminPartyActions.partyRetrieved.matches)
const partyAdminCreatedQueue = defineActionQueue(AdminPartyActions.partyAdminCreated.matches)
const partyRemovedQueue = defineActionQueue(AdminPartyActions.partyRemoved.matches)
const partyPatchedQueue = defineActionQueue(AdminPartyActions.partyPatched.matches)
const activeRoutesRetrievedQueue = defineActionQueue(AdminActiveRouteActions.activeRoutesRetrieved.matches)
const fetchedInstanceServerQueue = defineActionQueue(InstanceServerSettingActions.fetchedInstanceServer.matches)
const chargebeeSettingRetrievedQueue = defineActionQueue(AdminChargebeeSettingActions.chargebeeSettingRetrieved.matches)
Expand Down Expand Up @@ -126,10 +121,6 @@ const execute = () => {
for (const action of locationPatchedQueue()) AdminLocationReceptors.locationPatchedReceptor(action)
for (const action of locationRemovedQueue()) AdminLocationReceptors.locationRemovedReceptor(action)
for (const action of locationTypesRetrievedQueue()) AdminLocationReceptors.locationTypesRetrievedReceptor(action)
for (const action of partyRetrievedQueue()) AdminPartyReceptors.partyRetrievedReceptor(action)
for (const action of partyAdminCreatedQueue()) AdminPartyReceptors.partyAdminCreatedReceptor(action)
for (const action of partyRemovedQueue()) AdminPartyReceptors.partyRemovedReceptor(action)
for (const action of partyPatchedQueue()) AdminPartyReceptors.partyPatchedReceptor(action)
for (const action of activeRoutesRetrievedQueue()) AdminActiveRouteReceptors.activeRoutesRetrievedReceptor(action)
for (const action of fetchedInstanceServerQueue()) AdminInstanceServerReceptors.fetchedInstanceServerReceptor(action)
for (const action of chargebeeSettingRetrievedQueue())
Expand Down