-
Notifications
You must be signed in to change notification settings - Fork 291
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
refactor: readonly conversation indication #17369
Merged
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 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 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
77 changes: 0 additions & 77 deletions
77
src/script/components/Conversation/ReadOnlyConversationMessage.tsx
This file was deleted.
Oops, something went wrong.
94 changes: 94 additions & 0 deletions
94
.../components/Conversation/ReadOnlyConversationMessage/ReadOnlyConversationMessage.test.tsx
This file contains 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,94 @@ | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2024 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 {render} from '@testing-library/react'; | ||
| import {ConnectionStatus} from '@wireapp/api-client/lib/connection'; | ||
| import {CONVERSATION_TYPE} from '@wireapp/api-client/lib/conversation'; | ||
|
|
||
| import {withTheme} from 'src/script/auth/util/test/TestUtil'; | ||
| import {ConnectionEntity} from 'src/script/connection/ConnectionEntity'; | ||
| import {CONVERSATION_READONLY_STATE} from 'src/script/conversation/ConversationRepository'; | ||
| import {Conversation} from 'src/script/entity/Conversation'; | ||
| import {User} from 'src/script/entity/User'; | ||
|
|
||
| import {ReadOnlyConversationMessage} from './ReadOnlyConversationMessage'; | ||
|
|
||
| const generateConversation = ( | ||
| readOnlyState: CONVERSATION_READONLY_STATE | null = null, | ||
| is1To1WithBlockedUser = false, | ||
| userName = 'John Doe', | ||
| ) => { | ||
| const conversation = new Conversation(); | ||
| conversation.type(CONVERSATION_TYPE.ONE_TO_ONE); | ||
| conversation.readOnlyState(readOnlyState); | ||
|
|
||
| const connection = new ConnectionEntity(); | ||
|
|
||
| if (is1To1WithBlockedUser) { | ||
| connection.status(ConnectionStatus.BLOCKED); | ||
| } | ||
|
|
||
| const user = new User('user-id', 'user-domain'); | ||
| user.name(userName); | ||
| conversation.participating_user_ets([user]); | ||
| conversation.participating_user_ids([user.qualifiedId]); | ||
|
|
||
| user.connection(connection); | ||
| connection.userId = user.qualifiedId; | ||
|
|
||
| return conversation; | ||
| }; | ||
|
|
||
| describe('ReadOnlyConversationMessage', () => { | ||
| it('renders mls is not supported by the other user', () => { | ||
| const conversation = generateConversation( | ||
| CONVERSATION_READONLY_STATE.READONLY_ONE_TO_ONE_OTHER_UNSUPPORTED_MLS, | ||
| false, | ||
| ); | ||
|
|
||
| const {getByText} = render( | ||
| withTheme(<ReadOnlyConversationMessage conversation={conversation} reloadApp={() => {}} />), | ||
| ); | ||
|
|
||
| expect(getByText('otherUserNotSupportMLSMsg')).toBeDefined(); | ||
| }); | ||
|
|
||
| it('renders mls is not supported by the self user', () => { | ||
| const conversation = generateConversation( | ||
| CONVERSATION_READONLY_STATE.READONLY_ONE_TO_ONE_SELF_UNSUPPORTED_MLS, | ||
| false, | ||
| ); | ||
|
|
||
| const reloadAppMock = jest.fn(); | ||
|
|
||
| const {getByText} = render( | ||
| withTheme(<ReadOnlyConversationMessage reloadApp={reloadAppMock} conversation={conversation} />), | ||
| ); | ||
|
|
||
| const reloadButton = getByText('downloadLatestMLS'); | ||
|
|
||
| expect(getByText('selfNotSupportMLSMsgPart1')).toBeDefined(); | ||
| expect(reloadButton).toBeDefined(); | ||
| expect(getByText('selfNotSupportMLSMsgPart2')).toBeDefined(); | ||
|
|
||
| reloadButton.click(); | ||
|
|
||
| expect(reloadAppMock).toHaveBeenCalled(); | ||
| }); | ||
| }); |
109 changes: 109 additions & 0 deletions
109
...cript/components/Conversation/ReadOnlyConversationMessage/ReadOnlyConversationMessage.tsx
This file contains 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,109 @@ | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2023 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 {FC, ReactNode} from 'react'; | ||
|
|
||
| import {Link, LinkVariant} from '@wireapp/react-ui-kit'; | ||
|
|
||
| import {Icon} from 'Components/Icon'; | ||
| import {CONVERSATION_READONLY_STATE} from 'src/script/conversation/ConversationRepository'; | ||
| import {Conversation} from 'src/script/entity/Conversation'; | ||
| import {useKoSubscribableChildren} from 'Util/ComponentUtil'; | ||
| import {t} from 'Util/LocalizerUtil'; | ||
| import {replaceReactComponents} from 'Util/LocalizerUtil/ReactLocalizerUtil'; | ||
|
|
||
| interface ReadOnlyConversationMessageProps { | ||
| reloadApp: () => void; | ||
| conversation: Conversation; | ||
| } | ||
|
|
||
| export const ReadOnlyConversationMessage: FC<ReadOnlyConversationMessageProps> = ({conversation, reloadApp}) => { | ||
| const { | ||
| readOnlyState, | ||
| is1to1, | ||
| participating_user_ets: participatingUserEts, | ||
| } = useKoSubscribableChildren(conversation, ['readOnlyState', 'is1to1', 'participating_user_ets']); | ||
|
|
||
| const user = (is1to1 && participatingUserEts[0]) || null; | ||
|
|
||
| if (!user) { | ||
| // This should never happen for 1:1 conversations | ||
| return null; | ||
| } | ||
|
|
||
| if (readOnlyState) { | ||
| switch (readOnlyState) { | ||
| case CONVERSATION_READONLY_STATE.READONLY_ONE_TO_ONE_OTHER_UNSUPPORTED_MLS: | ||
| return ( | ||
| <ReadOnlyConversationMessageBase> | ||
| <span> | ||
| {replaceReactComponents(t('otherUserNotSupportMLSMsg'), [ | ||
| { | ||
| exactMatch: '{{participantName}}', | ||
| render: () => <strong>{user.name()}</strong>, | ||
| }, | ||
| ])} | ||
| </span> | ||
| </ReadOnlyConversationMessageBase> | ||
| ); | ||
| case CONVERSATION_READONLY_STATE.READONLY_ONE_TO_ONE_SELF_UNSUPPORTED_MLS: | ||
| return ( | ||
| <ReadOnlyConversationMessageBase> | ||
| <span> | ||
| {replaceReactComponents(t('selfNotSupportMLSMsgPart1'), [ | ||
| { | ||
| exactMatch: '{{selfUserName}}', | ||
| render: () => <strong>{user.name()}</strong>, | ||
| }, | ||
| ])} | ||
| </span> | ||
| <> | ||
| {' '} | ||
| <Link | ||
| css={{fontSize: 'var(--font-size-small)', fontWeight: 'var(--font-weight-semibold)'}} | ||
| onClick={reloadApp} | ||
| variant={LinkVariant.PRIMARY} | ||
| data-uie-name="do-update-mls" | ||
| > | ||
| {t('downloadLatestMLS')} | ||
| </Link>{' '} | ||
| <span>{t('selfNotSupportMLSMsgPart2')}</span> | ||
| </> | ||
| </ReadOnlyConversationMessageBase> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| return null; | ||
| }; | ||
|
|
||
| const ReadOnlyConversationMessageBase = ({children}: {children: ReactNode}) => { | ||
| return ( | ||
| <div className="readonly-message-header readonly-message-container"> | ||
| <div className="readonly-message-header-icon readonly-message-header-icon--svg"> | ||
| <div> | ||
| <Icon.Info /> | ||
| </div> | ||
| </div> | ||
| <p className="readonly-message-header-label" data-uie-name="element-readonly-conversation"> | ||
| {children} | ||
| </p> | ||
| </div> | ||
| ); | ||
| }; |
This file contains 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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Question: Is localisation in German done for those? Might be worth it to cherrypick the localisation commit too if we want to avoid the
[bold]tag to appear as a stringThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When merged to dev, these changes were made automatically for German
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So I guess it will happen automatically here as well
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's see, it didn't work out that way on master last time :|
Let's worry about it when we get there 🤞