Skip to content

fix(PM-1169): send source to accept or decline invite API #1650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 3, 2025
Merged

fix(PM-1169): send source to accept or decline invite API #1650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0eb4fb3
fix: send source to accept or decline invite API
hentrymartin May 30, 2025
8390251
fix: send source to accept or decline invite API
hentrymartin May 30, 2025
713528f
fix: send source to accept or decline invite API
hentrymartin May 30, 2025
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ workflows:
context: org-global
filters: &filters-dev
branches:
only: ["develop", "PM-803_wm-regression-fixes", "PM-902_show-all-projects-on-challenge-page"]
only: ["develop", "PM-803_wm-regression-fixes", "PM-902_show-all-projects-on-challenge-page", "pm-1169"]

# Production builds are exectuted only on tagged commits to the
# master branch.
Expand Down
12 changes: 7 additions & 5 deletions src/containers/ProjectInvitations/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ const ProjectInvitations = ({ match, auth, isProjectLoading, history, projectDet
const [isUpdating, setIsUpdating] = useState(automaticAction || false)
const isAccepting = isUpdating === PROJECT_MEMBER_INVITE_STATUS_ACCEPTED
const isDeclining = isUpdating === PROJECT_MEMBER_INVITE_STATUS_REFUSED
const queryParams = new URLSearchParams(window.location.search)
const source = queryParams.get('source')

useEffect(() => {
if (!projectId) {
Expand All @@ -42,9 +44,9 @@ const ProjectInvitations = ({ match, auth, isProjectLoading, history, projectDet
}
}, [projectId, auth, projectDetail, isProjectLoading, history])

const updateInvite = useCallback(async (status) => {
const updateInvite = useCallback(async (status, source) => {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The updateInvite function now requires a source parameter, but it's not clear from the diff how this parameter is being passed when updateInvite is called. Ensure that all calls to updateInvite are updated to include the source argument.

setIsUpdating(status)
await updateProjectMemberInvite(projectId, invitation.id, status)
await updateProjectMemberInvite(projectId, invitation.id, status, source)

// await for the project details to propagate
await delay(1000)
Expand All @@ -56,8 +58,8 @@ const ProjectInvitations = ({ match, auth, isProjectLoading, history, projectDet
history.push(status === PROJECT_MEMBER_INVITE_STATUS_ACCEPTED ? `/projects/${projectId}/challenges` : '/projects')
}, [projectId, invitation, loadProjectInvites, history])

const acceptInvite = useCallback(() => updateInvite(PROJECT_MEMBER_INVITE_STATUS_ACCEPTED), [updateInvite])
const declineInvite = useCallback(() => updateInvite(PROJECT_MEMBER_INVITE_STATUS_REFUSED), [updateInvite])
const acceptInvite = useCallback(() => updateInvite(PROJECT_MEMBER_INVITE_STATUS_ACCEPTED, source), [updateInvite, source])
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The variable source is used here, but it is not clear from the diff where it is defined or how it is being set. Ensure that source is properly initialized and passed to this component.

const declineInvite = useCallback(() => updateInvite(PROJECT_MEMBER_INVITE_STATUS_REFUSED, source), [updateInvite, source])
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similar to the previous line, ensure that the source variable is correctly defined and initialized before being used in this function.


useEffect(() => {
if (!invitation || !automaticAction) {
Expand All @@ -69,7 +71,7 @@ const ProjectInvitations = ({ match, auth, isProjectLoading, history, projectDet
} else if (automaticAction === PROJECT_MEMBER_INVITE_STATUS_REFUSED) {
declineInvite()
}
}, [invitation, automaticAction])
}, [invitation, automaticAction, source])

return (
<>
Expand Down
4 changes: 2 additions & 2 deletions src/services/projectMemberInvites.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import { PROJECTS_API_URL } from '../config/constants'
* @param {string} status the new status for invitation
* @return {object} project member invite returned by api
*/
export function updateProjectMemberInvite (projectId, inviteId, status) {
export function updateProjectMemberInvite (projectId, inviteId, status, source) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The function updateProjectMemberInvite now includes a new parameter source. Ensure that all calls to this function in the codebase are updated to pass this new parameter to avoid potential runtime errors.

const url = `${PROJECTS_API_URL}/${projectId}/invites/${inviteId}`
return axios.patch(url, { status })
return axios.patch(url, { status, source })
.then(resp => resp.data)
}

Expand Down