Merge pull request #29814 from RocketChat/release-6.2.10

Release 6.2.10

.changeset/dirty-crabs-deliver.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+fix: Prevent app's bridges from overriding the lastMsg prop which further was affecting Omni-Visitor abandonment feature for app

.changeset/fuzzy-parents-drop.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fix Toggle message box formatting toolbar on click

.changeset/nine-yaks-draw.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/release-action': minor
+---
+
+Use `release-automation` branch to perform the release

.changeset/ninety-cats-arrive.md

@@ -0,0 +1,2 @@
+---
+---

.github/workflows/new-release.yml

@@ -39,7 +39,7 @@ jobs:
 
     - uses: dtinth/setup-github-actions-caching-for-turbo@v1
 
-    - name: Build
+    - name: Build packages
       run: yarn build
 
     - name: Start next release

.github/workflows/publish-release.yml

@@ -18,6 +18,7 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v3
         with:
+          fetch-depth: 0
           token: ${{ secrets.CI_PAT }}
 
       - name: Setup NodeJS
@@ -29,7 +30,7 @@ jobs:
 
       - uses: dtinth/setup-github-actions-caching-for-turbo@v1
 
-      - name: Build
+      - name: Build packages
         run: yarn build
 
       - name: Publish final release

apps/meteor/app/apps/server/converters/rooms.js

