Merge branch 'feat/setup-wizard-back-step' of github.com:RocketChat/R…

…ocket.Chat into feat/setup-wizard-back-step

.changeset/eleven-gorillas-deliver.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fix trying to upload same file again and again.

.changeset/gentle-radios-relate.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed DM room with "guest" user kept as "read only" after reactivating user

.changeset/heavy-ads-carry.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+fix: Change plan name from Enterprise to Premium on marketplace filtering

.changeset/odd-hounds-thank.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+chore: Change plan name Enterprise to Premium on marketplace

.changeset/proud-shrimps-cheat.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+fix: Unable to send attachments via email as an omni-agent

.changeset/shiny-pillows-run.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+fix: cloud alerts not working

apps/meteor/app/cloud/server/functions/getWorkspaceLicense.ts

@@ -73,7 +73,7 @@ export async function getWorkspaceLicense(): Promise<{ updated: boolean; license
 
 		const payload = await fetchCloudWorkspaceLicensePayload({ token });
 
-		if (Date.parse(payload.updatedAt) <= currentLicense._updatedAt.getTime()) {
+		if (currentLicense.value && Date.parse(payload.updatedAt) <= currentLicense._updatedAt.getTime()) {
 			return fromCurrentLicense();
 		}
 

apps/meteor/app/cloud/server/functions/syncWorkspace/announcementSync.ts

@@ -107,7 +107,7 @@ export async function announcementSync() {
 	} catch (err) {
 		SystemLogger.error({
 			msg: 'Failed to sync with Rocket.Chat Cloud',
-			url: '/sync',
+			url: '/comms/workspace',
 			err,
 		});
 	}

apps/meteor/app/cloud/server/functions/syncWorkspace/index.ts

@@ -1,3 +1,4 @@
+import { SystemLogger } from '../../../../../server/lib/logger/system';
 import { CloudWorkspaceAccessTokenError } from '../getWorkspaceAccessToken';
 import { getCachedSupportedVersionsToken } from '../supportedVersionsToken/supportedVersionsToken';
 import { announcementSync } from './announcementSync';
@@ -7,10 +8,11 @@ export async function syncWorkspace() {
 	try {
 		await syncCloudData();
 		await announcementSync();
-	} catch (error) {
-		if (error instanceof CloudWorkspaceAccessTokenError) {
+	} catch (err) {
+		if (err instanceof CloudWorkspaceAccessTokenError) {
 			// TODO: Remove License if there is no access token
 		}
+		SystemLogger.error({ msg: 'Error during workspace sync', err });
 	}
 
 	await getCachedSupportedVersionsToken.reset();

apps/meteor/app/version-check/server/functions/getNewUpdates.ts

@@ -50,18 +50,16 @@ export const getNewUpdates = async () => {
 						infoUrl: String,
 					}),
 				],
-				alerts: [
-					Match.Optional([
-						Match.ObjectIncluding({
-							id: String,
-							title: String,
-							text: String,
-							textArguments: [Match.Any],
-							modifiers: [String] as [StringConstructor],
-							infoUrl: String,
-						}),
-					]),
-				],
+				alerts: Match.Optional([
+					Match.ObjectIncluding({
+						id: String,
+						title: String,
+						text: String,
+						textArguments: [Match.Any],
+						modifiers: [String] as [StringConstructor],
+						infoUrl: String,
+					}),
+				]),
 			}),
 		);
 

apps/meteor/client/components/GenericUpsellModal/GenericUpsellModal.tsx

