feat: allow inviting Data Access Users to Proposal with email by shivoomiess · Pull Request #1615 · UserOfficeProject/user-office-core

shivoomiess · 2026-06-30T14:37:34Z

Description

This PR introduces the capability to invite data access users to a proposal by creating a new data access claim.

Motivation and Context

This change is required to allow data access users to be linked directly to proposals, enabling them to view and manipulate data related to the proposal they are invited to. This enhances collaboration and data management in the project.

Changes

A new table 'data_access_claims' is created in the database to store the data access user claims.
The 'DataAccessClaimDataSource' token is added to various configuration files to enable the data access claim functionality across different environments.
The 'DataAccessClaimDataSource' is mapped to 'PostgresDataAccessClaimDataSource' in the dependency configuration files to tie the functionality with the PostgreSQL database.
GraphQL queries and mutations have been added on the frontend and backend for getting / setting DAU email invites.
The read/write path for creating invites has been mirrored from the existing code for Co Proposer Invites and corresponding mutations have been added.
On the frontend Proposal Summary page, we now see invited emails inline for both Co-Proposers and Data Access Users instead of a separate row for only co-proposers.

Visual Changes

The invite pop-ups have been updated to look clean and show the type of proposal invite (Co-Proposer / Data Access).

Current

How Has This Been Tested?

Adding and Deleting Invited Users

Changes are saved to the DB

Screen.Recording.2026-07-02.at.19.51.10.mov

Screen.Recording.2026-07-02.at.19.51.42.mov

Emails are sent correctly

Screen.Recording.2026-07-02.at.19.53.53.mov

Invite Popups for New Sign-Ups

Screen.Recording.2026-07-06.at.16.15.20.mov

Fixes Jira Issue

https://jira.ess.eu//browse/SWAP-5408

Depends On

Tests included/Docs Updated?

I have added tests to cover my changes.
All relevant doc has been updated

Summary page

yoganandaness

@shivoomiess Kindly attach relevant video or screenshot

yoganandaness

kindly test all pieces of change
Attach video or pic if possible
Pls have clean diff

jekabs-karklins

Over all looks very good :raisedhands:
As this is a bigger PR I think you will get a bit more comments :).

I have checked the PR and left some comments, and Happy to chat if any help or clarification needed.

shivoomiess

incorporated feedback

Co-Proposers

The invites.cy.ts test "Should be able to view and accept the outstanding invites with the proposal information" had failed on every CI run of this branch since 30 June. After clicking accept, the proposal table still read "No records to display" where the test expected the accepted proposal, so it only ever failed after a 30s retry, which made it look like timing noise rather than a defect. The accept helpers fired the mutation and returned immediately, so the caller ran onAccept() while the request was still in flight. The proposal table refetched before the invite had been accepted and came back empty, which is what the e2e test saw. The success snackbar had the same problem, and the .catch() that rethrew inside the promise chain surfaced as an unhandled rejection rather than reaching the component, so a failed acceptance still reported success. That is why nothing in the UI hinted at the real cause. Return the promises and await them at the call sites.

- Renumber the data access claims patch to 0214, as 0213 is taken - Block the data access users modal until the proposal has loaded, and reset the loading flag when the proposal request fails so the modal cannot get stuck on "Loading..."

setDataAccessInvites rebuilds the invite list by diffing the emails the frontend submits against the invites already attached to the proposal. That set included claimed and expired invites, while the read path (Proposal.dataAccessInvites) only returns pending ones, so an accepted invite was never in the submitted list and got deleted on the next update. Take the existing set from the invite data source filtered on isClaimed: false, which is the same set the read path returns. Both halves of the diff now operate on the same invites, so claimed invites are left alone and pending ones stay deletable.

setCoProposerInvites has the same defect as setDataAccessInvites did: it diffed the submitted emails against every invite claimed for the proposal, claimed ones included, while Proposal.coProposerInvites only returns pending invites. An accepted co-proposer invite was therefore absent from the submitted list and deleted on the next update. Take the existing set from the invite data source filtered on isClaimed: false, matching the read path, so both halves of the diff see the same invites.

…n B) The proposal-scoped lookups moved to InviteDataSource.getXInvites, so findByProposalPk has no production caller left. Remove it from both claim data source interfaces and their postgres implementations, and keep it on the mocks only. InviteDataSourceMock held its own copy of the claim rows for the getXInvites proposalPk filter while findXInvites and the mutations wrote through the claim data sources, so the two stores could disagree. Drop the internal copies and resolve the proposal scope through the injected claim mocks, which makes claims created during a test visible to every read path. Reconciling the seeds means CoProposerClaimDataSourceMock also has to claim invite 2 on proposal 1, DataAccessClaimDataSourceMock has to point at invite 4 rather than the non-existent invite 7, and InviteMutations.spec has to init the data access claim mock it never initialised before.

