feat: only show instruments and calls on tags for proposal reader role by ellen-wright · Pull Request #1465 · UserOfficeProject/user-office-core

ellen-wright · 2026-04-08T10:07:21Z

Description

refs: UserOfficeProject/issue-tracker#1562

This PR makes it so that only calls and instruments on tags attached to the specific proposal reader role are shown in the proposal filters.

Motivation and Context

Currently all calls and instruments are shown even if a user does not have access to them through the tags attached tot eh proposal reader role.

Changes

Adds two new graphQL queries

getInstrumentsByRole
getCallsByRole

These are called from the instrument and call hooks when logged in on the proposal reader role and returns only the calls and instruments that are assigned to any tag attached to the role.
If there are no tags on a role or you are using the root proposal reader role then all calls and instruments are returned, similarly to user officer.

Depends on

Tests included/Docs Updated?

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

mutambaraf

Just some comments looks good.

mutambaraf · 2026-04-08T13:33:41Z

apps/backend/src/resolvers/queries/CallsQuery.ts

+  callsByRole(@Ctx() context: ResolverContext) {
+    const t = context.queries.call.getTagCallsByRoleId(context.user);
+
+    return t;


We can remove the variable declaration here.

mutambaraf · 2026-04-08T13:35:09Z

apps/backend/src/datasources/mockups/RoleDataSource.ts

      isRootRole: false,
    } as Role;
  }
+  async getCallsbyRoleId(agent: number): Promise<Call[]> {


We can use camelCase here : getCallsByRoleId

mutambaraf · 2026-04-08T13:35:42Z

apps/backend/src/datasources/postgres/RoleDataSource.ts

    }
  }
