Skip to content

[WPB-28089] Treat team collaborators like team members in contact search. - #5452

Merged
fisx merged 9 commits into
developfrom
WPB-28089-treat-team-collaborators-like-team-members-in-contact-search
Aug 26, 2026
Merged

[WPB-28089] Treat team collaborators like team members in contact search.#5452
fisx merged 9 commits into
developfrom
WPB-28089-treat-team-collaborators-like-team-members-in-contact-search

Conversation

@fisx

@fisx fisx commented Aug 17, 2026

Copy link
Copy Markdown
Contributor

https://wearezeta.atlassian.net/browse/WPB-28089

Checklist

  • Add a new entry in an appropriate subdirectory of changelog.d
  • Read and follow the PR guidelines

@fisx
fisx force-pushed the WPB-28089-treat-team-collaborators-like-team-members-in-contact-search branch from c988cd7 to c378cd1 Compare August 21, 2026 14:38
@zebot zebot added the ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist label Aug 21, 2026
@fisx
fisx force-pushed the WPB-28089-treat-team-collaborators-like-team-members-in-contact-search branch from c378cd1 to 21812b5 Compare August 24, 2026 12:39
Comment thread services/brig/src/Brig/API/Internal.hs Outdated
Comment thread libs/wire-subsystems/src/Wire/IndexedUserStore/Bulk/ElasticSearch.hs Outdated
@fisx
fisx force-pushed the WPB-28089-treat-team-collaborators-like-team-members-in-contact-search branch from fcd51ce to 3525f18 Compare August 25, 2026 09:16
@fisx
fisx force-pushed the WPB-28089-treat-team-collaborators-like-team-members-in-contact-search branch from 3525f18 to e5336f6 Compare August 25, 2026 13:08
fisx added 5 commits August 25, 2026 16:34
Was previously UserSubsystem, but since it TeamCollaboratorsSubsystem
is also used outside of Brig, that is not always available.

Further changes:

- Support BrigAPIAccess locally in Brig.
- Change collaborator field type in UserDoc to collapse `Nothing` and
  `Just []` (remove the Maybe).
(I don't understand what it is about, and there is no author to ask.)
(This end-point only updates searchability settings, nothing else.)
This is only where we don't expect to use it.  if we're wrong about
this, a warning will be logged.
@fisx
fisx force-pushed the WPB-28089-treat-team-collaborators-like-team-members-in-contact-search branch from e5336f6 to 6ae1977 Compare August 25, 2026 14:51
@fisx
fisx marked this pull request as ready for review August 25, 2026 14:56
@fisx
fisx requested review from a team as code owners August 25, 2026 14:56
@@ -0,0 +1,65 @@
-- This file is part of the Wire Server implementation.
--
-- Copyright (C) 2025 Wire Swiss GmbH <opensource@wire.com>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
-- Copyright (C) 2025 Wire Swiss GmbH <opensource@wire.com>
-- Copyright (C) 2026 Wire Swiss GmbH <opensource@wire.com>

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I'll set up headroom again, to fix this once and for all. But not in this PR! :-)

@@ -0,0 +1,80 @@
-- This file is part of the Wire Server implementation.
--
-- Copyright (C) 2025 Wire Swiss GmbH <opensource@wire.com>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
-- Copyright (C) 2025 Wire Swiss GmbH <opensource@wire.com>
-- Copyright (C) 2026 Wire Swiss GmbH <opensource@wire.com>

@fisx
fisx merged commit 3309e7b into develop Aug 26, 2026
9 checks passed
@fisx
fisx deleted the WPB-28089-treat-team-collaborators-like-team-members-in-contact-search branch August 26, 2026 08:02
fisx added a commit that referenced this pull request Aug 27, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants