Skip to content

[Hold Auth#21556] Show configured domain group preferred workspace to domain admins without policy access#90255

Draft
rayane-d wants to merge 6 commits into
Expensify:mainfrom
rayane-d:restrictedPrimaryPolicyName
Draft

[Hold Auth#21556] Show configured domain group preferred workspace to domain admins without policy access#90255
rayane-d wants to merge 6 commits into
Expensify:mainfrom
rayane-d:restrictedPrimaryPolicyName

Conversation

@rayane-d
Copy link
Copy Markdown
Contributor

@rayane-d rayane-d commented May 11, 2026 •
edited
Loading

Explanation of Change

The bug: PreferredWorkspaceToggle resolved the workspace name from the local Onyx policy collection and fell back to the viewer's first admin policy. Domain admins without access to the configured workspace saw their own first workspace as the title - an unrelated workspace presented as if it were the configured one.

The solution: Prefer the local policy name as before, but fall back to the server-supplied restrictedPrimaryPolicyName (from the Auth PR) on the security group instead of the viewer's first admin policy. Render the menu item whenever there's an effective name to show (so domain admins without admin policies of their own can still see what's configured), and disable navigation when the viewer has neither admin policies nor a local copy of the configured policy - since the picker would have nothing to offer in that case.

Fixed Issues

Part of https://github.com/Expensify/Expensify/issues/634391
PROPOSAL:

Tests

  1. Create two domain admins A and B in the same domain, each owning a different workspace.
  2. As A, set the security group's preferred workspace to A's workspace.
  3. As B, open the preferred workspace toggle for the group -> verify the title shows A's workspace name (not B's), and the row is navigable.
  4. As an admin C with no admin workspaces, open the toggle -> verify the title shows the configured workspace name and the row is disabled.
  • Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

Same as test

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

s2

rayane-d added 4 commits May 11, 2026 22:00
@rayane-d
Enhance SecurityGroup type by adding optional restrictedPrimaryPolicy…
bb0c6a5 
…Name field for fallback policy name.
@rayane-d
Show configured preferred workspace in group toggle for admins withou…
336cd2e 
…t policy access

PreferredWorkspaceToggle resolved the workspace name from the local Onyx policy collection and fell back to the viewer's first admin policy when the configured policy wasn't there. Domain admins without access to the configured workspace saw their own first workspace as the title.

Prefer the local policy name as before, but fall back to the server-supplied restrictedPrimaryPolicyName form the group onyx data  instead of the viewer's first admin policy. The title now reflects the actual configured workspace regardless of whether the viewer has access to its policy data
@rayane-d
Show the configured preferred workspace in group editor when admin ha…
9fcf54f 
…s no policies

The preferred workspace selector was hidden when the viewing admin had no admin policies, even if a workspace was already configured for the group.

Keep the selector visible whenever a server-supplied preferred policy name is available, even with an empty admin policy list.
@rayane-d
Disable preferred workspace menu when viewer has nothing to pick
1ac44e3 
Admins without any admin policies of their own and without a local Onyx copy of the configured policy could still tap the menu row and navigate to a picker that had nothing to offer them.

Disable the row when the viewer has neither admin policies nor a local copy of the configured policy. The title still displays the configured workspace, only the navigation is gated
@codecov
Copy link
Copy Markdown

codecov Bot commented May 11, 2026 •
edited by github-actions Bot
Loading

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
...c/pages/domain/Groups/PreferredWorkspaceToggle.tsx 0.00% <0.00%> (ø)
... and 9 files with indirect coverage changes

@rayane-d rayane-d changed the title Restricted primary policy name Show configured domain group preferred workspace to domain admins without policy access May 11, 2026
@rayane-d rayane-d changed the title Show configured domain group preferred workspace to domain admins without policy access [Hold Auth#21556] Show configured domain group preferred workspace to domain admins without policy access May 11, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@rayane-d rayane-d

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@rayane-d