Merge pull request #18665 from RocketChat/release-3.5.4

sampaiodiego · web-flow · commit ef234790be55 · 2020-08-24T20:21:36.000-03:00
Release 3.5.4
diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.5.3
+ENV RC_VERSION 3.5.4
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
@@ -48074,6 +48074,28 @@
           ]
         }
       ]
+    },
+    "3.5.4": {
+      "node_version": "12.16.1",
+      "npm_version": "6.14.0",
+      "apps_engine_version": "1.16.0",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "18621",
+          "title": "[FIX] MarkdownText usage",
+          "userLogin": "ggazzo",
+          "milestone": "3.5.4",
+          "contributors": [
+            "ggazzo",
+            "web-flow"
+          ]
+        }
+      ]
     }
   }
 }
diff --git a/.snapcraft/resources/prepareRocketChat b/.snapcraft/resources/prepareRocketChat
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-curl -SLf "https://releases.rocket.chat/3.5.3/download/" -o rocket.chat.tgz
+curl -SLf "https://releases.rocket.chat/3.5.4/download/" -o rocket.chat.tgz
 
 tar xf rocket.chat.tgz --strip 1
 
diff --git a/.snapcraft/snap/snapcraft.yaml b/.snapcraft/snap/snapcraft.yaml
@@ -7,7 +7,7 @@
 # 5.  `snapcraft snap`
 
 name: rocketchat-server
-version: 3.5.3
+version: 3.5.4
 summary: Rocket.Chat server
 description: Have your own Slack like online chat, built with Meteor. https://rocket.chat/
 confinement: strict
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,4 +1,22 @@
 