@@ -38,11 +38,16 @@ export class AppRoomsConverter {
 		let v;
 		if (room.visitor) {
 			const visitor = await LivechatVisitors.findOneById(room.visitor.id);
+
+			const lastMessageTs = room?.visitor?.lastMessageTs;
+			const phone = room?.visitor?.channelPhone;
 			v = {
 				_id: visitor._id,
 				username: visitor.username,
 				token: visitor.token,
 				status: visitor.status || 'online',
+				...(lastMessageTs && { lastMessageTs }),
+				...(phone && { phone }),
 			};
 		}
 
@@ -172,9 +177,21 @@ export class AppRoomsConverter {
 					return undefined;
 				}
 
+				const { lastMessageTs, phone } = v;
+
 				delete room.v;
 
-				return this.orch.getConverters().get('visitors').convertById(v._id);
+				return {
+					...(await this.orch.getConverters().get('visitors').convertById(v._id)),
+					// Note: room.v is not just visitor, it also contains channel related visitor data
+					// so we need to pass this data to the converter
+					// So suppose you have a contact whom we're contacting using SMS via 2 phone no's,
+					// let's call X and Y. Then if the contact sends a message using X phone number,
+					// then room.v.phoneNo would be X and correspondingly we'll store the timestamp of
+					// the last message from this visitor from X phone no on room.v.lastMessageTs
+					...(phone && { channelPhone: phone }),
+					...(lastMessageTs && { lastMessageTs }),
+				};
 			},
 			department: async (room) => {
 				const { departmentId } = room;

apps/meteor/app/livechat/server/hooks/saveLastVisitorMessageTs.ts

@@ -9,6 +9,9 @@ callbacks.add(
 		if (!(isOmnichannelRoom(room) && room.v.token)) {
 			return message;
 		}
+		if (message.t) {
+			return message;
+		}
 		if (message.token) {
 			await LivechatRooms.setVisitorLastMessageTimestampByRoomId(room._id, message.ts);
 		}

apps/meteor/client/views/room/components/body/composer/messageBox/MessageBoxFormattingToolbar/FormattingToolbarDropdown.tsx

@@ -34,7 +34,13 @@ const FormattingToolbarDropdown = ({ composer, items, ...props }: FormattingTool
 						};
 
 						return (
-							<Option key={index} onClick={handleFormattingAction}>
+							<Option
+								key={index}
+								onClick={() => {
+									handleFormattingAction();
+									toggle();
+								}}
+							>
 								<OptionIcon name={'icon' in formatter ? formatter.icon : 'link'} />
 								<OptionContent>{t(formatter.label)}</OptionContent>
 							</Option>

package.json

@@ -17,7 +17,6 @@
 		"fuselage": "./fuselage.sh"
 	},
 	"devDependencies": {
-		"@changesets/changelog-github": "^0.4.8",
 		"@changesets/cli": "^2.26.1",
 		"@types/chart.js": "^2.9.37",
 		"@types/js-yaml": "^4.0.5",

packages/core-typings/src/IInquiry.ts

@@ -18,6 +18,9 @@ export enum LivechatInquiryStatus {
 	OPEN = 'open',
 }
 
+// This is a subset of the IVisitor interface + channel related fields
+// IMPORTANT: If you're adding a new field here, make sure to update the
+// apps-engine's room converter to include it too
 export interface IVisitor {
 	_id: string;
 	username: string;

packages/release-action/src/bumpNextVersion.ts

@@ -9,6 +9,7 @@ import { setupOctokit } from './setupOctokit';
 import { createNpmFile } from './createNpmFile';
 import { getChangelogEntry, bumpFileVersions, readPackageJson } from './utils';
 import { fixWorkspaceVersionsBeforePublish } from './fixWorkspaceVersionsBeforePublish';
+import { commitChanges, createBranch, createTag, pushNewBranch } from './gitUtils';
 
 export async function bumpNextVersion({
 	githubToken,
@@ -59,19 +60,18 @@ export async function bumpNextVersion({
 	await bumpFileVersions(cwd, currentVersion, newVersion);
 
 	// TODO check if branch exists
-	await exec('git', ['checkout', '-b', newBranch]);
+	await createBranch(newBranch);
 
-	await exec('git', ['add', '.']);
-	await exec('git', ['commit', '-m', newVersion]);
+	await commitChanges(`Release ${newVersion}`);
 
 	core.info('fix dependencies in workspace packages');
 	await fixWorkspaceVersionsBeforePublish();
 
 	await exec('yarn', ['changeset', 'publish', '--no-git-tag']);
 
-	await exec('git', ['tag', newVersion]);
+	await createTag(newVersion);
 
-	await exec('git', ['push', '--force', '--follow-tags', 'origin', `HEAD:refs/heads/${newBranch}`]);
+	await pushNewBranch(newBranch);
 
 	if (newVersion.includes('rc.0')) {
 		const finalPrTitle = `Release ${finalVersion}`;

packages/release-action/src/fixWorkspaceVersionsBeforePublish.ts

@@ -41,10 +41,6 @@ export async function fixWorkspaceVersionsBeforePublish() {
 			for (const dependency of dependencies) {
 				const dependencyVersion = packageJson[dependencyType][dependency];
 				if (dependencyVersion.startsWith('workspace:')) {
-					if (!dependencyVersion.startsWith('workspace:^')) {
-						throw new Error(`Unsupported workspace version range: ${dependencyVersion}`);
-					}
-
 					const realVersion = workspaceVersions.get(dependency);
 					if (!realVersion) {
 						throw new Error(`Could not find version for workspace ${dependency}`);

packages/release-action/src/gitUtils.ts

@@ -1,6 +1,42 @@
-import { exec } from '@actions/exec';
+import { exec, getExecOutput } from '@actions/exec';
 
 export async function setupGitUser() {
 	await exec('git', ['config', 'user.name', '"rocketchat-github-ci"']);
 	await exec('git', ['config', 'user.email', '"[email protected]"']);
 }
+
+export async function createBranch(newBranch: string) {
+	await exec('git', ['checkout', '-b', newBranch]);
+}
+
+export async function checkoutBranch(branchName: string) {
+	await exec('git', ['checkout', branchName]);
+}
+
+export async function mergeBranch(branchName: string) {
+	await exec('git', ['merge', '--no-edit', branchName]);
+}
+
+export async function commitChanges(commitMessage: string) {
+	await exec('git', ['add', '.']);
+	await exec('git', ['commit', '-m', commitMessage]);
+}
+
+export async function createTag(version: string) {
+	// create an annotated tag so git push --follow-tags will push the tag
+	await exec('git', ['tag', version, '-m', version]);
+}
+
+export async function getCurrentBranch() {
+	const { stdout: branchName } = await getExecOutput('git', ['rev-parse', '--abbrev-ref', 'HEAD']);
+
+	return branchName.trim();
+}
+
+export async function pushChanges() {
+	await exec('git', ['push', '--follow-tags']);
+}
+
+export async function pushNewBranch(newBranch: string) {
+	await exec('git', ['push', '--force', '--follow-tags', 'origin', `HEAD:refs/heads/${newBranch}`]);
+}

packages/release-action/src/index.ts

@@ -38,7 +38,7 @@ import { setupGitUser } from './gitUtils';
 	const mainPackagePath = path.join(cwd, 'apps', 'meteor');
 
 	if (action === 'publish-final') {
-		await publishRelease({ githubToken, exitCandidate: true, mainPackagePath });
+		await publishRelease({ githubToken, mergeFinal: true, mainPackagePath });
 	} else if (action === 'publish') {
 		await publishRelease({ githubToken, baseRef, mainPackagePath });
 	} else if (action === 'bump') {

packages/release-action/src/publishRelease.ts

@@ -9,18 +9,19 @@ import { createNpmFile } from './createNpmFile';
 import { setupOctokit } from './setupOctokit';
 import { bumpFileVersions, getChangelogEntry, readPackageJson } from './utils';
 import { fixWorkspaceVersionsBeforePublish } from './fixWorkspaceVersionsBeforePublish';
+import { checkoutBranch, commitChanges, createTag, getCurrentBranch, mergeBranch, pushChanges } from './gitUtils';
 
 export async function publishRelease({
 	githubToken,
 	mainPackagePath,
-	exitCandidate = false,
+	mergeFinal = false,
 	baseRef,
 	cwd = process.cwd(),
 }: {
 	githubToken: string;
 	mainPackagePath: string;
 	baseRef?: string;
-	exitCandidate?: boolean;
+	mergeFinal?: boolean;
 	cwd?: string;
 }) {
 	const octokit = setupOctokit(githubToken);
@@ -29,12 +30,12 @@ export async function publishRelease({
 	await createNpmFile();
 
 	if (baseRef) {
-		await exec('git', ['checkout', baseRef]);
+		await checkoutBranch(baseRef);
 	}
 
 	const { version: currentVersion } = await readPackageJson(cwd);
 
-	if (exitCandidate) {
+	if (mergeFinal) {
 		let preRelease = false;
 		try {
 			fs.accessSync(path.resolve(cwd, '.changeset', 'pre.json'));
@@ -73,17 +74,25 @@ export async function publishRelease({
 	core.info('update version in all files to new');
 	await bumpFileVersions(cwd, currentVersion, newVersion);
 
-	await exec('git', ['add', '.']);
-	await exec('git', ['commit', '-m', `Release ${newVersion}`]);
+	await commitChanges(`Release ${newVersion}`);
+
+	if (mergeFinal) {
+		// get current branch name
+		const branchName = await getCurrentBranch();
+
+		// merge release changes to master
+		await checkoutBranch('master');
+		await mergeBranch(branchName);
+	}
 
 	core.info('fix dependencies in workspace packages');
 	await fixWorkspaceVersionsBeforePublish();
 
 	await exec('yarn', ['changeset', 'publish', '--no-git-tag']);
 
-	await exec('git', ['tag', newVersion]);
+	await createTag(newVersion);
 
-	await exec('git', ['push', '--follow-tags']);
+	await pushChanges();
 
 	core.info('create draft release');
 	await octokit.rest.repos.createRelease({