@@ -42,7 +42,7 @@ const GenericUpsellModal = ({
 			<Modal.Header>
 				{icon && <Modal.Icon name={icon} />}
 				<Modal.HeaderText>
-					<Modal.Tagline color='font-annotation'>{tagline ?? t('Enterprise_capability')}</Modal.Tagline>
+					<Modal.Tagline color='font-annotation'>{tagline ?? t('Premium_capability')}</Modal.Tagline>
 					<Modal.Title>{title}</Modal.Title>
 				</Modal.HeaderText>
 				<Modal.Close aria-label={t('Close')} onClick={onClose} />

apps/meteor/client/lib/chats/ChatAPI.ts

@@ -144,7 +144,7 @@ export type ChatAPI = {
 	ActionManager: any;
 
 	readonly flows: {
-		readonly uploadFiles: (files: readonly File[]) => Promise<void>;
+		readonly uploadFiles: (files: readonly File[], resetFileInput?: () => void) => Promise<void>;
 		readonly sendMessage: ({ text, tshow }: { text: string; tshow?: boolean; previewUrls?: string[] }) => Promise<boolean>;
 		readonly processSlashCommand: (message: IMessage, userId: string | null) => Promise<boolean>;
 		readonly processTooLongMessage: (message: IMessage) => Promise<boolean>;

apps/meteor/client/lib/chats/flows/uploadFiles.ts

@@ -6,7 +6,7 @@ import { imperativeModal } from '../../imperativeModal';
 import { prependReplies } from '../../utils/prependReplies';
 import type { ChatAPI } from '../ChatAPI';
 
-export const uploadFiles = async (chat: ChatAPI, files: readonly File[]): Promise<void> => {
+export const uploadFiles = async (chat: ChatAPI, files: readonly File[], resetFileInput?: () => void): Promise<void> => {
 	const replies = chat.composer?.quotedMessages.get() ?? [];
 
 	const msg = await prependReplies('', replies);
@@ -52,4 +52,5 @@ export const uploadFiles = async (chat: ChatAPI, files: readonly File[]): Promis
 	};
 
 	uploadNextFile();
+	resetFileInput?.();
 };

apps/meteor/client/views/marketplace/AppsPage/AppsFilters.tsx

@@ -50,7 +50,7 @@ const AppsFilters = ({
 
 	const appsSearchPlaceholders: { [key: string]: string } = {
 		explore: t('Search_Apps'),
-		enterprise: t('Search_Enterprise_Apps'),
+		enterprise: t('Search_Premium_Apps'),
 		installed: t('Search_Installed_Apps'),
 		requested: t('Search_Requested_Apps'),
 		private: t('Search_Private_apps'),

apps/meteor/client/views/marketplace/AppsPage/AppsPageContent.tsx

@@ -40,7 +40,7 @@ const AppsPageContent = (): ReactElement => {
 			{ id: 'all', label: t('All_Prices'), checked: true },
 			{ id: 'free', label: t('Free_Apps'), checked: false },
 			{ id: 'paid', label: t('Paid_Apps'), checked: false },
-			{ id: 'enterprise', label: t('Enterprise'), checked: false },
+			{ id: 'premium', label: t('Premium'), checked: false },
 		],
 	});
 	const freePaidFilterOnSelected = useRadioToggle(setFreePaidFilterStructure);
@@ -89,7 +89,7 @@ const AppsPageContent = (): ReactElement => {
 
 	const getAppsData = useCallback((): appsDataType => {
 		switch (context) {
-			case 'enterprise':
+			case 'premium':
 			case 'explore':
 			case 'requested':
 				return marketplaceApps;

apps/meteor/client/views/marketplace/BundleChips.tsx

@@ -18,15 +18,15 @@ const BundleChips = ({ bundledIn }: BundleChipsProps): ReactElement => {
 
 	return (
 		<>
-			{bundledIn.map((bundle) => (
+			{bundledIn.map(({ bundleId, bundleName }) => (
 				<Tag
-					key={bundle.bundleId}
+					key={bundleId}
 					variant='featured'
 					title={t('this_app_is_included_with_subscription', {
-						bundleName: bundle.bundleName,
+						bundleName,
 					})}
 				>
-					{bundle.bundleName}
+					{bundleName}
 				</Tag>
 			))}
 		</>

apps/meteor/client/views/marketplace/components/EnabledAppsCount.tsx

@@ -15,7 +15,7 @@ const EnabledAppsCount = ({
 	percentage: number;
 	limit: number;
 	enabled: number;
-	context: 'private' | 'explore' | 'installed' | 'enterprise' | 'requested';
+	context: 'private' | 'explore' | 'installed' | 'premium' | 'requested';
 }): ReactElement | null => {
 	const t = useTranslation();
 

apps/meteor/client/views/marketplace/components/MarketplaceHeader.tsx

@@ -12,7 +12,7 @@ import EnabledAppsCount from './EnabledAppsCount';
 const MarketplaceHeader = ({ title }: { title: string }): ReactElement | null => {
 	const t = useTranslation();
 	const isAdmin = usePermission('manage-apps');
-	const context = (useRouteParameter('context') || 'explore') as 'private' | 'explore' | 'installed' | 'enterprise' | 'requested';
+	const context = (useRouteParameter('context') || 'explore') as 'private' | 'explore' | 'installed' | 'premium' | 'requested';
 	const route = useRoute('marketplace');
 	const setModal = useSetModal();
 	const result = useAppsCountQuery(context);

apps/meteor/client/views/marketplace/hooks/useAppInfo.ts

@@ -36,7 +36,7 @@ export const useAppInfo = (appId: string, context: string): AppInfo | undefined
 			}
 
 			let appResult: App | undefined;
-			const marketplaceAppsContexts = ['explore', 'enterprise', 'requested'];
+			const marketplaceAppsContexts = ['explore', 'premium', 'requested'];
 
 			if (marketplaceAppsContexts.includes(context)) appResult = marketplaceApps.value?.apps.find((app) => app.id === appId);
 

apps/meteor/client/views/marketplace/hooks/useAppsCountQuery.ts

@@ -11,10 +11,10 @@ const getProgressBarValues = (numberOfEnabledApps: number, enabledAppsLimit: num
 	percentage: Math.round((numberOfEnabledApps / enabledAppsLimit) * 100),
 });
 
-export type MarketplaceRouteContext = 'private' | 'explore' | 'installed' | 'enterprise' | 'requested';
+export type MarketplaceRouteContext = 'private' | 'explore' | 'installed' | 'premium' | 'requested';
 
 export function isMarketplaceRouteContext(context: string): context is MarketplaceRouteContext {
-	return ['private', 'explore', 'installed', 'enterprise', 'requested'].includes(context);
+	return ['private', 'explore', 'installed', 'premium', 'requested'].includes(context);
 }
 
 export const useAppsCountQuery = (context: MarketplaceRouteContext) => {

apps/meteor/client/views/marketplace/hooks/useFilteredApps.ts

@@ -66,7 +66,7 @@ export const useFilteredApps = ({
 		const filterByPurchaseType: Record<string, (apps: App[]) => App[]> = {
 			all: fallback,
 			paid: (apps: App[]) => apps.filter(filterAppsByPaid),
-			enterprise: (apps: App[]) => apps.filter(filterAppsByEnterprise),
+			premium: (apps: App[]) => apps.filter(filterAppsByEnterprise),
 			free: (apps: App[]) => apps.filter(filterAppsByFree),
 		};
 
@@ -80,7 +80,7 @@ export const useFilteredApps = ({
 			explore: fallback,
 			installed: fallback,
 			private: fallback,
-			enterprise: (apps: App[]) => apps.filter(({ categories }) => categories.includes('Enterprise')),
+			premium: (apps: App[]) => apps.filter(({ categories }) => categories.includes('Premium')),
 			requested: (apps: App[]) => apps.filter(({ appRequestStats, installed }) => Boolean(appRequestStats) && !installed),
 		};
 

apps/meteor/client/views/marketplace/sidebarItems.tsx

@@ -17,9 +17,9 @@ export const {
 		permissionGranted: (): boolean => hasAtLeastOnePermission(['access-marketplace', 'manage-apps']),
 	},
 	{
-		href: '/marketplace/enterprise',
+		href: '/marketplace/premium',
 		icon: 'lightning',
-		i18nLabel: 'Enterprise',
+		i18nLabel: 'Premium',
 		permissionGranted: (): boolean => hasAtLeastOnePermission(['access-marketplace', 'manage-apps']),
 	},
 	{

apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/actions/FileUploadAction.tsx

@@ -18,6 +18,14 @@ const FileUploadAction = ({ collapsed, chatContext, disabled, ...props }: FileUp
 	const fileInputRef = useRef<HTMLInputElement>(null);
 	const chat = useChat() ?? chatContext;
 
+	const resetFileInput = () => {
+		if (!fileInputRef.current) {
+			return;
+		}
+
+		fileInputRef.current.value = '';
+	};
+
 	const handleUploadChange = async (e: ChangeEvent<HTMLInputElement>) => {
 		const { mime } = await import('../../../../../../../app/utils/lib/mimeTypes');
 		const filesToUpload = Array.from(e.target.files ?? []).map((file) => {
@@ -26,8 +34,7 @@ const FileUploadAction = ({ collapsed, chatContext, disabled, ...props }: FileUp
 			});
 			return file;
 		});
-
-		chat?.flows.uploadFiles(filesToUpload);
+		chat?.flows.uploadFiles(filesToUpload, resetFileInput);
 	};
 
 	const handleUpload = () => {

apps/meteor/ee/app/license/server/settings.ts

@@ -1,8 +1,6 @@
-import { License } from '@rocket.chat/license';
-import { Settings } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
-import { settings, settingsRegistry } from '../../../../app/settings/server';
+import { settingsRegistry } from '../../../../app/settings/server';
 
 Meteor.startup(async () => {
 	await settingsRegistry.addGroup('Enterprise', async function () {
@@ -11,6 +9,12 @@ Meteor.startup(async () => {
 				type: 'string',
 				i18nLabel: 'Enterprise_License',
 			});
+			await this.add('Enterprise_License_Data', '', {
+				type: 'string',
+				hidden: true,
+				blocked: true,
+				public: false,
+			});
 			await this.add('Enterprise_License_Status', '', {
 				readonly: true,
 				type: 'string',
@@ -19,42 +23,3 @@ Meteor.startup(async () => {
 		});
 	});
 });
-
-settings.watch<string>('Enterprise_License', async (license) => {
-	if (!license || String(license).trim() === '') {
-		return;
-	}
-
-	if (license === process.env.ROCKETCHAT_LICENSE) {
-		return;
-	}
-
-	try {
-		if (!(await License.setLicense(license))) {
-			await Settings.updateValueById('Enterprise_License_Status', 'Invalid');
-			return;
-		}
-	} catch (_error) {
-		// do nothing
-	}
-
-	await Settings.updateValueById('Enterprise_License_Status', 'Valid');
-});
-
-if (process.env.ROCKETCHAT_LICENSE) {
-	try {
-		await License.setLicense(process.env.ROCKETCHAT_LICENSE);
-	} catch (_error) {
-		// do nothing
-	}
-
-	Meteor.startup(async () => {
-		if (settings.get('Enterprise_License')) {
-			console.warn(
-				'Rocket.Chat Enterprise: The license from your environment variable was ignored, please use only the admin setting from now on.',
-			);
-			return;
-		}
-		await Settings.updateValueById('Enterprise_License', process.env.ROCKETCHAT_LICENSE);
-	});
-}