Merge branch 'develop' into chore/contacts-types

.gitignore

@@ -29,6 +29,7 @@ yarn-error.log*
 .env.test.local
 .env.production.local
 
+storybook-static
 # turbo
 .turbo
 

apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts

@@ -1,6 +1,7 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import type { Mongo } from 'meteor/mongo';
 import { useEffect, useMemo } from 'react';
 
 import { ChatRoom } from '../../../../../app/models/client';
@@ -12,7 +13,7 @@ const sortRoomByLastMessage = (a: IRoom, b: IRoom) => {
 	if (!b.lm) {
 		return -1;
 	}
-	return new Date(b.lm).toUTCString().localeCompare(new Date(a.lm).toUTCString());
+	return b.lm.getTime() - a.lm.getTime();
 };
 
 export const useTeamsListChildrenUpdate = (
@@ -23,7 +24,7 @@ export const useTeamsListChildrenUpdate = (
 	const queryClient = useQueryClient();
 
 	const query = useMemo(() => {
-		const query: Parameters<typeof ChatRoom.find>[0] = {
+		const query: Mongo.Selector<IRoom> = {
 			$or: [
 				{
 					_id: parentRid,

packages/ui-composer/package.json

@@ -1,52 +1,54 @@
 {
-  "name": "@rocket.chat/ui-composer",
-  "version": "0.3.0-rc.0",
-  "private": true,
-  "main": "./dist/index.js",
-  "typings": "./dist/index.d.ts",
-  "files": [
-    "/dist"
-  ],
-  "scripts": {
-    "lint": "eslint --ext .js,.jsx,.ts,.tsx .",
-    "lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix",
-    "build": "rm -rf dist && tsc -p tsconfig.build.json",
-    "typecheck": "tsc --noEmit",
-    "dev": "tsc -p tsconfig.build.json --watch --preserveWatchOutput",
-    "storybook": "start-storybook -p 6006"
-  },
-  "devDependencies": {
-    "@babel/core": "~7.22.20",
-    "@react-aria/toolbar": "^3.0.0-beta.1",
-    "@rocket.chat/eslint-config": "workspace:^",
-    "@rocket.chat/fuselage": "^0.59.1",
-    "@rocket.chat/icons": "~0.38.0",
-    "@storybook/addon-actions": "~6.5.16",
-    "@storybook/addon-docs": "~6.5.16",
-    "@storybook/addon-essentials": "~6.5.16",
-    "@storybook/builder-webpack4": "~6.5.16",
-    "@storybook/manager-webpack4": "~6.5.16",
-    "@storybook/react": "~6.5.16",
-    "@storybook/testing-library": "~0.0.13",
-    "@types/react": "~17.0.80",
-    "@types/react-dom": "~17.0.25",
-    "eslint": "~8.45.0",
-    "eslint-plugin-react": "~7.32.2",
-    "eslint-plugin-react-hooks": "~4.6.2",
-    "eslint-plugin-storybook": "~0.6.15",
-    "react": "~17.0.2",
-    "react-docgen-typescript-plugin": "~1.0.8",
-    "react-dom": "~17.0.2",
-    "typescript": "~5.5.4"
-  },
-  "peerDependencies": {
-    "@react-aria/toolbar": "*",
-    "@rocket.chat/fuselage": "*",
-    "@rocket.chat/icons": "*",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2"
-  },
-  "volta": {
-    "extends": "../../package.json"
-  }
+	"name": "@rocket.chat/ui-composer",
+	"version": "0.3.0-rc.0",
+	"private": true,
+	"main": "./dist/index.js",
+	"typings": "./dist/index.d.ts",
+	"files": [
+		"/dist"
+	],
+	"scripts": {
+		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
+		"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix",
+		"build": "rm -rf dist && tsc -p tsconfig.build.json",
+		"typecheck": "tsc --noEmit",
+		"dev": "tsc -p tsconfig.build.json --watch --preserveWatchOutput",
+		"storybook": "start-storybook -p 6006",
+		"build-preview": "build-storybook",
+		".:build-preview-move": "mkdir -p ../../.preview/ && cp -r ./storybook-static ../../.preview/ui-composer"
+	},
+	"devDependencies": {
+		"@babel/core": "~7.22.20",
+		"@react-aria/toolbar": "^3.0.0-beta.1",
+		"@rocket.chat/eslint-config": "workspace:^",
+		"@rocket.chat/fuselage": "^0.59.1",
+		"@rocket.chat/icons": "~0.38.0",
+		"@storybook/addon-actions": "~6.5.16",
+		"@storybook/addon-docs": "~6.5.16",
+		"@storybook/addon-essentials": "~6.5.16",
+		"@storybook/builder-webpack4": "~6.5.16",
+		"@storybook/manager-webpack4": "~6.5.16",
+		"@storybook/react": "~6.5.16",
+		"@storybook/testing-library": "~0.0.13",
+		"@types/react": "~17.0.80",
+		"@types/react-dom": "~17.0.25",
+		"eslint": "~8.45.0",
+		"eslint-plugin-react": "~7.32.2",
+		"eslint-plugin-react-hooks": "~4.6.2",
+		"eslint-plugin-storybook": "~0.6.15",
+		"react": "~17.0.2",
+		"react-docgen-typescript-plugin": "~1.0.8",
+		"react-dom": "~17.0.2",
+		"typescript": "~5.5.4"
+	},
+	"peerDependencies": {
+		"@react-aria/toolbar": "*",
+		"@rocket.chat/fuselage": "*",
+		"@rocket.chat/icons": "*",
+		"react": "^17.0.2",
+		"react-dom": "^17.0.2"
+	},
+	"volta": {
+		"extends": "../../package.json"
+	}
 }