Merge remote-tracking branch 'rocketchat/master'

* rocketchat/master: Bump version to 3.11.1 [FIX] Livechat bridge permission checkers (RocketChat#20653) Fix room not being assigned to bot agent first. (RocketChat#20662) [FIX] Attachment download from title fixed (RocketChat#20585) [FIX] Gif images aspect ratio on preview (RocketChat#20654) [FIX] Update NPS banner when changing score (RocketChat#20611)
vanhoang1107 · Feb 19, 2021 · cd137d6 · cd137d6
2 parents 99a6ed6 + 7c5d6ae
commit cd137d6
Show file tree

Hide file tree

Showing 15 changed files with 159 additions and 45 deletions.
diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/ubi8/nodejs-12
 
-ENV RC_VERSION 3.11.0
+ENV RC_VERSION 3.11.1
 
 MAINTAINER buildmaster@rocket.chat
 

diff --git a/.github/history.json b/.github/history.json
@@ -55243,6 +55243,71 @@
         "4.0"
       ],
       "pull_requests": []
+    },
+    "3.11.1": {
+      "node_version": "12.18.4",
+      "npm_version": "6.14.8",
+      "apps_engine_version": "1.22.2",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "20653",
+          "title": "[FIX] Livechat bridge permission checkers",
+          "userLogin": "d-gubert",
+          "description": "Update to latest patch version of the Apps-Engine with a fix for the Livechat bridge, as seen in https://github.com/RocketChat/Rocket.Chat.Apps-engine/pull/379",
+          "milestone": "3.11.1",
+          "contributors": [
+            "d-gubert",
+            "lolimay",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "20662",
+          "title": "[FIX] Omnichannel Routing System not assigning chats to Bot agents",
+          "userLogin": "renatobecker",
+          "description": "The `Omnichannel Routing System` is no longer assigning chats to `bot` agents when the `bot` agent is the default agent of the inquiry.",
+          "milestone": "3.11.1",
+          "contributors": [
+            "renatobecker",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "20585",
+          "title": "[FIX] Attachment download from title fixed",
+          "userLogin": "yash-rajpal",
+          "description": "Added target = '_self' to attachment link, this seems to fix the problem, without this attribute, error page is displayed.",
+          "milestone": "3.11.1",
+          "contributors": [
+            "yash-rajpal",
+            "tiagoevanp",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "20654",
+          "title": "[FIX] Gif images aspect ratio on preview",
+          "userLogin": "tiagoevanp",
+          "milestone": "3.11.1",
+          "contributors": [
+            "tiagoevanp"
+          ]
+        },
+        {
+          "pr": "20611",
+          "title": "[FIX] Update NPS banner when changing score",
+          "userLogin": "sampaiodiego",
+          "milestone": "3.11.1",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        }
+      ]
     }
   }
 }
diff --git a/.snapcraft/resources/prepareRocketChat b/.snapcraft/resources/prepareRocketChat
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-curl -SLf "https://releases.rocket.chat/3.11.0/download/" -o rocket.chat.tgz
+curl -SLf "https://releases.rocket.chat/3.11.1/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.11.0
+version: 3.11.1
 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,44 @@
 