create() derived the new id from the array length, so once a mutation had deleted an invite the next create handed out an id that another invite still held. findById then resolved the older invite, which only became visible now that claims created during a test are read back through the claim mocks.

The read path and the setXInvites mutations each decided for themselves what a pending invite on a proposal is: InviteQueries called findXInvites(proposalPk, false) while the mutations called getXInvites({ proposalPk, isClaimed: false }). Two spellings of the same rule against two different data source methods is what let them drift apart in the first place, which is the bug this branch started from. Replace both with findPendingCoProposerInvites / findPendingDataAccessInvites on InviteDataSource. Neither caller states the filter now, so neither can disagree about it. This matches how the visit path already works, where the query and the mutation share findVisitRegistrationInvites. Dropping the isClaimed flag also fixes the mock, which took the argument and ignored it, so mocked reads returned claimed invites the postgres implementation would have filtered out.

jekabs-karklins · 2026-08-06T19:54:14Z

I thiks otherwise this looks very good, just let me know your thoughts on the comments I mentioned

shivoomiess · 2026-08-18T09:41:20Z

@zacharyjhankin @simonfernandes we need one more review before we merge this, could you please take a look? my summer engagement at ESS is concluding next week

jekabs-karklins

Looks good now, looking forward to have this feature on production 👍🏻

mutambaraf

Looks good and left few comments

mutambaraf · 2026-08-28T14:00:18Z


 export const dummyCountry = new Country(1, 'Denmark');
 export const dummyCountry2 = new Country(2, 'United Kingdom');
+export const dummyCountry3 = new Country(3, 'Belarus');


We can remove dummyCountry3 because it is not being used.

