-
Notifications
You must be signed in to change notification settings - Fork 308
Import participants from an existing group/channel while creating meeting [WPB-28117] #22380
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.
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
+968
−108
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
120 changes: 120 additions & 0 deletions
120
.../components/meeting/meetingParticipantsPicker/meetingConversationsSearchableList.test.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2026 Wire Swiss GmbH | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see http://www.gnu.org/licenses/. | ||
| * | ||
| */ | ||
|
|
||
| import {fireEvent, render, screen} from '@testing-library/react'; | ||
|
|
||
| import type {Conversation} from 'Repositories/entity/Conversation'; | ||
| import { | ||
| createRootContextValueForTest, | ||
| createRootProviderWrapperForTest, | ||
| } from 'src/script/page/testSupport/rootContextTestSupport'; | ||
| import {withThemeAndRootContext} from 'src/script/auth/util/test/testUtil'; | ||
|
|
||
| import {MeetingConversationsSearchableList} from './meetingConversationsSearchableList'; | ||
| import {translateForTest} from 'Util/test/translateForTest'; | ||
|
|
||
| const rootProviderWrapper = createRootProviderWrapperForTest( | ||
| createRootContextValueForTest({ | ||
| translate: translateForTest, | ||
| }), | ||
| ); | ||
|
|
||
| const createConversation = (id: string, name: string, channel = false) => | ||
| ({ | ||
| display_name: () => name, | ||
| id, | ||
| isChannel: () => channel, | ||
| participating_user_ets: () => [], | ||
| qualifiedId: {domain: 'example.com', id}, | ||
| }) as unknown as Conversation; | ||
|
|
||
| describe('MeetingConversationsSearchableList', () => { | ||
| it('renders groups and channels with their selection state', () => { | ||
| const conversations = [ | ||
| createConversation('group', 'Project group'), | ||
| createConversation('channel', 'Project channel', true), | ||
| ]; | ||
| const onSelectConversation = jest.fn(); | ||
|
|
||
| render( | ||
| withThemeAndRootContext( | ||
| <MeetingConversationsSearchableList | ||
| id="participants" | ||
| conversations={conversations} | ||
| selectedConversationIds={new Set(['example.com-group'])} | ||
| onSelectConversation={onSelectConversation} | ||
| isOpen | ||
| onOpenChange={jest.fn()} | ||
| noUnderline={false} | ||
| />, | ||
| rootProviderWrapper, | ||
| ), | ||
| ); | ||
|
|
||
| expect(screen.getByText('Project group')).toBeInTheDocument(); | ||
| expect(screen.getByText('Project channel')).toBeInTheDocument(); | ||
| expect(screen.getByRole('checkbox', {name: 'Project group'})).toBeChecked(); | ||
| expect(screen.getByRole('checkbox', {name: 'Project channel'})).not.toBeChecked(); | ||
|
|
||
| fireEvent.click(screen.getByRole('checkbox', {name: 'Project channel'})); | ||
| expect(onSelectConversation).toHaveBeenCalledWith(conversations[1]); | ||
| }); | ||
|
|
||
| it('collapses and expands the list without changing the selection handler', () => { | ||
| const onOpenChange = jest.fn(); | ||
|
|
||
| render( | ||
| withThemeAndRootContext( | ||
| <MeetingConversationsSearchableList | ||
| id="participants" | ||
| conversations={[createConversation('group', 'Project group')]} | ||
| selectedConversationIds={new Set()} | ||
| onSelectConversation={jest.fn()} | ||
| isOpen | ||
| onOpenChange={onOpenChange} | ||
| noUnderline={false} | ||
| />, | ||
| rootProviderWrapper, | ||
| ), | ||
| ); | ||
|
|
||
| fireEvent.click(screen.getByRole('button')); | ||
| expect(onOpenChange).toHaveBeenCalledWith(false); | ||
| }); | ||
|
|
||
| it('renders nothing when there are no matching conversations', () => { | ||
| render( | ||
| withThemeAndRootContext( | ||
| <MeetingConversationsSearchableList | ||
| id="participants" | ||
| conversations={[]} | ||
| selectedConversationIds={new Set()} | ||
| onSelectConversation={jest.fn()} | ||
| isOpen | ||
| onOpenChange={jest.fn()} | ||
| noUnderline={false} | ||
| />, | ||
| rootProviderWrapper, | ||
| ), | ||
| ); | ||
|
|
||
| expect(screen.queryByRole('button')).not.toBeInTheDocument(); | ||
| expect(screen.queryByText('Project group')).not.toBeInTheDocument(); | ||
| }); | ||
| }); |
112 changes: 112 additions & 0 deletions
112
...cript/components/meeting/meetingParticipantsPicker/meetingConversationsSearchableList.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2026 Wire Swiss GmbH | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see http://www.gnu.org/licenses/. | ||
| * | ||
| */ | ||
|
|
||
| import {Checkbox, CheckboxLabel, ChevronDownIcon} from '@wireapp/react-ui-kit'; | ||
|
|
||
| import {ChannelAvatar} from 'Components/avatar/channelAvatar'; | ||
| import {GroupAvatar} from 'Components/avatar/groupAvatar'; | ||
| import {listItem, listWrapper} from 'Components/participantItemContent/participantItem.styles'; | ||
| import {collapseButton, collapseIcon} from 'Components/userList/userList.styles'; | ||
| import type {Conversation} from 'Repositories/entity/Conversation'; | ||
| import {useApplicationContext} from 'src/script/page/rootProvider'; | ||
|
|
||
| import {conversationIconStyles, conversationListStyles} from './meetingParticipantsPicker.styles'; | ||
| import {getConversationKey} from './participantPickerUtils'; | ||
|
|
||
| type MeetingConversationsSearchableListProps = { | ||
| id: string; | ||
| conversations: Conversation[]; | ||
| selectedConversationIds: ReadonlySet<string>; | ||
| onSelectConversation: (conversation: Conversation) => void; | ||
| isOpen: boolean; | ||
| onOpenChange: (isOpen: boolean) => void; | ||
| noUnderline: boolean; | ||
| dataUieName?: string; | ||
| }; | ||
|
|
||
| export const MeetingConversationsSearchableList = ({ | ||
| id, | ||
| conversations, | ||
| selectedConversationIds, | ||
| onSelectConversation, | ||
| isOpen, | ||
| onOpenChange, | ||
| noUnderline, | ||
| dataUieName, | ||
| }: MeetingConversationsSearchableListProps) => { | ||
| const {translate} = useApplicationContext(); | ||
|
|
||
| if (conversations.length === 0) { | ||
| return null; | ||
| } | ||
|
|
||
| return ( | ||
| <> | ||
| <button | ||
| type="button" | ||
| onClick={() => onOpenChange(!isOpen)} | ||
| css={collapseButton} | ||
| data-uie-name={dataUieName ? `${dataUieName}-toggle` : undefined} | ||
| aria-expanded={isOpen} | ||
| aria-controls={`${id}-conversation-list`} | ||
| > | ||
| <span css={collapseIcon(isOpen)} aria-hidden="true"> | ||
| <ChevronDownIcon width={16} height={16} /> | ||
| </span> | ||
| {translate('meetings.scheduleModal.groupsAndChannels')} | ||
| </button> | ||
| <div id={`${id}-conversation-list`} css={conversationListStyles} role="list"> | ||
| {isOpen && | ||
| conversations.map(conversation => { | ||
| const conversationKey = getConversationKey(conversation); | ||
| const checkboxId = `${id}-${conversationKey}`; | ||
|
|
||
| return ( | ||
| <div key={conversationKey} css={listWrapper({noUnderline})} role="listitem"> | ||
| <Checkbox | ||
| id={checkboxId} | ||
| checked={selectedConversationIds.has(conversationKey)} | ||
| onChange={() => onSelectConversation(conversation)} | ||
| labelBeforeCheckbox | ||
| aligncenter={false} | ||
| outlineOffset="0" | ||
| > | ||
| <CheckboxLabel htmlFor={checkboxId}> | ||
| <div css={listItem()}> | ||
| {conversation.isChannel() ? ( | ||
| <ChannelAvatar | ||
| conversationID={conversation.id} | ||
| isLocked={false} | ||
| size="large" | ||
| css={conversationIconStyles} | ||
| /> | ||
| ) : ( | ||
| <GroupAvatar conversationID={conversation.id} size="medium" css={conversationIconStyles} /> | ||
| )} | ||
| <span>{conversation.display_name()}</span> | ||
| </div> | ||
| </CheckboxLabel> | ||
| </Checkbox> | ||
| </div> | ||
| ); | ||
| })} | ||
| </div> | ||
| </> | ||
| ); | ||
| }; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.