+# 3.5.4
+`2020-08-24  ·  1 🐛  ·  1 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `12.16.1`
+- NPM: `6.14.0`
+- MongoDB: `3.4, 3.6, 4.0`
+- Apps-Engine: `1.16.0`
+
+### 🐛 Bug fixes
+
+
+- MarkdownText usage ([#18621](https://github.com/RocketChat/Rocket.Chat/pull/18621))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@ggazzo](https://github.com/ggazzo)
+
 # 3.5.3
 `2020-08-19  ·  3 🐛  ·  2 👩‍💻👨‍💻`
 
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "3.5.3"
+	"version": "3.5.4"
 }
diff --git a/client/admin/cloud/ManualWorkspaceRegistrationModal.js b/client/admin/cloud/ManualWorkspaceRegistrationModal.js
@@ -67,7 +67,7 @@ function CopyStep({ onNextButtonClick }) {
 					<Icon name='copy' /> {t('Copy')}
 				</Button>
 			</Box>
-			<MarkdownText is='p' withRichContent content={t('Cloud_click_here', { cloudConsoleUrl })} />
+			<MarkdownText is='p' preserveHtml={true} withRichContent content={t('Cloud_click_here', { cloudConsoleUrl })} />
 		</Modal.Content>
 		<Modal.Footer>
 			<ButtonGroup>
diff --git a/client/admin/settings/Setting.js b/client/admin/settings/Setting.js
@@ -132,7 +132,7 @@ export function Setting({ className, settingId, sectionChanged }) {
 	} = setting;
 
 	const label = (i18nLabel && t(i18nLabel)) || (_id || t(_id));
-	const hint = useMemo(() => t.has(i18nDescription) && <MarkdownText content={t(i18nDescription)} />, [i18nDescription, t]);
+	const hint = useMemo(() => t.has(i18nDescription) && <MarkdownText preserveHtml={true} content={t(i18nDescription)} />, [i18nDescription, t]);
 	const callout = useMemo(() => alert && <span dangerouslySetInnerHTML={{ __html: t(alert) }} />, [alert, t]);
 	const hasResetButton = !disableReset && !readonly && type !== 'asset' && (JSON.stringify(packageEditor) !== JSON.stringify(editor) || JSON.stringify(value) !== JSON.stringify(packageValue)) && !disabled;
 
diff --git a/client/components/basic/MarkdownText.js b/client/components/basic/MarkdownText.js
@@ -1,17 +1,18 @@
+import s from 'underscore.string';
 import { Box } from '@rocket.chat/fuselage';
 import React, { useMemo } from 'react';
 import marked from 'marked';
 
 marked.InlineLexer.rules.gfm.strong = /^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)|^\*(?=\S)([\s\S]*?\S)\*(?!\*)/;
 marked.InlineLexer.rules.gfm.em = /^__(?=\S)([\s\S]*?\S)__(?!_)|^_(?=\S)([\s\S]*?\S)_(?!_)/;
 
-function MarkdownText({ content, ...props }) {
-	const options = useMemo(() => ({
-		gfm: true,
-		headerIds: false,
-	}), []);
+const options = {
+	gfm: true,
+	headerIds: false,
+};
 
-	const __html = useMemo(() => content && marked(content, options), [content, options]);
+function MarkdownText({ content, preserveHtml = false, ...props }) {
+	const __html = useMemo(() => content && marked(preserveHtml ? content : s.escapeHTML(content), options), [content, preserveHtml]);
 
 	return <Box dangerouslySetInnerHTML={{ __html }} withRichContent {...props} />;
 }
diff --git a/client/components/basic/UserCard.js b/client/components/basic/UserCard.js
@@ -4,6 +4,7 @@ import { Box, Tag, Button, Icon, Skeleton } from '@rocket.chat/fuselage';
 import { ActionButton } from './Buttons/ActionButton';
 import UserAvatar from './avatar/UserAvatar';
 import * as Status from './UserStatus';
+import MarkdownText from './MarkdownText';
 
 const clampStyle = {
 	display: '-webkit-box',
@@ -84,7 +85,7 @@ const UserCard = forwardRef(({
 		{ customStatus && <Info>{customStatus}</Info> }
 		<Roles>{roles}</Roles>
 		<Info>{localTime}</Info>
-		{ bio && <Info withTruncatedText={false} style={clampStyle} height='x60'>{bio}</Info> }
+		{ bio && <Info withTruncatedText={false} style={clampStyle} height='x60'><MarkdownText content={bio}/></Info> }
 		{open && <a onClick={open}>{t('See_full_profile')}</a>}
 	</Box>
 	{onClose && <Box><ActionButton icon='cross' onClick={onClose}/></Box>}
diff --git a/client/views/directory/UserTab.js b/client/views/directory/UserTab.js
@@ -11,8 +11,7 @@ import { useEndpointData } from '../../hooks/useEndpointData';
 import { useFormatDate } from '../../hooks/useFormatDate';
 import UserAvatar from '../../components/basic/avatar/UserAvatar';
 import NotAuthorizedPage from '../../components/NotAuthorizedPage';
-
-const style = { whiteSpace: 'nowrap', textOverflow: 'ellipsis', overflow: 'hidden' };
+import MarkdownText from '../../components/basic/MarkdownText';
 
 const FilterByText = ({ setFilter, ...props }) => {
 	const t = useTranslation();
@@ -79,24 +78,24 @@ function UserTable({
 					<Flex.Item>
 						<UserAvatar size='x40' title={username} username={username} etag={avatarETag} />
 					</Flex.Item>
-					<Box style={style} grow={1} mi='x8'>
+					<Box withTruncatedText grow={1} mi='x8'>
 						<Box display='flex'>
-							<Box fontScale='p2' style={style}>{name || username}{nickname && ` (${ nickname })`}</Box> <Box mi='x4'/> <Box fontScale='p1' color='hint' style={style}>{username}</Box>
+							<Box fontScale='p2' withTruncatedText>{name || username}{nickname && ` (${ nickname })`}</Box> <Box mi='x4'/> <Box fontScale='p1' color='hint' withTruncatedText>{username}</Box>
 						</Box>
-						<Box fontScale='p1' color='hint' style={style}> {bio} </Box>
+						<MarkdownText fontScale='p1' color='hint' content={bio}/>
 					</Box>
 				</Box>
 			</Flex.Container>
 		</Table.Cell>
 		{mediaQuery && canViewFullOtherUserInfo
-			&& <Table.Cell style={style} >
+			&& <Table.Cell withTruncatedText >
 				{emails && emails[0].address}
 			</Table.Cell>}
 		{federation
-		&& <Table.Cell style={style}>
+		&& <Table.Cell withTruncatedText>
 			{domain}
 		</Table.Cell>}
-		{mediaQuery && <Table.Cell fontScale='p1' color='hint' style={style}>
+		{mediaQuery && <Table.Cell fontScale='p1' color='hint' withTruncatedText>
 			{formatDate(createdAt)}
 		</Table.Cell>}
 	</Table.Row>, [mediaQuery, federation, canViewFullOtherUserInfo, formatDate, onClick]);
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "3.5.3",
+	"version": "3.5.4",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

-Original file line number
+Diff line change
@@ @@ -1,6 +1,6 @@ @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 -ENV RC_VERSION 3.5.3
 +ENV RC_VERSION 3.5.4
 MAINTAINER [email protected]
Original file line number	Diff line number	Diff line change
`@@ -48074,6 +48074,28 @@`
`48074`	`48074`	`]`
`48075`	`48075`	`}`
`48076`	`48076`	`]`
	`48077`	`+ },`
	`48078`	`+ "3.5.4": {`
	`48079`	`+ "node_version": "12.16.1",`
	`48080`	`+ "npm_version": "6.14.0",`
	`48081`	`+ "apps_engine_version": "1.16.0",`
	`48082`	`+ "mongo_versions": [`
	`48083`	`+ "3.4",`
	`48084`	`+ "3.6",`
	`48085`	`+ "4.0"`
	`48086`	`+ ],`
	`48087`	`+ "pull_requests": [`
	`48088`	`+ {`
	`48089`	`+ "pr": "18621",`
	`48090`	`+ "title": "[FIX] MarkdownText usage",`
	`48091`	`+ "userLogin": "ggazzo",`
	`48092`	`+ "milestone": "3.5.4",`
	`48093`	`+ "contributors": [`
	`48094`	`+ "ggazzo",`
	`48095`	`+ "web-flow"`
	`48096`	`+ ]`
	`48097`	`+ }`
	`48098`	`+ ]`
`48077`	`48099`	`}`
`48078`	`48100`	`}`
`48079`	`48101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "version": "3.5.3"`
	`2`	`+ "version": "3.5.4"`
`3`	`3`	`}`