+
+  async getCallsbyRoleId(agent: number): Promise<Call[]> {


We can improve naming here to getCallsByRoleId

mutambaraf · 2026-04-08T13:36:46Z

apps/backend/src/datasources/postgres/RoleDataSource.ts

+    }
+  }
+
+  async getInstrumentsbyRoleId(agent: number): Promise<Instrument[]> {


We can improve naming to : getInstrumentsbyRoleId

mutambaraf · 2026-04-08T13:38:55Z

apps/backend/src/datasources/postgres/RoleDataSource.ts

+      const tagIds = tags.map((tag) => tag.id);
+      if (tagIds.length != 0) {
+        const instruments = await database<InstrumentRecord>(
+          'tag_instrument as fi'


Maybe we can name it to ti here.

mutambaraf · 2026-04-08T13:54:29Z

apps/frontend/src/hooks/call/useCallsData.ts

+    if (currentRole === UserRole.PROPOSAL_READER) {
+      getCallsByRole({}).then((data) => {
+        if (unmounted) {
+          return;
+        }
+        if (data.callsByRole) {
+          setCalls(data.callsByRole as Call[]);
+          setLoadingCalls(false);
+        }
+      });
+    } else {
+      getCalls({ filter: callsFilter, ...callsQueryParams }).then((data) => {
+        if (unmounted) {
+          return;
+        }

-    getCalls({ filter: callsFilter, ...callsQueryParams }).then((data) => {
-      if (unmounted) {
-        return;
-      }
-
-      if (data.calls) {
-        setCalls(data.calls as Call[]);
-      }
-      setLoadingCalls(false);
-    });
+        if (data.calls) {
+          setCalls(data.calls as Call[]);
+        }
+        setLoadingCalls(false);
+      });
+    }


I think in the backend we technically do not care if a user has UserRole.PROPOSAL_READER so do not know if we need the if switch here. Lets just add the filters callsFilter, ...callsQueryParams to getCallsByRole endpoint and use it for all calls.

This is because the get calls and instruments by tag isn't needed for User Officers and other roles so it's not necessary to alter how the filters are populated for them

mutambaraf · 2026-04-08T13:57:14Z

apps/frontend/src/hooks/call/useCallsData.ts

+    if (currentRole === UserRole.PROPOSAL_READER) {
+      getCallsByRole({}).then((data) => {
+        if (unmounted) {
+          return;
+        }
+        if (data.callsByRole) {
+          setCalls(data.callsByRole as Call[]);
+          setLoadingCalls(false);
+        }
+      });
+    } else {
+      getCalls({ filter: callsFilter, ...callsQueryParams }).then((data) => {


If we are getting the calls by roles do we still need the if statement here we may just need to pass in the filters.

This separation is because currently the proposal reader is the role that changes depending on what tags are assigned

mutambaraf · 2026-04-08T13:58:40Z

apps/frontend/src/hooks/instrument/useInstrumentsMinimalData.ts

+    } else if (currentRole === UserRole.PROPOSAL_READER) {
+      api()
+        .getInstrumentsByRole()
+        .then((data) => {
+          if (unmounted) {
+            return;
+          }
+
+          if (data.instrumentByRole) {
+            setInstruments(data.instrumentByRole);
+          }
+          setLoadingInstruments(false);
+        });
    } else {
      api()
        .getMyInstrumentsMinimal()


I have added a comment above.

mutambaraf · 2026-04-08T14:04:50Z

apps/backend/src/datasources/postgres/RoleDataSource.ts

+      const tags = await this.getTagsByRoleId(agent);
+      const tagIds = tags.map((tag) => tag.id);


The tags variable can be handled this way, If getTagsByRoleId(agent) returns null or undefined, the subsequent .map() call will throw a runtime error. Consider defaulting to an empty array to ensure safety: const tags = (await this.getTagsByRoleId(agent)) ?? [];."

…com/UserOfficeProject/user-office-core into 1562-fix-filters-for-read-only-role

mutambaraf

LGTM

jekabs-karklins

question: will the proposal reader role will be able to get all calls by calling the previous call getCalls, say buy crafting the GraphQL request? If yes, I'm therefore thinking if it isn't better to simply modify the existing getCalls and getCallsMinimal and filter out calls that proposal reader is not part of in the backend query. Or was it what @mutambaraf already asked?

…com/UserOfficeProject/user-office-core into 1562-fix-filters-for-read-only-role

ellen-wright · 2026-04-10T13:36:12Z

question: will the proposal reader role will be able to get all calls by calling the previous call getCalls, say buy crafting the GraphQL request? If yes, I'm therefore thinking if it isn't better to simply modify the existing getCalls and getCallsMinimal and filter out calls that proposal reader is not part of in the backend query. Or was it what @mutambaraf already asked?

Yeah I agree, I have removed the new queries and added them to the original call and instrument queries

ellen-wright added 2 commits April 8, 2026 10:33

Only show instruments and calls on tags for proposal reader role

374931a

Return all calls and instruments for a role with no tags

edc6a1d

ellen-wright requested a review from a team as a code owner April 8, 2026 10:07

ellen-wright requested review from Scott-James-Hurley and removed request for a team April 8, 2026 10:07

Merge branch 'develop' into 1562-fix-filters-for-read-only-role

d3359e3

ellen-wright requested review from mutambaraf and removed request for Scott-James-Hurley April 8, 2026 10:07

mutambaraf reviewed Apr 8, 2026

View reviewed changes

mutambaraf and others added 4 commits April 8, 2026 15:37

Merge branch 'develop' into 1562-fix-filters-for-read-only-role

d150e53

Naming changes

4c0a021

Merge branch '1562-fix-filters-for-read-only-role' of https://github.…

30770e6

…com/UserOfficeProject/user-office-core into 1562-fix-filters-for-read-only-role

Merge branch 'develop' into 1562-fix-filters-for-read-only-role

29cf396

ellen-wright requested review from jekabs-karklins and mutambaraf April 9, 2026 12:29

mutambaraf approved these changes Apr 10, 2026

View reviewed changes

jekabs-karklins reviewed Apr 10, 2026

View reviewed changes

ellen-wright added 3 commits April 10, 2026 11:29

remove new call query

9cef691

Merge branch '1562-fix-filters-for-read-only-role' of https://github.…

75905fe

…com/UserOfficeProject/user-office-core into 1562-fix-filters-for-read-only-role

Remove new instrument query

37250f4

jekabs-karklins approved these changes Apr 10, 2026

View reviewed changes

Remove unneeded imports

62bee2c

		const tags = await this.getTagsByRoleId(agent);
		const tagIds = tags.map((tag) => tag.id);

Conversation

ellen-wright commented Apr 8, 2026

Description

Motivation and Context

Changes

Depends on

Tests included/Docs Updated?

Uh oh!

mutambaraf left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mutambaraf left a comment

Choose a reason for hiding this comment

Uh oh!

jekabs-karklins left a comment

Choose a reason for hiding this comment

Uh oh!

ellen-wright commented Apr 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants