Merge pull request #26822 from RocketChat/release-5.1.1

Release 5.1.1

.github/history.json

@@ -93600,6 +93600,49 @@
         "5.0"
       ],
       "pull_requests": []
+    },
+    "5.1.1": {
+      "node_version": "14.19.3",
+      "npm_version": "6.14.17",
+      "mongo_versions": [
+        "4.2",
+        "4.4",
+        "5.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "26776",
+          "title": "[FIX] Livechat trigger messages covering all the website",
+          "userLogin": "tiagoevanp",
+          "milestone": "5.1.1",
+          "contributors": [
+            "tiagoevanp",
+            "kodiakhq[bot]",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "26808",
+          "title": "[FIX] Restore current chats  default table order",
+          "userLogin": "MartinSchoeler",
+          "milestone": "5.1.1",
+          "contributors": [
+            "MartinSchoeler",
+            "kodiakhq[bot]",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "26819",
+          "title": "[FIX] Fix broken legacy message view",
+          "userLogin": "hugocostadev",
+          "description": "Fixed `messagesHistory` function, it was filtering messages only with existing threads.",
+          "milestone": "5.1.1",
+          "contributors": [
+            "hugocostadev"
+          ]
+        }
+      ]
     }
   }
 }
\ No newline at end of file

apps/meteor/.docker/Dockerfile.rhel

 FROM registry.access.redhat.com/ubi8/nodejs-12
 
-ENV RC_VERSION 5.1.0
+ENV RC_VERSION 5.1.1
 
 MAINTAINER buildmaster@rocket.chat
 

apps/meteor/app/ui/client/views/app/lib/roomHelpers.ts

@@ -42,7 +42,7 @@ function messagesHistory() {
 	const query: Mongo.Query<IMessage> = {
 		rid,
 		_hidden: { $ne: true },
-		$or: [{ tmid: { $exists: true } }, { tshow: { $eq: true } }],
+		$or: [{ tmid: { $exists: false } }, { tshow: { $eq: true } }],
 		...(hideMessagesOfType.size && { t: { $nin: Array.from(hideMessagesOfType.values()) } }),
 	};
 

apps/meteor/app/utils/rocketchat.info

 {
-	"version": "5.1.0"
+	"version": "5.1.1"
 }

apps/meteor/client/views/omnichannel/currentChats/CurrentChatsRoute.tsx

@@ -111,7 +111,7 @@ const useQuery: useQueryType = (
 	}, [guest, column, direction, itemsPerPage, current, from, to, status, servedBy, department, tags, customFields]);
 
 const CurrentChatsRoute = (): ReactElement => {
-	const { sortBy, sortDirection, setSort } = useSort<'fname' | 'departmentId' | 'servedBy' | 'ts' | 'lm' | 'open'>('fname');
+	const { sortBy, sortDirection, setSort } = useSort<'fname' | 'departmentId' | 'servedBy' | 'ts' | 'lm' | 'open'>('ts', 'desc');
 	const [customFields, setCustomFields] = useState<{ [key: string]: string }>();
 	const [params, setParams] = useState({
 		guest: '',

apps/meteor/package.json

 {
 	"name": "@rocket.chat/meteor",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "5.1.0",
+	"version": "5.1.1",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",

package.json

 {
 	"name": "rocket.chat",
-	"version": "5.1.0",
+	"version": "5.1.1",
 	"description": "Rocket.Chat Monorepo",
 	"main": "index.js",
 	"private": true,

packages/livechat/src/widget.js

@@ -70,6 +70,8 @@ function callHook(action, params) {
 }
 
 const updateWidgetStyle = (isOpened) => {
+	const isFullscreen = smallScreen && widget.dataset.state !== 'triggered';
+
 	if (smallScreen && isOpened) {
 		scrollPosition = document.documentElement.scrollTop;
 		document.body.classList.add('rc-livechat-mobile-full-screen');
@@ -80,8 +82,9 @@ const updateWidgetStyle = (isOpened) => {
 		}
 	}
 
+
 	if (isOpened) {
-		widget.style.left = smallScreen ? '0' : 'auto';
+		widget.style.left = isFullscreen ? '0' : 'auto';
 
 		/**
 		 * If we use widget.style.height = smallScreen ? '100vh' : ...
@@ -91,8 +94,8 @@ const updateWidgetStyle = (isOpened) => {
 		 * for widget.style.width
 		 */
 
-		widget.style.height = smallScreen ? '100%' : `${ WIDGET_MARGIN + widget_height + WIDGET_MARGIN + WIDGET_MINIMIZED_HEIGHT }px`;
-		widget.style.width = smallScreen ? '100%' : `${ WIDGET_MARGIN + WIDGET_OPEN_WIDTH + WIDGET_MARGIN }px`;
+		widget.style.height = isFullscreen ? '100%' : `${ WIDGET_MARGIN + widget_height + WIDGET_MARGIN + WIDGET_MINIMIZED_HEIGHT }px`;
+		widget.style.width = isFullscreen ? '100%' : `${ WIDGET_MARGIN + WIDGET_OPEN_WIDTH + WIDGET_MARGIN }px`;
 	} else {
 		widget.style.left = 'auto';
 		widget.style.width = `${ WIDGET_MARGIN + WIDGET_MINIMIZED_WIDTH + WIDGET_MARGIN }px`;
@@ -151,16 +154,16 @@ const openWidget = () => {
 	}
 
 	widget_height = WIDGET_OPEN_HEIGHT;
-	updateWidgetStyle(true);
 	widget.dataset.state = 'opened';
+	updateWidgetStyle(true);
 	iframe.focus();
 	emitCallback('chat-maximized');
 };
 
 const resizeWidget = (height) => {
 	widget_height = height;
-	updateWidgetStyle(true);
 	widget.dataset.state = 'triggered';
+	updateWidgetStyle(true);
 };
 
 function closeWidget() {
@@ -168,8 +171,8 @@ function closeWidget() {
 		return;
 	}
 
-	updateWidgetStyle(false);
 	widget.dataset.state = 'closed';
+	updateWidgetStyle(false);
 	emitCallback('chat-minimized');
 }