Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Chore: Settings UI issue #26053

Merged
merged 6 commits into from
Jul 2, 2022
Merged

Chore: Settings UI issue #26053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
08e6949
chore: settings ui issue
dougfabris Jun 28, 2022
c6bf0c3
Merge remote-tracking branch 'origin/develop' into chore/settings-sma…
ggazzo Jun 29, 2022
2770df7
Merge remote-tracking branch 'origin/develop' into chore/settings-sma…
ggazzo Jun 29, 2022
e5faff8
chore: packages update
dougfabris Jun 29, 2022
ee75c97
Merge branch 'develop' into chore/settings-small-issues
dougfabris Jul 1, 2022
028d553
chore: standaloneServer Locator
dougfabris Jul 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/meteor/client/components/UserCard/UserCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@ const UserCard = forwardRef(function UserCard(
)}
</Box>
<Box display='flex' flexDirection='column' flexGrow={1} flexShrink={1} mis='x24' width='1px'>
<Box mbe='x4' withTruncatedText display='flex'>
<Box mbe='x4' withTruncatedText display='flex' alignItems='center'>
{!name ? <Skeleton width='100%' /> : <UserCardUsername status={status} name={name} />}
{nickname && (
<Box flexGrow={1} flexShrink={1} flexBasis={0} title={t('Nickname')} color='hint' mis='x4' fontScale='p2' withTruncatedText>
<Box flexGrow={1} flexShrink={1} flexBasis={0} title={nickname} color='hint' mis='x4' fontScale='p2' withTruncatedText>
({nickname})
</Box>
)}
Expand Down
4 changes: 1 addition & 3 deletions apps/meteor/client/views/admin/settings/SettingsGroupCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,7 @@ const SettingsGroupCard = ({ id, title, description }: SettingsGroupCard): React
</Box>
</Card.Body>
<Card.Footer>
<Button small onClick={handleOpenGroup}>
{t('Open')}
</Button>
<Button onClick={handleOpenGroup}>{t('Open')}</Button>
</Card.Footer>
</Card>
);
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/views/admin/settings/SettingsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const SettingsPage = (): ReactElement => {

<Page.ScrollableContentWithShadow p='0'>
{isLoadingGroups && <Skeleton />}
<Grid mi='x16'>
<Grid mi='x16' mbe='x18'>
{!isLoadingGroups &&
!!groups.length &&
groups.map((group) => (
Expand Down
24 changes: 12 additions & 12 deletions apps/meteor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,29 +195,29 @@
"@rocket.chat/api-client": "workspace:^",
"@rocket.chat/apps-engine": "alpha",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/css-in-js": "~0.31.12",
"@rocket.chat/emitter": "~0.31.12",
"@rocket.chat/css-in-js": "~0.31.14",
"@rocket.chat/emitter": "~0.31.14",
"@rocket.chat/favicon": "workspace:^",
"@rocket.chat/forked-matrix-appservice-bridge": "^4.0.1",
"@rocket.chat/forked-matrix-bot-sdk": "^0.6.0-beta.2",
"@rocket.chat/fuselage": "^0.31.14",
"@rocket.chat/fuselage-hooks": "~0.31.14-dev.9",
"@rocket.chat/fuselage-polyfills": "~0.31.12",
"@rocket.chat/fuselage-toastbar": "^0.32.0-dev.22",
"@rocket.chat/fuselage-tokens": "^0.32.0-dev.9",
"@rocket.chat/fuselage": "~0.31.14",
"@rocket.chat/fuselage-hooks": "~0.31.14",
"@rocket.chat/fuselage-polyfills": "~0.31.14",
"@rocket.chat/fuselage-toastbar": "~0.31.14",
"@rocket.chat/fuselage-tokens": "~0.31.14",
"@rocket.chat/fuselage-ui-kit": "~0.32.0-dev.15",
"@rocket.chat/gazzodown": "workspace:^",
"@rocket.chat/icons": "~0.31.14",
"@rocket.chat/logo": "~0.31.12",
"@rocket.chat/memo": "~0.31.12",
"@rocket.chat/message-parser": "next",
"@rocket.chat/logo": "~0.31.14",
"@rocket.chat/memo": "~0.31.14",
"@rocket.chat/message-parser": "~0.31.14",
"@rocket.chat/model-typings": "workspace:^",
"@rocket.chat/models": "workspace:^",
"@rocket.chat/mp3-encoder": "^0.24.0",
"@rocket.chat/onboarding-ui": "~0.31.12",
"@rocket.chat/onboarding-ui": "~0.31.14",
"@rocket.chat/poplib": "workspace:^",
"@rocket.chat/rest-typings": "workspace:^",
"@rocket.chat/string-helpers": "~0.31.12",
"@rocket.chat/string-helpers": "~0.31.14",
"@rocket.chat/ui-client": "workspace:^",
"@rocket.chat/ui-contexts": "workspace:^",
"@rocket.chat/ui-kit": "~0.32.0-dev.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/tests/e2e/pageobjects/SetupWizard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export class SetupWizard extends BasePage {
}

get standaloneServer(): Locator {
return this.page.locator('//button[contains(text(), "Continue as standalone")]');
return this.page.locator('//a[contains(text(), "Continue as standalone")]');
}

get standaloneConfirmText(): Locator {
Expand Down
11 changes: 6 additions & 5 deletions packages/gazzodown/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
"@babel/core": "^7.18.5",
"@mdx-js/react": "^1.6.22",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/css-in-js": "^0.31.13",
"@rocket.chat/css-in-js": "^0.31.14",
"@rocket.chat/fuselage": "next",
"@rocket.chat/fuselage-tokens": "^0.31.13",
"@rocket.chat/fuselage-tokens": "^0.31.14",
"@rocket.chat/message-parser": "next",
"@rocket.chat/styled": "^0.31.13",
"@rocket.chat/styled": "^0.31.14",
"@rocket.chat/ui-client": "workspace:^",
"@rocket.chat/ui-contexts": "workspace:^",
"@storybook/addon-actions": "^6.5.9",
Expand Down Expand Up @@ -62,10 +62,11 @@
],
"peerDependencies": {
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/css-in-js": "*",
"@rocket.chat/fuselage": "*",
"@rocket.chat/fuselage-tokens": "^0.31.13",
"@rocket.chat/fuselage-tokens": "*",
"@rocket.chat/message-parser": "*",
"@rocket.chat/styled": "^0.31.13",
"@rocket.chat/styled": "*",
"@rocket.chat/ui-client": "workspace:^",
"@rocket.chat/ui-contexts": "workspace:^",
"katex": "*",
Expand Down
8 changes: 6 additions & 2 deletions packages/livechat/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
"devDependencies": {
"@babel/preset-env": "^7.11.5",
"@rocket.chat/eslint-config": "^0.4.0",
"@rocket.chat/fuselage-tokens": "~0.31.14",
"@rocket.chat/logo": "~0.31.14",
"@storybook/addon-actions": "^6.5.8",
"@storybook/addon-backgrounds": "^6.5.8",
"@storybook/addon-essentials": "^6.5.8",
Expand Down Expand Up @@ -78,9 +80,11 @@
"webpack-cli": "^3.3.12",
"webpack-dev-server": "^3.11.0"
},
"peerDependencies": {
"@rocket.chat/fuselage-tokens": "*",
"@rocket.chat/logo": "*"
},
"dependencies": {
"@rocket.chat/fuselage-tokens": "~0.31.11",
"@rocket.chat/logo": "^0.31.11",
"@rocket.chat/sdk": "^1.0.0-alpha.42",
"@rocket.chat/ui-kit": "^0.14.1",
"crypto-js": "^4.1.1",
Expand Down
Loading