feat: Workspace/subscription ux #34057
+222
−162
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| --- | ||
| "@rocket.chat/meteor": minor | ||
| --- | ||
|
|
||
| Improves the workspace and subscription admin pages by updating font scaling, centralizing elements, | ||
| enhancing responsiveness, and refactoring components to provide a better overall user experience. |
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
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,15 @@ | ||
| import { Box, CardBody } from '@rocket.chat/fuselage'; | ||
| import type { ReactNode } from 'react'; | ||
| import React from 'react'; | ||
|
|
||
| type FeatureUsageCardBodyProps = { justifyContent?: 'flex-start' | 'center'; children: ReactNode }; | ||
|
|
||
| const FeatureUsageCardBody = ({ justifyContent = 'center', children }: FeatureUsageCardBodyProps) => ( | ||
| <CardBody> | ||
| <Box h='full' w='full' display='flex' alignItems='center' justifyContent={justifyContent} flexDirection='column'> | ||
| {children} | ||
| </Box> | ||
| </CardBody> | ||
| ); | ||
|
|
||
| export default FeatureUsageCardBody; |
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
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
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
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
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
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
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
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,15 @@ | ||
| import { Box } from '@rocket.chat/fuselage'; | ||
| import React from 'react'; | ||
|
|
||
| type WorkspaceCardSectionTitleProps = { | ||
| variant?: 'p2b' | 'h4'; | ||
| title: string; | ||
| }; | ||
|
|
||
| const WorkspaceCardSectionTitle = ({ variant = 'p2b', title }: WorkspaceCardSectionTitleProps) => ( | ||
| <Box fontScale={variant} marginBlockEnd={variant === 'h4' ? 20 : 0}> | ||
| {title} | ||
| </Box> | ||
| ); | ||
|
|
||
| export default WorkspaceCardSectionTitle; |
Unchanged files with check annotations Beta
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
| const { modifiedCount } = await updateAuditedByUser({ | ||
| _id: this.userId, | ||
| username: this.user.username!, | ||
| ip: this.requestIp, | ||
| useragent: this.request.headers['user-agent'] || '', | ||
| })(Settings.updateValueById, key, value); | ||
| const { modifiedCount } = await updateAuditedByUser({ | ||
| _id: this.userId, | ||
| username: this.user.username!, | ||
| ip: this.requestIp, | ||
| useragent: this.request.headers['user-agent'] || '', | ||
| })(Settings.updateValueById, key, value); | ||
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
| const auditSettingOperation = updateAuditedByUser({ | ||
| _id: this.userId, | ||
| username: this.user.username!, | ||
| ip: this.requestIp, | ||
| useragent: this.request.headers['user-agent'] || '', | ||
| }); | ||
| return resetAuditedSettingByUser({ | ||
| _id: this.userId, | ||
| username: this.user.username!, | ||
| ip: this.requestIp, | ||
| useragent: this.request.headers['user-agent'] || '', | ||
| })(Settings.resetValueById, settingId); | ||
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
| const auditSettingOperation = updateAuditedByUser({ | ||
| _id: this.userId, | ||
| username: this.user.username!, | ||
| ip: this.requestIp, | ||
| useragent: this.request.headers['user-agent'] || '', | ||
| }); | ||
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
| const room = await Rooms.findOneById(rid); | ||
| await Room.beforeTopicChange(room!); | ||
| const update = await Rooms.setTopicById(rid, roomTopic); | ||
| if (update && sendMessage) { | ||
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
| } | ||
| try { | ||
| const room = Rooms.findOne({ _id: this.roomId })!; | ||
| if (!room.e2eKeyId) { | ||
| this.setState(E2ERoomState.CREATING_KEYS); | ||
| await this.createGroupKey(); | ||
| // Import session key for use. | ||
| try { | ||
| const key = await importAESKey(JSON.parse(this.sessionKeyExportedString!)); | ||
| // Key has been obtained. E2E is now in session. | ||
| this.groupSessionKey = key; | ||
| } catch (error) { | ||
| await sdk.rest.post('/v1/e2e.updateGroupKey', { | ||
| rid: this.roomId, | ||
| uid: this.userId, | ||
| key: await this.encryptGroupKeyForParticipant(e2e.publicKey!), | ||
| } as any); | ||
| await this.encryptKeyForOtherParticipants(); | ||
| } catch (error) { | ||
| const usersSuggestedGroupKeys = { [this.roomId]: [] as any[] }; | ||
| for await (const user of users) { | ||
| const encryptedGroupKey = await this.encryptGroupKeyForParticipant(user.e2e!.public_key!); | ||
| const oldKeys = await this.encryptOldKeysForParticipant(user.e2e?.public_key, decryptedOldGroupKeys); | ||
| usersSuggestedGroupKeys[this.roomId].push({ _id: user._id, key: encryptedGroupKey, ...(oldKeys && { oldKeys }) }); | ||
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.