mutambaraf · 2026-08-28T14:06:07Z

  constructor(
    @inject(Tokens.CoProposerClaimDataSource)
-    private coProposerDataSource: CoProposerClaimDataSource
+    private coProposerDataSource: CoProposerClaimDataSourceMock,


We can improve naming to coProposerClaimDataSource

mutambaraf · 2026-08-28T14:09:32Z

-      coProposerClaims.map((claim) => this.findById(claim.inviteId))
-    );
+  async findPendingCoProposerInvites(proposalPk: number): Promise<Invite[]> {
+    return this.getCoProposerInvites({ proposalPk, isClaimed: false });


Maybe lets avoid hard coding this variable by actually passing in through findPendingCoProposerInvites

mutambaraf · 2026-08-28T14:12:30Z

-        }
-      })
+  findPendingCoProposerInvites(proposalPk: number): Promise<Invite[]> {
+    return this.getCoProposerInvites({ proposalPk, isClaimed: false });


We can also avoid hard coding isClaimed: false

mutambaraf · 2026-08-28T14:38:00Z

+export interface DataAccessClaimRecord {
+  readonly invite_id: number;
+  readonly proposal_pk: number;
+}
+


We can remove this if we are not using it.

mutambaraf · 2026-08-28T14:43:42Z

+      .insert({ invite_id: inviteId, proposal_pk: proposalPk })
+      .returning('*')
+      .then((rows) => {
+        const row = rows[0];


We may need to check if rows is an array and I think this is where we where supposed to use DataAccessClaimRecord

mutambaraf · 2026-08-28T14:48:24Z

+  ): Promise<Invite[]> {
+    const inviteIdsOnProposal = filter.proposalPk
+      ? (
+          await this.coProposerDataSource.findByProposalPk(filter.proposalPk)


It may be more clear if we assign the value of await this.coProposerDataSource.findByProposalPk(filter.proposalPk) to a variable an check if it is returned.

shivoomiess added 14 commits June 26, 2026 14:56

step 1: add backend models for DAU claim

11bf743

chore: comments + planning wip

eebd948

add: DB patch for DAU claim

e8785bf

add: DAU claim datasources

0a440d4

add: modify DAU datasources to allow propagate accept invite changes

690a838

add: Dependency injection changes due to DAU claims

3c248cd

add: more datasource related functions for invites

eef7581

add: mirror CoProposer invite business logic for DAU

440df87

add: events for DAU invites and email template

c981fa5

add: frontend changes for DAU invite

e9f2506

add: dataAccessInvites to where Proposal is built

5bb0f15

refactor: Show invited for Co-Proposers and DAU inline on Proposal

b7732bc

Summary page

fix: use correct auth for DAU

ce7c095

fix: read invite relevant proposal for both co-prop & DAU

f132108

shivoomiess requested review from jekabs-karklins and yoganandaness June 30, 2026 14:37

shivoomiess requested a review from a team as a code owner June 30, 2026 14:37

shivoomiess requested review from simonfernandes and removed request for a team June 30, 2026 14:37

shivoomiess added the review: please label Jun 30, 2026

shivoomiess changed the title ~~feat: Invite Data Access Users to Proposal~~ feat: allow inviting Data Access Users to Proposal with email Jun 30, 2026

yoganandaness reviewed Jul 1, 2026

View reviewed changes

yoganandaness requested changes Jul 1, 2026

View reviewed changes

Comment thread apps/backend/src/eventHandlers/logging.ts

Comment thread apps/backend/src/eventHandlers/email/essEmailHandler.ts

Comment thread apps/backend/src/mutations/InviteMutations.ts

jekabs-karklins reviewed Jul 1, 2026

View reviewed changes

Comment thread apps/backend/src/queries/InviteQueries.ts Outdated

Comment thread apps/backend/src/eventHandlers/email/essEmailHandler.ts Outdated

Comment thread apps/backend/src/mutations/InviteMutations.ts Outdated

shivoomiess added 4 commits July 2, 2026 18:06

fix: changes from review suggestions

e9637ee

fix: try catch block for DB errors,

ef2df9d

fix: fetch DA users without institution, remove redundant user details

4a8e52d

fix: LF to CRLF

709560c

shivoomiess commented Jul 3, 2026

View reviewed changes

feat(backend): auto-accept DAU invite onLogin flow to mirror

311bab1

Co-Proposers

shivoomiess added 2 commits July 28, 2026 16:49

add: updated E2E tests for DAU

4ef9f25

jekabs-karklins reviewed Jul 28, 2026

View reviewed changes

Comment thread apps/backend/db_patches/0213_AddDataAccessClaims.sql Outdated

Comment thread apps/frontend/src/components/proposal/DataAccessUsersModal.tsx Outdated

Comment thread apps/backend/src/mutations/InviteMutations.ts Outdated

shivoomiess added 7 commits July 29, 2026 11:57

Merge branch 'develop' into SWAP-5408-invite-DAU

5bf9e4b

shivoomiess requested a review from jekabs-karklins July 29, 2026 12:50

Merge branch 'develop' into SWAP-5408-invite-DAU

dafb880

jekabs-karklins reviewed Aug 6, 2026

View reviewed changes

Comment thread apps/backend/src/mutations/InviteMutations.ts

Comment thread apps/backend/src/eventHandlers/email/essEmailHandler.ts

Comment thread apps/backend/src/mutations/InviteMutations.ts

Comment thread apps/backend/src/eventHandlers/email/essEmailHandler.ts Outdated

shivoomiess added 2 commits August 7, 2026 19:38

resolve feedback

a129e6a

Merge branch 'develop' into SWAP-5408-invite-DAU

311ab19

shivoomiess mentioned this pull request Aug 18, 2026

fix: deeplinks to Proposal and Experiment #1665

Merged

2 tasks

shivoomiess and others added 2 commits August 24, 2026 15:27

Merge branch 'develop' into SWAP-5408-invite-DAU

7a4728b

Merge branch 'develop' into SWAP-5408-invite-DAU

b3dc5ce

yoganandaness requested review from TCMeldrum and jekabs-karklins and removed request for simonfernandes August 25, 2026 12:38

Merge branch 'develop' into SWAP-5408-invite-DAU

e556817

jekabs-karklins approved these changes Aug 26, 2026

View reviewed changes

yoganandaness requested a review from deepaksftc August 27, 2026 10:11

mutambaraf self-requested a review August 27, 2026 13:08

mutambaraf reviewed Aug 28, 2026

View reviewed changes

mutambaraf and others added 2 commits August 28, 2026 15:54

Merge branch 'develop' into SWAP-5408-invite-DAU

91cb147

Merge branch 'develop' into SWAP-5408-invite-DAU

8283872

Uh oh!

Conversation

shivoomiess commented Jun 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Motivation and Context

Changes

Visual Changes

Previous

Current

How Has This Been Tested?

Adding and Deleting Invited Users

Invite Popups for New Sign-Ups

Fixes Jira Issue

Depends On

Tests included/Docs Updated?

Uh oh!

yoganandaness left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

yoganandaness left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jekabs-karklins left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

shivoomiess left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jekabs-karklins commented Aug 6, 2026

Uh oh!

shivoomiess commented Aug 18, 2026

Uh oh!

jekabs-karklins left a comment

Choose a reason for hiding this comment

Uh oh!

mutambaraf left a comment

Choose a reason for hiding this comment

Uh oh!

mutambaraf Aug 28, 2026

Choose a reason for hiding this comment

Uh oh!

mutambaraf Aug 28, 2026

Choose a reason for hiding this comment

Uh oh!

mutambaraf Aug 28, 2026

Choose a reason for hiding this comment

Uh oh!

mutambaraf Aug 28, 2026

Choose a reason for hiding this comment

Uh oh!

mutambaraf Aug 28, 2026

Choose a reason for hiding this comment

Uh oh!

mutambaraf Aug 28, 2026

Choose a reason for hiding this comment

Uh oh!

mutambaraf Aug 28, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

shivoomiess commented Jun 30, 2026 •

edited

Loading