Rename group fns and add upgrade plan modal to project level groups tab

This commit is contained in:
Tuan Dang
2024-03-28 20:54:25 -07:00
parent f2e5f1bb10
commit 38adc83f2b
11 changed files with 55 additions and 48 deletions
+6 -12
View File
@@ -18,11 +18,11 @@ import { OrgPermissionActions, OrgPermissionSubjects } from "../permission/org-p
import { TPermissionServiceFactory } from "../permission/permission-service";
import { TGroupDALFactory } from "./group-dal";
import {
TAddUserToGroupDTO,
TCreateGroupDTO,
TCreateGroupUserMembershipDTO,
TDeleteGroupDTO,
TDeleteGroupUserMembershipDTO,
TGetGroupUserMembershipsDTO,
TListGroupUsersDTO,
TRemoveUserFromGroupDTO,
TUpdateGroupDTO
} from "./group-types";
import { TUserGroupMembershipDALFactory } from "./user-group-membership-dal";
@@ -185,13 +185,7 @@ export const groupServiceFactory = ({
return group;
};
const listGroupUsers = async ({
groupSlug,
actor,
actorId,
actorAuthMethod,
actorOrgId
}: TGetGroupUserMembershipsDTO) => {
const listGroupUsers = async ({ groupSlug, actor, actorId, actorAuthMethod, actorOrgId }: TListGroupUsersDTO) => {
if (!actorOrgId) throw new BadRequestError({ message: "Failed to create group without organization" });
const { permission } = await permissionService.getOrgPermission(
@@ -224,7 +218,7 @@ export const groupServiceFactory = ({
actorId,
actorAuthMethod,
actorOrgId
}: TCreateGroupUserMembershipDTO) => {
}: TAddUserToGroupDTO) => {
if (!actorOrgId) throw new BadRequestError({ message: "Failed to create group without organization" });
const { permission } = await permissionService.getOrgPermission(
@@ -368,7 +362,7 @@ export const groupServiceFactory = ({
actorId,
actorAuthMethod,
actorOrgId
}: TDeleteGroupUserMembershipDTO) => {
}: TRemoveUserFromGroupDTO) => {
if (!actorOrgId) throw new BadRequestError({ message: "Failed to create group without organization" });
const { permission } = await permissionService.getOrgPermission(
+3 -3
View File
@@ -19,16 +19,16 @@ export type TDeleteGroupDTO = {
groupSlug: string;
} & TGenericPermission;
export type TGetGroupUserMembershipsDTO = {
export type TListGroupUsersDTO = {
groupSlug: string;
} & TGenericPermission;
export type TCreateGroupUserMembershipDTO = {
export type TAddUserToGroupDTO = {
groupSlug: string;
username: string;
} & TGenericPermission;
export type TDeleteGroupUserMembershipDTO = {
export type TRemoveUserFromGroupDTO = {
groupSlug: string;
username: string;
} & TGenericPermission;