+# 3.11.1
+`2021-02-10  ·  5 🐛  ·  6 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `12.18.4`
+- NPM: `6.14.8`
+- MongoDB: `3.4, 3.6, 4.0`
+- Apps-Engine: `1.22.2`
+
+### 🐛 Bug fixes
+
+
+- Attachment download from title fixed ([#20585](https://github.com/RocketChat/Rocket.Chat/pull/20585) by [@yash-rajpal](https://github.com/yash-rajpal))
+
+  Added target = '_self' to attachment link, this seems to fix the problem, without this attribute, error page is displayed.
+
+- Gif images aspect ratio on preview ([#20654](https://github.com/RocketChat/Rocket.Chat/pull/20654))
+
+- Livechat bridge permission checkers ([#20653](https://github.com/RocketChat/Rocket.Chat/pull/20653))
+
+  Update to latest patch version of the Apps-Engine with a fix for the Livechat bridge, as seen in https://github.com/RocketChat/Rocket.Chat.Apps-engine/pull/379
+
+- Omnichannel Routing System not assigning chats to Bot agents ([#20662](https://github.com/RocketChat/Rocket.Chat/pull/20662))
+
+  The `Omnichannel Routing System` is no longer assigning chats to `bot` agents when the `bot` agent is the default agent of the inquiry.
+
+- Update NPS banner when changing score ([#20611](https://github.com/RocketChat/Rocket.Chat/pull/20611))
+
+### 👩‍💻👨‍💻 Contributors 😍
+
+- [@yash-rajpal](https://github.com/yash-rajpal)
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@d-gubert](https://github.com/d-gubert)
+- [@lolimay](https://github.com/lolimay)
+- [@renatobecker](https://github.com/renatobecker)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+- [@tiagoevanp](https://github.com/tiagoevanp)
+
 # 3.11.0
 `2021-01-31  ·  8 🎉  ·  9 🚀  ·  52 🐛  ·  44 🔍  ·  32 👩‍💻👨‍💻`
 

diff --git a/app/file-upload/server/lib/FileUpload.js b/app/file-upload/server/lib/FileUpload.js
@@ -266,7 +266,7 @@ export const FileUpload = {
 	},
 
 	uploadsOnValidate(file) {
-		if (!/^image\/((x-windows-)?bmp|p?jpeg|png)$/.test(file.type)) {
+		if (!/^image\/((x-windows-)?bmp|p?jpeg|png|gif)$/.test(file.type)) {
 			return;
 		}
 

diff --git a/app/livechat/server/lib/RoutingManager.js b/app/livechat/server/lib/RoutingManager.js
@@ -10,6 +10,7 @@ import {
 	forwardRoomToDepartment,
 	removeAgentFromSubscription,
 	updateChatDepartment,
+	allowAgentSkipQueue,
 } from './Helper';
 import { callbacks } from '../../../callbacks/server';
 import { LivechatRooms, Rooms, Messages, Users, LivechatInquiry } from '../../../models/server';
@@ -44,7 +45,7 @@ export const RoutingManager = {
 
 	async delegateInquiry(inquiry, agent) {
 		const { department, rid } = inquiry;
-		if (!agent || (agent.username && !Users.findOneOnlineAgentByUsername(agent.username))) {
+		if (!agent || (agent.username && !Users.findOneOnlineAgentByUsername(agent.username) && !allowAgentSkipQueue(agent))) {
 			agent = await this.getNextAgent(department);
 		}
 

diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "3.11.0"
+	"version": "3.11.1"
 }
diff --git a/client/components/Message/Attachments/Files/GenericFileAttachment.tsx b/client/components/Message/Attachments/Files/GenericFileAttachment.tsx
@@ -24,7 +24,7 @@ export const GenericFileAttachment: FC<GenericFileAttachmentProps> = ({
 	<Attachment>
 		{ description && <MarkdownText withRichContent={undefined} content={description} /> }
 		<Attachment.Row>
-			<Attachment.Title { ...hasDownload && link && { is: 'a', href: link, color: undefined } } >{title}</Attachment.Title>
+			<Attachment.Title { ...hasDownload && link && { is: 'a', href: link, color: undefined, target: '_blank', download: title } } >{title}</Attachment.Title>
 			{size && <Attachment.Size size={size}/>}
 			{/* {collapse} */}
 			{hasDownload && link && <Attachment.Download title={title} href={link}/>}

diff --git a/client/components/Message/Attachments/components/Image.tsx b/client/components/Message/Attachments/components/Image.tsx
@@ -60,10 +60,10 @@ const getDimensions = (width: Dimensions['width'], height: Dimensions['height'],
 	const ratio = height / width;
 
 	if (height >= width || Math.min(width, limits.width) * ratio > limits.height) {
-		return { width: width * Math.min(height, limits.height) / height, height: Math.min(height, limits.height) };
+		return { width: width * Math.min(height, limits.height) / height, height: 'auto' };
 	}
 
-	return { width: Math.min(width, limits.width), height: height * Math.min(width, limits.width) / width };
+	return { width: Math.min(width, limits.width), height: 'auto' };
 };
 
 const Image: FC<ImageProps> = ({ previewUrl, loadImage = true, setLoadImage, src, ...size }) => {

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.11.0",
+	"version": "3.11.1",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
@@ -135,7 +135,7 @@
 		"@nivo/heatmap": "^0.61.0",
 		"@nivo/line": "^0.61.1",
 		"@nivo/pie": "^0.61.1",
-		"@rocket.chat/apps-engine": "1.22.1",
+		"@rocket.chat/apps-engine": "1.22.2",
 		"@rocket.chat/css-in-js": "^0.21.0",
 		"@rocket.chat/emitter": "^0.21.0",
 		"@rocket.chat/fuselage": "^0.21.0",
-Original file line number
+Diff line change
@@ Expand Up / @@ -266,7 +266,7 @@ export const FileUpload = { @@
     	},
     	uploadsOnValidate(file) {
-    		if (!/^image\/((x-windows-)?bmp|p?jpeg|png)$/.test(file.type)) {
+    		if (!/^image\/((x-windows-)?bmp|p?jpeg|png|gif)$/.test(file.type)) {
     			return;
     		}
@@ Expand Down @@