From cb533849e8eb9e45bfb69872c29483211660c200 Mon Sep 17 00:00:00 2001 From: Aaryan Khandelwal <65252264+aaryan610@users.noreply.github.com> Date: Tue, 31 Oct 2023 12:16:40 +0530 Subject: [PATCH] chore: update members endpoint (#2569) --- .../integration/github/single-user-select.tsx | 2 +- .../integration/jira/import-users.tsx | 6 +- .../issues/attachment/attachments.tsx | 2 +- web/components/issues/select/assignee.tsx | 2 +- .../issues/sidebar-select/assignee.tsx | 2 +- web/components/modules/select/lead.tsx | 2 +- web/components/modules/select/members.tsx | 2 +- .../modules/sidebar-select/select-lead.tsx | 2 +- .../modules/sidebar-select/select-members.tsx | 2 +- web/components/pages/pages-view.tsx | 2 +- web/components/project/member-select.tsx | 2 +- .../project/send-project-invitation-modal.tsx | 6 +- web/components/ui/avatar.tsx | 2 +- web/components/views/select-filters.tsx | 2 +- web/components/web-view/select-assignee.tsx | 2 +- web/constants/fetch-keys.ts | 27 +-------- web/hooks/use-project-members.tsx | 4 +- web/hooks/use-workspace-members.tsx | 2 +- web/layouts/auth-layout/project-wrapper.tsx | 8 ++- web/layouts/auth-layout/workspace-wrapper.tsx | 6 +- .../projects/[projectId]/settings/members.tsx | 28 +++++----- web/pages/workspace-invitations/index.tsx | 5 +- web/services/project/project.service.ts | 56 ++++++++----------- .../project/project_invitation.service.ts | 10 +--- web/services/workspace.service.ts | 16 +++--- web/store/project/project.store.ts | 14 ++--- web/store/workspace/workspace.store.ts | 4 +- web/types/projects.d.ts | 2 +- 28 files changed, 94 insertions(+), 126 deletions(-) diff --git a/web/components/integration/github/single-user-select.tsx b/web/components/integration/github/single-user-select.tsx index 2bc16d87d..40e743aa8 100644 --- a/web/components/integration/github/single-user-select.tsx +++ b/web/components/integration/github/single-user-select.tsx @@ -44,7 +44,7 @@ export const SingleUserSelect: React.FC = ({ collaborator, index, users, const { data: members } = useSWR( workspaceSlug ? WORKSPACE_MEMBERS(workspaceSlug.toString()) : null, - workspaceSlug ? () => workspaceService.workspaceMembers(workspaceSlug.toString()) : null + workspaceSlug ? () => workspaceService.fetchWorkspaceMembers(workspaceSlug.toString()) : null ); const options = members?.map((member) => ({ diff --git a/web/components/integration/jira/import-users.tsx b/web/components/integration/jira/import-users.tsx index c49a3483a..48f9231c2 100644 --- a/web/components/integration/jira/import-users.tsx +++ b/web/components/integration/jira/import-users.tsx @@ -3,7 +3,7 @@ import { useRouter } from "next/router"; import useSWR from "swr"; import { useFormContext, useFieldArray, Controller } from "react-hook-form"; // fetch keys -import { WORKSPACE_MEMBERS_WITH_EMAIL } from "constants/fetch-keys"; +import { WORKSPACE_MEMBERS } from "constants/fetch-keys"; // services import { WorkspaceService } from "services/workspace.service"; // components @@ -30,8 +30,8 @@ export const JiraImportUsers: FC = () => { }); const { data: members } = useSWR( - workspaceSlug ? WORKSPACE_MEMBERS_WITH_EMAIL(workspaceSlug?.toString() ?? "") : null, - workspaceSlug ? () => workspaceService.workspaceMembers(workspaceSlug?.toString() ?? "") : null + workspaceSlug ? WORKSPACE_MEMBERS(workspaceSlug?.toString() ?? "") : null, + workspaceSlug ? () => workspaceService.fetchWorkspaceMembers(workspaceSlug?.toString() ?? "") : null ); const options = members?.map((member) => ({ diff --git a/web/components/issues/attachment/attachments.tsx b/web/components/issues/attachment/attachments.tsx index 176ff5f7c..7d8872f9c 100644 --- a/web/components/issues/attachment/attachments.tsx +++ b/web/components/issues/attachment/attachments.tsx @@ -44,7 +44,7 @@ export const IssueAttachments = () => { const { data: people } = useSWR( workspaceSlug && projectId ? PROJECT_MEMBERS(projectId as string) : null, workspaceSlug && projectId - ? () => projectService.projectMembers(workspaceSlug as string, projectId as string) + ? () => projectService.fetchProjectMembers(workspaceSlug as string, projectId as string) : null ); diff --git a/web/components/issues/select/assignee.tsx b/web/components/issues/select/assignee.tsx index bb2ffcbd4..7e4c5bedb 100644 --- a/web/components/issues/select/assignee.tsx +++ b/web/components/issues/select/assignee.tsx @@ -26,7 +26,7 @@ export const IssueAssigneeSelect: React.FC = ({ projectId, value = [], on const { data: members } = useSWR( workspaceSlug && projectId ? PROJECT_MEMBERS(projectId as string) : null, workspaceSlug && projectId - ? () => projectService.projectMembers(workspaceSlug as string, projectId as string) + ? () => projectService.fetchProjectMembers(workspaceSlug as string, projectId as string) : null ); diff --git a/web/components/issues/sidebar-select/assignee.tsx b/web/components/issues/sidebar-select/assignee.tsx index a56c6176b..09b1af7dd 100644 --- a/web/components/issues/sidebar-select/assignee.tsx +++ b/web/components/issues/sidebar-select/assignee.tsx @@ -28,7 +28,7 @@ export const SidebarAssigneeSelect: React.FC = ({ value, onChange, disabl const { data: members } = useSWR( workspaceSlug && projectId ? PROJECT_MEMBERS(projectId as string) : null, workspaceSlug && projectId - ? () => projectService.projectMembers(workspaceSlug as string, projectId as string) + ? () => projectService.fetchProjectMembers(workspaceSlug as string, projectId as string) : null ); diff --git a/web/components/modules/select/lead.tsx b/web/components/modules/select/lead.tsx index 982acdeb6..86ced41a9 100644 --- a/web/components/modules/select/lead.tsx +++ b/web/components/modules/select/lead.tsx @@ -25,7 +25,7 @@ export const ModuleLeadSelect: React.FC = ({ value, onChange }) => { const { data: members } = useSWR( workspaceSlug && projectId ? PROJECT_MEMBERS(projectId as string) : null, workspaceSlug && projectId - ? () => projectService.projectMembers(workspaceSlug as string, projectId as string) + ? () => projectService.fetchProjectMembers(workspaceSlug as string, projectId as string) : null ); diff --git a/web/components/modules/select/members.tsx b/web/components/modules/select/members.tsx index 49f8ab7db..36aaa869b 100644 --- a/web/components/modules/select/members.tsx +++ b/web/components/modules/select/members.tsx @@ -24,7 +24,7 @@ export const ModuleMembersSelect: React.FC = ({ value, onChange }) => { const { data: members } = useSWR( workspaceSlug && projectId ? PROJECT_MEMBERS(projectId as string) : null, workspaceSlug && projectId - ? () => projectService.projectMembers(workspaceSlug as string, projectId as string) + ? () => projectService.fetchProjectMembers(workspaceSlug as string, projectId as string) : null ); const options = members?.map((member) => ({ diff --git a/web/components/modules/sidebar-select/select-lead.tsx b/web/components/modules/sidebar-select/select-lead.tsx index 020aad037..271b1dfc9 100644 --- a/web/components/modules/sidebar-select/select-lead.tsx +++ b/web/components/modules/sidebar-select/select-lead.tsx @@ -27,7 +27,7 @@ export const SidebarLeadSelect: FC = (props) => { const { data: members } = useSWR( workspaceSlug && projectId ? PROJECT_MEMBERS(projectId as string) : null, workspaceSlug && projectId - ? () => projectService.projectMembers(workspaceSlug as string, projectId as string) + ? () => projectService.fetchProjectMembers(workspaceSlug as string, projectId as string) : null ); diff --git a/web/components/modules/sidebar-select/select-members.tsx b/web/components/modules/sidebar-select/select-members.tsx index 7b74ef794..35fbcd7a1 100644 --- a/web/components/modules/sidebar-select/select-members.tsx +++ b/web/components/modules/sidebar-select/select-members.tsx @@ -29,7 +29,7 @@ export const SidebarMembersSelect: React.FC = ({ value, onChange }) => { const { data: members } = useSWR( workspaceSlug && projectId ? PROJECT_MEMBERS(projectId as string) : null, workspaceSlug && projectId - ? () => projectService.projectMembers(workspaceSlug as string, projectId as string) + ? () => projectService.fetchProjectMembers(workspaceSlug as string, projectId as string) : null ); diff --git a/web/components/pages/pages-view.tsx b/web/components/pages/pages-view.tsx index f441c4e00..699cbb582 100644 --- a/web/components/pages/pages-view.tsx +++ b/web/components/pages/pages-view.tsx @@ -54,7 +54,7 @@ export const PagesView: React.FC = ({ pages, viewType }) => { const { data: people } = useSWR( workspaceSlug && projectId ? PROJECT_MEMBERS(projectId.toString()) : null, workspaceSlug && projectId - ? () => projectService.projectMembers(workspaceSlug.toString(), projectId.toString()) + ? () => projectService.fetchProjectMembers(workspaceSlug.toString(), projectId.toString()) : null ); diff --git a/web/components/project/member-select.tsx b/web/components/project/member-select.tsx index 90b4cb6b3..686568513 100644 --- a/web/components/project/member-select.tsx +++ b/web/components/project/member-select.tsx @@ -30,7 +30,7 @@ export const MemberSelect: React.FC = ({ value, onChange, isDisabled = fa const { data: members } = useSWR( workspaceSlug && projectId ? PROJECT_MEMBERS(projectId as string) : null, workspaceSlug && projectId - ? () => projectService.projectMembers(workspaceSlug as string, projectId as string) + ? () => projectService.fetchProjectMembers(workspaceSlug as string, projectId as string) : null ); diff --git a/web/components/project/send-project-invitation-modal.tsx b/web/components/project/send-project-invitation-modal.tsx index 961e28802..be27088fd 100644 --- a/web/components/project/send-project-invitation-modal.tsx +++ b/web/components/project/send-project-invitation-modal.tsx @@ -67,7 +67,7 @@ const SendProjectInvitationModal: React.FC = (props) => { const { data: people } = useSWR( workspaceSlug ? WORKSPACE_MEMBERS(workspaceSlug as string) : null, - workspaceSlug ? () => workspaceService.workspaceMembers(workspaceSlug as string) : null + workspaceSlug ? () => workspaceService.fetchWorkspaceMembers(workspaceSlug as string) : null ); const { @@ -90,9 +90,11 @@ const SendProjectInvitationModal: React.FC = (props) => { const onSubmit = async (formData: FormValues) => { if (!workspaceSlug || !projectId || isSubmitting) return; + const payload = { ...formData }; + await projectService - .inviteProject(workspaceSlug as string, projectId as string, payload, user) + .bulkAddMembersToProject(workspaceSlug.toString(), projectId.toString(), payload, user) .then(() => { setIsOpen(false); setToastAlert({ diff --git a/web/components/ui/avatar.tsx b/web/components/ui/avatar.tsx index 44997f807..a28b449ba 100644 --- a/web/components/ui/avatar.tsx +++ b/web/components/ui/avatar.tsx @@ -95,7 +95,7 @@ export const AssigneesList: React.FC = ({ const { data: people } = useSWR( workspaceSlug ? WORKSPACE_MEMBERS(workspaceSlug as string) : null, - workspaceSlug ? () => workspaceService.workspaceMembers(workspaceSlug as string) : null + workspaceSlug ? () => workspaceService.fetchWorkspaceMembers(workspaceSlug as string) : null ); if ((users && users.length === 0) || (userIds && userIds.length === 0)) diff --git a/web/components/views/select-filters.tsx b/web/components/views/select-filters.tsx index b566bb96e..b032b1057 100644 --- a/web/components/views/select-filters.tsx +++ b/web/components/views/select-filters.tsx @@ -54,7 +54,7 @@ export const SelectFilters: React.FC = ({ filters, onSelect, direction = const { data: members } = useSWR( projectId ? PROJECT_MEMBERS(projectId as string) : null, workspaceSlug && projectId - ? () => projectService.projectMembers(workspaceSlug as string, projectId as string) + ? () => projectService.fetchProjectMembers(workspaceSlug as string, projectId as string) : null ); diff --git a/web/components/web-view/select-assignee.tsx b/web/components/web-view/select-assignee.tsx index 877452579..1848b944f 100644 --- a/web/components/web-view/select-assignee.tsx +++ b/web/components/web-view/select-assignee.tsx @@ -33,7 +33,7 @@ export const AssigneeSelect: React.FC = (props) => { const { data: members } = useSWR( workspaceSlug && projectId ? PROJECT_MEMBERS(projectId as string) : null, workspaceSlug && projectId - ? () => projectService.projectMembers(workspaceSlug as string, projectId as string) + ? () => projectService.fetchProjectMembers(workspaceSlug as string, projectId as string) : null ); diff --git a/web/constants/fetch-keys.ts b/web/constants/fetch-keys.ts index 61c899ee2..fc1b5544d 100644 --- a/web/constants/fetch-keys.ts +++ b/web/constants/fetch-keys.ts @@ -47,19 +47,6 @@ const paramsToKey = (params: any) => { return `${layoutKey}_${projectKey}_${stateGroupKey}_${stateKey}_${priorityKey}_${assigneesKey}_${createdByKey}_${type}_${groupBy}_${orderBy}_${labelsKey}_${startDateKey}_${targetDateKey}_${sub_issue}_${startTargetDate}_${subscriberKey}`; }; -const inboxParamsToKey = (params: any) => { - const { priority, inbox_status } = params; - - let priorityKey = priority ? priority.split(",") : []; - let inboxStatusKey = inbox_status ? inbox_status.split(",") : []; - - // sorting each keys in ascending order - priorityKey = priorityKey.sort().join("_"); - inboxStatusKey = inboxStatusKey.sort().join("_"); - - return `${priorityKey}_${inboxStatusKey}`; -}; - const myIssuesParamsToKey = (params: any) => { const { assignees, created_by, labels, priority, state_group, subscriber, start_date, target_date } = params; @@ -93,13 +80,9 @@ export const USER_WORKSPACES = "USER_WORKSPACES"; export const WORKSPACE_DETAILS = (workspaceSlug: string) => `WORKSPACE_DETAILS_${workspaceSlug.toUpperCase()}`; export const WORKSPACE_MEMBERS = (workspaceSlug: string) => `WORKSPACE_MEMBERS_${workspaceSlug.toUpperCase()}`; -export const WORKSPACE_MEMBERS_WITH_EMAIL = (workspaceSlug: string) => - `WORKSPACE_MEMBERS_WITH_EMAIL_${workspaceSlug.toUpperCase()}`; export const WORKSPACE_MEMBERS_ME = (workspaceSlug: string) => `WORKSPACE_MEMBERS_ME${workspaceSlug.toUpperCase()}`; -export const WORKSPACE_INVITATIONS = "WORKSPACE_INVITATIONS"; -export const WORKSPACE_INVITATION_WITH_EMAIL = (workspaceSlug: string) => - `WORKSPACE_INVITATION_WITH_EMAIL_${workspaceSlug.toUpperCase()}`; -export const WORKSPACE_INVITATION = "WORKSPACE_INVITATION"; +export const WORKSPACE_INVITATIONS = (workspaceSlug: string) => `WORKSPACE_INVITATIONS_${workspaceSlug.toString()}`; +export const WORKSPACE_INVITATION = (invitationId: string) => `WORKSPACE_INVITATION_${invitationId}`; export const LAST_ACTIVE_WORKSPACE_AND_PROJECTS = "LAST_ACTIVE_WORKSPACE_AND_PROJECTS"; export const PROJECTS_LIST = ( @@ -115,11 +98,7 @@ export const PROJECTS_LIST = ( export const PROJECT_DETAILS = (projectId: string) => `PROJECT_DETAILS_${projectId.toUpperCase()}`; export const PROJECT_MEMBERS = (projectId: string) => `PROJECT_MEMBERS_${projectId.toUpperCase()}`; -export const PROJECT_MEMBERS_WITH_EMAIL = (workspaceSlug: string, projectId: string) => - `PROJECT_MEMBERS_WITH_EMAIL_${workspaceSlug}_${projectId.toUpperCase()}`; -export const PROJECT_INVITATIONS = "PROJECT_INVITATIONS"; -export const PROJECT_INVITATIONS_WITH_EMAIL = (workspaceSlug: string, projectId: string) => - `PROJECT_INVITATIONS_WITH_EMAIL_${workspaceSlug}_${projectId.toUpperCase()}`; +export const PROJECT_INVITATIONS = (projectId: string) => `PROJECT_INVITATIONS_${projectId.toString()}`; export const PROJECT_ISSUES_LIST = (workspaceSlug: string, projectId: string) => `PROJECT_ISSUES_LIST_${workspaceSlug.toUpperCase()}_${projectId.toUpperCase()}`; diff --git a/web/hooks/use-project-members.tsx b/web/hooks/use-project-members.tsx index 4b7abe641..298d0b3de 100644 --- a/web/hooks/use-project-members.tsx +++ b/web/hooks/use-project-members.tsx @@ -19,7 +19,9 @@ const useProjectMembers = ( // fetching project members const { data: members } = useSWR( workspaceSlug && projectId && fetchCondition ? PROJECT_MEMBERS(projectId) : null, - workspaceSlug && projectId && fetchCondition ? () => projectService.projectMembers(workspaceSlug, projectId) : null + workspaceSlug && projectId && fetchCondition + ? () => projectService.fetchProjectMembers(workspaceSlug, projectId) + : null ); const hasJoined = members?.some((item: any) => item.member.id === (user as any)?.id); diff --git a/web/hooks/use-workspace-members.tsx b/web/hooks/use-workspace-members.tsx index e6fa6d2e3..b486ac13e 100644 --- a/web/hooks/use-workspace-members.tsx +++ b/web/hooks/use-workspace-members.tsx @@ -15,7 +15,7 @@ const useWorkspaceMembers = (workspaceSlug: string | undefined, fetchCondition?: const { data: workspaceMembers, error: workspaceMemberErrors } = useSWR( workspaceSlug && fetchCondition ? WORKSPACE_MEMBERS(workspaceSlug) : null, - workspaceSlug && fetchCondition ? () => workspaceService.workspaceMembers(workspaceSlug) : null + workspaceSlug && fetchCondition ? () => workspaceService.fetchWorkspaceMembers(workspaceSlug) : null ); const hasJoined = workspaceMembers?.some((item: any) => item.member.id === (user as any)?.id); diff --git a/web/layouts/auth-layout/project-wrapper.tsx b/web/layouts/auth-layout/project-wrapper.tsx index 91645222e..688d97129 100644 --- a/web/layouts/auth-layout/project-wrapper.tsx +++ b/web/layouts/auth-layout/project-wrapper.tsx @@ -38,7 +38,7 @@ export const ProjectAuthWrapper: FC = observer((props) => { : null ); // fetching user project member information - useSWR( + const { data: projectMemberInfo } = useSWR( workspaceSlug && projectId ? `PROJECT_MEMBERS_ME_${workspaceSlug}_${projectId}` : null, workspaceSlug && projectId ? () => userStore.fetchUserProjectInfo(workspaceSlug.toString(), projectId.toString()) @@ -53,8 +53,10 @@ export const ProjectAuthWrapper: FC = observer((props) => { ); // fetching project members useSWR( - workspaceSlug && projectId ? `PROJECT_MEMBERS_${workspaceSlug}_${projectId}` : null, - workspaceSlug && projectId + workspaceSlug && projectId && projectMemberInfo && [20, 15].includes(projectMemberInfo.role) + ? `PROJECT_MEMBERS_${workspaceSlug}_${projectId}` + : null, + workspaceSlug && projectId && projectMemberInfo && [20, 15].includes(projectMemberInfo.role) ? () => projectStore.fetchProjectMembers(workspaceSlug.toString(), projectId.toString()) : null ); diff --git a/web/layouts/auth-layout/workspace-wrapper.tsx b/web/layouts/auth-layout/workspace-wrapper.tsx index e46515bf7..d218bf68c 100644 --- a/web/layouts/auth-layout/workspace-wrapper.tsx +++ b/web/layouts/auth-layout/workspace-wrapper.tsx @@ -12,8 +12,6 @@ export interface IWorkspaceAuthWrapper { children: ReactNode; } -const HIGHER_ROLES = [20, 15]; - export const WorkspaceAuthWrapper: FC = observer((props) => { const { children } = props; // store @@ -35,10 +33,10 @@ export const WorkspaceAuthWrapper: FC = observer((props) ); // fetch workspace members useSWR( - workspaceSlug && workspaceMemberInfo && HIGHER_ROLES.includes(workspaceMemberInfo.role) + workspaceSlug && workspaceMemberInfo && [20, 15].includes(workspaceMemberInfo.role) ? `WORKSPACE_MEMBERS_${workspaceSlug}` : null, - workspaceSlug && workspaceMemberInfo && HIGHER_ROLES.includes(workspaceMemberInfo.role) + workspaceSlug && workspaceMemberInfo && [20, 15].includes(workspaceMemberInfo.role) ? () => workspaceStore.fetchWorkspaceMembers(workspaceSlug.toString()) : null ); diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/settings/members.tsx b/web/pages/[workspaceSlug]/projects/[projectId]/settings/members.tsx index 7a0b34197..c55b33710 100644 --- a/web/pages/[workspaceSlug]/projects/[projectId]/settings/members.tsx +++ b/web/pages/[workspaceSlug]/projects/[projectId]/settings/members.tsx @@ -30,8 +30,8 @@ import { IProject, IUserLite, IWorkspace } from "types"; import { PROJECTS_LIST, PROJECT_DETAILS, - PROJECT_INVITATIONS_WITH_EMAIL, - PROJECT_MEMBERS_WITH_EMAIL, + PROJECT_INVITATIONS, + PROJECT_MEMBERS, USER_PROJECT_VIEW, WORKSPACE_DETAILS, } from "constants/fetch-keys"; @@ -68,21 +68,21 @@ const MembersSettings: NextPage = () => { const { reset, control } = useForm({ defaultValues }); - const { data: activeWorkspace } = useSWR(workspaceSlug ? WORKSPACE_DETAILS(workspaceSlug as string) : null, () => - workspaceSlug ? workspaceService.getWorkspace(workspaceSlug as string) : null + const { data: activeWorkspace } = useSWR(workspaceSlug ? WORKSPACE_DETAILS(workspaceSlug.toString()) : null, () => + workspaceSlug ? workspaceService.getWorkspace(workspaceSlug.toString()) : null ); const { data: projectMembers, mutate: mutateMembers } = useSWR( - workspaceSlug && projectId ? PROJECT_MEMBERS_WITH_EMAIL(workspaceSlug.toString(), projectId.toString()) : null, + workspaceSlug && projectId ? PROJECT_MEMBERS(projectId.toString()) : null, workspaceSlug && projectId - ? () => projectService.projectMembersWithEmail(workspaceSlug as string, projectId as string) + ? () => projectService.fetchProjectMembers(workspaceSlug.toString(), projectId.toString()) : null ); const { data: projectInvitations, mutate: mutateInvitations } = useSWR( - workspaceSlug && projectId ? PROJECT_INVITATIONS_WITH_EMAIL(workspaceSlug.toString(), projectId.toString()) : null, + workspaceSlug && projectId ? PROJECT_INVITATIONS(projectId.toString()) : null, workspaceSlug && projectId - ? () => projectInvitationService.projectInvitationsWithEmail(workspaceSlug as string, projectId as string) + ? () => projectInvitationService.fetchProjectInvitations(workspaceSlug.toString(), projectId.toString()) : null ); @@ -133,12 +133,12 @@ const MembersSettings: NextPage = () => { // }; // await projectService - // .updateProject(workspaceSlug as string, projectId as string, payload, user) + // .updateProject(workspaceSlug.toString(), projectId.toString(), payload, user) // .then((res) => { - // mutate(PROJECT_DETAILS(projectId as string)); + // mutate(PROJECT_DETAILS(projectId.toString())); // mutate( - // PROJECTS_LIST(workspaceSlug as string, { + // PROJECTS_LIST(workspaceSlug.toString(), { // is_favorite: "all", // }) // ); @@ -173,12 +173,12 @@ const MembersSettings: NextPage = () => { }; await projectService - .updateProject(workspaceSlug as string, projectId as string, payload, user) + .updateProject(workspaceSlug.toString(), projectId.toString(), payload, user) .then(() => { - mutate(PROJECT_DETAILS(projectId as string)); + mutate(PROJECT_DETAILS(projectId.toString())); mutate( - PROJECTS_LIST(workspaceSlug as string, { + PROJECTS_LIST(workspaceSlug.toString(), { is_favorite: "all", }) ); diff --git a/web/pages/workspace-invitations/index.tsx b/web/pages/workspace-invitations/index.tsx index 7288a669c..ea671a4a9 100644 --- a/web/pages/workspace-invitations/index.tsx +++ b/web/pages/workspace-invitations/index.tsx @@ -30,8 +30,9 @@ const WorkspaceInvitation: NextPage = () => { const { user } = useUser(); - const { data: invitationDetail, error } = useSWR(invitation_id && WORKSPACE_INVITATION, () => - invitation_id ? workspaceService.getWorkspaceInvitation(invitation_id as string) : null + const { data: invitationDetail, error } = useSWR( + invitation_id && WORKSPACE_INVITATION(invitation_id.toString()), + () => (invitation_id ? workspaceService.getWorkspaceInvitation(invitation_id as string) : null) ); const handleAccept = () => { diff --git a/web/services/project/project.service.ts b/web/services/project/project.service.ts index e1309fafa..1c824a40c 100644 --- a/web/services/project/project.service.ts +++ b/web/services/project/project.service.ts @@ -7,7 +7,7 @@ import type { GithubRepositoriesResponse, IUser, IProject, - IProjectBulkInviteFormData, + IProjectBulkAddFormData, IProjectMember, ISearchIssueResponse, ProjectPreferences, @@ -83,32 +83,6 @@ export class ProjectService extends APIService { }); } - async inviteProject( - workspaceSlug: string, - projectId: string, - data: IProjectBulkInviteFormData, - user: IUser | undefined - ): Promise { - return this.post(`/api/workspaces/${workspaceSlug}/projects/${projectId}/members/add/`, data) - .then((response) => { - trackEventService.trackProjectEvent( - { - workspaceId: response?.data?.workspace?.id, - workspaceSlug, - projectId, - projectName: response?.data?.project?.name, - memberEmail: response?.data?.member?.email, - }, - "PROJECT_MEMBER_INVITE", - user as IUser - ); - return response?.data; - }) - .catch((error) => { - throw error?.response?.data; - }); - } - async joinProject(workspaceSlug: string, project_ids: string[]): Promise { return this.post(`/api/workspaces/${workspaceSlug}/projects/join/`, { project_ids }) .then((response) => response?.data) @@ -136,17 +110,35 @@ export class ProjectService extends APIService { }); } - async projectMembers(workspaceSlug: string, projectId: string): Promise { - return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/project-members/`) + async fetchProjectMembers(workspaceSlug: string, projectId: string): Promise { + return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/members/`) .then((response) => response?.data) .catch((error) => { throw error?.response?.data; }); } - async projectMembersWithEmail(workspaceSlug: string, projectId: string): Promise { - return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/members/`) - .then((response) => response?.data) + async bulkAddMembersToProject( + workspaceSlug: string, + projectId: string, + data: IProjectBulkAddFormData, + user: IUser | undefined + ): Promise { + return this.post(`/api/workspaces/${workspaceSlug}/projects/${projectId}/members/`, data) + .then((response) => { + trackEventService.trackProjectEvent( + { + workspaceId: response?.data?.workspace?.id, + workspaceSlug, + projectId, + projectName: response?.data?.project?.name, + memberEmail: response?.data?.member?.email, + }, + "PROJECT_MEMBER_INVITE", + user as IUser + ); + return response?.data; + }) .catch((error) => { throw error?.response?.data; }); diff --git a/web/services/project/project_invitation.service.ts b/web/services/project/project_invitation.service.ts index 54686dd6a..1fbf6e24c 100644 --- a/web/services/project/project_invitation.service.ts +++ b/web/services/project/project_invitation.service.ts @@ -9,15 +9,7 @@ export class ProjectInvitationService extends APIService { super(API_BASE_URL); } - async projectInvitations(workspaceSlug: string, projectId: string): Promise { - return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/invitations/`) - .then((response) => response?.data) - .catch((error) => { - throw error?.response?.data; - }); - } - - async projectInvitationsWithEmail(workspaceSlug: string, projectId: string): Promise { + async fetchProjectInvitations(workspaceSlug: string, projectId: string): Promise { return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/invitations/`) .then((response) => response?.data) .catch((error) => { diff --git a/web/services/workspace.service.ts b/web/services/workspace.service.ts index 6d2f9cdf7..30126c2ee 100644 --- a/web/services/workspace.service.ts +++ b/web/services/workspace.service.ts @@ -132,14 +132,6 @@ export class WorkspaceService extends APIService { }); } - async workspaceMembers(workspaceSlug: string): Promise { - return this.get(`/api/workspaces/${workspaceSlug}/workspace-members/`) - .then((response) => response?.data) - .catch((error) => { - throw error?.response?.data; - }); - } - async workspaceMemberMe(workspaceSlug: string): Promise { return this.get(`/api/workspaces/${workspaceSlug}/workspace-members/me/`) .then((response) => response?.data) @@ -156,6 +148,14 @@ export class WorkspaceService extends APIService { }); } + async fetchWorkspaceMembers(workspaceSlug: string): Promise { + return this.get(`/api/workspaces/${workspaceSlug}/members/`) + .then((response) => response?.data) + .catch((error) => { + throw error?.response?.data; + }); + } + async updateWorkspaceMember( workspaceSlug: string, memberId: string, diff --git a/web/store/project/project.store.ts b/web/store/project/project.store.ts index b4361ec2f..225ca76bc 100644 --- a/web/store/project/project.store.ts +++ b/web/store/project/project.store.ts @@ -78,21 +78,21 @@ export class ProjectStore implements IProjectStore { searchQuery: string = ""; projectId: string | null = null; - projects: { [workspaceSlug: string]: IProject[] } = {}; // workspace_id: project[] + projects: { [workspaceSlug: string]: IProject[] } = {}; // workspaceSlug: project[] project_details: { - [key: string]: IProject; // project_id: project + [projectId: string]: IProject; // projectId: project } = {}; states: { - [key: string]: IStateResponse; // project_id: states + [projectId: string]: IStateResponse; // projectId: states } | null = {}; labels: { - [key: string]: IIssueLabels[]; // project_id: labels + [projectId: string]: IIssueLabels[]; // projectId: labels } | null = {}; members: { - [key: string]: IProjectMember[]; // project_id: members + [projectId: string]: IProjectMember[]; // projectId: members } | null = {}; estimates: { - [key: string]: IEstimate[]; // project_id: estimates + [projectId: string]: IEstimate[]; // projectId: estimates } | null = {}; // root store @@ -370,7 +370,7 @@ export class ProjectStore implements IProjectStore { this.loader = true; this.error = null; - const membersResponse = await this.projectService.projectMembers(workspaceSlug, projectId); + const membersResponse = await this.projectService.fetchProjectMembers(workspaceSlug, projectId); const _members = { ...this.members, [projectId]: membersResponse, diff --git a/web/store/workspace/workspace.store.ts b/web/store/workspace/workspace.store.ts index 28e901928..7c6551ec0 100644 --- a/web/store/workspace/workspace.store.ts +++ b/web/store/workspace/workspace.store.ts @@ -49,7 +49,7 @@ export class WorkspaceStore implements IWorkspaceStore { // observables workspaceSlug: string | null = null; workspaces: IWorkspace[] = []; - projects: { [workspaceSlug: string]: IProject[] } = {}; // workspace_id: project[] + projects: { [workspaceSlug: string]: IProject[] } = {}; // workspaceSlug: project[] labels: { [workspaceSlug: string]: IIssueLabels[] } = {}; members: { [workspaceSlug: string]: IWorkspaceMember[] } = {}; @@ -214,7 +214,7 @@ export class WorkspaceStore implements IWorkspaceStore { this.error = null; }); - const membersResponse = await this.workspaceService.workspaceMembers(workspaceSlug); + const membersResponse = await this.workspaceService.fetchWorkspaceMembers(workspaceSlug); runInAction(() => { this.members = { diff --git a/web/types/projects.d.ts b/web/types/projects.d.ts index 5ddfd64eb..f1f69af2a 100644 --- a/web/types/projects.d.ts +++ b/web/types/projects.d.ts @@ -108,7 +108,7 @@ export interface IProjectMemberInvitation { updated_by: string; } -export interface IProjectBulkInviteFormData { +export interface IProjectBulkAddFormData { members: { role: 5 | 10 | 15 | 20; member_id: string }[]; }