Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export const MemberDataTableComponent: React.FC<MemberDataTableComponentProps> =

const members = React.useMemo(
() => memberService.values({namespaceId: namespaceId}),
[memberStore]
[memberStore, namespaceId]
)

return <DataTable filter={filter}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export const MemberDataTableRowComponent: React.FC<MemberDataTableRowComponentPr

const assignedRoles = React.useMemo(
() => member?.roles?.nodes?.map(role => roleService.getById(role?.id, {namespaceId: member?.namespace?.id})) || [],
[roleStore, member?.roles?.nodes?.length]
[roleStore, member]
)

const [localAssignedRoles, setLocalAssignedRoles] = React.useState(assignedRoles)
Expand Down
34 changes: 28 additions & 6 deletions src/packages/ce/src/member/services/Member.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
NamespacesMembersBulkInvitePayload,
NamespacesMembersDeleteInput,
NamespacesMembersDeletePayload,
NamespaceRole,
Query, User
} from "@code0-tech/sagittarius-graphql-types"
import {GraphqlClient} from "@core/util/graphql-client"
Expand Down Expand Up @@ -89,18 +90,39 @@ export class MemberService extends ReactiveArrayService<NamespaceMember, MemberD
const currentMember = this.getById(payload.memberId)
const index = super.values().findIndex(m => m.id === payload.memberId)

if (currentMember && index >= 0) {
const newMember: NamespaceMember = {
...currentMember,
roles: {
...currentMember.roles,
count: payload.roleIds.length,
nodes: payload.roleIds.map(roleId => ({ id: roleId }))
}
}

this.set(index, new View(newMember))
}
}

return result.data?.namespacesMembersAssignRoles ?? undefined
}

removeRoleFromMembers(roleId: NamespaceRole['id']): void {
super.values().forEach((member, index) => {
if (!member?.roles?.nodes?.some(role => role?.id === roleId)) return

const nodes = member.roles.nodes.filter(role => role?.id !== roleId)
const newMember: NamespaceMember = {
...currentMember,
...member,
roles: {
count: payload.roleIds.length,
nodes: payload.roleIds.map(roleId => ({ id: roleId }))
...member.roles,
count: nodes.length,
nodes: nodes
}
}

this.set(index, new View(newMember))
}

return result.data?.namespacesMembersAssignRoles ?? undefined
})
}

async memberDelete(payload: NamespacesMembersDeleteInput): Promise<NamespacesMembersDeletePayload | undefined> {
Expand Down
3 changes: 3 additions & 0 deletions src/packages/ce/src/role/views/RoleDeleteView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import React from "react";
import {useParams, useRouter} from "next/navigation";
import {Button, Card, Flex, Spacing, Text, useService} from "@code0-tech/pictor";
import {RoleService} from "@edition/role/services/Role.service";
import {MemberService} from "@edition/member/services/Member.service";
import type {NamespaceRole} from "@code0-tech/sagittarius-graphql-types";
import {TabContent} from "@code0-tech/pictor/dist/components/tab/Tab";
import {addIslandSuccessNotification} from "@code0-tech/pictor/dist/components/island/Island.hook";
Expand All @@ -13,6 +14,7 @@ export const RoleDeleteView: React.FC = () => {
const params = useParams()
const router = useRouter()
const roleService = useService(RoleService)
const memberService = useService(MemberService)
const [, startTransition] = React.useTransition()

const namespaceIndex = params.namespaceId as any as number
Expand All @@ -25,6 +27,7 @@ export const RoleDeleteView: React.FC = () => {
namespaceRoleId: roleId
}).then(payload => {
if ((payload?.errors?.length ?? 0) <= 0) {
memberService.removeRoleFromMembers(roleId)
addIslandSuccessNotification({
message: "Deleted role"
})
Expand Down