From 61cb883b4fe190b2bd734ea7468e94ec5dde1d0c Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Mon, 20 Nov 2023 23:34:20 -0300 Subject: [PATCH 01/76] set the same Organization_Name for Site_Name during registration --- apps/meteor/app/lib/server/methods/saveSettings.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/apps/meteor/app/lib/server/methods/saveSettings.ts b/apps/meteor/app/lib/server/methods/saveSettings.ts index 776897ce4a58..e08375e3aa95 100644 --- a/apps/meteor/app/lib/server/methods/saveSettings.ts +++ b/apps/meteor/app/lib/server/methods/saveSettings.ts @@ -48,6 +48,16 @@ Meteor.methods({ const editPrivilegedSetting = await hasPermissionAsync(uid, 'edit-privileged-setting'); const manageSelectedSettings = await hasPermissionAsync(uid, 'manage-selected-settings'); + // if the id contains Organization_Name then change the Site_Name + const orgName = params.find(({ _id }) => _id === 'Organization_Name'); + + if (orgName) { + params.push({ + _id: 'Site_Name', + value: orgName.value, + }); + } + await Promise.all( params.map(async ({ _id, value }) => { // Verify the _id passed in is a string. From c66eebc40f931f9d6631dcf4524ecac313998af9 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Mon, 20 Nov 2023 23:35:06 -0300 Subject: [PATCH 02/76] chore: dont show callout limits if limit is zero --- .../views/admin/subscription/SubscriptionCalloutLimits.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/meteor/client/views/admin/subscription/SubscriptionCalloutLimits.tsx b/apps/meteor/client/views/admin/subscription/SubscriptionCalloutLimits.tsx index 8982492bb4a8..7558f3bff19f 100644 --- a/apps/meteor/client/views/admin/subscription/SubscriptionCalloutLimits.tsx +++ b/apps/meteor/client/views/admin/subscription/SubscriptionCalloutLimits.tsx @@ -39,6 +39,10 @@ export const SubscriptionCalloutLimits = () => { return undefined; } + if (rule.max === 0) { + return undefined; + } + return [key, rule.behavior]; }) .filter(Boolean) as Array<[keyof typeof limits, LicenseBehavior]>; From 820d6691754b7fb3bce89ba53c9bf6ded07d868c Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Mon, 20 Nov 2023 23:36:05 -0300 Subject: [PATCH 03/76] regression: hideManageSubscription inverted --- .../views/admin/subscription/components/cards/SeatsCard.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/meteor/client/views/admin/subscription/components/cards/SeatsCard.tsx b/apps/meteor/client/views/admin/subscription/components/cards/SeatsCard.tsx index 34a58fb1791c..a90f2d1171d0 100644 --- a/apps/meteor/client/views/admin/subscription/components/cards/SeatsCard.tsx +++ b/apps/meteor/client/views/admin/subscription/components/cards/SeatsCard.tsx @@ -27,7 +27,7 @@ const SeatsCard = ({ value, max, hideManageSubscription }: SeatsCardProps): Reac const card: CardProps = { title: t('Seats'), infoText: t('Seats_InfoText'), - ...(hideManageSubscription && + ...(!hideManageSubscription && nearLimit && { upgradeButton: ( From b1a426da88e9c3530ee439d45fbb2496785c7a67 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Mon, 20 Nov 2023 23:37:00 -0300 Subject: [PATCH 04/76] chore: reduce uselicense debounce in few cases --- apps/meteor/client/hooks/useLicense.ts | 6 +++--- apps/meteor/client/views/admin/cloud/PasteStep.tsx | 5 +++-- .../views/setupWizard/providers/SetupWizardProvider.tsx | 4 +++- .../client/views/setupWizard/steps/RegisterServerStep.tsx | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/apps/meteor/client/hooks/useLicense.ts b/apps/meteor/client/hooks/useLicense.ts index bdf983061d66..192aa089251a 100644 --- a/apps/meteor/client/hooks/useLicense.ts +++ b/apps/meteor/client/hooks/useLicense.ts @@ -14,12 +14,12 @@ type LicenseParams = { const invalidateQueryClientLicenses = (() => { let timeout: ReturnType | undefined; - return (queryClient: QueryClient) => { + return (queryClient: QueryClient, milliseconds = 5000) => { clearTimeout(timeout); timeout = setTimeout(() => { timeout = undefined; queryClient.invalidateQueries(['licenses']); - }, 5000); + }, milliseconds); }; })(); @@ -62,5 +62,5 @@ export const useLicenseName = (params?: LicenseParams) => { export const useInvalidateLicense = () => { const queryClient = useQueryClient(); - return () => invalidateQueryClientLicenses(queryClient); + return (milliseconds?: number) => invalidateQueryClientLicenses(queryClient, milliseconds); }; diff --git a/apps/meteor/client/views/admin/cloud/PasteStep.tsx b/apps/meteor/client/views/admin/cloud/PasteStep.tsx index 884d4a1e8d17..da77aa6efb48 100644 --- a/apps/meteor/client/views/admin/cloud/PasteStep.tsx +++ b/apps/meteor/client/views/admin/cloud/PasteStep.tsx @@ -3,7 +3,7 @@ import { useToastMessageDispatch, useEndpoint, useTranslation } from '@rocket.ch import type { ChangeEvent, FC } from 'react'; import React, { useState } from 'react'; -import { queryClient } from '../../../lib/queryClient'; +import { useInvalidateLicense } from '../../../hooks/useLicense'; type PasteStepProps = { onBackButtonClick: () => void; @@ -13,6 +13,7 @@ type PasteStepProps = { const PasteStep: FC = ({ onBackButtonClick, onFinish }) => { const t = useTranslation(); const dispatchToastMessage = useToastMessageDispatch(); + const invalidateLicenseQuery = useInvalidateLicense(); const [isLoading, setLoading] = useState(false); const [cloudKey, setCloudKey] = useState(''); @@ -28,7 +29,7 @@ const PasteStep: FC = ({ onBackButtonClick, onFinish }) => { try { await registerManually({ cloudBlob: cloudKey }); - queryClient.invalidateQueries(['licenses']); + invalidateLicenseQuery(100); dispatchToastMessage({ type: 'success', message: t('Cloud_register_success') }); } catch (error) { dispatchToastMessage({ type: 'error', message: t('Cloud_register_error') }); diff --git a/apps/meteor/client/views/setupWizard/providers/SetupWizardProvider.tsx b/apps/meteor/client/views/setupWizard/providers/SetupWizardProvider.tsx index 094824b39aa2..e728151ee989 100644 --- a/apps/meteor/client/views/setupWizard/providers/SetupWizardProvider.tsx +++ b/apps/meteor/client/views/setupWizard/providers/SetupWizardProvider.tsx @@ -15,6 +15,7 @@ import React, { useCallback, useMemo, useState } from 'react'; import { callbacks } from '../../../../lib/callbacks'; import { validateEmail } from '../../../../lib/emailValidator'; +import { useInvalidateLicense } from '../../../hooks/useLicense'; import { queryClient } from '../../../lib/queryClient'; import { SetupWizardContext } from '../contexts/SetupWizardContext'; import { useParameters } from '../hooks/useParameters'; @@ -38,6 +39,7 @@ const initialData: ContextType['setupWizardData'] = { type HandleRegisterServer = (params: { email: string; resend?: boolean }) => Promise; const SetupWizardProvider = ({ children }: { children: ReactElement }): ReactElement => { + const invalidateLicenseQuery = useInvalidateLicense(); const t = useTranslation(); const [setupWizardData, setSetupWizardData] = useState['setupWizardData']>(initialData); const [currentStep, setCurrentStep] = useStepRouting(); @@ -148,7 +150,7 @@ const SetupWizardProvider = ({ children }: { children: ReactElement }): ReactEle const registerServer: HandleRegisterServer = useMutableCallback(async ({ email, resend = false }): Promise => { try { const { intentData } = await createRegistrationIntent({ resend, email }); - queryClient.invalidateQueries(['licenses']); + invalidateLicenseQuery(100); queryClient.invalidateQueries(['getRegistrationStatus']); setSetupWizardData((prevState) => ({ diff --git a/apps/meteor/client/views/setupWizard/steps/RegisterServerStep.tsx b/apps/meteor/client/views/setupWizard/steps/RegisterServerStep.tsx index b8370897104b..09747e360dbe 100644 --- a/apps/meteor/client/views/setupWizard/steps/RegisterServerStep.tsx +++ b/apps/meteor/client/views/setupWizard/steps/RegisterServerStep.tsx @@ -4,7 +4,7 @@ import { useMutation, useQuery } from '@tanstack/react-query'; import type { ReactElement, ComponentProps } from 'react'; import React, { useState } from 'react'; -import { queryClient } from '../../../lib/queryClient'; +import { useInvalidateLicense } from '../../../hooks/useLicense'; import { dispatchToastMessage } from '../../../lib/toast'; import { useSetupWizardContext } from '../contexts/SetupWizardContext'; @@ -17,6 +17,7 @@ const RegisterServerStep = (): ReactElement => { const t = useTranslation(); const { currentStep, goToNextStep, setSetupWizardData, registerServer, maxSteps, completeSetupWizard } = useSetupWizardContext(); const [serverOption, setServerOption] = useState(SERVER_OPTIONS.REGISTERED); + const invalidateLicenseQuery = useInvalidateLicense(); const handleRegister: ComponentProps['onSubmit'] = async (data: { email: string; @@ -51,7 +52,7 @@ const RegisterServerStep = (): ReactElement => { async (token) => registerManually({ cloudBlob: token }), { onSuccess: () => { - queryClient.invalidateQueries(['licenses']); + invalidateLicenseQuery(100); completeSetupWizard(); }, onError: () => { From ae335290fafbf665d6b3fb6d82f15661cd7fe4f5 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Mon, 20 Nov 2023 23:37:15 -0300 Subject: [PATCH 05/76] regression: hideManageSubscription inverted --- .../views/admin/subscription/components/cards/MACCard.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/meteor/client/views/admin/subscription/components/cards/MACCard.tsx b/apps/meteor/client/views/admin/subscription/components/cards/MACCard.tsx index e22231294fae..05065e2e4d40 100644 --- a/apps/meteor/client/views/admin/subscription/components/cards/MACCard.tsx +++ b/apps/meteor/client/views/admin/subscription/components/cards/MACCard.tsx @@ -31,7 +31,7 @@ const MACCard = ({ const card: CardProps = { title: t('Monthly_active_contacts'), infoText: t('MAC_InfoText'), - ...(hideManageSubscription && { + ...(!hideManageSubscription && { upgradeButton: ( {t('Buy_more')} From a15e101afe03a0cdf57e40cdccae9d81d597b55d Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Mon, 20 Nov 2023 23:37:45 -0300 Subject: [PATCH 06/76] regression: do not show unlimited if max is zero --- .../meteor/client/views/admin/subscription/SubscriptionPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx b/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx index e6b03b0237a4..1ebfb887fad6 100644 --- a/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx +++ b/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx @@ -39,7 +39,7 @@ const SubscriptionPage = () => { const getKeyLimit = (key: 'monthlyActiveContacts' | 'activeUsers') => { const { max, value } = limits?.[key] || {}; return { - max: max && max !== -1 ? max : Infinity, + max: max !== undefined && max !== -1 ? max : Infinity, value, }; }; From e3f765db3660775d3c416b6b8bcabaeb4a766f41 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Mon, 20 Nov 2023 23:38:09 -0300 Subject: [PATCH 07/76] chore: add formatting number to card limits --- apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json index 183498e09c1f..0a91fe00cd29 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json @@ -4571,10 +4571,8 @@ "Search_rooms": "Search rooms", "Search_Rooms": "Search Rooms", "Search_Users": "Search Users", - "Seats_Available": "{{seatsLeft}} Seats Available", - "MAC_Available": "{{macLeft}} MAC's Available", - "MAC_Required": "{{macRequired}} MAC's Required", - "Seats_Required": "{{seatsRequired}} Seats Required", + "Seats_Available": "{{seatsLeft, number}} Seats Available", + "MAC_Available": "{{macLeft, number}} MAC's Available", "Seats_usage": "Seats Usage", "seconds": "seconds", "Secret_token": "Secret Token", From b764f281d10cbb350e1cb4be5fbe13026c892631 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Mon, 20 Nov 2023 23:38:43 -0300 Subject: [PATCH 08/76] regression: add timeout for cloud requests --- .../functions/supportedVersionsToken/supportedVersionsToken.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsToken.ts b/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsToken.ts index f4c662362f5c..2455f68e030d 100644 --- a/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsToken.ts +++ b/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsToken.ts @@ -102,6 +102,7 @@ const getSupportedVersionsFromCloud = async () => { const response = await handleResponse( fetch(releaseEndpoint, { headers, + timeout: 3000, }), ); From 4b189dc8de080c7aa2f43bb103a40364520f3ed4 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Tue, 21 Nov 2023 14:33:07 -0300 Subject: [PATCH 09/76] review --- apps/meteor/app/lib/server/methods/saveSettings.ts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/apps/meteor/app/lib/server/methods/saveSettings.ts b/apps/meteor/app/lib/server/methods/saveSettings.ts index e08375e3aa95..6d7c0927c3f8 100644 --- a/apps/meteor/app/lib/server/methods/saveSettings.ts +++ b/apps/meteor/app/lib/server/methods/saveSettings.ts @@ -8,6 +8,7 @@ import { Meteor } from 'meteor/meteor'; import { twoFactorRequired } from '../../../2fa/server/twoFactorRequired'; import { getSettingPermissionId } from '../../../authorization/lib'; import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission'; +import { settings } from '../../../settings/server'; declare module '@rocket.chat/ui-contexts' { // eslint-disable-next-line @typescript-eslint/naming-convention @@ -52,10 +53,15 @@ Meteor.methods({ const orgName = params.find(({ _id }) => _id === 'Organization_Name'); if (orgName) { - params.push({ - _id: 'Site_Name', - value: orgName.value, - }); + // check if the site name is still the default value or ifs the same as organization name + const siteName = await Settings.findOneById('Site_Name'); + + if (siteName?.value === siteName?.packageValue || siteName?.value === settings.get('Organization_Name')) { + params.push({ + _id: 'Site_Name', + value: orgName.value, + }); + } } await Promise.all( From dd3ecd6f1838348eee66c6917cc896e2cee01554 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Tue, 21 Nov 2023 14:37:16 -0300 Subject: [PATCH 10/76] chore: show license with after code sequence (#31035) --- .../admin/subscription/SubscriptionPage.tsx | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx b/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx index e6b03b0237a4..1efa696a7125 100644 --- a/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx +++ b/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx @@ -1,7 +1,9 @@ import { Box, Button, ButtonGroup, Callout, Grid, Throbber } from '@rocket.chat/fuselage'; +import { useSessionStorage } from '@rocket.chat/fuselage-hooks'; import { useRouter } from '@rocket.chat/ui-contexts'; import { t } from 'i18next'; import React, { memo, useCallback, useEffect } from 'react'; +import tinykeys from 'tinykeys'; import Page from '../../../components/Page'; import { useIsEnterprise } from '../../../hooks/useIsEnterprise'; @@ -23,7 +25,25 @@ import PlanCardCommunity from './components/cards/PlanCard/PlanCardCommunity'; import SeatsCard from './components/cards/SeatsCard'; import { useWorkspaceSync } from './hooks/useWorkspaceSync'; +function useShowLicense() { + const [showLicenseTab, setShowLicenseTab] = useSessionStorage('admin:showLicenseTab', false); + + useEffect(() => { + const unsubscribe = tinykeys(window, { + 'ArrowUp ArrowUp ArrowDown ArrowDown ArrowLeft ArrowRight ArrowLeft ArrowRight b a': () => { + setShowLicenseTab((showLicenseTab) => !showLicenseTab); + }, + }); + return () => { + unsubscribe(); + }; + }); + + return showLicenseTab; +} + const SubscriptionPage = () => { + const showLicense = useShowLicense(); const router = useRouter(); const { data: enterpriseData } = useIsEnterprise(); const { isRegistered } = useRegistrationStatus(); @@ -89,6 +109,11 @@ const SubscriptionPage = () => { {!isLicenseLoading && ( + {showLicense && ( + + 
{JSON.stringify(licensesData, null, 2)}
+ + )} {license && ( Date: Tue, 21 Nov 2023 13:22:49 -0600 Subject: [PATCH 11/76] regression: `saveGuest` triggering app events for invalid visitor ids (#31037) --- apps/meteor/app/livechat/server/lib/LivechatTyped.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apps/meteor/app/livechat/server/lib/LivechatTyped.ts b/apps/meteor/app/livechat/server/lib/LivechatTyped.ts index 27c99d4e1000..e9fdfe7050e6 100644 --- a/apps/meteor/app/livechat/server/lib/LivechatTyped.ts +++ b/apps/meteor/app/livechat/server/lib/LivechatTyped.ts @@ -1343,6 +1343,12 @@ class LivechatClass { async saveGuest(guestData: Pick & { email?: string; phone?: string }, userId: string) { const { _id, name, email, phone, livechatData = {} } = guestData; + + const visitor = await LivechatVisitors.findOneById(_id, { projection: { _id: 1 } }); + if (!visitor) { + throw new Error('error-invalid-visitor'); + } + this.logger.debug({ msg: 'Saving guest', guestData }); const updateData: { name?: string | undefined; From bcbf385207e20291d2a94902f3af7a097c12cf8a Mon Sep 17 00:00:00 2001 From: Matheus Barbosa Silva <36537004+matheusbsilva137@users.noreply.github.com> Date: Tue, 21 Nov 2023 17:19:24 -0300 Subject: [PATCH 12/76] regression: error when archiving rooms in the UI (#31034) --- .../views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx index ac325ed64a80..7ebcde07fee6 100644 --- a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx +++ b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx @@ -97,6 +97,7 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) => const handleUpdateRoomData = useMutableCallback(async ({ hideSysMes, ...formData }) => { const data = getDirtyFields(formData, dirtyFields); + delete data.archived; try { await saveAction({ From af0a4b2274d9997276f38d12f1ffa3e8a940ce0c Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Tue, 21 Nov 2023 17:40:50 -0300 Subject: [PATCH 13/76] regression: handle cloud delete registration (#31038) --- .../server/functions/getWorkspaceAccessToken.ts | 15 ++++++++++----- .../functions/getWorkspaceAccessTokenWithScope.ts | 6 +++++- .../functions/removeWorkspaceRegistrationInfo.ts | 1 + 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/apps/meteor/app/cloud/server/functions/getWorkspaceAccessToken.ts b/apps/meteor/app/cloud/server/functions/getWorkspaceAccessToken.ts index b495e3342d4b..d5b92c97ef7d 100644 --- a/apps/meteor/app/cloud/server/functions/getWorkspaceAccessToken.ts +++ b/apps/meteor/app/cloud/server/functions/getWorkspaceAccessToken.ts @@ -10,7 +10,7 @@ import { retrieveRegistrationStatus } from './retrieveRegistrationStatus'; * @param {boolean} save * @returns string */ -export async function getWorkspaceAccessToken(forceNew = false, scope = '', save = true): Promise { +export async function getWorkspaceAccessToken(forceNew = false, scope = '', save = true, throwOnError = false): Promise { const { workspaceRegistered } = await retrieveRegistrationStatus(); if (!workspaceRegistered) { @@ -29,7 +29,7 @@ export async function getWorkspaceAccessToken(forceNew = false, scope = '', save return settings.get('Cloud_Workspace_Access_Token'); } - const accessToken = await getWorkspaceAccessTokenWithScope(scope); + const accessToken = await getWorkspaceAccessTokenWithScope(scope, throwOnError); if (save) { await Promise.all([ @@ -37,7 +37,6 @@ export async function getWorkspaceAccessToken(forceNew = false, scope = '', save Settings.updateValueById('Cloud_Workspace_Access_Token_Expires_At', accessToken.expiresAt), ]); } - return accessToken.token; } @@ -47,11 +46,17 @@ export class CloudWorkspaceAccessTokenError extends Error { } } +export class CloudWorkspaceAccessTokenEmptyError extends Error { + constructor() { + super('Workspace access token is empty'); + } +} + export async function getWorkspaceAccessTokenOrThrow(forceNew = false, scope = '', save = true): Promise { - const token = await getWorkspaceAccessToken(forceNew, scope, save); + const token = await getWorkspaceAccessToken(forceNew, scope, save, true); if (!token) { - throw new CloudWorkspaceAccessTokenError(); + throw new CloudWorkspaceAccessTokenEmptyError(); } return token; diff --git a/apps/meteor/app/cloud/server/functions/getWorkspaceAccessTokenWithScope.ts b/apps/meteor/app/cloud/server/functions/getWorkspaceAccessTokenWithScope.ts index 88509902cb6d..bb32476fd3dc 100644 --- a/apps/meteor/app/cloud/server/functions/getWorkspaceAccessTokenWithScope.ts +++ b/apps/meteor/app/cloud/server/functions/getWorkspaceAccessTokenWithScope.ts @@ -4,10 +4,11 @@ import { SystemLogger } from '../../../../server/lib/logger/system'; import { settings } from '../../../settings/server'; import { workspaceScopes } from '../oauthScopes'; import { getRedirectUri } from './getRedirectUri'; +import { CloudWorkspaceAccessTokenError } from './getWorkspaceAccessToken'; import { removeWorkspaceRegistrationInfo } from './removeWorkspaceRegistrationInfo'; import { retrieveRegistrationStatus } from './retrieveRegistrationStatus'; -export async function getWorkspaceAccessTokenWithScope(scope = '') { +export async function getWorkspaceAccessTokenWithScope(scope = '', throwOnError = false) { const { workspaceRegistered } = await retrieveRegistrationStatus(); const tokenResponse = { token: '', expiresAt: new Date() }; @@ -58,6 +59,9 @@ export async function getWorkspaceAccessTokenWithScope(scope = '') { if (err.response?.data?.error === 'oauth_invalid_client_credentials') { SystemLogger.error('Server has been unregistered from cloud'); void removeWorkspaceRegistrationInfo(); + if (throwOnError) { + throw new CloudWorkspaceAccessTokenError(); + } } return tokenResponse; diff --git a/apps/meteor/app/cloud/server/functions/removeWorkspaceRegistrationInfo.ts b/apps/meteor/app/cloud/server/functions/removeWorkspaceRegistrationInfo.ts index 5884a282482b..ec26e0bb9b27 100644 --- a/apps/meteor/app/cloud/server/functions/removeWorkspaceRegistrationInfo.ts +++ b/apps/meteor/app/cloud/server/functions/removeWorkspaceRegistrationInfo.ts @@ -18,5 +18,6 @@ export async function removeWorkspaceRegistrationInfo() { Settings.updateValueById('Cloud_Workspace_Registration_Client_Uri', null), ]); + await Settings.updateValueById('Show_Setup_Wizard', 'in_progress'); return true; } From 6ce892fb60742f22971a677de5cab024a94d3556 Mon Sep 17 00:00:00 2001 From: Tiago Evangelista Pinto Date: Tue, 21 Nov 2023 19:18:04 -0300 Subject: [PATCH 14/76] regression: Bump `fuselage` packages version (#31022) Co-authored-by: Tasso Evangelista <2263066+tassoevan@users.noreply.github.com> --- apps/meteor/ee/server/services/package.json | 10 +- apps/meteor/package.json | 30 +- ee/apps/account-service/package.json | 4 +- ee/apps/authorization-service/package.json | 4 +- ee/apps/ddp-streamer/package.json | 4 +- ee/apps/omnichannel-transcript/package.json | 2 +- ee/apps/presence-service/package.json | 4 +- ee/apps/queue-worker/package.json | 2 +- ee/apps/stream-hub-service/package.json | 4 +- ee/packages/omnichannel-services/package.json | 4 +- ee/packages/pdf-worker/package.json | 2 +- ee/packages/ui-theming/package.json | 8 +- packages/core-services/package.json | 6 +- packages/core-typings/package.json | 6 +- packages/fuselage-ui-kit/package.json | 16 +- packages/gazzodown/package.json | 10 +- packages/livechat/package.json | 8 +- packages/logger/package.json | 2 +- packages/rest-typings/package.json | 4 +- packages/ui-client/package.json | 8 +- packages/ui-composer/package.json | 4 +- packages/ui-contexts/package.json | 4 +- packages/ui-video-conf/package.json | 12 +- packages/uikit-playground/package.json | 16 +- packages/web-ui-registration/package.json | 2 +- yarn.lock | 304 ++++++++---------- 26 files changed, 230 insertions(+), 250 deletions(-) diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json index d6d6c527fbfc..0b44e01739b9 100644 --- a/apps/meteor/ee/server/services/package.json +++ b/apps/meteor/ee/server/services/package.json @@ -21,13 +21,13 @@ "@rocket.chat/apps-engine": "1.41.0-alpha.290", "@rocket.chat/core-services": "workspace:^", "@rocket.chat/core-typings": "workspace:^", - "@rocket.chat/emitter": "next", - "@rocket.chat/message-parser": "next", + "@rocket.chat/emitter": "~0.31.25", + "@rocket.chat/message-parser": "~0.31.26", "@rocket.chat/model-typings": "workspace:^", "@rocket.chat/models": "workspace:^", "@rocket.chat/rest-typings": "workspace:^", - "@rocket.chat/string-helpers": "next", - "@rocket.chat/ui-kit": "^0.32.1", + "@rocket.chat/string-helpers": "~0.31.25", + "@rocket.chat/ui-kit": "~0.32.1", "ajv": "^8.11.0", "bcrypt": "^5.0.1", "body-parser": "^1.20.2", @@ -50,7 +50,7 @@ "ws": "^8.8.1" }, "devDependencies": { - "@rocket.chat/icons": "^0.32.0", + "@rocket.chat/icons": "~0.32.0", "@types/cookie": "^0.5.3", "@types/cookie-parser": "^1.4.5", "@types/ejson": "^2.2.1", diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 7014851350aa..d6ee3b9fc01b 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -231,34 +231,34 @@ "@rocket.chat/core-services": "workspace:^", "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/cron": "workspace:^", - "@rocket.chat/css-in-js": "next", - "@rocket.chat/emitter": "next", + "@rocket.chat/css-in-js": "~0.31.25", + "@rocket.chat/emitter": "~0.31.25", "@rocket.chat/favicon": "workspace:^", "@rocket.chat/forked-matrix-appservice-bridge": "^4.0.2", "@rocket.chat/forked-matrix-bot-sdk": "^0.6.0-beta.3", - "@rocket.chat/fuselage": "^0.37.1", - "@rocket.chat/fuselage-hooks": "^0.32.1", - "@rocket.chat/fuselage-polyfills": "next", - "@rocket.chat/fuselage-toastbar": "next", - "@rocket.chat/fuselage-tokens": "^0.32.0", + "@rocket.chat/fuselage": "~0.38.1", + "@rocket.chat/fuselage-hooks": "~0.32.1", + "@rocket.chat/fuselage-polyfills": "~0.31.25", + "@rocket.chat/fuselage-toastbar": "~0.31.25", + "@rocket.chat/fuselage-tokens": "~0.32.0", "@rocket.chat/fuselage-ui-kit": "workspace:^", "@rocket.chat/gazzodown": "workspace:^", "@rocket.chat/i18n": "workspace:^", - "@rocket.chat/icons": "^0.32.0", + "@rocket.chat/icons": "~0.32.0", "@rocket.chat/instance-status": "workspace:^", "@rocket.chat/jwt": "workspace:^", - "@rocket.chat/layout": "next", + "@rocket.chat/layout": "~0.31.26", "@rocket.chat/license": "workspace:^", "@rocket.chat/log-format": "workspace:^", "@rocket.chat/logger": "workspace:^", - "@rocket.chat/logo": "^0.31.28", - "@rocket.chat/memo": "next", - "@rocket.chat/message-parser": "next", + "@rocket.chat/logo": "~0.31.28", + "@rocket.chat/memo": "~0.31.25", + "@rocket.chat/message-parser": "~0.31.26", "@rocket.chat/model-typings": "workspace:^", "@rocket.chat/models": "workspace:^", "@rocket.chat/mp3-encoder": "0.24.0", "@rocket.chat/omnichannel-services": "workspace:^", - "@rocket.chat/onboarding-ui": "0.33.0", + "@rocket.chat/onboarding-ui": "~0.33.1", "@rocket.chat/password-policies": "workspace:^", "@rocket.chat/pdf-worker": "workspace:^", "@rocket.chat/poplib": "workspace:^", @@ -268,12 +268,12 @@ "@rocket.chat/server-cloud-communication": "workspace:^", "@rocket.chat/server-fetch": "workspace:^", "@rocket.chat/sha256": "workspace:^", - "@rocket.chat/string-helpers": "next", + "@rocket.chat/string-helpers": "~0.31.25", "@rocket.chat/tools": "workspace:^", "@rocket.chat/ui-client": "workspace:^", "@rocket.chat/ui-composer": "workspace:^", "@rocket.chat/ui-contexts": "workspace:^", - "@rocket.chat/ui-kit": "^0.32.1", + "@rocket.chat/ui-kit": "~0.32.1", "@rocket.chat/ui-theming": "workspace:^", "@rocket.chat/ui-video-conf": "workspace:^", "@rocket.chat/web-ui-registration": "workspace:^", diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json index 9a8de416d40e..04860fa05f61 100644 --- a/ee/apps/account-service/package.json +++ b/ee/apps/account-service/package.json @@ -17,11 +17,11 @@ "dependencies": { "@rocket.chat/core-services": "workspace:^", "@rocket.chat/core-typings": "workspace:^", - "@rocket.chat/emitter": "next", + "@rocket.chat/emitter": "~0.31.25", "@rocket.chat/model-typings": "workspace:^", "@rocket.chat/models": "workspace:^", "@rocket.chat/rest-typings": "workspace:^", - "@rocket.chat/string-helpers": "next", + "@rocket.chat/string-helpers": "~0.31.25", "@types/node": "^14.18.63", "bcrypt": "^5.0.1", "ejson": "^2.2.3", diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json index 83d0969d07cf..199b0905a0cf 100644 --- a/ee/apps/authorization-service/package.json +++ b/ee/apps/authorization-service/package.json @@ -17,11 +17,11 @@ "dependencies": { "@rocket.chat/core-services": "workspace:^", "@rocket.chat/core-typings": "workspace:^", - "@rocket.chat/emitter": "next", + "@rocket.chat/emitter": "~0.31.25", "@rocket.chat/model-typings": "workspace:^", "@rocket.chat/models": "workspace:^", "@rocket.chat/rest-typings": "workspace:^", - "@rocket.chat/string-helpers": "next", + "@rocket.chat/string-helpers": "~0.31.25", "@types/node": "^14.18.63", "ejson": "^2.2.3", "event-loop-stats": "^1.4.1", diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json index 4cee0967c56c..6796e164b76d 100644 --- a/ee/apps/ddp-streamer/package.json +++ b/ee/apps/ddp-streamer/package.json @@ -18,13 +18,13 @@ "@rocket.chat/apps-engine": "1.41.0-alpha.290", "@rocket.chat/core-services": "workspace:^", "@rocket.chat/core-typings": "workspace:^", - "@rocket.chat/emitter": "next", + "@rocket.chat/emitter": "~0.31.25", "@rocket.chat/instance-status": "workspace:^", "@rocket.chat/logger": "workspace:^", "@rocket.chat/model-typings": "workspace:^", "@rocket.chat/models": "workspace:^", "@rocket.chat/rest-typings": "workspace:^", - "@rocket.chat/string-helpers": "next", + "@rocket.chat/string-helpers": "~0.31.25", "@rocket.chat/ui-contexts": "workspace:^", "colorette": "^1.4.0", "ejson": "^2.2.3", diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json index 7369f418a6d0..6e1bd994ab65 100644 --- a/ee/apps/omnichannel-transcript/package.json +++ b/ee/apps/omnichannel-transcript/package.json @@ -18,7 +18,7 @@ "@react-pdf/renderer": "^3.1.14", "@rocket.chat/core-services": "workspace:^", "@rocket.chat/core-typings": "workspace:^", - "@rocket.chat/emitter": "next", + "@rocket.chat/emitter": "~0.31.25", "@rocket.chat/logger": "workspace:^", "@rocket.chat/model-typings": "workspace:^", "@rocket.chat/models": "workspace:^", diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json index 092c29aea948..ba3f05f204a5 100644 --- a/ee/apps/presence-service/package.json +++ b/ee/apps/presence-service/package.json @@ -17,11 +17,11 @@ "dependencies": { "@rocket.chat/core-services": "workspace:^", "@rocket.chat/core-typings": "workspace:^", - "@rocket.chat/emitter": "next", + "@rocket.chat/emitter": "~0.31.25", "@rocket.chat/model-typings": "workspace:^", "@rocket.chat/models": "workspace:^", "@rocket.chat/presence": "workspace:^", - "@rocket.chat/string-helpers": "next", + "@rocket.chat/string-helpers": "~0.31.25", "@types/node": "^14.18.63", "ejson": "^2.2.3", "event-loop-stats": "^1.4.1", diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json index d86b3d8ac00e..d62ff5450068 100644 --- a/ee/apps/queue-worker/package.json +++ b/ee/apps/queue-worker/package.json @@ -18,7 +18,7 @@ "@react-pdf/renderer": "^3.1.14", "@rocket.chat/core-services": "workspace:^", "@rocket.chat/core-typings": "workspace:^", - "@rocket.chat/emitter": "next", + "@rocket.chat/emitter": "~0.31.25", "@rocket.chat/logger": "workspace:^", "@rocket.chat/model-typings": "workspace:^", "@rocket.chat/models": "workspace:^", diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json index a615bb9bde70..20f56bc5eddd 100644 --- a/ee/apps/stream-hub-service/package.json +++ b/ee/apps/stream-hub-service/package.json @@ -17,11 +17,11 @@ "dependencies": { "@rocket.chat/core-services": "workspace:^", "@rocket.chat/core-typings": "workspace:^", - "@rocket.chat/emitter": "next", + "@rocket.chat/emitter": "~0.31.25", "@rocket.chat/logger": "workspace:^", "@rocket.chat/model-typings": "workspace:^", "@rocket.chat/models": "workspace:^", - "@rocket.chat/string-helpers": "next", + "@rocket.chat/string-helpers": "~0.31.25", "@types/node": "^14.18.63", "ejson": "^2.2.3", "event-loop-stats": "^1.4.1", diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json index 73fa510e6d12..60c34e215bec 100644 --- a/ee/packages/omnichannel-services/package.json +++ b/ee/packages/omnichannel-services/package.json @@ -13,13 +13,13 @@ "dependencies": { "@rocket.chat/core-services": "workspace:^", "@rocket.chat/core-typings": "workspace:^", - "@rocket.chat/emitter": "next", + "@rocket.chat/emitter": "~0.31.25", "@rocket.chat/logger": "workspace:^", "@rocket.chat/model-typings": "workspace:^", "@rocket.chat/models": "workspace:^", "@rocket.chat/pdf-worker": "workspace:^", "@rocket.chat/rest-typings": "workspace:^", - "@rocket.chat/string-helpers": "next", + "@rocket.chat/string-helpers": "~0.31.25", "@rocket.chat/tools": "workspace:^", "@types/node": "^14.18.63", "ejson": "^2.2.3", diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json index 9b0e3579f80e..8d112454191c 100644 --- a/ee/packages/pdf-worker/package.json +++ b/ee/packages/pdf-worker/package.json @@ -34,7 +34,7 @@ "dependencies": { "@react-pdf/renderer": "^3.1.14", "@rocket.chat/core-typings": "workspace:^", - "@rocket.chat/fuselage-tokens": "^0.32.0", + "@rocket.chat/fuselage-tokens": "~0.32.0", "@types/react": "~17.0.69", "emoji-assets": "^7.0.1", "emoji-toolkit": "^7.0.1", diff --git a/ee/packages/ui-theming/package.json b/ee/packages/ui-theming/package.json index 3870408f7a50..f1a904fd6f65 100644 --- a/ee/packages/ui-theming/package.json +++ b/ee/packages/ui-theming/package.json @@ -3,10 +3,10 @@ "version": "0.1.1-rc.0", "private": true, "devDependencies": { - "@rocket.chat/css-in-js": "next", - "@rocket.chat/fuselage": "^0.37.1", - "@rocket.chat/fuselage-hooks": "^0.32.1", - "@rocket.chat/icons": "^0.32.0", + "@rocket.chat/css-in-js": "~0.31.25", + "@rocket.chat/fuselage": "~0.38.1", + "@rocket.chat/fuselage-hooks": "~0.32.1", + "@rocket.chat/icons": "~0.32.0", "@rocket.chat/ui-contexts": "workspace:~", "@storybook/addon-actions": "~6.5.16", "@storybook/addon-docs": "~6.5.16", diff --git a/packages/core-services/package.json b/packages/core-services/package.json index 22883244d4e3..a815f6ec69df 100644 --- a/packages/core-services/package.json +++ b/packages/core-services/package.json @@ -36,11 +36,11 @@ "dependencies": { "@rocket.chat/apps-engine": "1.41.0-alpha.290", "@rocket.chat/core-typings": "workspace:^", - "@rocket.chat/icons": "^0.32.0", - "@rocket.chat/message-parser": "next", + "@rocket.chat/icons": "~0.32.0", + "@rocket.chat/message-parser": "~0.31.26", "@rocket.chat/models": "workspace:^", "@rocket.chat/rest-typings": "workspace:^", - "@rocket.chat/ui-kit": "^0.32.1", + "@rocket.chat/ui-kit": "~0.32.1", "@types/fibers": "^3.1.3", "fibers": "^5.0.3" } diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json index 5b872b851f2f..39c97a857383 100644 --- a/packages/core-typings/package.json +++ b/packages/core-typings/package.json @@ -23,9 +23,9 @@ ], "dependencies": { "@rocket.chat/apps-engine": "1.41.0-alpha.290", - "@rocket.chat/icons": "^0.32.0", - "@rocket.chat/message-parser": "next", - "@rocket.chat/ui-kit": "^0.32.1" + "@rocket.chat/icons": "~0.32.0", + "@rocket.chat/message-parser": "~0.31.26", + "@rocket.chat/ui-kit": "~0.32.1" }, "volta": { "extends": "../../package.json" diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index 090477afdf9f..e5d4ba8cca5d 100644 --- a/packages/fuselage-ui-kit/package.json +++ b/packages/fuselage-ui-kit/package.json @@ -61,14 +61,14 @@ "@babel/preset-typescript": "~7.22.15", "@rocket.chat/apps-engine": "1.41.0-alpha.290", "@rocket.chat/eslint-config": "workspace:^", - "@rocket.chat/fuselage": "^0.37.1", - "@rocket.chat/fuselage-hooks": "^0.32.1", - "@rocket.chat/fuselage-polyfills": "next", - "@rocket.chat/icons": "^0.32.0", - "@rocket.chat/prettier-config": "next", - "@rocket.chat/styled": "next", + "@rocket.chat/fuselage": "~0.38.1", + "@rocket.chat/fuselage-hooks": "~0.32.1", + "@rocket.chat/fuselage-polyfills": "~0.31.25", + "@rocket.chat/icons": "~0.32.0", + "@rocket.chat/prettier-config": "~0.31.25", + "@rocket.chat/styled": "~0.31.25", "@rocket.chat/ui-contexts": "workspace:^", - "@rocket.chat/ui-kit": "^0.32.1", + "@rocket.chat/ui-kit": "~0.32.1", "@rocket.chat/ui-video-conf": "workspace:^", "@storybook/addon-essentials": "~6.5.16", "@storybook/addons": "~6.5.16", @@ -98,7 +98,7 @@ }, "dependencies": { "@rocket.chat/gazzodown": "workspace:^", - "@rocket.chat/ui-kit": "^0.32.1", + "@rocket.chat/ui-kit": "~0.32.1", "tslib": "^2.5.3" }, "volta": { diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json index 6a6aba549c45..f4907c14d5c4 100644 --- a/packages/gazzodown/package.json +++ b/packages/gazzodown/package.json @@ -5,11 +5,11 @@ "devDependencies": { "@babel/core": "~7.22.20", "@rocket.chat/core-typings": "workspace:^", - "@rocket.chat/css-in-js": "next", - "@rocket.chat/fuselage": "^0.37.1", - "@rocket.chat/fuselage-tokens": "^0.32.0", - "@rocket.chat/message-parser": "next", - "@rocket.chat/styled": "next", + "@rocket.chat/css-in-js": "~0.31.25", + "@rocket.chat/fuselage": "~0.38.1", + "@rocket.chat/fuselage-tokens": "~0.32.0", + "@rocket.chat/message-parser": "~0.31.26", + "@rocket.chat/styled": "~0.31.25", "@rocket.chat/ui-client": "workspace:^", "@rocket.chat/ui-contexts": "workspace:^", "@storybook/addon-actions": "~6.5.16", diff --git a/packages/livechat/package.json b/packages/livechat/package.json index 0cf288930699..1fd61f1869ae 100644 --- a/packages/livechat/package.json +++ b/packages/livechat/package.json @@ -30,8 +30,8 @@ "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/ddp-client": "workspace:^", "@rocket.chat/eslint-config": "workspace:^", - "@rocket.chat/fuselage-tokens": "^0.32.0", - "@rocket.chat/logo": "^0.31.28", + "@rocket.chat/fuselage-tokens": "~0.32.0", + "@rocket.chat/logo": "~0.31.28", "@storybook/addon-essentials": "~6.5.16", "@storybook/addon-postcss": "~2.0.0", "@storybook/preact": "~6.5.16", @@ -94,10 +94,10 @@ }, "dependencies": { "@rocket.chat/gazzodown": "workspace:^", - "@rocket.chat/message-parser": "next", + "@rocket.chat/message-parser": "~0.31.26", "@rocket.chat/random": "workspace:~", "@rocket.chat/sdk": "^1.0.0-alpha.42", - "@rocket.chat/ui-kit": "^0.32.1", + "@rocket.chat/ui-kit": "~0.32.1", "css-vars-ponyfill": "^2.4.8", "date-fns": "^2.15.0", "emoji-mart": "^3.0.1", diff --git a/packages/logger/package.json b/packages/logger/package.json index a1e83ea24f3b..37fc79059681 100644 --- a/packages/logger/package.json +++ b/packages/logger/package.json @@ -22,7 +22,7 @@ "/dist" ], "dependencies": { - "@rocket.chat/emitter": "next", + "@rocket.chat/emitter": "~0.31.25", "pino": "^8.15.0" } } diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json index 58d1898dd3c0..68f356a4a132 100644 --- a/packages/rest-typings/package.json +++ b/packages/rest-typings/package.json @@ -27,8 +27,8 @@ "@rocket.chat/apps-engine": "1.41.0-alpha.290", "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/license": "workspace:^", - "@rocket.chat/message-parser": "next", - "@rocket.chat/ui-kit": "^0.32.1", + "@rocket.chat/message-parser": "~0.31.26", + "@rocket.chat/ui-kit": "~0.32.1", "ajv": "^8.11.0", "ajv-formats": "^2.1.1" }, diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json index 3b7e7c246c25..483a7fe5fb86 100644 --- a/packages/ui-client/package.json +++ b/packages/ui-client/package.json @@ -4,10 +4,10 @@ "private": true, "devDependencies": { "@babel/core": "~7.22.20", - "@rocket.chat/css-in-js": "next", - "@rocket.chat/fuselage": "^0.37.1", - "@rocket.chat/fuselage-hooks": "^0.32.1", - "@rocket.chat/icons": "^0.32.0", + "@rocket.chat/css-in-js": "~0.31.25", + "@rocket.chat/fuselage": "~0.38.1", + "@rocket.chat/fuselage-hooks": "~0.32.1", + "@rocket.chat/icons": "~0.32.0", "@rocket.chat/mock-providers": "workspace:^", "@rocket.chat/ui-contexts": "workspace:~", "@storybook/addon-actions": "~6.5.16", diff --git a/packages/ui-composer/package.json b/packages/ui-composer/package.json index 4551d06659cc..39eab8109232 100644 --- a/packages/ui-composer/package.json +++ b/packages/ui-composer/package.json @@ -5,8 +5,8 @@ "devDependencies": { "@babel/core": "~7.22.20", "@rocket.chat/eslint-config": "workspace:^", - "@rocket.chat/fuselage": "^0.37.1", - "@rocket.chat/icons": "^0.32.0", + "@rocket.chat/fuselage": "~0.38.1", + "@rocket.chat/icons": "~0.32.0", "@storybook/addon-actions": "~6.5.16", "@storybook/addon-docs": "~6.5.16", "@storybook/addon-essentials": "~6.5.16", diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json index b75a5449907a..d05d9386ef79 100644 --- a/packages/ui-contexts/package.json +++ b/packages/ui-contexts/package.json @@ -4,8 +4,8 @@ "private": true, "devDependencies": { "@rocket.chat/core-typings": "workspace:^", - "@rocket.chat/emitter": "next", - "@rocket.chat/fuselage-hooks": "^0.32.1", + "@rocket.chat/emitter": "~0.31.25", + "@rocket.chat/fuselage-hooks": "~0.32.1", "@rocket.chat/rest-typings": "workspace:^", "@types/jest": "~29.5.7", "@types/react": "~17.0.69", diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json index 16293f9424d6..a2c3c9cf019e 100644 --- a/packages/ui-video-conf/package.json +++ b/packages/ui-video-conf/package.json @@ -4,12 +4,12 @@ "private": true, "devDependencies": { "@babel/core": "~7.22.20", - "@rocket.chat/css-in-js": "next", + "@rocket.chat/css-in-js": "~0.31.25", "@rocket.chat/eslint-config": "workspace:^", - "@rocket.chat/fuselage": "^0.37.1", - "@rocket.chat/fuselage-hooks": "^0.32.1", - "@rocket.chat/icons": "^0.32.0", - "@rocket.chat/styled": "next", + "@rocket.chat/fuselage": "~0.38.1", + "@rocket.chat/fuselage-hooks": "~0.32.1", + "@rocket.chat/icons": "~0.32.0", + "@rocket.chat/styled": "~0.31.25", "@rocket.chat/ui-contexts": "workspace:^", "@storybook/addon-actions": "~6.5.16", "@storybook/addon-docs": "~6.5.16", @@ -53,7 +53,7 @@ "/dist" ], "dependencies": { - "@rocket.chat/emitter": "next" + "@rocket.chat/emitter": "~0.31.25" }, "volta": { "extends": "../../package.json" diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json index a02abbb30c9a..2c48168d22d0 100644 --- a/packages/uikit-playground/package.json +++ b/packages/uikit-playground/package.json @@ -14,15 +14,15 @@ "@codemirror/lang-json": "^6.0.1", "@codemirror/tooltip": "^0.19.16", "@lezer/highlight": "^1.1.6", - "@rocket.chat/css-in-js": "next", - "@rocket.chat/fuselage": "^0.37.1", - "@rocket.chat/fuselage-hooks": "^0.32.1", - "@rocket.chat/fuselage-polyfills": "next", - "@rocket.chat/fuselage-tokens": "^0.32.0", + "@rocket.chat/css-in-js": "~0.31.25", + "@rocket.chat/fuselage": "~0.38.1", + "@rocket.chat/fuselage-hooks": "~0.32.1", + "@rocket.chat/fuselage-polyfills": "~0.31.25", + "@rocket.chat/fuselage-tokens": "~0.32.0", "@rocket.chat/fuselage-ui-kit": "workspace:~", - "@rocket.chat/icons": "^0.32.0", - "@rocket.chat/logo": "^0.31.28", - "@rocket.chat/styled": "next", + "@rocket.chat/icons": "~0.32.0", + "@rocket.chat/logo": "~0.31.28", + "@rocket.chat/styled": "~0.31.25", "@rocket.chat/ui-contexts": "workspace:~", "codemirror": "^6.0.1", "eslint4b-prebuilt": "^6.7.2", diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json index ae313fe52f67..022438b562e3 100644 --- a/packages/web-ui-registration/package.json +++ b/packages/web-ui-registration/package.json @@ -22,7 +22,7 @@ "@babel/preset-react": "~7.22.15", "@babel/preset-typescript": "~7.22.15", "@rocket.chat/i18n": "workspace:~", - "@rocket.chat/layout": "next", + "@rocket.chat/layout": "~0.31.26", "@rocket.chat/mock-providers": "workspace:~", "@rocket.chat/tools": "workspace:~", "@rocket.chat/ui-client": "workspace:^", diff --git a/yarn.lock b/yarn.lock index 0f36024edc91..c00fbb463c2e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2656,7 +2656,16 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.20.1, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.22.5, @babel/runtime@npm:^7.5.0, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2, @babel/runtime@npm:~7.22.15": +"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.20.1, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.22.5, @babel/runtime@npm:^7.5.0, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2": + version: 7.23.4 + resolution: "@babel/runtime@npm:7.23.4" + dependencies: + regenerator-runtime: ^0.14.0 + checksum: 8eb6a6b2367f7d60e7f7dd83f477cc2e2fdb169e5460694d7614ce5c730e83324bcf29251b70940068e757ad1ee56ff8073a372260d90cad55f18a825caf97cd + languageName: node + linkType: hard + +"@babel/runtime@npm:~7.22.15": version: 7.22.15 resolution: "@babel/runtime@npm:7.22.15" dependencies: @@ -7697,12 +7706,12 @@ __metadata: dependencies: "@rocket.chat/core-services": "workspace:^" "@rocket.chat/core-typings": "workspace:^" - "@rocket.chat/emitter": next + "@rocket.chat/emitter": ~0.31.25 "@rocket.chat/eslint-config": "workspace:^" "@rocket.chat/model-typings": "workspace:^" "@rocket.chat/models": "workspace:^" "@rocket.chat/rest-typings": "workspace:^" - "@rocket.chat/string-helpers": next + "@rocket.chat/string-helpers": ~0.31.25 "@types/bcrypt": ^5.0.1 "@types/gc-stats": ^1.4.2 "@types/node": ^14.18.63 @@ -7821,12 +7830,12 @@ __metadata: dependencies: "@rocket.chat/core-services": "workspace:^" "@rocket.chat/core-typings": "workspace:^" - "@rocket.chat/emitter": next + "@rocket.chat/emitter": ~0.31.25 "@rocket.chat/eslint-config": "workspace:^" "@rocket.chat/model-typings": "workspace:^" "@rocket.chat/models": "workspace:^" "@rocket.chat/rest-typings": "workspace:^" - "@rocket.chat/string-helpers": next + "@rocket.chat/string-helpers": ~0.31.25 "@types/gc-stats": ^1.4.2 "@types/node": ^14.18.63 "@types/polka": ^0.5.6 @@ -7886,11 +7895,11 @@ __metadata: "@rocket.chat/apps-engine": 1.41.0-alpha.290 "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/eslint-config": "workspace:^" - "@rocket.chat/icons": ^0.32.0 - "@rocket.chat/message-parser": next + "@rocket.chat/icons": ~0.32.0 + "@rocket.chat/message-parser": ~0.31.26 "@rocket.chat/models": "workspace:^" "@rocket.chat/rest-typings": "workspace:^" - "@rocket.chat/ui-kit": ^0.32.1 + "@rocket.chat/ui-kit": ~0.32.1 "@types/babel__core": ^7.20.3 "@types/babel__preset-env": ^7.9.4 "@types/fibers": ^3.1.3 @@ -7911,9 +7920,9 @@ __metadata: dependencies: "@rocket.chat/apps-engine": 1.41.0-alpha.290 "@rocket.chat/eslint-config": "workspace:^" - "@rocket.chat/icons": ^0.32.0 - "@rocket.chat/message-parser": next - "@rocket.chat/ui-kit": ^0.32.1 + "@rocket.chat/icons": ~0.32.0 + "@rocket.chat/message-parser": ~0.31.26 + "@rocket.chat/ui-kit": ~0.32.1 eslint: ~8.45.0 mongodb: ^4.17.1 prettier: ~2.8.8 @@ -7938,7 +7947,7 @@ __metadata: languageName: unknown linkType: soft -"@rocket.chat/css-in-js@npm:^0.31.25": +"@rocket.chat/css-in-js@npm:^0.31.25, @rocket.chat/css-in-js@npm:~0.31.25": version: 0.31.25 resolution: "@rocket.chat/css-in-js@npm:0.31.25" dependencies: @@ -7951,19 +7960,6 @@ __metadata: languageName: node linkType: hard -"@rocket.chat/css-in-js@npm:next": - version: 0.31.26-dev.19 - resolution: "@rocket.chat/css-in-js@npm:0.31.26-dev.19" - dependencies: - "@emotion/hash": ^0.9.0 - "@rocket.chat/css-supports": ^0.31.25 - "@rocket.chat/memo": ^0.31.25 - "@rocket.chat/stylis-logical-props-middleware": ^0.31.25 - stylis: ~4.1.3 - checksum: 4d1381558188c4625051420a6760e613189abca9cf06c23beb833e582229975a0aaac9aef89a788f161ad5a99344a3d028042d90a33d5144668577aa647a78f3 - languageName: node - linkType: hard - "@rocket.chat/css-supports@npm:^0.31.25": version: 0.31.25 resolution: "@rocket.chat/css-supports@npm:0.31.25" @@ -8001,14 +7997,14 @@ __metadata: "@rocket.chat/apps-engine": 1.41.0-alpha.290 "@rocket.chat/core-services": "workspace:^" "@rocket.chat/core-typings": "workspace:^" - "@rocket.chat/emitter": next + "@rocket.chat/emitter": ~0.31.25 "@rocket.chat/eslint-config": "workspace:^" "@rocket.chat/instance-status": "workspace:^" "@rocket.chat/logger": "workspace:^" "@rocket.chat/model-typings": "workspace:^" "@rocket.chat/models": "workspace:^" "@rocket.chat/rest-typings": "workspace:^" - "@rocket.chat/string-helpers": next + "@rocket.chat/string-helpers": ~0.31.25 "@rocket.chat/ui-contexts": "workspace:^" "@types/ejson": ^2.2.1 "@types/gc-stats": ^1.4.2 @@ -8042,10 +8038,10 @@ __metadata: languageName: unknown linkType: soft -"@rocket.chat/emitter@npm:next": - version: 0.31.26-dev.25 - resolution: "@rocket.chat/emitter@npm:0.31.26-dev.25" - checksum: 2320d757ba92bcb510a362dec49efb8a80e15c6e4877c49f428e7d757cfa08b291d6771512aef0344feadc41a564ec689673d87b4c828d8cc692a6d01726e9dd +"@rocket.chat/emitter@npm:~0.31.25": + version: 0.31.25 + resolution: "@rocket.chat/emitter@npm:0.31.25" + checksum: bcb7fbd947507446b9902157adea89ed873f499f5493e9de4eee14795e52a3678b2dd7353f827721f985773dc0a39f51f387bc4e40202e2afb666444437a6041 languageName: node linkType: hard @@ -8138,7 +8134,7 @@ __metadata: languageName: node linkType: hard -"@rocket.chat/fuselage-hooks@npm:^0.32.1": +"@rocket.chat/fuselage-hooks@npm:^0.32.1, @rocket.chat/fuselage-hooks@npm:~0.32.1": version: 0.32.1 resolution: "@rocket.chat/fuselage-hooks@npm:0.32.1" dependencies: @@ -8150,9 +8146,9 @@ __metadata: languageName: node linkType: hard -"@rocket.chat/fuselage-polyfills@npm:next": - version: 0.31.26-dev.25 - resolution: "@rocket.chat/fuselage-polyfills@npm:0.31.26-dev.25" +"@rocket.chat/fuselage-polyfills@npm:~0.31.25": + version: 0.31.25 + resolution: "@rocket.chat/fuselage-polyfills@npm:0.31.25" dependencies: "@juggle/resize-observer": ^3.4.0 clipboard-polyfill: ^3.0.3 @@ -8160,13 +8156,13 @@ __metadata: focus-visible: ^5.2.0 focus-within-polyfill: ^5.2.1 new-event-polyfill: ^1.0.1 - checksum: ddee0db78b115400635d86991fe8b707f1354d2f4f1f2a4b0a6b642e7cc9eb57881942803d49804d5de811a6a37085994709980011aee848d18c6551746c0422 + checksum: 191731a2b8bc963287e7072fa8eb7a7b3cc255b6bd8ecabb3c0303e8f3f046213a6a1bcc1d6c2812ce664657fb92c46bf370c6d3ff9981ba58140819189f2b62 languageName: node linkType: hard -"@rocket.chat/fuselage-toastbar@npm:next": - version: 0.32.0-dev.409 - resolution: "@rocket.chat/fuselage-toastbar@npm:0.32.0-dev.409" +"@rocket.chat/fuselage-toastbar@npm:~0.31.25": + version: 0.31.25 + resolution: "@rocket.chat/fuselage-toastbar@npm:0.31.25" peerDependencies: "@rocket.chat/fuselage": "*" "@rocket.chat/fuselage-hooks": "*" @@ -8174,11 +8170,11 @@ __metadata: "@rocket.chat/styled": "*" react: ^17.0.2 react-dom: ^17.0.2 - checksum: c772456d364328484ddc72abd2b83c33a8610cd514139a6a832b77202aac1d8abc747a41d7d2ebe61e66de856d3b99446eee3c90df4b4afff86fbfe200527d56 + checksum: 0dcc6e38c45594efefefe5763ef5bf98296cdf2f9b189f2f0c062d1d9bedf460b10508ccaaa689e2a656876f224eb9c9ac74e48fcd6acacb794c6fab3e8d4c33 languageName: node linkType: hard -"@rocket.chat/fuselage-tokens@npm:^0.32.0": +"@rocket.chat/fuselage-tokens@npm:^0.32.0, @rocket.chat/fuselage-tokens@npm:~0.32.0": version: 0.32.0 resolution: "@rocket.chat/fuselage-tokens@npm:0.32.0" checksum: 8da7836877ba93462f90d13de6d3d3add8b2758b58c7988e14a8f0deffd1ceef0547f26d4c60a7ddc881e21e3327b5a04cbf17336e5ca8ab9c19789d8e6af3c0 @@ -8195,15 +8191,15 @@ __metadata: "@babel/preset-typescript": ~7.22.15 "@rocket.chat/apps-engine": 1.41.0-alpha.290 "@rocket.chat/eslint-config": "workspace:^" - "@rocket.chat/fuselage": ^0.37.1 - "@rocket.chat/fuselage-hooks": ^0.32.1 - "@rocket.chat/fuselage-polyfills": next + "@rocket.chat/fuselage": ~0.38.1 + "@rocket.chat/fuselage-hooks": ~0.32.1 + "@rocket.chat/fuselage-polyfills": ~0.31.25 "@rocket.chat/gazzodown": "workspace:^" - "@rocket.chat/icons": ^0.32.0 - "@rocket.chat/prettier-config": next - "@rocket.chat/styled": next + "@rocket.chat/icons": ~0.32.0 + "@rocket.chat/prettier-config": ~0.31.25 + "@rocket.chat/styled": ~0.31.25 "@rocket.chat/ui-contexts": "workspace:^" - "@rocket.chat/ui-kit": ^0.32.1 + "@rocket.chat/ui-kit": ~0.32.1 "@rocket.chat/ui-video-conf": "workspace:^" "@storybook/addon-essentials": ~6.5.16 "@storybook/addons": ~6.5.16 @@ -8248,9 +8244,9 @@ __metadata: languageName: unknown linkType: soft -"@rocket.chat/fuselage@npm:^0.37.1": - version: 0.37.1 - resolution: "@rocket.chat/fuselage@npm:0.37.1" +"@rocket.chat/fuselage@npm:~0.38.1": + version: 0.38.1 + resolution: "@rocket.chat/fuselage@npm:0.38.1" dependencies: "@rocket.chat/css-in-js": ^0.31.25 "@rocket.chat/css-supports": ^0.31.25 @@ -8268,7 +8264,7 @@ __metadata: react: ^17.0.2 react-dom: ^17.0.2 react-virtuoso: 1.2.4 - checksum: f51faa64c93d6563ef8851b1c640796c54a474f0e6fda7408d49bd7091252680a405f4e1a65cadefdce9910c118ff486e949301aa42fe8858c8eb2228870d885 + checksum: 91d59bead6710a60835e6dfd5f93af2923f3a2998cf5eb3107a97f8cb301bd8e98a3f8bbc4edcc75496e622b5f158fb4491155016bc60e17e76d737f536855dc languageName: node linkType: hard @@ -8278,11 +8274,11 @@ __metadata: dependencies: "@babel/core": ~7.22.20 "@rocket.chat/core-typings": "workspace:^" - "@rocket.chat/css-in-js": next - "@rocket.chat/fuselage": ^0.37.1 - "@rocket.chat/fuselage-tokens": ^0.32.0 - "@rocket.chat/message-parser": next - "@rocket.chat/styled": next + "@rocket.chat/css-in-js": ~0.31.25 + "@rocket.chat/fuselage": ~0.38.1 + "@rocket.chat/fuselage-tokens": ~0.32.0 + "@rocket.chat/message-parser": ~0.31.26 + "@rocket.chat/styled": ~0.31.25 "@rocket.chat/ui-client": "workspace:^" "@rocket.chat/ui-contexts": "workspace:^" "@storybook/addon-actions": ~6.5.16 @@ -8351,7 +8347,7 @@ __metadata: languageName: unknown linkType: soft -"@rocket.chat/icons@npm:^0.32.0": +"@rocket.chat/icons@npm:~0.32.0": version: 0.32.0 resolution: "@rocket.chat/icons@npm:0.32.0" checksum: 013c819eaaa5a2abc6e35f237e904c35ba105eb0be101dadba678732815423c3a4e01e0e65d0301acfeac77bc59e3aa2bc997744e3c7611c0814c733118cb248 @@ -8384,15 +8380,15 @@ __metadata: languageName: unknown linkType: soft -"@rocket.chat/layout@npm:next": - version: 0.32.0-dev.318 - resolution: "@rocket.chat/layout@npm:0.32.0-dev.318" +"@rocket.chat/layout@npm:~0.31.26": + version: 0.31.26 + resolution: "@rocket.chat/layout@npm:0.31.26" peerDependencies: "@rocket.chat/fuselage": "*" react: 17.0.2 react-dom: 17.0.2 react-i18next: ~11.15.4 - checksum: fc08ca4b30373e2b7760bd4c916b8bfd233579cb604d831a52e3737774218ac50652869218499cf3122f3c7b7619fc848bd3893772e9373f6459058866e6ee6c + checksum: 473b3ce43f7e5c495bbbfb54c628a1da9fda672fee0aeef74a25690a462b243982749bb1ba6933130381aea8aae61fb9aed6b45d6c3ec370c7555e1ac69930ce languageName: node linkType: hard @@ -8428,13 +8424,13 @@ __metadata: "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/ddp-client": "workspace:^" "@rocket.chat/eslint-config": "workspace:^" - "@rocket.chat/fuselage-tokens": ^0.32.0 + "@rocket.chat/fuselage-tokens": ~0.32.0 "@rocket.chat/gazzodown": "workspace:^" - "@rocket.chat/logo": ^0.31.28 - "@rocket.chat/message-parser": next + "@rocket.chat/logo": ~0.31.28 + "@rocket.chat/message-parser": ~0.31.26 "@rocket.chat/random": "workspace:~" "@rocket.chat/sdk": ^1.0.0-alpha.42 - "@rocket.chat/ui-kit": ^0.32.1 + "@rocket.chat/ui-kit": ~0.32.1 "@storybook/addon-essentials": ~6.5.16 "@storybook/addon-postcss": ~2.0.0 "@storybook/preact": ~6.5.16 @@ -8530,7 +8526,7 @@ __metadata: version: 0.0.0-use.local resolution: "@rocket.chat/logger@workspace:packages/logger" dependencies: - "@rocket.chat/emitter": next + "@rocket.chat/emitter": ~0.31.25 "@types/jest": ~29.5.7 eslint: ~8.45.0 jest: ~29.6.4 @@ -8540,7 +8536,7 @@ __metadata: languageName: unknown linkType: soft -"@rocket.chat/logo@npm:^0.31.28": +"@rocket.chat/logo@npm:~0.31.28": version: 0.31.28 resolution: "@rocket.chat/logo@npm:0.31.28" dependencies: @@ -8553,26 +8549,19 @@ __metadata: languageName: node linkType: hard -"@rocket.chat/memo@npm:^0.31.25": +"@rocket.chat/memo@npm:^0.31.25, @rocket.chat/memo@npm:~0.31.25": version: 0.31.25 resolution: "@rocket.chat/memo@npm:0.31.25" checksum: 92d595c68d76a5258fb37ed4639e2709ba290c5d240df1272d81a2ab6b4be28ee2dd5b721dad940fe2638a89e8d14e684a970c59890003a06ce6088c655b7c0e languageName: node linkType: hard -"@rocket.chat/memo@npm:next": - version: 0.31.26-dev.19 - resolution: "@rocket.chat/memo@npm:0.31.26-dev.19" - checksum: 387c29643c0d725b2e2d3b79eeebf2ed3ac2fa518178d2836913dddf48f2aa72e80b277d54c77ac0498c144324cdfd3449bae883895c316fbb43c7dbbfcb3993 - languageName: node - linkType: hard - -"@rocket.chat/message-parser@npm:next": - version: 0.32.0-dev.383 - resolution: "@rocket.chat/message-parser@npm:0.32.0-dev.383" +"@rocket.chat/message-parser@npm:~0.31.26": + version: 0.31.26 + resolution: "@rocket.chat/message-parser@npm:0.31.26" dependencies: tldts: ~5.7.112 - checksum: a214e4f24caef43cb6fe4f48b86eadd9a74a9a8495aa3a6ccd51c1e7d1c7734d781ca364f36ee2a9ad994b10cbe9f440b2270c496d607987d17fa59b8d278f82 + checksum: d845409037ee51acd05b636aa6677053edc70b8fb759ee081cce42ec71070e3b45b4407dcfd4f49ea4373cb37f25c9b45f543f230a5fb20a55355077487669b2 languageName: node linkType: hard @@ -8611,37 +8600,37 @@ __metadata: "@rocket.chat/core-services": "workspace:^" "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/cron": "workspace:^" - "@rocket.chat/css-in-js": next - "@rocket.chat/emitter": next + "@rocket.chat/css-in-js": ~0.31.25 + "@rocket.chat/emitter": ~0.31.25 "@rocket.chat/eslint-config": "workspace:^" "@rocket.chat/favicon": "workspace:^" "@rocket.chat/forked-matrix-appservice-bridge": ^4.0.2 "@rocket.chat/forked-matrix-bot-sdk": ^0.6.0-beta.3 - "@rocket.chat/fuselage": ^0.37.1 - "@rocket.chat/fuselage-hooks": ^0.32.1 - "@rocket.chat/fuselage-polyfills": next - "@rocket.chat/fuselage-toastbar": next - "@rocket.chat/fuselage-tokens": ^0.32.0 + "@rocket.chat/fuselage": ~0.38.1 + "@rocket.chat/fuselage-hooks": ~0.32.1 + "@rocket.chat/fuselage-polyfills": ~0.31.25 + "@rocket.chat/fuselage-toastbar": ~0.31.25 + "@rocket.chat/fuselage-tokens": ~0.32.0 "@rocket.chat/fuselage-ui-kit": "workspace:^" "@rocket.chat/gazzodown": "workspace:^" "@rocket.chat/i18n": "workspace:^" - "@rocket.chat/icons": ^0.32.0 + "@rocket.chat/icons": ~0.32.0 "@rocket.chat/instance-status": "workspace:^" "@rocket.chat/jwt": "workspace:^" - "@rocket.chat/layout": next + "@rocket.chat/layout": ~0.31.26 "@rocket.chat/license": "workspace:^" "@rocket.chat/livechat": "workspace:^" "@rocket.chat/log-format": "workspace:^" "@rocket.chat/logger": "workspace:^" - "@rocket.chat/logo": ^0.31.28 - "@rocket.chat/memo": next - "@rocket.chat/message-parser": next + "@rocket.chat/logo": ~0.31.28 + "@rocket.chat/memo": ~0.31.25 + "@rocket.chat/message-parser": ~0.31.26 "@rocket.chat/mock-providers": "workspace:^" "@rocket.chat/model-typings": "workspace:^" "@rocket.chat/models": "workspace:^" "@rocket.chat/mp3-encoder": 0.24.0 "@rocket.chat/omnichannel-services": "workspace:^" - "@rocket.chat/onboarding-ui": 0.33.0 + "@rocket.chat/onboarding-ui": ~0.33.1 "@rocket.chat/password-policies": "workspace:^" "@rocket.chat/pdf-worker": "workspace:^" "@rocket.chat/poplib": "workspace:^" @@ -8651,12 +8640,12 @@ __metadata: "@rocket.chat/server-cloud-communication": "workspace:^" "@rocket.chat/server-fetch": "workspace:^" "@rocket.chat/sha256": "workspace:^" - "@rocket.chat/string-helpers": next + "@rocket.chat/string-helpers": ~0.31.25 "@rocket.chat/tools": "workspace:^" "@rocket.chat/ui-client": "workspace:^" "@rocket.chat/ui-composer": "workspace:^" "@rocket.chat/ui-contexts": "workspace:^" - "@rocket.chat/ui-kit": ^0.32.1 + "@rocket.chat/ui-kit": ~0.32.1 "@rocket.chat/ui-theming": "workspace:^" "@rocket.chat/ui-video-conf": "workspace:^" "@rocket.chat/web-ui-registration": "workspace:^" @@ -9021,14 +9010,14 @@ __metadata: dependencies: "@rocket.chat/core-services": "workspace:^" "@rocket.chat/core-typings": "workspace:^" - "@rocket.chat/emitter": next + "@rocket.chat/emitter": ~0.31.25 "@rocket.chat/eslint-config": "workspace:^" "@rocket.chat/logger": "workspace:^" "@rocket.chat/model-typings": "workspace:^" "@rocket.chat/models": "workspace:^" "@rocket.chat/pdf-worker": "workspace:^" "@rocket.chat/rest-typings": "workspace:^" - "@rocket.chat/string-helpers": next + "@rocket.chat/string-helpers": ~0.31.25 "@rocket.chat/tools": "workspace:^" "@types/jest": ~29.5.7 "@types/node": ^14.18.63 @@ -9055,7 +9044,7 @@ __metadata: "@react-pdf/renderer": ^3.1.14 "@rocket.chat/core-services": "workspace:^" "@rocket.chat/core-typings": "workspace:^" - "@rocket.chat/emitter": next + "@rocket.chat/emitter": ~0.31.25 "@rocket.chat/eslint-config": "workspace:^" "@rocket.chat/logger": "workspace:^" "@rocket.chat/model-typings": "workspace:^" @@ -9087,9 +9076,9 @@ __metadata: languageName: unknown linkType: soft -"@rocket.chat/onboarding-ui@npm:0.33.0": - version: 0.33.0 - resolution: "@rocket.chat/onboarding-ui@npm:0.33.0" +"@rocket.chat/onboarding-ui@npm:~0.33.1": + version: 0.33.1 + resolution: "@rocket.chat/onboarding-ui@npm:0.33.1" dependencies: i18next: ~21.6.16 react-hook-form: ~7.27.1 @@ -9104,7 +9093,7 @@ __metadata: react: 17.0.2 react-dom: 17.0.2 react-i18next: ~11.15.4 - checksum: d09e9bd4443410d9064a7a759dcb96f23deec77eb4ae1049d0d94ee0403d8f8c9c3a64290ce7011d48ae13ff0150ad915585a47520621f8680a89035c9637652 + checksum: 48be4af0c4d6ca4f4746d21cc76d0a0087ff4b768e578a18e62bee3736b1b4860aa9ff1a73b3b4c3590149ce9ea7cf8d7fcfe964d37000a8a71766b08a4bcdce languageName: node linkType: hard @@ -9128,7 +9117,7 @@ __metadata: dependencies: "@react-pdf/renderer": ^3.1.14 "@rocket.chat/core-typings": "workspace:^" - "@rocket.chat/fuselage-tokens": ^0.32.0 + "@rocket.chat/fuselage-tokens": ~0.32.0 "@storybook/addon-essentials": ~6.5.16 "@storybook/react": ~6.5.16 "@testing-library/jest-dom": ^5.16.5 @@ -9170,12 +9159,12 @@ __metadata: dependencies: "@rocket.chat/core-services": "workspace:^" "@rocket.chat/core-typings": "workspace:^" - "@rocket.chat/emitter": next + "@rocket.chat/emitter": ~0.31.25 "@rocket.chat/eslint-config": "workspace:^" "@rocket.chat/model-typings": "workspace:^" "@rocket.chat/models": "workspace:^" "@rocket.chat/presence": "workspace:^" - "@rocket.chat/string-helpers": next + "@rocket.chat/string-helpers": ~0.31.25 "@types/gc-stats": ^1.4.2 "@types/node": ^14.18.63 "@types/polka": ^0.5.6 @@ -9218,12 +9207,12 @@ __metadata: languageName: unknown linkType: soft -"@rocket.chat/prettier-config@npm:next": - version: 0.31.17-dev.32 - resolution: "@rocket.chat/prettier-config@npm:0.31.17-dev.32" +"@rocket.chat/prettier-config@npm:~0.31.25": + version: 0.31.25 + resolution: "@rocket.chat/prettier-config@npm:0.31.25" peerDependencies: - prettier: ^2.2.1 - checksum: 9bec76f8dd9b3a7203258b8b07185fb1acdc8c43ed8adea02655aec2fb6794ce232f270504889e1e716f4ac6002d54100cad943a3062e3579578c96f80656a1d + prettier: ~2.7.1 + checksum: 4c0be678e7c161bf132014aa3f986b84f4ec06808b5149f967d52515fb929ee07d073b00a60e197256c8244e02b7e521be20707d6f841de4949d8f516fb8ec09 languageName: node linkType: hard @@ -9234,7 +9223,7 @@ __metadata: "@react-pdf/renderer": ^3.1.14 "@rocket.chat/core-services": "workspace:^" "@rocket.chat/core-typings": "workspace:^" - "@rocket.chat/emitter": next + "@rocket.chat/emitter": ~0.31.25 "@rocket.chat/eslint-config": "workspace:^" "@rocket.chat/logger": "workspace:^" "@rocket.chat/model-typings": "workspace:^" @@ -9308,8 +9297,8 @@ __metadata: "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/eslint-config": "workspace:^" "@rocket.chat/license": "workspace:^" - "@rocket.chat/message-parser": next - "@rocket.chat/ui-kit": ^0.32.1 + "@rocket.chat/message-parser": ~0.31.26 + "@rocket.chat/ui-kit": ~0.32.1 "@types/jest": ~29.5.7 ajv: ^8.11.0 ajv-formats: ^2.1.1 @@ -9387,13 +9376,13 @@ __metadata: dependencies: "@rocket.chat/core-services": "workspace:^" "@rocket.chat/core-typings": "workspace:^" - "@rocket.chat/emitter": next + "@rocket.chat/emitter": ~0.31.25 "@rocket.chat/eslint-config": "workspace:^" "@rocket.chat/logger": "workspace:^" "@rocket.chat/model-typings": "workspace:^" "@rocket.chat/models": "workspace:^" "@rocket.chat/rest-typings": "workspace:^" - "@rocket.chat/string-helpers": next + "@rocket.chat/string-helpers": ~0.31.25 "@types/bcrypt": ^5.0.1 "@types/gc-stats": ^1.4.2 "@types/node": ^14.18.63 @@ -9415,14 +9404,14 @@ __metadata: languageName: unknown linkType: soft -"@rocket.chat/string-helpers@npm:next": - version: 0.31.26-dev.25 - resolution: "@rocket.chat/string-helpers@npm:0.31.26-dev.25" - checksum: cba4efb7e06cf46317fce9ba868e1c59756e1e87b8998320a95657beaacf1ead6bedbee1996e717389c7c40379392b8a6af859efcec1dd301f26adce748b6ba5 +"@rocket.chat/string-helpers@npm:~0.31.25": + version: 0.31.25 + resolution: "@rocket.chat/string-helpers@npm:0.31.25" + checksum: 9fd3f25a9e87a6c33bea1fb521c51e7e6497ad5f9b695807b8b0b98b3130799924305adaa1ea851f10ed2ffc64af8270f3f14339ac181f64b038cb1fd8f8819f languageName: node linkType: hard -"@rocket.chat/styled@npm:^0.31.25": +"@rocket.chat/styled@npm:^0.31.25, @rocket.chat/styled@npm:~0.31.25": version: 0.31.25 resolution: "@rocket.chat/styled@npm:0.31.25" dependencies: @@ -9431,15 +9420,6 @@ __metadata: languageName: node linkType: hard -"@rocket.chat/styled@npm:next": - version: 0.31.26-dev.19 - resolution: "@rocket.chat/styled@npm:0.31.26-dev.19" - dependencies: - "@rocket.chat/css-in-js": ^0.31.25 - checksum: f65cd023bc99af913e2550b39ae21d51da0391699c914a5cabdf556afe1659d22bc70f2924b30084c7cf2547da952750ab96745d6162fcec74ef2b5bbfb8e01a - languageName: node - linkType: hard - "@rocket.chat/stylis-logical-props-middleware@npm:^0.31.25": version: 0.31.25 resolution: "@rocket.chat/stylis-logical-props-middleware@npm:0.31.25" @@ -9469,10 +9449,10 @@ __metadata: resolution: "@rocket.chat/ui-client@workspace:packages/ui-client" dependencies: "@babel/core": ~7.22.20 - "@rocket.chat/css-in-js": next - "@rocket.chat/fuselage": ^0.37.1 - "@rocket.chat/fuselage-hooks": ^0.32.1 - "@rocket.chat/icons": ^0.32.0 + "@rocket.chat/css-in-js": ~0.31.25 + "@rocket.chat/fuselage": ~0.38.1 + "@rocket.chat/fuselage-hooks": ~0.32.1 + "@rocket.chat/icons": ~0.32.0 "@rocket.chat/mock-providers": "workspace:^" "@rocket.chat/ui-contexts": "workspace:~" "@storybook/addon-actions": ~6.5.16 @@ -9521,8 +9501,8 @@ __metadata: dependencies: "@babel/core": ~7.22.20 "@rocket.chat/eslint-config": "workspace:^" - "@rocket.chat/fuselage": ^0.37.1 - "@rocket.chat/icons": ^0.32.0 + "@rocket.chat/fuselage": ~0.38.1 + "@rocket.chat/icons": ~0.32.0 "@storybook/addon-actions": ~6.5.16 "@storybook/addon-docs": ~6.5.16 "@storybook/addon-essentials": ~6.5.16 @@ -9553,8 +9533,8 @@ __metadata: resolution: "@rocket.chat/ui-contexts@workspace:packages/ui-contexts" dependencies: "@rocket.chat/core-typings": "workspace:^" - "@rocket.chat/emitter": next - "@rocket.chat/fuselage-hooks": ^0.32.1 + "@rocket.chat/emitter": ~0.31.25 + "@rocket.chat/fuselage-hooks": ~0.32.1 "@rocket.chat/password-policies": "workspace:^" "@rocket.chat/rest-typings": "workspace:^" "@types/jest": ~29.5.7 @@ -9580,7 +9560,7 @@ __metadata: languageName: unknown linkType: soft -"@rocket.chat/ui-kit@npm:^0.32.1": +"@rocket.chat/ui-kit@npm:~0.32.1": version: 0.32.1 resolution: "@rocket.chat/ui-kit@npm:0.32.1" checksum: dec0d2ebc23786dae2dc62d598b89482abbd810a71527ba99a5fb0f36e3de51647e4ab13a0bb514d760156f92780c22a88317701d886fd934d848c0fd5961579 @@ -9591,10 +9571,10 @@ __metadata: version: 0.0.0-use.local resolution: "@rocket.chat/ui-theming@workspace:ee/packages/ui-theming" dependencies: - "@rocket.chat/css-in-js": next - "@rocket.chat/fuselage": ^0.37.1 - "@rocket.chat/fuselage-hooks": ^0.32.1 - "@rocket.chat/icons": ^0.32.0 + "@rocket.chat/css-in-js": ~0.31.25 + "@rocket.chat/fuselage": ~0.38.1 + "@rocket.chat/fuselage-hooks": ~0.32.1 + "@rocket.chat/icons": ~0.32.0 "@rocket.chat/ui-contexts": "workspace:~" "@storybook/addon-actions": ~6.5.16 "@storybook/addon-docs": ~6.5.16 @@ -9632,13 +9612,13 @@ __metadata: resolution: "@rocket.chat/ui-video-conf@workspace:packages/ui-video-conf" dependencies: "@babel/core": ~7.22.20 - "@rocket.chat/css-in-js": next - "@rocket.chat/emitter": next + "@rocket.chat/css-in-js": ~0.31.25 + "@rocket.chat/emitter": ~0.31.25 "@rocket.chat/eslint-config": "workspace:^" - "@rocket.chat/fuselage": ^0.37.1 - "@rocket.chat/fuselage-hooks": ^0.32.1 - "@rocket.chat/icons": ^0.32.0 - "@rocket.chat/styled": next + "@rocket.chat/fuselage": ~0.38.1 + "@rocket.chat/fuselage-hooks": ~0.32.1 + "@rocket.chat/icons": ~0.32.0 + "@rocket.chat/styled": ~0.31.25 "@rocket.chat/ui-contexts": "workspace:^" "@storybook/addon-actions": ~6.5.16 "@storybook/addon-docs": ~6.5.16 @@ -9677,15 +9657,15 @@ __metadata: "@codemirror/lang-json": ^6.0.1 "@codemirror/tooltip": ^0.19.16 "@lezer/highlight": ^1.1.6 - "@rocket.chat/css-in-js": next - "@rocket.chat/fuselage": ^0.37.1 - "@rocket.chat/fuselage-hooks": ^0.32.1 - "@rocket.chat/fuselage-polyfills": next - "@rocket.chat/fuselage-tokens": ^0.32.0 + "@rocket.chat/css-in-js": ~0.31.25 + "@rocket.chat/fuselage": ~0.38.1 + "@rocket.chat/fuselage-hooks": ~0.32.1 + "@rocket.chat/fuselage-polyfills": ~0.31.25 + "@rocket.chat/fuselage-tokens": ~0.32.0 "@rocket.chat/fuselage-ui-kit": "workspace:~" - "@rocket.chat/icons": ^0.32.0 - "@rocket.chat/logo": ^0.31.28 - "@rocket.chat/styled": next + "@rocket.chat/icons": ~0.32.0 + "@rocket.chat/logo": ~0.31.28 + "@rocket.chat/styled": ~0.31.25 "@rocket.chat/ui-contexts": "workspace:~" "@types/react": ~17.0.69 "@types/react-beautiful-dnd": ^13.1.6 @@ -9721,7 +9701,7 @@ __metadata: "@babel/preset-react": ~7.22.15 "@babel/preset-typescript": ~7.22.15 "@rocket.chat/i18n": "workspace:~" - "@rocket.chat/layout": next + "@rocket.chat/layout": ~0.31.26 "@rocket.chat/mock-providers": "workspace:~" "@rocket.chat/tools": "workspace:~" "@rocket.chat/ui-client": "workspace:^" @@ -34580,14 +34560,14 @@ __metadata: "@rocket.chat/apps-engine": 1.41.0-alpha.290 "@rocket.chat/core-services": "workspace:^" "@rocket.chat/core-typings": "workspace:^" - "@rocket.chat/emitter": next - "@rocket.chat/icons": ^0.32.0 - "@rocket.chat/message-parser": next + "@rocket.chat/emitter": ~0.31.25 + "@rocket.chat/icons": ~0.32.0 + "@rocket.chat/message-parser": ~0.31.26 "@rocket.chat/model-typings": "workspace:^" "@rocket.chat/models": "workspace:^" "@rocket.chat/rest-typings": "workspace:^" - "@rocket.chat/string-helpers": next - "@rocket.chat/ui-kit": ^0.32.1 + "@rocket.chat/string-helpers": ~0.31.25 + "@rocket.chat/ui-kit": ~0.32.1 "@types/cookie": ^0.5.3 "@types/cookie-parser": ^1.4.5 "@types/ejson": ^2.2.1 From 59a4f66d60e633d21ae8eba9bf886b29fb222a25 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Tue, 21 Nov 2023 21:10:42 -0300 Subject: [PATCH 15/76] chore: improve license sync (#31040) --- .../server/functions/getConfirmationPoll.ts | 19 ++++------ .../getWorkspaceAccessTokenWithScope.ts | 29 +++++++++------ .../removeWorkspaceRegistrationInfo.ts | 14 +++---- .../syncWorkspace/announcementSync.ts | 33 +++++++++++------ .../server/functions/syncWorkspace/index.ts | 37 +++++++++++++++++-- .../syncWorkspace/legacySyncWorkspace.ts | 5 +-- .../functions/syncWorkspace/syncCloudData.ts | 32 +++++++--------- 7 files changed, 103 insertions(+), 66 deletions(-) diff --git a/apps/meteor/app/cloud/server/functions/getConfirmationPoll.ts b/apps/meteor/app/cloud/server/functions/getConfirmationPoll.ts index 2c5d9dec77dc..deda7327a6b9 100644 --- a/apps/meteor/app/cloud/server/functions/getConfirmationPoll.ts +++ b/apps/meteor/app/cloud/server/functions/getConfirmationPoll.ts @@ -5,16 +5,19 @@ import { SystemLogger } from '../../../../server/lib/logger/system'; import { settings } from '../../../settings/server'; export async function getConfirmationPoll(deviceCode: string): Promise { - let payload; try { const cloudUrl = settings.get('Cloud_Url'); const response = await fetch(`${cloudUrl}/api/v2/register/workspace/poll`, { params: { token: deviceCode } }); - if (!response.ok) { - throw new Error((await response.json()).error); - } + try { + if (!response.ok) { + throw new Error((await response.json()).error); + } - payload = await response.json(); + return await response.json(); + } catch (err) { + throw new Error(`Failed to retrieve registration confirmation poll data: ${response.statusText}`); + } } catch (err: any) { SystemLogger.error({ msg: 'Failed to get confirmation poll from Rocket.Chat Cloud', @@ -24,10 +27,4 @@ export async function getConfirmationPoll(deviceCode: string): Promise= 400) { + if (payload.error === 'oauth_invalid_client_credentials') { + throw new CloudWorkspaceAccessTokenError(); + } + } + + const expiresAt = new Date(); + expiresAt.setSeconds(expiresAt.getSeconds() + payload.expires_in); + + return { + token: payload.access_token, + expiresAt, + }; } catch (err: any) { SystemLogger.error({ msg: 'Failed to get Workspace AccessToken from Rocket.Chat Cloud', url: '/api/oauth/token', scope, - ...(err.response?.data && { cloudError: err.response.data }), err, }); - if (err.response?.data?.error === 'oauth_invalid_client_credentials') { + if (err instanceof CloudWorkspaceAccessTokenError) { SystemLogger.error('Server has been unregistered from cloud'); void removeWorkspaceRegistrationInfo(); if (throwOnError) { - throw new CloudWorkspaceAccessTokenError(); + throw err; } } - - return tokenResponse; } - - const expiresAt = new Date(); - expiresAt.setSeconds(expiresAt.getSeconds() + payload.expires_in); - - tokenResponse.expiresAt = expiresAt; - tokenResponse.token = payload.access_token; - return tokenResponse; } diff --git a/apps/meteor/app/cloud/server/functions/removeWorkspaceRegistrationInfo.ts b/apps/meteor/app/cloud/server/functions/removeWorkspaceRegistrationInfo.ts index ec26e0bb9b27..b4e5362f5ac7 100644 --- a/apps/meteor/app/cloud/server/functions/removeWorkspaceRegistrationInfo.ts +++ b/apps/meteor/app/cloud/server/functions/removeWorkspaceRegistrationInfo.ts @@ -9,13 +9,13 @@ export async function removeWorkspaceRegistrationInfo() { } await Promise.all([ - Settings.updateValueById('Cloud_Workspace_Id', null), - Settings.updateValueById('Cloud_Workspace_Name', null), - Settings.updateValueById('Cloud_Workspace_Client_Id', null), - Settings.updateValueById('Cloud_Workspace_Client_Secret', null), - Settings.updateValueById('Cloud_Workspace_Client_Secret_Expires_At', null), - Settings.updateValueById('Cloud_Workspace_PublicKey', null), - Settings.updateValueById('Cloud_Workspace_Registration_Client_Uri', null), + Settings.resetValueById('Cloud_Workspace_Id', null), + Settings.resetValueById('Cloud_Workspace_Name', null), + Settings.resetValueById('Cloud_Workspace_Client_Id', null), + Settings.resetValueById('Cloud_Workspace_Client_Secret', null), + Settings.resetValueById('Cloud_Workspace_Client_Secret_Expires_At', null), + Settings.resetValueById('Cloud_Workspace_PublicKey', null), + Settings.resetValueById('Cloud_Workspace_Registration_Client_Uri', null), ]); await Settings.updateValueById('Show_Setup_Wizard', 'in_progress'); diff --git a/apps/meteor/app/cloud/server/functions/syncWorkspace/announcementSync.ts b/apps/meteor/app/cloud/server/functions/syncWorkspace/announcementSync.ts index f3885c1e95c2..dde631e0485b 100644 --- a/apps/meteor/app/cloud/server/functions/syncWorkspace/announcementSync.ts +++ b/apps/meteor/app/cloud/server/functions/syncWorkspace/announcementSync.ts @@ -2,16 +2,14 @@ import { type Cloud, type Serialized } from '@rocket.chat/core-typings'; import { serverFetch as fetch } from '@rocket.chat/server-fetch'; import { v, compile } from 'suretype'; -import { CloudWorkspaceAccessError } from '../../../../../lib/errors/CloudWorkspaceAccessError'; import { CloudWorkspaceConnectionError } from '../../../../../lib/errors/CloudWorkspaceConnectionError'; import { CloudWorkspaceRegistrationError } from '../../../../../lib/errors/CloudWorkspaceRegistrationError'; import { SystemLogger } from '../../../../../server/lib/logger/system'; import { settings } from '../../../../settings/server'; import { buildWorkspaceRegistrationData } from '../buildRegistrationData'; -import { getWorkspaceAccessToken } from '../getWorkspaceAccessToken'; +import { CloudWorkspaceAccessTokenEmptyError, getWorkspaceAccessToken } from '../getWorkspaceAccessToken'; import { retrieveRegistrationStatus } from '../retrieveRegistrationStatus'; import { handleAnnouncementsOnWorkspaceSync, handleNpsOnWorkspaceSync } from './handleCommsSync'; -import { legacySyncWorkspace } from './legacySyncWorkspace'; const workspaceCommPayloadSchema = v.object({ workspaceId: v.string().required(), @@ -85,7 +83,7 @@ export async function announcementSync() { const token = await getWorkspaceAccessToken(true); if (!token) { - throw new CloudWorkspaceAccessError('Workspace does not have a valid access token'); + throw new CloudWorkspaceAccessTokenEmptyError(); } const workspaceRegistrationData = await buildWorkspaceRegistrationData(undefined); @@ -105,12 +103,25 @@ export async function announcementSync() { return true; } catch (err) { - SystemLogger.error({ - msg: 'Failed to sync with Rocket.Chat Cloud', - url: '/comms/workspace', - err, - }); + switch (true) { + case err instanceof CloudWorkspaceConnectionError: + case err instanceof CloudWorkspaceRegistrationError: + case err instanceof CloudWorkspaceAccessTokenEmptyError: { + SystemLogger.info({ + msg: 'Failed to sync with Rocket.Chat Cloud', + function: 'announcementSync', + err, + }); + break; + } + default: { + SystemLogger.error({ + msg: 'Error during workspace sync', + function: 'announcementSync', + err, + }); + } + } + throw err; } - - await legacySyncWorkspace(); } diff --git a/apps/meteor/app/cloud/server/functions/syncWorkspace/index.ts b/apps/meteor/app/cloud/server/functions/syncWorkspace/index.ts index bdd898b510f7..721c96d9a0f7 100644 --- a/apps/meteor/app/cloud/server/functions/syncWorkspace/index.ts +++ b/apps/meteor/app/cloud/server/functions/syncWorkspace/index.ts @@ -1,7 +1,9 @@ +import { CloudWorkspaceRegistrationError } from '../../../../../lib/errors/CloudWorkspaceRegistrationError'; import { SystemLogger } from '../../../../../server/lib/logger/system'; -import { CloudWorkspaceAccessTokenError } from '../getWorkspaceAccessToken'; +import { CloudWorkspaceAccessTokenEmptyError, CloudWorkspaceAccessTokenError } from '../getWorkspaceAccessToken'; import { getCachedSupportedVersionsToken } from '../supportedVersionsToken/supportedVersionsToken'; import { announcementSync } from './announcementSync'; +import { legacySyncWorkspace } from './legacySyncWorkspace'; import { syncCloudData } from './syncCloudData'; export async function syncWorkspace() { @@ -9,10 +11,37 @@ export async function syncWorkspace() { await syncCloudData(); await announcementSync(); } catch (err) { - if (err instanceof CloudWorkspaceAccessTokenError) { - // TODO: Remove License if there is no access token + switch (true) { + case err instanceof CloudWorkspaceRegistrationError: + case err instanceof CloudWorkspaceAccessTokenError: + case err instanceof CloudWorkspaceAccessTokenEmptyError: { + // There is no access token, so we can't sync + SystemLogger.info('Workspace does not have a valid access token, sync aborted'); + break; + } + default: { + SystemLogger.error({ msg: 'Error during workspace sync', err }); + SystemLogger.info({ + msg: 'Falling back to legacy sync', + function: 'syncCloudData', + }); + try { + await legacySyncWorkspace(); + } catch (err) { + switch (true) { + case err instanceof CloudWorkspaceRegistrationError: + case err instanceof CloudWorkspaceAccessTokenError: + case err instanceof CloudWorkspaceAccessTokenEmptyError: { + // There is no access token, so we can't sync + break; + } + default: { + SystemLogger.error({ msg: 'Error during fallback workspace sync', err }); + } + } + } + } } - SystemLogger.error({ msg: 'Error during workspace sync', err }); } await getCachedSupportedVersionsToken.reset(); diff --git a/apps/meteor/app/cloud/server/functions/syncWorkspace/legacySyncWorkspace.ts b/apps/meteor/app/cloud/server/functions/syncWorkspace/legacySyncWorkspace.ts index d5f86fad8409..bde316fae828 100644 --- a/apps/meteor/app/cloud/server/functions/syncWorkspace/legacySyncWorkspace.ts +++ b/apps/meteor/app/cloud/server/functions/syncWorkspace/legacySyncWorkspace.ts @@ -3,14 +3,13 @@ import { Settings } from '@rocket.chat/models'; import { serverFetch as fetch } from '@rocket.chat/server-fetch'; import { v, compile } from 'suretype'; -import { CloudWorkspaceAccessError } from '../../../../../lib/errors/CloudWorkspaceAccessError'; import { CloudWorkspaceConnectionError } from '../../../../../lib/errors/CloudWorkspaceConnectionError'; import { CloudWorkspaceRegistrationError } from '../../../../../lib/errors/CloudWorkspaceRegistrationError'; import { SystemLogger } from '../../../../../server/lib/logger/system'; import { settings } from '../../../../settings/server'; import type { WorkspaceRegistrationData } from '../buildRegistrationData'; import { buildWorkspaceRegistrationData } from '../buildRegistrationData'; -import { getWorkspaceAccessToken } from '../getWorkspaceAccessToken'; +import { CloudWorkspaceAccessTokenEmptyError, getWorkspaceAccessToken } from '../getWorkspaceAccessToken'; import { getWorkspaceLicense } from '../getWorkspaceLicense'; import { retrieveRegistrationStatus } from '../retrieveRegistrationStatus'; import { handleBannerOnWorkspaceSync, handleNpsOnWorkspaceSync } from './handleCommsSync'; @@ -154,7 +153,7 @@ export async function legacySyncWorkspace() { const token = await getWorkspaceAccessToken(true); if (!token) { - throw new CloudWorkspaceAccessError('Workspace does not have a valid access token'); + throw new CloudWorkspaceAccessTokenEmptyError(); } const workspaceRegistrationData = await buildWorkspaceRegistrationData(undefined); diff --git a/apps/meteor/app/cloud/server/functions/syncWorkspace/syncCloudData.ts b/apps/meteor/app/cloud/server/functions/syncWorkspace/syncCloudData.ts index 63dc37dd9901..51f302097136 100644 --- a/apps/meteor/app/cloud/server/functions/syncWorkspace/syncCloudData.ts +++ b/apps/meteor/app/cloud/server/functions/syncWorkspace/syncCloudData.ts @@ -10,9 +10,8 @@ import { CloudWorkspaceRegistrationError } from '../../../../../lib/errors/Cloud import { SystemLogger } from '../../../../../server/lib/logger/system'; import { settings } from '../../../../settings/server'; import { buildWorkspaceRegistrationData } from '../buildRegistrationData'; -import { getWorkspaceAccessToken } from '../getWorkspaceAccessToken'; +import { CloudWorkspaceAccessTokenEmptyError, getWorkspaceAccessToken } from '../getWorkspaceAccessToken'; import { retrieveRegistrationStatus } from '../retrieveRegistrationStatus'; -import { legacySyncWorkspace } from './legacySyncWorkspace'; const workspaceSyncPayloadSchema = v.object({ workspaceId: v.string().required(), @@ -63,7 +62,7 @@ export async function syncCloudData() { const token = await getWorkspaceAccessToken(true); if (!token) { - throw new CloudWorkspaceAccessError('Workspace does not have a valid access token'); + throw new CloudWorkspaceAccessTokenEmptyError(); } const workspaceRegistrationData = await buildWorkspaceRegistrationData(undefined); @@ -88,28 +87,25 @@ export async function syncCloudData() { * The DuplicatedLicenseError license error is also ignored because it is not a problem. the Cloud is allowed to send the same license twice. */ switch (true) { + case err instanceof DuplicatedLicenseError: + return; case err instanceof CloudWorkspaceAccessError: case err instanceof CloudWorkspaceRegistrationError: - case err instanceof DuplicatedLicenseError: + case err instanceof CloudWorkspaceAccessTokenEmptyError: SystemLogger.info({ msg: 'Failed to sync with Rocket.Chat Cloud', function: 'syncCloudData', err, }); - return; - } + break; - SystemLogger.error({ - msg: 'Failed to sync with Rocket.Chat Cloud', - url: '/sync', - err, - }); + default: + SystemLogger.error({ + msg: 'Failed to sync with Rocket.Chat Cloud', + function: 'syncCloudData', + err, + }); + } + throw err; } - - SystemLogger.info({ - msg: 'Falling back to legacy sync', - function: 'syncCloudData', - }); - - await legacySyncWorkspace(); } From d072fa74b4880e1470ea322e070b454ce682cdaa Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Tue, 21 Nov 2023 21:29:54 -0300 Subject: [PATCH 16/76] chore: build meteor with cloud version (#31028) --- .../supportedVersionsToken.ts | 2 + .../utils/rocketchat-supported-versions.info | 2 + apps/meteor/client/definitions/info.d.ts | 4 ++ .../plugin/compile-version.js | 61 ++++++++++++++++--- 4 files changed, 60 insertions(+), 9 deletions(-) create mode 100644 apps/meteor/app/utils/rocketchat-supported-versions.info diff --git a/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsToken.ts b/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsToken.ts index 2455f68e030d..0b04d10e3556 100644 --- a/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsToken.ts +++ b/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsToken.ts @@ -7,6 +7,7 @@ import { serverFetch as fetch } from '@rocket.chat/server-fetch'; import { SystemLogger } from '../../../../../server/lib/logger/system'; import { settings } from '../../../../settings/server'; +import { supportedVersions as supportedVersionsFromBuild } from '../../../../utils/rocketchat-supported-versions.info'; import { buildVersionUpdateMessage } from '../../../../version-check/server/functions/buildVersionUpdateMessage'; import { generateWorkspaceBearerHttpHeader } from '../getWorkspaceAccessToken'; import { supportedVersionsChooseLatest } from './supportedVersionsChooseLatest'; @@ -128,6 +129,7 @@ const getSupportedVersionsToken = async () => { const [versionsFromLicense, response] = await Promise.all([License.getLicense(), getSupportedVersionsFromCloud()]); const supportedVersions = await supportedVersionsChooseLatest( + supportedVersionsFromBuild, versionsFromLicense?.supportedVersions, (response.success && response.result) || undefined, ); diff --git a/apps/meteor/app/utils/rocketchat-supported-versions.info b/apps/meteor/app/utils/rocketchat-supported-versions.info new file mode 100644 index 000000000000..2c63c0851048 --- /dev/null +++ b/apps/meteor/app/utils/rocketchat-supported-versions.info @@ -0,0 +1,2 @@ +{ +} diff --git a/apps/meteor/client/definitions/info.d.ts b/apps/meteor/client/definitions/info.d.ts index 43fa1fc53414..4db548297770 100644 --- a/apps/meteor/client/definitions/info.d.ts +++ b/apps/meteor/client/definitions/info.d.ts @@ -28,4 +28,8 @@ declare module '*.info' { desktop: string; mobile: string; }; + + import type { SignedSupportedVersions } from '@rocket.chat/server-cloud-communication'; + + export const supportedVersions: SignedSupportedVersions; } diff --git a/apps/meteor/packages/rocketchat-version/plugin/compile-version.js b/apps/meteor/packages/rocketchat-version/plugin/compile-version.js index 20b26b9cdcf0..084f14a1abd0 100644 --- a/apps/meteor/packages/rocketchat-version/plugin/compile-version.js +++ b/apps/meteor/packages/rocketchat-version/plugin/compile-version.js @@ -3,16 +3,42 @@ import os from 'os'; import util from 'util'; import path from 'path'; import fs from 'fs'; +import https from 'https'; const execAsync = util.promisify(exec); class VersionCompiler { async processFilesForTarget(files) { - const processFile = async function (file) { - if (!file.getDisplayPath().match(/rocketchat\.info$/)) { - return; - } + const processVersionFile = async function (file) { + const data = await new Promise((resolve, reject) => { + https + .get('https://releases.rocket.chat/v2/server/supportedVersions', function (response) { + let data = ''; + response.on('data', function (chunk) { + data += chunk; + }); + response.on('end', function () { + resolve(JSON.parse(data)); + }); + response.on('error', function (err) { + console.error(err); + if (process.env.NODE_ENV !== 'development') { + reject(err); + return; + } + resolve({}); + }); + }) + .end(); + }); + file.addJavaScript({ + data: `exports.supportedVersions = ${JSON.stringify(data)}`, + path: `${file.getPathInPackage()}.js`, + }); + }; + + const processFile = async function (file) { let output = JSON.parse(file.getContentsAsString()); output.build = { date: new Date().toISOString(), @@ -39,6 +65,9 @@ class VersionCompiler { subject: data.join('\n'), }; } catch (e) { + if (process.env.NODE_ENV !== 'development') { + throw e; + } // no git } @@ -57,20 +86,34 @@ class VersionCompiler { output.commit.branch = branch.stdout.replace('\n', ''); } } catch (e) { + if (process.env.NODE_ENV !== 'development') { + throw e; + } + // no branch } - output = `exports.Info = ${JSON.stringify(output, null, 4)}; - exports.minimumClientVersions = ${JSON.stringify(minimumClientVersions, null, 4)};`; - file.addJavaScript({ - data: output, + data: `exports.Info = ${JSON.stringify(output, null, 4)}; + exports.minimumClientVersions = ${JSON.stringify(minimumClientVersions, null, 4)};`, path: `${file.getPathInPackage()}.js`, }); }; for await (const file of files) { - await processFile(file); + switch (true) { + case file.getDisplayPath().endsWith('rocketchat.info'): { + await processFile(file); + break; + } + case file.getDisplayPath().endsWith('rocketchat-supported-versions.info'): { + await processVersionFile(file); + break; + } + default: { + throw new Error(`Unexpected file ${file.getDisplayPath()}`); + } + } } } } From 928177b602fb58cbd74e5e5a6fdcd352bff29650 Mon Sep 17 00:00:00 2001 From: Allan RIbeiro <35040806+AllanPazRibeiro@users.noreply.github.com> Date: Tue, 21 Nov 2023 21:44:22 -0300 Subject: [PATCH 17/76] fix: href messages from server (#31005) --- .changeset/great-queens-joke.md | 5 +++++ .../components/message/toolbox/MessageActionMenu.tsx | 5 ++++- apps/meteor/ee/server/apps/communication/rest.ts | 1 + apps/meteor/tests/e2e/message-actions.spec.ts | 3 ++- yarn.lock | 9 +-------- 5 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 .changeset/great-queens-joke.md diff --git a/.changeset/great-queens-joke.md b/.changeset/great-queens-joke.md new file mode 100644 index 000000000000..232430641a62 --- /dev/null +++ b/.changeset/great-queens-joke.md @@ -0,0 +1,5 @@ +--- +'@rocket.chat/meteor': patch +--- + +Fix rocket.cat's app request message escaping diff --git a/apps/meteor/client/components/message/toolbox/MessageActionMenu.tsx b/apps/meteor/client/components/message/toolbox/MessageActionMenu.tsx index 54a320ebf3d7..937667b817c7 100644 --- a/apps/meteor/client/components/message/toolbox/MessageActionMenu.tsx +++ b/apps/meteor/client/components/message/toolbox/MessageActionMenu.tsx @@ -97,7 +97,10 @@ const MessageActionMenu = ({ options, onChangeMenuVisibility, ...props }: Messag id={option.id} icon={option.icon as ComponentProps['icon']} label={t(option.label)} - onClick={option.action} + onClick={(e) => { + handleClose(); + option.action(e); + }} data-qa-type='message-action' data-qa-id={option.id} role={option.role ? option.role : 'button'} diff --git a/apps/meteor/ee/server/apps/communication/rest.ts b/apps/meteor/ee/server/apps/communication/rest.ts index b6f2f7a9c2ae..d4c9165a9281 100644 --- a/apps/meteor/ee/server/apps/communication/rest.ts +++ b/apps/meteor/ee/server/apps/communication/rest.ts @@ -855,6 +855,7 @@ export class AppsRestApi { user_name: `@${this.user.username}`, message: message || '', learn_more: learnMore, + interpolation: { escapeValue: false }, }), }; }; diff --git a/apps/meteor/tests/e2e/message-actions.spec.ts b/apps/meteor/tests/e2e/message-actions.spec.ts index ad48c09beeba..97fbc2c238b7 100644 --- a/apps/meteor/tests/e2e/message-actions.spec.ts +++ b/apps/meteor/tests/e2e/message-actions.spec.ts @@ -64,12 +64,13 @@ test.describe.serial('message-actions', () => { await expect(poHomeChannel.content.lastMessageTextAttachmentEqualsText).toHaveText(message); }); + test('expect star the message', async ({ page }) => { await poHomeChannel.content.sendMessage('Message to star'); await poHomeChannel.content.openLastMessageMenu(); await page.locator('[data-qa-id="star-message"]').click(); await poHomeChannel.dismissToast(); - await page.getByRole('button').and(page.getByTitle('Options')).click(); + await page.locator('role=button[name="Options"]').click(); await page.locator('[data-key="starred-messages"]').click(); await expect(poHomeChannel.content.lastUserMessageBody).toHaveText('Message to star'); }); diff --git a/yarn.lock b/yarn.lock index c00fbb463c2e..fb8e61d17a20 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19310,14 +19310,7 @@ __metadata: languageName: node linkType: hard -"detect-libc@npm:^2.0.0": - version: 2.0.1 - resolution: "detect-libc@npm:2.0.1" - checksum: ccb05fcabbb555beb544d48080179c18523a343face9ee4e1a86605a8715b4169f94d663c21a03c310ac824592f2ba9a5270218819bb411ad7be578a527593d7 - languageName: node - linkType: hard - -"detect-libc@npm:^2.0.2": +"detect-libc@npm:^2.0.0, detect-libc@npm:^2.0.2": version: 2.0.2 resolution: "detect-libc@npm:2.0.2" checksum: 2b2cd3649b83d576f4be7cc37eb3b1815c79969c8b1a03a40a4d55d83bc74d010753485753448eacb98784abf22f7dbd3911fd3b60e29fda28fed2d1a997944d From 22bd4578d83c21796978395f90cebb7fce53a8ae Mon Sep 17 00:00:00 2001 From: rocketchat-github-ci Date: Wed, 22 Nov 2023 01:23:57 +0000 Subject: [PATCH 18/76] Release 6.5.0-rc.8 [no ci] --- .changeset/bump-patch-1700616232353.md | 5 ++++ .changeset/pre.json | 2 ++ apps/meteor/.docker/Dockerfile.rhel | 2 +- apps/meteor/CHANGELOG.md | 27 +++++++++++++++++++ apps/meteor/app/utils/rocketchat.info | 2 +- apps/meteor/ee/server/services/CHANGELOG.md | 10 +++++++ apps/meteor/ee/server/services/package.json | 2 +- apps/meteor/package.json | 2 +- ee/apps/account-service/CHANGELOG.md | 10 +++++++ ee/apps/account-service/package.json | 2 +- ee/apps/authorization-service/CHANGELOG.md | 10 +++++++ ee/apps/authorization-service/package.json | 2 +- ee/apps/ddp-streamer/CHANGELOG.md | 12 +++++++++ ee/apps/ddp-streamer/package.json | 2 +- ee/apps/omnichannel-transcript/CHANGELOG.md | 11 ++++++++ ee/apps/omnichannel-transcript/package.json | 2 +- ee/apps/presence-service/CHANGELOG.md | 10 +++++++ ee/apps/presence-service/package.json | 2 +- ee/apps/queue-worker/CHANGELOG.md | 10 +++++++ ee/apps/queue-worker/package.json | 2 +- ee/apps/stream-hub-service/CHANGELOG.md | 9 +++++++ ee/apps/stream-hub-service/package.json | 2 +- ee/packages/api-client/CHANGELOG.md | 7 +++++ ee/packages/api-client/package.json | 2 +- ee/packages/ddp-client/CHANGELOG.md | 7 +++++ ee/packages/ddp-client/package.json | 2 +- ee/packages/license/CHANGELOG.md | 6 +++++ ee/packages/license/package.json | 2 +- ee/packages/omnichannel-services/CHANGELOG.md | 11 ++++++++ ee/packages/omnichannel-services/package.json | 2 +- ee/packages/pdf-worker/CHANGELOG.md | 6 +++++ ee/packages/pdf-worker/package.json | 2 +- ee/packages/presence/CHANGELOG.md | 8 ++++++ ee/packages/presence/package.json | 2 +- package.json | 2 +- packages/core-services/CHANGELOG.md | 8 ++++++ packages/core-services/package.json | 2 +- packages/core-typings/CHANGELOG.md | 2 ++ packages/core-typings/package.json | 2 +- packages/cron/CHANGELOG.md | 7 +++++ packages/cron/package.json | 2 +- packages/fuselage-ui-kit/CHANGELOG.md | 8 ++++++ packages/fuselage-ui-kit/package.json | 6 ++--- packages/gazzodown/CHANGELOG.md | 8 ++++++ packages/gazzodown/package.json | 8 +++--- packages/instance-status/CHANGELOG.md | 6 +++++ packages/instance-status/package.json | 2 +- packages/livechat/CHANGELOG.md | 6 +++++ packages/livechat/package.json | 2 +- packages/model-typings/CHANGELOG.md | 6 +++++ packages/model-typings/package.json | 2 +- packages/models/CHANGELOG.md | 6 +++++ packages/models/package.json | 2 +- packages/rest-typings/CHANGELOG.md | 7 +++++ packages/rest-typings/package.json | 2 +- packages/ui-client/CHANGELOG.md | 6 +++++ packages/ui-client/package.json | 4 +-- packages/ui-contexts/CHANGELOG.md | 8 ++++++ packages/ui-contexts/package.json | 2 +- packages/ui-video-conf/CHANGELOG.md | 6 +++++ packages/ui-video-conf/package.json | 4 +-- packages/uikit-playground/CHANGELOG.md | 7 +++++ packages/uikit-playground/package.json | 2 +- packages/web-ui-registration/CHANGELOG.md | 6 +++++ packages/web-ui-registration/package.json | 4 +-- 65 files changed, 299 insertions(+), 41 deletions(-) create mode 100644 .changeset/bump-patch-1700616232353.md diff --git a/.changeset/bump-patch-1700616232353.md b/.changeset/bump-patch-1700616232353.md new file mode 100644 index 000000000000..e1eaa7980afb --- /dev/null +++ b/.changeset/bump-patch-1700616232353.md @@ -0,0 +1,5 @@ +--- +'@rocket.chat/meteor': patch +--- + +Bump @rocket.chat/meteor version. diff --git a/.changeset/pre.json b/.changeset/pre.json index 23292ba7856a..048436a83629 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -67,6 +67,7 @@ "bump-patch-1699991612617", "bump-patch-1699998565522", "bump-patch-1700263798234", + "bump-patch-1700616232353", "cool-rockets-talk", "cool-zoos-move", "cuddly-ties-run", @@ -77,6 +78,7 @@ "fluffy-monkeys-sing", "fuzzy-plums-travel", "gentle-radios-relate", + "great-queens-joke", "heavy-ads-carry", "hip-pans-argue", "honest-socks-sniff", diff --git a/apps/meteor/.docker/Dockerfile.rhel b/apps/meteor/.docker/Dockerfile.rhel index c0d3936c211c..a1d9dd5ac2bd 100644 --- a/apps/meteor/.docker/Dockerfile.rhel +++ b/apps/meteor/.docker/Dockerfile.rhel @@ -1,6 +1,6 @@ FROM registry.access.redhat.com/ubi8/nodejs-12 -ENV RC_VERSION 6.5.0-rc.7 +ENV RC_VERSION 6.5.0-rc.8 MAINTAINER buildmaster@rocket.chat diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md index d676b3b742ef..4343fa12d4cd 100644 --- a/apps/meteor/CHANGELOG.md +++ b/apps/meteor/CHANGELOG.md @@ -1,5 +1,32 @@ # @rocket.chat/meteor +## 6.5.0-rc.8 + +### Patch Changes + +- Bump @rocket.chat/meteor version. +- 928177b602: Fix rocket.cat's app request message escaping + - @rocket.chat/core-typings@6.5.0-rc.8 + - @rocket.chat/rest-typings@6.5.0-rc.8 + - @rocket.chat/api-client@0.1.18-rc.1 + - @rocket.chat/license@0.1.0-rc.8 + - @rocket.chat/omnichannel-services@0.1.0-rc.8 + - @rocket.chat/pdf-worker@0.0.24-rc.1 + - @rocket.chat/presence@0.1.0-rc.8 + - @rocket.chat/core-services@0.3.0-rc.8 + - @rocket.chat/cron@0.0.20-rc.1 + - @rocket.chat/gazzodown@3.0.0-rc.8 + - @rocket.chat/model-typings@0.2.0-rc.8 + - @rocket.chat/ui-contexts@3.0.0-rc.8 + - @rocket.chat/server-cloud-communication@0.0.1 + - @rocket.chat/fuselage-ui-kit@3.0.0-rc.8 + - @rocket.chat/models@0.0.24-rc.1 + - @rocket.chat/ui-theming@0.1.1-rc.0 + - @rocket.chat/ui-client@3.0.0-rc.8 + - @rocket.chat/ui-video-conf@3.0.0-rc.8 + - @rocket.chat/web-ui-registration@3.0.0-rc.7 + - @rocket.chat/instance-status@0.0.24-rc.1 + ## 6.5.0-rc.7 ### Patch Changes diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info index e60dc0818fa9..0a2cc51c2ddd 100644 --- a/apps/meteor/app/utils/rocketchat.info +++ b/apps/meteor/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "6.5.0-rc.7" + "version": "6.5.0-rc.8" } diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md index 7836b8eb1868..a8265f034311 100644 --- a/apps/meteor/ee/server/services/CHANGELOG.md +++ b/apps/meteor/ee/server/services/CHANGELOG.md @@ -1,5 +1,15 @@ # rocketchat-services +## 1.1.18-rc.1 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.8 +- @rocket.chat/rest-typings@6.5.0-rc.8 +- @rocket.chat/core-services@0.3.0-rc.8 +- @rocket.chat/model-typings@0.2.0-rc.8 +- @rocket.chat/models@0.0.24-rc.1 + ## 1.1.15-rc.7 ### Patch Changes diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json index 0b44e01739b9..ea4aed6f8fad 100644 --- a/apps/meteor/ee/server/services/package.json +++ b/apps/meteor/ee/server/services/package.json @@ -1,7 +1,7 @@ { "name": "rocketchat-services", "private": true, - "version": "1.1.18-rc.0", + "version": "1.1.18-rc.1", "description": "Rocket.Chat Authorization service", "main": "index.js", "scripts": { diff --git a/apps/meteor/package.json b/apps/meteor/package.json index d6ee3b9fc01b..a6e61d3da35b 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/meteor", "description": "The Ultimate Open Source WebChat Platform", - "version": "6.5.0-rc.7", + "version": "6.5.0-rc.8", "private": true, "author": { "name": "Rocket.Chat", diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md index a19189da6cbf..33f833cf07c4 100644 --- a/ee/apps/account-service/CHANGELOG.md +++ b/ee/apps/account-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/account-service +## 0.3.0-rc.8 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.8 +- @rocket.chat/rest-typings@6.5.0-rc.8 +- @rocket.chat/core-services@0.3.0-rc.8 +- @rocket.chat/model-typings@0.2.0-rc.8 +- @rocket.chat/models@0.0.24-rc.1 + ## 0.3.0-rc.7 ### Patch Changes diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json index 04860fa05f61..606df999ad0a 100644 --- a/ee/apps/account-service/package.json +++ b/ee/apps/account-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/account-service", "private": true, - "version": "0.3.0-rc.7", + "version": "0.3.0-rc.8", "description": "Rocket.Chat Account service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/authorization-service/CHANGELOG.md b/ee/apps/authorization-service/CHANGELOG.md index 08a17b61063b..f55e4d29b71e 100644 --- a/ee/apps/authorization-service/CHANGELOG.md +++ b/ee/apps/authorization-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/authorization-service +## 0.3.0-rc.8 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.8 +- @rocket.chat/rest-typings@6.5.0-rc.8 +- @rocket.chat/core-services@0.3.0-rc.8 +- @rocket.chat/model-typings@0.2.0-rc.8 +- @rocket.chat/models@0.0.24-rc.1 + ## 0.3.0-rc.7 ### Patch Changes diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json index 199b0905a0cf..d2d9a55ad587 100644 --- a/ee/apps/authorization-service/package.json +++ b/ee/apps/authorization-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/authorization-service", "private": true, - "version": "0.3.0-rc.7", + "version": "0.3.0-rc.8", "description": "Rocket.Chat Authorization service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/ddp-streamer/CHANGELOG.md b/ee/apps/ddp-streamer/CHANGELOG.md index f86e59f76b96..9b25e4d926b7 100644 --- a/ee/apps/ddp-streamer/CHANGELOG.md +++ b/ee/apps/ddp-streamer/CHANGELOG.md @@ -1,5 +1,17 @@ # @rocket.chat/ddp-streamer +## 0.2.0-rc.8 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.8 +- @rocket.chat/rest-typings@6.5.0-rc.8 +- @rocket.chat/core-services@0.3.0-rc.8 +- @rocket.chat/model-typings@0.2.0-rc.8 +- @rocket.chat/ui-contexts@3.0.0-rc.8 +- @rocket.chat/models@0.0.24-rc.1 +- @rocket.chat/instance-status@0.0.24-rc.1 + ## 0.2.0-rc.7 ### Patch Changes diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json index 6796e164b76d..48b3044573c5 100644 --- a/ee/apps/ddp-streamer/package.json +++ b/ee/apps/ddp-streamer/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/ddp-streamer", "private": true, - "version": "0.2.0-rc.7", + "version": "0.2.0-rc.8", "description": "Rocket.Chat DDP-Streamer service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/omnichannel-transcript/CHANGELOG.md b/ee/apps/omnichannel-transcript/CHANGELOG.md index 4cf5684defe4..41e6bdffe706 100644 --- a/ee/apps/omnichannel-transcript/CHANGELOG.md +++ b/ee/apps/omnichannel-transcript/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/omnichannel-transcript +## 0.3.0-rc.8 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.8 +- @rocket.chat/omnichannel-services@0.1.0-rc.8 +- @rocket.chat/pdf-worker@0.0.24-rc.1 +- @rocket.chat/core-services@0.3.0-rc.8 +- @rocket.chat/model-typings@0.2.0-rc.8 +- @rocket.chat/models@0.0.24-rc.1 + ## 0.3.0-rc.7 ### Patch Changes diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json index 6e1bd994ab65..4ca1fb806a6a 100644 --- a/ee/apps/omnichannel-transcript/package.json +++ b/ee/apps/omnichannel-transcript/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/omnichannel-transcript", "private": true, - "version": "0.3.0-rc.7", + "version": "0.3.0-rc.8", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/presence-service/CHANGELOG.md b/ee/apps/presence-service/CHANGELOG.md index cc34c979175a..081faf08d43b 100644 --- a/ee/apps/presence-service/CHANGELOG.md +++ b/ee/apps/presence-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/presence-service +## 0.3.0-rc.8 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.8 +- @rocket.chat/presence@0.1.0-rc.8 +- @rocket.chat/core-services@0.3.0-rc.8 +- @rocket.chat/model-typings@0.2.0-rc.8 +- @rocket.chat/models@0.0.24-rc.1 + ## 0.3.0-rc.7 ### Patch Changes diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json index ba3f05f204a5..22e3397126cf 100644 --- a/ee/apps/presence-service/package.json +++ b/ee/apps/presence-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/presence-service", "private": true, - "version": "0.3.0-rc.7", + "version": "0.3.0-rc.8", "description": "Rocket.Chat Presence service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/queue-worker/CHANGELOG.md b/ee/apps/queue-worker/CHANGELOG.md index 54b40f64181d..59e85a87aeb5 100644 --- a/ee/apps/queue-worker/CHANGELOG.md +++ b/ee/apps/queue-worker/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/queue-worker +## 0.3.0-rc.8 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.8 +- @rocket.chat/omnichannel-services@0.1.0-rc.8 +- @rocket.chat/core-services@0.3.0-rc.8 +- @rocket.chat/model-typings@0.2.0-rc.8 +- @rocket.chat/models@0.0.24-rc.1 + ## 0.3.0-rc.7 ### Patch Changes diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json index d62ff5450068..60b7d66e968f 100644 --- a/ee/apps/queue-worker/package.json +++ b/ee/apps/queue-worker/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/queue-worker", "private": true, - "version": "0.3.0-rc.7", + "version": "0.3.0-rc.8", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/stream-hub-service/CHANGELOG.md b/ee/apps/stream-hub-service/CHANGELOG.md index d27e6701d005..afadd0a38fb5 100644 --- a/ee/apps/stream-hub-service/CHANGELOG.md +++ b/ee/apps/stream-hub-service/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/stream-hub-service +## 0.3.0-rc.8 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.8 +- @rocket.chat/core-services@0.3.0-rc.8 +- @rocket.chat/model-typings@0.2.0-rc.8 +- @rocket.chat/models@0.0.24-rc.1 + ## 0.3.0-rc.7 ### Patch Changes diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json index 20f56bc5eddd..47d176dbcfec 100644 --- a/ee/apps/stream-hub-service/package.json +++ b/ee/apps/stream-hub-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/stream-hub-service", "private": true, - "version": "0.3.0-rc.7", + "version": "0.3.0-rc.8", "description": "Rocket.Chat Stream Hub service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/packages/api-client/CHANGELOG.md b/ee/packages/api-client/CHANGELOG.md index 7f0793b918b8..56346f915172 100644 --- a/ee/packages/api-client/CHANGELOG.md +++ b/ee/packages/api-client/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/api-client +## 0.1.18-rc.1 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.8 +- @rocket.chat/rest-typings@6.5.0-rc.8 + ## 0.1.15-rc.7 ### Patch Changes diff --git a/ee/packages/api-client/package.json b/ee/packages/api-client/package.json index 3cefb84a8088..5a4b887556ba 100644 --- a/ee/packages/api-client/package.json +++ b/ee/packages/api-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/api-client", - "version": "0.1.18-rc.0", + "version": "0.1.18-rc.1", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/ddp-client/CHANGELOG.md b/ee/packages/ddp-client/CHANGELOG.md index b665410d6093..184982c72472 100644 --- a/ee/packages/ddp-client/CHANGELOG.md +++ b/ee/packages/ddp-client/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/ddp-client +## 0.2.9-rc.1 + +### Patch Changes + +- @rocket.chat/rest-typings@6.5.0-rc.8 +- @rocket.chat/api-client@0.1.18-rc.1 + ## 0.2.6-rc.7 ### Patch Changes diff --git a/ee/packages/ddp-client/package.json b/ee/packages/ddp-client/package.json index 4804abb369a7..245d0680ca03 100644 --- a/ee/packages/ddp-client/package.json +++ b/ee/packages/ddp-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ddp-client", - "version": "0.2.9-rc.0", + "version": "0.2.9-rc.1", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/license/CHANGELOG.md b/ee/packages/license/CHANGELOG.md index a4b1453e8faf..81276946b1a9 100644 --- a/ee/packages/license/CHANGELOG.md +++ b/ee/packages/license/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/license +## 0.1.0-rc.8 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.8 + ## 0.1.0-rc.7 ### Patch Changes diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json index 814649c87e0f..f1a789c6f76d 100644 --- a/ee/packages/license/package.json +++ b/ee/packages/license/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/license", - "version": "0.1.0-rc.7", + "version": "0.1.0-rc.8", "private": true, "devDependencies": { "@swc/core": "^1.3.95", diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md index aea3cb273457..98f14a960476 100644 --- a/ee/packages/omnichannel-services/CHANGELOG.md +++ b/ee/packages/omnichannel-services/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/omnichannel-services +## 0.1.0-rc.8 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.8 +- @rocket.chat/rest-typings@6.5.0-rc.8 +- @rocket.chat/pdf-worker@0.0.24-rc.1 +- @rocket.chat/core-services@0.3.0-rc.8 +- @rocket.chat/model-typings@0.2.0-rc.8 +- @rocket.chat/models@0.0.24-rc.1 + ## 0.1.0-rc.7 ### Patch Changes diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json index 60c34e215bec..1e4545e1fe71 100644 --- a/ee/packages/omnichannel-services/package.json +++ b/ee/packages/omnichannel-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/omnichannel-services", - "version": "0.1.0-rc.7", + "version": "0.1.0-rc.8", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/ee/packages/pdf-worker/CHANGELOG.md b/ee/packages/pdf-worker/CHANGELOG.md index c27e364ea564..4213e221fb55 100644 --- a/ee/packages/pdf-worker/CHANGELOG.md +++ b/ee/packages/pdf-worker/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/pdf-worker +## 0.0.24-rc.1 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.8 + ## 0.0.21-rc.7 ### Patch Changes diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json index 8d112454191c..809c10516a95 100644 --- a/ee/packages/pdf-worker/package.json +++ b/ee/packages/pdf-worker/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/pdf-worker", - "version": "0.0.24-rc.0", + "version": "0.0.24-rc.1", "private": true, "devDependencies": { "@storybook/addon-essentials": "~6.5.16", diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md index ba4eb4b27108..bea9d734d07f 100644 --- a/ee/packages/presence/CHANGELOG.md +++ b/ee/packages/presence/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/presence +## 0.1.0-rc.8 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.8 +- @rocket.chat/core-services@0.3.0-rc.8 +- @rocket.chat/models@0.0.24-rc.1 + ## 0.1.0-rc.7 ### Patch Changes diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json index 7bcfc6e1db03..dc8160bd21a2 100644 --- a/ee/packages/presence/package.json +++ b/ee/packages/presence/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/presence", - "version": "0.1.0-rc.7", + "version": "0.1.0-rc.8", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/package.json b/package.json index c3f688a07a5a..74ab9f77bcc2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket.chat", - "version": "6.5.0-rc.7", + "version": "6.5.0-rc.8", "description": "Rocket.Chat Monorepo", "main": "index.js", "private": true, diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md index 37a2fec2ff4e..7b09556f0c44 100644 --- a/packages/core-services/CHANGELOG.md +++ b/packages/core-services/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/core-services +## 0.3.0-rc.8 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.8 +- @rocket.chat/rest-typings@6.5.0-rc.8 +- @rocket.chat/models@0.0.24-rc.1 + ## 0.3.0-rc.7 ### Patch Changes diff --git a/packages/core-services/package.json b/packages/core-services/package.json index a815f6ec69df..7d67e43aeb3b 100644 --- a/packages/core-services/package.json +++ b/packages/core-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/core-services", - "version": "0.3.0-rc.7", + "version": "0.3.0-rc.8", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md index fdbaa2258da4..a1a4ff51392e 100644 --- a/packages/core-typings/CHANGELOG.md +++ b/packages/core-typings/CHANGELOG.md @@ -1,5 +1,7 @@ # @rocket.chat/core-typings +## 6.5.0-rc.8 + ## 6.5.0-rc.7 ## 6.5.0-rc.6 diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json index 39c97a857383..c6653e4453d1 100644 --- a/packages/core-typings/package.json +++ b/packages/core-typings/package.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/package", "name": "@rocket.chat/core-typings", - "version": "6.5.0-rc.7", + "version": "6.5.0-rc.8", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "eslint": "~8.45.0", diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md index df345293e9ee..1ada3849a56b 100644 --- a/packages/cron/CHANGELOG.md +++ b/packages/cron/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/cron +## 0.0.20-rc.1 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.8 +- @rocket.chat/models@0.0.24-rc.1 + ## 0.0.17-rc.7 ### Patch Changes diff --git a/packages/cron/package.json b/packages/cron/package.json index 70a436aff65f..679e68264f1c 100644 --- a/packages/cron/package.json +++ b/packages/cron/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/cron", - "version": "0.0.20-rc.0", + "version": "0.0.20-rc.1", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md index ea42640d97a1..9da4b9170bb1 100644 --- a/packages/fuselage-ui-kit/CHANGELOG.md +++ b/packages/fuselage-ui-kit/CHANGELOG.md @@ -1,5 +1,13 @@ # Change Log +## 3.0.0-rc.8 + +### Patch Changes + +- @rocket.chat/gazzodown@3.0.0-rc.8 +- @rocket.chat/ui-contexts@3.0.0-rc.8 +- @rocket.chat/ui-video-conf@3.0.0-rc.8 + ## 3.0.0-rc.7 ### Patch Changes diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index e5d4ba8cca5d..60faedc0cf5b 100644 --- a/packages/fuselage-ui-kit/package.json +++ b/packages/fuselage-ui-kit/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/fuselage-ui-kit", "private": true, - "version": "3.0.0-rc.7", + "version": "3.0.0-rc.8", "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system", "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/", "author": { @@ -47,9 +47,9 @@ "@rocket.chat/icons": "*", "@rocket.chat/prettier-config": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.7", + "@rocket.chat/ui-contexts": "3.0.0-rc.8", "@rocket.chat/ui-kit": "*", - "@rocket.chat/ui-video-conf": "3.0.0-rc.7", + "@rocket.chat/ui-video-conf": "3.0.0-rc.8", "@tanstack/react-query": "*", "react": "*", "react-dom": "*" diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md index db795a3acad7..533eeaef3206 100644 --- a/packages/gazzodown/CHANGELOG.md +++ b/packages/gazzodown/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/gazzodown +## 3.0.0-rc.8 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.8 +- @rocket.chat/ui-contexts@3.0.0-rc.8 +- @rocket.chat/ui-client@3.0.0-rc.8 + ## 3.0.0-rc.7 ### Patch Changes diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json index f4907c14d5c4..01635fc1a868 100644 --- a/packages/gazzodown/package.json +++ b/packages/gazzodown/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/gazzodown", - "version": "3.0.0-rc.7", + "version": "3.0.0-rc.8", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -65,14 +65,14 @@ "/dist" ], "peerDependencies": { - "@rocket.chat/core-typings": "6.5.0-rc.7", + "@rocket.chat/core-typings": "6.5.0-rc.8", "@rocket.chat/css-in-js": "*", "@rocket.chat/fuselage": "*", "@rocket.chat/fuselage-tokens": "*", "@rocket.chat/message-parser": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-client": "3.0.0-rc.7", - "@rocket.chat/ui-contexts": "3.0.0-rc.7", + "@rocket.chat/ui-client": "3.0.0-rc.8", + "@rocket.chat/ui-contexts": "3.0.0-rc.8", "katex": "*", "react": "*" }, diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md index 45593a97f303..e193db11a026 100644 --- a/packages/instance-status/CHANGELOG.md +++ b/packages/instance-status/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/instance-status +## 0.0.24-rc.1 + +### Patch Changes + +- @rocket.chat/models@0.0.24-rc.1 + ## 0.0.21-rc.7 ### Patch Changes diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json index eb512a50dffe..7d5249e58f5c 100644 --- a/packages/instance-status/package.json +++ b/packages/instance-status/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/instance-status", - "version": "0.0.24-rc.0", + "version": "0.0.24-rc.1", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md index abe2212eb7b7..67f224ccd3df 100644 --- a/packages/livechat/CHANGELOG.md +++ b/packages/livechat/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/livechat Change Log +## 1.14.9-rc.1 + +### Patch Changes + +- @rocket.chat/gazzodown@3.0.0-rc.8 + ## 1.14.6-rc.7 ### Patch Changes diff --git a/packages/livechat/package.json b/packages/livechat/package.json index 1fd61f1869ae..1b8ae3acb0d0 100644 --- a/packages/livechat/package.json +++ b/packages/livechat/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/livechat", - "version": "1.14.9-rc.0", + "version": "1.14.9-rc.1", "files": [ "/build" ], diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md index 12ed3645d773..76c18e094e05 100644 --- a/packages/model-typings/CHANGELOG.md +++ b/packages/model-typings/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/model-typings +## 0.2.0-rc.8 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.8 + ## 0.2.0-rc.7 ### Patch Changes diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json index 8d92ab5ae540..bfcb956ac226 100644 --- a/packages/model-typings/package.json +++ b/packages/model-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/model-typings", - "version": "0.2.0-rc.7", + "version": "0.2.0-rc.8", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md index b747514a9979..c4d60cbfd9b1 100644 --- a/packages/models/CHANGELOG.md +++ b/packages/models/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/models +## 0.0.24-rc.1 + +### Patch Changes + +- @rocket.chat/model-typings@0.2.0-rc.8 + ## 0.0.21-rc.7 ### Patch Changes diff --git a/packages/models/package.json b/packages/models/package.json index 4471297e7a9c..ffe6e5c90e57 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/models", - "version": "0.0.24-rc.0", + "version": "0.0.24-rc.1", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md index 9bca22a51398..675716f74b73 100644 --- a/packages/rest-typings/CHANGELOG.md +++ b/packages/rest-typings/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/rest-typings +## 6.5.0-rc.8 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.8 +- @rocket.chat/license@0.1.0-rc.8 + ## 6.5.0-rc.7 ### Patch Changes diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json index 68f356a4a132..c9118ca8f8ce 100644 --- a/packages/rest-typings/package.json +++ b/packages/rest-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/rest-typings", - "version": "6.5.0-rc.7", + "version": "6.5.0-rc.8", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "@types/jest": "~29.5.7", diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md index 713b0a7ee5ee..706a9cd68686 100644 --- a/packages/ui-client/CHANGELOG.md +++ b/packages/ui-client/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/ui-client +## 3.0.0-rc.8 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.8 + ## 3.0.0-rc.7 ### Patch Changes diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json index 483a7fe5fb86..7191e6cef0ea 100644 --- a/packages/ui-client/package.json +++ b/packages/ui-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-client", - "version": "3.0.0-rc.7", + "version": "3.0.0-rc.8", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -61,7 +61,7 @@ "@rocket.chat/fuselage": "*", "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.7", + "@rocket.chat/ui-contexts": "3.0.0-rc.8", "react": "~17.0.2" }, "volta": { diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md index f570d5e5c159..bf3b1da14ff3 100644 --- a/packages/ui-contexts/CHANGELOG.md +++ b/packages/ui-contexts/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/ui-contexts +## 3.0.0-rc.8 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.8 +- @rocket.chat/rest-typings@6.5.0-rc.8 +- @rocket.chat/ddp-client@0.2.9-rc.1 + ## 3.0.0-rc.7 ### Patch Changes diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json index d05d9386ef79..147fa761b5fe 100644 --- a/packages/ui-contexts/package.json +++ b/packages/ui-contexts/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-contexts", - "version": "3.0.0-rc.7", + "version": "3.0.0-rc.8", "private": true, "devDependencies": { "@rocket.chat/core-typings": "workspace:^", diff --git a/packages/ui-video-conf/CHANGELOG.md b/packages/ui-video-conf/CHANGELOG.md index 400346f3835f..6a75282e69ae 100644 --- a/packages/ui-video-conf/CHANGELOG.md +++ b/packages/ui-video-conf/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/ui-video-conf +## 3.0.0-rc.8 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.8 + ## 3.0.0-rc.7 ### Patch Changes diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json index a2c3c9cf019e..254cbd34a4fb 100644 --- a/packages/ui-video-conf/package.json +++ b/packages/ui-video-conf/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-video-conf", - "version": "3.0.0-rc.7", + "version": "3.0.0-rc.8", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -35,7 +35,7 @@ "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.7", + "@rocket.chat/ui-contexts": "3.0.0-rc.8", "react": "^17.0.2", "react-dom": "^17.0.2" }, diff --git a/packages/uikit-playground/CHANGELOG.md b/packages/uikit-playground/CHANGELOG.md index fc591fd32c99..c465aec5ef61 100644 --- a/packages/uikit-playground/CHANGELOG.md +++ b/packages/uikit-playground/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/uikit-playground +## 0.2.9-rc.1 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.8 +- @rocket.chat/fuselage-ui-kit@3.0.0-rc.8 + ## 0.2.6-rc.7 ### Patch Changes diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json index 2c48168d22d0..b0af51aa81ba 100644 --- a/packages/uikit-playground/package.json +++ b/packages/uikit-playground/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/uikit-playground", "private": true, - "version": "0.2.9-rc.0", + "version": "0.2.9-rc.1", "type": "module", "scripts": { "dev": "vite", diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md index f1cbded5ded9..d09c55b945a9 100644 --- a/packages/web-ui-registration/CHANGELOG.md +++ b/packages/web-ui-registration/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/web-ui-registration +## 3.0.0-rc.7 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.8 + ## 3.0.0-rc.6 ### Patch Changes diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json index 022438b562e3..6561537ab5cb 100644 --- a/packages/web-ui-registration/package.json +++ b/packages/web-ui-registration/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/web-ui-registration", - "version": "3.0.0-rc.6", + "version": "3.0.0-rc.7", "private": true, "homepage": "https://rocket.chat", "main": "./dist/index.js", @@ -51,7 +51,7 @@ "peerDependencies": { "@rocket.chat/layout": "*", "@rocket.chat/tools": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.7", + "@rocket.chat/ui-contexts": "3.0.0-rc.8", "@tanstack/react-query": "*", "react": "*", "react-hook-form": "*", From f914c6d316b394ac5cfcd79e62ecf5910f5a4c9e Mon Sep 17 00:00:00 2001 From: Martin Schoeler Date: Wed, 22 Nov 2023 10:38:32 -0300 Subject: [PATCH 19/76] fix: Livechat Reactivity issues with createOrUpdateGuest (#30960) From 505547a6934a349b945588e510a97db6406aec90 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Wed, 22 Nov 2023 11:23:04 -0300 Subject: [PATCH 20/76] regression: airgapped (#31043) --- apps/meteor/app/api/server/v1/cloud.ts | 6 +- .../getWorkspaceAccessTokenWithScope.ts | 1 + .../server/functions/saveRegistrationData.ts | 67 ++++++++++++++++++- .../server/functions/syncWorkspace/index.ts | 5 +- apps/meteor/ee/app/license/server/startup.ts | 2 +- 5 files changed, 72 insertions(+), 9 deletions(-) diff --git a/apps/meteor/app/api/server/v1/cloud.ts b/apps/meteor/app/api/server/v1/cloud.ts index 626cefb9ae3d..00875f8d21c7 100644 --- a/apps/meteor/app/api/server/v1/cloud.ts +++ b/apps/meteor/app/api/server/v1/cloud.ts @@ -7,7 +7,7 @@ import { getCheckoutUrl } from '../../../cloud/server/functions/getCheckoutUrl'; import { getConfirmationPoll } from '../../../cloud/server/functions/getConfirmationPoll'; import { registerPreIntentWorkspaceWizard } from '../../../cloud/server/functions/registerPreIntentWorkspaceWizard'; import { retrieveRegistrationStatus } from '../../../cloud/server/functions/retrieveRegistrationStatus'; -import { saveRegistrationData } from '../../../cloud/server/functions/saveRegistrationData'; +import { saveRegistrationDataManual } from '../../../cloud/server/functions/saveRegistrationData'; import { startRegisterWorkspaceSetupWizard } from '../../../cloud/server/functions/startRegisterWorkspaceSetupWizard'; import { syncWorkspace } from '../../../cloud/server/functions/syncWorkspace'; import { API } from '../api'; @@ -33,7 +33,7 @@ API.v1.addRoute( const settingsData = JSON.parse(Buffer.from(this.bodyParams.cloudBlob, 'base64').toString()); - await saveRegistrationData(settingsData); + await saveRegistrationDataManual(settingsData); return API.v1.success(); }, @@ -104,7 +104,7 @@ API.v1.addRoute( const pollData = await getConfirmationPoll(deviceCode); if (pollData) { if ('successful' in pollData && pollData.successful) { - await saveRegistrationData(pollData.payload); + await saveRegistrationDataManual(pollData.payload); } return API.v1.success({ pollData }); } diff --git a/apps/meteor/app/cloud/server/functions/getWorkspaceAccessTokenWithScope.ts b/apps/meteor/app/cloud/server/functions/getWorkspaceAccessTokenWithScope.ts index 1d67ed3876d5..62d50630dd24 100644 --- a/apps/meteor/app/cloud/server/functions/getWorkspaceAccessTokenWithScope.ts +++ b/apps/meteor/app/cloud/server/functions/getWorkspaceAccessTokenWithScope.ts @@ -45,6 +45,7 @@ export async function getWorkspaceAccessTokenWithScope(scope = '', throwOnError headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, method: 'POST', body, + timeout: 3000, }); payload = await response.json(); diff --git a/apps/meteor/app/cloud/server/functions/saveRegistrationData.ts b/apps/meteor/app/cloud/server/functions/saveRegistrationData.ts index 9faa52c787b5..ba1940c54bd1 100644 --- a/apps/meteor/app/cloud/server/functions/saveRegistrationData.ts +++ b/apps/meteor/app/cloud/server/functions/saveRegistrationData.ts @@ -1,9 +1,39 @@ import { Settings } from '@rocket.chat/models'; +import { applyLicense } from '../../../../ee/app/license/server/startup'; import { settings } from '../../../settings/server'; import { syncCloudData } from './syncWorkspace/syncCloudData'; -export function saveRegistrationData({ +export async function saveRegistrationData({ + workspaceId, + client_name, + client_id, + client_secret, + client_secret_expires_at, + publicKey, + registration_client_uri, +}: { + workspaceId: string; + client_name: string; + client_id: string; + client_secret: string; + client_secret_expires_at: number; + publicKey: string; + registration_client_uri: string; +}) { + await saveRegistrationDataBase({ + workspaceId, + client_name, + client_id, + client_secret, + client_secret_expires_at, + publicKey, + registration_client_uri, + }); + + await syncCloudData(); +} +function saveRegistrationDataBase({ workspaceId, client_name, client_id, @@ -50,8 +80,39 @@ export function saveRegistrationData({ } await new Promise((resolve) => setTimeout(resolve, 1000)); } - - await syncCloudData(); return results; }); } + +export async function saveRegistrationDataManual({ + workspaceId, + client_name, + client_id, + client_secret, + client_secret_expires_at, + publicKey, + registration_client_uri, + licenseData, +}: { + workspaceId: string; + client_name: string; + client_id: string; + client_secret: string; + client_secret_expires_at: number; + publicKey: string; + registration_client_uri: string; + licenseData: { + license: string; + }; +}) { + await saveRegistrationDataBase({ + workspaceId, + client_name, + client_id, + client_secret, + client_secret_expires_at, + publicKey, + registration_client_uri, + }); + await applyLicense(licenseData.license, true); +} diff --git a/apps/meteor/app/cloud/server/functions/syncWorkspace/index.ts b/apps/meteor/app/cloud/server/functions/syncWorkspace/index.ts index 721c96d9a0f7..4dca8bc35321 100644 --- a/apps/meteor/app/cloud/server/functions/syncWorkspace/index.ts +++ b/apps/meteor/app/cloud/server/functions/syncWorkspace/index.ts @@ -10,6 +10,7 @@ export async function syncWorkspace() { try { await syncCloudData(); await announcementSync(); + await getCachedSupportedVersionsToken.reset(); } catch (err) { switch (true) { case err instanceof CloudWorkspaceRegistrationError: @@ -27,6 +28,7 @@ export async function syncWorkspace() { }); try { await legacySyncWorkspace(); + await getCachedSupportedVersionsToken.reset(); } catch (err) { switch (true) { case err instanceof CloudWorkspaceRegistrationError: @@ -37,12 +39,11 @@ export async function syncWorkspace() { } default: { SystemLogger.error({ msg: 'Error during fallback workspace sync', err }); + throw err; } } } } } } - - await getCachedSupportedVersionsToken.reset(); } diff --git a/apps/meteor/ee/app/license/server/startup.ts b/apps/meteor/ee/app/license/server/startup.ts index e0dd567da392..04c8d70c16a2 100644 --- a/apps/meteor/ee/app/license/server/startup.ts +++ b/apps/meteor/ee/app/license/server/startup.ts @@ -25,7 +25,7 @@ License.onInvalidateLicense(async () => { await Settings.updateValueById('Enterprise_License_Status', 'Invalid'); }); -const applyLicense = async (license: string, isNewLicense: boolean): Promise => { +export const applyLicense = async (license: string, isNewLicense: boolean): Promise => { const enterpriseLicense = (license ?? '').trim(); if (!enterpriseLicense) { return false; From 34498986f086c2e84c63b0fc54f4dad007b96494 Mon Sep 17 00:00:00 2001 From: Aleksander Nicacio da Silva Date: Wed, 22 Nov 2023 13:48:13 -0300 Subject: [PATCH 21/76] chore: Changed over mac limit Banner to Callout (#31046) --- .../omnichannel/currentChats/CurrentChatsPage.tsx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/apps/meteor/client/views/omnichannel/currentChats/CurrentChatsPage.tsx b/apps/meteor/client/views/omnichannel/currentChats/CurrentChatsPage.tsx index 0194290432cd..83e000f2f1b8 100644 --- a/apps/meteor/client/views/omnichannel/currentChats/CurrentChatsPage.tsx +++ b/apps/meteor/client/views/omnichannel/currentChats/CurrentChatsPage.tsx @@ -1,4 +1,4 @@ -import { Banner, Icon, Pagination } from '@rocket.chat/fuselage'; +import { Callout, Pagination } from '@rocket.chat/fuselage'; import { useMutableCallback } from '@rocket.chat/fuselage-hooks'; import type { GETLivechatRoomsParams } from '@rocket.chat/rest-typings'; import { usePermission, useTranslation } from '@rocket.chat/ui-contexts'; @@ -306,15 +306,14 @@ const CurrentChatsPage = ({ id, onRowClick }: { id?: string; onRowClick: (_id: s /> )} {isWorkspaceOverMacLimit && ( - } + {t('Talk_to_your_workspace_admin_to_address_this_issue')} - + )} {isSuccess && data?.rooms.length === 0 && queryHasChanged && } {isSuccess && data?.rooms.length === 0 && !queryHasChanged && ( From e0f3fc478babe19ff30f221d11a26e8ffc434aee Mon Sep 17 00:00:00 2001 From: Hugo Costa Date: Wed, 22 Nov 2023 15:25:43 -0300 Subject: [PATCH 22/76] regression: remove unlimited mac info (#31044) --- .../admin/subscription/SubscriptionPage.tsx | 7 +------ .../subscription/components/cards/PlanCard.tsx | 1 - .../cards/PlanCard/PlanCardPremium.tsx | 18 ++++++------------ .../packages/rocketchat-i18n/i18n/en.i18n.json | 4 +--- 4 files changed, 8 insertions(+), 22 deletions(-) diff --git a/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx b/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx index 101565ce63d4..d0dd1ec0be4e 100644 --- a/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx +++ b/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx @@ -115,12 +115,7 @@ const SubscriptionPage = () => { )} - {license && ( - - )} + {license && } {!license && } diff --git a/apps/meteor/client/views/admin/subscription/components/cards/PlanCard.tsx b/apps/meteor/client/views/admin/subscription/components/cards/PlanCard.tsx index e9b026e57499..c9e1e06ff8cd 100644 --- a/apps/meteor/client/views/admin/subscription/components/cards/PlanCard.tsx +++ b/apps/meteor/client/views/admin/subscription/components/cards/PlanCard.tsx @@ -7,7 +7,6 @@ import PlanCardTrial from './PlanCard/PlanCardTrial'; type LicenseLimits = { activeUsers: { max: number; value?: number }; - monthlyActiveContacts: { max: number; value?: number }; }; type PlanCardProps = { diff --git a/apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardPremium.tsx b/apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardPremium.tsx index d829cd4affc2..cd7227bda098 100644 --- a/apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardPremium.tsx +++ b/apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardPremium.tsx @@ -13,7 +13,6 @@ import PlanCardBase from './PlanCardBase'; type LicenseLimits = { activeUsers: { max: number; value?: number }; - monthlyActiveContacts: { max: number; value?: number }; }; type PlanCardProps = { @@ -33,17 +32,12 @@ const PlanCardPremium = ({ licenseInformation, licenseLimits }: PlanCardProps): return ( - {licenseLimits?.activeUsers.max === Infinity || - (licenseLimits?.monthlyActiveContacts.max === Infinity && ( - - - {licenseLimits?.activeUsers.max === Infinity && - licenseLimits?.monthlyActiveContacts.max === Infinity && - t('Unlimited_seats_MACs')} - {licenseLimits?.activeUsers.max === Infinity && licenseLimits?.monthlyActiveContacts.max !== Infinity && t('Unlimited_seats')} - {licenseLimits?.activeUsers.max !== Infinity && licenseLimits?.monthlyActiveContacts.max === Infinity && t('Unlimited_MACs')} - - ))} + {licenseLimits?.activeUsers.max === Infinity && ( + + + {t('Unlimited_seats')} + + )} {visualExpiration && ( diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json index aeee244efea8..e2fc7b07805d 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json @@ -6189,7 +6189,5 @@ "Sync_license_update_Callout": "If you don't notice any changes in your workspace within a few minutes, sync the license update.", "Includes": "Includes", "Unlock_premium_capabilities": "Unlock premium capabilities", - "Unlimited_seats": "Unlimited seats", - "Unlimited_MACs": "Unlimited MACs", - "Unlimited_seats_MACs": "Unlimited seats and MACs" + "Unlimited_seats": "Unlimited seats" } From 2bbba79ca941d1973e87b5715db4b8235d6c85b3 Mon Sep 17 00:00:00 2001 From: Douglas Gubert Date: Wed, 22 Nov 2023 17:50:00 -0300 Subject: [PATCH 23/76] chore: Bump Apps-Engine version (#30998) --- apps/meteor/ee/server/services/package.json | 2 +- apps/meteor/package.json | 2 +- ee/apps/ddp-streamer/package.json | 2 +- ee/packages/presence/package.json | 2 +- packages/core-services/package.json | 2 +- packages/core-typings/package.json | 2 +- packages/fuselage-ui-kit/package.json | 2 +- packages/rest-typings/package.json | 2 +- yarn.lock | 48 +++++++-------------- 9 files changed, 23 insertions(+), 41 deletions(-) diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json index ea4aed6f8fad..868c72c35c6d 100644 --- a/apps/meteor/ee/server/services/package.json +++ b/apps/meteor/ee/server/services/package.json @@ -18,7 +18,7 @@ "author": "Rocket.Chat", "license": "MIT", "dependencies": { - "@rocket.chat/apps-engine": "1.41.0-alpha.290", + "@rocket.chat/apps-engine": "1.41.0", "@rocket.chat/core-services": "workspace:^", "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/emitter": "~0.31.25", diff --git a/apps/meteor/package.json b/apps/meteor/package.json index a6e61d3da35b..5f5f4575c3d9 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -225,7 +225,7 @@ "@rocket.chat/account-utils": "workspace:^", "@rocket.chat/agenda": "workspace:^", "@rocket.chat/api-client": "workspace:^", - "@rocket.chat/apps-engine": "1.41.0-alpha.312", + "@rocket.chat/apps-engine": "1.41.0", "@rocket.chat/base64": "workspace:^", "@rocket.chat/cas-validate": "workspace:^", "@rocket.chat/core-services": "workspace:^", diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json index 48b3044573c5..9041bcb87cae 100644 --- a/ee/apps/ddp-streamer/package.json +++ b/ee/apps/ddp-streamer/package.json @@ -15,7 +15,7 @@ ], "author": "Rocket.Chat", "dependencies": { - "@rocket.chat/apps-engine": "1.41.0-alpha.290", + "@rocket.chat/apps-engine": "1.41.0", "@rocket.chat/core-services": "workspace:^", "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/emitter": "~0.31.25", diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json index dc8160bd21a2..82b7613d6cb4 100644 --- a/ee/packages/presence/package.json +++ b/ee/packages/presence/package.json @@ -6,7 +6,7 @@ "@babel/core": "~7.22.20", "@babel/preset-env": "~7.22.20", "@babel/preset-typescript": "~7.22.15", - "@rocket.chat/apps-engine": "1.41.0-alpha.290", + "@rocket.chat/apps-engine": "1.41.0", "@rocket.chat/eslint-config": "workspace:^", "@rocket.chat/rest-typings": "workspace:^", "@types/node": "^14.18.63", diff --git a/packages/core-services/package.json b/packages/core-services/package.json index 7d67e43aeb3b..0c4124f8e102 100644 --- a/packages/core-services/package.json +++ b/packages/core-services/package.json @@ -34,7 +34,7 @@ "extends": "../../package.json" }, "dependencies": { - "@rocket.chat/apps-engine": "1.41.0-alpha.290", + "@rocket.chat/apps-engine": "1.41.0", "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/icons": "~0.32.0", "@rocket.chat/message-parser": "~0.31.26", diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json index c6653e4453d1..8ad17d9af6fb 100644 --- a/packages/core-typings/package.json +++ b/packages/core-typings/package.json @@ -22,7 +22,7 @@ "/dist" ], "dependencies": { - "@rocket.chat/apps-engine": "1.41.0-alpha.290", + "@rocket.chat/apps-engine": "1.41.0", "@rocket.chat/icons": "~0.32.0", "@rocket.chat/message-parser": "~0.31.26", "@rocket.chat/ui-kit": "~0.32.1" diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index 60faedc0cf5b..9113629bd03b 100644 --- a/packages/fuselage-ui-kit/package.json +++ b/packages/fuselage-ui-kit/package.json @@ -59,7 +59,7 @@ "@babel/preset-env": "~7.22.20", "@babel/preset-react": "~7.22.15", "@babel/preset-typescript": "~7.22.15", - "@rocket.chat/apps-engine": "1.41.0-alpha.290", + "@rocket.chat/apps-engine": "1.41.0", "@rocket.chat/eslint-config": "workspace:^", "@rocket.chat/fuselage": "~0.38.1", "@rocket.chat/fuselage-hooks": "~0.32.1", diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json index c9118ca8f8ce..aed97934f88b 100644 --- a/packages/rest-typings/package.json +++ b/packages/rest-typings/package.json @@ -24,7 +24,7 @@ "/dist" ], "dependencies": { - "@rocket.chat/apps-engine": "1.41.0-alpha.290", + "@rocket.chat/apps-engine": "1.41.0", "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/license": "workspace:^", "@rocket.chat/message-parser": "~0.31.26", diff --git a/yarn.lock b/yarn.lock index fb8e61d17a20..be60075a2a9c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7788,9 +7788,9 @@ __metadata: languageName: unknown linkType: soft -"@rocket.chat/apps-engine@npm:1.41.0-alpha.290": - version: 1.41.0-alpha.290 - resolution: "@rocket.chat/apps-engine@npm:1.41.0-alpha.290" +"@rocket.chat/apps-engine@npm:1.41.0": + version: 1.41.0 + resolution: "@rocket.chat/apps-engine@npm:1.41.0" dependencies: adm-zip: ^0.5.9 cryptiles: ^4.1.3 @@ -7798,29 +7798,11 @@ __metadata: lodash.clonedeep: ^4.5.0 semver: ^5.7.1 stack-trace: 0.0.10 - uuid: ^3.4.0 + uuid: ~8.3.2 vm2: ^3.9.19 peerDependencies: "@rocket.chat/ui-kit": "*" - checksum: f31f4c9bac7f036d22b023688d9854196340f5813112a016848ddbea9589088ab5a2a7830b691c24ef01e9cce98e9046c5b8780bc46dd3bef6f3a05207d51a60 - languageName: node - linkType: hard - -"@rocket.chat/apps-engine@npm:1.41.0-alpha.312": - version: 1.41.0-alpha.312 - resolution: "@rocket.chat/apps-engine@npm:1.41.0-alpha.312" - dependencies: - adm-zip: ^0.5.9 - cryptiles: ^4.1.3 - jose: ^4.11.1 - lodash.clonedeep: ^4.5.0 - semver: ^5.7.1 - stack-trace: 0.0.10 - uuid: ^3.4.0 - vm2: ^3.9.19 - peerDependencies: - "@rocket.chat/ui-kit": "*" - checksum: 003853d3c4d4374ab984474026e4ae657daf4591fe4c375b914aa57c27f576af0fcba66e70c539e056b5d80a1ef655775f6f3a07bf81a36ab6fd438ce464e70f + checksum: 2e7fa2856bdbdc6b0dd2456e9aa5e5804a4198f8df0306a002c5e71681466d3fc2cb0a1253668d5e24fa21345a7dd7eed3458a257e1e4cc59a4e8a3876579aa5 languageName: node linkType: hard @@ -7892,7 +7874,7 @@ __metadata: "@babel/core": ~7.22.20 "@babel/preset-env": ~7.22.20 "@babel/preset-typescript": ~7.22.15 - "@rocket.chat/apps-engine": 1.41.0-alpha.290 + "@rocket.chat/apps-engine": 1.41.0 "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/eslint-config": "workspace:^" "@rocket.chat/icons": ~0.32.0 @@ -7918,7 +7900,7 @@ __metadata: version: 0.0.0-use.local resolution: "@rocket.chat/core-typings@workspace:packages/core-typings" dependencies: - "@rocket.chat/apps-engine": 1.41.0-alpha.290 + "@rocket.chat/apps-engine": 1.41.0 "@rocket.chat/eslint-config": "workspace:^" "@rocket.chat/icons": ~0.32.0 "@rocket.chat/message-parser": ~0.31.26 @@ -7994,7 +7976,7 @@ __metadata: version: 0.0.0-use.local resolution: "@rocket.chat/ddp-streamer@workspace:ee/apps/ddp-streamer" dependencies: - "@rocket.chat/apps-engine": 1.41.0-alpha.290 + "@rocket.chat/apps-engine": 1.41.0 "@rocket.chat/core-services": "workspace:^" "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/emitter": ~0.31.25 @@ -8189,7 +8171,7 @@ __metadata: "@babel/preset-env": ~7.22.20 "@babel/preset-react": ~7.22.15 "@babel/preset-typescript": ~7.22.15 - "@rocket.chat/apps-engine": 1.41.0-alpha.290 + "@rocket.chat/apps-engine": 1.41.0 "@rocket.chat/eslint-config": "workspace:^" "@rocket.chat/fuselage": ~0.38.1 "@rocket.chat/fuselage-hooks": ~0.32.1 @@ -8594,7 +8576,7 @@ __metadata: "@rocket.chat/account-utils": "workspace:^" "@rocket.chat/agenda": "workspace:^" "@rocket.chat/api-client": "workspace:^" - "@rocket.chat/apps-engine": 1.41.0-alpha.312 + "@rocket.chat/apps-engine": 1.41.0 "@rocket.chat/base64": "workspace:^" "@rocket.chat/cas-validate": "workspace:^" "@rocket.chat/core-services": "workspace:^" @@ -9192,7 +9174,7 @@ __metadata: "@babel/core": ~7.22.20 "@babel/preset-env": ~7.22.20 "@babel/preset-typescript": ~7.22.15 - "@rocket.chat/apps-engine": 1.41.0-alpha.290 + "@rocket.chat/apps-engine": 1.41.0 "@rocket.chat/core-services": "workspace:^" "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/eslint-config": "workspace:^" @@ -9293,7 +9275,7 @@ __metadata: version: 0.0.0-use.local resolution: "@rocket.chat/rest-typings@workspace:packages/rest-typings" dependencies: - "@rocket.chat/apps-engine": 1.41.0-alpha.290 + "@rocket.chat/apps-engine": 1.41.0 "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/eslint-config": "workspace:^" "@rocket.chat/license": "workspace:^" @@ -34550,7 +34532,7 @@ __metadata: version: 0.0.0-use.local resolution: "rocketchat-services@workspace:apps/meteor/ee/server/services" dependencies: - "@rocket.chat/apps-engine": 1.41.0-alpha.290 + "@rocket.chat/apps-engine": 1.41.0 "@rocket.chat/core-services": "workspace:^" "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/emitter": ~0.31.25 @@ -39158,7 +39140,7 @@ __metadata: languageName: node linkType: hard -"uuid@npm:^3.0.1, uuid@npm:^3.2.1, uuid@npm:^3.3.2, uuid@npm:^3.4.0": +"uuid@npm:^3.0.1, uuid@npm:^3.2.1, uuid@npm:^3.3.2": version: 3.4.0 resolution: "uuid@npm:3.4.0" bin: @@ -39176,7 +39158,7 @@ __metadata: languageName: node linkType: hard -"uuid@npm:^8.0.0, uuid@npm:^8.3.2": +"uuid@npm:^8.0.0, uuid@npm:^8.3.2, uuid@npm:~8.3.2": version: 8.3.2 resolution: "uuid@npm:8.3.2" bin: From cda74fc52e50fec6efd024909e5af33447270437 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Wed, 22 Nov 2023 18:48:31 -0300 Subject: [PATCH 24/76] regression: fix registration sync (#31053) --- apps/meteor/app/api/server/v1/cloud.ts | 4 +- .../license/__tests__/MockedLicenseBuilder.ts | 42 +++++++++++++++ .../license/__tests__/setLicense.spec.ts | 51 +++++++++++++++++++ ee/packages/license/src/license.ts | 11 ++-- 4 files changed, 103 insertions(+), 5 deletions(-) diff --git a/apps/meteor/app/api/server/v1/cloud.ts b/apps/meteor/app/api/server/v1/cloud.ts index 00875f8d21c7..507495b150de 100644 --- a/apps/meteor/app/api/server/v1/cloud.ts +++ b/apps/meteor/app/api/server/v1/cloud.ts @@ -7,7 +7,7 @@ import { getCheckoutUrl } from '../../../cloud/server/functions/getCheckoutUrl'; import { getConfirmationPoll } from '../../../cloud/server/functions/getConfirmationPoll'; import { registerPreIntentWorkspaceWizard } from '../../../cloud/server/functions/registerPreIntentWorkspaceWizard'; import { retrieveRegistrationStatus } from '../../../cloud/server/functions/retrieveRegistrationStatus'; -import { saveRegistrationDataManual } from '../../../cloud/server/functions/saveRegistrationData'; +import { saveRegistrationData, saveRegistrationDataManual } from '../../../cloud/server/functions/saveRegistrationData'; import { startRegisterWorkspaceSetupWizard } from '../../../cloud/server/functions/startRegisterWorkspaceSetupWizard'; import { syncWorkspace } from '../../../cloud/server/functions/syncWorkspace'; import { API } from '../api'; @@ -104,7 +104,7 @@ API.v1.addRoute( const pollData = await getConfirmationPoll(deviceCode); if (pollData) { if ('successful' in pollData && pollData.successful) { - await saveRegistrationDataManual(pollData.payload); + await saveRegistrationData(pollData.payload); } return API.v1.success({ pollData }); } diff --git a/ee/packages/license/__tests__/MockedLicenseBuilder.ts b/ee/packages/license/__tests__/MockedLicenseBuilder.ts index d68976b23df0..dd2698b26810 100644 --- a/ee/packages/license/__tests__/MockedLicenseBuilder.ts +++ b/ee/packages/license/__tests__/MockedLicenseBuilder.ts @@ -110,6 +110,48 @@ export class MockedLicenseBuilder { }; } + public withExpiredDate(): this { + // expired 1 minute ago + const date = new Date(); + date.setMinutes(date.getMinutes() - 1); + const expired = date.toISOString(); + + const rule = this.validation.validPeriods.find((period) => period.invalidBehavior === 'invalidate_license'); + + if (rule) { + rule.validUntil = expired; + } else { + this.validation.validPeriods.push({ + invalidBehavior: 'invalidate_license', + validFrom: new Date(new Date().setFullYear(new Date().getFullYear() - 1)).toISOString(), + validUntil: expired, + }); + } + + return this; + } + + public withNotStartedDate(): this { + // starts in 1 minute + const date = new Date(); + date.setMinutes(date.getMinutes() + 1); + const starts = date.toISOString(); + + const rule = this.validation.validPeriods.find((period) => period.invalidBehavior === 'invalidate_license'); + + if (rule) { + rule.validFrom = starts; + } else { + this.validation.validPeriods.push({ + invalidBehavior: 'invalidate_license', + validUntil: new Date(new Date().setFullYear(new Date().getFullYear() + 1)).toISOString(), + validFrom: starts, + }); + } + + return this; + } + public resetValidPeriods(): this { this.validation.validPeriods = []; return this; diff --git a/ee/packages/license/__tests__/setLicense.spec.ts b/ee/packages/license/__tests__/setLicense.spec.ts index 35a7a495edc0..f077a4fd0e0b 100644 --- a/ee/packages/license/__tests__/setLicense.spec.ts +++ b/ee/packages/license/__tests__/setLicense.spec.ts @@ -32,6 +32,57 @@ describe('License set license procedures', () => { }); }); + describe('Invalid periods', () => { + it('should throw an error if the license is expired', async () => { + const license = await getReadyLicenseManager(); + + const mocked = await new MockedLicenseBuilder(); + const token = await mocked.withExpiredDate().sign(); + + await license.setLicense(token); + await expect(license.hasValidLicense()).toBe(false); + }); + + describe('license that is not not started yet is applied', () => { + it('should throw an error if the license is not started yet', async () => { + const license = await getReadyLicenseManager(); + + const mocked = new MockedLicenseBuilder(); + const token = await mocked.withNotStartedDate().sign(); + + await license.setLicense(token); + await expect(license.hasValidLicense()).toBe(false); + }); + + it('should be allowed to set the same license again if the license is not started yet', async () => { + const license = await getReadyLicenseManager(); + + const mocked = await new MockedLicenseBuilder(); + const as = await mocked.resetValidPeriods().withNotStartedDate(); + const token = await as.sign(); + + await license.setLicense(token); + + await expect(license.hasValidLicense()).toBe(false); + + // 5 minutes in the future + + const mockedData = new Date(); + + mockedData.setMinutes(mockedData.getMinutes() + 5); + + jest.useFakeTimers(); + jest.setSystemTime(mockedData); + + await license.setLicense(token); + + jest.useRealTimers(); + + await expect(license.hasValidLicense()).toBe(true); + }); + }); + }); + it('should throw an error if the license is duplicated', async () => { const license = await getReadyLicenseManager(); diff --git a/ee/packages/license/src/license.ts b/ee/packages/license/src/license.ts index c8a5c0a514d5..7e15296de565 100644 --- a/ee/packages/license/src/license.ts +++ b/ee/packages/license/src/license.ts @@ -163,7 +163,6 @@ export class LicenseManager extends Emitter { this._license = newLicense; this._lockedLicense = encryptedLicense; - await this.validateLicense({ isNewLicense }); } catch (e) { if (e instanceof InvalidLicenseError) { @@ -251,10 +250,16 @@ export class LicenseManager extends Emitter { if (hasPendingLicense.call(this) && !isPendingLicense.call(this, encryptedLicense)) { // simply remove the pending license clearPendingLicense.call(this); - throw new Error('Invalid license 1'); + throw new Error('Invalid license'); } - throw new DuplicatedLicenseError(); + /** + * The license can be set with future minimum date, failing during the first set, + * but if the user tries to set the same license again later it can be valid or not, so we need to check it again + */ + if (this.hasValidLicense()) { + throw new DuplicatedLicenseError(); + } } if (!isReadyForValidation.call(this)) { From 7433545a8c49cad92866d7545b4af0fca20c4651 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Wed, 22 Nov 2023 19:08:25 -0300 Subject: [PATCH 25/76] regression: Cloud communication (#31055) --- apps/meteor/client/views/cloud/CloudAnnouncementHandler.tsx | 3 +++ apps/meteor/client/views/cloud/CloudAnnouncementsRegion.tsx | 2 ++ 2 files changed, 5 insertions(+) diff --git a/apps/meteor/client/views/cloud/CloudAnnouncementHandler.tsx b/apps/meteor/client/views/cloud/CloudAnnouncementHandler.tsx index c2fef93c6f29..c345188d0873 100644 --- a/apps/meteor/client/views/cloud/CloudAnnouncementHandler.tsx +++ b/apps/meteor/client/views/cloud/CloudAnnouncementHandler.tsx @@ -12,6 +12,9 @@ const CloudAnnouncementHandler = ({ dictionary = {}, surface, view }: CloudAnnou useEffect(() => { const appNs = `app-cloud-announcements-core`; + if (!dictionary) { + return; + } for (const [language, translations] of Object.entries(dictionary)) { i18n.addResources(language, appNs, translations); diff --git a/apps/meteor/client/views/cloud/CloudAnnouncementsRegion.tsx b/apps/meteor/client/views/cloud/CloudAnnouncementsRegion.tsx index 7f08fb3f83ae..69510848111c 100644 --- a/apps/meteor/client/views/cloud/CloudAnnouncementsRegion.tsx +++ b/apps/meteor/client/views/cloud/CloudAnnouncementsRegion.tsx @@ -14,6 +14,8 @@ const CloudAnnouncementsRegion = () => { queryFn: () => getAnnouncements(), select: (data) => data.announcements, enabled: !!uid, + staleTime: 0, + refetchInterval: 1000 * 60 * 5, }); if (!isSuccess) { From 48699e49e40c22d59183c8783a3b1e833a819f95 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Wed, 22 Nov 2023 19:24:38 -0300 Subject: [PATCH 26/76] chore: remove seats cap banner (#31047) Co-authored-by: Rodrigo Nascimento --- .../ee/app/license/server/maxSeatsBanners.ts | 110 ---------------- apps/meteor/ee/server/startup/index.ts | 1 - apps/meteor/ee/server/startup/seatsCap.ts | 119 ------------------ .../rocketchat-i18n/i18n/ar.i18n.json | 11 -- .../rocketchat-i18n/i18n/ca.i18n.json | 7 -- .../rocketchat-i18n/i18n/cs.i18n.json | 4 - .../rocketchat-i18n/i18n/da.i18n.json | 4 - .../rocketchat-i18n/i18n/de-IN.i18n.json | 92 +++++++------- .../rocketchat-i18n/i18n/de.i18n.json | 30 ----- .../rocketchat-i18n/i18n/en.i18n.json | 4 +- .../rocketchat-i18n/i18n/es.i18n.json | 7 -- .../rocketchat-i18n/i18n/fa.i18n.json | 1 - .../rocketchat-i18n/i18n/fi.i18n.json | 44 ------- .../rocketchat-i18n/i18n/fr.i18n.json | 11 -- .../rocketchat-i18n/i18n/hu.i18n.json | 30 ----- .../rocketchat-i18n/i18n/ja.i18n.json | 7 -- .../rocketchat-i18n/i18n/ka-GE.i18n.json | 2 - .../rocketchat-i18n/i18n/km.i18n.json | 2 - .../rocketchat-i18n/i18n/ko.i18n.json | 4 - .../rocketchat-i18n/i18n/lo.i18n.json | 2 - .../rocketchat-i18n/i18n/lv.i18n.json | 2 - .../rocketchat-i18n/i18n/nl.i18n.json | 11 -- .../rocketchat-i18n/i18n/no.i18n.json | 2 - .../rocketchat-i18n/i18n/pl.i18n.json | 15 --- .../rocketchat-i18n/i18n/pt-BR.i18n.json | 12 -- .../rocketchat-i18n/i18n/ru.i18n.json | 15 --- .../rocketchat-i18n/i18n/sk-SK.i18n.json | 1 - .../rocketchat-i18n/i18n/sv.i18n.json | 44 ------- .../rocketchat-i18n/i18n/uk.i18n.json | 1 - .../rocketchat-i18n/i18n/zh-TW.i18n.json | 5 - .../rocketchat-i18n/i18n/zh.i18n.json | 4 - 31 files changed, 43 insertions(+), 561 deletions(-) delete mode 100644 apps/meteor/ee/app/license/server/maxSeatsBanners.ts delete mode 100644 apps/meteor/ee/server/startup/seatsCap.ts diff --git a/apps/meteor/ee/app/license/server/maxSeatsBanners.ts b/apps/meteor/ee/app/license/server/maxSeatsBanners.ts deleted file mode 100644 index c94ee41248bf..000000000000 --- a/apps/meteor/ee/app/license/server/maxSeatsBanners.ts +++ /dev/null @@ -1,110 +0,0 @@ -import { Banner } from '@rocket.chat/core-services'; -import type { IBanner } from '@rocket.chat/core-typings'; -import { BannerPlatform } from '@rocket.chat/core-typings'; -import { Meteor } from 'meteor/meteor'; - -import { i18n } from '../../../../server/lib/i18n'; - -const WARNING_BANNER_ID = 'closeToSeatsLimit'; -const DANGER_BANNER_ID = 'reachedSeatsLimit'; - -const makeWarningBanner = (seats: number): IBanner => ({ - _id: WARNING_BANNER_ID, - platform: [BannerPlatform.Web], - roles: ['admin'], - view: { - icon: 'warning', - variant: 'warning', - viewId: WARNING_BANNER_ID, - appId: 'banner-core', - blocks: [ - { - type: 'section', - blockId: 'attention', - text: { - type: 'mrkdwn', - text: i18n.t('Close_to_seat_limit_banner_warning', { - seats, - url: Meteor.absoluteUrl('/requestSeats'), - }), - }, - }, - ], - }, - createdBy: { - _id: 'rocket.cat', - username: 'rocket.cat', - }, - expireAt: new Date(8640000000000000), - startAt: new Date(), - createdAt: new Date(), - _updatedAt: new Date(), - active: false, -}); - -const makeDangerBanner = (): IBanner => ({ - _id: DANGER_BANNER_ID, - platform: [BannerPlatform.Web], - roles: ['admin'], - view: { - icon: 'ban', - variant: 'danger', - viewId: DANGER_BANNER_ID, - appId: 'banner-core', - blocks: [ - { - type: 'section', - blockId: 'attention', - text: { - type: 'mrkdwn', - text: i18n.t('Reached_seat_limit_banner_warning', { - url: Meteor.absoluteUrl('/requestSeats'), - }), - }, - }, - ], - }, - createdBy: { - _id: 'rocket.cat', - username: 'rocket.cat', - }, - expireAt: new Date(8640000000000000), - startAt: new Date(), - createdAt: new Date(), - _updatedAt: new Date(), - active: false, -}); - -export const createSeatsLimitBanners = async (): Promise => { - const [warning, danger] = await Promise.all([Banner.getById(WARNING_BANNER_ID), Banner.getById(DANGER_BANNER_ID)]); - if (!warning) { - await Banner.create(makeWarningBanner(0)); - } - if (!danger) { - await Banner.create(makeDangerBanner()); - } -}; - -export async function enableDangerBanner() { - await Banner.enable(DANGER_BANNER_ID, makeDangerBanner()); -} - -export const disableDangerBannerDiscardingDismissal = async (): Promise => { - const banner = await Banner.getById(DANGER_BANNER_ID); - if (banner?.active) { - await Banner.disable(DANGER_BANNER_ID); - await Banner.discardDismissal(DANGER_BANNER_ID); - } -}; - -export async function enableWarningBanner(seatsLeft: number) { - await Banner.enable(WARNING_BANNER_ID, makeWarningBanner(seatsLeft)); -} - -export async function disableWarningBannerDiscardingDismissal() { - const banner = await Banner.getById(WARNING_BANNER_ID); - if (banner?.active) { - await Banner.disable(WARNING_BANNER_ID); - await Banner.discardDismissal(WARNING_BANNER_ID); - } -} diff --git a/apps/meteor/ee/server/startup/index.ts b/apps/meteor/ee/server/startup/index.ts index e2f2d2d38287..598c520b50c7 100644 --- a/apps/meteor/ee/server/startup/index.ts +++ b/apps/meteor/ee/server/startup/index.ts @@ -4,7 +4,6 @@ import './audit'; import './deviceManagement'; import './engagementDashboard'; import './maxRoomsPerGuest'; -import './seatsCap'; import './services'; import './upsell'; import { api } from '@rocket.chat/core-services'; diff --git a/apps/meteor/ee/server/startup/seatsCap.ts b/apps/meteor/ee/server/startup/seatsCap.ts deleted file mode 100644 index d5762e5e9c13..000000000000 --- a/apps/meteor/ee/server/startup/seatsCap.ts +++ /dev/null @@ -1,119 +0,0 @@ -import type { IUser } from '@rocket.chat/core-typings'; -import { License } from '@rocket.chat/license'; -import { Users } from '@rocket.chat/models'; -import { Meteor } from 'meteor/meteor'; -import { throttle } from 'underscore'; - -import { callbacks } from '../../../lib/callbacks'; -import { i18n } from '../../../server/lib/i18n'; -import { validateUserRoles } from '../../app/authorization/server/validateUserRoles'; -import { - createSeatsLimitBanners, - disableDangerBannerDiscardingDismissal, - disableWarningBannerDiscardingDismissal, - enableDangerBanner, - enableWarningBanner, -} from '../../app/license/server/maxSeatsBanners'; - -callbacks.add( - 'onCreateUser', - async ({ isGuest }: { isGuest: boolean }) => { - if (isGuest) { - return; - } - - if (await License.shouldPreventAction('activeUsers')) { - throw new Meteor.Error('error-license-user-limit-reached', i18n.t('error-license-user-limit-reached')); - } - }, - callbacks.priority.MEDIUM, - 'check-max-user-seats', -); - -callbacks.add( - 'beforeUserImport', - async ({ userCount }) => { - if (await License.shouldPreventAction('activeUsers', userCount)) { - throw new Meteor.Error('error-license-user-limit-reached', i18n.t('error-license-user-limit-reached')); - } - }, - callbacks.priority.MEDIUM, - 'check-max-user-seats', -); - -callbacks.add( - 'beforeActivateUser', - async (user: IUser) => { - if (user.roles.length === 1 && user.roles.includes('guest')) { - return; - } - - if (user.type === 'app') { - return; - } - - if (await License.shouldPreventAction('activeUsers')) { - throw new Meteor.Error('error-license-user-limit-reached', i18n.t('error-license-user-limit-reached')); - } - }, - callbacks.priority.MEDIUM, - 'check-max-user-seats', -); - -callbacks.add( - 'validateUserRoles', - async (userData: Partial) => validateUserRoles(userData), - callbacks.priority.MEDIUM, - 'check-max-user-seats', -); - -const handleMaxSeatsBanners = throttle(async function _handleMaxSeatsBanners() { - const maxActiveUsers = License.getMaxActiveUsers(); - - await License.shouldPreventAction('activeUsers'); - - if (!maxActiveUsers) { - await disableWarningBannerDiscardingDismissal(); - await disableDangerBannerDiscardingDismissal(); - return; - } - - const activeUsers = await Users.getActiveLocalUserCount(); - - // callback runs before user is added, so we should add the user - // that is being created to the current value. - const ratio = activeUsers / maxActiveUsers; - const seatsLeft = maxActiveUsers - activeUsers; - - if (ratio < 0.8 || ratio >= 1) { - await disableWarningBannerDiscardingDismissal(); - } else { - await enableWarningBanner(seatsLeft); - } - - if (ratio < 1) { - await disableDangerBannerDiscardingDismissal(); - } else { - await enableDangerBanner(); - } -}, 10000); - -callbacks.add('afterCreateUser', handleMaxSeatsBanners, callbacks.priority.MEDIUM, 'handle-max-seats-banners'); - -callbacks.add('afterSaveUser', handleMaxSeatsBanners, callbacks.priority.MEDIUM, 'handle-max-seats-banners'); - -callbacks.add('afterDeleteUser', handleMaxSeatsBanners, callbacks.priority.MEDIUM, 'handle-max-seats-banners'); - -callbacks.add('afterDeactivateUser', handleMaxSeatsBanners, callbacks.priority.MEDIUM, 'handle-max-seats-banners'); - -callbacks.add('afterActivateUser', handleMaxSeatsBanners, callbacks.priority.MEDIUM, 'handle-max-seats-banners'); - -callbacks.add('afterUserImport', handleMaxSeatsBanners, callbacks.priority.MEDIUM, 'handle-max-seats-banners'); - -Meteor.startup(async () => { - await createSeatsLimitBanners(); - - await handleMaxSeatsBanners(); - - License.onValidateLicense(handleMaxSeatsBanners); -}); diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ar.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ar.i18n.json index 114c0ada54bb..d3603a98aa3e 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/ar.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/ar.i18n.json @@ -449,7 +449,6 @@ "Apply": "تطبيق", "Apply_and_refresh_all_clients": "التطبيق وتحديث جميع العملاء", "Apps": "التطبيقات", - "Apps_context_enterprise": "مؤسسة", "Apps_context_installed": "تم التثبيت", "Apps_Engine_Version": "إصدار محرك التطبيقات", "Apps_Essential_Alert": "هذا التطبيق ضروري للأحداث التالية:", @@ -840,7 +839,6 @@ "Close": "إغلاق", "Close_chat": "إغلاق الدردشة", "Close_room_description": "إنك توشك على إغلاق هذه الدردشة. هل تريد فعلاً المتابعة؟", - "Close_to_seat_limit_banner_warning": "*تبقى لديك [{{seats}}] من المقاعد* \nتقترب مساحة العمل هذه من حد المقاعد الخاص بها. بمجرد استيفاء الحد، لا يمكن إضافة أعضاء جدد. *‎[Request More Seats]({{url}})‎*", "Close_to_seat_limit_warning": "لا يمكن إنشاء أعضاء جدد بمجرد استيفاء حد المقاعد.", "close-livechat-room": "إغلاق Room القناة متعددة الاتجاهات", "close-livechat-room_description": "إذن لإغلاق غرفة القناة متعددة الاتجاهات الحالية", @@ -875,8 +873,6 @@ "Cloud_register_offline_finish_helper": "بعد الانتهاء من عملية التسجيل في وحدة التحكم السحابية، يجب عرض بعض النصوص عليك. يُرجى لصقها هنا لإنهاء التسجيل.", "Cloud_register_offline_helper": "يمكن تسجيل مساحات العمل يدويًا إذا كانت معزولة بفجوة هواء أو تم تقييد الوصول إلى الشبكة. انسخ النص أدناه وانتقل إلى وحدة التحكم السحابية لإكمال العملية.", "Cloud_register_success": "تم تسجيل مساحة العمل الخاصة بك بنجاح!", - "Cloud_registration_pending_html": "لن تعمل الإشعارات المنبثقة حتى يتم الانتهاء من التسجيل. تعرف على المزيد ", - "Cloud_registration_pending_title": "التسجيل السحابي لا يزال معلقًا", "Cloud_registration_required": "التسجيل مطلوب", "Cloud_registration_required_description": "يبدو أنك لم تختر تسجيل مساحة العمل الخاصة بك أثناء الإعداد.", "Cloud_registration_required_link_text": "انقر هنا لتسجيل مساحة العمل الخاصة بك.", @@ -1627,8 +1623,6 @@ "Enter_Normal": "الوضع العادي (إرسال باستخدام إنتر)", "Enter_to": "إدخال إلى", "Enter_your_E2E_password": "أدخل كلمة مرور التشفير بين الطرفيات", - "Enterprise_License": "ترخيص المؤسسة", - "Enterprise_License_Description": "إذا تم تسجيل مساحة العمل الخاصة بك وتم توفير الترخيص بواسطة Rocket.Chat Cloud، فلن تحتاج إلى تحديث الترخيص يدويًا هنا.", "Entertainment": "الترفيه", "Error": "خطأ", "Error_something_went_wrong": "أُووبس! هناك خطأ ما. يرجى إعادة تحميل الصفحة أو الاتصال بالمسؤول.", @@ -3418,7 +3412,6 @@ "Random": "عشوائي", "Rate_Limiter_Limit_RegisterUser": "مكالمات الرقم الافتراضي إلى محدد المعدل لتسجيل المستخدم", "Rate_Limiter_Limit_RegisterUser_Description": "عدد المكالمات الافتراضية لنقاط النهاية الخاصة بتسجيل المستخدم (REST وواجهة برمجة التطبيقات في الوقت الفعلي)، المسموح بها ضمن النطاق الزمني المحدد في قسم محدِّد معدل واجهة برمجة التطبيقات.", - "Reached_seat_limit_banner_warning": "*لا يتوافر المزيد من المقاعد* \nوصلت مساحة العمل هذه إلى الحد الأقصى لعدد المقاعد المخصصة لها لذلك لا يمكن لأعضاء آخرين الانضمام. *[طلب المزيد من المقاعد]({{url}})*", "React_when_read_only": "السماح بالتفاعل", "React_when_read_only_changed_successfully": "السماح بالتفاعل عند تغيير وضع القراءة فقط بنجاح", "Reacted_with": "تم التفاعل مع", @@ -4376,10 +4369,6 @@ "Update_to_version": "التحديث إلى {{version}}", "Update_your_RocketChat": "تحديث Rocket.Chat الخاص بك", "Updated_at": "تم التحديث في ", - "Upgrade_tab_connection_error_description": "يبدو أنه ليس لديك اتصال بالإنترنت. قد يكون هذا بسبب أن مساحة العمل الخاصة بك مثبتة على خادم مؤمن بالكامل ومفصول.", - "Upgrade_tab_connection_error_restore": "قم باستعادة الاتصال الخاص بك للتعرف على الميزات التي فاتتك.", - "Upgrade_tab_go_fully_featured": "انتقل إلى الميزات الكاملة", - "Upgrade_tab_trial_guide": "دليل التجربة", "Upgrade_tab_upgrade_your_plan": "قم بترقية اشتراكك", "Upload": "تحميل", "Uploads": "تحميلات", diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ca.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ca.i18n.json index 66a5f4e1a567..8c82d5cc56b7 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/ca.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/ca.i18n.json @@ -449,7 +449,6 @@ "Apply": "Aplicar", "Apply_and_refresh_all_clients": "Aplicar i refrescar tots els clients", "Apps": "Aplicacions", - "Apps_context_enterprise": "Empresa", "Apps_context_installed": "Instal·lat", "Apps_Engine_Version": "Versió del Motor d'Aplicacions", "Apps_Essential_Alert": "Aquesta aplicació és essencial per als següents esdeveniments:", @@ -835,7 +834,6 @@ "Close": "Tanca", "Close_chat": "Tancar xat", "Close_room_description": "Esteu a punt de tancar aquest xat. Esteu segur que voleu continuar?", - "Close_to_seat_limit_banner_warning": "* Et queden [{{seats}}] llocs * \nAquest espai de treball s'acosta al seu límit de llocs. Una vegada que s'aconsegueix el límit, no es poden afegir nous membres. * [Sol·licitar més llocs] ({{url}}) *", "Close_to_seat_limit_warning": "No es poden crear nous membres una vegada que s'arriba al límit de seients.", "close-livechat-room": "Tancar Room de Livechat", "close-livechat-room_description": "Permís per tancar la sala d'LiveChat actual", @@ -870,8 +868,6 @@ "Cloud_register_offline_finish_helper": "Després de completar el procés de registre en Cloud Console, hauria d'aparèixer un text. Enganxeu-lo aquí per finalitzar el registre.", "Cloud_register_offline_helper": "Els espais de treball es poden registrar manualment si restringiu l'accés a la xarxa o l'espai d'aire. Copieu el text a continuació i aneu a la nostra consola al núvol per completar el procés.", "Cloud_register_success": "El seu espai de treball s'ha registrat correctament!", - "Cloud_registration_pending_html": " Les notificacions en dispositius mòbils no funcionessin fins que el registre hagi finalitzat. Llegir més ", - "Cloud_registration_pending_title": "El registre en el núvol encara està pendent", "Cloud_registration_required": "Cal registrar-se", "Cloud_registration_required_description": "Sembla que durant la configuració no va triar registrar el seu espai de treball.", "Cloud_registration_required_link_text": "Feu clic aquí per registrar el vostre espai de treball.", @@ -1618,8 +1614,6 @@ "Enter_Normal": "Mode normal (envia amb Enter)", "Enter_to": "Entra a", "Enter_your_E2E_password": "Introduïu la vostra contrasenya E2E", - "Enterprise_License": "Llicència d’empresa", - "Enterprise_License_Description": "Si el vostre espai de treball està registrat i la llicència la proporciona Rocket.Chat Cloud, no cal que actualitzeu manualment la llicència aquí.", "Entertainment": "Entreteniment", "Error": "Error", "Error_404": "Error: 404", @@ -3374,7 +3368,6 @@ "Random": "Aleatori", "Rate_Limiter_Limit_RegisterUser": "Trucades de números predeterminats al limitador de velocitat per registrar un usuari", "Rate_Limiter_Limit_RegisterUser_Description": "Nombre de trucades predeterminades per a usuaris que registren punts finals (REST i API en temps real), permeses dins del rang de temps definit a la secció API Rate Limiter.", - "Reached_seat_limit_banner_warning": "* No hi ha més llocs disponibles * \nAquest espai de treball ha arribat al seu límit de llocs, per la qual cosa no poden unir-se més membres. * [Sol·licitar més llocs] ({{url}}) *", "React_when_read_only": "Permetre reaccions", "React_when_read_only_changed_successfully": "Permetre reaccions en 'només lectura'", "Reacted_with": "es fa reaccionar amb", diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/cs.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/cs.i18n.json index 05272cf33219..d807b49264df 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/cs.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/cs.i18n.json @@ -713,8 +713,6 @@ "Cloud_register_offline_finish_helper": "Po dokončení procesu registrace v cloudové konzoli obdržíte textový řežězec. Pro dokončení registrace jej vložte sem.", "Cloud_register_offline_helper": "Pracovní prostory lze ručně zaregistrovat, pokud je k nim omezen síťový přístup. Zkopírujte níže uvedený text a dokončete proces pomocí naší cloudové konzole.", "Cloud_register_success": "Váš pracovní prostor byl úspěšně zaregistrován!", - "Cloud_registration_pending_html": "Mobilní oznámení nebudou fungovat, dokud není registrace dokončena. Další informace ", - "Cloud_registration_pending_title": "Cloudová registrace stále čeká", "Cloud_registration_required": "Povinná registrace", "Cloud_registration_required_description": "Vypadá to, že jste se nevybral/a zaregistraci svého pracovního prostoru během instalace .", "Cloud_registration_required_link_text": "Klikněte zde pro registraci svého pracovního prostoru.", @@ -1372,8 +1370,6 @@ "Enter_Normal": "Normální mód (odeslání po stisku klávesy enter)", "Enter_to": "Enter", "Enter_your_E2E_password": "Zadejte heslo E2E", - "Enterprise_License": "Enterprise licence", - "Enterprise_License_Description": "Pokud je vaše prostředí registrováno a máte od Rocket.Chat licenci není potřeba ji zde ručně doplňovat", "Entertainment": "Zábava", "Error": "Chyba", "Error_404": "Chyba: 404 nenalezeno", diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/da.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/da.i18n.json index d076c14497ea..34efd76e20d8 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/da.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/da.i18n.json @@ -717,8 +717,6 @@ "Cloud_register_offline_finish_helper": "Efter afslutningen af registreringsprocessen i Cloud Console, skal du præsenteres for noget tekst. Indsæt det her for at afslutte registreringen.", "Cloud_register_offline_helper": "Arbejdsområder kan registreres manuelt, hvis der ikke er netværksadgang eller den er begrænset. Kopier teksten nedenfor og gå til vores Cloud Console for at afslutte processen.", "Cloud_register_success": "Dit workspace er blevet registreret!", - "Cloud_registration_pending_html": " Mobil-notifikationer fungerer ikke før registreringen er afsluttet. Lær mere ", - "Cloud_registration_pending_title": "Cloudregistrering afventer stadig", "Cloud_registration_required": "Registrering er påkrævet", "Cloud_registration_required_description": "Under opsætningen valgte du tilsyneladende ikke at registrere dit workspace.", "Cloud_registration_required_link_text": "Tryk her for at registrere dit workspace.", @@ -1380,8 +1378,6 @@ "Enter_Normal": "Normal mode (send med Enter)", "Enter_to": "Indtast til", "Enter_your_E2E_password": "Indtast din E2E adgangskode", - "Enterprise_License": "Koncernlicens", - "Enterprise_License_Description": "Hvis dit workspace er registreret og en licens er tildelt af Rocket.Chat Cloud, behøver du ikke manuelt at opdatere licensen her", "Entertainment": "Underholdning", "Error": "Fejl", "Error_404": "Fejl: 404", diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/de-IN.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/de-IN.i18n.json index 3c23a5db9968..83c76f7c1882 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/de-IN.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/de-IN.i18n.json @@ -192,8 +192,10 @@ "Accounts_TwoFactorAuthentication_MaxDelta_Description": "Das maximale Delta bestimmt, wie viele Token zu einem bestimmten Zeitpunkt gültig sind. Token werden alle 30 Sekunden generiert und gelten für (30 * Maximum Delta) Sekunden. \nBeispiel: Wenn ein maximales Delta auf 10 gesetzt ist, kann jedes Token bis zu 300 Sekunden vor oder nach dem Zeitstempel verwendet werden. Dies ist nützlich, wenn die Uhr des Clients nicht richtig mit dem Server synchronisiert ist.", "Accounts_UseDefaultBlockedDomainsList": "Standardliste für blockierte Domains verwenden", "Accounts_UseDNSDomainCheck": "DNS-Domain-Check verwenden", + "API_EmbedDisabledFor": "Einbettungen für Benutzer deaktivieren", "Accounts_UserAddedEmail_Default": "

Willkommen zu [Site_Name]

Besuche [Site_URL] und probiere noch heute die beste Open-Source-Chat-Lösung aus.

Du kannst Dich mit den folgenden Daten anmelden: E-Mail-Adresse: [email] Passwort: [password]Es kann sein, dass Du Dein Passwort nach der ersten Anmeldung ändern musst.", "Accounts_UserAddedEmail_Description": "Du kannst folgenden Platzhalter verwenden: \n - `[name]`, `[fname]`, `[lname]` für den vollständigen Namen des Benutzers, Vornamen oder Nachnamen. \n - [email] für die E-Mail-Adresse des Benutzers. \n - [password] für das Kennwort des Benutzers. \n - [Site_Name] und `[Site_URL]` für den Anwendungsname und die URL. ", + "API_EmbedDisabledFor_Description": "Kommaseparierte Liste von Benutzernamen zum Einbetten von Link-Vorschauen", "Accounts_UserAddedEmailSubject_Default": "Du wurdest zu [Site_Name] hinzugefügt", "Activate": "Aktivieren", "Activity": "Aktivität", @@ -217,6 +219,7 @@ "add-user-to-any-p-room_description": "Berechtigung, Benutzer jedem privaten Kanal hinzuzufügen", "add-user-to-joined-room": "Benutzer jedem beigetretenen Kanal hinzufügen", "add-user-to-joined-room_description": "Berechtigung, Benutzer jedem beigetretenen Kanal hinzuzufügen", + "Apps_Framework_enabled": "Das App Framework aktivieren", "Adding_OAuth_Services": "Hinzufügen von OAuth-Services", "Adding_permission": "Berechtigung hinzufügen", "Adding_user": "Füge BenutzerIn hinzu", @@ -236,11 +239,20 @@ "Alias_Format": "Alias-Format", "Alias_Format_Description": "Nachricht von Slack mit einem Alias importieren; %s wird mit dem Benutzernamen ersetzt. Wenn Feld leer bleibt, wird kein Alias benutzt.", "Alias_Set": "Alias setzen", + "AutoLinker_Email": "AutoLinker für E-Mail-Adressen", "Aliases": "Aliase", + "AutoLinker_Phone": "AutoLinker für Telefonnummern", + "AutoLinker_Phone_Description": "Telefonnummern automatisch verlinken. z.B. `(123) 456-7890`", "All": "Alle", + "AutoLinker_StripPrefix": "AutoLinker Präfix entfernen", + "AutoLinker_StripPrefix_Description": "Kurze Anzeige. z.B. https://rocket.chat => rocket.chat", "All_added_tokens_will_be_required_by_the_user": "Alle hinzugefügten Tokens werden vom Benutzer verlangt werden", + "AutoLinker_Urls_Scheme": "Schema des AutoLinkers: // URLs", "All_channels": "Alle Kanäle", + "AutoLinker_Urls_TLD": "AutoLinker TLD-URLs", + "AutoLinker_Urls_www": "AutoLinker \"www\"-URLs", "All_logs": "Alle Protokolle", + "AutoLinker_UrlsRegExp": "AutoLinker RegExp für URLs", "All_messages": "Alle Nachrichten", "All_users": "Alle Benutzer", "All_users_in_the_channel_can_write_new_messages": "Alle Benutzer in diesem Kanal dürfen Nachrichten schreiben", @@ -252,6 +264,7 @@ "Allow_switching_departments": "Erlaube Besuchern, Abteilungen zu wechseln", "Almost_done": "Fast geschafft", "Alphabetical": "alphabetisch", + "bold": "fett", "Always_open_in_new_window": "Immer in neuem Fenster öffnen", "Analytics": "Analytics", "Analytics_features_enabled": "Aktivierte Funktionen", @@ -276,14 +289,12 @@ "API_Drupal_URL_Description": "Beispiel: https://domain.de (ohne abschließenden /)", "API_Embed": "Link-Vorschauen einbetten", "API_Embed_Description": "Eingebettete Link-Vorschau für Links, die von Benutzern gepostet wurden.", - "API_Embed_UserAgent": "User Agent des Requests übermitteln", - "API_EmbedCacheExpirationDays": "Tage bis zum Ablauf den eingebetteten Caches", - "API_EmbedDisabledFor": "Einbettungen für Benutzer deaktivieren", - "API_EmbedDisabledFor_Description": "Kommaseparierte Liste von Benutzernamen zum Einbetten von Link-Vorschauen", "API_EmbedIgnoredHosts": "Einbettungen für Hosts deaktivieren", "API_EmbedIgnoredHosts_Description": "Kommagetrennte Liste von Hosts oder CIDR-Adressen, z. B. localhost, 127.0.0.1, 10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16", "API_EmbedSafePorts": "Sichere Ports", "API_EmbedSafePorts_Description": "Kommagetrennte Liste der Ports, für die eine Vorschau erlaubt ist.", + "API_Embed_UserAgent": "User Agent des Requests übermitteln", + "API_EmbedCacheExpirationDays": "Tage bis zum Ablauf den eingebetteten Caches", "API_Enable_CORS": "CORS", "API_Enable_Direct_Message_History_EndPoint": "Endpunkt für den Verlauf von Direktnachrichten", "API_Enable_Direct_Message_History_EndPoint_Description": "Aktiviere `/api/v1/im.history.others`. Hierüber ist es möglich, Direktnachrichten einzusehen, an denen der Benutzer nicht beteiligt ist.", @@ -309,7 +320,9 @@ "API_Personal_Access_Tokens_To_REST_API": "Persönlicher Zugangsschlüssel für die REST API", "API_Shield_Types": "Shield Typen", "API_Shield_Types_Description": "Shield Typen. Konfiguration mit einer komma-separierten Liste. Optionen: `online`, `channel` oder `*` für \"Alles\"", + "Apps_Framework_Development_Mode": "Entwicklungsmodus aktivieren", "API_Token": "API-Token", + "Apps_Framework_Development_Mode_Description": "Im Entwicklungsmodus können Apps installiert werden, die nicht vom Rocketchat Marketplace stammen.", "API_Tokenpass_URL": "Url des Tokenpass Servers", "API_Tokenpass_URL_Description": "Beispiel: `https://domain.com` (ohne Schrägstrich am Ende)", "API_Upper_Count_Limit": "Maximales Limit", @@ -343,12 +356,10 @@ "Apply_and_refresh_all_clients": "Anwenden und alle Clients aktualisieren", "Apps": "Apps", "Apps_Engine_Version": "Version der Anwendungsumgebung", - "Apps_Framework_Development_Mode": "Entwicklungsmodus aktivieren", - "Apps_Framework_Development_Mode_Description": "Im Entwicklungsmodus können Apps installiert werden, die nicht vom Rocketchat Marketplace stammen.", - "Apps_Framework_enabled": "Das App Framework aktivieren", "Apps_Marketplace_Login_Required_Description": "Um Apps aus dem Rocket.Chat Marketplace herunterladen zu können, muss der Arbeitsbereich registriert sein.", "Apps_Marketplace_Login_Required_Title": "Marketplace Login benötigt", "Apps_Settings": "App-Einstellungen", + "AutoLinker": "Auto Linker", "Apps_WhatIsIt": "Apps: Was ist das?", "Apps_WhatIsIt_paragraph1": "Ein neues Icon im Administrationsbereich! Was bedeutet das und was sind Apps?", "Apps_WhatIsIt_paragraph2": "Zunächst einmal beziehen sich Apps in diesem Zusammenhang nicht auf die mobilen Anwendungen. Tatsächlich wäre es am besten, sie in Form von Plugins oder fortgeschrittenen Integrationen zu betrachten.", @@ -387,16 +398,6 @@ "Auto_Translate": "Automatische Übersetzung", "auto-translate": "Automatische Übersetzung", "auto-translate_description": "Berechtigung, die automatische Überstzung zu verwenden", - "AutoLinker": "Auto Linker", - "AutoLinker_Email": "AutoLinker für E-Mail-Adressen", - "AutoLinker_Phone": "AutoLinker für Telefonnummern", - "AutoLinker_Phone_Description": "Telefonnummern automatisch verlinken. z.B. `(123) 456-7890`", - "AutoLinker_StripPrefix": "AutoLinker Präfix entfernen", - "AutoLinker_StripPrefix_Description": "Kurze Anzeige. z.B. https://rocket.chat => rocket.chat", - "AutoLinker_Urls_Scheme": "Schema des AutoLinkers: // URLs", - "AutoLinker_Urls_TLD": "AutoLinker TLD-URLs", - "AutoLinker_Urls_www": "AutoLinker \"www\"-URLs", - "AutoLinker_UrlsRegExp": "AutoLinker RegExp für URLs", "Automatic_Translation": "Automatische Übersetzung", "AutoTranslate": "Automatische Übersetzung", "AutoTranslate_APIKey": "API Key", @@ -437,7 +438,6 @@ "Blockstack_ButtonLabelText": "Text des Button-Labels", "Blockstack_Generate_Username": "Benutzernamen generieren", "Body": "Textkörper", - "bold": "fett", "bot_request": "Bot-Anfrage", "BotHelpers_userFields": "Benutzerfelder", "BotHelpers_userFields_Description": "CSV-Datei mit Benutzerfeldern die von Bot-Methoden genutzt werden dürfen.", @@ -801,6 +801,7 @@ "Country_Saudi_Arabia": "Saudi Arabien", "Country_Senegal": "Senegal", "Country_Serbia_and_Montenegro": "Serbien und Montenegro", + "inline_code": "Code", "Country_Seychelles": "Seychellen", "Country_Sierra_Leone": "Sierra Leone", "Country_Singapore": "Singapur", @@ -900,7 +901,6 @@ "Custom_Sound_Has_Been_Deleted": "Der eigene Ton wurde gelöscht.", "Custom_Sound_Info": "Info zu eigenen Tönen", "Custom_Sound_Saved_Successfully": "Der eigene Ton wurde erfolgreich gespeichert", - "Custom_Sounds": "Benutzerdefinierte Töne", "Custom_Translations": "Benutzerdefinierte Übersetzungen", "Custom_Translations_Description": "Ein gültiges JSON, in dem die Schlüssel Sprachkürzel sind, die wiederum Tupel von Schlüssel und Übersetzungen enthalten. Beispiel: \n `{\"en\": {\"Channels\": \"Rooms\"},\"pt\": {\"Channels\": \"Salas\"}}`", "Customize": "anpassen", @@ -967,6 +967,7 @@ "Desktop_Notifications_Enabled": "Desktop-Benachrichtigungen sind aktiviert.", "Desktop_Notifications_Not_Enabled": "Desktopbenachrichtigungen sind nicht aktiviert", "Details": "Details", + "line": "Zeile", "Different_Style_For_User_Mentions": "Anderer Stil für Benutzer-Erwähnungen", "Direct_message_someone": "Jemandem eine Direktnachricht schicken", "Direct_Messages": "Direktnachrichten", @@ -1030,12 +1031,22 @@ "Dry_run": "Probelauf", "Dry_run_description": "Es wird nur eine E-Mail an die Adresse aus dem Feld \"Absender\" geschickt. Die E-Mail-Adresse muss zu einem gültigen Benutzer gehören.", "Duplicate_archived_channel_name": "Ein archivierter Kanal mit dem Namen '%s' existiert bereits.", + "Markdown_Headers": "Markdown-Überschriften", + "Markdown_Marked_Breaks": "Formatierte Umbrüche", "Duplicate_archived_private_group_name": "Eine archivierter private Gruppe mit dem Namen '%s' existiert bereits.", "Duplicate_channel_name": "Ein Kanal mit dem Namen '%s' existiert bereits", + "Markdown_Marked_GFM": "Formatierung mit Github Flavoured Markdown (GFM)", + "Markdown_Marked_Pedantic": "Pedantisch Formatieren", + "Markdown_Marked_SmartLists": "Formatierte smarte Listen", "Duplicate_private_group_name": "Eine private Gruppe mit dem Namen '%s' existiert bereits.", + "Markdown_Marked_Smartypants": "Formatiere mit intelligenter Punktsetzung (\"Smartypants\")", "Duplicated_Email_address_will_be_ignored": "Doppelte E-Mail_Adressen werden ignoriert.", + "Markdown_Marked_Tables": "Formatierte Tabellen", "duplicated-account": "Doppeltes Konto", "E2E Encryption": "Ende-zu-Ende-Verschlüsselung", + "Markdown_Parser": "Markdown Parser", + "Markdown_SupportSchemesForLink": "Unterstützte Markdown- Schemata für Links", + "Markdown_SupportSchemesForLink_Description": "Kommata getrennte Liste von erlaubten Schemata", "E2E_Enable_alert": "Dieses Feature ist derzeit im Beta-Test. Bitte melde Fehler unter github.com/RocketChat/Rocket.Chat/issues und beachte folgende Auswirkungen:
- Verschlüsselte Nachrichten werden durch die Suche nicht gefunden werden.
- Die mobilen Apps unterstützen derzeit noch keine verschlüsselten Nachrichten.
- Bots werden wahrscheinlich keine verschlüsselten Nachrichten verarbeiten können.
- Uploads werden in dieser Version nicht verschlüsselt werden.", "E2E_Enable_description": "Aktiviere diese Option, um Direktnachrichten und private Gruppen verschlüsseln zu können.", "E2E_Enabled": "E2E aktiviert", @@ -1045,8 +1056,11 @@ "Edit": "Bearbeiten", "Edit_Custom_Field": "Benutzerdefinierte Felder bearbeiten", "Edit_Department": "Abteilung bearbeiten", + "Message_AllowSnippeting": "Erlauben, Snippets aus Nachrichten zu erstellen", "Edit_previous_message": "`%s` - Bearbeite vorherige Nachricht", "Edit_Trigger": "Trigger bearbeiten", + "Message_Attachments_GroupAttach": "Schaltflächen für Anhänge gruppieren", + "Message_Attachments_GroupAttachDescription": "Dies sorgt dafür, dass die Schaltflächen in einem erweiterbaren Menü untergebracht werden. So wird weniger Bildschirmplatz benötigt.", "edit-message": "Nachricht bearbeiten", "edit-message_description": "Berechtigung, eine Nachricht in einem Raum zu bearbeiten", "edit-other-user-active-status": "Online-Status anderer Benutzer ändern", @@ -1063,10 +1077,13 @@ "edit-room_description": "Berechtigung, einen Raum zu bearbeiten (Name, Thema, Sichtbarkeit, Archivierung)", "edit-room-retention-policy": "Bearbeiten der Aufbewahrungsrichtlinie für Räume", "edit-room-retention-policy_description": "Berechtigung zum Bearbeiten der Aufbewahrungsrichtlinie eines Raums, um darin enthaltene Nachrichten automatisch zu löschen", + "multi_line": "Mehrzeilig", "edited": "bearbeitet", "Editing_room": "Raum bearbeiten", "Editing_user": "BenutzerIn bearbeiten", + "Message_ShowEditedStatus": "Bearbeitungsstatus anzeigen", "Education": "Bildung", + "Message_ShowFormattingTips": "Formatierungshilfe anzeigen", "Email": "E-Mail", "Email_address_to_send_offline_messages": "E-Mail-Adresse zum Senden von Offline-Nachrichten", "Email_already_exists": "Die E-Mail-Adresse existiert bereits.", @@ -1258,6 +1275,7 @@ "FEDERATION_Status": "Status", "FEDERATION_Test_Setup_Error": "Ich konnte Deinen Server mit dieser Konfiguration nicht finden. Bitte überprüfe Deine Einstellungen.", "FEDERATION_Test_Setup_Success": "Dein Föderations-Setup funktioniert - andere Server können diesen Server nun finden!", + "Retry_Count": "Anzahl der Wiederholungsversuche", "Field": "Feld", "Field_removed": "Feld entfernt", "Field_required": "Feld erforderlich", @@ -1362,9 +1380,9 @@ "Full_Screen": "Vollbild", "Gaming": "Spiele", "General": "Allgemeines", - "Get_link": "Link abrufen", "github_no_public_email": "Du hast keine öffentliche E-Mail-Adresse in Deinem GitHub-Account.", "Give_a_unique_name_for_the_custom_oauth": "Gib dem benutzerdefinierten OAuth-Konto einen eindeutigen Namen.", + "strike": "durchgestrichen", "Give_the_application_a_name_This_will_be_seen_by_your_users": "Gib der Anwendung einen Namen. Alle Nutzer können diesen Namen sehen.", "Global": "Global", "Global Policy": "Globale Policy", @@ -1378,7 +1396,10 @@ "Graphql_CORS": "GraphQL CORS", "Graphql_Enabled": "GraphQL aktiviert", "Graphql_Subscription_Port": "GraphQL Subscription Port", + "Snippet_Messages": "Nachrichten-Snippets", "Group_by_Type": "Gruppieren nach Typ", + "snippet-message": "Nachrichten-Snippet", + "snippet-message_description": "Berechtigung, ein Nachrichten-Snippet zu erstellen", "Group_discussions": "Gruppendiskussionen", "Group_favorites": "Gruppenfavoriten", "Group_mentions_disabled_x_members": "Die Gruppenerwähnungen `@all` und `@here` wurden für Räume mit mehr als {{total}} Mitgliedern deaktiviert.", @@ -1418,8 +1439,6 @@ "Idle_Time_Limit_Description": "Zeitraum bis sich der Status in away ändert. Der Wert muss in Sekunden angegeben werden.", "if_they_are_from": "(wenn sie von %s sind)", "If_this_email_is_registered": "Wenn es sich um eine registrierte E-Mail-Adresse handelt, werden wir an diese eine Anleitung zum Zurücksetzen des Passworts senden. Solltest Du zeitnah keine E-Mail erhalten, versuche es noch einmal.", - "If_you_are_sure_type_in_your_password": "Wenn Du Dir sicher bist, gib Dein Passwort ein:", - "If_you_are_sure_type_in_your_username": "Wenn Du Dir sicher bist, gib Deinen Benutzernamen ein:", "If_you_didnt_ask_for_reset_ignore_this_email": "Wenn Du das Zurücksetzen des Kennworts nicht angefordert hast, kannst Du diese E-Mail ignorieren.", "Iframe_Integration": "Iframe-Integration", "Iframe_Integration_receive_enable": "Empfang zulassen", @@ -1474,7 +1493,6 @@ "Industry": "Industrie", "Info": "Info", "initials_avatar": "Avatar aus Initialien", - "inline_code": "Code", "Install": "Installieren", "Install_Extension": "Erweiterung installieren", "Install_FxOs": "Rocket.Chat in Deinen Firefox installieren", @@ -1584,7 +1602,6 @@ "IssueLinks_LinkTemplate": "Vorlage für Issue-Verknüpfungen", "IssueLinks_LinkTemplate_Description": "Vorlage für Issue-Verknüpfungen; %s wird mit der Issue-Nummer ersetzt werden.", "It_works": "Es funktioniert", - "italic": "Kursiv", "italics": "kursiv", "Job_Title": "Berufsbezeichnung", "Join_audio_call": "Anruf beitreten", @@ -1751,7 +1768,6 @@ "leave-c": "Kanäle verlassen", "leave-p": "Verlasse private Gruppen", "Lets_get_you_new_one": "Lass mich Ihnen ein neues geben!", - "line": "Zeile", "List_of_Channels": "Liste der Kanäle", "List_of_Direct_Messages": "Liste der Direktnachrichten", "Livechat": "Livechat", @@ -1861,16 +1877,6 @@ "Mark_as_unread": "Als ungelesen markieren", "Mark_read": "Als gelesen markieren", "Mark_unread": "Als ungelesen markieren", - "Markdown_Headers": "Markdown-Überschriften", - "Markdown_Marked_Breaks": "Formatierte Umbrüche", - "Markdown_Marked_GFM": "Formatierung mit Github Flavoured Markdown (GFM)", - "Markdown_Marked_Pedantic": "Pedantisch Formatieren", - "Markdown_Marked_SmartLists": "Formatierte smarte Listen", - "Markdown_Marked_Smartypants": "Formatiere mit intelligenter Punktsetzung (\"Smartypants\")", - "Markdown_Marked_Tables": "Formatierte Tabellen", - "Markdown_Parser": "Markdown Parser", - "Markdown_SupportSchemesForLink": "Unterstützte Markdown- Schemata für Links", - "Markdown_SupportSchemesForLink_Description": "Kommata getrennte Liste von erlaubten Schemata", "Marketplace_view_marketplace": "Marketplace anzeigen", "Max_length_is": "Maximale Länge ist %s", "Media": "Medien", @@ -1897,14 +1903,11 @@ "Message_AllowEditing_BlockEditInMinutesDescription": "Gib 0 ein, um das Bearbeiten von Nachrichten unbegrenzt zu erlauben.", "Message_AllowPinning": "Das Anheften von Nachrichten erlauben", "Message_AllowPinning_Description": "Benutzern das Anheften von Nachrichten in Kanälen erlauben", - "Message_AllowSnippeting": "Erlauben, Snippets aus Nachrichten zu erstellen", "Message_AllowStarring": "Erlaube es, Nachrichten als Favoriten zu markieren", "Message_AllowUnrecognizedSlashCommand": "Unerkannte Slash-Kommandos erlauben", "Message_AlwaysSearchRegExp": "Beim Suchen immer reguläre Ausdrücke verwenden", "Message_AlwaysSearchRegExp_Description": "Wir empfehlen diese Option, wenn Deine Sprache in der [MongoDB-Textsuche](https://docs.mongodb.org/manual/reference/text-search-languages/#text-search-languages) nicht unterstützt wird.", "Message_Attachments": "Nachrichten-Anhänge", - "Message_Attachments_GroupAttach": "Schaltflächen für Anhänge gruppieren", - "Message_Attachments_GroupAttachDescription": "Dies sorgt dafür, dass die Schaltflächen in einem erweiterbaren Menü untergebracht werden. So wird weniger Bildschirmplatz benötigt.", "Report_sent": "Bericht gesendet", "Message_Audio": "Audio Nachricht", "Message_Audio_bitRate": "Audio-Nachrichten-Bitrate", @@ -1942,8 +1945,6 @@ "Message_removed": "Die Nachricht wurde entfernt", "Message_sent_by_email": "Nachricht per E-Mail versendet", "Message_ShowDeletedStatus": "Löschstatus anzeigen", - "Message_ShowEditedStatus": "Bearbeitungsstatus anzeigen", - "Message_ShowFormattingTips": "Formatierungshilfe anzeigen", "Message_starring": "Markieren von favorisierten Nachrichten", "Message_Time": "Zeitpunkt der Nachricht", "Message_TimeAndDateFormat": "Zeit- und Datumsformat", @@ -1982,7 +1983,6 @@ "Move_end_message": "`%s` - Zum Ende der Nachricht springen", "Msgs": "Nachrichten", "multi": "mehrere", - "multi_line": "Mehrzeilig", "Mute_all_notifications": "Alle Benachrichtigungen stummschalten", "Mute_Focused_Conversations": "Stumm geschaltete Gespräche", "Mute_Group_Mentions": "Mute @all und @here erwähnt", @@ -2070,9 +2070,7 @@ "Number_of_events": "Anzahl der Ereignisse", "Number_of_federated_users": "Anzahl föderierter Benutzer", "Number_of_messages": "Nachrichtenanzahl", - "OAuth Apps": "OAuth-Apps", "OAuth_Application": "OAuth-Anwendung", - "OAuth_Applications": "OAuth-Anwendungen", "Objects": "Objekte", "Off": "Aus", "Off_the_record_conversation": "Off-the-record-Gespräche", @@ -2375,7 +2373,6 @@ "RetentionPolicyRoom_MaxAge": "Maximales Nachrichtenalter in Tagen (Standard: {{max}})", "RetentionPolicyRoom_OverrideGlobal": "Globale Aufbewahrungsrichtlinie außer Kraft setzen", "RetentionPolicyRoom_ReadTheDocs": "Achtung! Das Anpassen dieser Einstellungen ohne große Sorgfalt kann den gesamten Nachrichtenverlauf zerstören. Bitte lies die Dokumentation, bevor Du das Feature unter hieraktivierst.", - "Retry_Count": "Anzahl der Wiederholungsversuche", "Return_to_home": "Zurück zur Startseite", "Return_to_previous_page": "zur vorherigen Seite zurückkehren", "Robot_Instructions_File_Content": "Inhalt von Robots.txt", @@ -2510,6 +2507,7 @@ "Set_as_leader": "Zum Diskussionsleiter ernennen", "Set_as_moderator": "Zum Moderator ernennen", "Set_as_owner": "Zum Besitzer machen", + "Upload_app": "App hochladen", "set-leader": "Diskussionsleiter ernennen", "set-moderator": "Moderator ernennen", "set-moderator_description": "Berechtigung, andere Benutzer zum Moderator eines Kanals zu ernennen", @@ -2591,10 +2589,7 @@ "SMTP_Test_Button": "SMTP-Einstellungen testen", "SMTP_Username": "SMTP-Benutzername", "Snippet_Added": "Erstellt am %s", - "Snippet_Messages": "Nachrichten-Snippets", "Snippet_name": "Snippet-Name", - "snippet-message": "Nachrichten-Snippet", - "snippet-message_description": "Berechtigung, ein Nachrichten-Snippet zu erstellen", "Snippeted_a_message": "Ein Snippet wurde erstellt: {{snippetLink}}", "Social_Network": "Soziales Netzwerk", "Sorry_page_you_requested_does_not_exist_or_was_deleted": "Entschuldigung, die angeforderte Seite existiert nicht oder wurde gelöscht!", @@ -2652,7 +2647,6 @@ "Stream_Cast": "Stream Cast", "Stream_Cast_Address": "Stream Cast Adresse", "Stream_Cast_Address_Description": "IP oder Host Deines zentralen Stream Cast Servers inkl. Port, bspw. `192.168.1.1:3000` oder `localhost:4000`", - "strike": "durchgestrichen", "Style": "Stil", "Subject": "Betreff", "Submit": "Abssenden", @@ -2818,7 +2812,6 @@ "Type_your_job_title": "Gib Deine Job-Bezeichnung ein", "Type_your_message": "Gib Deine Nachricht ein", "Type_your_name": "Gib Deinen Namen ein", - "Type_your_new_password": "Gib ein neues Passwort ein", "Type_your_password": "Gib Dein Passwort ein", "Type_your_username": "Gib Deinen Benutzernamen ein", "UI_Allow_room_names_with_special_chars": "Sonderzeichen im Raumnamen erlauben", @@ -2857,7 +2850,6 @@ "Update_to_version": "Auf Version {{version}} aktualisieren", "Update_your_RocketChat": "Aktualisiere Dein Rocket.Chat", "Updated_at": "Aktualisiert am", - "Upload_app": "App hochladen", "Upload_file_description": "Dateibeschreibung", "Upload_file_name": "Dateiname", "Upload_file_question": "Datei hochladen?", diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/de.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/de.i18n.json index 40bc9c194b51..45c48e596596 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/de.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/de.i18n.json @@ -495,7 +495,6 @@ "Apply_and_refresh_all_clients": "Anwenden und alle Clients aktualisieren", "Apps": "Anwendungen", "Apps_context_explore": "Erkunden", - "Apps_context_enterprise": "Unternehmen", "Apps_context_installed": "Installiert", "Apps_context_requested": "Angefordert", "Apps_Engine_Version": "Version der Anwendungs-Engine", @@ -805,7 +804,6 @@ "Call_provider": "Anrufserive-Anbieter", "Call_Already_Ended": "Anruf bereits beendet", "Call_number": "Rufnummer", - "Call_number_enterprise_only": "Rufnummer (nur Enterprise Edition)", "call-management": "Anrufverwaltung", "call-management_description": "Erlaubnis zum Starten einer Besprechung", "Call_ongoing": "Anruf laufend", @@ -951,7 +949,6 @@ "Close": "Schließen", "Close_chat": "Chat schließen", "Close_room_description": "Sie sind im Begriff, diesen Chat zu schließen. Sind Sie sicher, dass Sie fortfahren möchten?", - "Close_to_seat_limit_banner_warning": "*Es sind noch [{{seats}}] Plätze übrig* \nDieser Arbeitsbereich nähert sich seinem Platzlimit. Wenn das Limit erreicht ist, können keine neuen Mitglieder mehr hinzugefügt werden. *[Weitere Plätze anfordern]({{url}})*", "Close_to_seat_limit_warning": "Wenn das Platzlimit erreicht ist, können keine weiteren neuen Mitglieder erstellt werden.", "close-livechat-room": "Livechat-Room schließen", "close-livechat-room_description": "Berechtigung, den aktuellen Livechat-Raum zu schließen", @@ -987,8 +984,6 @@ "Cloud_register_offline_finish_helper": "Nach Abschluss des Registrierungsvorgangs in der Cloud-Konsole sollte ein Text angezeigt werden. Bitte hier einfügen, um die Registrierung abzuschließen.", "Cloud_register_offline_helper": "Arbeitsbereiche können manuell registriert werden, wenn ein Airgap besteht oder der Netzwerkzugriff eingeschränkt ist. Kopieren Sie den folgenden Text und rufen Sie unsere Cloud-Konsole auf, um den Vorgang abzuschließen.", "Cloud_register_success": "Ihr Arbeitsbereich wurde erfolgreich registriert!", - "Cloud_registration_pending_html": "Push-Benachrichtigungen funktionieren nicht, bis die Registrierung abgeschlossen ist. Mehr erfahren", - "Cloud_registration_pending_title": "Die Cloud-Registrierung steht noch aus", "Cloud_registration_required": "Registrierung erforderlich", "Cloud_registration_required_description": "Es sieht aus, als hätten Sie sich während des Setups nicht für die Registrierung Ihres Arbeitsbereichs entschieden.", "Cloud_registration_required_link_text": "Klicken Sie hier, um Ihren Arbeitsbereich zu registrieren.", @@ -1827,9 +1822,6 @@ "Enter_Normal": "Normaler Modus (mit Eingabetaste senden)", "Enter_to": "Eingabetaste: ", "Enter_your_E2E_password": "Geben Sie ihr Passwort für die Ende-Zu-Ende-Verschlüsselung ein", - "Enterprise_capabilities": "Enterprise-Funktionen", - "Enterprise_License": "Unternehmenslizenz", - "Enterprise_License_Description": "Wenn dein Arbeitsbereich registriert ist und die Lizenz von Rocket.Chat Cloud zur Verfügung gestellt wird, brauchest du die Lizenz hier nicht manuell zu aktualisieren.", "Entertainment": "Unterhaltung", "Error": "Fehler", "Error_something_went_wrong": "Huch! Ein Fehler ist aufgetreten. Bitte laden Sie die Seite neu oder kontaktieren Sie einen Administrator.", @@ -1974,7 +1966,6 @@ "error-tags-must-be-assigned-before-closing-chat": "Tags müssen vor dem Schließen des Chats zugewiesen werden", "error-the-field-is-required": "Das Feld {{field}} ist erforderlich.", "error-this-is-not-a-livechat-room": "Dies ist kein Livechat-Raum", - "error-this-is-an-ee-feature": "Dies ist eine Funktion der Enterprise Edition", "error-token-already-exists": "Ein Zugangsschlüssel mit diesem Namen existiert bereits", "error-token-does-not-exists": "Der Zugangsschlüssel existiert nicht", "error-too-many-requests": "Fehler, zu viele Anfragen. Bitte fahren Sie langsamer fort. Sie müssen {{seconds}} Sekunden warten, bevor Sie es erneut versuchen können.", @@ -2275,10 +2266,8 @@ "Global_purge_override_warning": "Eine globale Aufbewahrungsrichtlinie ist vorhanden. Wenn Sie die globale Aufbewahrungsrichtlinie außer Kraft setzen, können Sie nur eine Richtlinie anwenden, die strenger ist als die globale Richtlinie.", "Global_Search": "Globale Suche", "Go_to_your_workspace": "Auf zu Ihrem Arbeitsbereich!", - "Google_Meet_Enterprise_only": "Google Meet (nur Enterprise)", "Google_Play": "Google Play", "Hold_Call": "Gespräch halten", - "Hold_Call_EE_only": "Anruf halten (nur Enterprise Edition)", "GoogleCloudStorage": "Google Cloud-Speicher", "GoogleNaturalLanguage_ServiceAccount_Description": "Service-Konto SchlüsselDatei (JSON). Weiterführende Informationen dazu [hier](https://cloud.google.com/natural-language/docs/common/auth#set_up_a_service_account)", "GoogleTagManager_id": "Google-Tag-Manager-ID", @@ -2333,7 +2322,6 @@ "History": "Chronik", "Hold_Time": "Haltezeit", "Hold": "Halten", - "Hold_EE_only": "Halten (nur Enterprise Edition)", "Home": "Startseite", "Homepage": "Startseite", "Host": "Host", @@ -3117,18 +3105,6 @@ "Marketplace_app_last_updated": "Zuletzt aktualisiert {{lastUpdated}}", "Marketplace_view_marketplace": "Marketplace anzeigen", "Marketplace_error": "Keine Verbindung zum Internet oder zu Ihrem Arbeitsbereich möglich, möglicherweise handelt es sich um eine Offline-Installation.", - "marketplace_featured_section_community_featured": "Ausgewählte von der Gemeinschaft unterstützt Apps", - "marketplace_featured_section_community_supported": "Von der Gemeinschaft unterstützte Apps", - "marketplace_featured_section_enterprise": "Ausgewählte Enterprise-Apps", - "marketplace_featured_section_featured": "Ausgewählte Apps", - "marketplace_featured_section_most_popular": "Beliebteste Apps", - "marketplace_featured_section_new_arrivals": "Neu eingetroffen", - "marketplace_featured_section_popular_this_month": "Beliebte Apps in diesem Monat", - "marketplace_featured_section_recommended": "Empfohlene Apps", - "marketplace_featured_section_social": "Soziale Apps", - "marketplace_featured_section_trending": "Aktuelle Apps", - "marketplace_featured_section_omnichannel": "Omnichannel-Apps", - "marketplace_featured_section_video_conferencing": "Apps für Videokonferenzen", "MAU_value": "MAU {{value}}", "Max_length_is": "Maximale Länge ist %s", "Max_number_incoming_livechats_displayed": "Maximale Anzahl der in der Warteschlange angezeigten Elemente", @@ -3401,7 +3377,6 @@ "New_Application": "Neue Anwendung", "New_Business_Hour": "Neue Öffnungszeiten", "New_Call": "Neuer Aufruf", - "New_Call_Enterprise_Edition_Only": "Neuer Anruf (nur Enterprise Edition)", "New_chat_in_queue": "Neuer Chat in der Warteschlange", "New_chat_priority": "Priorität geändert: {{user}} hat die Priorität in {{priority}} geändert", "New_chat_transfer": "Neue Chatübertragung: {{transfer}}", @@ -3842,7 +3817,6 @@ "Rate Limiter_Description": "Kontrollieren Sie die Rate der von Ihrem Server gesendeten oder empfangenen Anfragen, um Cyberangriffe und Scraping zu verhindern.", "Rate_Limiter_Limit_RegisterUser": "Rate-Limit für die Registrierung eines Benutzers", "Rate_Limiter_Limit_RegisterUser_Description": "Anzahl der erlaubten Standardaufrufe der Benutzerregistrierungs Endpunkte (REST and real-time API's), innherhalb der, im API Rate Limiter Absschnitt definierten, Zeitspanne.", - "Reached_seat_limit_banner_warning": "*Keine Plätze mehr vrefügbar* \nDieser Arbeitsbereich hat sein Platzlimit erreicht, es können also keine Mitglieder mehr beitreten. *[Mehr Plätze anfordern]({{url}})*", "React_when_read_only": "Reaktionen erlauben", "React_when_read_only_changed_successfully": "Reaktionen erlauben, wenn ein Kanal schreibgeschützt wurde", "Reacted_with": "Reagierten mit", @@ -4900,10 +4874,6 @@ "Update_to_version": "Auf Version {{version}} aktualisieren", "Update_your_RocketChat": "Aktualisieren Sie Ihr Rocket.Chat", "Updated_at": "Aktualisiert am", - "Upgrade_tab_connection_error_description": "Sieht so aus, als hätten Sie keine Internetverbindung. Das kann daran liegen, dass Ihr Arbeitsbereich auf einem vollständig gesicherten Server mit Air Gap installiert ist", - "Upgrade_tab_connection_error_restore": "Stellen Sie Ihre Verbindung wieder her, um mehr über die Funktionen zu erfahren, die Ihnen entgehen.", - "Upgrade_tab_go_fully_featured": "Erhalte vollen Funktionsumfang", - "Upgrade_tab_trial_guide": "Leitfaden für Versuche", "Upgrade_tab_upgrade_your_plan": "Aktualisieren Sie Ihren Plan", "Upload": "Hochladen", "Uploads": "Uploads", diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json index e2fc7b07805d..73a23a659050 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json @@ -1017,7 +1017,6 @@ "Close": "Close", "Close_chat": "Close chat", "Close_room_description": "You are about to close this chat. Are you sure you want to continue?", - "Close_to_seat_limit_banner_warning": "*You have [{{seats}}] seats left* \nThis workspace is nearing its seat limit. Once the limit is met no new members can be added. *[Request More Seats]({{url}})*", "Close_to_seat_limit_warning": "New members cannot be created once the seat limit is met.", "close-livechat-room": "Close Omnichannel Room", "close-livechat-room_description": "Permission to close the current Omnichannel room", @@ -4157,7 +4156,6 @@ "Rate Limiter_Description": "Control the rate of requests sent or recieved by your server to prevent cyber attacks and scraping.", "Rate_Limiter_Limit_RegisterUser": "Default number calls to the rate limiter for registering a user", "Rate_Limiter_Limit_RegisterUser_Description": "Number of default calls for user registering endpoints(REST and real-time API's), allowed within the time range defined in the API Rate Limiter section.", - "Reached_seat_limit_banner_warning": "*No more seats available* \nThis workspace has reached its seat limit so no more members can join. *[Request More Seats]({{url}})*", "React_when_read_only": "Allow Reacting", "React_when_read_only_changed_successfully": "Allow reacting when read only changed successfully", "Reacted_with": "Reacted with", @@ -6115,7 +6113,7 @@ "unread_messages_counter": "{{count}} unread message", "unread_messages_counter_plural": "{{count}} unread messages", "Premium": "Premium", - "Enterprise": "Premium", + "Enterprise": "Premium", "Premium_capability": "Premium capability", "Operating_withing_plan_limits": "Operating within plan limits", "Plan_limits_reached": "Plan limits reached", diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/es.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/es.i18n.json index 8886a1c2abe9..d77b268b93f4 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/es.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/es.i18n.json @@ -447,7 +447,6 @@ "Apply": "Aplicar", "Apply_and_refresh_all_clients": "Aplicar y actualizar todos los clientes", "Apps": "Aplicaciones", - "Apps_context_enterprise": "Empresa", "Apps_context_installed": "Instalada", "Apps_Engine_Version": "Versión de motor de aplicaciones", "Apps_Essential_Alert": "Esta aplicación es esencial para los siguientes eventos:", @@ -830,7 +829,6 @@ "Close": "Cerrar", "Close_chat": "Cerrar chat", "Close_room_description": "Estás a punto de cerrar este chat. ¿Seguro que quieres continuar?", - "Close_to_seat_limit_banner_warning": "*Te quedan [{{seats}}] puestos* \nEste espacio de trabajo se acerca a su límite de puestos. Una vez que se alcanza el límite, no se pueden añadir nuevos miembros. *[Request More Seats]({{url}})*", "Close_to_seat_limit_warning": "No se pueden crear nuevos miembros una vez que se alcanza el límite de puestos.", "close-livechat-room": "Cerrar Room de Omnichannel", "close-livechat-room_description": "Permiso para cerrar la sala de Omnichannel actual", @@ -865,8 +863,6 @@ "Cloud_register_offline_finish_helper": "Después de completar el proceso de registro en Cloud Console, debería aparecer un texto. Pégalo aquí para finalizar el registro.", "Cloud_register_offline_helper": "Los espacios de trabajo se pueden registrar manualmente si el espacio está aislado o el acceso de red está restringido. Copia el texto que aparece a continuación y ve a Cloud Console para completar el proceso.", "Cloud_register_success": "Tu espacio de trabajo se ha registrado correctamente", - "Cloud_registration_pending_html": "Las notificaciones push no funcionarán hasta que el registro haya finalizado. Más información", - "Cloud_registration_pending_title": "El registro en la nube aún está pendiente", "Cloud_registration_required": "Registro obligatorio", "Cloud_registration_required_description": "Parece que durante la configuración decidiste no registrar tu espacio de trabajo.", "Cloud_registration_required_link_text": "Haz clic aquí para registrar tu espacio de trabajo.", @@ -1616,8 +1612,6 @@ "Enter_Normal": "Modo normal (enviar con Intro)", "Enter_to": "Intro para", "Enter_your_E2E_password": "Introduzca su contraseña E2E", - "Enterprise_License": "Licencia de empresa", - "Enterprise_License_Description": "Si tu espacio de trabajo está registrado y la licencia la proporciona Rocket.Chat Cloud, no es necesario que actualices la licencia manualmente aquí.", "Entertainment": "Entretenimiento", "Error": "Error", "Error_404": "Error 404", @@ -3394,7 +3388,6 @@ "Random": "Aleatorio", "Rate_Limiter_Limit_RegisterUser": "Número de llamadas por defecto al limitador de frecuencia para registrar un usuario", "Rate_Limiter_Limit_RegisterUser_Description": "Número de llamadas por defecto para los usuarios que registran puntos finales (REST y API en tiempo real) que se permiten dentro del rango de tiempo definido en la sección Limitador de frecuencia de API.", - "Reached_seat_limit_banner_warning": "*No hay más puestos disponibles* \nEste espacio de trabajo ha alcanzado su límite de puestos, por lo que no pueden unirse más miembros. *[Request More Seats]({{url}})*", "React_when_read_only": "Permitir reacciones", "React_when_read_only_changed_successfully": "Permitir reacciones cuando solo lectura ha cambiado correctamente", "Reacted_with": "Ha reaccionado con", diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/fa.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/fa.i18n.json index d7eabf8ce8bd..c0a8fac5d98b 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/fa.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/fa.i18n.json @@ -1214,7 +1214,6 @@ "Enter_name_here": "نام را اینجا وارد کنید", "Enter_Normal": "حالت عادی (ارسال با Enter)", "Enter_to": "ورود به ", - "Enterprise_License": "مجوز سازمانی", "Entertainment": "سرگرمی", "Error": "خطا", "Error_404": "خطای 404", diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/fi.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/fi.i18n.json index 6977b0729d54..1065283f064e 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/fi.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/fi.i18n.json @@ -499,7 +499,6 @@ "Apply_and_refresh_all_clients": "Tallenna ja päivitä kaikki asiakkaat", "Apps": "Sovellukset", "Apps_context_explore": "Tutustu", - "Apps_context_enterprise": "Yritys", "Apps_context_installed": "Asennettu", "Apps_context_requested": "Pyydetty", "Apps_context_private": "Yksityiset sovellukset", @@ -508,9 +507,6 @@ "Private_Apps_Count_Enabled": "{{count}} yksityistä sovellusta käytössä", "Private_Apps_Count_Enabled_plural": "{{count}} yksityistä sovellusta käytössä", "Apps_Count_Enabled_tooltip": "Yhteisöversion työtiloissa voi ottaa käyttöön enintään {{number}} {{context}}sovellusta", - "Apps_disabled_when_Enterprise_trial_ended": "Sovellukset poistuivat käytöstä, kun yritysversion kokeilujakso päättyi", - "Apps_disabled_when_Enterprise_trial_ended_description": "Yhteisöversion työtiloissa voi olla käytössä enintään 5 markkinapaikkasovellusta ja 3 yksityistä sovellusta. Pyydä työtilan järjestelmänvalvojaa ottamaan sovelluksia käyttöön uudelleen.", - "Apps_disabled_when_Enterprise_trial_ended_description_admin": "Yhteisöversion työtiloissa voi olla käytössä enintään 5 markkinapaikkasovellusta ja 3 yksityistä sovellusta. Ota tarvitsemasi sovellukset käyttöön uudelleen.", "Apps_Engine_Version": "Sovellusmoottorin versio", "Apps_Essential_Alert": "Tämä sovellus on välttämätön seuraavissa tapahtumissa:", "Apps_Essential_Disclaimer": "Edellä mainitut tapahtumat keskeytyvät, jos sovellus poistetaan käytöstä. Jos haluat Rocket.Chatin toimivan ilman tämän sovelluksen toimintoja, sinun on poistettava sovellus", @@ -822,7 +818,6 @@ "Call_provider": "Puhelun palveluntarjoaja", "Call_Already_Ended": "Puhelu on jo päättynyt", "Call_number": "Soita numeroon", - "Call_number_enterprise_only": "Soittajanumero (vain Enterprise Edition)", "call-management": "Puhelujen hallinta", "call-management_description": "Oikeus aloittaa kokous", "Call_ongoing": "Puhelu käynnissä", @@ -967,7 +962,6 @@ "Close": "Sulje", "Close_chat": "Sulje keskustelu", "Close_room_description": "Olet sulkemassa keskustelun. Haluatko varmasti jatkaa?", - "Close_to_seat_limit_banner_warning": "*Sinulla on [{{seats}}] käyttäjää jäljellä* \nTämä työtila lähestyy käyttäjämäärän rajaa. Kun raja on saavutettu, uusia jäseniä ei voida lisätä. *[Request More Seats]({{url}})*", "Close_to_seat_limit_warning": "Uusia jäseniä ei voida luoda, kun käyttäjämäärä on saavutettu.", "close-livechat-room": "Sulje Omnichannel-huone", "close-livechat-room_description": "Lupa nykyisen monikanavahuoneen sulkemiseen", @@ -1006,8 +1000,6 @@ "Cloud_register_offline_finish_helper": "Kun olet rekisteröitynyt pilvikonsolissa, näet tekstiä. Viimeistele rekisteröinti liittämällä teksti tähän.", "Cloud_register_offline_helper": "Työtiloja voidaan rekisteröidä manuaalisesti, jos verkko on suojattu ilmaraolla tai verkon käyttöä on rajoitettu. Kopioi alla oleva teksti ja viimeistele prosessi pilvikonsolissamme.", "Cloud_register_success": "Työtilasi on rekisteröity!", - "Cloud_registration_pending_html": "Push-ilmoitukset eivät toimi, ennen kuin rekisteröinti on valmis. Lisätietoja", - "Cloud_registration_pending_title": "Pilvirekisteröinti on vielä kesken", "Cloud_registration_required": "Rekisteröinti on pakollinen", "Cloud_registration_required_description": "Näyttää siltä, ettet rekisteröinyt työtilaa määrityksen aikana.", "Cloud_registration_required_link_text": "Rekisteröi työtila napsauttamalla tätä.", @@ -1847,14 +1839,6 @@ "Enter_Normal": "Normaali tila (Enter lähettää viestin)", "Enter_to": "Siirry", "Enter_your_E2E_password": "Anna E2E-salasanasi", - "Enterprise_capability": "Yritysominaisuudet", - "Enterprise_capabilities": "Yritysominaisuudet", - "Enterprise_Departments_title": "Liitä asiakkaat jonoihin ja paranna agenttien tuottavuutta", - "Enterprise_Departments_description_upgrade": "Yhteisöversion työtiloissa voidaan luoda vain yksi osasto. Poista rajat ja tehosta työtilaasi päivittämällä yritysversioon.", - "Enterprise_Departments_description_free_trial": "Yhteisöversion työtiloissa voi luoda yhden osaston. Aloita maksuton yritysversion kokeilu, jotta voit luoda useita osastoja heti!", - "Enterprise_License": "Yrityskäyttöoikeus", - "Enterprise_License_Description": "Jos työtilasi on rekisteröity ja sinulla on Rocket.Chat-pilven käyttöoikeus, sinun ei tarvitse päivittää käyttöoikeutta manuaalisesti tässä.", - "Enterprise_Only": "Vain yritysversio", "Entertainment": "Viihde", "Error": "Virhe", "Error_something_went_wrong": "Oho! Jokin meni pieleen. Lataa sivu uudelleen tai ota yhteys järjestelmänvalvojaan.", @@ -2003,7 +1987,6 @@ "error-tags-must-be-assigned-before-closing-chat": "Tunnisteet on määritettävä ennen keskustelun sulkemista", "error-the-field-is-required": "Kenttä {{field}} on pakollinen.", "error-this-is-not-a-livechat-room": "Tämä ei ole monikanavahuone", - "error-this-is-an-ee-feature": "Tämä ominaisuus on yritysversiossa", "error-token-already-exists": "Tällä nimellä oleva tunnus on jo olemassa", "error-token-does-not-exists": "Tunnusta ei ole olemassa", "error-too-many-requests": "Virhe, liikaa pyyntöjä. Hidasta vähän. Odota {{seconds}} sekuntia ennen uutta yritystä.", @@ -2136,7 +2119,6 @@ "Federation_Matrix_losing_privileges_warning": "Et voi kumota tätä toimenpidettä, koska alennat itsesi. Jos olet viimeinen käyttäjä, jolla on laajat oikeudet, et voi saada tätä oikeutta takaisin. Haluatko silti jatkaa?", "Federation_Matrix_not_allowed_to_change_moderator": "Et saa vaihtaa moderaattoria", "Federation_Matrix_not_allowed_to_change_owner": "Et saa vaihtaa omistajaa", - "Federation_Matrix_join_public_rooms_is_enterprise": "Liittyminen liittoutuneisiin huoneisiin on yritysversion ominaisuus", "Field": "Kenttä", "Field_removed": "Kenttä poistettu", "Field_required": "Kenttä pakollinen", @@ -2309,10 +2291,8 @@ "Global_purge_override_warning": "Yleinen säilytyskäytäntö on käytössä. Jos jätät asetuksen Ohita yleinen säilytyskäytäntö pois käytöstä, voit käyttää ainoastaan yleistä käytäntöä tiukempaa käytäntöä.", "Global_Search": "Yleinen haku", "Go_to_your_workspace": "Siirry työtilaasi", - "Google_Meet_Enterprise_only": "Google Meet (vain yritysversio)", "Google_Play": "Google Play", "Hold_Call": "Aseta puhelu pitoon", - "Hold_Call_EE_only": "Aseta puhelu pitoon (vain yritysversio)", "GoogleCloudStorage": "Google-pilvitallennus", "GoogleNaturalLanguage_ServiceAccount_Description": "Palvelutiliavaimen JSON-tiedosto. Lisätietoja on [täällä](https://cloud.google.com/natural-language/docs/common/auth#set_up_a_service_account)", "GoogleTagManager_id": "Google Tag Manager -tunnus", @@ -2368,7 +2348,6 @@ "History": "Historia", "Hold_Time": "Pitoaika", "Hold": "Pidä", - "Hold_EE_only": "Pidä (vain yritysversio)", "Home": "Koti", "Homepage": "Aloitussivu", "Homepage_Custom_Content_Default_Message": "Järjestelmänvalvojat voivat lisätä html-sisältöä hahmonnettavaksi tähän valkoiseen tilaan.", @@ -3167,18 +3146,6 @@ "Marketplace_app_last_updated": "Viimeksi päivitetty {{lastUpdated}}", "Marketplace_view_marketplace": "Näytä kauppapaikka", "Marketplace_error": "Yhteyttä internetiin ei voi muodostaa, tai työtilasi on offline-asennus.", - "marketplace_featured_section_community_featured": "Esitellyt yhteisön sovellukset", - "marketplace_featured_section_community_supported": "Yhteisön tukemat sovellukset", - "marketplace_featured_section_enterprise": "Esitellyt yrityssovellukset", - "marketplace_featured_section_featured": "Esitellyt sovellukset", - "marketplace_featured_section_most_popular": "Suosituimmat sovellukset", - "marketplace_featured_section_new_arrivals": "Uutuudet", - "marketplace_featured_section_popular_this_month": "Kuukauden suosituimmat sovellukset", - "marketplace_featured_section_recommended": "Suositellut sovellukset", - "marketplace_featured_section_social": "Sosiaaliset sovellukset", - "marketplace_featured_section_trending": "Trendaavat sovellukset", - "marketplace_featured_section_omnichannel": "Omnichannel-sovellukset", - "marketplace_featured_section_video_conferencing": "Videoneuvottelusovellukset", "MAU_value": "MAU {{value}}", "Max_length_is": "Maksimi pituus on %s", "Max_number_incoming_livechats_displayed": "Jonossa näytettävien kohteiden enimmäismäärä", @@ -3438,7 +3405,6 @@ "New_Application": "Uusi sovellus", "New_Business_Hour": "Uusi aukioloaika", "New_Call": "Uusi puhelu", - "New_Call_Enterprise_Edition_Only": "Uusi puhelu (vain yritysversio)", "New_chat_in_queue": "Uusi keskustelu jonossa", "New_chat_priority": "Prioriteetti muutettu: {{user}} prioriteettti muutettu {{priority}}", "New_chat_transfer": "Uusi chat-siirto: {{transfer}}", @@ -3739,7 +3705,6 @@ "Permalink": "Pysyvä linkki", "Permissions": "Oikeudet", "Personal_Access_Tokens": "Henkilökohtaiset pääsykoodit", - "Pexip_Enterprise_only": "Pexip (vain yritysversio)", "Phone": "Puhelin", "Phone_call": "Puhelu", "Phone_Number": "Puhelinnumero", @@ -3905,7 +3870,6 @@ "Rate Limiter_Description": "Hallitse palvelimesi lähettämien tai vastaanottamien pyyntöjen tiheyttä verkkohyökkäysten ja kaapimisen estämiseksi.", "Rate_Limiter_Limit_RegisterUser": "Pyyntöjen oletusmäärä nopeusrajoittimelle kun rekisteröidään käyttäjä", "Rate_Limiter_Limit_RegisterUser_Description": "Käyttäjärekisteröivien päätepisteiden (REST- ja reaaliaikaiset API:t) oletuspyyntöjen määrä, joka sallitaan API Rate Limiter-osiossa määritellyn aikavälien sisällä.", - "Reached_seat_limit_banner_warning": "*Paikkoja ei ole enää saatavilla* \nTämä työtila on saavuttanut paikkarajansa, joten siihen ei voi liittyä enää lisää jäseniä. *[Pyydä lisää paikkoja]({{url}})*", "React_when_read_only": "Salli reaktiot", "React_when_read_only_changed_successfully": "Salli reagointi, kun vain luku on muutettu onnistuneesti", "Reacted_with": "Reagoi:", @@ -4284,7 +4248,6 @@ "Search": "Haku", "Searchable": "Hakukelpoinen", "Search_Apps": "Hae sovelluksia", - "Search_Enterprise_Apps": "Hae yrityssovelluksia", "Search_Installed_Apps": "Hae asennettuja sovelluksia", "Search_Private_apps": "Hae yksityisiä sovelluksia", "Search_Requested_Apps": "Hae pyydettyjä sovelluksia", @@ -5006,10 +4969,6 @@ "Update_to_version": "Päivitys versioon {{version}}", "Update_your_RocketChat": "Päivitä Chatsovellus", "Updated_at": "Päivitetty klo.", - "Upgrade_tab_connection_error_description": "Näyttää siltä, että sinulla ei ole internet-yhteyttä. Tämä voi johtua siitä, että työtilasi on asennettu täysin suojattuun air-gapped palvelimeen", - "Upgrade_tab_connection_error_restore": "Palauta yhteys, niin saat tietää puuttuvista ominaisuuksista.", - "Upgrade_tab_go_fully_featured": "Ota kaikki ominaisuudet käyttöön", - "Upgrade_tab_trial_guide": "Kokeiluopas", "Upgrade_tab_upgrade_your_plan": "Päivitä tilauksesi", "Upload": "Lataa", "Uploads": "Lataukset", @@ -5602,9 +5561,7 @@ "Undo_request": "Kumoa pyyntö", "No_permission": "Ei oikeutta", "Community_cap_description": "Yhteisön työtiloissa on 200 samanaikaisen yhteyden yläraja. Vaikka aktiivisia yhteyksiä voi olla sitä enemmänkin, kyseisen rajan jälkeen et enää näe käyttäjien tilaa. Tämä ei vaikuta siihen, miten he voivat lähettää ja vastaanottaa viestejä.", - "Enterprise_cap_description": "Yritysversion työtiloissa ei ole läsnäolopalvelun ylärajaa.", "Service_status": "Palvelun tila", - "More_about_Enterprise_Edition": "Lisätietoja yritysversiosta", "Presence_service_cap": "Läsnäolopalvelun yläraja", "User_Status": "Käyttäjän tila", "Active_connections": "Aktiiviset yhteydet", @@ -5670,7 +5627,6 @@ "cloud.RegisterWorkspace_Token_Step_One": "1. Valitse: <1>cloud.rocket.chat > Työtilat ja <3>Itse hallinnoitu rekisteröinti.", "cloud.RegisterWorkspace_Setup_Terms_Privacy": "Hyväksyn <1>käyttöehdot ja <3>tietosuojakäytännön", "Larger_amounts_of_active_connections": "Jos tarvitset enemmän aktiivisia yhteyksiä, ota harkintaan", - "multiple_instance_solutions": "usean esiintymän ratkaisut", "Uninstall_grandfathered_app": "Poistetaanko {{appName}}?", "App_will_lose_grandfathered_status": "**Tämä {{context}}sovellus menettää aikaisemmin käytetössä olleen sovelluksen tilansa.** \n \nYhteisöversion työtiloissa voi olla käytössä enintään {{limit}} {{context}} sovellusta. aikaisemmin Aikaisemmin käytössä olleet sovellukset lasketaan mukaan rajoitukseen, mutta rajoitusta ei sovelleta niihin.", "Theme_Appearence": "Teeman ulkoasu" diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/fr.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/fr.i18n.json index 1a4a8acc93f1..2f3d924c5e0f 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/fr.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/fr.i18n.json @@ -450,7 +450,6 @@ "Apply": "Appliquer", "Apply_and_refresh_all_clients": "Appliquer et actualiser tous les clients", "Apps": "Applications", - "Apps_context_enterprise": "Entreprise", "Apps_context_installed": "Installé", "Apps_Engine_Version": "Version d'Apps Engine", "Apps_Essential_Alert": "Cette application est indispensable pour les événements suivants :", @@ -843,7 +842,6 @@ "Close": "Fermer", "Close_chat": "Fermer le chat", "Close_room_description": "Vous êtes sur le point de fermer ce chat. Voulez-vous continuer ?", - "Close_to_seat_limit_banner_warning": "*Il vous reste [{{seats}}] sièges* \nLe nombre maximal de sièges de cet espace de travail est presque atteint. Une fois la limite atteinte, aucun nouveau membre ne pourra être ajouté. *[Demander plus de sièges]({{url}})*", "Close_to_seat_limit_warning": "Aucun nouveau membre ne peut être créé une fois que la limite de sièges est atteinte.", "close-livechat-room": "Fermer le salon omnicanal", "close-livechat-room_description": "Autorisation de fermer le salon omnicanal actuel", @@ -878,8 +876,6 @@ "Cloud_register_offline_finish_helper": "Une fois le processus d'enregistrement terminé dans la console cloud, un texte doit s'afficher. Collez-le ici pour terminer l'enregistrement.", "Cloud_register_offline_helper": "Les espaces de travail peuvent être enregistrés manuellement s'ils sont isolés (airgap) ou si l'accès au réseau est restreint. Copiez le texte ci-dessous et accédez à notre console cloud pour terminer le processus.", "Cloud_register_success": "Votre espace de travail a été enregistré avec succès !", - "Cloud_registration_pending_html": "Les notifications push ne fonctionnent pas tant que l'enregistrement n'est pas terminé. En savoir plus", - "Cloud_registration_pending_title": "L'enregistrement dans le cloud est toujours en cours", "Cloud_registration_required": "Inscription requise", "Cloud_registration_required_description": "Il semble que, lors de l'installation, vous n'ayez pas choisi d'enregistrer votre espace de travail.", "Cloud_registration_required_link_text": "Cliquez ici pour enregistrer votre espace de travail.", @@ -1631,8 +1627,6 @@ "Enter_Normal": "Mode normal (envoyé avec Entrée)", "Enter_to": "Entrée pour", "Enter_your_E2E_password": "Entrez votre mot de passe E2E", - "Enterprise_License": "Licence d'entreprise", - "Enterprise_License_Description": "Si votre espace de travail est enregistré et que la licence est fournie par le cloud Rocket.Chat, vous n'avez pas besoin de mettre à jour manuellement la licence ici.", "Entertainment": "Divertissement", "Error": "Erreur", "Error_404": "Erreur 404", @@ -3414,7 +3408,6 @@ "Random": "Aléatoire", "Rate_Limiter_Limit_RegisterUser": "Nombre d'appels par défaut au limiteur de débit pour l'enregistrement d'un utilisateur", "Rate_Limiter_Limit_RegisterUser_Description": "Nombre d'appels par défaut pour les points de terminaison d'enregistrement d'utilisateurs (API REST et en temps réel) autorisés pendant l'intervalle défini dans la section Limiteur de débit d'API.", - "Reached_seat_limit_banner_warning": "*Plus de sièges disponibles* \nLe nombre maximal de sièges de cet espace de travail est atteint. Aucun autre membre ne peut le rejoindre. *[Request More Seats]({{url}})*", "React_when_read_only": "Autoriser les réactions", "React_when_read_only_changed_successfully": "Autoriser les réactions après modification du mode de lecture seule", "Reacted_with": "A réagi avec", @@ -4377,10 +4370,6 @@ "Update_to_version": "Mettre à jour vers {{version}}", "Update_your_RocketChat": "Mettre à jour votre Rocket.Chat", "Updated_at": "Mis à jour à", - "Upgrade_tab_connection_error_description": "Il semble que vous n'ayez pas de connexion Internet. Cela peut être dû au fait que votre espace de travail est installé sur un serveur air-gap entièrement sécurisé", - "Upgrade_tab_connection_error_restore": "Rétablissez votre connexion pour découvrir les fonctionnalités qui vous manquent.", - "Upgrade_tab_go_fully_featured": "Passez à la version complète", - "Upgrade_tab_trial_guide": "Guide d'essai", "Upgrade_tab_upgrade_your_plan": "Améliorez votre plan", "Upload": "Charger", "Uploads": "Chargements", diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/hu.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/hu.i18n.json index eab9008d8d1a..3ecd99a4e6c4 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/hu.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/hu.i18n.json @@ -790,7 +790,6 @@ "Call_provider": "Hívásszolgáltató", "Call_Already_Ended": "A hívás már befejeződött", "Call_number": "Szám hívása", - "Call_number_enterprise_only": "Szám hívása (csak vállalati kiadás)", "call-management": "Híváskezelés", "call-management_description": "Jogosultság egy értekezlet kezdéséhez", "Call_ongoing": "Hívás folyamatban", @@ -933,7 +932,6 @@ "Close": "Bezárás", "Close_chat": "Csevegés lezárása", "Close_room_description": "A csevegés lezárására készül. Biztosan folytatni szeretné?", - "Close_to_seat_limit_banner_warning": "*Önnek [{{seats}}] helye van hátra* \nEz a munkaterület közelít a helyek korlátjához. A korlát elérése után nem lehet új tagokat hozzáadni. *[További helyek kérése]({{url}})*", "Close_to_seat_limit_warning": "Nem lehet új tagokat létrehozni, ha a helyek elérték a korlátot.", "close-livechat-room": "Összcsatornás szoba lezárása", "close-livechat-room_description": "Jogosultság a jelenlegi összcsatornás szoba lezárásához", @@ -969,8 +967,6 @@ "Cloud_register_offline_finish_helper": "Miután befejezte a regisztrációs folyamatot a felhőkonzolban, megjelenik néhány szöveg. Illessze be ide a regisztráció befejezéséhez.", "Cloud_register_offline_helper": "A munkaterületek kézzel is regisztrálhatók, ha fizikailag elválasztott vagy a hálózati hozzáférés korlátozott. Másolja le az alábbi szöveget, és menjen a felhőkonzolunkhoz a folyamat befejezéséhez.", "Cloud_register_success": "A munkaterülete sikeresen regisztrálva lett!", - "Cloud_registration_pending_html": "A leküldéses értesítések nem működnek, amíg a regisztráció be nem fejeződik. Tudjon meg többet", - "Cloud_registration_pending_title": "A felhőregisztráció továbbra is függőben van", "Cloud_registration_required": "Regisztráció szükséges", "Cloud_registration_required_description": "Úgy tűnik, hogy a beállítás során nem választotta a munkaterületének regisztrációját.", "Cloud_registration_required_link_text": "Kattintson ide a munkaterülete regisztrálásához.", @@ -1794,9 +1790,6 @@ "Enter_Normal": "Normál mód (küldés az Enter billentyűvel)", "Enter_to": "Belépés ide:", "Enter_your_E2E_password": "A végpontok közötti titkosítási jelszó megadása", - "Enterprise_capabilities": "Vállalati képességek", - "Enterprise_License": "Vállalati licenc", - "Enterprise_License_Description": "Ha a munkaterülete regisztrálva van és a Rocket.Chat felhője biztosítja a licencet, akkor itt nem kell kézzel frissítenie a licencet.", "Entertainment": "Szórakozás", "Error": "Hiba", "Error_something_went_wrong": "Hoppá! Valami elromlott. Töltse újra az oldalt, vagy vegye fel a kapcsolatot egy adminisztrátorral.", @@ -1940,7 +1933,6 @@ "error-tags-must-be-assigned-before-closing-chat": "Címkéket kell hozzárendelni a csevegés lezárása előtt", "error-the-field-is-required": "A(z) {{field}} mező kötelező.", "error-this-is-not-a-livechat-room": "Ez nem összcsatornás szoba", - "error-this-is-an-ee-feature": "Ez egy vállalati kiadási funkció", "error-token-already-exists": "Már létezik ilyen nevű token", "error-token-does-not-exists": "A token nem létezik", "error-too-many-requests": "Hiba, túl sok kérés. Lassítson. Várnia kell {{seconds}} másodpercet, mielőtt újra próbálkozna.", @@ -2231,10 +2223,8 @@ "Global_purge_override_warning": "Globális megőrzési házirend van érvényben. Ha kikapcsolja a „Globális megőrzési házirend felülbírálása” beállítást, akkor csak a globális házirendnél szigorúbb házirendet alkalmazhat.", "Global_Search": "Globális keresés", "Go_to_your_workspace": "Ugrás a munkaterületére", - "Google_Meet_Enterprise_only": "Google Meet (csak vállalati)", "Google_Play": "Google Play", "Hold_Call": "Tartott hívás", - "Hold_Call_EE_only": "Tartott hívás (csak vállalati kiadás)", "GoogleCloudStorage": "Google-felhőtárhely", "GoogleNaturalLanguage_ServiceAccount_Description": "A szolgáltatás fiókkulcsának JSON-fájlja. További információk találhatók [itt](https://cloud.google.com/natural-language/docs/common/auth#set_up_a_service_account)", "GoogleTagManager_id": "Google-címkekezelő azonosítója", @@ -2286,7 +2276,6 @@ "History": "Előzmények", "Hold_Time": "Tartási idő", "Hold": "Tartás", - "Hold_EE_only": "Tartás (csak vállalati kiadás)", "Home": "Kezdőlap", "Homepage": "Honlap", "Host": "Kiszolgáló", @@ -3051,18 +3040,6 @@ "Marketplace_app_last_updated": "Utoljára frissítve: {{lastUpdated}}", "Marketplace_view_marketplace": "Piactér megtekintése", "Marketplace_error": "Nem lehet kapcsolódni az internetre, vagy a munkaterülete kapcsolat nélküli telepítésű lehet.", - "marketplace_featured_section_community_featured": "Kiemelt közösségi alkalmazások", - "marketplace_featured_section_community_supported": "Közösségi támogatású alkalmazások", - "marketplace_featured_section_enterprise": "Kiemelt vállalati alkalmazások", - "marketplace_featured_section_featured": "Kiemelt alkalmazások", - "marketplace_featured_section_most_popular": "Legnépszerűbb alkalmazások", - "marketplace_featured_section_new_arrivals": "Újonnan érkezettek", - "marketplace_featured_section_popular_this_month": "Ebben a hónapban népszerű alkalmazások", - "marketplace_featured_section_recommended": "Ajánlott alkalmazások", - "marketplace_featured_section_social": "Közösségi alkalmazások", - "marketplace_featured_section_trending": "Felkapott alkalmazások", - "marketplace_featured_section_omnichannel": "Összcsatornás alkalmazások", - "marketplace_featured_section_video_conferencing": "Videokonferencia alkalmazások", "MAU_value": "MAU {{value}}", "Max_length_is": "A legnagyobb hossz %s", "Max_number_incoming_livechats_displayed": "A várólistában megjelenített elemek legnagyobb száma", @@ -3314,7 +3291,6 @@ "New_Application": "Új alkalmazás", "New_Business_Hour": "Új munkaidő", "New_Call": "Új hívás", - "New_Call_Enterprise_Edition_Only": "Új hívás (csak vállalati kiadás)", "New_chat_in_queue": "Új csevegés a várólistában", "New_chat_priority": "Prioritás megváltoztatva: {{user}} megváltoztatta a prioritást {{priority}} szintre", "New_chat_transfer": "Új csevegésátadás: {{transfer}}", @@ -3600,7 +3576,6 @@ "Permalink": "Állandó hivatkozás", "Permissions": "Jogosultságok", "Personal_Access_Tokens": "Személyes hozzáférési tokenek", - "Pexip_Enterprise_only": "Pexip (csak vállalati)", "Phone": "Telefon", "Phone_call": "Telefonhívás", "Phone_Number": "Telefonszám", @@ -3763,7 +3738,6 @@ "Rate Limiter_Description": "A kiszolgáló által elküldött vagy fogadott kérések sebességének vezérlése, hogy megakadályozza a kibertámadásokat és az adatkinyeréseket.", "Rate_Limiter_Limit_RegisterUser": "Alapértelmezett hívásszám a sebességkorlátozóhoz egy felhasználó regisztrálásánál", "Rate_Limiter_Limit_RegisterUser_Description": "Az API sebességkorlátozó szakaszban meghatározott időtartományon belül engedélyezett alapértelmezett hívások száma a felhasználó regisztrálási végpontoknál (REST és valós idejű API-k).", - "Reached_seat_limit_banner_warning": "*Nincs több elérhető hely* \nEz a munkaterület elérte a helyek korlátját, így több tag nem csatlakozhat. *[További helyek kérése]({{url}})*", "React_when_read_only": "Reagálás engedélyezése", "React_when_read_only_changed_successfully": "Reagálás engedélyezése csak olvashatókor sikeresen megváltoztatva", "Reacted_with": "Reagált ezzel:", @@ -4819,10 +4793,6 @@ "Update_to_version": "Frissítés a(z) {{version}} verzióra", "Update_your_RocketChat": "A Rocket.Chat frissítése", "Updated_at": "Frissítve", - "Upgrade_tab_connection_error_description": "Úgy tűnik, hogy nincs internetkapcsolata. Ez azért lehet, mert a munkaterülete egy teljesen biztonságos, légréses kiszolgálón van telepítve.", - "Upgrade_tab_connection_error_restore": "Állítsa vissza a kapcsolatot, hogy megtudja, milyen funkciókról maradt le.", - "Upgrade_tab_go_fully_featured": "Irány teljes értékűvé", - "Upgrade_tab_trial_guide": "Próba útmutató", "Upgrade_tab_upgrade_your_plan": "Előfizetéses csomag frissítése", "Upload": "Feltöltés", "Uploads": "Feltöltések", diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ja.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ja.i18n.json index 018cfedf2d4a..5b8c68f4d3b2 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/ja.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/ja.i18n.json @@ -447,7 +447,6 @@ "Apply": "適用", "Apply_and_refresh_all_clients": "すべてのクライアントを適用して更新", "Apps": "アプリ", - "Apps_context_enterprise": "エンタープライズ", "Apps_context_installed": "インストール済み", "Apps_Engine_Version": "アプリエンジンのバージョン", "Apps_Essential_Alert": "このアプリは次のイベントに不可欠です：", @@ -830,7 +829,6 @@ "Close": "閉じる", "Close_chat": "チャットを閉じる", "Close_room_description": "このチャットを閉じようとしています。続行してよろしいですか？", - "Close_to_seat_limit_banner_warning": "*[{{seats}}]のシートが残っています* \nこのワークスペースのシート数の上限に近づいています。上限に達すると、新しいメンバーを追加できません。*[追加のシートを要求する]({{url}})*", "Close_to_seat_limit_warning": "シートの上限に達すると、新しいメンバーを作成できません。", "close-livechat-room": "オムニチャネルRoomを閉じる", "close-livechat-room_description": "現在のオムニチャネルルームを閉じる権限", @@ -865,8 +863,6 @@ "Cloud_register_offline_finish_helper": "Cloud Consoleで登録プロセスを完了すると、テキストが表示されます。ここに貼り付けて登録を完了してください。", "Cloud_register_offline_helper": "エアギャップまたはネットワークアクセスが制限されている場合、ワークスペースを手動で登録できます。以下のテキストをコピーし、Cloud Consoleに移動してプロセスを完了します。", "Cloud_register_success": "ワークスペースが正常に登録されました！", - "Cloud_registration_pending_html": "プッシュ通知は登録が完了するまで機能しません。詳細はこちら", - "Cloud_registration_pending_title": "クラウド登録はまだ保留中です", "Cloud_registration_required": "登録が必要です", "Cloud_registration_required_description": "設定中にワークスペースを登録しない選択をしたようです。", "Cloud_registration_required_link_text": "ワークスペースを登録するにはここをクリックしてください。", @@ -1613,8 +1609,6 @@ "Enter_Normal": "通常モード（Enterで送信）", "Enter_to": "Enterキーで", "Enter_your_E2E_password": "E2Eパスワードを入力してください", - "Enterprise_License": "エンタープライズライセンス", - "Enterprise_License_Description": "ワークスペースが登録されており、ライセンスがRocket.Chat Cloudによって提供されている場合は、ここでライセンスを手動で更新する必要はありません。", "Entertainment": "エンターテインメント", "Error": "エラー", "Error_404": "エラー404", @@ -3385,7 +3379,6 @@ "Random": "ランダム", "Rate_Limiter_Limit_RegisterUser": "ユーザーを登録するためのレート制限へのデフォルト数の呼び出し", "Rate_Limiter_Limit_RegisterUser_Description": "エンドポイント（RESTとリアルタイムAPI）を登録するユーザーのデフォルトの呼び出し数。［APIレート制限］セクションで定義した時間範囲内で許可されます。", - "Reached_seat_limit_banner_warning": "*利用できるシートがありません* \nこのワークスペースはシート数の上限に達したため、メンバーはこれ以上参加できません。*[追加のシートの要求]({{url}})*", "React_when_read_only": "応答を許可", "React_when_read_only_changed_successfully": "読み取り専用が正常に変更された場合の応答を許可", "Reacted_with": "で応答", diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ka-GE.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ka-GE.i18n.json index 6dd72917fe9d..3f88fbb6026d 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/ka-GE.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/ka-GE.i18n.json @@ -1304,8 +1304,6 @@ "Enter_Normal": "ნორმალური რეჟიმი", "Enter_to": "შესვლა", "Enter_your_E2E_password": "შეიყვანეთ თქვენი E2E პაროლი", - "Enterprise_License": "საწარმოოს ლიცენზია", - "Enterprise_License_Description": "თუ თქვენი სამუშაო ადგილი რეგისტრირებულია და ლიცენზირებულია Rocket.Chat Cloud–-ის მიერ , აქ ლიცენზიის ხელით განახლება არ დაგჭირდებათ.", "Entertainment": "გართობა", "Error": "შეცდომა", "Error_404": "შეცდომა: 404", diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/km.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/km.i18n.json index 48417add36f5..bedc3238a00b 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/km.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/km.i18n.json @@ -1192,8 +1192,6 @@ "Enter_Normal": "របៀបធម្មតា (ផ្ញើជាមួយបញ្ចូល)", "Enter_to": "បញ្ចូល", "Enter_your_E2E_password": "បញ្ចូលពាក្យសម្ងាត់ E2E របស់អ្នក", - "Enterprise_License": "អាជ្ញាប័ណ្ណសហគ្រាស", - "Enterprise_License_Description": "ប្រសិនបើកន្លែងធ្វើការរបស់អ្នកត្រូវបានចុះឈ្មោះហើយអាជ្ញាប័ណ្ណត្រូវបានផ្តល់ដោយ Rocket.Chat Cloud អ្នកមិនចាំបាច់ធ្វើបច្ចុប្បន្នភាពអាជ្ញាប័ណ្ណដោយដៃនៅទីនេះទេ។", "Entertainment": "ការកំសាន្ត", "Error": "កំហុសក្នុងការ", "Error_404": "កំហុស: 404", diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ko.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ko.i18n.json index 596a11436883..a5a611626b48 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/ko.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/ko.i18n.json @@ -755,8 +755,6 @@ "Cloud_register_offline_finish_helper": "Cloud Console에서 등록 프로세스를 완료하면 몇 가지 텍스트가 표시됩니다. 등록을 마치려면 여기에 붙여 넣으십시오.", "Cloud_register_offline_helper": "에어 갭 또는 네트워크 액세스가 제한되는 경우 Workspace를 수동으로 등록 할 수 있습니다. 아래 텍스트를 복사하고 Cloud Console로 이동하여 프로세스를 완료하십시오.", "Cloud_register_success": "Workspace가 성공적으로 등록되었습니다!", - "Cloud_registration_pending_html": " 등록이 완료 될 때까지 모바일 알림이 작동하지 않습니다. 자세히 알아보기 ", - "Cloud_registration_pending_title": "현재 클라우드 등록 처리가 지연 중입니다.", "Cloud_registration_required": "등록이 필요합니다.", "Cloud_registration_required_description": "설치 중에는 Workspace가 등록되지 않은 것처럼 보입니다.", "Cloud_registration_required_link_text": " Workspace를 등록하려면 여기를 클릭하십시오.", @@ -1429,8 +1427,6 @@ "Enter_Normal": "일반 모드 (Enter 키와 함께 전송)", "Enter_to": "입력:", "Enter_your_E2E_password": "E2E 비밀번호를 입력하세요.", - "Enterprise_License": "기업 라이센스", - "Enterprise_License_Description": "WorkSpace가 등록되어 있고, Rocket.Chat Cloud에서 제공한 라이선스일 경우, 여기에 라이센스를 수동으로 업데이트 할 필요가 없습니다.", "Entertainment": "엔터테인먼트", "Error": "오류", "Error_404": "오류: 404", diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/lo.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/lo.i18n.json index 840acfaea0e7..d120d793ac71 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/lo.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/lo.i18n.json @@ -998,8 +998,6 @@ "Enter_name_here": "ກະລຸນາໃສ່ຊື່ນີ້", "Enter_Normal": "ໂຫມດປະກະຕິ (ສົ່ງກັບ Enter)", "Enter_to": "ກະລຸນາໃສ່ທີ່", - "Enterprise_License": "ສິດໃຊ້ງານລະດັບອົງກອນ", - "Enterprise_License_Description": "ຫາກພື້ນທີ່ເຮັດວຽກຂອງທ່ານລົງທະບຽນ ແລະ ໄດ້ຮັບອະນຸຍາດຈາກ Rocket.Chat Cloud ທ່ານບໍ່ຈໍາເປັນຕ້ອງອັບເດດສິຂະສິດການນໍາໃຊ້ເອງຢູ່ບ່ອນນີ້.", "Entertainment": "ຄວາມບັນເທີງ", "Error": "Error", "Error_404": "ຂໍ້ຜິດພາດ: 404", diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/lv.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/lv.i18n.json index 5c7898c44863..36d608606537 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/lv.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/lv.i18n.json @@ -986,8 +986,6 @@ "Enter_name_here": "Ievadiet nosaukumu šeit", "Enter_Normal": "Normāls režīms (nosūtīt ar 'Enter')", "Enter_to": "Enter uz", - "Enterprise_License": "Uzņēmuma licence", - "Enterprise_License_Description": "Ja jūsu darbvieta ir reģistrēta un licenci nodrošina Rocket.Chat Mākulis, jums šeit licence nav manuāli jāaktualalizē.", "Entertainment": "Izklaide", "Error": "Kļūda", "Error_404": "Kļūda: 404", diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/nl.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/nl.i18n.json index 725d860fa28d..3af1970a8b59 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/nl.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/nl.i18n.json @@ -450,7 +450,6 @@ "Apply": "Toepassen", "Apply_and_refresh_all_clients": "Toepassen en alle klanten opnieuw laden", "Apps": "Apps", - "Apps_context_enterprise": "Onderneming", "Apps_context_installed": "Geïnstalleerd", "Apps_Engine_Version": "Apps Engine-versie", "Apps_Essential_Alert": "Deze app is essentieel voor de volgende evenementen:", @@ -838,7 +837,6 @@ "Close": "Sluiten", "Close_chat": "Chat sluiten", "Close_room_description": "Je staat op het punt deze chat te sluiten. Weet je zeker dat je wilt doorgaan?", - "Close_to_seat_limit_banner_warning": "*Je hebt nog [{{seats}}] plaatsen over* \nDeze werkruimte nadert zijn limiet qua plaatsen. Zodra de limiet bereikt is, kunnen er geen nieuwe leden worden toegevoegd. *[Meer plaatsen aanvragen]({{url}})*", "Close_to_seat_limit_warning": "Er kunnen geen nieuwe leden worden aangemaakt zodra de plaatslimiet bereikt is.", "close-livechat-room": "Omnichannel-ruimte sluiten", "close-livechat-room_description": "Toestemming om de huidige omnichannel-ruimte te sluiten", @@ -873,8 +871,6 @@ "Cloud_register_offline_finish_helper": "Nadat u het registratieproces in de Cloud Console hebt voltooit, krijgt u wat tekst te zien. Plak het hier om de registratie te voltooien.", "Cloud_register_offline_helper": "Werkruimten kunnen handmatig worden geregistreerd als het airgapped is of wanneer de netwerktoegang beperkt is. Kopieer de onderstaande tekst en ga naar onze Cloud Console om het proces te voltooien.", "Cloud_register_success": "Uw werkruimte is succesvol geregistreerd!", - "Cloud_registration_pending_html": "Pushmeldingen werken pas als de registratie voltooid is. Meer informatie", - "Cloud_registration_pending_title": "Cloudregistratie is nog in behandeling", "Cloud_registration_required": "Registratie vereist", "Cloud_registration_required_description": "Het lijkt erop dat u tijdens de installatie er niet hebt voor gekozen om uw werkruimte te registreren.", "Cloud_registration_required_link_text": "Klik hier om je werkruimte te registreren.", @@ -1626,8 +1622,6 @@ "Enter_Normal": "Normale modus (verzenden met Enter)", "Enter_to": "Enter om", "Enter_your_E2E_password": "Voer uw E2E-wachtwoord in", - "Enterprise_License": "Enterprise-licentie", - "Enterprise_License_Description": "Als uw werkruimte geregistreerd is en de licentie verstrekt wordt door Rocket.Chat Cloud, hoeft u de licentie hier niet handmatig bij te werken.", "Entertainment": "Vermaak", "Error": "Fout", "Error_404": "Foutmelding 404", @@ -3407,7 +3401,6 @@ "Random": "Willekeurig", "Rate_Limiter_Limit_RegisterUser": "Standaard aantal oproepen naar de snelheidsbegrenzer (rate limiter) voor het registreren van een gebruiker", "Rate_Limiter_Limit_RegisterUser_Description": "Aantaal standaardoproepen voor gebruikersregistratie-eindpunten (REST en realtime API's), toegestaan binnen het tijdbereik dat is gedefinieerd in de sectie API Rate Limiter.", - "Reached_seat_limit_banner_warning": "*Geen plaatsen meer beschikbaar* \nDeze werkruimte heeft de plaatslimiet bereikt, er kunnen dus geen leden meer toegevoegd worden. *[Meer plaatsen aanvragen]({{url}})*", "React_when_read_only": "Reageren toestaan", "React_when_read_only_changed_successfully": "Laat reageren wanneer alleen lezen succesvol is gewijzigd", "Reacted_with": "Reageerde met", @@ -4367,10 +4360,6 @@ "Update_to_version": "Update naar {{version}}", "Update_your_RocketChat": "Update je Rocket.Chat", "Updated_at": "Bijgewerkt op", - "Upgrade_tab_connection_error_description": "Het lijkt erop dat je geen internetverbinding hebt. Dit kan komen omdat jouw werkruimte geïnstalleerd is op een volledig beveiligde air-gapped server", - "Upgrade_tab_connection_error_restore": "Herstel uw verbinding om meer te weten komen over functies die u mist.", - "Upgrade_tab_go_fully_featured": "Upgrade naar de volledige versie", - "Upgrade_tab_trial_guide": "Proefgids", "Upgrade_tab_upgrade_your_plan": "Upgrade je abonnement", "Upload": "Uploaden", "Uploads": "Uploads", diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/no.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/no.i18n.json index 2d9dd3b11fef..665ed70ab141 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/no.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/no.i18n.json @@ -1040,8 +1040,6 @@ "Enter_name_here": "Skriv inn navn her", "Enter_Normal": "Normal modus (send med Enter)", "Enter_to": "Skriv inn til", - "Enterprise_License": "Enterpriselisens", - "Enterprise_License_Description": "Hvis arbeidsområdet ditt er registrert og lisensen er levert av Rocket.Chat Cloud trenger du ikke å oppdatere lisensen manuelt her.", "Entertainment": "Underholdning", "Error": "Feil", "Error_404": "Feil: 404", diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/pl.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/pl.i18n.json index 628b6c3aafde..f1350cbad455 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/pl.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/pl.i18n.json @@ -480,7 +480,6 @@ "Apply_and_refresh_all_clients": "Zastosuj i odśwież wszystkich klientów", "Apps": "Aplikacje", "Apps_context_explore": "Poznaj", - "Apps_context_enterprise": "Enterprise", "Apps_context_installed": "Zainstalowana", "Apps_Engine_Version": "Wersja silnika aplikacji", "Apps_Essential_Alert": "Ta aplikacja jest niezbędna dla następujących zdarzeń:", @@ -776,7 +775,6 @@ "Call_provider": "Dostawca połączenia", "Call_Already_Ended": "Połączenie już zakończone", "Call_number": "Numer połączenia", - "Call_number_enterprise_only": "Numer połączenia (tylko wersja Enterprise Edition)", "call-management": "Zarządzanie połączeniami", "call-management_description": "Zezwolenie na rozpoczęcie spotkania", "Call_unavailable_for_federation": "Połączenie jest niedostępne dla pokoi Federacji", @@ -917,7 +915,6 @@ "Close": "Zamknij", "Close_chat": "Zamknij czat", "Close_room_description": "Za chwilę zamkniesz ten czat. Czy na pewno chcesz kontynuować?", - "Close_to_seat_limit_banner_warning": "* Zostało miejsc: [{{seats}}]* \nTen obszar roboczy zbliża się do limitu miejsc. Po osiągnięciu limitu nie będzie można dodawać nowych członków. *[Poproś o więcej miejsc]({{url}})*.", "Close_to_seat_limit_warning": "Po wyczerpaniu limitu miejsc nie można tworzyć nowych członków.", "close-livechat-room": "Zamknij pokój Omnichannel", "close-livechat-room_description": "Uprawnienie do zamykania bieżącego pokoju Omnichannel", @@ -952,8 +949,6 @@ "Cloud_register_offline_finish_helper": "Po zakończeniu procesu rejestracji w konsoli chmury powinien pojawić się tekst. Wklej go tutaj, aby zakończyć rejestrację.", "Cloud_register_offline_helper": "Obszary robocze można zarejestrować ręcznie, jeśli dostęp do sieci jest ograniczony. Skopiuj poniższy tekst i przejdź do konsoli chmury, aby zakończyć proces.", "Cloud_register_success": "Twój obszar roboczy został zarejestrowany!", - "Cloud_registration_pending_html": "Powiadomienia push nie będą działać do czasu zakończenia rejestracj.Dowiedz się więcej", - "Cloud_registration_pending_title": "Rejestracja w chmurze jest nadal w toku", "Cloud_registration_required": "Rejestracja wymagana", "Cloud_registration_required_description": "Wygląda na to, że podczas konfiguracji nie wybrano opcji rejestracji obszaru roboczego.", "Cloud_registration_required_link_text": "Kliknij tutaj, aby zarejestrować swój obszar roboczy.", @@ -1766,8 +1761,6 @@ "Enter_Normal": "Tryb normalny (wysyłaj klawiszem Enter)", "Enter_to": "Naciśnij Enter: ", "Enter_your_E2E_password": "Wprowadź swoje hasło E2E", - "Enterprise_License": "Licencja Enterprise", - "Enterprise_License_Description": "Jeśli Twoja przestrzeń robocza jest zarejestrowana i licencja jest dostarczana przez Rocket.Chat Cloud, nie musisz ręcznie aktualizować licencji tutaj.", "Entertainment": "Rozrywka", "Error": "Błąd", "Error_something_went_wrong": "Ups! Coś poszło nie tak. Odśwież stronę lub skontaktuj się z administratorem.", @@ -1910,7 +1903,6 @@ "error-tags-must-be-assigned-before-closing-chat": "Tag(i) musi (muszą) być przypisane przed zamknięciem czatu", "error-the-field-is-required": "Wymagane jest {{field}} pola.", "error-this-is-not-a-livechat-room": "To nie jest pokój Livechata", - "error-this-is-an-ee-feature": "To jest funkcja edycji Enterprise", "error-token-already-exists": "Token o tej nazwie już istnieje", "error-token-does-not-exists": "Token nie istnieje", "error-too-many-requests": "Błąd, zbyt wiele żądań. Proszę zwolnij. Musisz czekać {{seconds}} sekund przed ponowną próbą.", @@ -2200,7 +2192,6 @@ "Go_to_your_workspace": "Idź do swojej przestrzeni roboczej", "Google_Play": "Google Play", "Hold_Call": "Zawieś połączenie", - "Hold_Call_EE_only": "Zawieszenie połączenia (tylko wersja Enterprise)", "GoogleCloudStorage": "Google Cloud Storage", "GoogleNaturalLanguage_ServiceAccount_Description": "Plik JSON klucza usługi. Więcej informacji można znaleźć [tutaj] (https://cloud.google.com/natural-language/docs/common/auth#set_up_a_service_account)", "GoogleTagManager_id": "Menedżer tagów Google Id", @@ -3255,7 +3246,6 @@ "New_Application": "Nowa aplikacja", "New_Business_Hour": "Nowe godziny pracy", "New_Call": "Nowe połączenie", - "New_Call_Enterprise_Edition_Only": "Nowe połączenie (tylko wersja Enterprise)", "New_chat_in_queue": "Nowa rozmowa w kolejce", "New_chat_priority": "Zmieniono priorytet: {{user}} zmienił priorytet na {{priority}}", "New_chat_transfer": "Nowy transfer czatu: {{transfer}}", @@ -3697,7 +3687,6 @@ "Rate Limiter_Description": "Kontroluj częstotliwość żądań wysyłanych lub odbieranych przez Twój serwer, aby zapobiec cyberatakom i scrapingowi.", "Rate_Limiter_Limit_RegisterUser": "Domyślna liczba wywołań dla limitu żądań przy rejestracji użytkownika", "Rate_Limiter_Limit_RegisterUser_Description": "Liczba domyślnych wywołań dla punktów końcowych rejestrujących użytkownika (interfejsów API REST i czasu rzeczywistego), dozwolonych w zakresie czasowym określonym w sekcji Limit żądań interfejsu API.", - "Reached_seat_limit_banner_warning": "*Brak dostępnych miejsc* \nTa przestrzeń robocza osiągnęła swój limit miejsc, więc nikt więcej nie może dołączyć. *[Poproś o więcej miejsc]({{url}})", "React_when_read_only": "Zezwalaj na reagowanie", "React_when_read_only_changed_successfully": "Zezwalaj na reagowanie, gdy zmiana tylko do odczytu jest pomyślna", "Reacted_with": "reaguje z", @@ -4744,10 +4733,6 @@ "Update_to_version": "Zaktualizuj do {{version}}", "Update_your_RocketChat": "Zaktualizuj swój Rocket.Chat", "Updated_at": "Zaktualizowano na", - "Upgrade_tab_connection_error_description": "Wygląda na to, że nie masz połączenia z internetem. Może to być spowodowane tym, że Twoja przestrzeń robocza jest zainstalowana na w pełni zabezpieczonym serwerze", - "Upgrade_tab_connection_error_restore": "Przywróć połączenie, aby dowiedzieć się o funkcjach, których Ci brakuje.", - "Upgrade_tab_go_fully_featured": "Zostań w pełni funkcjonalny", - "Upgrade_tab_trial_guide": "Przewodnik próbny", "Upgrade_tab_upgrade_your_plan": "Zwiększ poziom swojego plan", "Upload": "Wczytaj", "Uploads": "Przesyłane pliki", diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/pt-BR.i18n.json index 0102410d80b6..57b9fe9f4306 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/pt-BR.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/pt-BR.i18n.json @@ -480,7 +480,6 @@ "Apply": "Aplicar", "Apply_and_refresh_all_clients": "Aplicar e atualizar todos os clientes", "Apps": "Aplicativos", - "Apps_context_enterprise": "Enterprise", "Apps_context_installed": "Instalado", "Apps_Engine_Version": "Versão do mecanismo de aplicativos", "Apps_Essential_Alert": "Este aplicativo é essencial para os seguintes eventos:", @@ -880,7 +879,6 @@ "Close": "Fechar", "Close_chat": "Fechar conversa", "Close_room_description": "Você está prestes a fechar esta conversa. Você tem certeza de que deseja continuar?", - "Close_to_seat_limit_banner_warning": "*Você tem [{{seats}}] lugares vagos* \nEste espaço de trabalho está próximo do seu limite de lugares. Assim que o limite for atingido, não poderão ser adicionados novos membros. *[Solicitar mais lugares]({{url}})*", "Close_to_seat_limit_warning": "Novos membros não podem ser criados, pois o limite de lugares foi atingido.", "close-livechat-room": "Fechar sala omnichannel", "close-livechat-room_description": "Permissão para fechar a sala Omnichannel atual", @@ -915,8 +913,6 @@ "Cloud_register_offline_finish_helper": "Após concluir o processo de registro no console da nuvem, você será apresentado a um texto. Cole-o aqui para finalizar o registro.", "Cloud_register_offline_helper": "Os espaços de trabalho podem ser registrados manualmente caso estejam esgotados ou acesso à rede seja restrito. Copie o texto abaixo e vá até nossa Cloud Console para concluir o processo.", "Cloud_register_success": "Seu espaço de trabalho foi registrado com sucesso!", - "Cloud_registration_pending_html": "Notificações móveis não funcionarão até que o registro seja finalizado. Saiba mais", - "Cloud_registration_pending_title": "Registro na nuvem ainda está pendente", "Cloud_registration_required": "Registro solicitado", "Cloud_registration_required_description": "Parece que durante a configuração você optou por não registrar seu espaço de trabalho.", "Cloud_registration_required_link_text": "Clique aqui para registrar seu espaço de trabalho.", @@ -1669,8 +1665,6 @@ "Enter_Normal": "Modo normal (enviar com Enter)", "Enter_to": "Enter para", "Enter_your_E2E_password": "Digite sua senha E2E", - "Enterprise_License": "Licença Enterprise", - "Enterprise_License_Description": "Se você registrou seu espaço de trabalho e a licença foi fornecida pela Rocket.Chat Cloud, você não precisará atualizar a licença manualmente aqui.", "Entertainment": "Entretenimento", "Error": "Erro", "Error_404": "Erro 404", @@ -2122,7 +2116,6 @@ "History": "Histórico", "Hold_Time": "Tempo de espera", "Hold": "Pausar", - "Hold_EE_only": "Pausar (Enterprise Edition only)", "Home": "Início", "Host": "Host", "Hospitality_Businness": "Hospitalidade", @@ -3476,7 +3469,6 @@ "Random": "Aleatória", "Rate_Limiter_Limit_RegisterUser": "Número padrão de chamadas para o limitador de taxa para os endpoints de registro de usuário", "Rate_Limiter_Limit_RegisterUser_Description": "Número de chamadas padrão para as endpoints de registro de usuário (API REST e real-time), permitido dentro do intervalo de tempo na seção Limitação de Taxa de API.", - "Reached_seat_limit_banner_warning": "*Não há mais lugares disponíveis* \nEste espaço de trabalho atingiu o seu limite de lugares, portanto nenhum membro poderá entrar. *[Solicitar mais lugares]({{url}})*", "React_when_read_only": "Permitir reação", "React_when_read_only_changed_successfully": "Permitir reação quando somente leitura foi alterada com sucesso", "Reacted_with": "Reagiu com", @@ -4458,10 +4450,6 @@ "Update_to_version": "Atualizado para {{version}}", "Update_your_RocketChat": "Atualize seu Rocket.Chat", "Updated_at": "Atualizado em", - "Upgrade_tab_connection_error_description": "Parece que você não está com conexão com a internet. Isso pode ser porque sua workspace está instalada num servidor totalmente seguro sem acesso à internet", - "Upgrade_tab_connection_error_restore": "Restaure sua conexão para aprender sobre funcionalidades que você está perdendo", - "Upgrade_tab_go_fully_featured": "Obtenha todos os recursos", - "Upgrade_tab_trial_guide": "Guia de teste", "Upgrade_tab_upgrade_your_plan": "Faça upgrade no seu plano", "Upload": "Upload", "Uploads": "Uploads", diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ru.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ru.i18n.json index 292172682bd3..3c665654e89b 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/ru.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/ru.i18n.json @@ -497,7 +497,6 @@ "Apply": "Подать заявление", "Apply_and_refresh_all_clients": "Применить", "Apps": "Приложения", - "Apps_context_enterprise": "Организация", "Apps_context_installed": "Установлен", "Apps_context_requested": "Запрошено", "Apps_context_private": "Приватные приложения", @@ -506,7 +505,6 @@ "Private_Apps_Count_Enabled": "{{count}} приватное приложение включено", "Private_Apps_Count_Enabled_plural": "{{count}} приватных приложений включено", "Apps_Count_Enabled_tooltip": "В рабочих пространствах Community Edition можно использовать до {{number}} {{context}} приложений", - "Apps_disabled_when_Enterprise_trial_ended": "Приложения отключены по окончании пробной версии Enterprise", "Apps_Engine_Version": "Версия движка приложений", "Apps_Essential_Alert": "Это приложение необходимо для следующих событий:", "Apps_Essential_Disclaimer": "Перечисленные выше события будут прерваны, если это приложение будет отключено. Если вы хотите, чтобы Rocket.Chat работал без функциональности этого приложения, вам необходимо его удалить", @@ -803,7 +801,6 @@ "Call_provider": "Поставщик вызовов", "Call_Already_Ended": "Вызов уже завершен", "Call_number": "Вызов номера", - "Call_number_enterprise_only": "Вызов номера (Только для ЕЕ)", "call-management": "Управление вызовами", "call-management_description": "Разрешение на начало собрания", "Call_ongoing": "Звонок продолжается", @@ -939,7 +936,6 @@ "Close": "Закрыть", "Close_chat": "Закрыть чат", "Close_room_description": "Вы собираетесь закрыть этот чат. Вы уверены, что хотите продолжить?", - "Close_to_seat_limit_banner_warning": "*Мест осталось: [{{seats}}]* \nОграничение на количество мест в этом рабочем пространстве скоро будет достигнуто. После достижения ограничения добавление новых пользователей станет невозможным. *[Запросить дополнительные места]({{url}})*", "Close_to_seat_limit_warning": "Создание новых участников невозможно после достижения ограничения на количество мест.", "close-livechat-room": "Закрыть комнату Livechat ", "close-livechat-room_description": "Разрешение на закрытие текущего чата LiveChat", @@ -974,8 +970,6 @@ "Cloud_register_offline_finish_helper": "После завершения процесса регистрации в Cloud Console вам должен быть представлен некоторый текст. Пожалуйста, вставьте его здесь, чтобы закончить регистрацию.", "Cloud_register_offline_helper": "Рабочие места могут быть зарегистрированы вручную, если доступ в сеть ограничен. Скопируйте текст ниже и перейдите в нашу Cloud Console, чтобы завершить процесс.", "Cloud_register_success": "Ваше рабочее место успешно зарегистрировано!", - "Cloud_registration_pending_html": "Мобильные уведомления не будут работать до тех пор, пока не будет завершена регистрация. Узнайте больше ", - "Cloud_registration_pending_title": "Регистрация в облаке еще не завершена", "Cloud_registration_required": "Требуется регистрация", "Cloud_registration_required_description": "Похоже, что во время установки вы не решили регистрировать свое рабочее пространство.", "Cloud_registration_required_link_text": "Нажмите здесь, чтобы зарегистрировать ваше рабочее пространство.", @@ -1759,8 +1753,6 @@ "Enter_Normal": "Обычный режим (отправка по Enter)", "Enter_to": "Войти в", "Enter_your_E2E_password": "Введите пароль E2E", - "Enterprise_License": "Корпоративная лицензия", - "Enterprise_License_Description": "Если ваше рабочее пространство зарегистрировано и лицензия предоставлена Rocket.Chat Cloud, вам не нужно вручную обновлять лицензию здесь.", "Entertainment": "Развлечения", "Error": "Ошибка", "Error_something_went_wrong": "Ой! Что-то пошло не так. Пожалуйста, перезагрузите страницу или обратитесь к администратору.", @@ -2165,7 +2157,6 @@ "Global_Search": "Общий поиск", "Go_to_your_workspace": "Перейти в рабочее пространство", "Hold_Call": "Удерживать вызов", - "Hold_Call_EE_only": "Удержание вызова (Только для ЕЕ)", "GoogleCloudStorage": "Google Cloud Storage", "GoogleNaturalLanguage_ServiceAccount_Description": "Учетная запись ключа JSON файла. Больше информации можно найти здесь [here](https://cloud.google.com/natural-language/docs/common/auth#set_up_a_service_account)", "GoogleTagManager_id": "Идентификатор Google Tag Manager ", @@ -3158,7 +3149,6 @@ "New_Application": "Новое приложение", "New_Business_Hour": "Новые рабочие часы", "New_Call": "Новый звонок", - "New_Call_Enterprise_Edition_Only": "Новый звонок (Только для ЕЕ)", "New_chat_in_queue": "Новый чат в очереди", "New_chat_priority": "Приоритет изменен: {{user}} изменил приоритет на {{priority}}", "New_chat_transfer": "Новый чат-трансфер: {{transfer}}", @@ -3564,7 +3554,6 @@ "Random": "Случайный", "Rate_Limiter_Limit_RegisterUser": "Звонки с номера по умолчанию на ограничитель скорости для регистрации пользователя", "Rate_Limiter_Limit_RegisterUser_Description": "Количество вызовов по умолчанию для регистрации конечных точек пользователем (API REST и API реального времени), разрешенных в пределах временного диапазона, указанного в разделе \"Ограничение частоты запросов к API\".", - "Reached_seat_limit_banner_warning": "*Больше нет доступных рабочих мест* \nВ этом рабочем пространстве достигнуто ограничение по количеству мест, поэтому новые участники не смогут присоединиться. *[Запросить дополнительные рабочие места]({{url}})*", "React_when_read_only": "Разрешить реакции", "React_when_read_only_changed_successfully": "Разрешение на реакции при включенном режиме только для чтения изменено", "Reacted_with": "Реагирует с", @@ -4543,10 +4532,6 @@ "Update_to_version": "Обновить до {{version}}", "Update_your_RocketChat": "Обновите ваш Rocket.Chat", "Updated_at": "Обновлено в", - "Upgrade_tab_connection_error_description": "Кажется у вас нет подключения к интернету. Это возможно потому, что ваш воркспейс развернут на полностью защищенном изолированном сервере.", - "Upgrade_tab_connection_error_restore": "Восстановите подключение, чтобы узнать у всех возможностях, которые вы упускаете.", - "Upgrade_tab_go_fully_featured": "Полнофункциональная версия", - "Upgrade_tab_trial_guide": "Руководство по пробному периоду", "Upgrade_tab_upgrade_your_plan": "Улучшить ваш план", "Upload": "Загрузить", "Uploads": "Загрузки", diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/sk-SK.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/sk-SK.i18n.json index ac64631201ec..510fe6471c4c 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/sk-SK.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/sk-SK.i18n.json @@ -981,7 +981,6 @@ "Enter_name_here": "Tu zadajte názov", "Enter_Normal": "Normálny režim (odoslať pomocou Enter)", "Enter_to": "Zadajte do", - "Enterprise_License": "Enterprise licencia", "Entertainment": "zábava", "Error": "Chyba", "Error_404": "Chyba: 404", diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/sv.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/sv.i18n.json index a3dc221f5093..ce6007c4df8e 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/sv.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/sv.i18n.json @@ -498,7 +498,6 @@ "Apply_and_refresh_all_clients": "Tillämpa och uppdatera alla klienter", "Apps": "Appar", "Apps_context_explore": "Utforska", - "Apps_context_enterprise": "Enterprise", "Apps_context_installed": "Installerad", "Apps_context_requested": "Begärt", "Apps_context_private": "Privata appar", @@ -507,9 +506,6 @@ "Private_Apps_Count_Enabled": "{{count}} privat app aktiverad", "Private_Apps_Count_Enabled_plural": "{{count}} privata appar aktiverade", "Apps_Count_Enabled_tooltip": "Arbetsytorna i Community Edition kan aktivera upp till {{number}} {{context}} appar", - "Apps_disabled_when_Enterprise_trial_ended": "Appar inaktiverade när Enterprise trial avslutades", - "Apps_disabled_when_Enterprise_trial_ended_description": "Arbetsytorna i Community Edition kan ha upp till 5 marknadsplatsappar och 3 privata appar aktiverade. Be din arbetsrumsadministratör att återaktivera appar.", - "Apps_disabled_when_Enterprise_trial_ended_description_admin": "Arbetsytorna i Community Edition kan ha upp till 5 marknadsplatsappar och 3 privata appar aktiverade. Återaktivera de appar du behöver.", "Apps_Engine_Version": "App Engine-version", "Apps_Essential_Alert": "Den här appen behövs för följande händelser:", "Apps_Essential_Disclaimer": "De händelser som anges ovan avbryts om appen inaktiveras. Vill du använda Rocket.Chat utan den här appens funktioner måste du avinstallera den", @@ -821,7 +817,6 @@ "Call_provider": "Samtalsleverantör", "Call_Already_Ended": "Samtalet har redan avslutats", "Call_number": "Ring upp nummer", - "Call_number_enterprise_only": "Ring upp nummer (endast Enterprise Edition)", "call-management": "Samtalshantering", "call-management_description": "Behörighet att starta ett möte", "Call_ongoing": "Samtal pågår", @@ -966,7 +961,6 @@ "Close": "Stäng", "Close_chat": "Stäng chatt", "Close_room_description": "Du håller på att stänga chatten. Vill du fortsätta?", - "Close_to_seat_limit_banner_warning": "*Du har [{{seats}}] platser kvar* \nArbetsytans användarlicenser är nästan slut. När gränsen har uppnåtts kan inga nya medlemmar läggas till. *[Begär fler användarlicenser]({{url}})*", "Close_to_seat_limit_warning": "Du kan inte lägga till fler användare när gränsen för användare har uppnåtts.", "close-livechat-room": "Stäng Omnichannel-rum \n", "close-livechat-room_description": "Behörighet att stänga den aktuella Omnichannel-kanalen", @@ -1005,8 +999,6 @@ "Cloud_register_offline_finish_helper": "När du har slutfört registreringen i molnkonsolen ska text visas för dig. Klistra in den här för att slutföra registreringen.", "Cloud_register_offline_helper": "Arbetsytor kan registreras manuellt om nätverket är airgap-skyddat eller om nätverksåtkomsten är begränsad. Kopiera texten nedan och gå till molnkonsolen för att slutföra processen.", "Cloud_register_success": "Arbetsytan har registrerats.", - "Cloud_registration_pending_html": "Pushmeddelanden kan inte användas förrän registreringen är slutförd. Mer information", - "Cloud_registration_pending_title": "Molnregistreringen är fortfarande inte slutförd", "Cloud_registration_required": "Registrering krävs", "Cloud_registration_required_description": "Du verkar inte ha valt att registrera din arbetsyta under konfigurationen.", "Cloud_registration_required_link_text": "Klicka här för att registrera arbetsytan.", @@ -1848,14 +1840,6 @@ "Enter_your_E2E_password": "Ange ditt E2E-lösenord", "Enter_your_password_to_delete_your_account": "Ange ditt lösenord för att radera ditt konto. Detta kan inte göras ogjort.", "Enter_your_username_to_delete_your_account": "Ange ditt användarnamn för att radera ditt konto. Detta kan inte göras ogjort.", - "Enterprise_capability": "Enterprise-funktioner", - "Enterprise_capabilities": "Enterprise-funktioner", - "Enterprise_Departments_title": "Tilldela kunder till köer och förbättra agenternas produktivitet", - "Enterprise_Departments_description_upgrade": "Arbetsytorna i Community Edition kan bara skapa en avdelning. Uppgradera till Enterprise för att ta bort begränsningar och ge ditt arbetsområde mer kraft.", - "Enterprise_Departments_description_free_trial": "Arbetsytorna i Community Edition kan skapa en avdelning. Starta en kostnadsfri testversion för Enterprise för att skapa flera avdelningar idag!", - "Enterprise_License": "Enterprise-licens", - "Enterprise_License_Description": "Om din arbetsyta är registrerad och en licens har tillhandahållits av Rocket.Chat-molnet behöver du inte uppdatera licensen manuellt här.", - "Enterprise_Only": "Endast Enterprise", "Entertainment": "Underhållning", "Error": "Fel", "Error_something_went_wrong": "Ojdå! Något gick fel. Läs in sidan igen eller kontakta en administratör.", @@ -2004,7 +1988,6 @@ "error-tags-must-be-assigned-before-closing-chat": "Taggar måste tilldelas innan chatten stängs", "error-the-field-is-required": "Fältet {{field}} krävs.", "error-this-is-not-a-livechat-room": "Detta är inte ett Omnichannel-rum", - "error-this-is-an-ee-feature": "Det här är en funktion för Enterprise Edition", "error-token-already-exists": "Det finns redan en token med det namnet", "error-token-does-not-exists": "Token finns inte", "error-too-many-requests": "Fel, alltför många förfrågningar. Snälla sakta ner. Du måste vänta {{seconds}} sekunder innan du försöker igen.", @@ -2137,7 +2120,6 @@ "Federation_Matrix_losing_privileges_warning": "Du kommer inte att kunna ångra denna åtgärd eftersom du degraderar dig själv. Om du är den sista privilegierade användaren kan du inte återfå dessa privilegier. Vill du fortsätta ändå?", "Federation_Matrix_not_allowed_to_change_moderator": "Du får inte ändra moderatorn", "Federation_Matrix_not_allowed_to_change_owner": "Du får inte byta ägare", - "Federation_Matrix_join_public_rooms_is_enterprise": "Gå med i federerade rum är en funktion i Enterprise Edition", "Field": "Fält", "Field_removed": "Fältet borttaget", "Field_required": "Fält krävs", @@ -2310,10 +2292,8 @@ "Global_purge_override_warning": "Det finns en global policy för lagring av information. Om du inte väljer \"åsidosätt global lagringspolicy\" kan du bara tillämpa en policy som är strängare än den globala policyn.", "Global_Search": "Global sökning", "Go_to_your_workspace": "Gå till din arbetsyta", - "Google_Meet_Enterprise_only": "Google Meet (endast Enterprise Edition)", "Google_Play": "Google Play", "Hold_Call": "Parkera samtal", - "Hold_Call_EE_only": "Parkera samtal (endast Enterprise Edition)", "GoogleCloudStorage": "Google Cloud Storage", "GoogleNaturalLanguage_ServiceAccount_Description": "JSON-fil för tjänstekontonyckel. Mer information finns [här] (https://cloud.google.com/natural-language/docs/common/auth#set_up_a_service_account)", "GoogleTagManager_id": "Google Tag manager id", @@ -2369,7 +2349,6 @@ "History": "Historik", "Hold_Time": "Spärrtid", "Hold": "Spärra", - "Hold_EE_only": "Spärra (endast Enterprise Edition)", "Home": "Hem", "Homepage": "Hemsida", "Homepage_Custom_Content_Default_Message": "Administratörer kan lägga in html-innehåll som ska återges i detta vita utrymme.", @@ -3169,18 +3148,6 @@ "Marketplace_app_last_updated": "Uppdaterades senast {{lastUpdated}}", "Marketplace_view_marketplace": "Visa Marketplace", "Marketplace_error": "Det går inte att ansluta till internet eller så kanske arbetsytan är installerad offline.", - "marketplace_featured_section_community_featured": "Utvalda communityappar", - "marketplace_featured_section_community_supported": "Appar som stöds av communityn", - "marketplace_featured_section_enterprise": "Utvalda Enterprise-sappar", - "marketplace_featured_section_featured": "Utvalda appar", - "marketplace_featured_section_most_popular": "De populäraste apparna", - "marketplace_featured_section_new_arrivals": "Nyheter", - "marketplace_featured_section_popular_this_month": "Populära appar den här månaden ", - "marketplace_featured_section_recommended": "Rekommenderade appar", - "marketplace_featured_section_social": "Appar för sociala nätverk", - "marketplace_featured_section_trending": "Trendande appar", - "marketplace_featured_section_omnichannel": "Omnichannel-appar", - "marketplace_featured_section_video_conferencing": "Appar för videokonferenser", "MAU_value": "MAU {{value}}", "Max_length_is": "Max längd är %s", "Max_number_incoming_livechats_displayed": "Högsta antal objekt som visas i kön", @@ -3442,7 +3409,6 @@ "New_Application": "Ny applikation", "New_Business_Hour": "Ny kontorstid", "New_Call": "Nytt samtal", - "New_Call_Enterprise_Edition_Only": "Nytt samtal (endast Enterprise Edition)", "New_chat_in_queue": "Ny chatt i kö", "New_chat_priority": "Prioriteten har ändrats: {{user}} ändrade prioriteten till {{priority}}", "New_chat_transfer": "Ny chattöverföring: {{transfer}}", @@ -3743,7 +3709,6 @@ "Permalink": "Länka meddelande", "Permissions": "Tillstånd", "Personal_Access_Tokens": "Personliga åtkomsttokens", - "Pexip_Enterprise_only": "Pexip (endast Enterprise Edition)", "Phone": "Telefon", "Phone_call": "Telefonsamtal", "Phone_Number": "Telefonnummer", @@ -3909,7 +3874,6 @@ "Rate Limiter_Description": "Kontrollera andelen förfrågningar som skickas eller tas emot av servern för att förhindra cyberangrepp och skrapning.", "Rate_Limiter_Limit_RegisterUser": "Standardantalet anrop till begränsningen vid registrering av en användare", "Rate_Limiter_Limit_RegisterUser_Description": "Antalet standardanrop till slutpunkter för användarregistrering (REST- och realtids-API:er), som tillåts inom det tidsintervall som angetts i avsnittet för API-begränsning.", - "Reached_seat_limit_banner_warning": "*Inga fler tillgängliga användarlicenser* \nAlla arbetsytans användarlicenser används, så inga fler medlemmar kan ansluta. *[Begär fler användarlicenser]({{url}})*", "React_when_read_only": "Tillåt reaktion", "React_when_read_only_changed_successfully": "Tillåta att reagera när ändring av skrivskyddad information har lyckats", "Reacted_with": "Reagerade med", @@ -4288,7 +4252,6 @@ "Search": "Sök", "Searchable": "Sökbart", "Search_Apps": "Sök efter appar", - "Search_Enterprise_Apps": "Sök efter Enterprise-applikationer", "Search_Installed_Apps": "Sök efter installerade appar", "Search_Private_apps": "Sök efter privata appar", "Search_Requested_Apps": "Sök efter efterfrågade appar", @@ -5010,10 +4973,6 @@ "Update_to_version": "Uppdatera till {{version}}", "Update_your_RocketChat": "Uppdatera din Rocket.Chat", "Updated_at": "Uppdaterad den", - "Upgrade_tab_connection_error_description": "Du verkar inte ha någon internetanslutning. Det kan bero på att din arbetsyta är installerad på en komplett skyddad server med airgap-skydd", - "Upgrade_tab_connection_error_restore": "Upprätta anslutningen om du vill veta mer om de funktioner du går miste om.", - "Upgrade_tab_go_fully_featured": "Aktivera alla funktioner", - "Upgrade_tab_trial_guide": "Provperiodsguide", "Upgrade_tab_upgrade_your_plan": "Uppgradera ditt abonnemang", "Upload": "Ladda upp", "Uploads": "Uppladdningar", @@ -5606,9 +5565,7 @@ "Undo_request": "Ångra förfrågan", "No_permission": "Inget tillstånd", "Community_cap_description": "Arbetsytorna i Community Edition har ett tak på 200 samtidiga anslutningar, även om du kan ha fler anslutningar aktiva, kan du inte se användarnas status när du har nått gränsen. Detta påverkar inte deras förmåga att skicka och ta emot meddelanden.", - "Enterprise_cap_description": "Arbetsytorna i Community Edition för Enterprise har inget tak för närvarotjänsten.", "Service_status": "Status för tjänsten", - "More_about_Enterprise_Edition": "Mer om Enterprise Edition", "Presence_service_cap": "Tak för närvarotjänster", "User_Status": "Användarstatus", "Active_connections": "Aktiva anslutningar", @@ -5674,7 +5631,6 @@ "cloud.RegisterWorkspace_Token_Step_One": "1. Gå till: <1>cloud.rocket.chat > Arbetsytor och klicka på \" <3>Register self-managed\".", "cloud.RegisterWorkspace_Setup_Terms_Privacy": "Jag godkänner <1>villkoren och <3>integritetspolicyn", "Larger_amounts_of_active_connections": "För större mängder aktiva anslutningar kan du överväga vår", - "multiple_instance_solutions": "lösningar med flera instanser", "Uninstall_grandfathered_app": "Avinstallera {{appName}}?", "App_will_lose_grandfathered_status": "**Denna {{context}}-app kommer att förlora sin status som gammal app.** \n \nArbetsytorna i Community Edition kan ha upp till {{limit}} __kontext__-appar aktiverade. Gamla appar inkluderas i gränsen, men gränsen tillämpas inte på dem.", "Theme_Appearence": "Utseende för tema" diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/uk.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/uk.i18n.json index 0a2a9f357043..0dca22c1deae 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/uk.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/uk.i18n.json @@ -1289,7 +1289,6 @@ "Enter_Normal": "Нормальний режим (відправляти клавішою \"Enter\")", "Enter_to": "Ввійти в", "Enter_your_E2E_password": "Введіть свій пароль E2E", - "Enterprise_License": "Ліцензія підприємства", "Entertainment": "Розваги", "Error": "Помилка", "Error_404": "Помилка: 404", diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/zh-TW.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/zh-TW.i18n.json index b3ffdcde1c99..c3c9c4558fae 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/zh-TW.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/zh-TW.i18n.json @@ -829,7 +829,6 @@ "Close": "關閉", "Close_chat": "關閉聊天", "Close_room_description": "您即將關閉此聊天。您確定要繼續嗎？", - "Close_to_seat_limit_banner_warning": "*您還剩 [{{seats}}] 個座位* \n此工作區已接近其座位限制。 一旦達到限制，就不能增加新會員。 *[申請更多席位]({{url}})*", "Close_to_seat_limit_warning": "一旦到達座位限制，則無法建立新會員。", "close-livechat-room": "關閉客服 Room", "close-livechat-room_description": "有權限關閉當前客服聊天室", @@ -864,8 +863,6 @@ "Cloud_register_offline_finish_helper": "在雲端控制介面完成註冊程序之後您應該會顯示一些文字。請貼到這裡來完成註冊。", "Cloud_register_offline_helper": "如果存在間隙或網路存取受到限制，則可以手動註冊工作區。複製下面的文字，然後轉到我們的雲端控制介面以完成該過程。", "Cloud_register_success": "您的工作區已成功註冊！", - "Cloud_registration_pending_html": "在註冊完成之前，手機通知將沒有作用。 了解更多 ", - "Cloud_registration_pending_title": "雲端註冊仍在等待中", "Cloud_registration_required": "必須註冊", "Cloud_registration_required_description": "看起來安裝過程中您沒有選擇您的工作區域。", "Cloud_registration_required_link_text": "點擊這裡來註冊您的工作區域。", @@ -1605,8 +1602,6 @@ "Enter_Normal": "普通模式（使用 Enter 發送）", "Enter_to": "進入", "Enter_your_E2E_password": "輸入您的 E2E 密碼", - "Enterprise_License": "企業授權", - "Enterprise_License_Description": "如果您的工作區已註冊，並且授權是由Rocket.Chat Cloud提供的，則無需在此處手動更新授權。", "Entertainment": "娛樂", "Error": "錯誤", "Error_404": "錯誤：404", diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/zh.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/zh.i18n.json index a26efafc07ae..891840365d1e 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/zh.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/zh.i18n.json @@ -764,8 +764,6 @@ "Cloud_register_offline_finish_helper": "在Cloud Console中完成注册过程后，应该显示出一些文本。请粘贴到此处以完成注册。", "Cloud_register_offline_helper": "如果网络访问受到限制，可以手动注册工作区。复制下面的文字并转到Cloud Console以完成本次操作。", "Cloud_register_success": "您的工作区已成功注册！", - "Cloud_registration_pending_html": "完成注册前移动端通知将不可用。了解更多", - "Cloud_registration_pending_title": "云注册尚未完成", "Cloud_registration_required": "要求注册", "Cloud_registration_required_description": "在安装过程中，您似乎没有选择注册工作区。", "Cloud_registration_required_link_text": "点此注册您的工作区。", @@ -1452,8 +1450,6 @@ "Enter_Normal": "常规模式（Enter 发送消息）", "Enter_to": "进入", "Enter_your_E2E_password": "输入您的端到端密码", - "Enterprise_License": "企业许可证", - "Enterprise_License_Description": "如果您的工作区已经注册，且您的许可证由Rock.Chat Cloud提供，那么您无需在这里手动更新许可证。", "Entertainment": "娱乐", "Error": "错误", "Error_404": "错误：404", From 5e0bc2ffbff4e1438c9881bfd589842733a744f9 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Wed, 22 Nov 2023 20:17:50 -0300 Subject: [PATCH 27/76] chore: unify subscription manage urls (#31041) --- .../api/server/middlewares/authentication.ts | 36 +++++++++++++++---- .../cloud/server/functions/getCheckoutUrl.ts | 11 ++++-- .../SubscriptionCalloutLimits.tsx | 25 ++++--------- .../subscription/components/UpgradeButton.tsx | 21 +++-------- .../subscription/hooks/useCheckoutUrl.ts | 16 ++++++++- .../app/license/server/getSeatsRequestLink.ts | 13 +++++-- .../views/admin/users/useRequestSeatsLink.ts | 2 +- apps/meteor/ee/server/requestSeatsRoute.ts | 31 ++++++++++------ 8 files changed, 97 insertions(+), 58 deletions(-) diff --git a/apps/meteor/app/api/server/middlewares/authentication.ts b/apps/meteor/app/api/server/middlewares/authentication.ts index 0d644b09d02b..8da60e822357 100644 --- a/apps/meteor/app/api/server/middlewares/authentication.ts +++ b/apps/meteor/app/api/server/middlewares/authentication.ts @@ -1,19 +1,27 @@ import { hashLoginToken } from '@rocket.chat/account-utils'; +import { Authorization } from '@rocket.chat/core-services'; import { Users } from '@rocket.chat/models'; import type { Request, Response, NextFunction } from 'express'; import { oAuth2ServerAuth } from '../../../oauth2-server-config/server/oauth/oauth2-server'; type AuthenticationMiddlewareConfig = { - rejectUnauthorized: boolean; + rejectUnauthorized?: boolean; + cookies?: boolean; }; -const defaultAuthenticationMiddlewareConfig = { - rejectUnauthorized: true, -}; - -export function authenticationMiddleware(config: AuthenticationMiddlewareConfig = defaultAuthenticationMiddlewareConfig) { +export function authenticationMiddleware( + config: AuthenticationMiddlewareConfig = { + rejectUnauthorized: true, + cookies: false, + }, +) { return async (req: Request, res: Response, next: NextFunction): Promise => { + if (config.cookies) { + req.headers['x-auth-token'] = req.cookies.rc_token ?? req.headers['x-auth-token']; + req.headers['x-user-id'] = req.cookies.rc_uid ?? req.headers['x-user-id']; + } + const { 'x-user-id': userId, 'x-auth-token': authToken } = req.headers; if (userId && authToken) { @@ -32,3 +40,19 @@ export function authenticationMiddleware(config: AuthenticationMiddlewareConfig next(); }; } + +export function hasPermissionMiddleware(permission: string) { + return async (req: Request, res: Response, next: NextFunction): Promise => { + if (!req.userId) { + res.status(401).send('Unauthorized'); + return; + } + + if (!(await Authorization.hasPermission(req.userId, permission))) { + res.status(403).send('Forbidden'); + return; + } + + next(); + }; +} diff --git a/apps/meteor/app/cloud/server/functions/getCheckoutUrl.ts b/apps/meteor/app/cloud/server/functions/getCheckoutUrl.ts index 3c7d01030893..c3c08454f3d3 100644 --- a/apps/meteor/app/cloud/server/functions/getCheckoutUrl.ts +++ b/apps/meteor/app/cloud/server/functions/getCheckoutUrl.ts @@ -4,9 +4,14 @@ import { SystemLogger } from '../../../../server/lib/logger/system'; import { settings } from '../../../settings/server'; import { getURL } from '../../../utils/server/getURL'; import { getWorkspaceAccessTokenOrThrow } from './getWorkspaceAccessToken'; +import { syncWorkspace } from './syncWorkspace'; -export const getCheckoutUrl = async () => { +export const getCheckoutUrl = async (): Promise<{ + url: string; +}> => { try { + await syncWorkspace(); + const token = await getWorkspaceAccessTokenOrThrow(true, 'workspace:billing', false); const subscriptionURL = getURL('admin/subscription', { @@ -40,6 +45,8 @@ export const getCheckoutUrl = async () => { err, }); - throw err; + return { + url: `https://go.rocket.chat/i/contact-sales`, + }; } }; diff --git a/apps/meteor/client/views/admin/subscription/SubscriptionCalloutLimits.tsx b/apps/meteor/client/views/admin/subscription/SubscriptionCalloutLimits.tsx index 7558f3bff19f..3fcaf54cad9a 100644 --- a/apps/meteor/client/views/admin/subscription/SubscriptionCalloutLimits.tsx +++ b/apps/meteor/client/views/admin/subscription/SubscriptionCalloutLimits.tsx @@ -6,11 +6,10 @@ import React from 'react'; import { Trans, useTranslation } from 'react-i18next'; import { useLicense } from '../../../hooks/useLicense'; -import { useCheckoutUrlAction } from './hooks/useCheckoutUrl'; -import { CONTACT_SALES_LINK } from './utils/links'; +import { useCheckoutUrl } from './hooks/useCheckoutUrl'; export const SubscriptionCalloutLimits = () => { - const mutation = useCheckoutUrlAction(); + const manageSubscriptionUrl = useCheckoutUrl(); const { t } = useTranslation(); const result = useLicense({ loadValues: true }); @@ -66,14 +65,6 @@ export const SubscriptionCalloutLimits = () => { const map = (key: keyof typeof limits) => t(`subscription.callout.${key}`); - const handleClick = (params: Record) => (e: React.MouseEvent) => { - e.preventDefault(); - if (mutation.isLoading) { - return; - } - mutation.mutate(params); - }; - return ( <> {start_fair_policy && ( @@ -81,8 +72,7 @@ export const SubscriptionCalloutLimits = () => { Your workspace reached the <>{{ val: start_fair_policy.map(map) }} limit. { Your workspace exceeded the <>{{ val: prevent_action.map(map) }} license limit. { Your workspace exceeded the <>{{ val: disable_modules.map(map) }} license limit. { Your workspace exceeded the <>{{ val: invalidate_license.map(map) }} license limit. { - const mutation = useCheckoutUrlAction(); - - const handleBtnClick = () => { - if (mutation.isLoading) { - return; - } - - mutation.mutate({ - target, - action, - }); - }; + const url = useCheckoutUrl()({ target, action }); return ( - ); diff --git a/apps/meteor/client/views/admin/subscription/hooks/useCheckoutUrl.ts b/apps/meteor/client/views/admin/subscription/hooks/useCheckoutUrl.ts index e4ea7ef042bd..0d26f90bb40e 100644 --- a/apps/meteor/client/views/admin/subscription/hooks/useCheckoutUrl.ts +++ b/apps/meteor/client/views/admin/subscription/hooks/useCheckoutUrl.ts @@ -1,4 +1,4 @@ -import { useEndpoint } from '@rocket.chat/ui-contexts'; +import { useAbsoluteUrl, useEndpoint } from '@rocket.chat/ui-contexts'; import { useMutation } from '@tanstack/react-query'; import { useExternalLink } from '../../../../hooks/useExternalLink'; @@ -35,3 +35,17 @@ export const useCheckoutUrlAction = () => { }, }); }; + +export const useCheckoutUrl = () => { + const absoluteUrl = useAbsoluteUrl()('/links/manage-subscription'); + + return (query?: Record) => { + const url = new URL(absoluteUrl); + if (query) { + Object.entries(query).forEach(([key, value]) => { + url.searchParams.append(key, value.toString()); + }); + } + return url.toString(); + }; +}; diff --git a/apps/meteor/ee/app/license/server/getSeatsRequestLink.ts b/apps/meteor/ee/app/license/server/getSeatsRequestLink.ts index 4394723370a0..76401d9320ce 100644 --- a/apps/meteor/ee/app/license/server/getSeatsRequestLink.ts +++ b/apps/meteor/ee/app/license/server/getSeatsRequestLink.ts @@ -1,11 +1,12 @@ import type { ISetting } from '@rocket.chat/core-typings'; import { Settings, Users } from '@rocket.chat/models'; -type WizardSettings = Array; +import { getCheckoutUrl } from '../../../../app/cloud/server/functions/getCheckoutUrl'; -const url = 'https://go.rocket.chat/i/seats-cap-upgrade'; +type WizardSettings = Array; -export const getSeatsRequestLink = async (): Promise => { +export const getSeatsRequestLink = async (params?: Record): Promise => { + const { url } = await getCheckoutUrl(); const workspaceId = await Settings.findOneById('Cloud_Workspace_Id'); const activeUsers = await Users.getActiveLocalUserCount(); const wizardSettings: WizardSettings = await Settings.findSetupWizardSettings().toArray(); @@ -26,5 +27,11 @@ export const getSeatsRequestLink = async (): Promise => { newUrl.searchParams.append(setting._id.toLowerCase(), String(setting.value)); }); + if (params) { + Object.entries(params).forEach(([key, value]) => { + newUrl.searchParams.append(key, String(value)); + }); + } + return newUrl.toString(); }; diff --git a/apps/meteor/ee/client/views/admin/users/useRequestSeatsLink.ts b/apps/meteor/ee/client/views/admin/users/useRequestSeatsLink.ts index b88fff67dea4..68762127fcd4 100644 --- a/apps/meteor/ee/client/views/admin/users/useRequestSeatsLink.ts +++ b/apps/meteor/ee/client/views/admin/users/useRequestSeatsLink.ts @@ -1,3 +1,3 @@ import { useAbsoluteUrl } from '@rocket.chat/ui-contexts'; -export const useRequestSeatsLink = (): string => useAbsoluteUrl()('/requestSeats'); +export const useRequestSeatsLink = (): string => useAbsoluteUrl()('/links/manage-subscription'); diff --git a/apps/meteor/ee/server/requestSeatsRoute.ts b/apps/meteor/ee/server/requestSeatsRoute.ts index c01174bf7163..ae6ee78c0867 100644 --- a/apps/meteor/ee/server/requestSeatsRoute.ts +++ b/apps/meteor/ee/server/requestSeatsRoute.ts @@ -1,17 +1,28 @@ -import type { IncomingMessage, ServerResponse } from 'http'; - import { Analytics } from '@rocket.chat/core-services'; -import { Meteor } from 'meteor/meteor'; +import express from 'express'; import { WebApp } from 'meteor/webapp'; +import { authenticationMiddleware, hasPermissionMiddleware } from '../../app/api/server/middlewares/authentication'; import { getSeatsRequestLink } from '../app/license/server/getSeatsRequestLink'; -Meteor.startup(() => { - WebApp.connectHandlers.use('/requestSeats/', async (_: IncomingMessage, res: ServerResponse) => { - const url = await getSeatsRequestLink(); +const apiServer = express(); + +WebApp.connectHandlers.use(apiServer); + +// eslint-disable-next-line new-cap +const router = express.Router(); + +apiServer.use('/requestSeats', router); +apiServer.use('/links/manage-subscription', router); + +router.use(authenticationMiddleware({ rejectUnauthorized: true, cookies: true })); + +router.use(hasPermissionMiddleware('manage-cloud')); + +router.get('/', async (req, res) => { + const url = await getSeatsRequestLink(req.query as Record); - await Analytics.saveSeatRequest(); - res.writeHead(302, { Location: url }); - res.end(); - }); + await Analytics.saveSeatRequest(); + res.writeHead(302, { Location: url }); + res.end(); }); From 4856b718e0710d89dde23a6e819fc5054aa5eb2e Mon Sep 17 00:00:00 2001 From: rocketchat-github-ci Date: Wed, 22 Nov 2023 23:31:19 +0000 Subject: [PATCH 28/76] Release 6.5.0-rc.9 [no ci] --- .changeset/bump-patch-1700695874400.md | 5 ++++ .changeset/pre.json | 1 + apps/meteor/.docker/Dockerfile.rhel | 2 +- apps/meteor/CHANGELOG.md | 26 +++++++++++++++++++ apps/meteor/app/utils/rocketchat.info | 2 +- apps/meteor/ee/server/services/CHANGELOG.md | 10 +++++++ apps/meteor/ee/server/services/package.json | 2 +- apps/meteor/package.json | 2 +- ee/apps/account-service/CHANGELOG.md | 10 +++++++ ee/apps/account-service/package.json | 2 +- ee/apps/authorization-service/CHANGELOG.md | 10 +++++++ ee/apps/authorization-service/package.json | 2 +- ee/apps/ddp-streamer/CHANGELOG.md | 12 +++++++++ ee/apps/ddp-streamer/package.json | 2 +- ee/apps/omnichannel-transcript/CHANGELOG.md | 11 ++++++++ ee/apps/omnichannel-transcript/package.json | 2 +- ee/apps/presence-service/CHANGELOG.md | 10 +++++++ ee/apps/presence-service/package.json | 2 +- ee/apps/queue-worker/CHANGELOG.md | 10 +++++++ ee/apps/queue-worker/package.json | 2 +- ee/apps/stream-hub-service/CHANGELOG.md | 9 +++++++ ee/apps/stream-hub-service/package.json | 2 +- ee/packages/api-client/CHANGELOG.md | 7 +++++ ee/packages/api-client/package.json | 2 +- ee/packages/ddp-client/CHANGELOG.md | 7 +++++ ee/packages/ddp-client/package.json | 2 +- ee/packages/license/CHANGELOG.md | 6 +++++ ee/packages/license/package.json | 2 +- ee/packages/omnichannel-services/CHANGELOG.md | 11 ++++++++ ee/packages/omnichannel-services/package.json | 2 +- ee/packages/pdf-worker/CHANGELOG.md | 6 +++++ ee/packages/pdf-worker/package.json | 2 +- ee/packages/presence/CHANGELOG.md | 8 ++++++ ee/packages/presence/package.json | 2 +- package.json | 2 +- packages/core-services/CHANGELOG.md | 8 ++++++ packages/core-services/package.json | 2 +- packages/core-typings/CHANGELOG.md | 2 ++ packages/core-typings/package.json | 2 +- packages/cron/CHANGELOG.md | 7 +++++ packages/cron/package.json | 2 +- packages/fuselage-ui-kit/CHANGELOG.md | 8 ++++++ packages/fuselage-ui-kit/package.json | 6 ++--- packages/gazzodown/CHANGELOG.md | 8 ++++++ packages/gazzodown/package.json | 8 +++--- packages/instance-status/CHANGELOG.md | 6 +++++ packages/instance-status/package.json | 2 +- packages/livechat/CHANGELOG.md | 6 +++++ packages/livechat/package.json | 2 +- packages/model-typings/CHANGELOG.md | 6 +++++ packages/model-typings/package.json | 2 +- packages/models/CHANGELOG.md | 6 +++++ packages/models/package.json | 2 +- packages/rest-typings/CHANGELOG.md | 7 +++++ packages/rest-typings/package.json | 2 +- packages/ui-client/CHANGELOG.md | 6 +++++ packages/ui-client/package.json | 4 +-- packages/ui-contexts/CHANGELOG.md | 8 ++++++ packages/ui-contexts/package.json | 2 +- packages/ui-video-conf/CHANGELOG.md | 6 +++++ packages/ui-video-conf/package.json | 4 +-- packages/uikit-playground/CHANGELOG.md | 7 +++++ packages/uikit-playground/package.json | 2 +- packages/web-ui-registration/CHANGELOG.md | 6 +++++ packages/web-ui-registration/package.json | 4 +-- yarn.lock | 16 ++++++------ 66 files changed, 305 insertions(+), 49 deletions(-) create mode 100644 .changeset/bump-patch-1700695874400.md diff --git a/.changeset/bump-patch-1700695874400.md b/.changeset/bump-patch-1700695874400.md new file mode 100644 index 000000000000..e1eaa7980afb --- /dev/null +++ b/.changeset/bump-patch-1700695874400.md @@ -0,0 +1,5 @@ +--- +'@rocket.chat/meteor': patch +--- + +Bump @rocket.chat/meteor version. diff --git a/.changeset/pre.json b/.changeset/pre.json index 048436a83629..f38ecfeb63ce 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -68,6 +68,7 @@ "bump-patch-1699998565522", "bump-patch-1700263798234", "bump-patch-1700616232353", + "bump-patch-1700695874400", "cool-rockets-talk", "cool-zoos-move", "cuddly-ties-run", diff --git a/apps/meteor/.docker/Dockerfile.rhel b/apps/meteor/.docker/Dockerfile.rhel index a1d9dd5ac2bd..f7def4a1e7ed 100644 --- a/apps/meteor/.docker/Dockerfile.rhel +++ b/apps/meteor/.docker/Dockerfile.rhel @@ -1,6 +1,6 @@ FROM registry.access.redhat.com/ubi8/nodejs-12 -ENV RC_VERSION 6.5.0-rc.8 +ENV RC_VERSION 6.5.0-rc.9 MAINTAINER buildmaster@rocket.chat diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md index 4343fa12d4cd..6875d2acdf5a 100644 --- a/apps/meteor/CHANGELOG.md +++ b/apps/meteor/CHANGELOG.md @@ -1,5 +1,31 @@ # @rocket.chat/meteor +## 6.5.0-rc.9 + +### Patch Changes + +- Bump @rocket.chat/meteor version. + - @rocket.chat/core-typings@6.5.0-rc.9 + - @rocket.chat/rest-typings@6.5.0-rc.9 + - @rocket.chat/api-client@0.1.18-rc.2 + - @rocket.chat/license@0.1.0-rc.9 + - @rocket.chat/omnichannel-services@0.1.0-rc.9 + - @rocket.chat/pdf-worker@0.0.24-rc.2 + - @rocket.chat/presence@0.1.0-rc.9 + - @rocket.chat/core-services@0.3.0-rc.9 + - @rocket.chat/cron@0.0.20-rc.2 + - @rocket.chat/gazzodown@3.0.0-rc.9 + - @rocket.chat/model-typings@0.2.0-rc.9 + - @rocket.chat/ui-contexts@3.0.0-rc.9 + - @rocket.chat/server-cloud-communication@0.0.1 + - @rocket.chat/fuselage-ui-kit@3.0.0-rc.9 + - @rocket.chat/models@0.0.24-rc.2 + - @rocket.chat/ui-theming@0.1.1-rc.0 + - @rocket.chat/ui-client@3.0.0-rc.9 + - @rocket.chat/ui-video-conf@3.0.0-rc.9 + - @rocket.chat/web-ui-registration@3.0.0-rc.8 + - @rocket.chat/instance-status@0.0.24-rc.2 + ## 6.5.0-rc.8 ### Patch Changes diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info index 0a2cc51c2ddd..ab77c3b854de 100644 --- a/apps/meteor/app/utils/rocketchat.info +++ b/apps/meteor/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "6.5.0-rc.8" + "version": "6.5.0-rc.9" } diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md index a8265f034311..c181b3a97ed2 100644 --- a/apps/meteor/ee/server/services/CHANGELOG.md +++ b/apps/meteor/ee/server/services/CHANGELOG.md @@ -1,5 +1,15 @@ # rocketchat-services +## 1.1.18-rc.2 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.9 +- @rocket.chat/rest-typings@6.5.0-rc.9 +- @rocket.chat/core-services@0.3.0-rc.9 +- @rocket.chat/model-typings@0.2.0-rc.9 +- @rocket.chat/models@0.0.24-rc.2 + ## 1.1.18-rc.1 ### Patch Changes diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json index 868c72c35c6d..7d7cd57f118b 100644 --- a/apps/meteor/ee/server/services/package.json +++ b/apps/meteor/ee/server/services/package.json @@ -1,7 +1,7 @@ { "name": "rocketchat-services", "private": true, - "version": "1.1.18-rc.1", + "version": "1.1.18-rc.2", "description": "Rocket.Chat Authorization service", "main": "index.js", "scripts": { diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 5f5f4575c3d9..24fdb3485282 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/meteor", "description": "The Ultimate Open Source WebChat Platform", - "version": "6.5.0-rc.8", + "version": "6.5.0-rc.9", "private": true, "author": { "name": "Rocket.Chat", diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md index 33f833cf07c4..45ae022afb10 100644 --- a/ee/apps/account-service/CHANGELOG.md +++ b/ee/apps/account-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/account-service +## 0.3.0-rc.9 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.9 +- @rocket.chat/rest-typings@6.5.0-rc.9 +- @rocket.chat/core-services@0.3.0-rc.9 +- @rocket.chat/model-typings@0.2.0-rc.9 +- @rocket.chat/models@0.0.24-rc.2 + ## 0.3.0-rc.8 ### Patch Changes diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json index 606df999ad0a..56bca1a03062 100644 --- a/ee/apps/account-service/package.json +++ b/ee/apps/account-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/account-service", "private": true, - "version": "0.3.0-rc.8", + "version": "0.3.0-rc.9", "description": "Rocket.Chat Account service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/authorization-service/CHANGELOG.md b/ee/apps/authorization-service/CHANGELOG.md index f55e4d29b71e..dbf2d209b1c4 100644 --- a/ee/apps/authorization-service/CHANGELOG.md +++ b/ee/apps/authorization-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/authorization-service +## 0.3.0-rc.9 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.9 +- @rocket.chat/rest-typings@6.5.0-rc.9 +- @rocket.chat/core-services@0.3.0-rc.9 +- @rocket.chat/model-typings@0.2.0-rc.9 +- @rocket.chat/models@0.0.24-rc.2 + ## 0.3.0-rc.8 ### Patch Changes diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json index d2d9a55ad587..4881898434b2 100644 --- a/ee/apps/authorization-service/package.json +++ b/ee/apps/authorization-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/authorization-service", "private": true, - "version": "0.3.0-rc.8", + "version": "0.3.0-rc.9", "description": "Rocket.Chat Authorization service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/ddp-streamer/CHANGELOG.md b/ee/apps/ddp-streamer/CHANGELOG.md index 9b25e4d926b7..60fc609b46ff 100644 --- a/ee/apps/ddp-streamer/CHANGELOG.md +++ b/ee/apps/ddp-streamer/CHANGELOG.md @@ -1,5 +1,17 @@ # @rocket.chat/ddp-streamer +## 0.2.0-rc.9 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.9 +- @rocket.chat/rest-typings@6.5.0-rc.9 +- @rocket.chat/core-services@0.3.0-rc.9 +- @rocket.chat/model-typings@0.2.0-rc.9 +- @rocket.chat/ui-contexts@3.0.0-rc.9 +- @rocket.chat/models@0.0.24-rc.2 +- @rocket.chat/instance-status@0.0.24-rc.2 + ## 0.2.0-rc.8 ### Patch Changes diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json index 9041bcb87cae..9349881450d2 100644 --- a/ee/apps/ddp-streamer/package.json +++ b/ee/apps/ddp-streamer/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/ddp-streamer", "private": true, - "version": "0.2.0-rc.8", + "version": "0.2.0-rc.9", "description": "Rocket.Chat DDP-Streamer service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/omnichannel-transcript/CHANGELOG.md b/ee/apps/omnichannel-transcript/CHANGELOG.md index 41e6bdffe706..7161a3804e68 100644 --- a/ee/apps/omnichannel-transcript/CHANGELOG.md +++ b/ee/apps/omnichannel-transcript/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/omnichannel-transcript +## 0.3.0-rc.9 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.9 +- @rocket.chat/omnichannel-services@0.1.0-rc.9 +- @rocket.chat/pdf-worker@0.0.24-rc.2 +- @rocket.chat/core-services@0.3.0-rc.9 +- @rocket.chat/model-typings@0.2.0-rc.9 +- @rocket.chat/models@0.0.24-rc.2 + ## 0.3.0-rc.8 ### Patch Changes diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json index 4ca1fb806a6a..d011f00c8d9b 100644 --- a/ee/apps/omnichannel-transcript/package.json +++ b/ee/apps/omnichannel-transcript/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/omnichannel-transcript", "private": true, - "version": "0.3.0-rc.8", + "version": "0.3.0-rc.9", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/presence-service/CHANGELOG.md b/ee/apps/presence-service/CHANGELOG.md index 081faf08d43b..df86ef19ac32 100644 --- a/ee/apps/presence-service/CHANGELOG.md +++ b/ee/apps/presence-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/presence-service +## 0.3.0-rc.9 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.9 +- @rocket.chat/presence@0.1.0-rc.9 +- @rocket.chat/core-services@0.3.0-rc.9 +- @rocket.chat/model-typings@0.2.0-rc.9 +- @rocket.chat/models@0.0.24-rc.2 + ## 0.3.0-rc.8 ### Patch Changes diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json index 22e3397126cf..2565026e97c2 100644 --- a/ee/apps/presence-service/package.json +++ b/ee/apps/presence-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/presence-service", "private": true, - "version": "0.3.0-rc.8", + "version": "0.3.0-rc.9", "description": "Rocket.Chat Presence service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/queue-worker/CHANGELOG.md b/ee/apps/queue-worker/CHANGELOG.md index 59e85a87aeb5..8e7e6599707b 100644 --- a/ee/apps/queue-worker/CHANGELOG.md +++ b/ee/apps/queue-worker/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/queue-worker +## 0.3.0-rc.9 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.9 +- @rocket.chat/omnichannel-services@0.1.0-rc.9 +- @rocket.chat/core-services@0.3.0-rc.9 +- @rocket.chat/model-typings@0.2.0-rc.9 +- @rocket.chat/models@0.0.24-rc.2 + ## 0.3.0-rc.8 ### Patch Changes diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json index 60b7d66e968f..819ca5003995 100644 --- a/ee/apps/queue-worker/package.json +++ b/ee/apps/queue-worker/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/queue-worker", "private": true, - "version": "0.3.0-rc.8", + "version": "0.3.0-rc.9", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/stream-hub-service/CHANGELOG.md b/ee/apps/stream-hub-service/CHANGELOG.md index afadd0a38fb5..9e5692c653b4 100644 --- a/ee/apps/stream-hub-service/CHANGELOG.md +++ b/ee/apps/stream-hub-service/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/stream-hub-service +## 0.3.0-rc.9 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.9 +- @rocket.chat/core-services@0.3.0-rc.9 +- @rocket.chat/model-typings@0.2.0-rc.9 +- @rocket.chat/models@0.0.24-rc.2 + ## 0.3.0-rc.8 ### Patch Changes diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json index 47d176dbcfec..6974eff8a811 100644 --- a/ee/apps/stream-hub-service/package.json +++ b/ee/apps/stream-hub-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/stream-hub-service", "private": true, - "version": "0.3.0-rc.8", + "version": "0.3.0-rc.9", "description": "Rocket.Chat Stream Hub service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/packages/api-client/CHANGELOG.md b/ee/packages/api-client/CHANGELOG.md index 56346f915172..badefa044606 100644 --- a/ee/packages/api-client/CHANGELOG.md +++ b/ee/packages/api-client/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/api-client +## 0.1.18-rc.2 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.9 +- @rocket.chat/rest-typings@6.5.0-rc.9 + ## 0.1.18-rc.1 ### Patch Changes diff --git a/ee/packages/api-client/package.json b/ee/packages/api-client/package.json index 5a4b887556ba..b5df99b86261 100644 --- a/ee/packages/api-client/package.json +++ b/ee/packages/api-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/api-client", - "version": "0.1.18-rc.1", + "version": "0.1.18-rc.2", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/ddp-client/CHANGELOG.md b/ee/packages/ddp-client/CHANGELOG.md index 184982c72472..f86b7525a3a7 100644 --- a/ee/packages/ddp-client/CHANGELOG.md +++ b/ee/packages/ddp-client/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/ddp-client +## 0.2.9-rc.2 + +### Patch Changes + +- @rocket.chat/rest-typings@6.5.0-rc.9 +- @rocket.chat/api-client@0.1.18-rc.2 + ## 0.2.9-rc.1 ### Patch Changes diff --git a/ee/packages/ddp-client/package.json b/ee/packages/ddp-client/package.json index 245d0680ca03..af033fe4f1ed 100644 --- a/ee/packages/ddp-client/package.json +++ b/ee/packages/ddp-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ddp-client", - "version": "0.2.9-rc.1", + "version": "0.2.9-rc.2", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/license/CHANGELOG.md b/ee/packages/license/CHANGELOG.md index 81276946b1a9..5dd3dc1aa2c9 100644 --- a/ee/packages/license/CHANGELOG.md +++ b/ee/packages/license/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/license +## 0.1.0-rc.9 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.9 + ## 0.1.0-rc.8 ### Patch Changes diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json index f1a789c6f76d..6d37c1527118 100644 --- a/ee/packages/license/package.json +++ b/ee/packages/license/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/license", - "version": "0.1.0-rc.8", + "version": "0.1.0-rc.9", "private": true, "devDependencies": { "@swc/core": "^1.3.95", diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md index 98f14a960476..62e831df432f 100644 --- a/ee/packages/omnichannel-services/CHANGELOG.md +++ b/ee/packages/omnichannel-services/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/omnichannel-services +## 0.1.0-rc.9 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.9 +- @rocket.chat/rest-typings@6.5.0-rc.9 +- @rocket.chat/pdf-worker@0.0.24-rc.2 +- @rocket.chat/core-services@0.3.0-rc.9 +- @rocket.chat/model-typings@0.2.0-rc.9 +- @rocket.chat/models@0.0.24-rc.2 + ## 0.1.0-rc.8 ### Patch Changes diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json index 1e4545e1fe71..a7586edac9be 100644 --- a/ee/packages/omnichannel-services/package.json +++ b/ee/packages/omnichannel-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/omnichannel-services", - "version": "0.1.0-rc.8", + "version": "0.1.0-rc.9", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/ee/packages/pdf-worker/CHANGELOG.md b/ee/packages/pdf-worker/CHANGELOG.md index 4213e221fb55..3b97bbf4163d 100644 --- a/ee/packages/pdf-worker/CHANGELOG.md +++ b/ee/packages/pdf-worker/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/pdf-worker +## 0.0.24-rc.2 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.9 + ## 0.0.24-rc.1 ### Patch Changes diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json index 809c10516a95..a4fe783c75af 100644 --- a/ee/packages/pdf-worker/package.json +++ b/ee/packages/pdf-worker/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/pdf-worker", - "version": "0.0.24-rc.1", + "version": "0.0.24-rc.2", "private": true, "devDependencies": { "@storybook/addon-essentials": "~6.5.16", diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md index bea9d734d07f..a90b3e90b5e4 100644 --- a/ee/packages/presence/CHANGELOG.md +++ b/ee/packages/presence/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/presence +## 0.1.0-rc.9 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.9 +- @rocket.chat/core-services@0.3.0-rc.9 +- @rocket.chat/models@0.0.24-rc.2 + ## 0.1.0-rc.8 ### Patch Changes diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json index 82b7613d6cb4..094d91452f86 100644 --- a/ee/packages/presence/package.json +++ b/ee/packages/presence/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/presence", - "version": "0.1.0-rc.8", + "version": "0.1.0-rc.9", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/package.json b/package.json index 74ab9f77bcc2..90e8e13f34a6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket.chat", - "version": "6.5.0-rc.8", + "version": "6.5.0-rc.9", "description": "Rocket.Chat Monorepo", "main": "index.js", "private": true, diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md index 7b09556f0c44..b3cdab9065a4 100644 --- a/packages/core-services/CHANGELOG.md +++ b/packages/core-services/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/core-services +## 0.3.0-rc.9 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.9 +- @rocket.chat/rest-typings@6.5.0-rc.9 +- @rocket.chat/models@0.0.24-rc.2 + ## 0.3.0-rc.8 ### Patch Changes diff --git a/packages/core-services/package.json b/packages/core-services/package.json index 0c4124f8e102..511228389054 100644 --- a/packages/core-services/package.json +++ b/packages/core-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/core-services", - "version": "0.3.0-rc.8", + "version": "0.3.0-rc.9", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md index a1a4ff51392e..94b02a6a4e88 100644 --- a/packages/core-typings/CHANGELOG.md +++ b/packages/core-typings/CHANGELOG.md @@ -1,5 +1,7 @@ # @rocket.chat/core-typings +## 6.5.0-rc.9 + ## 6.5.0-rc.8 ## 6.5.0-rc.7 diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json index 8ad17d9af6fb..459e44451600 100644 --- a/packages/core-typings/package.json +++ b/packages/core-typings/package.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/package", "name": "@rocket.chat/core-typings", - "version": "6.5.0-rc.8", + "version": "6.5.0-rc.9", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "eslint": "~8.45.0", diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md index 1ada3849a56b..987e7867009e 100644 --- a/packages/cron/CHANGELOG.md +++ b/packages/cron/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/cron +## 0.0.20-rc.2 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.9 +- @rocket.chat/models@0.0.24-rc.2 + ## 0.0.20-rc.1 ### Patch Changes diff --git a/packages/cron/package.json b/packages/cron/package.json index 679e68264f1c..2215ef4af452 100644 --- a/packages/cron/package.json +++ b/packages/cron/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/cron", - "version": "0.0.20-rc.1", + "version": "0.0.20-rc.2", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md index 9da4b9170bb1..9d414b90679d 100644 --- a/packages/fuselage-ui-kit/CHANGELOG.md +++ b/packages/fuselage-ui-kit/CHANGELOG.md @@ -1,5 +1,13 @@ # Change Log +## 3.0.0-rc.9 + +### Patch Changes + +- @rocket.chat/gazzodown@3.0.0-rc.9 +- @rocket.chat/ui-contexts@3.0.0-rc.9 +- @rocket.chat/ui-video-conf@3.0.0-rc.9 + ## 3.0.0-rc.8 ### Patch Changes diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index 9113629bd03b..e91b8f26d99e 100644 --- a/packages/fuselage-ui-kit/package.json +++ b/packages/fuselage-ui-kit/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/fuselage-ui-kit", "private": true, - "version": "3.0.0-rc.8", + "version": "3.0.0-rc.9", "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system", "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/", "author": { @@ -47,9 +47,9 @@ "@rocket.chat/icons": "*", "@rocket.chat/prettier-config": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.8", + "@rocket.chat/ui-contexts": "3.0.0-rc.9", "@rocket.chat/ui-kit": "*", - "@rocket.chat/ui-video-conf": "3.0.0-rc.8", + "@rocket.chat/ui-video-conf": "3.0.0-rc.9", "@tanstack/react-query": "*", "react": "*", "react-dom": "*" diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md index 533eeaef3206..2458fba194b5 100644 --- a/packages/gazzodown/CHANGELOG.md +++ b/packages/gazzodown/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/gazzodown +## 3.0.0-rc.9 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.9 +- @rocket.chat/ui-contexts@3.0.0-rc.9 +- @rocket.chat/ui-client@3.0.0-rc.9 + ## 3.0.0-rc.8 ### Patch Changes diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json index 01635fc1a868..a036ed93694c 100644 --- a/packages/gazzodown/package.json +++ b/packages/gazzodown/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/gazzodown", - "version": "3.0.0-rc.8", + "version": "3.0.0-rc.9", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -65,14 +65,14 @@ "/dist" ], "peerDependencies": { - "@rocket.chat/core-typings": "6.5.0-rc.8", + "@rocket.chat/core-typings": "6.5.0-rc.9", "@rocket.chat/css-in-js": "*", "@rocket.chat/fuselage": "*", "@rocket.chat/fuselage-tokens": "*", "@rocket.chat/message-parser": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-client": "3.0.0-rc.8", - "@rocket.chat/ui-contexts": "3.0.0-rc.8", + "@rocket.chat/ui-client": "3.0.0-rc.9", + "@rocket.chat/ui-contexts": "3.0.0-rc.9", "katex": "*", "react": "*" }, diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md index e193db11a026..50460fc3ec99 100644 --- a/packages/instance-status/CHANGELOG.md +++ b/packages/instance-status/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/instance-status +## 0.0.24-rc.2 + +### Patch Changes + +- @rocket.chat/models@0.0.24-rc.2 + ## 0.0.24-rc.1 ### Patch Changes diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json index 7d5249e58f5c..28a49e92524a 100644 --- a/packages/instance-status/package.json +++ b/packages/instance-status/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/instance-status", - "version": "0.0.24-rc.1", + "version": "0.0.24-rc.2", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md index 67f224ccd3df..b04ef59bb185 100644 --- a/packages/livechat/CHANGELOG.md +++ b/packages/livechat/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/livechat Change Log +## 1.14.9-rc.2 + +### Patch Changes + +- @rocket.chat/gazzodown@3.0.0-rc.9 + ## 1.14.9-rc.1 ### Patch Changes diff --git a/packages/livechat/package.json b/packages/livechat/package.json index 1b8ae3acb0d0..151949d36e87 100644 --- a/packages/livechat/package.json +++ b/packages/livechat/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/livechat", - "version": "1.14.9-rc.1", + "version": "1.14.9-rc.2", "files": [ "/build" ], diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md index 76c18e094e05..f9b213f2dfc0 100644 --- a/packages/model-typings/CHANGELOG.md +++ b/packages/model-typings/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/model-typings +## 0.2.0-rc.9 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.9 + ## 0.2.0-rc.8 ### Patch Changes diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json index bfcb956ac226..9c2bd5bacde5 100644 --- a/packages/model-typings/package.json +++ b/packages/model-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/model-typings", - "version": "0.2.0-rc.8", + "version": "0.2.0-rc.9", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md index c4d60cbfd9b1..332f0e3f8fc2 100644 --- a/packages/models/CHANGELOG.md +++ b/packages/models/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/models +## 0.0.24-rc.2 + +### Patch Changes + +- @rocket.chat/model-typings@0.2.0-rc.9 + ## 0.0.24-rc.1 ### Patch Changes diff --git a/packages/models/package.json b/packages/models/package.json index ffe6e5c90e57..8b70e28113bc 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/models", - "version": "0.0.24-rc.1", + "version": "0.0.24-rc.2", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md index 675716f74b73..ab71884aa734 100644 --- a/packages/rest-typings/CHANGELOG.md +++ b/packages/rest-typings/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/rest-typings +## 6.5.0-rc.9 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.9 +- @rocket.chat/license@0.1.0-rc.9 + ## 6.5.0-rc.8 ### Patch Changes diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json index aed97934f88b..f3a490bdf399 100644 --- a/packages/rest-typings/package.json +++ b/packages/rest-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/rest-typings", - "version": "6.5.0-rc.8", + "version": "6.5.0-rc.9", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "@types/jest": "~29.5.7", diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md index 706a9cd68686..4a644e8e6bc3 100644 --- a/packages/ui-client/CHANGELOG.md +++ b/packages/ui-client/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/ui-client +## 3.0.0-rc.9 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.9 + ## 3.0.0-rc.8 ### Patch Changes diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json index 7191e6cef0ea..087d23173d23 100644 --- a/packages/ui-client/package.json +++ b/packages/ui-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-client", - "version": "3.0.0-rc.8", + "version": "3.0.0-rc.9", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -61,7 +61,7 @@ "@rocket.chat/fuselage": "*", "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.8", + "@rocket.chat/ui-contexts": "3.0.0-rc.9", "react": "~17.0.2" }, "volta": { diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md index bf3b1da14ff3..bf58c33f740c 100644 --- a/packages/ui-contexts/CHANGELOG.md +++ b/packages/ui-contexts/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/ui-contexts +## 3.0.0-rc.9 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.9 +- @rocket.chat/rest-typings@6.5.0-rc.9 +- @rocket.chat/ddp-client@0.2.9-rc.2 + ## 3.0.0-rc.8 ### Patch Changes diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json index 147fa761b5fe..02b5d72759be 100644 --- a/packages/ui-contexts/package.json +++ b/packages/ui-contexts/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-contexts", - "version": "3.0.0-rc.8", + "version": "3.0.0-rc.9", "private": true, "devDependencies": { "@rocket.chat/core-typings": "workspace:^", diff --git a/packages/ui-video-conf/CHANGELOG.md b/packages/ui-video-conf/CHANGELOG.md index 6a75282e69ae..31ddfb52fecd 100644 --- a/packages/ui-video-conf/CHANGELOG.md +++ b/packages/ui-video-conf/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/ui-video-conf +## 3.0.0-rc.9 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.9 + ## 3.0.0-rc.8 ### Patch Changes diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json index 254cbd34a4fb..70b5cfe3df1a 100644 --- a/packages/ui-video-conf/package.json +++ b/packages/ui-video-conf/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-video-conf", - "version": "3.0.0-rc.8", + "version": "3.0.0-rc.9", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -35,7 +35,7 @@ "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.8", + "@rocket.chat/ui-contexts": "3.0.0-rc.9", "react": "^17.0.2", "react-dom": "^17.0.2" }, diff --git a/packages/uikit-playground/CHANGELOG.md b/packages/uikit-playground/CHANGELOG.md index c465aec5ef61..a55484034d70 100644 --- a/packages/uikit-playground/CHANGELOG.md +++ b/packages/uikit-playground/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/uikit-playground +## 0.2.9-rc.2 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.9 +- @rocket.chat/fuselage-ui-kit@3.0.0-rc.9 + ## 0.2.9-rc.1 ### Patch Changes diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json index b0af51aa81ba..61cd05e5b698 100644 --- a/packages/uikit-playground/package.json +++ b/packages/uikit-playground/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/uikit-playground", "private": true, - "version": "0.2.9-rc.1", + "version": "0.2.9-rc.2", "type": "module", "scripts": { "dev": "vite", diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md index d09c55b945a9..2e9ab42905f3 100644 --- a/packages/web-ui-registration/CHANGELOG.md +++ b/packages/web-ui-registration/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/web-ui-registration +## 3.0.0-rc.8 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.9 + ## 3.0.0-rc.7 ### Patch Changes diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json index 6561537ab5cb..37942b6e3493 100644 --- a/packages/web-ui-registration/package.json +++ b/packages/web-ui-registration/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/web-ui-registration", - "version": "3.0.0-rc.7", + "version": "3.0.0-rc.8", "private": true, "homepage": "https://rocket.chat", "main": "./dist/index.js", @@ -51,7 +51,7 @@ "peerDependencies": { "@rocket.chat/layout": "*", "@rocket.chat/tools": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.8", + "@rocket.chat/ui-contexts": "3.0.0-rc.9", "@tanstack/react-query": "*", "react": "*", "react-hook-form": "*", diff --git a/yarn.lock b/yarn.lock index be60075a2a9c..03649b538af6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8217,9 +8217,9 @@ __metadata: "@rocket.chat/icons": "*" "@rocket.chat/prettier-config": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-contexts": 3.0.0-rc.7 + "@rocket.chat/ui-contexts": 3.0.0-rc.8 "@rocket.chat/ui-kit": "*" - "@rocket.chat/ui-video-conf": 3.0.0-rc.7 + "@rocket.chat/ui-video-conf": 3.0.0-rc.8 "@tanstack/react-query": "*" react: "*" react-dom: "*" @@ -8301,14 +8301,14 @@ __metadata: ts-jest: ~29.0.5 typescript: ~5.2.2 peerDependencies: - "@rocket.chat/core-typings": 6.5.0-rc.7 + "@rocket.chat/core-typings": 6.5.0-rc.8 "@rocket.chat/css-in-js": "*" "@rocket.chat/fuselage": "*" "@rocket.chat/fuselage-tokens": "*" "@rocket.chat/message-parser": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-client": 3.0.0-rc.7 - "@rocket.chat/ui-contexts": 3.0.0-rc.7 + "@rocket.chat/ui-client": 3.0.0-rc.8 + "@rocket.chat/ui-contexts": 3.0.0-rc.8 katex: "*" react: "*" languageName: unknown @@ -9472,7 +9472,7 @@ __metadata: "@rocket.chat/fuselage": "*" "@rocket.chat/fuselage-hooks": "*" "@rocket.chat/icons": "*" - "@rocket.chat/ui-contexts": 3.0.0-rc.7 + "@rocket.chat/ui-contexts": 3.0.0-rc.8 react: ~17.0.2 languageName: unknown linkType: soft @@ -9625,7 +9625,7 @@ __metadata: "@rocket.chat/fuselage-hooks": "*" "@rocket.chat/icons": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-contexts": 3.0.0-rc.7 + "@rocket.chat/ui-contexts": 3.0.0-rc.8 react: ^17.0.2 react-dom: ^17.0.2 languageName: unknown @@ -9711,7 +9711,7 @@ __metadata: peerDependencies: "@rocket.chat/layout": "*" "@rocket.chat/tools": "*" - "@rocket.chat/ui-contexts": 3.0.0-rc.7 + "@rocket.chat/ui-contexts": 3.0.0-rc.8 "@tanstack/react-query": "*" react: "*" react-hook-form: "*" From fc487a30d7a9db132789b0faf3f5ca96e9b66b6c Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Thu, 23 Nov 2023 10:13:07 -0300 Subject: [PATCH 29/76] regression: New Release banner showing for pre-releases (#31059) --- .../server/functions/buildVersionUpdateMessage.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/meteor/app/version-check/server/functions/buildVersionUpdateMessage.ts b/apps/meteor/app/version-check/server/functions/buildVersionUpdateMessage.ts index 8d159213d4e3..f3cb9d2f967e 100644 --- a/apps/meteor/app/version-check/server/functions/buildVersionUpdateMessage.ts +++ b/apps/meteor/app/version-check/server/functions/buildVersionUpdateMessage.ts @@ -20,6 +20,11 @@ export const buildVersionUpdateMessage = async ( } for await (const version of versions) { + // Ignore prerelease versions + if (semver.prerelease(version.version)) { + continue; + } + if (semver.lte(version.version, lastCheckedVersion)) { continue; } From 3231645104a06244193cf504be88c22f6174c23c Mon Sep 17 00:00:00 2001 From: rocketchat-github-ci Date: Thu, 23 Nov 2023 14:00:20 +0000 Subject: [PATCH 30/76] Release 6.5.0-rc.10 [no ci] --- .changeset/bump-patch-1700748014961.md | 5 ++++ .changeset/pre.json | 1 + apps/meteor/.docker/Dockerfile.rhel | 2 +- apps/meteor/CHANGELOG.md | 26 +++++++++++++++++++ apps/meteor/app/utils/rocketchat.info | 2 +- apps/meteor/ee/server/services/CHANGELOG.md | 10 +++++++ apps/meteor/ee/server/services/package.json | 2 +- apps/meteor/package.json | 2 +- ee/apps/account-service/CHANGELOG.md | 10 +++++++ ee/apps/account-service/package.json | 2 +- ee/apps/authorization-service/CHANGELOG.md | 10 +++++++ ee/apps/authorization-service/package.json | 2 +- ee/apps/ddp-streamer/CHANGELOG.md | 12 +++++++++ ee/apps/ddp-streamer/package.json | 2 +- ee/apps/omnichannel-transcript/CHANGELOG.md | 11 ++++++++ ee/apps/omnichannel-transcript/package.json | 2 +- ee/apps/presence-service/CHANGELOG.md | 10 +++++++ ee/apps/presence-service/package.json | 2 +- ee/apps/queue-worker/CHANGELOG.md | 10 +++++++ ee/apps/queue-worker/package.json | 2 +- ee/apps/stream-hub-service/CHANGELOG.md | 9 +++++++ ee/apps/stream-hub-service/package.json | 2 +- ee/packages/api-client/CHANGELOG.md | 7 +++++ ee/packages/api-client/package.json | 2 +- ee/packages/ddp-client/CHANGELOG.md | 7 +++++ ee/packages/ddp-client/package.json | 2 +- ee/packages/license/CHANGELOG.md | 6 +++++ ee/packages/license/package.json | 2 +- ee/packages/omnichannel-services/CHANGELOG.md | 11 ++++++++ ee/packages/omnichannel-services/package.json | 2 +- ee/packages/pdf-worker/CHANGELOG.md | 6 +++++ ee/packages/pdf-worker/package.json | 2 +- ee/packages/presence/CHANGELOG.md | 8 ++++++ ee/packages/presence/package.json | 2 +- package.json | 2 +- packages/core-services/CHANGELOG.md | 8 ++++++ packages/core-services/package.json | 2 +- packages/core-typings/CHANGELOG.md | 2 ++ packages/core-typings/package.json | 2 +- packages/cron/CHANGELOG.md | 7 +++++ packages/cron/package.json | 2 +- packages/fuselage-ui-kit/CHANGELOG.md | 8 ++++++ packages/fuselage-ui-kit/package.json | 6 ++--- packages/gazzodown/CHANGELOG.md | 8 ++++++ packages/gazzodown/package.json | 8 +++--- packages/instance-status/CHANGELOG.md | 6 +++++ packages/instance-status/package.json | 2 +- packages/livechat/CHANGELOG.md | 6 +++++ packages/livechat/package.json | 2 +- packages/model-typings/CHANGELOG.md | 6 +++++ packages/model-typings/package.json | 2 +- packages/models/CHANGELOG.md | 6 +++++ packages/models/package.json | 2 +- packages/rest-typings/CHANGELOG.md | 7 +++++ packages/rest-typings/package.json | 2 +- packages/ui-client/CHANGELOG.md | 6 +++++ packages/ui-client/package.json | 4 +-- packages/ui-contexts/CHANGELOG.md | 8 ++++++ packages/ui-contexts/package.json | 2 +- packages/ui-video-conf/CHANGELOG.md | 6 +++++ packages/ui-video-conf/package.json | 4 +-- packages/uikit-playground/CHANGELOG.md | 7 +++++ packages/uikit-playground/package.json | 2 +- packages/web-ui-registration/CHANGELOG.md | 6 +++++ packages/web-ui-registration/package.json | 4 +-- yarn.lock | 16 ++++++------ 66 files changed, 305 insertions(+), 49 deletions(-) create mode 100644 .changeset/bump-patch-1700748014961.md diff --git a/.changeset/bump-patch-1700748014961.md b/.changeset/bump-patch-1700748014961.md new file mode 100644 index 000000000000..e1eaa7980afb --- /dev/null +++ b/.changeset/bump-patch-1700748014961.md @@ -0,0 +1,5 @@ +--- +'@rocket.chat/meteor': patch +--- + +Bump @rocket.chat/meteor version. diff --git a/.changeset/pre.json b/.changeset/pre.json index f38ecfeb63ce..5b77b4a4c428 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -69,6 +69,7 @@ "bump-patch-1700263798234", "bump-patch-1700616232353", "bump-patch-1700695874400", + "bump-patch-1700748014961", "cool-rockets-talk", "cool-zoos-move", "cuddly-ties-run", diff --git a/apps/meteor/.docker/Dockerfile.rhel b/apps/meteor/.docker/Dockerfile.rhel index f7def4a1e7ed..b52d0bf1d974 100644 --- a/apps/meteor/.docker/Dockerfile.rhel +++ b/apps/meteor/.docker/Dockerfile.rhel @@ -1,6 +1,6 @@ FROM registry.access.redhat.com/ubi8/nodejs-12 -ENV RC_VERSION 6.5.0-rc.9 +ENV RC_VERSION 6.5.0-rc.10 MAINTAINER buildmaster@rocket.chat diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md index 6875d2acdf5a..b748634e989f 100644 --- a/apps/meteor/CHANGELOG.md +++ b/apps/meteor/CHANGELOG.md @@ -1,5 +1,31 @@ # @rocket.chat/meteor +## 6.5.0-rc.10 + +### Patch Changes + +- Bump @rocket.chat/meteor version. + - @rocket.chat/core-typings@6.5.0-rc.10 + - @rocket.chat/rest-typings@6.5.0-rc.10 + - @rocket.chat/api-client@0.1.18-rc.3 + - @rocket.chat/license@0.1.0-rc.10 + - @rocket.chat/omnichannel-services@0.1.0-rc.10 + - @rocket.chat/pdf-worker@0.0.24-rc.3 + - @rocket.chat/presence@0.1.0-rc.10 + - @rocket.chat/core-services@0.3.0-rc.10 + - @rocket.chat/cron@0.0.20-rc.3 + - @rocket.chat/gazzodown@3.0.0-rc.10 + - @rocket.chat/model-typings@0.2.0-rc.10 + - @rocket.chat/ui-contexts@3.0.0-rc.10 + - @rocket.chat/server-cloud-communication@0.0.1 + - @rocket.chat/fuselage-ui-kit@3.0.0-rc.10 + - @rocket.chat/models@0.0.24-rc.3 + - @rocket.chat/ui-theming@0.1.1-rc.0 + - @rocket.chat/ui-client@3.0.0-rc.10 + - @rocket.chat/ui-video-conf@3.0.0-rc.10 + - @rocket.chat/web-ui-registration@3.0.0-rc.9 + - @rocket.chat/instance-status@0.0.24-rc.3 + ## 6.5.0-rc.9 ### Patch Changes diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info index ab77c3b854de..56a62afe3d26 100644 --- a/apps/meteor/app/utils/rocketchat.info +++ b/apps/meteor/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "6.5.0-rc.9" + "version": "6.5.0-rc.10" } diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md index c181b3a97ed2..c381d09ccfa2 100644 --- a/apps/meteor/ee/server/services/CHANGELOG.md +++ b/apps/meteor/ee/server/services/CHANGELOG.md @@ -1,5 +1,15 @@ # rocketchat-services +## 1.1.18-rc.3 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.10 +- @rocket.chat/rest-typings@6.5.0-rc.10 +- @rocket.chat/core-services@0.3.0-rc.10 +- @rocket.chat/model-typings@0.2.0-rc.10 +- @rocket.chat/models@0.0.24-rc.3 + ## 1.1.18-rc.2 ### Patch Changes diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json index 7d7cd57f118b..ad5ea4618edc 100644 --- a/apps/meteor/ee/server/services/package.json +++ b/apps/meteor/ee/server/services/package.json @@ -1,7 +1,7 @@ { "name": "rocketchat-services", "private": true, - "version": "1.1.18-rc.2", + "version": "1.1.18-rc.3", "description": "Rocket.Chat Authorization service", "main": "index.js", "scripts": { diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 24fdb3485282..54c85ffc462b 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/meteor", "description": "The Ultimate Open Source WebChat Platform", - "version": "6.5.0-rc.9", + "version": "6.5.0-rc.10", "private": true, "author": { "name": "Rocket.Chat", diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md index 45ae022afb10..e98da920e256 100644 --- a/ee/apps/account-service/CHANGELOG.md +++ b/ee/apps/account-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/account-service +## 0.3.0-rc.10 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.10 +- @rocket.chat/rest-typings@6.5.0-rc.10 +- @rocket.chat/core-services@0.3.0-rc.10 +- @rocket.chat/model-typings@0.2.0-rc.10 +- @rocket.chat/models@0.0.24-rc.3 + ## 0.3.0-rc.9 ### Patch Changes diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json index 56bca1a03062..8847d6081634 100644 --- a/ee/apps/account-service/package.json +++ b/ee/apps/account-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/account-service", "private": true, - "version": "0.3.0-rc.9", + "version": "0.3.0-rc.10", "description": "Rocket.Chat Account service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/authorization-service/CHANGELOG.md b/ee/apps/authorization-service/CHANGELOG.md index dbf2d209b1c4..4c8a6742d7c5 100644 --- a/ee/apps/authorization-service/CHANGELOG.md +++ b/ee/apps/authorization-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/authorization-service +## 0.3.0-rc.10 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.10 +- @rocket.chat/rest-typings@6.5.0-rc.10 +- @rocket.chat/core-services@0.3.0-rc.10 +- @rocket.chat/model-typings@0.2.0-rc.10 +- @rocket.chat/models@0.0.24-rc.3 + ## 0.3.0-rc.9 ### Patch Changes diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json index 4881898434b2..cd4fe9db730d 100644 --- a/ee/apps/authorization-service/package.json +++ b/ee/apps/authorization-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/authorization-service", "private": true, - "version": "0.3.0-rc.9", + "version": "0.3.0-rc.10", "description": "Rocket.Chat Authorization service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/ddp-streamer/CHANGELOG.md b/ee/apps/ddp-streamer/CHANGELOG.md index 60fc609b46ff..0ac3cd5f1dc5 100644 --- a/ee/apps/ddp-streamer/CHANGELOG.md +++ b/ee/apps/ddp-streamer/CHANGELOG.md @@ -1,5 +1,17 @@ # @rocket.chat/ddp-streamer +## 0.2.0-rc.10 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.10 +- @rocket.chat/rest-typings@6.5.0-rc.10 +- @rocket.chat/core-services@0.3.0-rc.10 +- @rocket.chat/model-typings@0.2.0-rc.10 +- @rocket.chat/ui-contexts@3.0.0-rc.10 +- @rocket.chat/models@0.0.24-rc.3 +- @rocket.chat/instance-status@0.0.24-rc.3 + ## 0.2.0-rc.9 ### Patch Changes diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json index 9349881450d2..0a377a38f9bf 100644 --- a/ee/apps/ddp-streamer/package.json +++ b/ee/apps/ddp-streamer/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/ddp-streamer", "private": true, - "version": "0.2.0-rc.9", + "version": "0.2.0-rc.10", "description": "Rocket.Chat DDP-Streamer service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/omnichannel-transcript/CHANGELOG.md b/ee/apps/omnichannel-transcript/CHANGELOG.md index 7161a3804e68..dd1fa82ebbaa 100644 --- a/ee/apps/omnichannel-transcript/CHANGELOG.md +++ b/ee/apps/omnichannel-transcript/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/omnichannel-transcript +## 0.3.0-rc.10 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.10 +- @rocket.chat/omnichannel-services@0.1.0-rc.10 +- @rocket.chat/pdf-worker@0.0.24-rc.3 +- @rocket.chat/core-services@0.3.0-rc.10 +- @rocket.chat/model-typings@0.2.0-rc.10 +- @rocket.chat/models@0.0.24-rc.3 + ## 0.3.0-rc.9 ### Patch Changes diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json index d011f00c8d9b..59a63e046da8 100644 --- a/ee/apps/omnichannel-transcript/package.json +++ b/ee/apps/omnichannel-transcript/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/omnichannel-transcript", "private": true, - "version": "0.3.0-rc.9", + "version": "0.3.0-rc.10", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/presence-service/CHANGELOG.md b/ee/apps/presence-service/CHANGELOG.md index df86ef19ac32..85bea234d73f 100644 --- a/ee/apps/presence-service/CHANGELOG.md +++ b/ee/apps/presence-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/presence-service +## 0.3.0-rc.10 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.10 +- @rocket.chat/presence@0.1.0-rc.10 +- @rocket.chat/core-services@0.3.0-rc.10 +- @rocket.chat/model-typings@0.2.0-rc.10 +- @rocket.chat/models@0.0.24-rc.3 + ## 0.3.0-rc.9 ### Patch Changes diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json index 2565026e97c2..dec0308778c0 100644 --- a/ee/apps/presence-service/package.json +++ b/ee/apps/presence-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/presence-service", "private": true, - "version": "0.3.0-rc.9", + "version": "0.3.0-rc.10", "description": "Rocket.Chat Presence service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/queue-worker/CHANGELOG.md b/ee/apps/queue-worker/CHANGELOG.md index 8e7e6599707b..c2fb5d889625 100644 --- a/ee/apps/queue-worker/CHANGELOG.md +++ b/ee/apps/queue-worker/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/queue-worker +## 0.3.0-rc.10 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.10 +- @rocket.chat/omnichannel-services@0.1.0-rc.10 +- @rocket.chat/core-services@0.3.0-rc.10 +- @rocket.chat/model-typings@0.2.0-rc.10 +- @rocket.chat/models@0.0.24-rc.3 + ## 0.3.0-rc.9 ### Patch Changes diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json index 819ca5003995..5e7796d8f925 100644 --- a/ee/apps/queue-worker/package.json +++ b/ee/apps/queue-worker/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/queue-worker", "private": true, - "version": "0.3.0-rc.9", + "version": "0.3.0-rc.10", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/stream-hub-service/CHANGELOG.md b/ee/apps/stream-hub-service/CHANGELOG.md index 9e5692c653b4..ba6f820f4836 100644 --- a/ee/apps/stream-hub-service/CHANGELOG.md +++ b/ee/apps/stream-hub-service/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/stream-hub-service +## 0.3.0-rc.10 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.10 +- @rocket.chat/core-services@0.3.0-rc.10 +- @rocket.chat/model-typings@0.2.0-rc.10 +- @rocket.chat/models@0.0.24-rc.3 + ## 0.3.0-rc.9 ### Patch Changes diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json index 6974eff8a811..ed4064fd0bc8 100644 --- a/ee/apps/stream-hub-service/package.json +++ b/ee/apps/stream-hub-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/stream-hub-service", "private": true, - "version": "0.3.0-rc.9", + "version": "0.3.0-rc.10", "description": "Rocket.Chat Stream Hub service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/packages/api-client/CHANGELOG.md b/ee/packages/api-client/CHANGELOG.md index badefa044606..c1a54d972950 100644 --- a/ee/packages/api-client/CHANGELOG.md +++ b/ee/packages/api-client/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/api-client +## 0.1.18-rc.3 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.10 +- @rocket.chat/rest-typings@6.5.0-rc.10 + ## 0.1.18-rc.2 ### Patch Changes diff --git a/ee/packages/api-client/package.json b/ee/packages/api-client/package.json index b5df99b86261..d226d4fa633e 100644 --- a/ee/packages/api-client/package.json +++ b/ee/packages/api-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/api-client", - "version": "0.1.18-rc.2", + "version": "0.1.18-rc.3", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/ddp-client/CHANGELOG.md b/ee/packages/ddp-client/CHANGELOG.md index f86b7525a3a7..2f7104d76ef9 100644 --- a/ee/packages/ddp-client/CHANGELOG.md +++ b/ee/packages/ddp-client/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/ddp-client +## 0.2.9-rc.3 + +### Patch Changes + +- @rocket.chat/rest-typings@6.5.0-rc.10 +- @rocket.chat/api-client@0.1.18-rc.3 + ## 0.2.9-rc.2 ### Patch Changes diff --git a/ee/packages/ddp-client/package.json b/ee/packages/ddp-client/package.json index af033fe4f1ed..e363f4cb2810 100644 --- a/ee/packages/ddp-client/package.json +++ b/ee/packages/ddp-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ddp-client", - "version": "0.2.9-rc.2", + "version": "0.2.9-rc.3", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/license/CHANGELOG.md b/ee/packages/license/CHANGELOG.md index 5dd3dc1aa2c9..4d611bb837bd 100644 --- a/ee/packages/license/CHANGELOG.md +++ b/ee/packages/license/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/license +## 0.1.0-rc.10 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.10 + ## 0.1.0-rc.9 ### Patch Changes diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json index 6d37c1527118..adbd004e3c34 100644 --- a/ee/packages/license/package.json +++ b/ee/packages/license/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/license", - "version": "0.1.0-rc.9", + "version": "0.1.0-rc.10", "private": true, "devDependencies": { "@swc/core": "^1.3.95", diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md index 62e831df432f..1de91236c6ad 100644 --- a/ee/packages/omnichannel-services/CHANGELOG.md +++ b/ee/packages/omnichannel-services/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/omnichannel-services +## 0.1.0-rc.10 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.10 +- @rocket.chat/rest-typings@6.5.0-rc.10 +- @rocket.chat/pdf-worker@0.0.24-rc.3 +- @rocket.chat/core-services@0.3.0-rc.10 +- @rocket.chat/model-typings@0.2.0-rc.10 +- @rocket.chat/models@0.0.24-rc.3 + ## 0.1.0-rc.9 ### Patch Changes diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json index a7586edac9be..90e645a6c7a0 100644 --- a/ee/packages/omnichannel-services/package.json +++ b/ee/packages/omnichannel-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/omnichannel-services", - "version": "0.1.0-rc.9", + "version": "0.1.0-rc.10", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/ee/packages/pdf-worker/CHANGELOG.md b/ee/packages/pdf-worker/CHANGELOG.md index 3b97bbf4163d..71246e88c1dc 100644 --- a/ee/packages/pdf-worker/CHANGELOG.md +++ b/ee/packages/pdf-worker/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/pdf-worker +## 0.0.24-rc.3 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.10 + ## 0.0.24-rc.2 ### Patch Changes diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json index a4fe783c75af..47ae489848fb 100644 --- a/ee/packages/pdf-worker/package.json +++ b/ee/packages/pdf-worker/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/pdf-worker", - "version": "0.0.24-rc.2", + "version": "0.0.24-rc.3", "private": true, "devDependencies": { "@storybook/addon-essentials": "~6.5.16", diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md index a90b3e90b5e4..1f043a301247 100644 --- a/ee/packages/presence/CHANGELOG.md +++ b/ee/packages/presence/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/presence +## 0.1.0-rc.10 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.10 +- @rocket.chat/core-services@0.3.0-rc.10 +- @rocket.chat/models@0.0.24-rc.3 + ## 0.1.0-rc.9 ### Patch Changes diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json index 094d91452f86..a5b3e7036cb8 100644 --- a/ee/packages/presence/package.json +++ b/ee/packages/presence/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/presence", - "version": "0.1.0-rc.9", + "version": "0.1.0-rc.10", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/package.json b/package.json index 90e8e13f34a6..bb798ddffe20 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket.chat", - "version": "6.5.0-rc.9", + "version": "6.5.0-rc.10", "description": "Rocket.Chat Monorepo", "main": "index.js", "private": true, diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md index b3cdab9065a4..a62358312bd9 100644 --- a/packages/core-services/CHANGELOG.md +++ b/packages/core-services/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/core-services +## 0.3.0-rc.10 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.10 +- @rocket.chat/rest-typings@6.5.0-rc.10 +- @rocket.chat/models@0.0.24-rc.3 + ## 0.3.0-rc.9 ### Patch Changes diff --git a/packages/core-services/package.json b/packages/core-services/package.json index 511228389054..119f1b2326bd 100644 --- a/packages/core-services/package.json +++ b/packages/core-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/core-services", - "version": "0.3.0-rc.9", + "version": "0.3.0-rc.10", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md index 94b02a6a4e88..5ba7a06cc28e 100644 --- a/packages/core-typings/CHANGELOG.md +++ b/packages/core-typings/CHANGELOG.md @@ -1,5 +1,7 @@ # @rocket.chat/core-typings +## 6.5.0-rc.10 + ## 6.5.0-rc.9 ## 6.5.0-rc.8 diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json index 459e44451600..7adff8ed09c3 100644 --- a/packages/core-typings/package.json +++ b/packages/core-typings/package.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/package", "name": "@rocket.chat/core-typings", - "version": "6.5.0-rc.9", + "version": "6.5.0-rc.10", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "eslint": "~8.45.0", diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md index 987e7867009e..c60106b6f4d5 100644 --- a/packages/cron/CHANGELOG.md +++ b/packages/cron/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/cron +## 0.0.20-rc.3 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.10 +- @rocket.chat/models@0.0.24-rc.3 + ## 0.0.20-rc.2 ### Patch Changes diff --git a/packages/cron/package.json b/packages/cron/package.json index 2215ef4af452..1ac101e9be7b 100644 --- a/packages/cron/package.json +++ b/packages/cron/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/cron", - "version": "0.0.20-rc.2", + "version": "0.0.20-rc.3", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md index 9d414b90679d..c83237479d91 100644 --- a/packages/fuselage-ui-kit/CHANGELOG.md +++ b/packages/fuselage-ui-kit/CHANGELOG.md @@ -1,5 +1,13 @@ # Change Log +## 3.0.0-rc.10 + +### Patch Changes + +- @rocket.chat/gazzodown@3.0.0-rc.10 +- @rocket.chat/ui-contexts@3.0.0-rc.10 +- @rocket.chat/ui-video-conf@3.0.0-rc.10 + ## 3.0.0-rc.9 ### Patch Changes diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index e91b8f26d99e..650b372eb6a2 100644 --- a/packages/fuselage-ui-kit/package.json +++ b/packages/fuselage-ui-kit/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/fuselage-ui-kit", "private": true, - "version": "3.0.0-rc.9", + "version": "3.0.0-rc.10", "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system", "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/", "author": { @@ -47,9 +47,9 @@ "@rocket.chat/icons": "*", "@rocket.chat/prettier-config": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.9", + "@rocket.chat/ui-contexts": "3.0.0-rc.10", "@rocket.chat/ui-kit": "*", - "@rocket.chat/ui-video-conf": "3.0.0-rc.9", + "@rocket.chat/ui-video-conf": "3.0.0-rc.10", "@tanstack/react-query": "*", "react": "*", "react-dom": "*" diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md index 2458fba194b5..53fa1f320bf0 100644 --- a/packages/gazzodown/CHANGELOG.md +++ b/packages/gazzodown/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/gazzodown +## 3.0.0-rc.10 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.10 +- @rocket.chat/ui-contexts@3.0.0-rc.10 +- @rocket.chat/ui-client@3.0.0-rc.10 + ## 3.0.0-rc.9 ### Patch Changes diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json index a036ed93694c..9acd60aabf79 100644 --- a/packages/gazzodown/package.json +++ b/packages/gazzodown/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/gazzodown", - "version": "3.0.0-rc.9", + "version": "3.0.0-rc.10", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -65,14 +65,14 @@ "/dist" ], "peerDependencies": { - "@rocket.chat/core-typings": "6.5.0-rc.9", + "@rocket.chat/core-typings": "6.5.0-rc.10", "@rocket.chat/css-in-js": "*", "@rocket.chat/fuselage": "*", "@rocket.chat/fuselage-tokens": "*", "@rocket.chat/message-parser": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-client": "3.0.0-rc.9", - "@rocket.chat/ui-contexts": "3.0.0-rc.9", + "@rocket.chat/ui-client": "3.0.0-rc.10", + "@rocket.chat/ui-contexts": "3.0.0-rc.10", "katex": "*", "react": "*" }, diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md index 50460fc3ec99..8c2700bf4165 100644 --- a/packages/instance-status/CHANGELOG.md +++ b/packages/instance-status/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/instance-status +## 0.0.24-rc.3 + +### Patch Changes + +- @rocket.chat/models@0.0.24-rc.3 + ## 0.0.24-rc.2 ### Patch Changes diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json index 28a49e92524a..32570b5d694e 100644 --- a/packages/instance-status/package.json +++ b/packages/instance-status/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/instance-status", - "version": "0.0.24-rc.2", + "version": "0.0.24-rc.3", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md index b04ef59bb185..8af33fe7072e 100644 --- a/packages/livechat/CHANGELOG.md +++ b/packages/livechat/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/livechat Change Log +## 1.14.9-rc.3 + +### Patch Changes + +- @rocket.chat/gazzodown@3.0.0-rc.10 + ## 1.14.9-rc.2 ### Patch Changes diff --git a/packages/livechat/package.json b/packages/livechat/package.json index 151949d36e87..09e78fa2f4de 100644 --- a/packages/livechat/package.json +++ b/packages/livechat/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/livechat", - "version": "1.14.9-rc.2", + "version": "1.14.9-rc.3", "files": [ "/build" ], diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md index f9b213f2dfc0..7d377533a51f 100644 --- a/packages/model-typings/CHANGELOG.md +++ b/packages/model-typings/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/model-typings +## 0.2.0-rc.10 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.10 + ## 0.2.0-rc.9 ### Patch Changes diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json index 9c2bd5bacde5..eb4e90967492 100644 --- a/packages/model-typings/package.json +++ b/packages/model-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/model-typings", - "version": "0.2.0-rc.9", + "version": "0.2.0-rc.10", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md index 332f0e3f8fc2..9338a4201e6a 100644 --- a/packages/models/CHANGELOG.md +++ b/packages/models/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/models +## 0.0.24-rc.3 + +### Patch Changes + +- @rocket.chat/model-typings@0.2.0-rc.10 + ## 0.0.24-rc.2 ### Patch Changes diff --git a/packages/models/package.json b/packages/models/package.json index 8b70e28113bc..bb1f4835ebb3 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/models", - "version": "0.0.24-rc.2", + "version": "0.0.24-rc.3", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md index ab71884aa734..0d2215964c7b 100644 --- a/packages/rest-typings/CHANGELOG.md +++ b/packages/rest-typings/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/rest-typings +## 6.5.0-rc.10 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.10 +- @rocket.chat/license@0.1.0-rc.10 + ## 6.5.0-rc.9 ### Patch Changes diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json index f3a490bdf399..c1c175afa34a 100644 --- a/packages/rest-typings/package.json +++ b/packages/rest-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/rest-typings", - "version": "6.5.0-rc.9", + "version": "6.5.0-rc.10", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "@types/jest": "~29.5.7", diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md index 4a644e8e6bc3..76d2081da0b2 100644 --- a/packages/ui-client/CHANGELOG.md +++ b/packages/ui-client/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/ui-client +## 3.0.0-rc.10 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.10 + ## 3.0.0-rc.9 ### Patch Changes diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json index 087d23173d23..58664a2448fb 100644 --- a/packages/ui-client/package.json +++ b/packages/ui-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-client", - "version": "3.0.0-rc.9", + "version": "3.0.0-rc.10", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -61,7 +61,7 @@ "@rocket.chat/fuselage": "*", "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.9", + "@rocket.chat/ui-contexts": "3.0.0-rc.10", "react": "~17.0.2" }, "volta": { diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md index bf58c33f740c..acc2432f64c3 100644 --- a/packages/ui-contexts/CHANGELOG.md +++ b/packages/ui-contexts/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/ui-contexts +## 3.0.0-rc.10 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.10 +- @rocket.chat/rest-typings@6.5.0-rc.10 +- @rocket.chat/ddp-client@0.2.9-rc.3 + ## 3.0.0-rc.9 ### Patch Changes diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json index 02b5d72759be..ee051f2f3940 100644 --- a/packages/ui-contexts/package.json +++ b/packages/ui-contexts/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-contexts", - "version": "3.0.0-rc.9", + "version": "3.0.0-rc.10", "private": true, "devDependencies": { "@rocket.chat/core-typings": "workspace:^", diff --git a/packages/ui-video-conf/CHANGELOG.md b/packages/ui-video-conf/CHANGELOG.md index 31ddfb52fecd..f772c3736e1a 100644 --- a/packages/ui-video-conf/CHANGELOG.md +++ b/packages/ui-video-conf/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/ui-video-conf +## 3.0.0-rc.10 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.10 + ## 3.0.0-rc.9 ### Patch Changes diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json index 70b5cfe3df1a..56f4221d6324 100644 --- a/packages/ui-video-conf/package.json +++ b/packages/ui-video-conf/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-video-conf", - "version": "3.0.0-rc.9", + "version": "3.0.0-rc.10", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -35,7 +35,7 @@ "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.9", + "@rocket.chat/ui-contexts": "3.0.0-rc.10", "react": "^17.0.2", "react-dom": "^17.0.2" }, diff --git a/packages/uikit-playground/CHANGELOG.md b/packages/uikit-playground/CHANGELOG.md index a55484034d70..e34b87368eec 100644 --- a/packages/uikit-playground/CHANGELOG.md +++ b/packages/uikit-playground/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/uikit-playground +## 0.2.9-rc.3 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.10 +- @rocket.chat/fuselage-ui-kit@3.0.0-rc.10 + ## 0.2.9-rc.2 ### Patch Changes diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json index 61cd05e5b698..2933cf194e82 100644 --- a/packages/uikit-playground/package.json +++ b/packages/uikit-playground/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/uikit-playground", "private": true, - "version": "0.2.9-rc.2", + "version": "0.2.9-rc.3", "type": "module", "scripts": { "dev": "vite", diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md index 2e9ab42905f3..752985437cb0 100644 --- a/packages/web-ui-registration/CHANGELOG.md +++ b/packages/web-ui-registration/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/web-ui-registration +## 3.0.0-rc.9 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.10 + ## 3.0.0-rc.8 ### Patch Changes diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json index 37942b6e3493..1fc325535868 100644 --- a/packages/web-ui-registration/package.json +++ b/packages/web-ui-registration/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/web-ui-registration", - "version": "3.0.0-rc.8", + "version": "3.0.0-rc.9", "private": true, "homepage": "https://rocket.chat", "main": "./dist/index.js", @@ -51,7 +51,7 @@ "peerDependencies": { "@rocket.chat/layout": "*", "@rocket.chat/tools": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.9", + "@rocket.chat/ui-contexts": "3.0.0-rc.10", "@tanstack/react-query": "*", "react": "*", "react-hook-form": "*", diff --git a/yarn.lock b/yarn.lock index 03649b538af6..1a01272707d4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8217,9 +8217,9 @@ __metadata: "@rocket.chat/icons": "*" "@rocket.chat/prettier-config": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-contexts": 3.0.0-rc.8 + "@rocket.chat/ui-contexts": 3.0.0-rc.9 "@rocket.chat/ui-kit": "*" - "@rocket.chat/ui-video-conf": 3.0.0-rc.8 + "@rocket.chat/ui-video-conf": 3.0.0-rc.9 "@tanstack/react-query": "*" react: "*" react-dom: "*" @@ -8301,14 +8301,14 @@ __metadata: ts-jest: ~29.0.5 typescript: ~5.2.2 peerDependencies: - "@rocket.chat/core-typings": 6.5.0-rc.8 + "@rocket.chat/core-typings": 6.5.0-rc.9 "@rocket.chat/css-in-js": "*" "@rocket.chat/fuselage": "*" "@rocket.chat/fuselage-tokens": "*" "@rocket.chat/message-parser": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-client": 3.0.0-rc.8 - "@rocket.chat/ui-contexts": 3.0.0-rc.8 + "@rocket.chat/ui-client": 3.0.0-rc.9 + "@rocket.chat/ui-contexts": 3.0.0-rc.9 katex: "*" react: "*" languageName: unknown @@ -9472,7 +9472,7 @@ __metadata: "@rocket.chat/fuselage": "*" "@rocket.chat/fuselage-hooks": "*" "@rocket.chat/icons": "*" - "@rocket.chat/ui-contexts": 3.0.0-rc.8 + "@rocket.chat/ui-contexts": 3.0.0-rc.9 react: ~17.0.2 languageName: unknown linkType: soft @@ -9625,7 +9625,7 @@ __metadata: "@rocket.chat/fuselage-hooks": "*" "@rocket.chat/icons": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-contexts": 3.0.0-rc.8 + "@rocket.chat/ui-contexts": 3.0.0-rc.9 react: ^17.0.2 react-dom: ^17.0.2 languageName: unknown @@ -9711,7 +9711,7 @@ __metadata: peerDependencies: "@rocket.chat/layout": "*" "@rocket.chat/tools": "*" - "@rocket.chat/ui-contexts": 3.0.0-rc.8 + "@rocket.chat/ui-contexts": 3.0.0-rc.9 "@tanstack/react-query": "*" react: "*" react-hook-form: "*" From 9507733052e0a9ba8ad430d2de9f61049c702999 Mon Sep 17 00:00:00 2001 From: Martin Schoeler Date: Thu, 23 Nov 2023 14:12:40 -0300 Subject: [PATCH 31/76] chore: fix priorities sidebar flaky test (#30674) Co-authored-by: Aleksander Nicacio da Silva <6494543+aleksandernsilva@users.noreply.github.com> --- .../omnichannel-priorities-sidebar.spec.ts | 36 +++---- .../page-objects/fragments/home-sidenav.ts | 4 +- .../tests/e2e/utils/omnichannel/rooms.ts | 100 ++++++++++++++++++ 3 files changed, 117 insertions(+), 23 deletions(-) create mode 100644 apps/meteor/tests/e2e/utils/omnichannel/rooms.ts diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-priorities-sidebar.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-priorities-sidebar.spec.ts index 559d24889633..d1572f7b5ce7 100644 --- a/apps/meteor/tests/e2e/omnichannel/omnichannel-priorities-sidebar.spec.ts +++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-priorities-sidebar.spec.ts @@ -1,10 +1,10 @@ import { faker } from '@faker-js/faker'; import { IS_EE } from '../config/constants'; -import { createAuxContext } from '../fixtures/createAuxContext'; import { Users } from '../fixtures/userStates'; -import { HomeChannel, OmnichannelLiveChat } from '../page-objects'; +import { HomeChannel } from '../page-objects'; import { OmnichannelRoomInfo } from '../page-objects/omnichannel-room-info'; +import { createConversation } from '../utils/omnichannel/rooms'; import { test, expect } from '../utils/test'; const NEW_USER = { @@ -19,7 +19,7 @@ test.skip(!IS_EE, 'Omnichannel Priorities > Enterprise Only'); test.use({ storageState: Users.user1.state }); -test.describe.serial('Omnichannel Priorities [Sidebar]', () => { +test.describe.serial('OC - Priorities [Sidebar]', () => { let poHomeChannel: HomeChannel; let poRoomInfo: OmnichannelRoomInfo; @@ -33,14 +33,18 @@ test.describe.serial('Omnichannel Priorities [Sidebar]', () => { ).every((res) => expect(res.status()).toBe(200)); }); + test.beforeEach(async ({ page }) => { + poHomeChannel = new HomeChannel(page); + poRoomInfo = new OmnichannelRoomInfo(page); + }); + test.beforeEach(async ({ page }) => { await page.goto('/'); await page.locator('.main-content').waitFor(); }); - test.beforeEach(async ({ page }) => { - poHomeChannel = new HomeChannel(page); - poRoomInfo = new OmnichannelRoomInfo(page); + test.beforeEach(async ({ api }) => { + await createConversation(api, { visitorName: NEW_USER.name }); }); test.afterAll(async ({ api }) => { @@ -53,22 +57,11 @@ test.describe.serial('Omnichannel Priorities [Sidebar]', () => { ).every((res) => expect(res.status()).toBe(200)); }); - test('Priority updates with sidebar', async ({ browser, api }) => { + test('OC - Priorities [Sidebar] - Update conversation priority', async ({ page }) => { const systemMessage = poHomeChannel.content.lastSystemMessageBody; + await page.emulateMedia({ reducedMotion: 'reduce' }); - await test.step('Initiate conversation', async () => { - const poLivechat = await createAuxContext(browser, Users.user1, '/livechat', false).then( - ({ page }) => new OmnichannelLiveChat(page, api), - ); - await poLivechat.openLiveChat(); - await poLivechat.sendMessage(NEW_USER, false); - await poLivechat.onlineAgentMessage.type('this_a_test_message_from_visitor'); - await poLivechat.btnSendMessageToOnlineAgent.click(); - await poHomeChannel.sidenav.getSidebarItemByName(NEW_USER.name).click(); - await poLivechat.page.close(); - }); - - await test.step('Queue: Sidebar priority change', async () => { + await test.step('expect to change inquiry priority using sidebar menu', async () => { await poHomeChannel.sidenav.getSidebarItemByName(NEW_USER.name).click(); await expect(poRoomInfo.getLabel('Priority')).not.toBeVisible(); @@ -88,9 +81,10 @@ test.describe.serial('Omnichannel Priorities [Sidebar]', () => { await expect(poRoomInfo.getInfo('Unprioritized')).not.toBeVisible(); }); - await test.step('Subscription: Sidebar priority change', async () => { + await test.step('expect to change subscription priority using sidebar menu', async () => { await poHomeChannel.content.takeOmnichannelChatButton.click(); await systemMessage.locator('text="joined the channel"').waitFor(); + await page.waitForTimeout(500); await expect(poRoomInfo.getLabel('Priority')).not.toBeVisible(); diff --git a/apps/meteor/tests/e2e/page-objects/fragments/home-sidenav.ts b/apps/meteor/tests/e2e/page-objects/fragments/home-sidenav.ts index 4f3d7b4886eb..af860162bbdf 100644 --- a/apps/meteor/tests/e2e/page-objects/fragments/home-sidenav.ts +++ b/apps/meteor/tests/e2e/page-objects/fragments/home-sidenav.ts @@ -41,8 +41,8 @@ export class HomeSidenav { async selectPriority(name: string, priority: string) { const sidebarItem = this.getSidebarItemByName(name); - await sidebarItem.hover(); - await sidebarItem.locator(`[data-testid="menu"]`).click(); + await sidebarItem.focus(); + await sidebarItem.locator('.rcx-sidebar-item__menu').click(); await this.page.locator(`li[value="${priority}"]`).click(); } diff --git a/apps/meteor/tests/e2e/utils/omnichannel/rooms.ts b/apps/meteor/tests/e2e/utils/omnichannel/rooms.ts new file mode 100644 index 000000000000..bce8c7a44781 --- /dev/null +++ b/apps/meteor/tests/e2e/utils/omnichannel/rooms.ts @@ -0,0 +1,100 @@ +import { faker } from '@faker-js/faker'; + +import { BaseTest } from '../test'; + +type UpdateRoomParams = { roomId: string; visitorId: string; tags: string[] }; + +type CreateRoomParams = { tags?: string[]; visitorToken: string; agentId?: string }; + +type CreateVisitorParams = { token: string; department?: string; name: string; email: string }; + +type CreateConversationParams = { visitorName?: string; visitorToken?: string; agentId?: string; departmentId?: string }; + +export const updateRoom = async (api: BaseTest['api'], { roomId, visitorId, tags }: UpdateRoomParams) => { + if (!roomId) { + throw Error('Unable to update room info, missing room id'); + } + + if (!visitorId) { + throw Error('Unable to update room info, missing visitor id'); + } + + return api.post('/livechat/room.saveInfo', { + guestData: { _id: visitorId }, + roomData: { _id: roomId, tags }, + }); +}; + +export const createRoom = async (api: BaseTest['api'], { visitorToken, agentId }: CreateRoomParams) => { + const response = await api.get('/livechat/room', { + token: visitorToken, + agentId, + }); + + if (response.status() !== 200) { + throw Error(`Unable to create room [http status: ${response.status()}]`); + } + + const data = await response.json(); + + return { + response, + data: data.room, + delete: async () => { + await api.post('/livechat/room.close', { rid: data.room._id, token: visitorToken }); + await api.post('/method.call/livechat:removeRoom', { + message: JSON.stringify({ + msg: 'method', + id: '16', + method: 'livechat:removeRoom', + params: [data.room._id], + }), + }); + }, + }; +}; + +export const createVisitor = async (api: BaseTest['api'], params: CreateVisitorParams) => + api.post('/livechat/visitor', { visitor: params }); + +export const sendMessageToRoom = async ( + api: BaseTest['api'], + { visitorToken, roomId, message }: { visitorToken: string; roomId: string; message?: string }, +) => + api.post(`/livechat/message`, { + token: visitorToken, + rid: roomId, + msg: message || faker.lorem.sentence(), + }); + +export const createConversation = async ( + api: BaseTest['api'], + { visitorName, visitorToken, agentId, departmentId }: CreateConversationParams, +) => { + const token = visitorToken || faker.string.uuid(); + const visitorRes = await createVisitor(api, { + name: visitorName || faker.person.firstName(), + email: faker.internet.email(), + token, + ...(departmentId && { department: departmentId }), + }); + + if (visitorRes.status() !== 200) { + throw Error(`Unable to create visitor [http status: ${visitorRes.status()}]`); + } + + const { data: room } = await createRoom(api, { visitorToken: token, agentId }); + + const messageRes = await sendMessageToRoom(api, { visitorToken: token, roomId: room._id }); + + if (messageRes.status() !== 200) { + throw Error(`Unable to send message to room [http status: ${messageRes.status()}]`); + } + + const { visitor } = await visitorRes.json(); + + return { + room, + visitor, + }; +}; From 7e96fbd75f1c2011bb466d8615ef651e7a9f9715 Mon Sep 17 00:00:00 2001 From: Matheus Barbosa Silva <36537004+matheusbsilva137@users.noreply.github.com> Date: Thu, 23 Nov 2023 15:29:59 -0300 Subject: [PATCH 32/76] fix: creating group with the name of an already existing room throws `internalError` (#31039) --- .changeset/dirty-rings-fry.md | 5 +++++ apps/meteor/app/api/server/v1/groups.ts | 3 +-- apps/meteor/tests/end-to-end/api/02-channels.js | 15 +++++++++++++++ apps/meteor/tests/end-to-end/api/03-groups.js | 15 +++++++++++++++ 4 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 .changeset/dirty-rings-fry.md diff --git a/.changeset/dirty-rings-fry.md b/.changeset/dirty-rings-fry.md new file mode 100644 index 000000000000..06a0fd6a2966 --- /dev/null +++ b/.changeset/dirty-rings-fry.md @@ -0,0 +1,5 @@ +--- +"@rocket.chat/meteor": patch +--- + +Fixed issue with the creation of groups with the name of an already existing room throwing `internalError` diff --git a/apps/meteor/app/api/server/v1/groups.ts b/apps/meteor/app/api/server/v1/groups.ts index 8f2999cee71e..34deb57304fc 100644 --- a/apps/meteor/app/api/server/v1/groups.ts +++ b/apps/meteor/app/api/server/v1/groups.ts @@ -351,9 +351,8 @@ API.v1.addRoute( if (isMeteorError(error) && error.reason === 'error-not-allowed') { return API.v1.unauthorized(); } + throw error; } - - return API.v1.internalError(); }, }, ); diff --git a/apps/meteor/tests/end-to-end/api/02-channels.js b/apps/meteor/tests/end-to-end/api/02-channels.js index 7cb2e2234e4e..6976caa849bf 100644 --- a/apps/meteor/tests/end-to-end/api/02-channels.js +++ b/apps/meteor/tests/end-to-end/api/02-channels.js @@ -61,6 +61,21 @@ describe('[Channels]', function () { await deleteUser(guestUser); }); + it(`should fail when trying to use an existing room's name`, async () => { + await request + .post(api('channels.create')) + .set(credentials) + .send({ + name: 'general', + }) + .expect('Content-Type', 'application/json') + .expect(400) + .expect((res) => { + expect(res.body).to.have.property('success', false); + expect(res.body).to.have.nested.property('errorType', 'error-duplicate-channel-name'); + }); + }); + it('should not add guest users to more rooms than defined in the license', async function () { // TODO this is not the right way to do it. We're doing this way for now just because we have separate CI jobs for EE and CE, // ideally we should have a single CI job that adds a license and runs both CE and EE tests. diff --git a/apps/meteor/tests/end-to-end/api/03-groups.js b/apps/meteor/tests/end-to-end/api/03-groups.js index 3941df1366eb..df736ecbeb86 100644 --- a/apps/meteor/tests/end-to-end/api/03-groups.js +++ b/apps/meteor/tests/end-to-end/api/03-groups.js @@ -171,6 +171,21 @@ describe('[Groups]', function () { }); }); }); + + it(`should fail when trying to use an existing room's name`, async () => { + await request + .post(api('groups.create')) + .set(credentials) + .send({ + name: 'general', + }) + .expect('Content-Type', 'application/json') + .expect(400) + .expect((res) => { + expect(res.body).to.have.property('success', false); + expect(res.body).to.have.nested.property('errorType', 'error-duplicate-channel-name'); + }); + }); }); describe('/groups.info', () => { From 2d21a6d1dce0a59a34d83505289ec90acf8adc5b Mon Sep 17 00:00:00 2001 From: Yash Rajpal <58601732+yash-rajpal@users.noreply.github.com> Date: Fri, 24 Nov 2023 00:36:53 +0530 Subject: [PATCH 33/76] regression(fuselage-ui-kit): Handle null text before parsing (#31060) --- packages/fuselage-ui-kit/package.json | 1 + packages/fuselage-ui-kit/src/elements/MarkdownTextElement.tsx | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index 650b372eb6a2..557d7450ae3c 100644 --- a/packages/fuselage-ui-kit/package.json +++ b/packages/fuselage-ui-kit/package.json @@ -27,6 +27,7 @@ "access": "public" }, "scripts": { + "dev": "tsc --watch --preserveWatchOutput -p tsconfig-esm.json", "build": "run-s .:build:clean .:build:esm .:build:cjs", ".:build:clean": "rimraf dist", ".:build:esm": "tsc -p tsconfig-esm.json", diff --git a/packages/fuselage-ui-kit/src/elements/MarkdownTextElement.tsx b/packages/fuselage-ui-kit/src/elements/MarkdownTextElement.tsx index 6085c2831128..3eb04576851a 100644 --- a/packages/fuselage-ui-kit/src/elements/MarkdownTextElement.tsx +++ b/packages/fuselage-ui-kit/src/elements/MarkdownTextElement.tsx @@ -11,6 +11,10 @@ const MarkdownTextElement = ({ textObject }: { textObject: TextObject }) => { ? t(textObject.i18n.key, { ...textObject.i18n.args }) : textObject.text; + if (!text) { + return null; + } + return ; }; From 01ef14fe28eea8de053bae2e5a63deb66e1af135 Mon Sep 17 00:00:00 2001 From: Hugo Costa Date: Thu, 23 Nov 2023 22:15:22 -0300 Subject: [PATCH 34/76] regression: update seats cap modal (#31061) --- .../api/server/middlewares/authentication.ts | 23 +++-- .../cloud/server/functions/getCheckoutUrl.ts | 4 +- .../subscription/hooks/useCheckoutUrl.ts | 38 +------- .../views/admin/users/AdminUsersPage.tsx | 10 +- apps/meteor/definition/externals/express.d.ts | 1 + .../app/license/server/getSeatsRequestLink.ts | 5 +- .../admin/users/CloseToSeatsCapModal.tsx | 44 --------- .../admin/users/ReachedSeatsCapModal.tsx | 37 +++----- .../UserPageHeaderContentWithSeatsCap.tsx | 91 ++++++------------- .../views/admin/users/useRequestSeatsLink.ts | 3 - apps/meteor/ee/server/requestSeatsRoute.ts | 16 +++- .../rocketchat-i18n/i18n/en.i18n.json | 12 +-- apps/meteor/tests/e2e/administration.spec.ts | 2 +- .../fragments/admin-flextab-users.ts | 4 +- 14 files changed, 86 insertions(+), 204 deletions(-) delete mode 100644 apps/meteor/ee/client/views/admin/users/CloseToSeatsCapModal.tsx delete mode 100644 apps/meteor/ee/client/views/admin/users/useRequestSeatsLink.ts diff --git a/apps/meteor/app/api/server/middlewares/authentication.ts b/apps/meteor/app/api/server/middlewares/authentication.ts index 8da60e822357..e38da22fa793 100644 --- a/apps/meteor/app/api/server/middlewares/authentication.ts +++ b/apps/meteor/app/api/server/middlewares/authentication.ts @@ -41,18 +41,29 @@ export function authenticationMiddleware( }; } -export function hasPermissionMiddleware(permission: string) { +export function hasPermissionMiddleware( + permission: string, + { rejectUnauthorized } = { + rejectUnauthorized: true, + }, +) { return async (req: Request, res: Response, next: NextFunction): Promise => { if (!req.userId) { - res.status(401).send('Unauthorized'); - return; + if (rejectUnauthorized) { + res.status(401).send('Unauthorized'); + return; + } + req.unauthorized = true; + return next(); } if (!(await Authorization.hasPermission(req.userId, permission))) { - res.status(403).send('Forbidden'); - return; + if (rejectUnauthorized) { + res.status(403).send('Forbidden'); + return; + } + req.unauthorized = true; } - next(); }; } diff --git a/apps/meteor/app/cloud/server/functions/getCheckoutUrl.ts b/apps/meteor/app/cloud/server/functions/getCheckoutUrl.ts index c3c08454f3d3..2665f31c8498 100644 --- a/apps/meteor/app/cloud/server/functions/getCheckoutUrl.ts +++ b/apps/meteor/app/cloud/server/functions/getCheckoutUrl.ts @@ -6,6 +6,8 @@ import { getURL } from '../../../utils/server/getURL'; import { getWorkspaceAccessTokenOrThrow } from './getWorkspaceAccessToken'; import { syncWorkspace } from './syncWorkspace'; +export const fallback = `https://go.rocket.chat/i/contact-sales`; + export const getCheckoutUrl = async (): Promise<{ url: string; }> => { @@ -46,7 +48,7 @@ export const getCheckoutUrl = async (): Promise<{ }); return { - url: `https://go.rocket.chat/i/contact-sales`, + url: fallback, }; } }; diff --git a/apps/meteor/client/views/admin/subscription/hooks/useCheckoutUrl.ts b/apps/meteor/client/views/admin/subscription/hooks/useCheckoutUrl.ts index 0d26f90bb40e..9ae07c99ac84 100644 --- a/apps/meteor/client/views/admin/subscription/hooks/useCheckoutUrl.ts +++ b/apps/meteor/client/views/admin/subscription/hooks/useCheckoutUrl.ts @@ -1,40 +1,4 @@ -import { useAbsoluteUrl, useEndpoint } from '@rocket.chat/ui-contexts'; -import { useMutation } from '@tanstack/react-query'; - -import { useExternalLink } from '../../../../hooks/useExternalLink'; -import { CONTACT_SALES_LINK } from '../utils/links'; - -export const useCheckoutUrlAction = () => { - const getCheckoutUrl = useEndpoint('GET', '/v1/cloud.checkoutUrl'); - const handleExternalLink = useExternalLink(); - - return useMutation({ - mutationFn: async (extraData?: Record) => { - const { url } = await getCheckoutUrl(); - - const extraUrlParams = new URL(url); - - if (extraData) { - Object.entries(extraData).forEach(([key, value]) => { - extraUrlParams.searchParams.append(key, value.toString()); - }); - } - - handleExternalLink(extraUrlParams.toString()); - }, - onError: (_e, extraData) => { - const extraUrlParams = new URL(CONTACT_SALES_LINK); - - if (extraData) { - Object.entries(extraData).forEach(([key, value]) => { - extraUrlParams.searchParams.append(key, value.toString()); - }); - } - - handleExternalLink(extraUrlParams.toString()); - }, - }); -}; +import { useAbsoluteUrl } from '@rocket.chat/ui-contexts'; export const useCheckoutUrl = () => { const absoluteUrl = useAbsoluteUrl()('/links/manage-subscription'); diff --git a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx index a7db88f7ebbe..70fe8636175c 100644 --- a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx +++ b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx @@ -51,16 +51,16 @@ const UsersPage = (): ReactElement => { ) : ( - {canCreateUser && ( - - )} {canBulkCreateUser && ( )} + {canCreateUser && ( + + )} )} diff --git a/apps/meteor/definition/externals/express.d.ts b/apps/meteor/definition/externals/express.d.ts index b2a77f914aa0..1661385d94f7 100644 --- a/apps/meteor/definition/externals/express.d.ts +++ b/apps/meteor/definition/externals/express.d.ts @@ -6,5 +6,6 @@ declare module 'express' { interface Request { userId?: string; user?: IUser; + unauthorized?: boolean; } } diff --git a/apps/meteor/ee/app/license/server/getSeatsRequestLink.ts b/apps/meteor/ee/app/license/server/getSeatsRequestLink.ts index 76401d9320ce..1907d3ad982c 100644 --- a/apps/meteor/ee/app/license/server/getSeatsRequestLink.ts +++ b/apps/meteor/ee/app/license/server/getSeatsRequestLink.ts @@ -1,12 +1,9 @@ import type { ISetting } from '@rocket.chat/core-typings'; import { Settings, Users } from '@rocket.chat/models'; -import { getCheckoutUrl } from '../../../../app/cloud/server/functions/getCheckoutUrl'; - type WizardSettings = Array; -export const getSeatsRequestLink = async (params?: Record): Promise => { - const { url } = await getCheckoutUrl(); +export const getSeatsRequestLink = async (url: string, params?: Record): Promise => { const workspaceId = await Settings.findOneById('Cloud_Workspace_Id'); const activeUsers = await Users.getActiveLocalUserCount(); const wizardSettings: WizardSettings = await Settings.findSetupWizardSettings().toArray(); diff --git a/apps/meteor/ee/client/views/admin/users/CloseToSeatsCapModal.tsx b/apps/meteor/ee/client/views/admin/users/CloseToSeatsCapModal.tsx deleted file mode 100644 index 04bd22605fd1..000000000000 --- a/apps/meteor/ee/client/views/admin/users/CloseToSeatsCapModal.tsx +++ /dev/null @@ -1,44 +0,0 @@ -import { Modal, Button, Box } from '@rocket.chat/fuselage'; -import { ExternalLink } from '@rocket.chat/ui-client'; -import { useTranslation } from '@rocket.chat/ui-contexts'; -import type { ReactElement } from 'react'; -import React from 'react'; - -import MemberCapUsage from './SeatsCapUsage'; - -type CloseToSeatsCapModalProps = { - members: number; - limit: number; - title: string; - requestSeatsLink: string; - onConfirm: () => void; - onClose: () => void; -}; - -const CloseToSeatsCapModal = ({ members, limit, title, onConfirm, onClose, requestSeatsLink }: CloseToSeatsCapModalProps): ReactElement => { - const t = useTranslation(); - return ( - - - {title} - - - - - {t('Close_to_seat_limit_warning')} {t('Request_more_seats')} - - - - - - - - - - - ); -}; - -export default CloseToSeatsCapModal; diff --git a/apps/meteor/ee/client/views/admin/users/ReachedSeatsCapModal.tsx b/apps/meteor/ee/client/views/admin/users/ReachedSeatsCapModal.tsx index 79a595bbc37b..a8c5fcf9ea2d 100644 --- a/apps/meteor/ee/client/views/admin/users/ReachedSeatsCapModal.tsx +++ b/apps/meteor/ee/client/views/admin/users/ReachedSeatsCapModal.tsx @@ -1,49 +1,34 @@ import { Modal, Button, Box } from '@rocket.chat/fuselage'; -import { useTranslation } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React from 'react'; - -import { useExternalLink } from '../../../../../client/hooks/useExternalLink'; -import SeatsCapUsage from './SeatsCapUsage'; +import { useTranslation } from 'react-i18next'; type ReachedSeatsCapModalProps = { - members: number; - limit: number; - requestSeatsLink: string; onClose: () => void; + onContinue: () => void; + onBuyMoreSeats: () => void; + showContinue: boolean; }; -const ReachedSeatsCapModal = ({ members, limit, onClose, requestSeatsLink }: ReachedSeatsCapModalProps): ReactElement => { - const t = useTranslation(); - const handleExternalLink = useExternalLink(); +const ReachedSeatsCapModal = ({ onClose, onContinue, onBuyMoreSeats, showContinue }: ReachedSeatsCapModalProps): ReactElement => { + const { t } = useTranslation(); return ( - {t('Request_more_seats_title')} + {t('Seat_limit_reached')} - {t('Request_more_seats_out_of_seats')} - - - {t('Request_more_seats_sales_team')} + {t('Seat_limit_reached_Description')} - - - } + diff --git a/apps/meteor/ee/client/views/admin/users/UserPageHeaderContentWithSeatsCap.tsx b/apps/meteor/ee/client/views/admin/users/UserPageHeaderContentWithSeatsCap.tsx index 324aae2bdc90..4a2b618ff4b2 100644 --- a/apps/meteor/ee/client/views/admin/users/UserPageHeaderContentWithSeatsCap.tsx +++ b/apps/meteor/ee/client/views/admin/users/UserPageHeaderContentWithSeatsCap.tsx @@ -1,14 +1,13 @@ import { Button, ButtonGroup, Margins } from '@rocket.chat/fuselage'; -import { useSetModal, useRoute, useTranslation } from '@rocket.chat/ui-contexts'; +import { useSetModal, useTranslation, useRouter } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React from 'react'; import { useExternalLink } from '../../../../../client/hooks/useExternalLink'; import { useShouldPreventAction } from '../../../../../client/hooks/useShouldPreventAction'; -import CloseToSeatsCapModal from './CloseToSeatsCapModal'; +import { useCheckoutUrl } from '../../../../../client/views/admin/subscription/hooks/useCheckoutUrl'; import ReachedSeatsCapModal from './ReachedSeatsCapModal'; import SeatsCapUsage from './SeatsCapUsage'; -import { useRequestSeatsLink } from './useRequestSeatsLink'; type UserPageHeaderContentWithSeatsCapProps = { activeUsers: number; @@ -16,80 +15,44 @@ type UserPageHeaderContentWithSeatsCapProps = { }; const UserPageHeaderContentWithSeatsCap = ({ activeUsers, maxActiveUsers }: UserPageHeaderContentWithSeatsCapProps): ReactElement => { - const seatsLinkUrl = useRequestSeatsLink(); - const handleExternalLink = useExternalLink(); - const isCreateUserDisabled = useShouldPreventAction('activeUsers'); const t = useTranslation(); - const usersRoute = useRoute('admin-users'); + const router = useRouter(); const setModal = useSetModal(); const closeModal = (): void => setModal(null); - const isCloseToLimit = (): boolean => { - const ratio = activeUsers / maxActiveUsers; - return ratio >= 0.8; - }; + const openExternalLink = useExternalLink(); + const manageSubscriptionUrl = useCheckoutUrl()({ target: 'user-page', action: 'buy_more' }); - const withPreventionOnReachedLimit = (fn: () => void) => (): void => { - if (typeof seatsLinkUrl !== 'string') { - return; - } + const withReachedLimit = (fn: () => void) => (): void => { if (isCreateUserDisabled) { - setModal(); - return; - } - - fn(); - }; - - const handleNewButtonClick = withPreventionOnReachedLimit(() => { - if (typeof seatsLinkUrl !== 'string') { - return; - } - if (isCloseToLimit()) { setModal( - { - usersRoute.push({ context: 'new' }); + { + router.navigate('/admin/users/new'); closeModal(); }} - onClose={closeModal} + onBuyMoreSeats={() => { + openExternalLink(manageSubscriptionUrl); + }} + showContinue={!isCreateUserDisabled} />, ); return; } - usersRoute.push({ context: 'new' }); - }); + fn(); + }; - const handleInviteButtonClick = withPreventionOnReachedLimit(() => { - if (typeof seatsLinkUrl !== 'string') { - return; - } - if (isCloseToLimit()) { - setModal( - { - usersRoute.push({ context: 'invite' }); - closeModal(); - }} - onClose={closeModal} - />, - ); - return; - } + const handleNewButtonClick = withReachedLimit(() => { + router.navigate('/admin/users/new'); + }); - usersRoute.push({ context: 'invite' }); + const handleInviteButtonClick = withReachedLimit(() => { + router.navigate('/admin/users/invite'); }); return ( @@ -98,15 +61,17 @@ const UserPageHeaderContentWithSeatsCap = ({ activeUsers, maxActiveUsers }: User - - + {isCreateUserDisabled && ( + + )} ); diff --git a/apps/meteor/ee/client/views/admin/users/useRequestSeatsLink.ts b/apps/meteor/ee/client/views/admin/users/useRequestSeatsLink.ts deleted file mode 100644 index 68762127fcd4..000000000000 --- a/apps/meteor/ee/client/views/admin/users/useRequestSeatsLink.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { useAbsoluteUrl } from '@rocket.chat/ui-contexts'; - -export const useRequestSeatsLink = (): string => useAbsoluteUrl()('/links/manage-subscription'); diff --git a/apps/meteor/ee/server/requestSeatsRoute.ts b/apps/meteor/ee/server/requestSeatsRoute.ts index ae6ee78c0867..883418ab48f3 100644 --- a/apps/meteor/ee/server/requestSeatsRoute.ts +++ b/apps/meteor/ee/server/requestSeatsRoute.ts @@ -1,8 +1,9 @@ import { Analytics } from '@rocket.chat/core-services'; -import express from 'express'; +import express, { type Request } from 'express'; import { WebApp } from 'meteor/webapp'; import { authenticationMiddleware, hasPermissionMiddleware } from '../../app/api/server/middlewares/authentication'; +import { getCheckoutUrl, fallback } from '../../app/cloud/server/functions/getCheckoutUrl'; import { getSeatsRequestLink } from '../app/license/server/getSeatsRequestLink'; const apiServer = express(); @@ -15,14 +16,19 @@ const router = express.Router(); apiServer.use('/requestSeats', router); apiServer.use('/links/manage-subscription', router); -router.use(authenticationMiddleware({ rejectUnauthorized: true, cookies: true })); +router.use(authenticationMiddleware({ rejectUnauthorized: false, cookies: true })); -router.use(hasPermissionMiddleware('manage-cloud')); +router.use( + hasPermissionMiddleware('manage-cloud', { + rejectUnauthorized: false, + }), +); -router.get('/', async (req, res) => { - const url = await getSeatsRequestLink(req.query as Record); +router.get('/', async (req: Request, res) => { + const url = await getSeatsRequestLink(req.unauthorized ? fallback : (await getCheckoutUrl()).url, req.query as Record); await Analytics.saveSeatRequest(); + res.writeHead(302, { Location: url }); res.end(); }); diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json index 73a23a659050..3d0c59fa0813 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json @@ -1017,7 +1017,6 @@ "Close": "Close", "Close_chat": "Close chat", "Close_room_description": "You are about to close this chat. Are you sure you want to continue?", - "Close_to_seat_limit_warning": "New members cannot be created once the seat limit is met.", "close-livechat-room": "Close Omnichannel Room", "close-livechat-room_description": "Permission to close the current Omnichannel room", "Close_menu": "Close menu", @@ -3656,6 +3655,7 @@ "New_Trigger": "New Trigger", "New_Unit": "New Unit", "New_users": "New users", + "New_user": "New user", "New_version_available_(s)": "New version available (%s)", "New_videocall_request": "New Video Call Request", "New_visitor_navigation": "New Navigation: {{history}}", @@ -4273,11 +4273,6 @@ "Report_User": "Report user", "Reporting": "Reporting", "Request": "Request", - "Request_seats": "Request Seats", - "Request_more_seats": "Request more seats.", - "Request_more_seats_out_of_seats": "You can not add members because this Workspace is out of seats, please request more seats.", - "Request_more_seats_sales_team": "Once your request is submitted, our Sales Team will look into it and will reach out to you within the next couple of days.", - "Request_more_seats_title": "Request More Seats", "Request_comment_when_closing_conversation": "Request comment when closing conversation", "Request_comment_when_closing_conversation_description": "If enabled, the agent will need to set a comment before the conversation is closed.", "Request_tag_before_closing_chat": "Request tag(s) before closing conversation", @@ -6187,5 +6182,8 @@ "Sync_license_update_Callout": "If you don't notice any changes in your workspace within a few minutes, sync the license update.", "Includes": "Includes", "Unlock_premium_capabilities": "Unlock premium capabilities", - "Unlimited_seats": "Unlimited seats" + "Unlimited_seats": "Unlimited seats", + "Seat_limit_reached": "Seat limit reached", + "Seat_limit_reached_Description": "Your workspace has reached its contractual seat limit and soon you won't be able to add more users.", + "Buy_more_seats": "Buy more seats" } diff --git a/apps/meteor/tests/e2e/administration.spec.ts b/apps/meteor/tests/e2e/administration.spec.ts index ec9568152133..2601c2409b61 100644 --- a/apps/meteor/tests/e2e/administration.spec.ts +++ b/apps/meteor/tests/e2e/administration.spec.ts @@ -38,7 +38,7 @@ test.describe.parallel('administration', () => { }); test('expect create a user', async () => { - await poAdmin.tabs.users.btnNew.click(); + await poAdmin.tabs.users.btnNewUser.click(); await poAdmin.tabs.users.inputName.type(faker.person.firstName()); await poAdmin.tabs.users.inputUserName.type(faker.internet.userName()); await poAdmin.tabs.users.inputEmail.type(faker.internet.email()); diff --git a/apps/meteor/tests/e2e/page-objects/fragments/admin-flextab-users.ts b/apps/meteor/tests/e2e/page-objects/fragments/admin-flextab-users.ts index bd46de6ea00f..23e855b1aa21 100644 --- a/apps/meteor/tests/e2e/page-objects/fragments/admin-flextab-users.ts +++ b/apps/meteor/tests/e2e/page-objects/fragments/admin-flextab-users.ts @@ -7,8 +7,8 @@ export class AdminFlextabUsers { this.page = page; } - get btnNew(): Locator { - return this.page.locator('role=button[name="New"]'); + get btnNewUser(): Locator { + return this.page.locator('role=button[name="New user"]'); } get btnSave(): Locator { From 17cda50bac0ad8a60710ce996896c95b37f6259f Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Thu, 23 Nov 2023 22:17:21 -0300 Subject: [PATCH 35/76] regression: banners close (#31033) --- .../views/banners/hooks/useRemoteBanners.ts | 14 +++++++++----- .../ee/server/apps/communication/uikit.ts | 2 ++ .../server/modules/core-apps/banner.module.ts | 18 +++++++++++++++--- apps/meteor/tests/e2e/e2e-encryption.spec.ts | 6 +++--- apps/meteor/tests/e2e/fixtures/userStates.ts | 4 +++- 5 files changed, 32 insertions(+), 12 deletions(-) diff --git a/apps/meteor/client/views/banners/hooks/useRemoteBanners.ts b/apps/meteor/client/views/banners/hooks/useRemoteBanners.ts index ebed89e06037..96731f6c66a5 100644 --- a/apps/meteor/client/views/banners/hooks/useRemoteBanners.ts +++ b/apps/meteor/client/views/banners/hooks/useRemoteBanners.ts @@ -4,6 +4,7 @@ import { useEndpoint, useStream, useUserId, ServerContext } from '@rocket.chat/u import { useContext, useEffect } from 'react'; import * as banners from '../../../lib/banners'; +import { useUiKitActionManager } from '../../../uikit/hooks/useUiKitActionManager'; export const useRemoteBanners = () => { const uid = useUserId(); @@ -13,6 +14,8 @@ export const useRemoteBanners = () => { const subscribeToNotifyLoggedIn = useStream('notify-logged'); const subscribeToNotifyUser = useStream('notify-user'); + const actionManager = useUiKitActionManager(); + useEffect(() => { if (!uid) { return; @@ -37,7 +40,7 @@ export const useRemoteBanners = () => { } response.banners.forEach((banner) => { - banners.open(mapBanner(banner)); + actionManager.openView('banner', mapBanner(banner)); }); }; @@ -56,16 +59,17 @@ export const useRemoteBanners = () => { } if (!response.banners.length) { - return banners.closeById(event.bannerId); + actionManager.disposeView(event.bannerId); + return; } response.banners.forEach((banner) => { - banners.open(mapBanner(banner)); + actionManager.openView('banner', mapBanner(banner)); }); }); const unsubscribeBanners = subscribeToNotifyUser(`${uid}/banners`, async (banner) => { - banners.open(banner.view); + actionManager.openView('banner', banner.view); }); return () => { @@ -76,5 +80,5 @@ export const useRemoteBanners = () => { banners.clear(); }; - }, [getBanners, serverContext, subscribeToNotifyLoggedIn, uid, subscribeToNotifyUser]); + }, [getBanners, serverContext, subscribeToNotifyLoggedIn, uid, subscribeToNotifyUser, actionManager]); }; diff --git a/apps/meteor/ee/server/apps/communication/uikit.ts b/apps/meteor/ee/server/apps/communication/uikit.ts index 61dee0a1857f..0392076704d7 100644 --- a/apps/meteor/ee/server/apps/communication/uikit.ts +++ b/apps/meteor/ee/server/apps/communication/uikit.ts @@ -138,10 +138,12 @@ const getCoreAppPayload = (req: UiKitUserInteractionRequest): UiKitCoreAppPayloa const { type, payload: { view, isCleared }, + triggerId, } = req.body; return { appId, + triggerId, type, user, payload: { diff --git a/apps/meteor/server/modules/core-apps/banner.module.ts b/apps/meteor/server/modules/core-apps/banner.module.ts index fac891e5ea73..9455a06beb8a 100644 --- a/apps/meteor/server/modules/core-apps/banner.module.ts +++ b/apps/meteor/server/modules/core-apps/banner.module.ts @@ -1,11 +1,12 @@ import { Banner } from '@rocket.chat/core-services'; import type { IUiKitCoreApp, UiKitCoreAppPayload } from '@rocket.chat/core-services'; +import type { UiKit } from '@rocket.chat/core-typings'; export class BannerModule implements IUiKitCoreApp { appId = 'banner-core'; - // when banner view is closed we need to dissmiss that banner for that user - async viewClosed(payload: UiKitCoreAppPayload) { + // when banner view is closed we need to dismiss that banner for that user + async viewClosed(payload: UiKitCoreAppPayload): Promise { const { payload: { view: { viewId: bannerId } = {} }, user: { _id: userId } = {}, @@ -19,6 +20,17 @@ export class BannerModule implements IUiKitCoreApp { throw new Error('invalid banner'); } - return Banner.dismiss(userId, bannerId); + if (!payload.triggerId) { + throw new Error('invalid triggerId'); + } + + await Banner.dismiss(userId, bannerId); + + return { + type: 'banner.close', + triggerId: payload.triggerId, + appId: payload.appId, + viewId: bannerId, + }; } } diff --git a/apps/meteor/tests/e2e/e2e-encryption.spec.ts b/apps/meteor/tests/e2e/e2e-encryption.spec.ts index 7cc04efba3a0..dc10729f3b79 100644 --- a/apps/meteor/tests/e2e/e2e-encryption.spec.ts +++ b/apps/meteor/tests/e2e/e2e-encryption.spec.ts @@ -31,13 +31,13 @@ test.describe.serial('e2e-encryption initial setup', () => { test.beforeAll(async ({ api }) => { const statusCode = (await api.post('/settings/E2E_Enable', { value: true })).status(); - await expect(statusCode).toBe(200); + expect(statusCode).toBe(200); }); test.afterAll(async ({ api }) => { const statusCode = (await api.post('/settings/E2E_Enable', { value: false })).status(); - await expect(statusCode).toBe(200); + expect(statusCode).toBe(200); }); test.afterEach(async ({ api }) => { @@ -131,7 +131,7 @@ test.describe.serial('e2e-encryption', () => { test.beforeEach(async ({ page, api }) => { const statusCode = (await api.post('/settings/E2E_Enable', { value: true })).status(); - await expect(statusCode).toBe(200); + expect(statusCode).toBe(200); poHomeChannel = new HomeChannel(page); diff --git a/apps/meteor/tests/e2e/fixtures/userStates.ts b/apps/meteor/tests/e2e/fixtures/userStates.ts index d79679107889..7bcab213f8fc 100644 --- a/apps/meteor/tests/e2e/fixtures/userStates.ts +++ b/apps/meteor/tests/e2e/fixtures/userStates.ts @@ -99,9 +99,11 @@ export async function restoreState(page: Page, user: IUserState, options: { exce ls = ls.filter(({ name }) => !options.except?.includes(name)); } - return page.evaluate((items) => { + await page.evaluate((items) => { items.forEach(({ name, value }) => { window.localStorage.setItem(name, value); }); }, ls); + + await page.waitForTimeout(2000); // Wait for the login to be completed } From c3c23359bae4b97b3d27b589c553ff1a63c4f4e2 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Thu, 23 Nov 2023 22:20:53 -0300 Subject: [PATCH 36/76] chore: format limit cards (#31064) --- apps/meteor/client/hooks/useFormatNumber.ts | 16 ++++++++++++++++ .../subscription/components/UsagePieGraph.tsx | 12 +++++++++++- .../packages/rocketchat-i18n/i18n/en.i18n.json | 2 ++ 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 apps/meteor/client/hooks/useFormatNumber.ts diff --git a/apps/meteor/client/hooks/useFormatNumber.ts b/apps/meteor/client/hooks/useFormatNumber.ts new file mode 100644 index 000000000000..2e1041c95dfa --- /dev/null +++ b/apps/meteor/client/hooks/useFormatNumber.ts @@ -0,0 +1,16 @@ +import { useLanguage } from '@rocket.chat/ui-contexts'; +import { useCallback } from 'react'; + +export const useFormatNumber = (options?: Intl.NumberFormatOptions) => { + const language = useLanguage(); + return useCallback( + (value: number) => { + try { + return new Intl.NumberFormat(language, options).format(value); + } catch (_error) { + return value; + } + }, + [language, options], + ); +}; diff --git a/apps/meteor/client/views/admin/subscription/components/UsagePieGraph.tsx b/apps/meteor/client/views/admin/subscription/components/UsagePieGraph.tsx index 143f85bd34e6..3e07122adaff 100644 --- a/apps/meteor/client/views/admin/subscription/components/UsagePieGraph.tsx +++ b/apps/meteor/client/views/admin/subscription/components/UsagePieGraph.tsx @@ -3,6 +3,7 @@ import { Pie } from '@nivo/pie'; import { Box, Palette } from '@rocket.chat/fuselage'; import type { ReactElement, CSSProperties, ReactNode } from 'react'; import React, { useMemo, useCallback, memo } from 'react'; +import { useTranslation } from 'react-i18next'; import { useLocalePercentage } from '../../../../hooks/useLocalePercentage'; @@ -28,6 +29,7 @@ type GraphData = Array<{ }>; const UsagePieGraph = ({ used = 0, total = 0, label, color, size = 140 }: UsagePieGraphProps): ReactElement => { + const { t } = useTranslation(); const parsedData = useMemo( (): GraphData => [ { @@ -85,7 +87,15 @@ const UsagePieGraph = ({ used = 0, total = 0, label, color, size = 140 }: UsageP - {used} / {unlimited ? '∞' : total} + {unlimited && + t('used_limit_infinite', { + used, + })} + {!unlimited && + t('used_limit', { + used, + limit: total, + })} {label && ( diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json index 3d0c59fa0813..c1d003d8149a 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json @@ -4567,6 +4567,8 @@ "Search_Users": "Search Users", "Seats_Available": "{{seatsLeft, number}} Seats Available", "MAC_Available": "{{macLeft, number}} MAC's Available", + "used_limit": "{{used, number}} / {{limit, number}}", + "used_limit_infinite": "{{used, number}} / ∞", "Seats_usage": "Seats Usage", "seconds": "seconds", "Secret_token": "Secret Token", From 3334cfeff33f3cfe2b1870605aabf8fa1e9e1751 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Thu, 23 Nov 2023 22:21:28 -0300 Subject: [PATCH 37/76] regression: active users count validation (#31066) --- .../app/lib/server/functions/deleteUser.ts | 3 + .../app/lib/server/functions/saveUser.js | 13 +- .../ee/app/authorization/server/callback.ts | 23 ++ .../ee/app/authorization/server/index.ts | 1 + .../server/validateUserRoles.spec.ts | 254 ++++++++++++++++++ .../authorization/server/validateUserRoles.ts | 50 ++-- apps/meteor/jest.config.ts | 64 +++-- apps/meteor/lib/callbacks.ts | 4 +- apps/meteor/server/methods/deleteUser.ts | 3 - .../license/__tests__/MockedLicenseBuilder.ts | 236 +--------------- .../license/src/MockedLicenseBuilder.ts | 236 ++++++++++++++++ ee/packages/license/src/index.ts | 1 + 12 files changed, 604 insertions(+), 284 deletions(-) create mode 100644 apps/meteor/ee/app/authorization/server/callback.ts create mode 100644 apps/meteor/ee/app/authorization/server/validateUserRoles.spec.ts create mode 100644 ee/packages/license/src/MockedLicenseBuilder.ts diff --git a/apps/meteor/app/lib/server/functions/deleteUser.ts b/apps/meteor/app/lib/server/functions/deleteUser.ts index 21ae3fecf81c..d8c21bf06fce 100644 --- a/apps/meteor/app/lib/server/functions/deleteUser.ts +++ b/apps/meteor/app/lib/server/functions/deleteUser.ts @@ -15,6 +15,7 @@ import { } from '@rocket.chat/models'; import { Meteor } from 'meteor/meteor'; +import { callbacks } from '../../../../lib/callbacks'; import { i18n } from '../../../../server/lib/i18n'; import { FileUpload } from '../../../file-upload/server'; import { settings } from '../../../settings/server'; @@ -117,4 +118,6 @@ export async function deleteUser(userId: string, confirmRelinquish = false, dele // Refresh the servers list await FederationServers.refreshServers(); + + await callbacks.run('afterDeleteUser', user); } diff --git a/apps/meteor/app/lib/server/functions/saveUser.js b/apps/meteor/app/lib/server/functions/saveUser.js index 46bef4c7d1aa..1b243d4c0966 100644 --- a/apps/meteor/app/lib/server/functions/saveUser.js +++ b/apps/meteor/app/lib/server/functions/saveUser.js @@ -110,10 +110,6 @@ async function validateUserData(userId, userData) { }); } - if (userData.roles) { - await callbacks.run('validateUserRoles', userData); - } - let nameValidation; try { @@ -336,11 +332,18 @@ const saveNewUser = async function (userData, sendPassword) { }; export const saveUser = async function (userId, userData) { - const oldUserData = await Users.findOneById(userData._id); + const oldUserData = userData._id && (await Users.findOneById(userData._id)); if (oldUserData && isUserFederated(oldUserData)) { throw new Meteor.Error('Edit_Federated_User_Not_Allowed', 'Not possible to edit a federated user'); } + await validateUserData(userId, userData); + + await callbacks.run('beforeSaveUser', { + user: userData, + oldUser: oldUserData, + }); + let sendPassword = false; if (userData.hasOwnProperty('setRandomPassword')) { diff --git a/apps/meteor/ee/app/authorization/server/callback.ts b/apps/meteor/ee/app/authorization/server/callback.ts new file mode 100644 index 000000000000..54391147c8ef --- /dev/null +++ b/apps/meteor/ee/app/authorization/server/callback.ts @@ -0,0 +1,23 @@ +import { License } from '@rocket.chat/license'; + +import { callbacks } from '../../../../lib/callbacks'; +import { validateUserRoles } from './validateUserRoles'; + +License.on('installed', async () => { + callbacks.add( + 'beforeSaveUser', + async ({ user, oldUser }) => { + await validateUserRoles(user, oldUser); + }, + callbacks.priority.HIGH, + 'validateUserRoles', + ); + callbacks.add('afterSaveUser', () => License.shouldPreventAction('activeUsers'), callbacks.priority.HIGH, 'validateUserRoles'); + callbacks.add('afterDeleteUser', () => License.shouldPreventAction('activeUsers'), callbacks.priority.HIGH, 'validateUserRoles'); +}); + +License.on('invalidate', async () => { + callbacks.remove('beforeSaveUser', 'validateUserRoles'); + callbacks.remove('afterSaveUser', 'validateUserRoles'); + callbacks.remove('afterDeleteUser', 'validateUserRoles'); +}); diff --git a/apps/meteor/ee/app/authorization/server/index.ts b/apps/meteor/ee/app/authorization/server/index.ts index cd7f8dbb8316..a904bc84a9ef 100644 --- a/apps/meteor/ee/app/authorization/server/index.ts +++ b/apps/meteor/ee/app/authorization/server/index.ts @@ -1 +1,2 @@ import '../lib/addRoleRestrictions'; +import './callback'; diff --git a/apps/meteor/ee/app/authorization/server/validateUserRoles.spec.ts b/apps/meteor/ee/app/authorization/server/validateUserRoles.spec.ts new file mode 100644 index 000000000000..f850a20359b9 --- /dev/null +++ b/apps/meteor/ee/app/authorization/server/validateUserRoles.spec.ts @@ -0,0 +1,254 @@ +import { MeteorError } from '@rocket.chat/core-services'; +import { License, MockedLicenseBuilder } from '@rocket.chat/license'; + +import { validateUserRoles } from './validateUserRoles'; + +beforeEach(async () => { + const license = new MockedLicenseBuilder(); + await License.setWorkspaceUrl('http://localhost:3000'); + License.setLicenseLimitCounter('activeUsers', () => 0); + License.setLicenseLimitCounter('guestUsers', () => 0); + License.setLicenseLimitCounter('roomsPerGuest', async () => 0); + License.setLicenseLimitCounter('privateApps', () => 0); + License.setLicenseLimitCounter('marketplaceApps', () => 0); + License.setLicenseLimitCounter('monthlyActiveContacts', async () => 0); + + License.setLicenseLimitCounter('activeUsers', () => 1); + + license + .withLimits('activeUsers', [ + { + max: 1, + behavior: 'prevent_action', + }, + ]) + .withLimits('guestUsers', [ + { + max: 1, + behavior: 'prevent_action', + }, + ]); + + await License.setLicense(await license.sign()); +}); + +describe('Operating after activeUsers Limits', () => { + beforeEach(async () => { + License.setLicenseLimitCounter('activeUsers', () => 1); + }); + + describe('Adding a new user', () => { + it('should not throw error when user is not active', async () => { + const user = { + active: false, + type: 'user', + }; + + await expect(validateUserRoles(user)).resolves.not.toThrow(); + }); + + it('should not throw error when user is an app', async () => { + const user = { + active: true, + type: 'app', + }; + + await expect(validateUserRoles(user)).resolves.not.toThrow(); + }); + + it('should not throw error when user is a bot', async () => { + const user = { + active: true, + type: 'bot', + }; + + await expect(validateUserRoles(user)).resolves.not.toThrow(); + }); + + it('should not throw error when user is a guest', async () => { + const user = { + active: true, + type: 'user', + roles: ['guest'], + }; + + await expect(validateUserRoles(user)).resolves.not.toThrow(); + }); + + it('should throw error when user is active', async () => { + const user = { + active: true, + type: 'user', + }; + await expect(validateUserRoles(user)).rejects.toThrow(MeteorError); + }); + }); + + describe('Editing an existing user', () => { + beforeEach(async () => { + License.setLicenseLimitCounter('guestUsers', () => 1); + }); + afterEach(async () => { + License.setLicenseLimitCounter('guestUsers', () => 0); + }); + + it('should throw an error when we try to activate a user', async () => { + const user = { + active: true, + type: 'user', + }; + const currentUser = { + active: false, + type: 'user', + }; + await expect(validateUserRoles(user, currentUser)).rejects.toThrow(MeteorError); + }); + + it('should not throw an error when we try to deactivate a user', async () => { + const user = { + active: false, + type: 'user', + }; + const currentUser = { + active: true, + type: 'user', + }; + await expect(validateUserRoles(user, currentUser)).resolves.not.toThrow(); + }); + + it('should not throw an error when we try to change an active user', async () => { + const user = { + active: true, + type: 'user', + }; + const currentUser = { + active: true, + type: 'user', + }; + await expect(validateUserRoles(user, currentUser)).resolves.not.toThrow(); + }); + + it('should throw an error when we try to convert a bot to a user', async () => { + const user = { + active: true, + type: 'user', + }; + const currentUser = { + active: true, + type: 'bot', + }; + await expect(validateUserRoles(user, currentUser)).rejects.toThrow(MeteorError); + }); + }); +}); + +describe('Operating after guestUsers Limits', () => { + beforeEach(async () => { + License.setLicenseLimitCounter('guestUsers', () => 1); + }); + + it('should throw an error when we try to convert an user to guest', async () => { + const user = { + active: true, + type: 'user', + roles: ['guest'], + }; + const currentUser = { + active: true, + type: 'user', + }; + await expect(validateUserRoles(user, currentUser)).rejects.toThrow(MeteorError); + }); + + it('should throw an error when we try to convert app to guest', async () => { + const user = { + active: true, + type: 'user', + roles: ['guest'], + }; + const currentUser = { + active: true, + type: 'app', + }; + await expect(validateUserRoles(user, currentUser)).rejects.toThrow(MeteorError); + }); + + it('should not throw an error when we try to edit a guest', async () => { + const user = { + active: true, + type: 'user', + roles: ['guest'], + }; + const currentUser = { + active: true, + type: 'user', + roles: ['guest'], + }; + await expect(validateUserRoles(user, currentUser)).resolves.not.toThrow(); + }); +}); + +describe('Operating under activeUsers Limits', () => { + beforeEach(async () => { + License.setLicenseLimitCounter('activeUsers', () => 0); + }); + + describe('Adding a new user', () => { + it('should not throw an error validating a regular user', async () => { + const user = { + active: true, + type: 'user', + }; + await expect(validateUserRoles(user)).resolves.not.toThrow(); + }); + }); + + describe('Editing an existing user', () => { + it('should not throw an error when we try to activate a user', async () => { + const user = { + active: true, + type: 'user', + }; + const currentUser = { + active: false, + type: 'user', + }; + await expect(validateUserRoles(user, currentUser)).resolves.not.toThrow(); + }); + + it('should not throw an error when we try to convert a guest to a user', async () => { + const user = { + active: true, + type: 'user', + }; + const currentUser = { + active: true, + type: 'user', + roles: ['guest'], + }; + await expect(validateUserRoles(user, currentUser)).resolves.not.toThrow(); + }); + it('should not throw an error when we try to convert a bot to a user', async () => { + const user = { + active: true, + type: 'user', + }; + const currentUser = { + active: true, + type: 'bot', + }; + await expect(validateUserRoles(user, currentUser)).resolves.not.toThrow(); + }); + it('should not throw an error when we try to convert an app to a user', async () => { + const user = { + active: true, + type: 'user', + }; + const currentUser = { + active: true, + type: 'app', + }; + await expect(validateUserRoles(user, currentUser)).resolves.not.toThrow(); + }); + }); +}); diff --git a/apps/meteor/ee/app/authorization/server/validateUserRoles.ts b/apps/meteor/ee/app/authorization/server/validateUserRoles.ts index a07165b8c5d8..5ee978b2379c 100644 --- a/apps/meteor/ee/app/authorization/server/validateUserRoles.ts +++ b/apps/meteor/ee/app/authorization/server/validateUserRoles.ts @@ -1,43 +1,49 @@ +import { MeteorError } from '@rocket.chat/core-services'; import type { IUser } from '@rocket.chat/core-typings'; import { License } from '@rocket.chat/license'; -import { Users } from '@rocket.chat/models'; -import { Meteor } from 'meteor/meteor'; import { i18n } from '../../../../server/lib/i18n'; -export const validateUserRoles = async function (userData: Partial) { - if (!License.hasValidLicense()) { - return; - } +export async function validateUserRoles(userData: Partial, currentUserData?: Partial) { + const isApp = Boolean(userData.type === 'app'); + const wasApp = Boolean(currentUserData?.type === 'app'); + + const isBot = Boolean(userData.type === 'bot'); + const wasBot = Boolean(currentUserData?.type === 'bot'); const isGuest = Boolean(userData.roles?.includes('guest') && userData.roles.length === 1); - const currentUserData = userData._id ? await Users.findOneById(userData._id) : null; const wasGuest = Boolean(currentUserData?.roles?.includes('guest') && currentUserData.roles.length === 1); - if (currentUserData?.type === 'app') { + const isSpecialType = isApp || isBot; + + const hasGuestToChanged = isGuest && !wasGuest; + + if (isSpecialType) { return; } - if (isGuest) { - if (wasGuest) { - return; - } - - if (await License.shouldPreventAction('guestUsers')) { - throw new Meteor.Error('error-max-guests-number-reached', 'Maximum number of guests reached.', { - method: 'insertOrUpdateUser', - field: 'Assign_role', - }); - } + if (hasGuestToChanged && (await License.shouldPreventAction('guestUsers'))) { + throw new MeteorError('error-max-guests-number-reached', 'Maximum number of guests reached.', { + method: 'insertOrUpdateUser', + field: 'Assign_role', + }); + } + if (isGuest) { return; } - if (!wasGuest && userData._id) { + const isActive = Boolean(userData.active); + const wasActive = Boolean(currentUserData?.active); + + const hasStatusChanged = isActive && !wasActive; + const hasRemovedSpecialType = (wasApp && !isApp) || (wasBot && !isBot); + + if (!hasStatusChanged && !hasRemovedSpecialType) { return; } if (await License.shouldPreventAction('activeUsers')) { - throw new Meteor.Error('error-license-user-limit-reached', i18n.t('error-license-user-limit-reached')); + throw new MeteorError('error-license-user-limit-reached', i18n.t('error-license-user-limit-reached')); } -}; +} diff --git a/apps/meteor/jest.config.ts b/apps/meteor/jest.config.ts index b5fbbaa8caeb..81938441d722 100644 --- a/apps/meteor/jest.config.ts +++ b/apps/meteor/jest.config.ts @@ -1,20 +1,50 @@ -export default { - errorOnDeprecated: true, - - testEnvironment: 'jsdom', - modulePathIgnorePatterns: ['/dist/'], - testMatch: [ - '/client/**/**.spec.[jt]s?(x)', - '/tests/unit/client/views/**/*.spec.{ts,tsx}', - '/tests/unit/client/providers/**/*.spec.{ts,tsx}', +import type { Config } from 'jest'; + +const config: Config = { + projects: [ + { + displayName: 'client', + testEnvironment: 'jsdom', + testMatch: [ + '/client/**/**.spec.[jt]s?(x)', + '/tests/unit/client/views/**/*.spec.{ts,tsx}', + '/tests/unit/client/providers/**/*.spec.{ts,tsx}', + ], + errorOnDeprecated: true, + + modulePathIgnorePatterns: ['/dist/'], + + transform: { + '^.+\\.(t|j)sx?$': '@swc/jest', + }, + + moduleNameMapper: { + '\\.css$': 'identity-obj-proxy', + '^react($|/.+)': '/node_modules/react$1', + '^@tanstack/(.+)': '/node_modules/@tanstack/$1', + }, + }, + { + displayName: 'server', + testEnvironment: 'node', + testMatch: ['/ee/app/authorization/server/validateUserRoles.spec.ts'], + transformIgnorePatterns: ['!/node_modules/jose'], + errorOnDeprecated: true, + + modulePathIgnorePatterns: ['/dist/'], + + transform: { + '^.+\\.(t|j)sx?$': '@swc/jest', + }, + + moduleNameMapper: { + '\\.css$': 'identity-obj-proxy', + '^react($|/.+)': '/node_modules/react$1', + '^@tanstack/(.+)': '/node_modules/@tanstack/$1', + }, + }, ], - transform: { - '^.+\\.(t|j)sx?$': '@swc/jest', - }, - moduleNameMapper: { - '\\.css$': 'identity-obj-proxy', - '^react($|/.+)': '/node_modules/react$1', - '^@tanstack/(.+)': '/node_modules/@tanstack/$1', - }, collectCoverage: true, }; + +export default config; diff --git a/apps/meteor/lib/callbacks.ts b/apps/meteor/lib/callbacks.ts index 4d59f52e9cd6..fa36ee4f4a71 100644 --- a/apps/meteor/lib/callbacks.ts +++ b/apps/meteor/lib/callbacks.ts @@ -39,7 +39,6 @@ interface EventLikeCallbackSignatures { 'afterCreatePrivateGroup': (owner: IUser, room: IRoom) => void; 'afterDeactivateUser': (user: IUser) => void; 'afterDeleteMessage': (message: IMessage, room: IRoom) => void; - 'validateUserRoles': (userData: Partial) => void; 'workspaceLicenseChanged': (license: string) => void; 'afterReadMessages': (rid: IRoom['_id'], params: { uid: IUser['_id']; lastSeen?: Date; tmid?: IMessage['_id'] }) => void; 'beforeReadMessages': (rid: IRoom['_id'], uid: IUser['_id']) => void; @@ -86,7 +85,8 @@ interface EventLikeCallbackSignatures { 'afterJoinRoom': (user: IUser, room: IRoom) => void; 'livechat.afterDepartmentDisabled': (department: ILivechatDepartmentRecord) => void; 'livechat.afterDepartmentArchived': (department: Pick) => void; - 'afterSaveUser': ({ user, oldUser }: { user: IUser; oldUser: IUser | null }) => void; + 'beforeSaveUser': ({ user, oldUser }: { user: IUser; oldUser?: IUser }) => void; + 'afterSaveUser': ({ user, oldUser }: { user: IUser; oldUser?: IUser | null }) => void; 'livechat.afterTagRemoved': (tag: ILivechatTagRecord) => void; 'beforeUserImport': (data: { userCount: number }) => void; 'afterUserImport': (data: { inserted: IUser['_id'][]; updated: IUser['_id']; skipped: number; failed: number }) => void; diff --git a/apps/meteor/server/methods/deleteUser.ts b/apps/meteor/server/methods/deleteUser.ts index f8ccd07c6284..4dafad7a3a0c 100644 --- a/apps/meteor/server/methods/deleteUser.ts +++ b/apps/meteor/server/methods/deleteUser.ts @@ -7,7 +7,6 @@ import { Meteor } from 'meteor/meteor'; import { hasPermissionAsync } from '../../app/authorization/server/functions/hasPermission'; import { deleteUser } from '../../app/lib/server/functions/deleteUser'; import { AppEvents, Apps } from '../../ee/server/apps/orchestrator'; -import { callbacks } from '../../lib/callbacks'; declare module '@rocket.chat/ui-contexts' { // eslint-disable-next-line @typescript-eslint/naming-convention @@ -52,8 +51,6 @@ Meteor.methods({ await deleteUser(userId, confirmRelinquish, uid); - await callbacks.run('afterDeleteUser', user); - // App IPostUserDeleted event hook await Apps.triggerEvent(AppEvents.IPostUserDeleted, { user, performedBy: await Meteor.userAsync() }); diff --git a/ee/packages/license/__tests__/MockedLicenseBuilder.ts b/ee/packages/license/__tests__/MockedLicenseBuilder.ts index dd2698b26810..0689b8410114 100644 --- a/ee/packages/license/__tests__/MockedLicenseBuilder.ts +++ b/ee/packages/license/__tests__/MockedLicenseBuilder.ts @@ -1,240 +1,6 @@ import { LicenseImp } from '../src'; -import type { ILicenseTag } from '../src/definition/ILicenseTag'; -import type { ILicenseV3 } from '../src/definition/ILicenseV3'; -import type { LicenseLimit } from '../src/definition/LicenseLimit'; -import type { LicenseModule } from '../src/definition/LicenseModule'; -import type { LicensePeriod, Timestamp } from '../src/definition/LicensePeriod'; -import { encrypt } from '../src/token'; -export class MockedLicenseBuilder { - information: { - id?: string; - autoRenew: boolean; - visualExpiration?: Timestamp; - notifyAdminsAt?: Timestamp; - notifyUsersAt?: Timestamp; - trial: boolean; - offline: boolean; - createdAt: Timestamp; - grantedBy: { - method: 'manual' | 'self-service' | 'sales' | 'support' | 'reseller'; - seller?: string; - }; - grantedTo?: { - name?: string; - company?: string; - email?: string; - }; - legalText?: string; - notes?: string; - tags?: ILicenseTag[]; - }; - - validation: { - serverUrls: { - value: string; - type: 'url' | 'regex' | 'hash'; - }[]; - - serverVersions?: { - value: string; - }[]; - - serverUniqueId?: string; - cloudWorkspaceId?: string; - validPeriods: LicensePeriod[]; - legalTextAgreement?: { - type: 'required' | 'not-required' | 'accepted'; - acceptedVia?: 'cloud'; - }; - - statisticsReport: { - required: boolean; - allowedStaleInDays?: number; - }; - }; - - constructor() { - this.information = { - autoRenew: true, - // expires in 1 year - visualExpiration: new Date(new Date().setFullYear(new Date().getFullYear() + 1)).toISOString(), - // 15 days before expiration - notifyAdminsAt: new Date(new Date().setDate(new Date().getDate() + 15)).toISOString(), - // 30 days before expiration - notifyUsersAt: new Date(new Date().setDate(new Date().getDate() + 30)).toISOString(), - trial: false, - offline: false, - createdAt: new Date().toISOString(), - grantedBy: { - method: 'manual', - seller: 'Rocket.Cat', - }, - tags: [ - { - name: 'Test', - color: 'blue', - }, - ], - }; - - this.validation = { - serverUrls: [ - { - value: 'localhost:3000', - type: 'url', - }, - ], - serverVersions: [ - { - value: '3.0.0', - }, - ], - - serverUniqueId: '1234567890', - cloudWorkspaceId: '1234567890', - - validPeriods: [ - { - invalidBehavior: 'disable_modules', - modules: ['livechat-enterprise'], - validFrom: new Date(new Date().setFullYear(new Date().getFullYear() - 1)).toISOString(), - validUntil: new Date(new Date().setFullYear(new Date().getFullYear() + 1)).toISOString(), - }, - ], - - statisticsReport: { - required: true, - allowedStaleInDays: 30, - }, - }; - } - - public withExpiredDate(): this { - // expired 1 minute ago - const date = new Date(); - date.setMinutes(date.getMinutes() - 1); - const expired = date.toISOString(); - - const rule = this.validation.validPeriods.find((period) => period.invalidBehavior === 'invalidate_license'); - - if (rule) { - rule.validUntil = expired; - } else { - this.validation.validPeriods.push({ - invalidBehavior: 'invalidate_license', - validFrom: new Date(new Date().setFullYear(new Date().getFullYear() - 1)).toISOString(), - validUntil: expired, - }); - } - - return this; - } - - public withNotStartedDate(): this { - // starts in 1 minute - const date = new Date(); - date.setMinutes(date.getMinutes() + 1); - const starts = date.toISOString(); - - const rule = this.validation.validPeriods.find((period) => period.invalidBehavior === 'invalidate_license'); - - if (rule) { - rule.validFrom = starts; - } else { - this.validation.validPeriods.push({ - invalidBehavior: 'invalidate_license', - validUntil: new Date(new Date().setFullYear(new Date().getFullYear() + 1)).toISOString(), - validFrom: starts, - }); - } - - return this; - } - - public resetValidPeriods(): this { - this.validation.validPeriods = []; - return this; - } - - public withValidPeriod(period: LicensePeriod): this { - this.validation.validPeriods.push(period); - return this; - } - - public withGrantedTo(grantedTo: { name?: string; company?: string; email?: string }): this { - this.information.grantedTo = grantedTo; - return this; - } - - grantedModules: { - module: LicenseModule; - }[]; - - limits: { - activeUsers?: LicenseLimit[]; - guestUsers?: LicenseLimit[]; - roomsPerGuest?: LicenseLimit<'prevent_action'>[]; - privateApps?: LicenseLimit[]; - marketplaceApps?: LicenseLimit[]; - monthlyActiveContacts?: LicenseLimit[]; - }; - - cloudMeta?: Record; - - public withServerUrls(urls: { value: string; type: 'url' | 'regex' | 'hash' }): this { - this.validation.serverUrls = this.validation.serverUrls ?? []; - this.validation.serverUrls.push(urls); - return this; - } - - public withServerVersions(versions: { value: string }): this { - this.validation.serverVersions = this.validation.serverVersions ?? []; - this.validation.serverVersions.push(versions); - return this; - } - - public withGratedModules(modules: LicenseModule[]): this { - this.grantedModules = this.grantedModules ?? []; - this.grantedModules.push(...modules.map((module) => ({ module }))); - return this; - } - - withNoGratedModules(modules: LicenseModule[]): this { - this.grantedModules = this.grantedModules ?? []; - this.grantedModules = this.grantedModules.filter(({ module }) => !modules.includes(module)); - return this; - } - - public withLimits(key: K, value: ILicenseV3['limits'][K]): this { - this.limits = this.limits ?? {}; - this.limits[key] = value; - return this; - } - - public build(): ILicenseV3 { - return { - version: '3.0', - information: this.information, - validation: this.validation, - grantedModules: [...new Set(this.grantedModules)], - limits: { - activeUsers: [], - guestUsers: [], - roomsPerGuest: [], - privateApps: [], - marketplaceApps: [], - monthlyActiveContacts: [], - ...this.limits, - }, - cloudMeta: this.cloudMeta, - }; - } - - public sign(): Promise { - return encrypt(this.build()); - } -} +export { MockedLicenseBuilder } from '../src/MockedLicenseBuilder'; export const getReadyLicenseManager = async () => { const license = new LicenseImp(); diff --git a/ee/packages/license/src/MockedLicenseBuilder.ts b/ee/packages/license/src/MockedLicenseBuilder.ts new file mode 100644 index 000000000000..da9e833e06c4 --- /dev/null +++ b/ee/packages/license/src/MockedLicenseBuilder.ts @@ -0,0 +1,236 @@ +import type { ILicenseTag } from './definition/ILicenseTag'; +import type { ILicenseV3 } from './definition/ILicenseV3'; +import type { LicenseLimit } from './definition/LicenseLimit'; +import type { LicenseModule } from './definition/LicenseModule'; +import type { LicensePeriod, Timestamp } from './definition/LicensePeriod'; +import { encrypt } from './token'; + +export class MockedLicenseBuilder { + information: { + id?: string; + autoRenew: boolean; + visualExpiration?: Timestamp; + notifyAdminsAt?: Timestamp; + notifyUsersAt?: Timestamp; + trial: boolean; + offline: boolean; + createdAt: Timestamp; + grantedBy: { + method: 'manual' | 'self-service' | 'sales' | 'support' | 'reseller'; + seller?: string; + }; + grantedTo?: { + name?: string; + company?: string; + email?: string; + }; + legalText?: string; + notes?: string; + tags?: ILicenseTag[]; + }; + + validation: { + serverUrls: { + value: string; + type: 'url' | 'regex' | 'hash'; + }[]; + + serverVersions?: { + value: string; + }[]; + + serverUniqueId?: string; + cloudWorkspaceId?: string; + validPeriods: LicensePeriod[]; + legalTextAgreement?: { + type: 'required' | 'not-required' | 'accepted'; + acceptedVia?: 'cloud'; + }; + + statisticsReport: { + required: boolean; + allowedStaleInDays?: number; + }; + }; + + constructor() { + this.information = { + autoRenew: true, + // expires in 1 year + visualExpiration: new Date(new Date().setFullYear(new Date().getFullYear() + 1)).toISOString(), + // 15 days before expiration + notifyAdminsAt: new Date(new Date().setDate(new Date().getDate() + 15)).toISOString(), + // 30 days before expiration + notifyUsersAt: new Date(new Date().setDate(new Date().getDate() + 30)).toISOString(), + trial: false, + offline: false, + createdAt: new Date().toISOString(), + grantedBy: { + method: 'manual', + seller: 'Rocket.Cat', + }, + tags: [ + { + name: 'Test', + color: 'blue', + }, + ], + }; + + this.validation = { + serverUrls: [ + { + value: 'localhost:3000', + type: 'url', + }, + ], + serverVersions: [ + { + value: '3.0.0', + }, + ], + + serverUniqueId: '1234567890', + cloudWorkspaceId: '1234567890', + + validPeriods: [ + { + invalidBehavior: 'disable_modules', + modules: ['livechat-enterprise'], + validFrom: new Date(new Date().setFullYear(new Date().getFullYear() - 1)).toISOString(), + validUntil: new Date(new Date().setFullYear(new Date().getFullYear() + 1)).toISOString(), + }, + ], + + statisticsReport: { + required: true, + allowedStaleInDays: 30, + }, + }; + } + + public withExpiredDate(): this { + // expired 1 minute ago + const date = new Date(); + date.setMinutes(date.getMinutes() - 1); + const expired = date.toISOString(); + + const rule = this.validation.validPeriods.find((period) => period.invalidBehavior === 'invalidate_license'); + + if (rule) { + rule.validUntil = expired; + } else { + this.validation.validPeriods.push({ + invalidBehavior: 'invalidate_license', + validFrom: new Date(new Date().setFullYear(new Date().getFullYear() - 1)).toISOString(), + validUntil: expired, + }); + } + + return this; + } + + public withNotStartedDate(): this { + // starts in 1 minute + const date = new Date(); + date.setMinutes(date.getMinutes() + 1); + const starts = date.toISOString(); + + const rule = this.validation.validPeriods.find((period) => period.invalidBehavior === 'invalidate_license'); + + if (rule) { + rule.validFrom = starts; + } else { + this.validation.validPeriods.push({ + invalidBehavior: 'invalidate_license', + validUntil: new Date(new Date().setFullYear(new Date().getFullYear() + 1)).toISOString(), + validFrom: starts, + }); + } + + return this; + } + + public resetValidPeriods(): this { + this.validation.validPeriods = []; + return this; + } + + public withValidPeriod(period: LicensePeriod): this { + this.validation.validPeriods.push(period); + return this; + } + + public withGrantedTo(grantedTo: { name?: string; company?: string; email?: string }): this { + this.information.grantedTo = grantedTo; + return this; + } + + grantedModules: { + module: LicenseModule; + }[] = []; + + limits: { + activeUsers?: LicenseLimit[]; + guestUsers?: LicenseLimit[]; + roomsPerGuest?: LicenseLimit<'prevent_action'>[]; + privateApps?: LicenseLimit[]; + marketplaceApps?: LicenseLimit[]; + monthlyActiveContacts?: LicenseLimit[]; + } = {}; + + cloudMeta?: Record; + + public withServerUrls(urls: { value: string; type: 'url' | 'regex' | 'hash' }): this { + this.validation.serverUrls = this.validation.serverUrls ?? []; + this.validation.serverUrls.push(urls); + return this; + } + + public withServerVersions(versions: { value: string }): this { + this.validation.serverVersions = this.validation.serverVersions ?? []; + this.validation.serverVersions.push(versions); + return this; + } + + public withGratedModules(modules: LicenseModule[]): this { + this.grantedModules = this.grantedModules ?? []; + this.grantedModules.push(...modules.map((module) => ({ module }))); + return this; + } + + withNoGratedModules(modules: LicenseModule[]): this { + this.grantedModules = this.grantedModules ?? []; + this.grantedModules = this.grantedModules.filter(({ module }) => !modules.includes(module)); + return this; + } + + public withLimits(key: K, value: ILicenseV3['limits'][K]): this { + this.limits = this.limits ?? {}; + this.limits[key] = value; + return this; + } + + public build(): ILicenseV3 { + return { + version: '3.0', + information: this.information, + validation: this.validation, + grantedModules: [...new Set(this.grantedModules)], + limits: { + activeUsers: [], + guestUsers: [], + roomsPerGuest: [], + privateApps: [], + marketplaceApps: [], + monthlyActiveContacts: [], + ...this.limits, + }, + cloudMeta: this.cloudMeta, + }; + } + + public sign(): Promise { + return encrypt(this.build()); + } +} diff --git a/ee/packages/license/src/index.ts b/ee/packages/license/src/index.ts index 6e680e5296de..f0b752d5062b 100644 --- a/ee/packages/license/src/index.ts +++ b/ee/packages/license/src/index.ts @@ -32,6 +32,7 @@ export * from './definition/LicenseLimit'; export * from './definition/LicenseModule'; export * from './definition/LicensePeriod'; export * from './definition/LimitContext'; +export * from './MockedLicenseBuilder'; // eslint-disable-next-line @typescript-eslint/naming-convention interface License { From 6e489fc430f9ff41ee690614ba1c1d8fd9a91797 Mon Sep 17 00:00:00 2001 From: Kevin Aleman Date: Thu, 23 Nov 2023 19:25:40 -0600 Subject: [PATCH 38/76] regression: Use `this.getLicense` to instead of `this._license` when calculating shouldPreventAction map (#31008) --- ee/packages/license/src/license.spec.ts | 3 +++ ee/packages/license/src/license.ts | 13 +++++++++---- .../validation/getCurrentValueForLicenseLimit.ts | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ee/packages/license/src/license.spec.ts b/ee/packages/license/src/license.spec.ts index a1a226bdff5b..cbe74bafb4c5 100644 --- a/ee/packages/license/src/license.spec.ts +++ b/ee/packages/license/src/license.spec.ts @@ -279,6 +279,9 @@ describe('License.getInfo', () => { it('should respect the default if there is no license applied', async () => { const licenseManager = new LicenseImp(); + licenseManager.setLicenseLimitCounter('privateApps', () => 0); + licenseManager.setLicenseLimitCounter('marketplaceApps', () => 0); + expect( ( await licenseManager.getInfo({ diff --git a/ee/packages/license/src/license.ts b/ee/packages/license/src/license.ts index 7e15296de565..00f7cf4e1476 100644 --- a/ee/packages/license/src/license.ts +++ b/ee/packages/license/src/license.ts @@ -139,12 +139,13 @@ export class LicenseManager extends Emitter { this._valid = false; this._lockedLicense = undefined; - this.shouldPreventActionResults.clear(); + this.states.clear(); clearPendingLicense.call(this); } private invalidateLicense(): void { this._valid = false; + this.states.clear(); licenseInvalidated.call(this); invalidateAll.call(this); } @@ -332,6 +333,8 @@ export class LicenseManager extends Emitter { 'monthlyActiveContacts', ]; + const license = this.getLicense(); + const items = await Promise.all( keys.map(async (limit) => { const cached = this.shouldPreventActionResults.get(limit as LicenseLimitKind); @@ -340,15 +343,17 @@ export class LicenseManager extends Emitter { return [limit as LicenseLimitKind, cached]; } - const fresh = this._license + const fresh = license ? isBehaviorsInResult( - await validateLicenseLimits.call(this, this._license, { + await validateLicenseLimits.call(this, license, { behaviors: ['prevent_action'], limits: [limit], }), ['prevent_action'], ) - : false; + : isBehaviorsInResult(await validateDefaultLimits.call(this, { behaviors: ['prevent_action'], limits: [limit] }), [ + 'prevent_action', + ]); this.shouldPreventActionResults.set(limit as LicenseLimitKind, fresh); diff --git a/ee/packages/license/src/validation/getCurrentValueForLicenseLimit.ts b/ee/packages/license/src/validation/getCurrentValueForLicenseLimit.ts index 8f9c6ed4034e..6dd3f143fc72 100644 --- a/ee/packages/license/src/validation/getCurrentValueForLicenseLimit.ts +++ b/ee/packages/license/src/validation/getCurrentValueForLicenseLimit.ts @@ -24,7 +24,7 @@ export async function getCurrentValueForLicenseLimit const counterFn = this.dataCounters.get(limitKey); if (!counterFn) { logger.error({ msg: 'Unable to validate license limit due to missing data counter.', limitKey }); - throw new Error('Unable to validate license limit due to missing data counter.'); + throw new Error(`Unable to validate license limit due to missing ${limitKey} data counter`); } return counterFn(context as LimitContext | undefined); From 550188e34be46892f14611b112febcf6aa157bee Mon Sep 17 00:00:00 2001 From: rocketchat-github-ci Date: Fri, 24 Nov 2023 01:39:49 +0000 Subject: [PATCH 39/76] Release 6.5.0-rc.11 [no ci] --- .changeset/bump-patch-1700789984107.md | 5 ++++ .changeset/pre.json | 2 ++ apps/meteor/.docker/Dockerfile.rhel | 2 +- apps/meteor/CHANGELOG.md | 27 +++++++++++++++++++ apps/meteor/app/utils/rocketchat.info | 2 +- apps/meteor/ee/server/services/CHANGELOG.md | 10 +++++++ apps/meteor/ee/server/services/package.json | 2 +- apps/meteor/package.json | 2 +- ee/apps/account-service/CHANGELOG.md | 10 +++++++ ee/apps/account-service/package.json | 2 +- ee/apps/authorization-service/CHANGELOG.md | 10 +++++++ ee/apps/authorization-service/package.json | 2 +- ee/apps/ddp-streamer/CHANGELOG.md | 12 +++++++++ ee/apps/ddp-streamer/package.json | 2 +- ee/apps/omnichannel-transcript/CHANGELOG.md | 11 ++++++++ ee/apps/omnichannel-transcript/package.json | 2 +- ee/apps/presence-service/CHANGELOG.md | 10 +++++++ ee/apps/presence-service/package.json | 2 +- ee/apps/queue-worker/CHANGELOG.md | 10 +++++++ ee/apps/queue-worker/package.json | 2 +- ee/apps/stream-hub-service/CHANGELOG.md | 9 +++++++ ee/apps/stream-hub-service/package.json | 2 +- ee/packages/api-client/CHANGELOG.md | 7 +++++ ee/packages/api-client/package.json | 2 +- ee/packages/ddp-client/CHANGELOG.md | 7 +++++ ee/packages/ddp-client/package.json | 2 +- ee/packages/license/CHANGELOG.md | 6 +++++ ee/packages/license/package.json | 2 +- ee/packages/omnichannel-services/CHANGELOG.md | 11 ++++++++ ee/packages/omnichannel-services/package.json | 2 +- ee/packages/pdf-worker/CHANGELOG.md | 6 +++++ ee/packages/pdf-worker/package.json | 2 +- ee/packages/presence/CHANGELOG.md | 8 ++++++ ee/packages/presence/package.json | 2 +- package.json | 2 +- packages/core-services/CHANGELOG.md | 8 ++++++ packages/core-services/package.json | 2 +- packages/core-typings/CHANGELOG.md | 2 ++ packages/core-typings/package.json | 2 +- packages/cron/CHANGELOG.md | 7 +++++ packages/cron/package.json | 2 +- packages/fuselage-ui-kit/CHANGELOG.md | 8 ++++++ packages/fuselage-ui-kit/package.json | 8 +++--- packages/gazzodown/CHANGELOG.md | 8 ++++++ packages/gazzodown/package.json | 8 +++--- packages/instance-status/CHANGELOG.md | 6 +++++ packages/instance-status/package.json | 2 +- packages/livechat/CHANGELOG.md | 6 +++++ packages/livechat/package.json | 2 +- packages/model-typings/CHANGELOG.md | 6 +++++ packages/model-typings/package.json | 2 +- packages/models/CHANGELOG.md | 6 +++++ packages/models/package.json | 2 +- packages/rest-typings/CHANGELOG.md | 7 +++++ packages/rest-typings/package.json | 2 +- packages/ui-client/CHANGELOG.md | 6 +++++ packages/ui-client/package.json | 4 +-- packages/ui-contexts/CHANGELOG.md | 8 ++++++ packages/ui-contexts/package.json | 2 +- packages/ui-video-conf/CHANGELOG.md | 6 +++++ packages/ui-video-conf/package.json | 4 +-- packages/uikit-playground/CHANGELOG.md | 7 +++++ packages/uikit-playground/package.json | 2 +- packages/web-ui-registration/CHANGELOG.md | 6 +++++ packages/web-ui-registration/package.json | 4 +-- yarn.lock | 16 +++++------ 66 files changed, 308 insertions(+), 50 deletions(-) create mode 100644 .changeset/bump-patch-1700789984107.md diff --git a/.changeset/bump-patch-1700789984107.md b/.changeset/bump-patch-1700789984107.md new file mode 100644 index 000000000000..e1eaa7980afb --- /dev/null +++ b/.changeset/bump-patch-1700789984107.md @@ -0,0 +1,5 @@ +--- +'@rocket.chat/meteor': patch +--- + +Bump @rocket.chat/meteor version. diff --git a/.changeset/pre.json b/.changeset/pre.json index 5b77b4a4c428..81542371ae14 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -70,10 +70,12 @@ "bump-patch-1700616232353", "bump-patch-1700695874400", "bump-patch-1700748014961", + "bump-patch-1700789984107", "cool-rockets-talk", "cool-zoos-move", "cuddly-ties-run", "cyan-mangos-do", + "dirty-rings-fry", "dull-trainers-drive", "eleven-gorillas-deliver", "empty-files-know", diff --git a/apps/meteor/.docker/Dockerfile.rhel b/apps/meteor/.docker/Dockerfile.rhel index b52d0bf1d974..67c7e63aaece 100644 --- a/apps/meteor/.docker/Dockerfile.rhel +++ b/apps/meteor/.docker/Dockerfile.rhel @@ -1,6 +1,6 @@ FROM registry.access.redhat.com/ubi8/nodejs-12 -ENV RC_VERSION 6.5.0-rc.10 +ENV RC_VERSION 6.5.0-rc.11 MAINTAINER buildmaster@rocket.chat diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md index b748634e989f..189ffd586d75 100644 --- a/apps/meteor/CHANGELOG.md +++ b/apps/meteor/CHANGELOG.md @@ -1,5 +1,32 @@ # @rocket.chat/meteor +## 6.5.0-rc.11 + +### Patch Changes + +- Bump @rocket.chat/meteor version. +- 7e96fbd75f: Fixed issue with the creation of groups with the name of an already existing room throwing `internalError` + - @rocket.chat/core-typings@6.5.0-rc.11 + - @rocket.chat/rest-typings@6.5.0-rc.11 + - @rocket.chat/api-client@0.1.18-rc.4 + - @rocket.chat/license@0.1.0-rc.11 + - @rocket.chat/omnichannel-services@0.1.0-rc.11 + - @rocket.chat/pdf-worker@0.0.24-rc.4 + - @rocket.chat/presence@0.1.0-rc.11 + - @rocket.chat/core-services@0.3.0-rc.11 + - @rocket.chat/cron@0.0.20-rc.4 + - @rocket.chat/gazzodown@3.0.0-rc.11 + - @rocket.chat/model-typings@0.2.0-rc.11 + - @rocket.chat/ui-contexts@3.0.0-rc.11 + - @rocket.chat/server-cloud-communication@0.0.1 + - @rocket.chat/fuselage-ui-kit@3.0.0-rc.11 + - @rocket.chat/models@0.0.24-rc.4 + - @rocket.chat/ui-theming@0.1.1-rc.0 + - @rocket.chat/ui-client@3.0.0-rc.11 + - @rocket.chat/ui-video-conf@3.0.0-rc.11 + - @rocket.chat/web-ui-registration@3.0.0-rc.10 + - @rocket.chat/instance-status@0.0.24-rc.4 + ## 6.5.0-rc.10 ### Patch Changes diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info index 56a62afe3d26..e0b455ec2655 100644 --- a/apps/meteor/app/utils/rocketchat.info +++ b/apps/meteor/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "6.5.0-rc.10" + "version": "6.5.0-rc.11" } diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md index c381d09ccfa2..c06b5b3d5755 100644 --- a/apps/meteor/ee/server/services/CHANGELOG.md +++ b/apps/meteor/ee/server/services/CHANGELOG.md @@ -1,5 +1,15 @@ # rocketchat-services +## 1.1.18-rc.4 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.11 +- @rocket.chat/rest-typings@6.5.0-rc.11 +- @rocket.chat/core-services@0.3.0-rc.11 +- @rocket.chat/model-typings@0.2.0-rc.11 +- @rocket.chat/models@0.0.24-rc.4 + ## 1.1.18-rc.3 ### Patch Changes diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json index ad5ea4618edc..4ef2bea72f64 100644 --- a/apps/meteor/ee/server/services/package.json +++ b/apps/meteor/ee/server/services/package.json @@ -1,7 +1,7 @@ { "name": "rocketchat-services", "private": true, - "version": "1.1.18-rc.3", + "version": "1.1.18-rc.4", "description": "Rocket.Chat Authorization service", "main": "index.js", "scripts": { diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 54c85ffc462b..0ed1c533d21e 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/meteor", "description": "The Ultimate Open Source WebChat Platform", - "version": "6.5.0-rc.10", + "version": "6.5.0-rc.11", "private": true, "author": { "name": "Rocket.Chat", diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md index e98da920e256..0d981ece223a 100644 --- a/ee/apps/account-service/CHANGELOG.md +++ b/ee/apps/account-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/account-service +## 0.3.0-rc.11 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.11 +- @rocket.chat/rest-typings@6.5.0-rc.11 +- @rocket.chat/core-services@0.3.0-rc.11 +- @rocket.chat/model-typings@0.2.0-rc.11 +- @rocket.chat/models@0.0.24-rc.4 + ## 0.3.0-rc.10 ### Patch Changes diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json index 8847d6081634..47a8b730bbb7 100644 --- a/ee/apps/account-service/package.json +++ b/ee/apps/account-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/account-service", "private": true, - "version": "0.3.0-rc.10", + "version": "0.3.0-rc.11", "description": "Rocket.Chat Account service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/authorization-service/CHANGELOG.md b/ee/apps/authorization-service/CHANGELOG.md index 4c8a6742d7c5..4468c84fe858 100644 --- a/ee/apps/authorization-service/CHANGELOG.md +++ b/ee/apps/authorization-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/authorization-service +## 0.3.0-rc.11 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.11 +- @rocket.chat/rest-typings@6.5.0-rc.11 +- @rocket.chat/core-services@0.3.0-rc.11 +- @rocket.chat/model-typings@0.2.0-rc.11 +- @rocket.chat/models@0.0.24-rc.4 + ## 0.3.0-rc.10 ### Patch Changes diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json index cd4fe9db730d..d4020f39cb51 100644 --- a/ee/apps/authorization-service/package.json +++ b/ee/apps/authorization-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/authorization-service", "private": true, - "version": "0.3.0-rc.10", + "version": "0.3.0-rc.11", "description": "Rocket.Chat Authorization service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/ddp-streamer/CHANGELOG.md b/ee/apps/ddp-streamer/CHANGELOG.md index 0ac3cd5f1dc5..e19166a907cb 100644 --- a/ee/apps/ddp-streamer/CHANGELOG.md +++ b/ee/apps/ddp-streamer/CHANGELOG.md @@ -1,5 +1,17 @@ # @rocket.chat/ddp-streamer +## 0.2.0-rc.11 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.11 +- @rocket.chat/rest-typings@6.5.0-rc.11 +- @rocket.chat/core-services@0.3.0-rc.11 +- @rocket.chat/model-typings@0.2.0-rc.11 +- @rocket.chat/ui-contexts@3.0.0-rc.11 +- @rocket.chat/models@0.0.24-rc.4 +- @rocket.chat/instance-status@0.0.24-rc.4 + ## 0.2.0-rc.10 ### Patch Changes diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json index 0a377a38f9bf..c9091992bd97 100644 --- a/ee/apps/ddp-streamer/package.json +++ b/ee/apps/ddp-streamer/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/ddp-streamer", "private": true, - "version": "0.2.0-rc.10", + "version": "0.2.0-rc.11", "description": "Rocket.Chat DDP-Streamer service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/omnichannel-transcript/CHANGELOG.md b/ee/apps/omnichannel-transcript/CHANGELOG.md index dd1fa82ebbaa..4add39be063c 100644 --- a/ee/apps/omnichannel-transcript/CHANGELOG.md +++ b/ee/apps/omnichannel-transcript/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/omnichannel-transcript +## 0.3.0-rc.11 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.11 +- @rocket.chat/omnichannel-services@0.1.0-rc.11 +- @rocket.chat/pdf-worker@0.0.24-rc.4 +- @rocket.chat/core-services@0.3.0-rc.11 +- @rocket.chat/model-typings@0.2.0-rc.11 +- @rocket.chat/models@0.0.24-rc.4 + ## 0.3.0-rc.10 ### Patch Changes diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json index 59a63e046da8..5ff2aa7e1ac2 100644 --- a/ee/apps/omnichannel-transcript/package.json +++ b/ee/apps/omnichannel-transcript/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/omnichannel-transcript", "private": true, - "version": "0.3.0-rc.10", + "version": "0.3.0-rc.11", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/presence-service/CHANGELOG.md b/ee/apps/presence-service/CHANGELOG.md index 85bea234d73f..db92a7c72815 100644 --- a/ee/apps/presence-service/CHANGELOG.md +++ b/ee/apps/presence-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/presence-service +## 0.3.0-rc.11 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.11 +- @rocket.chat/presence@0.1.0-rc.11 +- @rocket.chat/core-services@0.3.0-rc.11 +- @rocket.chat/model-typings@0.2.0-rc.11 +- @rocket.chat/models@0.0.24-rc.4 + ## 0.3.0-rc.10 ### Patch Changes diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json index dec0308778c0..01e7a970205f 100644 --- a/ee/apps/presence-service/package.json +++ b/ee/apps/presence-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/presence-service", "private": true, - "version": "0.3.0-rc.10", + "version": "0.3.0-rc.11", "description": "Rocket.Chat Presence service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/queue-worker/CHANGELOG.md b/ee/apps/queue-worker/CHANGELOG.md index c2fb5d889625..b06f11d436d7 100644 --- a/ee/apps/queue-worker/CHANGELOG.md +++ b/ee/apps/queue-worker/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/queue-worker +## 0.3.0-rc.11 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.11 +- @rocket.chat/omnichannel-services@0.1.0-rc.11 +- @rocket.chat/core-services@0.3.0-rc.11 +- @rocket.chat/model-typings@0.2.0-rc.11 +- @rocket.chat/models@0.0.24-rc.4 + ## 0.3.0-rc.10 ### Patch Changes diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json index 5e7796d8f925..7bcc406a2091 100644 --- a/ee/apps/queue-worker/package.json +++ b/ee/apps/queue-worker/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/queue-worker", "private": true, - "version": "0.3.0-rc.10", + "version": "0.3.0-rc.11", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/stream-hub-service/CHANGELOG.md b/ee/apps/stream-hub-service/CHANGELOG.md index ba6f820f4836..eb9615af431b 100644 --- a/ee/apps/stream-hub-service/CHANGELOG.md +++ b/ee/apps/stream-hub-service/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/stream-hub-service +## 0.3.0-rc.11 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.11 +- @rocket.chat/core-services@0.3.0-rc.11 +- @rocket.chat/model-typings@0.2.0-rc.11 +- @rocket.chat/models@0.0.24-rc.4 + ## 0.3.0-rc.10 ### Patch Changes diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json index ed4064fd0bc8..f6b0d825b425 100644 --- a/ee/apps/stream-hub-service/package.json +++ b/ee/apps/stream-hub-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/stream-hub-service", "private": true, - "version": "0.3.0-rc.10", + "version": "0.3.0-rc.11", "description": "Rocket.Chat Stream Hub service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/packages/api-client/CHANGELOG.md b/ee/packages/api-client/CHANGELOG.md index c1a54d972950..eb84d5dfd656 100644 --- a/ee/packages/api-client/CHANGELOG.md +++ b/ee/packages/api-client/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/api-client +## 0.1.18-rc.4 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.11 +- @rocket.chat/rest-typings@6.5.0-rc.11 + ## 0.1.18-rc.3 ### Patch Changes diff --git a/ee/packages/api-client/package.json b/ee/packages/api-client/package.json index d226d4fa633e..766a68266c71 100644 --- a/ee/packages/api-client/package.json +++ b/ee/packages/api-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/api-client", - "version": "0.1.18-rc.3", + "version": "0.1.18-rc.4", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/ddp-client/CHANGELOG.md b/ee/packages/ddp-client/CHANGELOG.md index 2f7104d76ef9..b10886bc3d66 100644 --- a/ee/packages/ddp-client/CHANGELOG.md +++ b/ee/packages/ddp-client/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/ddp-client +## 0.2.9-rc.4 + +### Patch Changes + +- @rocket.chat/rest-typings@6.5.0-rc.11 +- @rocket.chat/api-client@0.1.18-rc.4 + ## 0.2.9-rc.3 ### Patch Changes diff --git a/ee/packages/ddp-client/package.json b/ee/packages/ddp-client/package.json index e363f4cb2810..25c99afdc410 100644 --- a/ee/packages/ddp-client/package.json +++ b/ee/packages/ddp-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ddp-client", - "version": "0.2.9-rc.3", + "version": "0.2.9-rc.4", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/license/CHANGELOG.md b/ee/packages/license/CHANGELOG.md index 4d611bb837bd..8266618e53de 100644 --- a/ee/packages/license/CHANGELOG.md +++ b/ee/packages/license/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/license +## 0.1.0-rc.11 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.11 + ## 0.1.0-rc.10 ### Patch Changes diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json index adbd004e3c34..42667b714be2 100644 --- a/ee/packages/license/package.json +++ b/ee/packages/license/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/license", - "version": "0.1.0-rc.10", + "version": "0.1.0-rc.11", "private": true, "devDependencies": { "@swc/core": "^1.3.95", diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md index 1de91236c6ad..883d826f00d3 100644 --- a/ee/packages/omnichannel-services/CHANGELOG.md +++ b/ee/packages/omnichannel-services/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/omnichannel-services +## 0.1.0-rc.11 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.11 +- @rocket.chat/rest-typings@6.5.0-rc.11 +- @rocket.chat/pdf-worker@0.0.24-rc.4 +- @rocket.chat/core-services@0.3.0-rc.11 +- @rocket.chat/model-typings@0.2.0-rc.11 +- @rocket.chat/models@0.0.24-rc.4 + ## 0.1.0-rc.10 ### Patch Changes diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json index 90e645a6c7a0..4a1440b81ea7 100644 --- a/ee/packages/omnichannel-services/package.json +++ b/ee/packages/omnichannel-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/omnichannel-services", - "version": "0.1.0-rc.10", + "version": "0.1.0-rc.11", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/ee/packages/pdf-worker/CHANGELOG.md b/ee/packages/pdf-worker/CHANGELOG.md index 71246e88c1dc..91af3c62b00a 100644 --- a/ee/packages/pdf-worker/CHANGELOG.md +++ b/ee/packages/pdf-worker/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/pdf-worker +## 0.0.24-rc.4 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.11 + ## 0.0.24-rc.3 ### Patch Changes diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json index 47ae489848fb..d4a78045acc5 100644 --- a/ee/packages/pdf-worker/package.json +++ b/ee/packages/pdf-worker/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/pdf-worker", - "version": "0.0.24-rc.3", + "version": "0.0.24-rc.4", "private": true, "devDependencies": { "@storybook/addon-essentials": "~6.5.16", diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md index 1f043a301247..04060f8a52ee 100644 --- a/ee/packages/presence/CHANGELOG.md +++ b/ee/packages/presence/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/presence +## 0.1.0-rc.11 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.11 +- @rocket.chat/core-services@0.3.0-rc.11 +- @rocket.chat/models@0.0.24-rc.4 + ## 0.1.0-rc.10 ### Patch Changes diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json index a5b3e7036cb8..2258e075e9c3 100644 --- a/ee/packages/presence/package.json +++ b/ee/packages/presence/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/presence", - "version": "0.1.0-rc.10", + "version": "0.1.0-rc.11", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/package.json b/package.json index bb798ddffe20..009df515e594 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket.chat", - "version": "6.5.0-rc.10", + "version": "6.5.0-rc.11", "description": "Rocket.Chat Monorepo", "main": "index.js", "private": true, diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md index a62358312bd9..014c5c95f1a7 100644 --- a/packages/core-services/CHANGELOG.md +++ b/packages/core-services/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/core-services +## 0.3.0-rc.11 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.11 +- @rocket.chat/rest-typings@6.5.0-rc.11 +- @rocket.chat/models@0.0.24-rc.4 + ## 0.3.0-rc.10 ### Patch Changes diff --git a/packages/core-services/package.json b/packages/core-services/package.json index 119f1b2326bd..9a56ca00c471 100644 --- a/packages/core-services/package.json +++ b/packages/core-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/core-services", - "version": "0.3.0-rc.10", + "version": "0.3.0-rc.11", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md index 5ba7a06cc28e..57ac9944ef0f 100644 --- a/packages/core-typings/CHANGELOG.md +++ b/packages/core-typings/CHANGELOG.md @@ -1,5 +1,7 @@ # @rocket.chat/core-typings +## 6.5.0-rc.11 + ## 6.5.0-rc.10 ## 6.5.0-rc.9 diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json index 7adff8ed09c3..0a8a24e2c808 100644 --- a/packages/core-typings/package.json +++ b/packages/core-typings/package.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/package", "name": "@rocket.chat/core-typings", - "version": "6.5.0-rc.10", + "version": "6.5.0-rc.11", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "eslint": "~8.45.0", diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md index c60106b6f4d5..3e3d1a7ed81d 100644 --- a/packages/cron/CHANGELOG.md +++ b/packages/cron/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/cron +## 0.0.20-rc.4 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.11 +- @rocket.chat/models@0.0.24-rc.4 + ## 0.0.20-rc.3 ### Patch Changes diff --git a/packages/cron/package.json b/packages/cron/package.json index 1ac101e9be7b..79b3e89218bf 100644 --- a/packages/cron/package.json +++ b/packages/cron/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/cron", - "version": "0.0.20-rc.3", + "version": "0.0.20-rc.4", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md index c83237479d91..bcf1eb42f277 100644 --- a/packages/fuselage-ui-kit/CHANGELOG.md +++ b/packages/fuselage-ui-kit/CHANGELOG.md @@ -1,5 +1,13 @@ # Change Log +## 3.0.0-rc.11 + +### Patch Changes + +- @rocket.chat/gazzodown@3.0.0-rc.11 +- @rocket.chat/ui-contexts@3.0.0-rc.11 +- @rocket.chat/ui-video-conf@3.0.0-rc.11 + ## 3.0.0-rc.10 ### Patch Changes diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index 557d7450ae3c..9559ca935049 100644 --- a/packages/fuselage-ui-kit/package.json +++ b/packages/fuselage-ui-kit/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/fuselage-ui-kit", "private": true, - "version": "3.0.0-rc.10", + "version": "3.0.0-rc.11", "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system", "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/", "author": { @@ -27,7 +27,7 @@ "access": "public" }, "scripts": { - "dev": "tsc --watch --preserveWatchOutput -p tsconfig-esm.json", + "dev": "tsc --watch --preserveWatchOutput -p tsconfig-esm.json", "build": "run-s .:build:clean .:build:esm .:build:cjs", ".:build:clean": "rimraf dist", ".:build:esm": "tsc -p tsconfig-esm.json", @@ -48,9 +48,9 @@ "@rocket.chat/icons": "*", "@rocket.chat/prettier-config": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.10", + "@rocket.chat/ui-contexts": "3.0.0-rc.11", "@rocket.chat/ui-kit": "*", - "@rocket.chat/ui-video-conf": "3.0.0-rc.10", + "@rocket.chat/ui-video-conf": "3.0.0-rc.11", "@tanstack/react-query": "*", "react": "*", "react-dom": "*" diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md index 53fa1f320bf0..7ae4c137143d 100644 --- a/packages/gazzodown/CHANGELOG.md +++ b/packages/gazzodown/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/gazzodown +## 3.0.0-rc.11 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.11 +- @rocket.chat/ui-contexts@3.0.0-rc.11 +- @rocket.chat/ui-client@3.0.0-rc.11 + ## 3.0.0-rc.10 ### Patch Changes diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json index 9acd60aabf79..25452b929d71 100644 --- a/packages/gazzodown/package.json +++ b/packages/gazzodown/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/gazzodown", - "version": "3.0.0-rc.10", + "version": "3.0.0-rc.11", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -65,14 +65,14 @@ "/dist" ], "peerDependencies": { - "@rocket.chat/core-typings": "6.5.0-rc.10", + "@rocket.chat/core-typings": "6.5.0-rc.11", "@rocket.chat/css-in-js": "*", "@rocket.chat/fuselage": "*", "@rocket.chat/fuselage-tokens": "*", "@rocket.chat/message-parser": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-client": "3.0.0-rc.10", - "@rocket.chat/ui-contexts": "3.0.0-rc.10", + "@rocket.chat/ui-client": "3.0.0-rc.11", + "@rocket.chat/ui-contexts": "3.0.0-rc.11", "katex": "*", "react": "*" }, diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md index 8c2700bf4165..bdb6773dbe1a 100644 --- a/packages/instance-status/CHANGELOG.md +++ b/packages/instance-status/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/instance-status +## 0.0.24-rc.4 + +### Patch Changes + +- @rocket.chat/models@0.0.24-rc.4 + ## 0.0.24-rc.3 ### Patch Changes diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json index 32570b5d694e..95afa6be1b31 100644 --- a/packages/instance-status/package.json +++ b/packages/instance-status/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/instance-status", - "version": "0.0.24-rc.3", + "version": "0.0.24-rc.4", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md index 8af33fe7072e..2b8bd229002f 100644 --- a/packages/livechat/CHANGELOG.md +++ b/packages/livechat/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/livechat Change Log +## 1.14.9-rc.4 + +### Patch Changes + +- @rocket.chat/gazzodown@3.0.0-rc.11 + ## 1.14.9-rc.3 ### Patch Changes diff --git a/packages/livechat/package.json b/packages/livechat/package.json index 09e78fa2f4de..95367bdeb7e1 100644 --- a/packages/livechat/package.json +++ b/packages/livechat/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/livechat", - "version": "1.14.9-rc.3", + "version": "1.14.9-rc.4", "files": [ "/build" ], diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md index 7d377533a51f..fa3eb8793df5 100644 --- a/packages/model-typings/CHANGELOG.md +++ b/packages/model-typings/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/model-typings +## 0.2.0-rc.11 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.11 + ## 0.2.0-rc.10 ### Patch Changes diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json index eb4e90967492..b93004654c0c 100644 --- a/packages/model-typings/package.json +++ b/packages/model-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/model-typings", - "version": "0.2.0-rc.10", + "version": "0.2.0-rc.11", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md index 9338a4201e6a..8019255487bf 100644 --- a/packages/models/CHANGELOG.md +++ b/packages/models/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/models +## 0.0.24-rc.4 + +### Patch Changes + +- @rocket.chat/model-typings@0.2.0-rc.11 + ## 0.0.24-rc.3 ### Patch Changes diff --git a/packages/models/package.json b/packages/models/package.json index bb1f4835ebb3..3e306f427c1b 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/models", - "version": "0.0.24-rc.3", + "version": "0.0.24-rc.4", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md index 0d2215964c7b..f74fb789115d 100644 --- a/packages/rest-typings/CHANGELOG.md +++ b/packages/rest-typings/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/rest-typings +## 6.5.0-rc.11 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.11 +- @rocket.chat/license@0.1.0-rc.11 + ## 6.5.0-rc.10 ### Patch Changes diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json index c1c175afa34a..99347a33e18f 100644 --- a/packages/rest-typings/package.json +++ b/packages/rest-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/rest-typings", - "version": "6.5.0-rc.10", + "version": "6.5.0-rc.11", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "@types/jest": "~29.5.7", diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md index 76d2081da0b2..daf8aa7eb423 100644 --- a/packages/ui-client/CHANGELOG.md +++ b/packages/ui-client/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/ui-client +## 3.0.0-rc.11 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.11 + ## 3.0.0-rc.10 ### Patch Changes diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json index 58664a2448fb..47c69683fb68 100644 --- a/packages/ui-client/package.json +++ b/packages/ui-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-client", - "version": "3.0.0-rc.10", + "version": "3.0.0-rc.11", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -61,7 +61,7 @@ "@rocket.chat/fuselage": "*", "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.10", + "@rocket.chat/ui-contexts": "3.0.0-rc.11", "react": "~17.0.2" }, "volta": { diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md index acc2432f64c3..39dc824e59bb 100644 --- a/packages/ui-contexts/CHANGELOG.md +++ b/packages/ui-contexts/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/ui-contexts +## 3.0.0-rc.11 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.11 +- @rocket.chat/rest-typings@6.5.0-rc.11 +- @rocket.chat/ddp-client@0.2.9-rc.4 + ## 3.0.0-rc.10 ### Patch Changes diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json index ee051f2f3940..a10b946a536a 100644 --- a/packages/ui-contexts/package.json +++ b/packages/ui-contexts/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-contexts", - "version": "3.0.0-rc.10", + "version": "3.0.0-rc.11", "private": true, "devDependencies": { "@rocket.chat/core-typings": "workspace:^", diff --git a/packages/ui-video-conf/CHANGELOG.md b/packages/ui-video-conf/CHANGELOG.md index f772c3736e1a..1cff1f3951bb 100644 --- a/packages/ui-video-conf/CHANGELOG.md +++ b/packages/ui-video-conf/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/ui-video-conf +## 3.0.0-rc.11 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.11 + ## 3.0.0-rc.10 ### Patch Changes diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json index 56f4221d6324..a60e424a593d 100644 --- a/packages/ui-video-conf/package.json +++ b/packages/ui-video-conf/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-video-conf", - "version": "3.0.0-rc.10", + "version": "3.0.0-rc.11", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -35,7 +35,7 @@ "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.10", + "@rocket.chat/ui-contexts": "3.0.0-rc.11", "react": "^17.0.2", "react-dom": "^17.0.2" }, diff --git a/packages/uikit-playground/CHANGELOG.md b/packages/uikit-playground/CHANGELOG.md index e34b87368eec..542eeb65658a 100644 --- a/packages/uikit-playground/CHANGELOG.md +++ b/packages/uikit-playground/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/uikit-playground +## 0.2.9-rc.4 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.11 +- @rocket.chat/fuselage-ui-kit@3.0.0-rc.11 + ## 0.2.9-rc.3 ### Patch Changes diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json index 2933cf194e82..5d1a5b51235c 100644 --- a/packages/uikit-playground/package.json +++ b/packages/uikit-playground/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/uikit-playground", "private": true, - "version": "0.2.9-rc.3", + "version": "0.2.9-rc.4", "type": "module", "scripts": { "dev": "vite", diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md index 752985437cb0..95f4191d2c5e 100644 --- a/packages/web-ui-registration/CHANGELOG.md +++ b/packages/web-ui-registration/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/web-ui-registration +## 3.0.0-rc.10 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.11 + ## 3.0.0-rc.9 ### Patch Changes diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json index 1fc325535868..db76dd72e5c5 100644 --- a/packages/web-ui-registration/package.json +++ b/packages/web-ui-registration/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/web-ui-registration", - "version": "3.0.0-rc.9", + "version": "3.0.0-rc.10", "private": true, "homepage": "https://rocket.chat", "main": "./dist/index.js", @@ -51,7 +51,7 @@ "peerDependencies": { "@rocket.chat/layout": "*", "@rocket.chat/tools": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.10", + "@rocket.chat/ui-contexts": "3.0.0-rc.11", "@tanstack/react-query": "*", "react": "*", "react-hook-form": "*", diff --git a/yarn.lock b/yarn.lock index 1a01272707d4..953db8d4d225 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8217,9 +8217,9 @@ __metadata: "@rocket.chat/icons": "*" "@rocket.chat/prettier-config": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-contexts": 3.0.0-rc.9 + "@rocket.chat/ui-contexts": 3.0.0-rc.10 "@rocket.chat/ui-kit": "*" - "@rocket.chat/ui-video-conf": 3.0.0-rc.9 + "@rocket.chat/ui-video-conf": 3.0.0-rc.10 "@tanstack/react-query": "*" react: "*" react-dom: "*" @@ -8301,14 +8301,14 @@ __metadata: ts-jest: ~29.0.5 typescript: ~5.2.2 peerDependencies: - "@rocket.chat/core-typings": 6.5.0-rc.9 + "@rocket.chat/core-typings": 6.5.0-rc.10 "@rocket.chat/css-in-js": "*" "@rocket.chat/fuselage": "*" "@rocket.chat/fuselage-tokens": "*" "@rocket.chat/message-parser": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-client": 3.0.0-rc.9 - "@rocket.chat/ui-contexts": 3.0.0-rc.9 + "@rocket.chat/ui-client": 3.0.0-rc.10 + "@rocket.chat/ui-contexts": 3.0.0-rc.10 katex: "*" react: "*" languageName: unknown @@ -9472,7 +9472,7 @@ __metadata: "@rocket.chat/fuselage": "*" "@rocket.chat/fuselage-hooks": "*" "@rocket.chat/icons": "*" - "@rocket.chat/ui-contexts": 3.0.0-rc.9 + "@rocket.chat/ui-contexts": 3.0.0-rc.10 react: ~17.0.2 languageName: unknown linkType: soft @@ -9625,7 +9625,7 @@ __metadata: "@rocket.chat/fuselage-hooks": "*" "@rocket.chat/icons": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-contexts": 3.0.0-rc.9 + "@rocket.chat/ui-contexts": 3.0.0-rc.10 react: ^17.0.2 react-dom: ^17.0.2 languageName: unknown @@ -9711,7 +9711,7 @@ __metadata: peerDependencies: "@rocket.chat/layout": "*" "@rocket.chat/tools": "*" - "@rocket.chat/ui-contexts": 3.0.0-rc.9 + "@rocket.chat/ui-contexts": 3.0.0-rc.10 "@tanstack/react-query": "*" react: "*" react-hook-form: "*" From 15d06f3538196f975127596fe061f523012621f9 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Fri, 24 Nov 2023 01:52:14 -0300 Subject: [PATCH 40/76] chore: Improve license events (#31068) --- .../meteor/ee/app/authorization/server/callback.ts | 4 ++-- .../authorization/server/validateUserRoles.spec.ts | 8 ++++++++ .../app/authorization/server/validateUserRoles.ts | 11 +++++++---- apps/meteor/ee/app/license/server/startup.ts | 4 ++++ apps/meteor/ee/server/startup/index.ts | 1 + ee/packages/license/src/events/listeners.ts | 14 ++++++++++++++ ee/packages/license/src/index.ts | 6 ++++++ 7 files changed, 42 insertions(+), 6 deletions(-) diff --git a/apps/meteor/ee/app/authorization/server/callback.ts b/apps/meteor/ee/app/authorization/server/callback.ts index 54391147c8ef..ce5b549bb0a5 100644 --- a/apps/meteor/ee/app/authorization/server/callback.ts +++ b/apps/meteor/ee/app/authorization/server/callback.ts @@ -3,7 +3,7 @@ import { License } from '@rocket.chat/license'; import { callbacks } from '../../../../lib/callbacks'; import { validateUserRoles } from './validateUserRoles'; -License.on('installed', async () => { +License.onInstall(async () => { callbacks.add( 'beforeSaveUser', async ({ user, oldUser }) => { @@ -16,7 +16,7 @@ License.on('installed', async () => { callbacks.add('afterDeleteUser', () => License.shouldPreventAction('activeUsers'), callbacks.priority.HIGH, 'validateUserRoles'); }); -License.on('invalidate', async () => { +License.onInvalidate(async () => { callbacks.remove('beforeSaveUser', 'validateUserRoles'); callbacks.remove('afterSaveUser', 'validateUserRoles'); callbacks.remove('afterDeleteUser', 'validateUserRoles'); diff --git a/apps/meteor/ee/app/authorization/server/validateUserRoles.spec.ts b/apps/meteor/ee/app/authorization/server/validateUserRoles.spec.ts index f850a20359b9..19458e5a5e97 100644 --- a/apps/meteor/ee/app/authorization/server/validateUserRoles.spec.ts +++ b/apps/meteor/ee/app/authorization/server/validateUserRoles.spec.ts @@ -38,6 +38,14 @@ describe('Operating after activeUsers Limits', () => { }); describe('Adding a new user', () => { + it('should throw error when user is active as undefined', async () => { + const user = { + roles: ['user'], + }; + + await expect(validateUserRoles(user)).rejects.toThrow(MeteorError); + }); + it('should not throw error when user is not active', async () => { const user = { active: false, diff --git a/apps/meteor/ee/app/authorization/server/validateUserRoles.ts b/apps/meteor/ee/app/authorization/server/validateUserRoles.ts index 5ee978b2379c..e4392d5b9324 100644 --- a/apps/meteor/ee/app/authorization/server/validateUserRoles.ts +++ b/apps/meteor/ee/app/authorization/server/validateUserRoles.ts @@ -33,13 +33,16 @@ export async function validateUserRoles(userData: Partial, currentUserDat return; } - const isActive = Boolean(userData.active); - const wasActive = Boolean(currentUserData?.active); + const isActive = Boolean(userData.active !== false); + const wasActive = currentUserData && currentUserData?.active !== false; - const hasStatusChanged = isActive && !wasActive; const hasRemovedSpecialType = (wasApp && !isApp) || (wasBot && !isBot); - if (!hasStatusChanged && !hasRemovedSpecialType) { + if (!isActive) { + return; + } + + if (!hasRemovedSpecialType && wasActive) { return; } diff --git a/apps/meteor/ee/app/license/server/startup.ts b/apps/meteor/ee/app/license/server/startup.ts index 04c8d70c16a2..834b88d98544 100644 --- a/apps/meteor/ee/app/license/server/startup.ts +++ b/apps/meteor/ee/app/license/server/startup.ts @@ -116,6 +116,10 @@ settings.onReady(async () => { callbacks.add('workspaceLicenseChanged', async (updatedLicense) => applyLicense(updatedLicense, true)); + License.onInstall(async () => void api.broadcast('license.actions', {} as Record, boolean>)); + + License.onInvalidate(async () => void api.broadcast('license.actions', {} as Record, boolean>)); + License.onBehaviorTriggered('prevent_action', (context) => syncByTriggerDebounced(`prevent_action_${context.limit}`)); License.onBehaviorTriggered('start_fair_policy', async (context) => syncByTriggerDebounced(`start_fair_policy_${context.limit}`)); diff --git a/apps/meteor/ee/server/startup/index.ts b/apps/meteor/ee/server/startup/index.ts index 598c520b50c7..5c0795f088c0 100644 --- a/apps/meteor/ee/server/startup/index.ts +++ b/apps/meteor/ee/server/startup/index.ts @@ -1,4 +1,5 @@ import '../apps/startup'; +import '../../app/authorization/server'; import './apps'; import './audit'; import './deviceManagement'; diff --git a/ee/packages/license/src/events/listeners.ts b/ee/packages/license/src/events/listeners.ts index f8c291edc4be..29caca3984c3 100644 --- a/ee/packages/license/src/events/listeners.ts +++ b/ee/packages/license/src/events/listeners.ts @@ -11,6 +11,20 @@ export function onChange(this: LicenseManager, cb: () => void) { this.on('sync', cb); } +export function onInstall(this: LicenseManager, cb: () => void) { + if (this.hasValidLicense()) { + cb(); + } + this.on('installed', cb); +} + +export function onInvalidate(this: LicenseManager, cb: () => void) { + if (!this.hasValidLicense()) { + cb(); + } + this.on('invalidate', cb); +} + export function onValidFeature(this: LicenseManager, feature: LicenseModule, cb: () => void) { this.on(`valid:${feature}`, cb); diff --git a/ee/packages/license/src/index.ts b/ee/packages/license/src/index.ts index f0b752d5062b..b9464eb1e37c 100644 --- a/ee/packages/license/src/index.ts +++ b/ee/packages/license/src/index.ts @@ -14,6 +14,8 @@ import { onToggledFeature, onValidFeature, onValidateLicense, + onInstall, + onInvalidate, } from './events/listeners'; import { overwriteClassOnLicense } from './events/overwriteClassOnLicense'; import { LicenseManager } from './license'; @@ -87,6 +89,10 @@ export class LicenseImp extends LicenseManager implements License { onChange = onChange; + onInstall = onInstall; + + onInvalidate = onInvalidate; + onValidFeature = onValidFeature; onInvalidFeature = onInvalidFeature; From 79d5478f8047e3d50ae84a38164fd4773fb796af Mon Sep 17 00:00:00 2001 From: rocketchat-github-ci Date: Fri, 24 Nov 2023 04:58:17 +0000 Subject: [PATCH 41/76] Release 6.5.0-rc.12 [no ci] --- .changeset/bump-patch-1700801891621.md | 5 ++++ .changeset/pre.json | 1 + apps/meteor/.docker/Dockerfile.rhel | 2 +- apps/meteor/CHANGELOG.md | 26 +++++++++++++++++++ apps/meteor/app/utils/rocketchat.info | 2 +- apps/meteor/ee/server/services/CHANGELOG.md | 10 +++++++ apps/meteor/ee/server/services/package.json | 2 +- apps/meteor/package.json | 2 +- ee/apps/account-service/CHANGELOG.md | 10 +++++++ ee/apps/account-service/package.json | 2 +- ee/apps/authorization-service/CHANGELOG.md | 10 +++++++ ee/apps/authorization-service/package.json | 2 +- ee/apps/ddp-streamer/CHANGELOG.md | 12 +++++++++ ee/apps/ddp-streamer/package.json | 2 +- ee/apps/omnichannel-transcript/CHANGELOG.md | 11 ++++++++ ee/apps/omnichannel-transcript/package.json | 2 +- ee/apps/presence-service/CHANGELOG.md | 10 +++++++ ee/apps/presence-service/package.json | 2 +- ee/apps/queue-worker/CHANGELOG.md | 10 +++++++ ee/apps/queue-worker/package.json | 2 +- ee/apps/stream-hub-service/CHANGELOG.md | 9 +++++++ ee/apps/stream-hub-service/package.json | 2 +- ee/packages/api-client/CHANGELOG.md | 7 +++++ ee/packages/api-client/package.json | 2 +- ee/packages/ddp-client/CHANGELOG.md | 7 +++++ ee/packages/ddp-client/package.json | 2 +- ee/packages/license/CHANGELOG.md | 6 +++++ ee/packages/license/package.json | 2 +- ee/packages/omnichannel-services/CHANGELOG.md | 11 ++++++++ ee/packages/omnichannel-services/package.json | 2 +- ee/packages/pdf-worker/CHANGELOG.md | 6 +++++ ee/packages/pdf-worker/package.json | 2 +- ee/packages/presence/CHANGELOG.md | 8 ++++++ ee/packages/presence/package.json | 2 +- package.json | 2 +- packages/core-services/CHANGELOG.md | 8 ++++++ packages/core-services/package.json | 2 +- packages/core-typings/CHANGELOG.md | 2 ++ packages/core-typings/package.json | 2 +- packages/cron/CHANGELOG.md | 7 +++++ packages/cron/package.json | 2 +- packages/fuselage-ui-kit/CHANGELOG.md | 8 ++++++ packages/fuselage-ui-kit/package.json | 6 ++--- packages/gazzodown/CHANGELOG.md | 8 ++++++ packages/gazzodown/package.json | 8 +++--- packages/instance-status/CHANGELOG.md | 6 +++++ packages/instance-status/package.json | 2 +- packages/livechat/CHANGELOG.md | 6 +++++ packages/livechat/package.json | 2 +- packages/model-typings/CHANGELOG.md | 6 +++++ packages/model-typings/package.json | 2 +- packages/models/CHANGELOG.md | 6 +++++ packages/models/package.json | 2 +- packages/rest-typings/CHANGELOG.md | 7 +++++ packages/rest-typings/package.json | 2 +- packages/ui-client/CHANGELOG.md | 6 +++++ packages/ui-client/package.json | 4 +-- packages/ui-contexts/CHANGELOG.md | 8 ++++++ packages/ui-contexts/package.json | 2 +- packages/ui-video-conf/CHANGELOG.md | 6 +++++ packages/ui-video-conf/package.json | 4 +-- packages/uikit-playground/CHANGELOG.md | 7 +++++ packages/uikit-playground/package.json | 2 +- packages/web-ui-registration/CHANGELOG.md | 6 +++++ packages/web-ui-registration/package.json | 4 +-- yarn.lock | 16 ++++++------ 66 files changed, 305 insertions(+), 49 deletions(-) create mode 100644 .changeset/bump-patch-1700801891621.md diff --git a/.changeset/bump-patch-1700801891621.md b/.changeset/bump-patch-1700801891621.md new file mode 100644 index 000000000000..e1eaa7980afb --- /dev/null +++ b/.changeset/bump-patch-1700801891621.md @@ -0,0 +1,5 @@ +--- +'@rocket.chat/meteor': patch +--- + +Bump @rocket.chat/meteor version. diff --git a/.changeset/pre.json b/.changeset/pre.json index 81542371ae14..0e4e1e1f9fb1 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -71,6 +71,7 @@ "bump-patch-1700695874400", "bump-patch-1700748014961", "bump-patch-1700789984107", + "bump-patch-1700801891621", "cool-rockets-talk", "cool-zoos-move", "cuddly-ties-run", diff --git a/apps/meteor/.docker/Dockerfile.rhel b/apps/meteor/.docker/Dockerfile.rhel index 67c7e63aaece..58e9c6a2633d 100644 --- a/apps/meteor/.docker/Dockerfile.rhel +++ b/apps/meteor/.docker/Dockerfile.rhel @@ -1,6 +1,6 @@ FROM registry.access.redhat.com/ubi8/nodejs-12 -ENV RC_VERSION 6.5.0-rc.11 +ENV RC_VERSION 6.5.0-rc.12 MAINTAINER buildmaster@rocket.chat diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md index 189ffd586d75..02fcbb8ac0fb 100644 --- a/apps/meteor/CHANGELOG.md +++ b/apps/meteor/CHANGELOG.md @@ -1,5 +1,31 @@ # @rocket.chat/meteor +## 6.5.0-rc.12 + +### Patch Changes + +- Bump @rocket.chat/meteor version. + - @rocket.chat/core-typings@6.5.0-rc.12 + - @rocket.chat/rest-typings@6.5.0-rc.12 + - @rocket.chat/api-client@0.1.18-rc.5 + - @rocket.chat/license@0.1.0-rc.12 + - @rocket.chat/omnichannel-services@0.1.0-rc.12 + - @rocket.chat/pdf-worker@0.0.24-rc.5 + - @rocket.chat/presence@0.1.0-rc.12 + - @rocket.chat/core-services@0.3.0-rc.12 + - @rocket.chat/cron@0.0.20-rc.5 + - @rocket.chat/gazzodown@3.0.0-rc.12 + - @rocket.chat/model-typings@0.2.0-rc.12 + - @rocket.chat/ui-contexts@3.0.0-rc.12 + - @rocket.chat/server-cloud-communication@0.0.1 + - @rocket.chat/fuselage-ui-kit@3.0.0-rc.12 + - @rocket.chat/models@0.0.24-rc.5 + - @rocket.chat/ui-theming@0.1.1-rc.0 + - @rocket.chat/ui-client@3.0.0-rc.12 + - @rocket.chat/ui-video-conf@3.0.0-rc.12 + - @rocket.chat/web-ui-registration@3.0.0-rc.11 + - @rocket.chat/instance-status@0.0.24-rc.5 + ## 6.5.0-rc.11 ### Patch Changes diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info index e0b455ec2655..a69feec1a915 100644 --- a/apps/meteor/app/utils/rocketchat.info +++ b/apps/meteor/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "6.5.0-rc.11" + "version": "6.5.0-rc.12" } diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md index c06b5b3d5755..9322a9ce2b0e 100644 --- a/apps/meteor/ee/server/services/CHANGELOG.md +++ b/apps/meteor/ee/server/services/CHANGELOG.md @@ -1,5 +1,15 @@ # rocketchat-services +## 1.1.18-rc.5 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.12 +- @rocket.chat/rest-typings@6.5.0-rc.12 +- @rocket.chat/core-services@0.3.0-rc.12 +- @rocket.chat/model-typings@0.2.0-rc.12 +- @rocket.chat/models@0.0.24-rc.5 + ## 1.1.18-rc.4 ### Patch Changes diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json index 4ef2bea72f64..d70addacafba 100644 --- a/apps/meteor/ee/server/services/package.json +++ b/apps/meteor/ee/server/services/package.json @@ -1,7 +1,7 @@ { "name": "rocketchat-services", "private": true, - "version": "1.1.18-rc.4", + "version": "1.1.18-rc.5", "description": "Rocket.Chat Authorization service", "main": "index.js", "scripts": { diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 0ed1c533d21e..f63b06393910 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/meteor", "description": "The Ultimate Open Source WebChat Platform", - "version": "6.5.0-rc.11", + "version": "6.5.0-rc.12", "private": true, "author": { "name": "Rocket.Chat", diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md index 0d981ece223a..4feabba8e241 100644 --- a/ee/apps/account-service/CHANGELOG.md +++ b/ee/apps/account-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/account-service +## 0.3.0-rc.12 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.12 +- @rocket.chat/rest-typings@6.5.0-rc.12 +- @rocket.chat/core-services@0.3.0-rc.12 +- @rocket.chat/model-typings@0.2.0-rc.12 +- @rocket.chat/models@0.0.24-rc.5 + ## 0.3.0-rc.11 ### Patch Changes diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json index 47a8b730bbb7..d83d8e1f0f09 100644 --- a/ee/apps/account-service/package.json +++ b/ee/apps/account-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/account-service", "private": true, - "version": "0.3.0-rc.11", + "version": "0.3.0-rc.12", "description": "Rocket.Chat Account service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/authorization-service/CHANGELOG.md b/ee/apps/authorization-service/CHANGELOG.md index 4468c84fe858..67c7d086824e 100644 --- a/ee/apps/authorization-service/CHANGELOG.md +++ b/ee/apps/authorization-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/authorization-service +## 0.3.0-rc.12 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.12 +- @rocket.chat/rest-typings@6.5.0-rc.12 +- @rocket.chat/core-services@0.3.0-rc.12 +- @rocket.chat/model-typings@0.2.0-rc.12 +- @rocket.chat/models@0.0.24-rc.5 + ## 0.3.0-rc.11 ### Patch Changes diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json index d4020f39cb51..cb809adf4a2e 100644 --- a/ee/apps/authorization-service/package.json +++ b/ee/apps/authorization-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/authorization-service", "private": true, - "version": "0.3.0-rc.11", + "version": "0.3.0-rc.12", "description": "Rocket.Chat Authorization service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/ddp-streamer/CHANGELOG.md b/ee/apps/ddp-streamer/CHANGELOG.md index e19166a907cb..a65c9c3a8e6c 100644 --- a/ee/apps/ddp-streamer/CHANGELOG.md +++ b/ee/apps/ddp-streamer/CHANGELOG.md @@ -1,5 +1,17 @@ # @rocket.chat/ddp-streamer +## 0.2.0-rc.12 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.12 +- @rocket.chat/rest-typings@6.5.0-rc.12 +- @rocket.chat/core-services@0.3.0-rc.12 +- @rocket.chat/model-typings@0.2.0-rc.12 +- @rocket.chat/ui-contexts@3.0.0-rc.12 +- @rocket.chat/models@0.0.24-rc.5 +- @rocket.chat/instance-status@0.0.24-rc.5 + ## 0.2.0-rc.11 ### Patch Changes diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json index c9091992bd97..b55673b323c7 100644 --- a/ee/apps/ddp-streamer/package.json +++ b/ee/apps/ddp-streamer/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/ddp-streamer", "private": true, - "version": "0.2.0-rc.11", + "version": "0.2.0-rc.12", "description": "Rocket.Chat DDP-Streamer service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/omnichannel-transcript/CHANGELOG.md b/ee/apps/omnichannel-transcript/CHANGELOG.md index 4add39be063c..7d63df4e0774 100644 --- a/ee/apps/omnichannel-transcript/CHANGELOG.md +++ b/ee/apps/omnichannel-transcript/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/omnichannel-transcript +## 0.3.0-rc.12 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.12 +- @rocket.chat/omnichannel-services@0.1.0-rc.12 +- @rocket.chat/pdf-worker@0.0.24-rc.5 +- @rocket.chat/core-services@0.3.0-rc.12 +- @rocket.chat/model-typings@0.2.0-rc.12 +- @rocket.chat/models@0.0.24-rc.5 + ## 0.3.0-rc.11 ### Patch Changes diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json index 5ff2aa7e1ac2..d90a4b19179d 100644 --- a/ee/apps/omnichannel-transcript/package.json +++ b/ee/apps/omnichannel-transcript/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/omnichannel-transcript", "private": true, - "version": "0.3.0-rc.11", + "version": "0.3.0-rc.12", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/presence-service/CHANGELOG.md b/ee/apps/presence-service/CHANGELOG.md index db92a7c72815..8d3e503b4fd5 100644 --- a/ee/apps/presence-service/CHANGELOG.md +++ b/ee/apps/presence-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/presence-service +## 0.3.0-rc.12 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.12 +- @rocket.chat/presence@0.1.0-rc.12 +- @rocket.chat/core-services@0.3.0-rc.12 +- @rocket.chat/model-typings@0.2.0-rc.12 +- @rocket.chat/models@0.0.24-rc.5 + ## 0.3.0-rc.11 ### Patch Changes diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json index 01e7a970205f..be883d4a1082 100644 --- a/ee/apps/presence-service/package.json +++ b/ee/apps/presence-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/presence-service", "private": true, - "version": "0.3.0-rc.11", + "version": "0.3.0-rc.12", "description": "Rocket.Chat Presence service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/queue-worker/CHANGELOG.md b/ee/apps/queue-worker/CHANGELOG.md index b06f11d436d7..2e1e2c0fca52 100644 --- a/ee/apps/queue-worker/CHANGELOG.md +++ b/ee/apps/queue-worker/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/queue-worker +## 0.3.0-rc.12 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.12 +- @rocket.chat/omnichannel-services@0.1.0-rc.12 +- @rocket.chat/core-services@0.3.0-rc.12 +- @rocket.chat/model-typings@0.2.0-rc.12 +- @rocket.chat/models@0.0.24-rc.5 + ## 0.3.0-rc.11 ### Patch Changes diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json index 7bcc406a2091..a8997ee8ec93 100644 --- a/ee/apps/queue-worker/package.json +++ b/ee/apps/queue-worker/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/queue-worker", "private": true, - "version": "0.3.0-rc.11", + "version": "0.3.0-rc.12", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/stream-hub-service/CHANGELOG.md b/ee/apps/stream-hub-service/CHANGELOG.md index eb9615af431b..a818f03ee497 100644 --- a/ee/apps/stream-hub-service/CHANGELOG.md +++ b/ee/apps/stream-hub-service/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/stream-hub-service +## 0.3.0-rc.12 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.12 +- @rocket.chat/core-services@0.3.0-rc.12 +- @rocket.chat/model-typings@0.2.0-rc.12 +- @rocket.chat/models@0.0.24-rc.5 + ## 0.3.0-rc.11 ### Patch Changes diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json index f6b0d825b425..8cbc1e0b070c 100644 --- a/ee/apps/stream-hub-service/package.json +++ b/ee/apps/stream-hub-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/stream-hub-service", "private": true, - "version": "0.3.0-rc.11", + "version": "0.3.0-rc.12", "description": "Rocket.Chat Stream Hub service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/packages/api-client/CHANGELOG.md b/ee/packages/api-client/CHANGELOG.md index eb84d5dfd656..91907cafa135 100644 --- a/ee/packages/api-client/CHANGELOG.md +++ b/ee/packages/api-client/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/api-client +## 0.1.18-rc.5 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.12 +- @rocket.chat/rest-typings@6.5.0-rc.12 + ## 0.1.18-rc.4 ### Patch Changes diff --git a/ee/packages/api-client/package.json b/ee/packages/api-client/package.json index 766a68266c71..7084aca939c4 100644 --- a/ee/packages/api-client/package.json +++ b/ee/packages/api-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/api-client", - "version": "0.1.18-rc.4", + "version": "0.1.18-rc.5", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/ddp-client/CHANGELOG.md b/ee/packages/ddp-client/CHANGELOG.md index b10886bc3d66..f12bb78d8bb2 100644 --- a/ee/packages/ddp-client/CHANGELOG.md +++ b/ee/packages/ddp-client/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/ddp-client +## 0.2.9-rc.5 + +### Patch Changes + +- @rocket.chat/rest-typings@6.5.0-rc.12 +- @rocket.chat/api-client@0.1.18-rc.5 + ## 0.2.9-rc.4 ### Patch Changes diff --git a/ee/packages/ddp-client/package.json b/ee/packages/ddp-client/package.json index 25c99afdc410..701f9f3f262a 100644 --- a/ee/packages/ddp-client/package.json +++ b/ee/packages/ddp-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ddp-client", - "version": "0.2.9-rc.4", + "version": "0.2.9-rc.5", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/license/CHANGELOG.md b/ee/packages/license/CHANGELOG.md index 8266618e53de..b1edfdcf2c24 100644 --- a/ee/packages/license/CHANGELOG.md +++ b/ee/packages/license/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/license +## 0.1.0-rc.12 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.12 + ## 0.1.0-rc.11 ### Patch Changes diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json index 42667b714be2..ff1df214e1ef 100644 --- a/ee/packages/license/package.json +++ b/ee/packages/license/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/license", - "version": "0.1.0-rc.11", + "version": "0.1.0-rc.12", "private": true, "devDependencies": { "@swc/core": "^1.3.95", diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md index 883d826f00d3..e20516088e9c 100644 --- a/ee/packages/omnichannel-services/CHANGELOG.md +++ b/ee/packages/omnichannel-services/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/omnichannel-services +## 0.1.0-rc.12 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.12 +- @rocket.chat/rest-typings@6.5.0-rc.12 +- @rocket.chat/pdf-worker@0.0.24-rc.5 +- @rocket.chat/core-services@0.3.0-rc.12 +- @rocket.chat/model-typings@0.2.0-rc.12 +- @rocket.chat/models@0.0.24-rc.5 + ## 0.1.0-rc.11 ### Patch Changes diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json index 4a1440b81ea7..74eb9a44a0d0 100644 --- a/ee/packages/omnichannel-services/package.json +++ b/ee/packages/omnichannel-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/omnichannel-services", - "version": "0.1.0-rc.11", + "version": "0.1.0-rc.12", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/ee/packages/pdf-worker/CHANGELOG.md b/ee/packages/pdf-worker/CHANGELOG.md index 91af3c62b00a..035e80b7a738 100644 --- a/ee/packages/pdf-worker/CHANGELOG.md +++ b/ee/packages/pdf-worker/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/pdf-worker +## 0.0.24-rc.5 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.12 + ## 0.0.24-rc.4 ### Patch Changes diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json index d4a78045acc5..436ae15f4134 100644 --- a/ee/packages/pdf-worker/package.json +++ b/ee/packages/pdf-worker/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/pdf-worker", - "version": "0.0.24-rc.4", + "version": "0.0.24-rc.5", "private": true, "devDependencies": { "@storybook/addon-essentials": "~6.5.16", diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md index 04060f8a52ee..2cdef6b457dc 100644 --- a/ee/packages/presence/CHANGELOG.md +++ b/ee/packages/presence/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/presence +## 0.1.0-rc.12 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.12 +- @rocket.chat/core-services@0.3.0-rc.12 +- @rocket.chat/models@0.0.24-rc.5 + ## 0.1.0-rc.11 ### Patch Changes diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json index 2258e075e9c3..b186e4da97e5 100644 --- a/ee/packages/presence/package.json +++ b/ee/packages/presence/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/presence", - "version": "0.1.0-rc.11", + "version": "0.1.0-rc.12", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/package.json b/package.json index 009df515e594..23781f19eb76 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket.chat", - "version": "6.5.0-rc.11", + "version": "6.5.0-rc.12", "description": "Rocket.Chat Monorepo", "main": "index.js", "private": true, diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md index 014c5c95f1a7..cce7b42381f9 100644 --- a/packages/core-services/CHANGELOG.md +++ b/packages/core-services/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/core-services +## 0.3.0-rc.12 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.12 +- @rocket.chat/rest-typings@6.5.0-rc.12 +- @rocket.chat/models@0.0.24-rc.5 + ## 0.3.0-rc.11 ### Patch Changes diff --git a/packages/core-services/package.json b/packages/core-services/package.json index 9a56ca00c471..613e88e59d06 100644 --- a/packages/core-services/package.json +++ b/packages/core-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/core-services", - "version": "0.3.0-rc.11", + "version": "0.3.0-rc.12", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md index 57ac9944ef0f..3abb3fea3967 100644 --- a/packages/core-typings/CHANGELOG.md +++ b/packages/core-typings/CHANGELOG.md @@ -1,5 +1,7 @@ # @rocket.chat/core-typings +## 6.5.0-rc.12 + ## 6.5.0-rc.11 ## 6.5.0-rc.10 diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json index 0a8a24e2c808..1425c5ce09ec 100644 --- a/packages/core-typings/package.json +++ b/packages/core-typings/package.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/package", "name": "@rocket.chat/core-typings", - "version": "6.5.0-rc.11", + "version": "6.5.0-rc.12", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "eslint": "~8.45.0", diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md index 3e3d1a7ed81d..5df17dff52ef 100644 --- a/packages/cron/CHANGELOG.md +++ b/packages/cron/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/cron +## 0.0.20-rc.5 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.12 +- @rocket.chat/models@0.0.24-rc.5 + ## 0.0.20-rc.4 ### Patch Changes diff --git a/packages/cron/package.json b/packages/cron/package.json index 79b3e89218bf..184bf1fb3ed9 100644 --- a/packages/cron/package.json +++ b/packages/cron/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/cron", - "version": "0.0.20-rc.4", + "version": "0.0.20-rc.5", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md index bcf1eb42f277..d1d45dfd391e 100644 --- a/packages/fuselage-ui-kit/CHANGELOG.md +++ b/packages/fuselage-ui-kit/CHANGELOG.md @@ -1,5 +1,13 @@ # Change Log +## 3.0.0-rc.12 + +### Patch Changes + +- @rocket.chat/gazzodown@3.0.0-rc.12 +- @rocket.chat/ui-contexts@3.0.0-rc.12 +- @rocket.chat/ui-video-conf@3.0.0-rc.12 + ## 3.0.0-rc.11 ### Patch Changes diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index 9559ca935049..f8ae991d62cf 100644 --- a/packages/fuselage-ui-kit/package.json +++ b/packages/fuselage-ui-kit/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/fuselage-ui-kit", "private": true, - "version": "3.0.0-rc.11", + "version": "3.0.0-rc.12", "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system", "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/", "author": { @@ -48,9 +48,9 @@ "@rocket.chat/icons": "*", "@rocket.chat/prettier-config": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.11", + "@rocket.chat/ui-contexts": "3.0.0-rc.12", "@rocket.chat/ui-kit": "*", - "@rocket.chat/ui-video-conf": "3.0.0-rc.11", + "@rocket.chat/ui-video-conf": "3.0.0-rc.12", "@tanstack/react-query": "*", "react": "*", "react-dom": "*" diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md index 7ae4c137143d..ac395d3de472 100644 --- a/packages/gazzodown/CHANGELOG.md +++ b/packages/gazzodown/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/gazzodown +## 3.0.0-rc.12 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.12 +- @rocket.chat/ui-contexts@3.0.0-rc.12 +- @rocket.chat/ui-client@3.0.0-rc.12 + ## 3.0.0-rc.11 ### Patch Changes diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json index 25452b929d71..9a60d285a575 100644 --- a/packages/gazzodown/package.json +++ b/packages/gazzodown/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/gazzodown", - "version": "3.0.0-rc.11", + "version": "3.0.0-rc.12", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -65,14 +65,14 @@ "/dist" ], "peerDependencies": { - "@rocket.chat/core-typings": "6.5.0-rc.11", + "@rocket.chat/core-typings": "6.5.0-rc.12", "@rocket.chat/css-in-js": "*", "@rocket.chat/fuselage": "*", "@rocket.chat/fuselage-tokens": "*", "@rocket.chat/message-parser": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-client": "3.0.0-rc.11", - "@rocket.chat/ui-contexts": "3.0.0-rc.11", + "@rocket.chat/ui-client": "3.0.0-rc.12", + "@rocket.chat/ui-contexts": "3.0.0-rc.12", "katex": "*", "react": "*" }, diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md index bdb6773dbe1a..b39bb1e54654 100644 --- a/packages/instance-status/CHANGELOG.md +++ b/packages/instance-status/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/instance-status +## 0.0.24-rc.5 + +### Patch Changes + +- @rocket.chat/models@0.0.24-rc.5 + ## 0.0.24-rc.4 ### Patch Changes diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json index 95afa6be1b31..198218dfdd69 100644 --- a/packages/instance-status/package.json +++ b/packages/instance-status/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/instance-status", - "version": "0.0.24-rc.4", + "version": "0.0.24-rc.5", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md index 2b8bd229002f..1fc3fdf76fc0 100644 --- a/packages/livechat/CHANGELOG.md +++ b/packages/livechat/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/livechat Change Log +## 1.14.9-rc.5 + +### Patch Changes + +- @rocket.chat/gazzodown@3.0.0-rc.12 + ## 1.14.9-rc.4 ### Patch Changes diff --git a/packages/livechat/package.json b/packages/livechat/package.json index 95367bdeb7e1..19bce2f8e7e1 100644 --- a/packages/livechat/package.json +++ b/packages/livechat/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/livechat", - "version": "1.14.9-rc.4", + "version": "1.14.9-rc.5", "files": [ "/build" ], diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md index fa3eb8793df5..42093121f123 100644 --- a/packages/model-typings/CHANGELOG.md +++ b/packages/model-typings/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/model-typings +## 0.2.0-rc.12 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.12 + ## 0.2.0-rc.11 ### Patch Changes diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json index b93004654c0c..005194829e7a 100644 --- a/packages/model-typings/package.json +++ b/packages/model-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/model-typings", - "version": "0.2.0-rc.11", + "version": "0.2.0-rc.12", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md index 8019255487bf..6fedb62d9eec 100644 --- a/packages/models/CHANGELOG.md +++ b/packages/models/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/models +## 0.0.24-rc.5 + +### Patch Changes + +- @rocket.chat/model-typings@0.2.0-rc.12 + ## 0.0.24-rc.4 ### Patch Changes diff --git a/packages/models/package.json b/packages/models/package.json index 3e306f427c1b..1dd5871cc4e3 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/models", - "version": "0.0.24-rc.4", + "version": "0.0.24-rc.5", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md index f74fb789115d..3699e7c289dd 100644 --- a/packages/rest-typings/CHANGELOG.md +++ b/packages/rest-typings/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/rest-typings +## 6.5.0-rc.12 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.12 +- @rocket.chat/license@0.1.0-rc.12 + ## 6.5.0-rc.11 ### Patch Changes diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json index 99347a33e18f..07fe3dbbd9b8 100644 --- a/packages/rest-typings/package.json +++ b/packages/rest-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/rest-typings", - "version": "6.5.0-rc.11", + "version": "6.5.0-rc.12", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "@types/jest": "~29.5.7", diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md index daf8aa7eb423..026afdc920a7 100644 --- a/packages/ui-client/CHANGELOG.md +++ b/packages/ui-client/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/ui-client +## 3.0.0-rc.12 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.12 + ## 3.0.0-rc.11 ### Patch Changes diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json index 47c69683fb68..37922e98fc8b 100644 --- a/packages/ui-client/package.json +++ b/packages/ui-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-client", - "version": "3.0.0-rc.11", + "version": "3.0.0-rc.12", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -61,7 +61,7 @@ "@rocket.chat/fuselage": "*", "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.11", + "@rocket.chat/ui-contexts": "3.0.0-rc.12", "react": "~17.0.2" }, "volta": { diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md index 39dc824e59bb..432e29bd5889 100644 --- a/packages/ui-contexts/CHANGELOG.md +++ b/packages/ui-contexts/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/ui-contexts +## 3.0.0-rc.12 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.12 +- @rocket.chat/rest-typings@6.5.0-rc.12 +- @rocket.chat/ddp-client@0.2.9-rc.5 + ## 3.0.0-rc.11 ### Patch Changes diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json index a10b946a536a..90799a65ab39 100644 --- a/packages/ui-contexts/package.json +++ b/packages/ui-contexts/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-contexts", - "version": "3.0.0-rc.11", + "version": "3.0.0-rc.12", "private": true, "devDependencies": { "@rocket.chat/core-typings": "workspace:^", diff --git a/packages/ui-video-conf/CHANGELOG.md b/packages/ui-video-conf/CHANGELOG.md index 1cff1f3951bb..b93882fe1e97 100644 --- a/packages/ui-video-conf/CHANGELOG.md +++ b/packages/ui-video-conf/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/ui-video-conf +## 3.0.0-rc.12 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.12 + ## 3.0.0-rc.11 ### Patch Changes diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json index a60e424a593d..56395951d309 100644 --- a/packages/ui-video-conf/package.json +++ b/packages/ui-video-conf/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-video-conf", - "version": "3.0.0-rc.11", + "version": "3.0.0-rc.12", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -35,7 +35,7 @@ "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.11", + "@rocket.chat/ui-contexts": "3.0.0-rc.12", "react": "^17.0.2", "react-dom": "^17.0.2" }, diff --git a/packages/uikit-playground/CHANGELOG.md b/packages/uikit-playground/CHANGELOG.md index 542eeb65658a..624de4a517ed 100644 --- a/packages/uikit-playground/CHANGELOG.md +++ b/packages/uikit-playground/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/uikit-playground +## 0.2.9-rc.5 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.12 +- @rocket.chat/fuselage-ui-kit@3.0.0-rc.12 + ## 0.2.9-rc.4 ### Patch Changes diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json index 5d1a5b51235c..211af8adbb4a 100644 --- a/packages/uikit-playground/package.json +++ b/packages/uikit-playground/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/uikit-playground", "private": true, - "version": "0.2.9-rc.4", + "version": "0.2.9-rc.5", "type": "module", "scripts": { "dev": "vite", diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md index 95f4191d2c5e..d5fd9d6bb68e 100644 --- a/packages/web-ui-registration/CHANGELOG.md +++ b/packages/web-ui-registration/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/web-ui-registration +## 3.0.0-rc.11 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.12 + ## 3.0.0-rc.10 ### Patch Changes diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json index db76dd72e5c5..efc085f3138c 100644 --- a/packages/web-ui-registration/package.json +++ b/packages/web-ui-registration/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/web-ui-registration", - "version": "3.0.0-rc.10", + "version": "3.0.0-rc.11", "private": true, "homepage": "https://rocket.chat", "main": "./dist/index.js", @@ -51,7 +51,7 @@ "peerDependencies": { "@rocket.chat/layout": "*", "@rocket.chat/tools": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.11", + "@rocket.chat/ui-contexts": "3.0.0-rc.12", "@tanstack/react-query": "*", "react": "*", "react-hook-form": "*", diff --git a/yarn.lock b/yarn.lock index 953db8d4d225..50232f4a2508 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8217,9 +8217,9 @@ __metadata: "@rocket.chat/icons": "*" "@rocket.chat/prettier-config": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-contexts": 3.0.0-rc.10 + "@rocket.chat/ui-contexts": 3.0.0-rc.11 "@rocket.chat/ui-kit": "*" - "@rocket.chat/ui-video-conf": 3.0.0-rc.10 + "@rocket.chat/ui-video-conf": 3.0.0-rc.11 "@tanstack/react-query": "*" react: "*" react-dom: "*" @@ -8301,14 +8301,14 @@ __metadata: ts-jest: ~29.0.5 typescript: ~5.2.2 peerDependencies: - "@rocket.chat/core-typings": 6.5.0-rc.10 + "@rocket.chat/core-typings": 6.5.0-rc.11 "@rocket.chat/css-in-js": "*" "@rocket.chat/fuselage": "*" "@rocket.chat/fuselage-tokens": "*" "@rocket.chat/message-parser": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-client": 3.0.0-rc.10 - "@rocket.chat/ui-contexts": 3.0.0-rc.10 + "@rocket.chat/ui-client": 3.0.0-rc.11 + "@rocket.chat/ui-contexts": 3.0.0-rc.11 katex: "*" react: "*" languageName: unknown @@ -9472,7 +9472,7 @@ __metadata: "@rocket.chat/fuselage": "*" "@rocket.chat/fuselage-hooks": "*" "@rocket.chat/icons": "*" - "@rocket.chat/ui-contexts": 3.0.0-rc.10 + "@rocket.chat/ui-contexts": 3.0.0-rc.11 react: ~17.0.2 languageName: unknown linkType: soft @@ -9625,7 +9625,7 @@ __metadata: "@rocket.chat/fuselage-hooks": "*" "@rocket.chat/icons": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-contexts": 3.0.0-rc.10 + "@rocket.chat/ui-contexts": 3.0.0-rc.11 react: ^17.0.2 react-dom: ^17.0.2 languageName: unknown @@ -9711,7 +9711,7 @@ __metadata: peerDependencies: "@rocket.chat/layout": "*" "@rocket.chat/tools": "*" - "@rocket.chat/ui-contexts": 3.0.0-rc.10 + "@rocket.chat/ui-contexts": 3.0.0-rc.11 "@tanstack/react-query": "*" react: "*" react-hook-form: "*" From d09b88292faa6b7bef79370744269a769a8efd78 Mon Sep 17 00:00:00 2001 From: Aleksander Nicacio da Silva Date: Fri, 24 Nov 2023 11:13:45 -0300 Subject: [PATCH 42/76] chore: refactored livechat e2e tests (#31054) --- .../omnichannel/omnichannel-livechat.spec.ts | 124 ++++++++++-------- 1 file changed, 66 insertions(+), 58 deletions(-) diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat.spec.ts index 8d8bf3eed191..240493337662 100644 --- a/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat.spec.ts +++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat.spec.ts @@ -1,5 +1,4 @@ import { faker } from '@faker-js/faker'; -import type { Page } from '@playwright/test'; import { createAuxContext } from '../fixtures/createAuxContext'; import { Users } from '../fixtures/userStates'; @@ -10,78 +9,87 @@ const newUser = { name: `${faker.person.firstName()} ${faker.string.uuid()}}`, email: faker.internet.email(), }; -test.describe('Livechat', () => { - test.describe('Send message', () => { - let poAuxContext: { page: Page; poHomeOmnichannel: HomeOmnichannel }; - let poLiveChat: OmnichannelLiveChat; - let page: Page; - test.beforeAll(async ({ browser, api }) => { - const statusCode = (await api.post('/livechat/users/agent', { username: 'user1' })).status(); - await expect(statusCode).toBe(200); +test.use({ storageState: Users.user1.state }); - page = await browser.newPage(); - poLiveChat = new OmnichannelLiveChat(page, api); +test.describe.serial('OC - Livechat', () => { + let poLiveChat: OmnichannelLiveChat; + let poHomeOmnichannel: HomeOmnichannel; - const { page: pageCtx } = await createAuxContext(browser, Users.user1); - poAuxContext = { page: pageCtx, poHomeOmnichannel: new HomeOmnichannel(pageCtx) }; + test.beforeAll(async ({ api }) => { + const statusCode = (await api.post('/livechat/users/agent', { username: 'user1' })).status(); + await expect(statusCode).toBe(200); + }); + + test.beforeAll(async ({ browser, api }) => { + const { page: livechatPage } = await createAuxContext(browser, Users.user1, '/livechat', false); + + poLiveChat = new OmnichannelLiveChat(livechatPage, api); + }); + + test.beforeEach(async ({ page }) => { + poHomeOmnichannel = new HomeOmnichannel(page); + + await page.goto('/'); + await page.locator('.main-content').waitFor(); + }); + + test.afterAll(async ({ api }) => { + await api.delete('/livechat/users/agent/user1'); + await poLiveChat.page?.close(); + }); + + test('OC - Livechat - Send message to online agent', async () => { + await test.step('expect message to be sent by livechat', async () => { + await poLiveChat.page.reload(); + await poLiveChat.openLiveChat(); + await poLiveChat.sendMessage(newUser, false); - await page.goto('/livechat'); + await poLiveChat.onlineAgentMessage.type('this_a_test_message_from_user'); + await poLiveChat.btnSendMessageToOnlineAgent.click(); + + await expect(poLiveChat.page.locator('div >> text="this_a_test_message_from_user"')).toBeVisible(); }); - test.afterAll(async ({ api }) => { - await api.delete('/livechat/users/agent/user1'); - await poAuxContext.page.close(); - await page.close(); + await test.step('expect message to be received by agent', async () => { + await poHomeOmnichannel.sidenav.openChat(newUser.name); + await expect(poHomeOmnichannel.content.lastUserMessage).toBeVisible(); + await expect(poHomeOmnichannel.content.lastUserMessage).toContainText('this_a_test_message_from_user'); }); + }); - test('Send message to online agent', async () => { - await test.step('Expect message to be sent by livechat', async () => { - await poLiveChat.openLiveChat(); - await poLiveChat.sendMessage(newUser, false); + test('OC - Livechat - Send message to livechat costumer', async () => { + await poHomeOmnichannel.sidenav.openChat(newUser.name); - await poLiveChat.onlineAgentMessage.type('this_a_test_message_from_user'); - await poLiveChat.btnSendMessageToOnlineAgent.click(); + await test.step('expect message to be sent by agent', async () => { + await poHomeOmnichannel.content.sendMessage('this_a_test_message_from_agent'); + await expect(poLiveChat.page.locator('div >> text="this_a_test_message_from_agent"')).toBeVisible(); + }); - await expect(page.locator('div >>text="this_a_test_message_from_user"')).toBeVisible(); - }); + await test.step('expect when user minimizes the livechat screen, the composer should be hidden', async () => { + await poLiveChat.openLiveChat(); + await expect(poLiveChat.page.locator('[contenteditable="true"]')).not.toBeVisible(); + }); - await test.step('expect message to be received by agent', async () => { - await poAuxContext.poHomeOmnichannel.sidenav.openChat(newUser.name); - await expect(poAuxContext.poHomeOmnichannel.content.lastUserMessage).toBeVisible(); - await expect(poAuxContext.poHomeOmnichannel.content.lastUserMessage).toContainText('this_a_test_message_from_user'); - }); + await test.step('expect message to be received by minimized livechat', async () => { + await poHomeOmnichannel.content.sendMessage('this_a_test_message_again_from_agent'); + await expect(poLiveChat.unreadMessagesBadge(1)).toBeVisible(); }); - test('Send message to livechat costumer', async () => { - await test.step('Expect message to be sent by agent', async () => { - await poAuxContext.poHomeOmnichannel.content.sendMessage('this_a_test_message_from_agent'); - await expect(page.locator('div >>text="this_a_test_message_from_agent"')).toBeVisible(); - }); - - await test.step('Expect when user minimizes the livechat screen, the composer should be hidden', async () => { - await poLiveChat.openLiveChat(); - await expect(page.locator('[contenteditable="true"]')).not.toBeVisible(); - }); - - await test.step('expect message to be received by minimized livechat', async () => { - await poAuxContext.poHomeOmnichannel.content.sendMessage('this_a_test_message_again_from_agent'); - await expect(poLiveChat.unreadMessagesBadge(1)).toBeVisible(); - }); - - await test.step('expect unread messages to be visible after a reload', async () => { - await page.reload(); - await expect(poLiveChat.unreadMessagesBadge(1)).toBeVisible(); - }); + await test.step('expect unread messages to be visible after a reload', async () => { + await poLiveChat.page.reload(); + await expect(poLiveChat.unreadMessagesBadge(1)).toBeVisible(); }); + }); + + test('OC - Livechat - Close livechat conversation', async () => { + await poHomeOmnichannel.sidenav.openChat(newUser.name); - test.describe('close livechat conversation', () => { - test('expect livechat conversation to be closed by agent', async () => { - await poAuxContext.poHomeOmnichannel.content.btnCloseChat.click(); - await poAuxContext.poHomeOmnichannel.content.omnichannelCloseChatModal.inputComment.fill('this_is_a_test_comment'); - await poAuxContext.poHomeOmnichannel.content.omnichannelCloseChatModal.btnConfirm.click(); - await expect(poAuxContext.poHomeOmnichannel.toastSuccess).toBeVisible(); - }); + await test.step('expect livechat conversation to be closed by agent', async () => { + await poHomeOmnichannel.content.btnCloseChat.click(); + await poHomeOmnichannel.content.omnichannelCloseChatModal.inputComment.fill('this_is_a_test_comment'); + await poHomeOmnichannel.content.omnichannelCloseChatModal.btnConfirm.click(); + await expect(poHomeOmnichannel.toastSuccess).toBeVisible(); }); }); }); From de4c7deb66dce8a0cc78376621d84d22b7285082 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Fri, 24 Nov 2023 20:32:53 -0300 Subject: [PATCH 43/76] chore: add callback events to user activation (#31073) --- .../ee/app/authorization/server/callback.ts | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/apps/meteor/ee/app/authorization/server/callback.ts b/apps/meteor/ee/app/authorization/server/callback.ts index ce5b549bb0a5..f0d74e5d96a6 100644 --- a/apps/meteor/ee/app/authorization/server/callback.ts +++ b/apps/meteor/ee/app/authorization/server/callback.ts @@ -3,21 +3,26 @@ import { License } from '@rocket.chat/license'; import { callbacks } from '../../../../lib/callbacks'; import { validateUserRoles } from './validateUserRoles'; -License.onInstall(async () => { +License.onInstall(() => { callbacks.add( 'beforeSaveUser', - async ({ user, oldUser }) => { - await validateUserRoles(user, oldUser); - }, + async ({ user, oldUser }) => validateUserRoles(user, oldUser), callbacks.priority.HIGH, 'validateUserRoles', ); callbacks.add('afterSaveUser', () => License.shouldPreventAction('activeUsers'), callbacks.priority.HIGH, 'validateUserRoles'); callbacks.add('afterDeleteUser', () => License.shouldPreventAction('activeUsers'), callbacks.priority.HIGH, 'validateUserRoles'); + + callbacks.add('afterDeactivateUser', () => License.shouldPreventAction('activeUsers'), callbacks.priority.HIGH, 'validateUserStatus'); + + callbacks.add('beforeActivateUser', () => License.shouldPreventAction('activeUsers'), callbacks.priority.HIGH, 'validateUserStatus'); }); -License.onInvalidate(async () => { +License.onInvalidate(() => { callbacks.remove('beforeSaveUser', 'validateUserRoles'); callbacks.remove('afterSaveUser', 'validateUserRoles'); callbacks.remove('afterDeleteUser', 'validateUserRoles'); + + callbacks.remove('afterDeactivateUser', 'validateUserStatus'); + callbacks.remove('beforeActivateUser', 'validateUserStatus'); }); From 0db5206ed3cfab954fc89d2077af1a94b551a5d0 Mon Sep 17 00:00:00 2001 From: rocketchat-github-ci Date: Sun, 26 Nov 2023 14:24:10 +0000 Subject: [PATCH 44/76] Release 6.5.0-rc.13 [no ci] --- .changeset/bump-patch-1701008644667.md | 5 ++++ .changeset/pre.json | 1 + apps/meteor/.docker/Dockerfile.rhel | 2 +- apps/meteor/CHANGELOG.md | 26 +++++++++++++++++++ apps/meteor/app/utils/rocketchat.info | 2 +- apps/meteor/ee/server/services/CHANGELOG.md | 10 +++++++ apps/meteor/ee/server/services/package.json | 2 +- apps/meteor/package.json | 2 +- ee/apps/account-service/CHANGELOG.md | 10 +++++++ ee/apps/account-service/package.json | 2 +- ee/apps/authorization-service/CHANGELOG.md | 10 +++++++ ee/apps/authorization-service/package.json | 2 +- ee/apps/ddp-streamer/CHANGELOG.md | 12 +++++++++ ee/apps/ddp-streamer/package.json | 2 +- ee/apps/omnichannel-transcript/CHANGELOG.md | 11 ++++++++ ee/apps/omnichannel-transcript/package.json | 2 +- ee/apps/presence-service/CHANGELOG.md | 10 +++++++ ee/apps/presence-service/package.json | 2 +- ee/apps/queue-worker/CHANGELOG.md | 10 +++++++ ee/apps/queue-worker/package.json | 2 +- ee/apps/stream-hub-service/CHANGELOG.md | 9 +++++++ ee/apps/stream-hub-service/package.json | 2 +- ee/packages/api-client/CHANGELOG.md | 7 +++++ ee/packages/api-client/package.json | 2 +- ee/packages/ddp-client/CHANGELOG.md | 7 +++++ ee/packages/ddp-client/package.json | 2 +- ee/packages/license/CHANGELOG.md | 6 +++++ ee/packages/license/package.json | 2 +- ee/packages/omnichannel-services/CHANGELOG.md | 11 ++++++++ ee/packages/omnichannel-services/package.json | 2 +- ee/packages/pdf-worker/CHANGELOG.md | 6 +++++ ee/packages/pdf-worker/package.json | 2 +- ee/packages/presence/CHANGELOG.md | 8 ++++++ ee/packages/presence/package.json | 2 +- package.json | 2 +- packages/core-services/CHANGELOG.md | 8 ++++++ packages/core-services/package.json | 2 +- packages/core-typings/CHANGELOG.md | 2 ++ packages/core-typings/package.json | 2 +- packages/cron/CHANGELOG.md | 7 +++++ packages/cron/package.json | 2 +- packages/fuselage-ui-kit/CHANGELOG.md | 8 ++++++ packages/fuselage-ui-kit/package.json | 6 ++--- packages/gazzodown/CHANGELOG.md | 8 ++++++ packages/gazzodown/package.json | 8 +++--- packages/instance-status/CHANGELOG.md | 6 +++++ packages/instance-status/package.json | 2 +- packages/livechat/CHANGELOG.md | 6 +++++ packages/livechat/package.json | 2 +- packages/model-typings/CHANGELOG.md | 6 +++++ packages/model-typings/package.json | 2 +- packages/models/CHANGELOG.md | 6 +++++ packages/models/package.json | 2 +- packages/rest-typings/CHANGELOG.md | 7 +++++ packages/rest-typings/package.json | 2 +- packages/ui-client/CHANGELOG.md | 6 +++++ packages/ui-client/package.json | 4 +-- packages/ui-contexts/CHANGELOG.md | 8 ++++++ packages/ui-contexts/package.json | 2 +- packages/ui-video-conf/CHANGELOG.md | 6 +++++ packages/ui-video-conf/package.json | 4 +-- packages/uikit-playground/CHANGELOG.md | 7 +++++ packages/uikit-playground/package.json | 2 +- packages/web-ui-registration/CHANGELOG.md | 6 +++++ packages/web-ui-registration/package.json | 4 +-- yarn.lock | 16 ++++++------ 66 files changed, 305 insertions(+), 49 deletions(-) create mode 100644 .changeset/bump-patch-1701008644667.md diff --git a/.changeset/bump-patch-1701008644667.md b/.changeset/bump-patch-1701008644667.md new file mode 100644 index 000000000000..e1eaa7980afb --- /dev/null +++ b/.changeset/bump-patch-1701008644667.md @@ -0,0 +1,5 @@ +--- +'@rocket.chat/meteor': patch +--- + +Bump @rocket.chat/meteor version. diff --git a/.changeset/pre.json b/.changeset/pre.json index 0e4e1e1f9fb1..ed40ceee399c 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -72,6 +72,7 @@ "bump-patch-1700748014961", "bump-patch-1700789984107", "bump-patch-1700801891621", + "bump-patch-1701008644667", "cool-rockets-talk", "cool-zoos-move", "cuddly-ties-run", diff --git a/apps/meteor/.docker/Dockerfile.rhel b/apps/meteor/.docker/Dockerfile.rhel index 58e9c6a2633d..686c6e35d45b 100644 --- a/apps/meteor/.docker/Dockerfile.rhel +++ b/apps/meteor/.docker/Dockerfile.rhel @@ -1,6 +1,6 @@ FROM registry.access.redhat.com/ubi8/nodejs-12 -ENV RC_VERSION 6.5.0-rc.12 +ENV RC_VERSION 6.5.0-rc.13 MAINTAINER buildmaster@rocket.chat diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md index 02fcbb8ac0fb..816527adb037 100644 --- a/apps/meteor/CHANGELOG.md +++ b/apps/meteor/CHANGELOG.md @@ -1,5 +1,31 @@ # @rocket.chat/meteor +## 6.5.0-rc.13 + +### Patch Changes + +- Bump @rocket.chat/meteor version. + - @rocket.chat/core-typings@6.5.0-rc.13 + - @rocket.chat/rest-typings@6.5.0-rc.13 + - @rocket.chat/api-client@0.1.18-rc.6 + - @rocket.chat/license@0.1.0-rc.13 + - @rocket.chat/omnichannel-services@0.1.0-rc.13 + - @rocket.chat/pdf-worker@0.0.24-rc.6 + - @rocket.chat/presence@0.1.0-rc.13 + - @rocket.chat/core-services@0.3.0-rc.13 + - @rocket.chat/cron@0.0.20-rc.6 + - @rocket.chat/gazzodown@3.0.0-rc.13 + - @rocket.chat/model-typings@0.2.0-rc.13 + - @rocket.chat/ui-contexts@3.0.0-rc.13 + - @rocket.chat/server-cloud-communication@0.0.1 + - @rocket.chat/fuselage-ui-kit@3.0.0-rc.13 + - @rocket.chat/models@0.0.24-rc.6 + - @rocket.chat/ui-theming@0.1.1-rc.0 + - @rocket.chat/ui-client@3.0.0-rc.13 + - @rocket.chat/ui-video-conf@3.0.0-rc.13 + - @rocket.chat/web-ui-registration@3.0.0-rc.12 + - @rocket.chat/instance-status@0.0.24-rc.6 + ## 6.5.0-rc.12 ### Patch Changes diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info index a69feec1a915..08e2f3a6a5b9 100644 --- a/apps/meteor/app/utils/rocketchat.info +++ b/apps/meteor/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "6.5.0-rc.12" + "version": "6.5.0-rc.13" } diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md index 9322a9ce2b0e..6b7be8c7efb7 100644 --- a/apps/meteor/ee/server/services/CHANGELOG.md +++ b/apps/meteor/ee/server/services/CHANGELOG.md @@ -1,5 +1,15 @@ # rocketchat-services +## 1.1.18-rc.6 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.13 +- @rocket.chat/rest-typings@6.5.0-rc.13 +- @rocket.chat/core-services@0.3.0-rc.13 +- @rocket.chat/model-typings@0.2.0-rc.13 +- @rocket.chat/models@0.0.24-rc.6 + ## 1.1.18-rc.5 ### Patch Changes diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json index d70addacafba..998c4ca39216 100644 --- a/apps/meteor/ee/server/services/package.json +++ b/apps/meteor/ee/server/services/package.json @@ -1,7 +1,7 @@ { "name": "rocketchat-services", "private": true, - "version": "1.1.18-rc.5", + "version": "1.1.18-rc.6", "description": "Rocket.Chat Authorization service", "main": "index.js", "scripts": { diff --git a/apps/meteor/package.json b/apps/meteor/package.json index f63b06393910..f1cf61a4da4f 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/meteor", "description": "The Ultimate Open Source WebChat Platform", - "version": "6.5.0-rc.12", + "version": "6.5.0-rc.13", "private": true, "author": { "name": "Rocket.Chat", diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md index 4feabba8e241..f239f1898b17 100644 --- a/ee/apps/account-service/CHANGELOG.md +++ b/ee/apps/account-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/account-service +## 0.3.0-rc.13 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.13 +- @rocket.chat/rest-typings@6.5.0-rc.13 +- @rocket.chat/core-services@0.3.0-rc.13 +- @rocket.chat/model-typings@0.2.0-rc.13 +- @rocket.chat/models@0.0.24-rc.6 + ## 0.3.0-rc.12 ### Patch Changes diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json index d83d8e1f0f09..503baab54c52 100644 --- a/ee/apps/account-service/package.json +++ b/ee/apps/account-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/account-service", "private": true, - "version": "0.3.0-rc.12", + "version": "0.3.0-rc.13", "description": "Rocket.Chat Account service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/authorization-service/CHANGELOG.md b/ee/apps/authorization-service/CHANGELOG.md index 67c7d086824e..37e1fcddabd0 100644 --- a/ee/apps/authorization-service/CHANGELOG.md +++ b/ee/apps/authorization-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/authorization-service +## 0.3.0-rc.13 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.13 +- @rocket.chat/rest-typings@6.5.0-rc.13 +- @rocket.chat/core-services@0.3.0-rc.13 +- @rocket.chat/model-typings@0.2.0-rc.13 +- @rocket.chat/models@0.0.24-rc.6 + ## 0.3.0-rc.12 ### Patch Changes diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json index cb809adf4a2e..8c3d2785b822 100644 --- a/ee/apps/authorization-service/package.json +++ b/ee/apps/authorization-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/authorization-service", "private": true, - "version": "0.3.0-rc.12", + "version": "0.3.0-rc.13", "description": "Rocket.Chat Authorization service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/ddp-streamer/CHANGELOG.md b/ee/apps/ddp-streamer/CHANGELOG.md index a65c9c3a8e6c..b0cf5c056856 100644 --- a/ee/apps/ddp-streamer/CHANGELOG.md +++ b/ee/apps/ddp-streamer/CHANGELOG.md @@ -1,5 +1,17 @@ # @rocket.chat/ddp-streamer +## 0.2.0-rc.13 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.13 +- @rocket.chat/rest-typings@6.5.0-rc.13 +- @rocket.chat/core-services@0.3.0-rc.13 +- @rocket.chat/model-typings@0.2.0-rc.13 +- @rocket.chat/ui-contexts@3.0.0-rc.13 +- @rocket.chat/models@0.0.24-rc.6 +- @rocket.chat/instance-status@0.0.24-rc.6 + ## 0.2.0-rc.12 ### Patch Changes diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json index b55673b323c7..f5d027dafd08 100644 --- a/ee/apps/ddp-streamer/package.json +++ b/ee/apps/ddp-streamer/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/ddp-streamer", "private": true, - "version": "0.2.0-rc.12", + "version": "0.2.0-rc.13", "description": "Rocket.Chat DDP-Streamer service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/omnichannel-transcript/CHANGELOG.md b/ee/apps/omnichannel-transcript/CHANGELOG.md index 7d63df4e0774..74396c098466 100644 --- a/ee/apps/omnichannel-transcript/CHANGELOG.md +++ b/ee/apps/omnichannel-transcript/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/omnichannel-transcript +## 0.3.0-rc.13 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.13 +- @rocket.chat/omnichannel-services@0.1.0-rc.13 +- @rocket.chat/pdf-worker@0.0.24-rc.6 +- @rocket.chat/core-services@0.3.0-rc.13 +- @rocket.chat/model-typings@0.2.0-rc.13 +- @rocket.chat/models@0.0.24-rc.6 + ## 0.3.0-rc.12 ### Patch Changes diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json index d90a4b19179d..46f93fbbc249 100644 --- a/ee/apps/omnichannel-transcript/package.json +++ b/ee/apps/omnichannel-transcript/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/omnichannel-transcript", "private": true, - "version": "0.3.0-rc.12", + "version": "0.3.0-rc.13", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/presence-service/CHANGELOG.md b/ee/apps/presence-service/CHANGELOG.md index 8d3e503b4fd5..d19ec0bc1ad6 100644 --- a/ee/apps/presence-service/CHANGELOG.md +++ b/ee/apps/presence-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/presence-service +## 0.3.0-rc.13 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.13 +- @rocket.chat/presence@0.1.0-rc.13 +- @rocket.chat/core-services@0.3.0-rc.13 +- @rocket.chat/model-typings@0.2.0-rc.13 +- @rocket.chat/models@0.0.24-rc.6 + ## 0.3.0-rc.12 ### Patch Changes diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json index be883d4a1082..a76edcc20068 100644 --- a/ee/apps/presence-service/package.json +++ b/ee/apps/presence-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/presence-service", "private": true, - "version": "0.3.0-rc.12", + "version": "0.3.0-rc.13", "description": "Rocket.Chat Presence service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/queue-worker/CHANGELOG.md b/ee/apps/queue-worker/CHANGELOG.md index 2e1e2c0fca52..abf41755463f 100644 --- a/ee/apps/queue-worker/CHANGELOG.md +++ b/ee/apps/queue-worker/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/queue-worker +## 0.3.0-rc.13 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.13 +- @rocket.chat/omnichannel-services@0.1.0-rc.13 +- @rocket.chat/core-services@0.3.0-rc.13 +- @rocket.chat/model-typings@0.2.0-rc.13 +- @rocket.chat/models@0.0.24-rc.6 + ## 0.3.0-rc.12 ### Patch Changes diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json index a8997ee8ec93..a4320b751971 100644 --- a/ee/apps/queue-worker/package.json +++ b/ee/apps/queue-worker/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/queue-worker", "private": true, - "version": "0.3.0-rc.12", + "version": "0.3.0-rc.13", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/stream-hub-service/CHANGELOG.md b/ee/apps/stream-hub-service/CHANGELOG.md index a818f03ee497..90da7e09898f 100644 --- a/ee/apps/stream-hub-service/CHANGELOG.md +++ b/ee/apps/stream-hub-service/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/stream-hub-service +## 0.3.0-rc.13 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.13 +- @rocket.chat/core-services@0.3.0-rc.13 +- @rocket.chat/model-typings@0.2.0-rc.13 +- @rocket.chat/models@0.0.24-rc.6 + ## 0.3.0-rc.12 ### Patch Changes diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json index 8cbc1e0b070c..014a0de8935a 100644 --- a/ee/apps/stream-hub-service/package.json +++ b/ee/apps/stream-hub-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/stream-hub-service", "private": true, - "version": "0.3.0-rc.12", + "version": "0.3.0-rc.13", "description": "Rocket.Chat Stream Hub service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/packages/api-client/CHANGELOG.md b/ee/packages/api-client/CHANGELOG.md index 91907cafa135..99bdb4b27bec 100644 --- a/ee/packages/api-client/CHANGELOG.md +++ b/ee/packages/api-client/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/api-client +## 0.1.18-rc.6 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.13 +- @rocket.chat/rest-typings@6.5.0-rc.13 + ## 0.1.18-rc.5 ### Patch Changes diff --git a/ee/packages/api-client/package.json b/ee/packages/api-client/package.json index 7084aca939c4..df3e005d22ca 100644 --- a/ee/packages/api-client/package.json +++ b/ee/packages/api-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/api-client", - "version": "0.1.18-rc.5", + "version": "0.1.18-rc.6", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/ddp-client/CHANGELOG.md b/ee/packages/ddp-client/CHANGELOG.md index f12bb78d8bb2..0b94bf3852c5 100644 --- a/ee/packages/ddp-client/CHANGELOG.md +++ b/ee/packages/ddp-client/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/ddp-client +## 0.2.9-rc.6 + +### Patch Changes + +- @rocket.chat/rest-typings@6.5.0-rc.13 +- @rocket.chat/api-client@0.1.18-rc.6 + ## 0.2.9-rc.5 ### Patch Changes diff --git a/ee/packages/ddp-client/package.json b/ee/packages/ddp-client/package.json index 701f9f3f262a..48c7de60cfcc 100644 --- a/ee/packages/ddp-client/package.json +++ b/ee/packages/ddp-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ddp-client", - "version": "0.2.9-rc.5", + "version": "0.2.9-rc.6", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/license/CHANGELOG.md b/ee/packages/license/CHANGELOG.md index b1edfdcf2c24..15f788056e9a 100644 --- a/ee/packages/license/CHANGELOG.md +++ b/ee/packages/license/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/license +## 0.1.0-rc.13 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.13 + ## 0.1.0-rc.12 ### Patch Changes diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json index ff1df214e1ef..61b8006ab7dc 100644 --- a/ee/packages/license/package.json +++ b/ee/packages/license/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/license", - "version": "0.1.0-rc.12", + "version": "0.1.0-rc.13", "private": true, "devDependencies": { "@swc/core": "^1.3.95", diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md index e20516088e9c..46e508d12d04 100644 --- a/ee/packages/omnichannel-services/CHANGELOG.md +++ b/ee/packages/omnichannel-services/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/omnichannel-services +## 0.1.0-rc.13 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.13 +- @rocket.chat/rest-typings@6.5.0-rc.13 +- @rocket.chat/pdf-worker@0.0.24-rc.6 +- @rocket.chat/core-services@0.3.0-rc.13 +- @rocket.chat/model-typings@0.2.0-rc.13 +- @rocket.chat/models@0.0.24-rc.6 + ## 0.1.0-rc.12 ### Patch Changes diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json index 74eb9a44a0d0..0f7ba0958d8c 100644 --- a/ee/packages/omnichannel-services/package.json +++ b/ee/packages/omnichannel-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/omnichannel-services", - "version": "0.1.0-rc.12", + "version": "0.1.0-rc.13", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/ee/packages/pdf-worker/CHANGELOG.md b/ee/packages/pdf-worker/CHANGELOG.md index 035e80b7a738..287116312315 100644 --- a/ee/packages/pdf-worker/CHANGELOG.md +++ b/ee/packages/pdf-worker/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/pdf-worker +## 0.0.24-rc.6 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.13 + ## 0.0.24-rc.5 ### Patch Changes diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json index 436ae15f4134..e6dba65b3bce 100644 --- a/ee/packages/pdf-worker/package.json +++ b/ee/packages/pdf-worker/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/pdf-worker", - "version": "0.0.24-rc.5", + "version": "0.0.24-rc.6", "private": true, "devDependencies": { "@storybook/addon-essentials": "~6.5.16", diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md index 2cdef6b457dc..b99ba756e739 100644 --- a/ee/packages/presence/CHANGELOG.md +++ b/ee/packages/presence/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/presence +## 0.1.0-rc.13 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.13 +- @rocket.chat/core-services@0.3.0-rc.13 +- @rocket.chat/models@0.0.24-rc.6 + ## 0.1.0-rc.12 ### Patch Changes diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json index b186e4da97e5..71d312417b4c 100644 --- a/ee/packages/presence/package.json +++ b/ee/packages/presence/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/presence", - "version": "0.1.0-rc.12", + "version": "0.1.0-rc.13", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/package.json b/package.json index 23781f19eb76..15b4a03617b4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket.chat", - "version": "6.5.0-rc.12", + "version": "6.5.0-rc.13", "description": "Rocket.Chat Monorepo", "main": "index.js", "private": true, diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md index cce7b42381f9..7aad838ff5d9 100644 --- a/packages/core-services/CHANGELOG.md +++ b/packages/core-services/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/core-services +## 0.3.0-rc.13 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.13 +- @rocket.chat/rest-typings@6.5.0-rc.13 +- @rocket.chat/models@0.0.24-rc.6 + ## 0.3.0-rc.12 ### Patch Changes diff --git a/packages/core-services/package.json b/packages/core-services/package.json index 613e88e59d06..90be95383ba1 100644 --- a/packages/core-services/package.json +++ b/packages/core-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/core-services", - "version": "0.3.0-rc.12", + "version": "0.3.0-rc.13", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md index 3abb3fea3967..23a3bd0eaf22 100644 --- a/packages/core-typings/CHANGELOG.md +++ b/packages/core-typings/CHANGELOG.md @@ -1,5 +1,7 @@ # @rocket.chat/core-typings +## 6.5.0-rc.13 + ## 6.5.0-rc.12 ## 6.5.0-rc.11 diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json index 1425c5ce09ec..cd42eca67b13 100644 --- a/packages/core-typings/package.json +++ b/packages/core-typings/package.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/package", "name": "@rocket.chat/core-typings", - "version": "6.5.0-rc.12", + "version": "6.5.0-rc.13", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "eslint": "~8.45.0", diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md index 5df17dff52ef..72badf0706e6 100644 --- a/packages/cron/CHANGELOG.md +++ b/packages/cron/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/cron +## 0.0.20-rc.6 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.13 +- @rocket.chat/models@0.0.24-rc.6 + ## 0.0.20-rc.5 ### Patch Changes diff --git a/packages/cron/package.json b/packages/cron/package.json index 184bf1fb3ed9..632bdb9f35ff 100644 --- a/packages/cron/package.json +++ b/packages/cron/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/cron", - "version": "0.0.20-rc.5", + "version": "0.0.20-rc.6", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md index d1d45dfd391e..4d4ba730ebee 100644 --- a/packages/fuselage-ui-kit/CHANGELOG.md +++ b/packages/fuselage-ui-kit/CHANGELOG.md @@ -1,5 +1,13 @@ # Change Log +## 3.0.0-rc.13 + +### Patch Changes + +- @rocket.chat/gazzodown@3.0.0-rc.13 +- @rocket.chat/ui-contexts@3.0.0-rc.13 +- @rocket.chat/ui-video-conf@3.0.0-rc.13 + ## 3.0.0-rc.12 ### Patch Changes diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index f8ae991d62cf..8510c701ad51 100644 --- a/packages/fuselage-ui-kit/package.json +++ b/packages/fuselage-ui-kit/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/fuselage-ui-kit", "private": true, - "version": "3.0.0-rc.12", + "version": "3.0.0-rc.13", "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system", "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/", "author": { @@ -48,9 +48,9 @@ "@rocket.chat/icons": "*", "@rocket.chat/prettier-config": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.12", + "@rocket.chat/ui-contexts": "3.0.0-rc.13", "@rocket.chat/ui-kit": "*", - "@rocket.chat/ui-video-conf": "3.0.0-rc.12", + "@rocket.chat/ui-video-conf": "3.0.0-rc.13", "@tanstack/react-query": "*", "react": "*", "react-dom": "*" diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md index ac395d3de472..d86c21fe200c 100644 --- a/packages/gazzodown/CHANGELOG.md +++ b/packages/gazzodown/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/gazzodown +## 3.0.0-rc.13 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.13 +- @rocket.chat/ui-contexts@3.0.0-rc.13 +- @rocket.chat/ui-client@3.0.0-rc.13 + ## 3.0.0-rc.12 ### Patch Changes diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json index 9a60d285a575..3eb1e56687d0 100644 --- a/packages/gazzodown/package.json +++ b/packages/gazzodown/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/gazzodown", - "version": "3.0.0-rc.12", + "version": "3.0.0-rc.13", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -65,14 +65,14 @@ "/dist" ], "peerDependencies": { - "@rocket.chat/core-typings": "6.5.0-rc.12", + "@rocket.chat/core-typings": "6.5.0-rc.13", "@rocket.chat/css-in-js": "*", "@rocket.chat/fuselage": "*", "@rocket.chat/fuselage-tokens": "*", "@rocket.chat/message-parser": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-client": "3.0.0-rc.12", - "@rocket.chat/ui-contexts": "3.0.0-rc.12", + "@rocket.chat/ui-client": "3.0.0-rc.13", + "@rocket.chat/ui-contexts": "3.0.0-rc.13", "katex": "*", "react": "*" }, diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md index b39bb1e54654..0f285899fe2a 100644 --- a/packages/instance-status/CHANGELOG.md +++ b/packages/instance-status/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/instance-status +## 0.0.24-rc.6 + +### Patch Changes + +- @rocket.chat/models@0.0.24-rc.6 + ## 0.0.24-rc.5 ### Patch Changes diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json index 198218dfdd69..8c380ec06478 100644 --- a/packages/instance-status/package.json +++ b/packages/instance-status/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/instance-status", - "version": "0.0.24-rc.5", + "version": "0.0.24-rc.6", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md index 1fc3fdf76fc0..adf18e41d143 100644 --- a/packages/livechat/CHANGELOG.md +++ b/packages/livechat/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/livechat Change Log +## 1.14.9-rc.6 + +### Patch Changes + +- @rocket.chat/gazzodown@3.0.0-rc.13 + ## 1.14.9-rc.5 ### Patch Changes diff --git a/packages/livechat/package.json b/packages/livechat/package.json index 19bce2f8e7e1..b977bbac89f9 100644 --- a/packages/livechat/package.json +++ b/packages/livechat/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/livechat", - "version": "1.14.9-rc.5", + "version": "1.14.9-rc.6", "files": [ "/build" ], diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md index 42093121f123..0ea27788a8da 100644 --- a/packages/model-typings/CHANGELOG.md +++ b/packages/model-typings/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/model-typings +## 0.2.0-rc.13 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.13 + ## 0.2.0-rc.12 ### Patch Changes diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json index 005194829e7a..b36e928fa169 100644 --- a/packages/model-typings/package.json +++ b/packages/model-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/model-typings", - "version": "0.2.0-rc.12", + "version": "0.2.0-rc.13", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md index 6fedb62d9eec..51879e3029b1 100644 --- a/packages/models/CHANGELOG.md +++ b/packages/models/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/models +## 0.0.24-rc.6 + +### Patch Changes + +- @rocket.chat/model-typings@0.2.0-rc.13 + ## 0.0.24-rc.5 ### Patch Changes diff --git a/packages/models/package.json b/packages/models/package.json index 1dd5871cc4e3..e5ad15b10d4a 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/models", - "version": "0.0.24-rc.5", + "version": "0.0.24-rc.6", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md index 3699e7c289dd..035f25e765dc 100644 --- a/packages/rest-typings/CHANGELOG.md +++ b/packages/rest-typings/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/rest-typings +## 6.5.0-rc.13 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.13 +- @rocket.chat/license@0.1.0-rc.13 + ## 6.5.0-rc.12 ### Patch Changes diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json index 07fe3dbbd9b8..9a1a26470964 100644 --- a/packages/rest-typings/package.json +++ b/packages/rest-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/rest-typings", - "version": "6.5.0-rc.12", + "version": "6.5.0-rc.13", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "@types/jest": "~29.5.7", diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md index 026afdc920a7..5c25dc92fd96 100644 --- a/packages/ui-client/CHANGELOG.md +++ b/packages/ui-client/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/ui-client +## 3.0.0-rc.13 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.13 + ## 3.0.0-rc.12 ### Patch Changes diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json index 37922e98fc8b..df6cd9fe3342 100644 --- a/packages/ui-client/package.json +++ b/packages/ui-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-client", - "version": "3.0.0-rc.12", + "version": "3.0.0-rc.13", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -61,7 +61,7 @@ "@rocket.chat/fuselage": "*", "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.12", + "@rocket.chat/ui-contexts": "3.0.0-rc.13", "react": "~17.0.2" }, "volta": { diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md index 432e29bd5889..922372ca4231 100644 --- a/packages/ui-contexts/CHANGELOG.md +++ b/packages/ui-contexts/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/ui-contexts +## 3.0.0-rc.13 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.13 +- @rocket.chat/rest-typings@6.5.0-rc.13 +- @rocket.chat/ddp-client@0.2.9-rc.6 + ## 3.0.0-rc.12 ### Patch Changes diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json index 90799a65ab39..c2895b1d6211 100644 --- a/packages/ui-contexts/package.json +++ b/packages/ui-contexts/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-contexts", - "version": "3.0.0-rc.12", + "version": "3.0.0-rc.13", "private": true, "devDependencies": { "@rocket.chat/core-typings": "workspace:^", diff --git a/packages/ui-video-conf/CHANGELOG.md b/packages/ui-video-conf/CHANGELOG.md index b93882fe1e97..85fc6e1d1a63 100644 --- a/packages/ui-video-conf/CHANGELOG.md +++ b/packages/ui-video-conf/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/ui-video-conf +## 3.0.0-rc.13 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.13 + ## 3.0.0-rc.12 ### Patch Changes diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json index 56395951d309..bb1623e8607c 100644 --- a/packages/ui-video-conf/package.json +++ b/packages/ui-video-conf/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-video-conf", - "version": "3.0.0-rc.12", + "version": "3.0.0-rc.13", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -35,7 +35,7 @@ "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.12", + "@rocket.chat/ui-contexts": "3.0.0-rc.13", "react": "^17.0.2", "react-dom": "^17.0.2" }, diff --git a/packages/uikit-playground/CHANGELOG.md b/packages/uikit-playground/CHANGELOG.md index 624de4a517ed..c6a89a212ee2 100644 --- a/packages/uikit-playground/CHANGELOG.md +++ b/packages/uikit-playground/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/uikit-playground +## 0.2.9-rc.6 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.13 +- @rocket.chat/fuselage-ui-kit@3.0.0-rc.13 + ## 0.2.9-rc.5 ### Patch Changes diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json index 211af8adbb4a..02540796c297 100644 --- a/packages/uikit-playground/package.json +++ b/packages/uikit-playground/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/uikit-playground", "private": true, - "version": "0.2.9-rc.5", + "version": "0.2.9-rc.6", "type": "module", "scripts": { "dev": "vite", diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md index d5fd9d6bb68e..61ea615d647e 100644 --- a/packages/web-ui-registration/CHANGELOG.md +++ b/packages/web-ui-registration/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/web-ui-registration +## 3.0.0-rc.12 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.13 + ## 3.0.0-rc.11 ### Patch Changes diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json index efc085f3138c..f005fdc774cc 100644 --- a/packages/web-ui-registration/package.json +++ b/packages/web-ui-registration/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/web-ui-registration", - "version": "3.0.0-rc.11", + "version": "3.0.0-rc.12", "private": true, "homepage": "https://rocket.chat", "main": "./dist/index.js", @@ -51,7 +51,7 @@ "peerDependencies": { "@rocket.chat/layout": "*", "@rocket.chat/tools": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.12", + "@rocket.chat/ui-contexts": "3.0.0-rc.13", "@tanstack/react-query": "*", "react": "*", "react-hook-form": "*", diff --git a/yarn.lock b/yarn.lock index 50232f4a2508..b8a59a03ed48 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8217,9 +8217,9 @@ __metadata: "@rocket.chat/icons": "*" "@rocket.chat/prettier-config": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-contexts": 3.0.0-rc.11 + "@rocket.chat/ui-contexts": 3.0.0-rc.12 "@rocket.chat/ui-kit": "*" - "@rocket.chat/ui-video-conf": 3.0.0-rc.11 + "@rocket.chat/ui-video-conf": 3.0.0-rc.12 "@tanstack/react-query": "*" react: "*" react-dom: "*" @@ -8301,14 +8301,14 @@ __metadata: ts-jest: ~29.0.5 typescript: ~5.2.2 peerDependencies: - "@rocket.chat/core-typings": 6.5.0-rc.11 + "@rocket.chat/core-typings": 6.5.0-rc.12 "@rocket.chat/css-in-js": "*" "@rocket.chat/fuselage": "*" "@rocket.chat/fuselage-tokens": "*" "@rocket.chat/message-parser": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-client": 3.0.0-rc.11 - "@rocket.chat/ui-contexts": 3.0.0-rc.11 + "@rocket.chat/ui-client": 3.0.0-rc.12 + "@rocket.chat/ui-contexts": 3.0.0-rc.12 katex: "*" react: "*" languageName: unknown @@ -9472,7 +9472,7 @@ __metadata: "@rocket.chat/fuselage": "*" "@rocket.chat/fuselage-hooks": "*" "@rocket.chat/icons": "*" - "@rocket.chat/ui-contexts": 3.0.0-rc.11 + "@rocket.chat/ui-contexts": 3.0.0-rc.12 react: ~17.0.2 languageName: unknown linkType: soft @@ -9625,7 +9625,7 @@ __metadata: "@rocket.chat/fuselage-hooks": "*" "@rocket.chat/icons": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-contexts": 3.0.0-rc.11 + "@rocket.chat/ui-contexts": 3.0.0-rc.12 react: ^17.0.2 react-dom: ^17.0.2 languageName: unknown @@ -9711,7 +9711,7 @@ __metadata: peerDependencies: "@rocket.chat/layout": "*" "@rocket.chat/tools": "*" - "@rocket.chat/ui-contexts": 3.0.0-rc.11 + "@rocket.chat/ui-contexts": 3.0.0-rc.12 "@tanstack/react-query": "*" react: "*" react-hook-form: "*" From e7d744e1c2bf5fa4edd16bd45c89168c45d105de Mon Sep 17 00:00:00 2001 From: Hugo Costa Date: Mon, 27 Nov 2023 17:07:51 -0300 Subject: [PATCH 45/76] regression: features items line break (#31036) --- .../admin/subscription/components/cards/FeaturesCard.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/meteor/client/views/admin/subscription/components/cards/FeaturesCard.tsx b/apps/meteor/client/views/admin/subscription/components/cards/FeaturesCard.tsx index 8e0d99a57167..7c5e67e622a6 100644 --- a/apps/meteor/client/views/admin/subscription/components/cards/FeaturesCard.tsx +++ b/apps/meteor/client/views/admin/subscription/components/cards/FeaturesCard.tsx @@ -22,7 +22,7 @@ type FeaturesCardProps = { const FeaturesCard = ({ activeModules, isEnterprise }: FeaturesCardProps): ReactElement => { const { t } = useTranslation(); - const mediaQuery = useMediaQuery('(min-width: 1024px)'); + const mediaQuery = useMediaQuery('(min-width: 1180px)'); const getFeatureSet = (modules: string[], isEnterprise: boolean): FeatureSet[] => { const featureSet: FeatureSet[] = [ @@ -78,9 +78,9 @@ const FeaturesCard = ({ activeModules, isEnterprise }: FeaturesCardProps): React - + {getFeatureSet(activeModules, isEnterprise).map(({ type, title, infoText }, index) => ( - + {t(title)} From 80a443bcde807ed91da47ed4609e4ce39367cbf9 Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Mon, 27 Nov 2023 17:57:07 -0300 Subject: [PATCH 46/76] fix: Missing info about license removal (#31086) Co-authored-by: Guilherme Gazzo --- apps/meteor/ee/app/license/server/settings.ts | 1 + apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json | 1 + 2 files changed, 2 insertions(+) diff --git a/apps/meteor/ee/app/license/server/settings.ts b/apps/meteor/ee/app/license/server/settings.ts index beea68ee2b5f..a5a474f591f2 100644 --- a/apps/meteor/ee/app/license/server/settings.ts +++ b/apps/meteor/ee/app/license/server/settings.ts @@ -10,6 +10,7 @@ Meteor.startup(async () => { await this.add('Enterprise_License', '', { type: 'string', i18nLabel: 'Premium_License', + alert: 'Premium_License_alert', }); await this.add('Enterprise_License_Data', '', { type: 'string', diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json index c1d003d8149a..9f829456e0cd 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json @@ -1923,6 +1923,7 @@ "Premium_Departments_description_upgrade": "Workspaces on Community can create just one department. Upgrade to a Premium plan to remove limits and supercharge your workspace.", "Premium_Departments_description_free_trial": "Workspaces on Community can create one department. Start a free Premium trial to create multiple departments today!", "Premium_License": "Premium License", + "Premium_License_alert": "If a license is removed the workspace must be restarted to take effect.
If the workspace is connected to the cloud the license should be canceled there first otherwise cloud will provide the license to the workspace again during the restart.", "Premium_only": "Premium only", "Entertainment": "Entertainment", "Error": "Error", From de6b13bdbd3e408c22917287228d1f9a0c987e9e Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Mon, 27 Nov 2023 18:33:14 -0300 Subject: [PATCH 47/76] fix: Prevent process crash when broadcasting before broker set (#31085) Co-authored-by: Guilherme Gazzo --- .../server/functions/saveRegistrationData.ts | 2 +- .../ee/app/license/server/applyLicense.ts | 18 ++++++++++++++++++ apps/meteor/ee/app/license/server/startup.ts | 18 +----------------- 3 files changed, 20 insertions(+), 18 deletions(-) create mode 100644 apps/meteor/ee/app/license/server/applyLicense.ts diff --git a/apps/meteor/app/cloud/server/functions/saveRegistrationData.ts b/apps/meteor/app/cloud/server/functions/saveRegistrationData.ts index ba1940c54bd1..d6815a7dcc15 100644 --- a/apps/meteor/app/cloud/server/functions/saveRegistrationData.ts +++ b/apps/meteor/app/cloud/server/functions/saveRegistrationData.ts @@ -1,6 +1,6 @@ import { Settings } from '@rocket.chat/models'; -import { applyLicense } from '../../../../ee/app/license/server/startup'; +import { applyLicense } from '../../../../ee/app/license/server/applyLicense'; import { settings } from '../../../settings/server'; import { syncCloudData } from './syncWorkspace/syncCloudData'; diff --git a/apps/meteor/ee/app/license/server/applyLicense.ts b/apps/meteor/ee/app/license/server/applyLicense.ts new file mode 100644 index 000000000000..759d58481abe --- /dev/null +++ b/apps/meteor/ee/app/license/server/applyLicense.ts @@ -0,0 +1,18 @@ +import { License } from '@rocket.chat/license'; + +export const applyLicense = async (license: string, isNewLicense: boolean): Promise => { + const enterpriseLicense = (license ?? '').trim(); + if (!enterpriseLicense) { + return false; + } + + if (enterpriseLicense === License.encryptedLicense) { + return false; + } + + try { + return License.setLicense(enterpriseLicense, isNewLicense); + } catch { + return false; + } +}; diff --git a/apps/meteor/ee/app/license/server/startup.ts b/apps/meteor/ee/app/license/server/startup.ts index 834b88d98544..9c9c546abaa3 100644 --- a/apps/meteor/ee/app/license/server/startup.ts +++ b/apps/meteor/ee/app/license/server/startup.ts @@ -9,6 +9,7 @@ import { syncWorkspace } from '../../../../app/cloud/server/functions/syncWorksp import { settings } from '../../../../app/settings/server'; import { callbacks } from '../../../../lib/callbacks'; import { getAppCount } from './lib/getAppCount'; +import { applyLicense } from './applyLicense'; settings.watch('Site_Url', (value) => { if (value) { @@ -25,23 +26,6 @@ License.onInvalidateLicense(async () => { await Settings.updateValueById('Enterprise_License_Status', 'Invalid'); }); -export const applyLicense = async (license: string, isNewLicense: boolean): Promise => { - const enterpriseLicense = (license ?? '').trim(); - if (!enterpriseLicense) { - return false; - } - - if (enterpriseLicense === License.encryptedLicense) { - return false; - } - - try { - return License.setLicense(enterpriseLicense, isNewLicense); - } catch { - return false; - } -}; - /** * This is a debounced function that will sync the workspace data to the cloud. * it caches the context, waits for a second and then syncs the data. From 8855d026053f961f2f69b218132c37cb0e2a0a8e Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Mon, 27 Nov 2023 18:37:17 -0300 Subject: [PATCH 48/76] chore: change trigger logic (#31088) --- .../SubscriptionCalloutLimits.tsx | 4 +-- .../ee/app/authorization/server/callback.ts | 14 +++++++- ee/packages/license/src/license.spec.ts | 6 ++-- .../license/src/validation/validateLimit.ts | 34 +++++++++++++++++++ 4 files changed, 52 insertions(+), 6 deletions(-) diff --git a/apps/meteor/client/views/admin/subscription/SubscriptionCalloutLimits.tsx b/apps/meteor/client/views/admin/subscription/SubscriptionCalloutLimits.tsx index 3fcaf54cad9a..e408d5e85b7b 100644 --- a/apps/meteor/client/views/admin/subscription/SubscriptionCalloutLimits.tsx +++ b/apps/meteor/client/views/admin/subscription/SubscriptionCalloutLimits.tsx @@ -1,6 +1,6 @@ import { Callout } from '@rocket.chat/fuselage'; import type { LicenseBehavior } from '@rocket.chat/license/src/definition/LicenseBehavior'; -import { validateLimit } from '@rocket.chat/license/src/validation/validateLimit'; +import { validateWarnLimit } from '@rocket.chat/license/src/validation/validateLimit'; import { ExternalLink } from '@rocket.chat/ui-client'; import React from 'react'; import { Trans, useTranslation } from 'react-i18next'; @@ -31,7 +31,7 @@ export const SubscriptionCalloutLimits = () => { const rules = keyLimits .map((key) => { const rule = license.limits[key] - ?.filter((limit) => validateLimit(limit.max, limits[key].value ?? 0, limit.behavior)) + ?.filter((limit) => validateWarnLimit(limit.max, limits[key].value ?? 0, limit.behavior)) .sort((a, b) => b.max - a.max)[0]; if (!rule) { diff --git a/apps/meteor/ee/app/authorization/server/callback.ts b/apps/meteor/ee/app/authorization/server/callback.ts index f0d74e5d96a6..4da07733ab51 100644 --- a/apps/meteor/ee/app/authorization/server/callback.ts +++ b/apps/meteor/ee/app/authorization/server/callback.ts @@ -1,6 +1,8 @@ +import { MeteorError } from '@rocket.chat/core-services'; import { License } from '@rocket.chat/license'; import { callbacks } from '../../../../lib/callbacks'; +import { i18n } from '../../../../server/lib/i18n'; import { validateUserRoles } from './validateUserRoles'; License.onInstall(() => { @@ -15,7 +17,17 @@ License.onInstall(() => { callbacks.add('afterDeactivateUser', () => License.shouldPreventAction('activeUsers'), callbacks.priority.HIGH, 'validateUserStatus'); - callbacks.add('beforeActivateUser', () => License.shouldPreventAction('activeUsers'), callbacks.priority.HIGH, 'validateUserStatus'); + callbacks.add( + 'beforeActivateUser', + async () => { + if (await License.shouldPreventAction('activeUsers')) { + throw new MeteorError('error-license-user-limit-reached', i18n.t('error-license-user-limit-reached')); + } + return undefined; + }, + callbacks.priority.HIGH, + 'validateUserStatus', + ); }); License.onInvalidate(() => { diff --git a/ee/packages/license/src/license.spec.ts b/ee/packages/license/src/license.spec.ts index cbe74bafb4c5..010063673905 100644 --- a/ee/packages/license/src/license.spec.ts +++ b/ee/packages/license/src/license.spec.ts @@ -105,7 +105,7 @@ describe('Validate License Limits', () => { }); }); describe('fair usage behavior', () => { - it('should change the flag to true if the counter is equal or over the limit', async () => { + it('should change the `prevent_action` flag to true if the counter is equal or over the limit', async () => { const licenseManager = await getReadyLicenseManager(); const fairUsageCallback = jest.fn(); @@ -137,7 +137,7 @@ describe('Validate License Limits', () => { fairUsageCallback.mockClear(); licenseManager.setLicenseLimitCounter('activeUsers', () => 10); await expect(licenseManager.shouldPreventAction('activeUsers')).resolves.toBe(true); - expect(fairUsageCallback).toHaveBeenCalledTimes(0); + expect(fairUsageCallback).toHaveBeenCalledTimes(1); expect(preventActionCallback).toHaveBeenCalledTimes(1); licenseManager.setLicenseLimitCounter('activeUsers', () => 11); @@ -148,7 +148,7 @@ describe('Validate License Limits', () => { await expect(licenseManager.shouldPreventAction('activeUsers')).resolves.toBe(true); await expect(licenseManager.shouldPreventAction('activeUsers')).resolves.toBe(true); expect(preventActionCallback).toHaveBeenCalledTimes(4); - expect(fairUsageCallback).toHaveBeenCalledTimes(1); + expect(fairUsageCallback).toHaveBeenCalledTimes(0); }); it('should trigger the toggle event if the counter is under the limit', async () => { const licenseManager = await getReadyLicenseManager(); diff --git a/ee/packages/license/src/validation/validateLimit.ts b/ee/packages/license/src/validation/validateLimit.ts index 5da4334a773a..21649d2e9f5b 100644 --- a/ee/packages/license/src/validation/validateLimit.ts +++ b/ee/packages/license/src/validation/validateLimit.ts @@ -1,5 +1,10 @@ import type { LicenseBehavior } from '../definition/LicenseBehavior'; +/** + * The difference between validateLimit and validateWarnLimit is that the first one + * is used to trigger the client so for start_fair_policy we trigger as soon the limit is reached + * for the visual warning we trigger when the limit is reached + 1 + /** * Validates if the current value is over the limit * @param max The maximum value allowed @@ -11,6 +16,35 @@ import type { LicenseBehavior } from '../definition/LicenseBehavior'; * - false if the limit is not reached */ export function validateLimit(max: number, currentValue: number, behavior: LicenseBehavior, extraCount = 0) { + switch (behavior) { + case 'invalidate_license': + case 'prevent_installation': + case 'disable_modules': + default: + return currentValue > max; + case 'start_fair_policy': + return currentValue >= max; + case 'prevent_action': + /** + * if we are validating the current count the limit should be equal or over the max, if we are validating the future count the limit should be over the max + */ + + return extraCount ? currentValue > max : currentValue >= max; + } +} + +/** + * Validates if the current value is over the limit + * @param max The maximum value allowed + * @param currentValue The current value + * @param behavior The behavior to be applied if the limit is reached + * @param extraCount The extra count to be added to the current value + * @returns + * - true if the limit is reached + * - false if the limit is not reached + */ + +export function validateWarnLimit(max: number, currentValue: number, behavior: LicenseBehavior, extraCount = 0) { switch (behavior) { case 'invalidate_license': case 'prevent_installation': From b03398b0f39679306aa4b93b243f447eafcc167f Mon Sep 17 00:00:00 2001 From: Hugo Costa Date: Mon, 27 Nov 2023 18:45:08 -0300 Subject: [PATCH 49/76] regression: upsells actions on modals and pages (#31084) Co-authored-by: Guilherme Gazzo --- .../GenericUpsellModal/GenericUpsellModal.tsx | 6 ++-- .../hooks/useUpsellActions.ts | 11 +++--- .../modals/EnterpriseDepartmentsModal.tsx | 35 +++++++------------ .../permissions/CustomRoleUpsellModal.tsx | 6 ++-- .../views/marketplace/AppInstallPage.js | 7 +++- .../marketplace/UnlimitedAppsUpsellModal.tsx | 6 ++-- .../components/BannerEnterpriseTrialEnded.tsx | 4 +-- .../hooks/useAppInstallationHandler.tsx | 13 ++++--- .../DeviceManagementAdminRoute.tsx | 8 ++--- .../EngagementDashboardRoute.tsx | 9 ++--- 10 files changed, 50 insertions(+), 55 deletions(-) diff --git a/apps/meteor/client/components/GenericUpsellModal/GenericUpsellModal.tsx b/apps/meteor/client/components/GenericUpsellModal/GenericUpsellModal.tsx index 513b31dd81fa..3d68e3f4b6d3 100644 --- a/apps/meteor/client/components/GenericUpsellModal/GenericUpsellModal.tsx +++ b/apps/meteor/client/components/GenericUpsellModal/GenericUpsellModal.tsx @@ -29,8 +29,8 @@ const GenericUpsellModal = ({ confirmText, icon, description, - onCancel, onClose, + onCancel, onConfirm, annotation, ...props @@ -66,12 +66,12 @@ const GenericUpsellModal = ({ {onCancel && ( )} {onConfirm && ( )} diff --git a/apps/meteor/client/components/GenericUpsellModal/hooks/useUpsellActions.ts b/apps/meteor/client/components/GenericUpsellModal/hooks/useUpsellActions.ts index 082bb3000563..2a51a53b09bf 100644 --- a/apps/meteor/client/components/GenericUpsellModal/hooks/useUpsellActions.ts +++ b/apps/meteor/client/components/GenericUpsellModal/hooks/useUpsellActions.ts @@ -1,13 +1,13 @@ -import { useRouter, useSetModal, useSetting } from '@rocket.chat/ui-contexts'; +import { useSetModal, useSetting } from '@rocket.chat/ui-contexts'; import { useCallback } from 'react'; import { useExternalLink } from '../../../hooks/useExternalLink'; import { useIsEnterprise } from '../../../hooks/useIsEnterprise'; +import { useCheckoutUrl } from '../../../views/admin/subscription/hooks/useCheckoutUrl'; const TALK_TO_SALES_URL = 'https://go.rocket.chat/i/contact-sales'; export const useUpsellActions = (hasLicenseModule = false) => { - const router = useRouter(); const setModal = useSetModal(); const handleOpenLink = useExternalLink(); const cloudWorkspaceHadTrial = useSetting('Cloud_Workspace_Had_Trial'); @@ -15,10 +15,13 @@ export const useUpsellActions = (hasLicenseModule = false) => { const { data } = useIsEnterprise(); const shouldShowUpsell = !data?.isEnterprise || !hasLicenseModule; + const openExternalLink = useExternalLink(); + const manageSubscriptionUrl = useCheckoutUrl()({ target: 'upsell-modal', action: 'upgrade' }); + const handleManageSubscription = useCallback(() => { - router.navigate('/admin/subscription'); + openExternalLink(manageSubscriptionUrl); setModal(null); - }, [router, setModal]); + }, [manageSubscriptionUrl, openExternalLink, setModal]); const handleTalkToSales = useCallback(() => { handleOpenLink(TALK_TO_SALES_URL); diff --git a/apps/meteor/client/components/Omnichannel/modals/EnterpriseDepartmentsModal.tsx b/apps/meteor/client/components/Omnichannel/modals/EnterpriseDepartmentsModal.tsx index 0cab89c23ce1..713dea4a0ed6 100644 --- a/apps/meteor/client/components/Omnichannel/modals/EnterpriseDepartmentsModal.tsx +++ b/apps/meteor/client/components/Omnichannel/modals/EnterpriseDepartmentsModal.tsx @@ -4,14 +4,19 @@ import { useRouter, useTranslation } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React, { useRef } from 'react'; -import { hasPermission } from '../../../../app/authorization/client'; +import { useExternalLink } from '../../../hooks/useExternalLink'; +import { useCheckoutUrl } from '../../../views/admin/subscription/hooks/useCheckoutUrl'; const EnterpriseDepartmentsModal = ({ closeModal }: { closeModal: () => void }): ReactElement => { const t = useTranslation(); const router = useRouter(); const ref = useRef(null); + + const openExternalLink = useExternalLink(); + const manageSubscriptionUrl = useCheckoutUrl()({ target: 'new-departments-page', action: 'upgrade' }); + const goToManageSubscriptionPage = (): void => { - router.navigate('/admin/subscription'); + openExternalLink(manageSubscriptionUrl); closeModal(); }; @@ -20,9 +25,6 @@ const EnterpriseDepartmentsModal = ({ closeModal }: { closeModal: () => void }): closeModal(); }; - const talkToExpertLink = - 'https://www.rocket.chat/sales-contact?utm_source=rocketchat_app&utm_medium=multiple_queues&utm_campaign=in_product_ctas'; - useOutsideClick([ref], onClose); return ( @@ -42,24 +44,13 @@ const EnterpriseDepartmentsModal = ({ closeModal }: { closeModal: () => void }): {t('Premium_Departments_description_upgrade')} - {hasPermission('view-statistics') ? ( - - + + - - - ) : ( - - Talk to your workspace admin about enabling departments. - - - )} + + ); diff --git a/apps/meteor/client/views/admin/permissions/CustomRoleUpsellModal.tsx b/apps/meteor/client/views/admin/permissions/CustomRoleUpsellModal.tsx index 2233abf91aa0..6d03af10c8b4 100644 --- a/apps/meteor/client/views/admin/permissions/CustomRoleUpsellModal.tsx +++ b/apps/meteor/client/views/admin/permissions/CustomRoleUpsellModal.tsx @@ -6,7 +6,7 @@ import { useUpsellActions } from '../../../components/GenericUpsellModal/hooks'; const CustomRoleUpsellModal = ({ onClose }: { onClose: () => void }) => { const t = useTranslation(); - const { cloudWorkspaceHadTrial, handleTalkToSales, handleManageSubscription } = useUpsellActions(); + const { handleManageSubscription } = useUpsellActions(); return ( void }) => { subtitle={t('Custom_roles_upsell_add_custom_roles_workspace')} description={t('Custom_roles_upsell_add_custom_roles_workspace_description')} onClose={onClose} - cancelText={t('Talk_to_an_expert')} - confirmText={cloudWorkspaceHadTrial ? t('Learn_more') : t('Start_a_free_trial')} onConfirm={handleManageSubscription} - onCancel={handleTalkToSales} + onCancel={onClose} /> ); }; diff --git a/apps/meteor/client/views/marketplace/AppInstallPage.js b/apps/meteor/client/views/marketplace/AppInstallPage.js index 774e2435c4e3..f5ebb0f915ae 100644 --- a/apps/meteor/client/views/marketplace/AppInstallPage.js +++ b/apps/meteor/client/views/marketplace/AppInstallPage.js @@ -15,7 +15,9 @@ import { useForm, Controller } from 'react-hook-form'; import { AppClientOrchestratorInstance } from '../../../ee/client/apps/orchestrator'; import Page from '../../components/Page'; import { useAppsReload } from '../../contexts/hooks/useAppsReload'; +import { useExternalLink } from '../../hooks/useExternalLink'; import { useFileInput } from '../../hooks/useFileInput'; +import { useCheckoutUrl } from '../admin/subscription/hooks/useCheckoutUrl'; import AppPermissionsReviewModal from './AppPermissionsReviewModal'; import AppUpdateModal from './AppUpdateModal'; import AppInstallModal from './components/AppInstallModal/AppInstallModal'; @@ -49,6 +51,9 @@ function AppInstallPage() { const appCountQuery = useAppsCountQuery('private'); + const openExternalLink = useExternalLink(); + const manageSubscriptionUrl = useCheckoutUrl()({ target: 'marketplace-app-install', action: 'Enable_unlimited_apps' }); + const { control, setValue, watch } = useForm({ defaultValues: { url: queryUrl || '' } }); const { file, url } = watch(); @@ -169,7 +174,7 @@ function AppInstallPage() { handleClose={cancelAction} handleConfirm={() => uploadFile(appFile, manifest)} handleEnableUnlimitedApps={() => { - router.navigate('/admin/subscription'); + openExternalLink(manageSubscriptionUrl); setModal(null); }} />, diff --git a/apps/meteor/client/views/marketplace/UnlimitedAppsUpsellModal.tsx b/apps/meteor/client/views/marketplace/UnlimitedAppsUpsellModal.tsx index f02271183fa1..33eb6a4960c8 100644 --- a/apps/meteor/client/views/marketplace/UnlimitedAppsUpsellModal.tsx +++ b/apps/meteor/client/views/marketplace/UnlimitedAppsUpsellModal.tsx @@ -6,7 +6,7 @@ import { useUpsellActions } from '../../components/GenericUpsellModal/hooks'; const UnlimitedAppsUpsellModal = ({ onClose }: { onClose: () => void }) => { const t = useTranslation(); - const { handleManageSubscription, handleTalkToSales, cloudWorkspaceHadTrial } = useUpsellActions(); + const { handleManageSubscription, cloudWorkspaceHadTrial } = useUpsellActions(); return ( void }) => { img='images/unlimited-apps-modal.png' subtitle={t('Get_all_apps')} description={!cloudWorkspaceHadTrial ? t('Workspaces_on_community_edition_trial_on') : t('Workspaces_on_community_edition_trial_off')} - confirmText={!cloudWorkspaceHadTrial ? t('Start_free_trial') : t('Learn_more')} - cancelText={t('Talk_to_sales')} onConfirm={handleManageSubscription} - onCancel={handleTalkToSales} + onCancel={onClose} onClose={onClose} /> ); diff --git a/apps/meteor/client/views/marketplace/components/BannerEnterpriseTrialEnded.tsx b/apps/meteor/client/views/marketplace/components/BannerEnterpriseTrialEnded.tsx index c51864f247b8..ca9e1fb480a8 100644 --- a/apps/meteor/client/views/marketplace/components/BannerEnterpriseTrialEnded.tsx +++ b/apps/meteor/client/views/marketplace/components/BannerEnterpriseTrialEnded.tsx @@ -9,9 +9,9 @@ const BannerEnterpriseTrialEnded = (): ReactElement => { const isAdmin = usePermission('manage-apps'); const bannerLink = { - link: '/admin/subscription', + link: '/links/manage-subscription', linkText: t('Upgrade_tab_upgrade_your_plan'), - linkTarget: '_self', + linkTarget: '_blank', }; const cloudWorkspaceHadTrial = useSetting('Cloud_Workspace_Had_Trial') as boolean; diff --git a/apps/meteor/client/views/marketplace/hooks/useAppInstallationHandler.tsx b/apps/meteor/client/views/marketplace/hooks/useAppInstallationHandler.tsx index 6c406e5af250..eca06002ec57 100644 --- a/apps/meteor/client/views/marketplace/hooks/useAppInstallationHandler.tsx +++ b/apps/meteor/client/views/marketplace/hooks/useAppInstallationHandler.tsx @@ -1,8 +1,10 @@ import type { App } from '@rocket.chat/core-typings'; -import { useEndpoint, useRouter, useRouteParameter, useSetModal, useToastMessageDispatch } from '@rocket.chat/ui-contexts'; +import { useEndpoint, useRouteParameter, useSetModal, useToastMessageDispatch } from '@rocket.chat/ui-contexts'; import React, { useCallback } from 'react'; import { AppClientOrchestratorInstance } from '../../../../ee/client/apps/orchestrator'; +import { useExternalLink } from '../../../hooks/useExternalLink'; +import { useCheckoutUrl } from '../../admin/subscription/hooks/useCheckoutUrl'; import IframeModal from '../IframeModal'; import AppInstallModal from '../components/AppInstallModal/AppInstallModal'; import type { Actions } from '../helpers'; @@ -23,7 +25,6 @@ export function useAppInstallationHandler({ app, action, isAppPurchased, onDismi const dispatchToastMessage = useToastMessageDispatch(); const setModal = useSetModal(); - const router = useRouter(); const routeContext = String(useRouteParameter('context')); const context = isMarketplaceRouteContext(routeContext) ? routeContext : 'explore'; @@ -33,6 +34,9 @@ export function useAppInstallationHandler({ app, action, isAppPurchased, onDismi const openIncompatibleModal = useOpenIncompatibleModal(); + const openExternalLink = useExternalLink(); + const manageSubscriptionUrl = useCheckoutUrl()({ target: 'user-page', action: 'buy_more' }); + const closeModal = useCallback(() => { setModal(null); onDismiss(); @@ -109,7 +113,7 @@ export function useAppInstallationHandler({ app, action, isAppPurchased, onDismi handleClose={closeModal} handleConfirm={acquireApp} handleEnableUnlimitedApps={() => { - router.navigate('/admin/subscription'); + openExternalLink(manageSubscriptionUrl); setModal(null); }} />, @@ -127,6 +131,7 @@ export function useAppInstallationHandler({ app, action, isAppPurchased, onDismi notifyAdmins, success, onDismiss, - router, + openExternalLink, + manageSubscriptionUrl, ]); } diff --git a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminRoute.tsx b/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminRoute.tsx index df877db73ba4..83e3b4eac72c 100644 --- a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminRoute.tsx +++ b/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminRoute.tsx @@ -19,7 +19,7 @@ const DeviceManagementAdminRoute = (): ReactElement => { const hasDeviceManagement = useHasLicenseModule('device-management') as boolean; const canViewDeviceManagement = usePermission('view-device-management'); - const { shouldShowUpsell, cloudWorkspaceHadTrial, handleManageSubscription, handleTalkToSales } = useUpsellActions(hasDeviceManagement); + const { shouldShowUpsell, handleManageSubscription } = useUpsellActions(hasDeviceManagement); useEffect(() => { if (shouldShowUpsell) { @@ -29,15 +29,13 @@ const DeviceManagementAdminRoute = (): ReactElement => { img={getURL('images/device-management.png')} subtitle={t('Ensure_secure_workspace_access')} description={t('Manage_which_devices')} - cancelText={t('Talk_to_an_expert')} - confirmText={cloudWorkspaceHadTrial ? t('Learn_more') : t('Start_a_free_trial')} onClose={() => setModal(null)} onConfirm={handleManageSubscription} - onCancel={handleTalkToSales} + onCancel={() => setModal(null)} />, ); } - }, [shouldShowUpsell, router, setModal, t, cloudWorkspaceHadTrial, handleManageSubscription, handleTalkToSales]); + }, [shouldShowUpsell, router, setModal, t, handleManageSubscription]); if (isModalOpen) { return ; diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardRoute.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardRoute.tsx index 33d1acf1d35e..ece57a9e1575 100644 --- a/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardRoute.tsx +++ b/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardRoute.tsx @@ -26,8 +26,7 @@ const EngagementDashboardRoute = (): ReactElement | null => { const hasEngagementDashboard = useHasLicenseModule('engagement-dashboard') as boolean; - const { shouldShowUpsell, cloudWorkspaceHadTrial, handleManageSubscription, handleTalkToSales } = - useUpsellActions(hasEngagementDashboard); + const { shouldShowUpsell, handleManageSubscription } = useUpsellActions(hasEngagementDashboard); useEffect(() => { if (shouldShowUpsell) { @@ -39,9 +38,7 @@ const EngagementDashboardRoute = (): ReactElement | null => { description={t('Enrich_your_workspace')} onClose={() => setModal(null)} onConfirm={handleManageSubscription} - confirmText={cloudWorkspaceHadTrial ? t('Learn_more') : t('Start_a_free_trial')} - onCancel={handleTalkToSales} - cancelText={t('Talk_to_an_expert')} + onCancel={() => setModal(null)} />, ); } @@ -57,7 +54,7 @@ const EngagementDashboardRoute = (): ReactElement | null => { ); } }); - }, [shouldShowUpsell, router, tab, setModal, t, handleManageSubscription, cloudWorkspaceHadTrial, handleTalkToSales]); + }, [shouldShowUpsell, router, tab, setModal, t, handleManageSubscription]); if (isModalOpen) { return ; From 14353e93b804e4522cda2c6985b321d8251068a9 Mon Sep 17 00:00:00 2001 From: Hugo Costa Date: Mon, 27 Nov 2023 18:50:00 -0300 Subject: [PATCH 50/76] regression: remove registration page and related methods and files (#31071) --- .../server/functions/reconnectWorkspace.ts | 17 ---- apps/meteor/app/cloud/server/methods.ts | 18 ---- apps/meteor/client/lib/constants.ts | 1 - .../actions/hooks/useAdministrationItems.tsx | 40 +-------- .../client/views/admin/cloud/CloudRoute.tsx | 17 ---- .../client/views/admin/cloud/CopyStep.tsx | 75 ----------------- .../ManualWorkspaceRegistrationModal.tsx | 42 ---------- .../client/views/admin/cloud/PasteStep.tsx | 83 ------------------- .../views/admin/cloud/RegisterWorkspace.tsx | 70 ---------------- .../components/RegisterWorkspaceCards.tsx | 24 ------ .../components/RegisterWorkspaceMenu.tsx | 57 ------------- .../cloud/modals/ConnectWorkspaceModal.tsx | 67 --------------- apps/meteor/client/views/admin/routes.tsx | 9 -- .../meteor/client/views/admin/sidebarItems.ts | 6 -- .../workspace/VersionCard/VersionCard.tsx | 2 +- .../VersionCard}/hooks/useFeatureBullets.tsx | 0 .../modals/RegisterWorkspaceModal.tsx | 0 .../RegisterWorkspaceSetupModal.tsx | 2 +- .../RegisterWorkspaceSetupStepOneModal.tsx | 0 .../RegisterWorkspaceSetupStepTwoModal.tsx | 0 .../RegisterWorkspaceSetupModal/index.tsx | 0 .../modals/RegisterWorkspaceTokenModal.tsx | 0 .../modals/RegisteredWorkspaceModal.tsx | 0 apps/meteor/package.json | 2 - yarn.lock | 52 ------------ 25 files changed, 4 insertions(+), 580 deletions(-) delete mode 100644 apps/meteor/app/cloud/server/functions/reconnectWorkspace.ts delete mode 100644 apps/meteor/client/views/admin/cloud/CloudRoute.tsx delete mode 100644 apps/meteor/client/views/admin/cloud/CopyStep.tsx delete mode 100644 apps/meteor/client/views/admin/cloud/ManualWorkspaceRegistrationModal.tsx delete mode 100644 apps/meteor/client/views/admin/cloud/PasteStep.tsx delete mode 100644 apps/meteor/client/views/admin/cloud/RegisterWorkspace.tsx delete mode 100644 apps/meteor/client/views/admin/cloud/components/RegisterWorkspaceCards.tsx delete mode 100644 apps/meteor/client/views/admin/cloud/components/RegisterWorkspaceMenu.tsx delete mode 100644 apps/meteor/client/views/admin/cloud/modals/ConnectWorkspaceModal.tsx rename apps/meteor/client/views/admin/{cloud => workspace/VersionCard}/hooks/useFeatureBullets.tsx (100%) rename apps/meteor/client/views/admin/{cloud => workspace/VersionCard}/modals/RegisterWorkspaceModal.tsx (100%) rename apps/meteor/client/views/admin/{cloud => workspace/VersionCard}/modals/RegisterWorkspaceSetupModal/RegisterWorkspaceSetupModal.tsx (96%) rename apps/meteor/client/views/admin/{cloud => workspace/VersionCard}/modals/RegisterWorkspaceSetupModal/RegisterWorkspaceSetupStepOneModal.tsx (100%) rename apps/meteor/client/views/admin/{cloud => workspace/VersionCard}/modals/RegisterWorkspaceSetupModal/RegisterWorkspaceSetupStepTwoModal.tsx (100%) rename apps/meteor/client/views/admin/{cloud => workspace/VersionCard}/modals/RegisterWorkspaceSetupModal/index.tsx (100%) rename apps/meteor/client/views/admin/{cloud => workspace/VersionCard}/modals/RegisterWorkspaceTokenModal.tsx (100%) rename apps/meteor/client/views/admin/{cloud => workspace/VersionCard}/modals/RegisteredWorkspaceModal.tsx (100%) diff --git a/apps/meteor/app/cloud/server/functions/reconnectWorkspace.ts b/apps/meteor/app/cloud/server/functions/reconnectWorkspace.ts deleted file mode 100644 index 7ee02a5e5de4..000000000000 --- a/apps/meteor/app/cloud/server/functions/reconnectWorkspace.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { Settings } from '@rocket.chat/models'; - -import { retrieveRegistrationStatus } from './retrieveRegistrationStatus'; -import { syncWorkspace } from './syncWorkspace'; - -export async function reconnectWorkspace() { - const { workspaceRegistered } = await retrieveRegistrationStatus(); - if (!workspaceRegistered || process.env.TEST_MODE) { - return false; - } - - await Settings.updateValueById('Register_Server', true); - - await syncWorkspace(); - - return true; -} diff --git a/apps/meteor/app/cloud/server/methods.ts b/apps/meteor/app/cloud/server/methods.ts index edb3a078ac14..0e47a8ba8754 100644 --- a/apps/meteor/app/cloud/server/methods.ts +++ b/apps/meteor/app/cloud/server/methods.ts @@ -8,7 +8,6 @@ import { checkUserHasCloudLogin } from './functions/checkUserHasCloudLogin'; import { connectWorkspace } from './functions/connectWorkspace'; import { finishOAuthAuthorization } from './functions/finishOAuthAuthorization'; import { getOAuthAuthorizationUrl } from './functions/getOAuthAuthorizationUrl'; -import { reconnectWorkspace } from './functions/reconnectWorkspace'; import { retrieveRegistrationStatus } from './functions/retrieveRegistrationStatus'; import { startRegisterWorkspace } from './functions/startRegisterWorkspace'; import { syncWorkspace } from './functions/syncWorkspace'; @@ -28,7 +27,6 @@ declare module '@rocket.chat/ui-contexts' { 'cloud:registerWorkspace': () => boolean; 'cloud:syncWorkspace': () => boolean; 'cloud:connectWorkspace': (token: string) => boolean | Error; - 'cloud:reconnectWorkspace': () => boolean; 'cloud:getOAuthAuthorizationUrl': () => string; 'cloud:finishOAuthAuthorization': (code: string, state: string) => boolean; 'cloud:checkUserLoggedIn': () => boolean; @@ -136,22 +134,6 @@ Meteor.methods({ return connectWorkspace(token); }, - async 'cloud:reconnectWorkspace'() { - const uid = Meteor.userId(); - if (!uid) { - throw new Meteor.Error('error-invalid-user', 'Invalid user', { - method: 'cloud:reconnectWorkspace', - }); - } - - if (!(await hasPermissionAsync(uid, 'manage-cloud'))) { - throw new Meteor.Error('error-not-authorized', 'Not authorized', { - method: 'cloud:reconnectWorkspace', - }); - } - - return reconnectWorkspace(); - }, // Currently unused but will link local account to Rocket.Chat Cloud account. async 'cloud:getOAuthAuthorizationUrl'() { const uid = Meteor.userId(); diff --git a/apps/meteor/client/lib/constants.ts b/apps/meteor/client/lib/constants.ts index 7e437deb7fd2..89052eea93ac 100644 --- a/apps/meteor/client/lib/constants.ts +++ b/apps/meteor/client/lib/constants.ts @@ -1,4 +1,3 @@ export const USER_STATUS_TEXT_MAX_LENGTH = 120; export const BIO_TEXT_MAX_LENGTH = 260; export const VIDEOCONF_STACK_MAX_USERS = 6; -export const CLOUD_CONSOLE_URL = 'https://cloud.rocket.chat'; diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useAdministrationItems.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useAdministrationItems.tsx index e794a3308476..5e802c2d1851 100644 --- a/apps/meteor/client/sidebar/header/actions/hooks/useAdministrationItems.tsx +++ b/apps/meteor/client/sidebar/header/actions/hooks/useAdministrationItems.tsx @@ -1,17 +1,6 @@ -import { - useTranslation, - useRoute, - useSetModal, - useRole, - useRouter, - useAtLeastOnePermission, - usePermission, -} from '@rocket.chat/ui-contexts'; -import React from 'react'; +import { useTranslation, useRoute, useRouter, useAtLeastOnePermission, usePermission } from '@rocket.chat/ui-contexts'; import type { GenericMenuItemProps } from '../../../../components/GenericMenu/GenericMenuItem'; -import { useRegistrationStatus } from '../../../../hooks/useRegistrationStatus'; -import RegisterWorkspaceModal from '../../../../views/admin/cloud/modals/RegisterWorkspaceModal'; const ADMIN_PERMISSIONS = [ 'view-statistics', @@ -53,18 +42,7 @@ export const useAdministrationItems = (): GenericMenuItemProps[] => { const shouldShowAdminMenu = useAtLeastOnePermission(ADMIN_PERMISSIONS); - const isAdmin = useRole('admin'); - const setModal = useSetModal(); - - const { isRegistered } = useRegistrationStatus(); - - const handleRegisterWorkspaceClick = (): void => { - const handleModalClose = (): void => setModal(null); - setModal(); - }; - const adminRoute = useRoute('admin-index'); - const cloudRoute = useRoute('cloud'); const omnichannel = usePermission('view-livechat-manager'); @@ -75,18 +53,6 @@ export const useAdministrationItems = (): GenericMenuItemProps[] => { onClick: () => router.navigate('/omnichannel/current'), }; - const adminItem: GenericMenuItemProps = { - id: 'registration', - content: isRegistered ? t('Registration') : t('Register'), - icon: 'cloud-plus', - onClick: () => { - if (isRegistered) { - cloudRoute.push({ context: '/' }); - return; - } - handleRegisterWorkspaceClick(); - }, - }; const workspaceItem: GenericMenuItemProps = { id: 'workspace', content: t('Workspace'), @@ -96,7 +62,5 @@ export const useAdministrationItems = (): GenericMenuItemProps[] => { }, }; - return [shouldShowAdminMenu && workspaceItem, isAdmin && adminItem, omnichannel && omnichannelItem].filter( - Boolean, - ) as GenericMenuItemProps[]; + return [shouldShowAdminMenu && workspaceItem, omnichannel && omnichannelItem].filter(Boolean) as GenericMenuItemProps[]; }; diff --git a/apps/meteor/client/views/admin/cloud/CloudRoute.tsx b/apps/meteor/client/views/admin/cloud/CloudRoute.tsx deleted file mode 100644 index 89bf5f1df772..000000000000 --- a/apps/meteor/client/views/admin/cloud/CloudRoute.tsx +++ /dev/null @@ -1,17 +0,0 @@ -import { usePermission } from '@rocket.chat/ui-contexts'; -import React from 'react'; - -import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; -import RegisterWorkspace from './RegisterWorkspace'; - -const CloudRoute = () => { - const canManageCloud = usePermission('manage-cloud'); - - if (!canManageCloud) { - return ; - } - - return ; -}; - -export default CloudRoute; diff --git a/apps/meteor/client/views/admin/cloud/CopyStep.tsx b/apps/meteor/client/views/admin/cloud/CopyStep.tsx deleted file mode 100644 index 326ce781fc5c..000000000000 --- a/apps/meteor/client/views/admin/cloud/CopyStep.tsx +++ /dev/null @@ -1,75 +0,0 @@ -import { Box, Button, Scrollable, Modal } from '@rocket.chat/fuselage'; -import { useToastMessageDispatch, useMethod, useTranslation } from '@rocket.chat/ui-contexts'; -import Clipboard from 'clipboard'; -import type { FC } from 'react'; -import React, { useEffect, useState, useRef } from 'react'; - -import MarkdownText from '../../../components/MarkdownText'; -import { CLOUD_CONSOLE_URL } from '../../../lib/constants'; - -type CopyStepProps = { - onNextButtonClick: () => void; -}; - -const CopyStep: FC = ({ onNextButtonClick }) => { - const t = useTranslation(); - const dispatchToastMessage = useToastMessageDispatch(); - - const [clientKey, setClientKey] = useState(''); - - const getWorkspaceRegisterData = useMethod('cloud:getWorkspaceRegisterData'); - - useEffect(() => { - const loadWorkspaceRegisterData = async (): Promise => { - const clientKey = await getWorkspaceRegisterData(); - setClientKey(clientKey); - }; - - loadWorkspaceRegisterData(); - }, [getWorkspaceRegisterData]); - - const copyRef = useRef(null); - - useEffect(() => { - if (!copyRef.current) { - return; - } - - const clipboard = new Clipboard(copyRef.current); - clipboard.on('success', () => { - dispatchToastMessage({ type: 'success', message: t('Copied') }); - }); - - return (): void => { - clipboard.destroy(); - }; - }, [dispatchToastMessage, t]); - - return ( - <> - - -

{t('Cloud_register_offline_helper')}

- - - - - {clientKey} - - - - - - - ); -}; - -export default CopyStep; diff --git a/apps/meteor/client/views/admin/cloud/ManualWorkspaceRegistrationModal.tsx b/apps/meteor/client/views/admin/cloud/ManualWorkspaceRegistrationModal.tsx deleted file mode 100644 index 44e5e9f436a9..000000000000 --- a/apps/meteor/client/views/admin/cloud/ManualWorkspaceRegistrationModal.tsx +++ /dev/null @@ -1,42 +0,0 @@ -import { Modal } from '@rocket.chat/fuselage'; -import { useTranslation } from '@rocket.chat/ui-contexts'; -import React, { useState } from 'react'; - -import CopyStep from './CopyStep'; -import PasteStep from './PasteStep'; - -const Steps = { - COPY: 'copy', - PASTE: 'paste', -}; - -type ManualWorkspaceRegistrationModalProps = { - onClose: () => void; -}; - -const ManualWorkspaceRegistrationModal = ({ onClose, ...props }: ManualWorkspaceRegistrationModalProps) => { - const t = useTranslation(); - - const [step, setStep] = useState(Steps.COPY); - - const handleNextButtonClick = () => { - setStep(Steps.PASTE); - }; - - const handleBackButtonClick = () => { - setStep(Steps.COPY); - }; - - return ( - - - {t('Cloud_Register_manually')} - - - {(step === Steps.COPY && ) || - (step === Steps.PASTE && )} - - ); -}; - -export default ManualWorkspaceRegistrationModal; diff --git a/apps/meteor/client/views/admin/cloud/PasteStep.tsx b/apps/meteor/client/views/admin/cloud/PasteStep.tsx deleted file mode 100644 index da77aa6efb48..000000000000 --- a/apps/meteor/client/views/admin/cloud/PasteStep.tsx +++ /dev/null @@ -1,83 +0,0 @@ -import { Box, Button, Scrollable, Modal } from '@rocket.chat/fuselage'; -import { useToastMessageDispatch, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts'; -import type { ChangeEvent, FC } from 'react'; -import React, { useState } from 'react'; - -import { useInvalidateLicense } from '../../../hooks/useLicense'; - -type PasteStepProps = { - onBackButtonClick: () => void; - onFinish: () => void; -}; - -const PasteStep: FC = ({ onBackButtonClick, onFinish }) => { - const t = useTranslation(); - const dispatchToastMessage = useToastMessageDispatch(); - const invalidateLicenseQuery = useInvalidateLicense(); - - const [isLoading, setLoading] = useState(false); - const [cloudKey, setCloudKey] = useState(''); - - const handleCloudKeyChange = (e: ChangeEvent): void => { - setCloudKey(e.currentTarget.value); - }; - - const registerManually = useEndpoint('POST', '/v1/cloud.manualRegister'); - - const handleFinishButtonClick = async (): Promise => { - setLoading(true); - - try { - await registerManually({ cloudBlob: cloudKey }); - invalidateLicenseQuery(100); - dispatchToastMessage({ type: 'success', message: t('Cloud_register_success') }); - } catch (error) { - dispatchToastMessage({ type: 'error', message: t('Cloud_register_error') }); - } finally { - setLoading(false); - onFinish?.(); - } - }; - - return ( - <> - - -

{t('Cloud_register_offline_finish_helper')}

- - - - - - - - - - - - - - - ); -}; - -export default PasteStep; diff --git a/apps/meteor/client/views/admin/cloud/RegisterWorkspace.tsx b/apps/meteor/client/views/admin/cloud/RegisterWorkspace.tsx deleted file mode 100644 index 9a12d45deb7c..000000000000 --- a/apps/meteor/client/views/admin/cloud/RegisterWorkspace.tsx +++ /dev/null @@ -1,70 +0,0 @@ -import { Box, Tag } from '@rocket.chat/fuselage'; -import { useSetModal, useTranslation } from '@rocket.chat/ui-contexts'; -import React from 'react'; - -import Page from '../../../components/Page'; -import { useRegistrationStatus } from '../../../hooks/useRegistrationStatus'; -import ManualWorkspaceRegistrationModal from './ManualWorkspaceRegistrationModal'; -import RegisterWorkspaceCards from './components/RegisterWorkspaceCards'; -import RegisterWorkspaceMenu from './components/RegisterWorkspaceMenu'; -import ConnectWorkspaceModal from './modals/ConnectWorkspaceModal'; -import RegisterWorkspaceModal from './modals/RegisterWorkspaceModal'; - -const RegisterWorkspace = () => { - const t = useTranslation(); - const setModal = useSetModal(); - - const { isRegistered, isLoading, isError, refetch } = useRegistrationStatus(); - - if (isLoading || isError) { - return null; - } - - const handleRegisterWorkspaceClick = (): void => { - const handleModalClose = (): void => { - setModal(null); - refetch(); - }; - if (isRegistered) { - setModal(); - } else setModal(); - }; - - const handleManualWorkspaceRegistrationButton = (): void => { - const handleModalClose = (): void => { - setModal(null); - refetch(); - }; - setModal(); - }; - - return ( - - - - - - - - {!isRegistered && {t('RegisterWorkspace_NotRegistered_Title')}} - {isRegistered && {t('Workspace_registered')}} - - - - - {!isRegistered && t('RegisterWorkspace_NotRegistered_Subtitle')} - {isRegistered && t('RegisterWorkspace_Registered_Description')} - - - - - - ); -}; - -export default RegisterWorkspace; diff --git a/apps/meteor/client/views/admin/cloud/components/RegisterWorkspaceCards.tsx b/apps/meteor/client/views/admin/cloud/components/RegisterWorkspaceCards.tsx deleted file mode 100644 index c3cd878ad081..000000000000 --- a/apps/meteor/client/views/admin/cloud/components/RegisterWorkspaceCards.tsx +++ /dev/null @@ -1,24 +0,0 @@ -import { Grid } from '@rocket.chat/fuselage'; -import { Card, CardBody, CardTitle } from '@rocket.chat/ui-client'; -import React from 'react'; - -import useFeatureBullets from '../hooks/useFeatureBullets'; - -const RegisterWorkspaceCards = () => { - const bulletFeatures = useFeatureBullets(); - - return ( - - {bulletFeatures.map((card) => ( - - - {card.title} - {card.description} - - - ))} - - ); -}; - -export default RegisterWorkspaceCards; diff --git a/apps/meteor/client/views/admin/cloud/components/RegisterWorkspaceMenu.tsx b/apps/meteor/client/views/admin/cloud/components/RegisterWorkspaceMenu.tsx deleted file mode 100644 index 9163e5e30af5..000000000000 --- a/apps/meteor/client/views/admin/cloud/components/RegisterWorkspaceMenu.tsx +++ /dev/null @@ -1,57 +0,0 @@ -import { Button, ButtonGroup } from '@rocket.chat/fuselage'; -import { useSetModal, useTranslation } from '@rocket.chat/ui-contexts'; -import React from 'react'; - -import { useExternalLink } from '../../../../hooks/useExternalLink'; -import { CLOUD_CONSOLE_URL } from '../../../../lib/constants'; -import RegisteredWorkspaceModal from '../modals/RegisteredWorkspaceModal'; - -type RegisterWorkspaceMenuProps = { - isWorkspaceRegistered: boolean | string; - onClick: () => void; - onClickOfflineRegistration: () => void; - onStatusChange?: () => void; -}; - -const RegisterWorkspaceMenu = ({ - isWorkspaceRegistered, - onClick, - onClickOfflineRegistration, - onStatusChange, -}: RegisterWorkspaceMenuProps) => { - const t = useTranslation(); - const setModal = useSetModal(); - - const handleManageButton = () => { - const handleModalClose = (): void => setModal(null); - setModal(); - }; - - const handleLinkClick = useExternalLink(); - - return ( - - {isWorkspaceRegistered && ( - <> - - - - )} - - {!isWorkspaceRegistered && ( - <> - - - - )} - - ); -}; - -export default RegisterWorkspaceMenu; diff --git a/apps/meteor/client/views/admin/cloud/modals/ConnectWorkspaceModal.tsx b/apps/meteor/client/views/admin/cloud/modals/ConnectWorkspaceModal.tsx deleted file mode 100644 index 929e6f93ab35..000000000000 --- a/apps/meteor/client/views/admin/cloud/modals/ConnectWorkspaceModal.tsx +++ /dev/null @@ -1,67 +0,0 @@ -import { Box, Button, ButtonGroup, Modal } from '@rocket.chat/fuselage'; -import { useMethod, useSetModal, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts'; -import React from 'react'; - -import useFeatureBullets from '../hooks/useFeatureBullets'; - -type ConnectWorkspaceModalProps = { - onClose: () => void; - onStatusChange?: () => void; -}; - -const ConnectWorkspaceModal = ({ onClose, onStatusChange, ...props }: ConnectWorkspaceModalProps) => { - const t = useTranslation(); - const setModal = useSetModal(); - const bulletFeatures = useFeatureBullets(); - const dispatchToastMessage = useToastMessageDispatch(); - - const connectWorkspace = useMethod('cloud:reconnectWorkspace'); - - const handleConnectWorkspace = async () => { - try { - await connectWorkspace(); - setModal(null); - dispatchToastMessage({ type: 'success', message: t('Connected') }); - } catch (error: unknown) { - console.error(error); - dispatchToastMessage({ type: 'error', message: error }); - } finally { - onStatusChange && onStatusChange(); - } - }; - - return ( - - - - {t('Workspace_not_connected')} - - - - - - {`${t('RegisterWorkspace_NotConnected_Subtitle')}:`} -
    - {bulletFeatures.map((features) => ( -
  • - {features.title} - - {features.description} - -
    • - ))} -
- - - - - - - - - ); -}; - -export default ConnectWorkspaceModal; diff --git a/apps/meteor/client/views/admin/routes.tsx b/apps/meteor/client/views/admin/routes.tsx index 0f852aa44f6b..afb40b1686c8 100644 --- a/apps/meteor/client/views/admin/routes.tsx +++ b/apps/meteor/client/views/admin/routes.tsx @@ -68,10 +68,6 @@ declare module '@rocket.chat/ui-contexts' { pathname: '/admin/invites'; pattern: '/admin/invites'; }; - 'cloud': { - pathname: `/admin/registration${`/${string}` | ''}`; - pattern: '/admin/registration/:page?'; - }; 'admin-view-logs': { pathname: '/admin/reports'; pattern: '/admin/reports'; @@ -197,11 +193,6 @@ registerAdminRoute('/invites', { component: lazy(() => import('./invites/InvitesRoute')), }); -registerAdminRoute('/registration/:page?', { - name: 'cloud', - component: lazy(() => import('./cloud/CloudRoute')), -}); - registerAdminRoute('/reports', { name: 'admin-view-logs', component: lazy(() => import('./viewLogs/ViewLogsRoute')), diff --git a/apps/meteor/client/views/admin/sidebarItems.ts b/apps/meteor/client/views/admin/sidebarItems.ts index c893b819962a..013206d9e9a8 100644 --- a/apps/meteor/client/views/admin/sidebarItems.ts +++ b/apps/meteor/client/views/admin/sidebarItems.ts @@ -19,12 +19,6 @@ export const { icon: 'card', permissionGranted: (): boolean => hasPermission('manage-cloud'), }, - { - href: '/admin/registration', - i18nLabel: 'Registration', - icon: 'cloud-plus', - permissionGranted: (): boolean => hasPermission('manage-cloud'), - }, { href: '/admin/engagement/users', i18nLabel: 'Engagement', diff --git a/apps/meteor/client/views/admin/workspace/VersionCard/VersionCard.tsx b/apps/meteor/client/views/admin/workspace/VersionCard/VersionCard.tsx index 3af049a25809..12dc3b76e162 100644 --- a/apps/meteor/client/views/admin/workspace/VersionCard/VersionCard.tsx +++ b/apps/meteor/client/views/admin/workspace/VersionCard/VersionCard.tsx @@ -14,13 +14,13 @@ import { useFormatDate } from '../../../../hooks/useFormatDate'; import { useLicense, useLicenseName } from '../../../../hooks/useLicense'; import { useRegistrationStatus } from '../../../../hooks/useRegistrationStatus'; import { isOverLicenseLimits } from '../../../../lib/utils/isOverLicenseLimits'; -import RegisterWorkspaceModal from '../../cloud/modals/RegisterWorkspaceModal'; import VersionCardActionButton from './components/VersionCardActionButton'; import type { VersionActionItem } from './components/VersionCardActionItem'; import VersionCardActionItemList from './components/VersionCardActionItemList'; import { VersionCardSkeleton } from './components/VersionCardSkeleton'; import { VersionTag } from './components/VersionTag'; import type { VersionStatus } from './components/VersionTag'; +import RegisterWorkspaceModal from './modals/RegisterWorkspaceModal'; const SUPPORT_EXTERNAL_LINK = 'https://go.rocket.chat/i/version-support'; const RELEASES_EXTERNAL_LINK = 'https://go.rocket.chat/i/update-product'; diff --git a/apps/meteor/client/views/admin/cloud/hooks/useFeatureBullets.tsx b/apps/meteor/client/views/admin/workspace/VersionCard/hooks/useFeatureBullets.tsx similarity index 100% rename from apps/meteor/client/views/admin/cloud/hooks/useFeatureBullets.tsx rename to apps/meteor/client/views/admin/workspace/VersionCard/hooks/useFeatureBullets.tsx diff --git a/apps/meteor/client/views/admin/cloud/modals/RegisterWorkspaceModal.tsx b/apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisterWorkspaceModal.tsx similarity index 100% rename from apps/meteor/client/views/admin/cloud/modals/RegisterWorkspaceModal.tsx rename to apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisterWorkspaceModal.tsx diff --git a/apps/meteor/client/views/admin/cloud/modals/RegisterWorkspaceSetupModal/RegisterWorkspaceSetupModal.tsx b/apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisterWorkspaceSetupModal/RegisterWorkspaceSetupModal.tsx similarity index 96% rename from apps/meteor/client/views/admin/cloud/modals/RegisterWorkspaceSetupModal/RegisterWorkspaceSetupModal.tsx rename to apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisterWorkspaceSetupModal/RegisterWorkspaceSetupModal.tsx index a38fbe17ae6f..880ab99fa27e 100644 --- a/apps/meteor/client/views/admin/cloud/modals/RegisterWorkspaceSetupModal/RegisterWorkspaceSetupModal.tsx +++ b/apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisterWorkspaceSetupModal/RegisterWorkspaceSetupModal.tsx @@ -1,7 +1,7 @@ import { useSetModal } from '@rocket.chat/ui-contexts'; import React, { useEffect, useState } from 'react'; -import { validateEmail } from '../../../../../../lib/emailValidator'; +import { validateEmail } from '../../../../../../../lib/emailValidator'; import RegisteredWorkspaceModal from '../RegisteredWorkspaceModal'; import RegisterWorkspaceSetupStepOneModal from './RegisterWorkspaceSetupStepOneModal'; import RegisterWorkspaceSetupStepTwoModal from './RegisterWorkspaceSetupStepTwoModal'; diff --git a/apps/meteor/client/views/admin/cloud/modals/RegisterWorkspaceSetupModal/RegisterWorkspaceSetupStepOneModal.tsx b/apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisterWorkspaceSetupModal/RegisterWorkspaceSetupStepOneModal.tsx similarity index 100% rename from apps/meteor/client/views/admin/cloud/modals/RegisterWorkspaceSetupModal/RegisterWorkspaceSetupStepOneModal.tsx rename to apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisterWorkspaceSetupModal/RegisterWorkspaceSetupStepOneModal.tsx diff --git a/apps/meteor/client/views/admin/cloud/modals/RegisterWorkspaceSetupModal/RegisterWorkspaceSetupStepTwoModal.tsx b/apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisterWorkspaceSetupModal/RegisterWorkspaceSetupStepTwoModal.tsx similarity index 100% rename from apps/meteor/client/views/admin/cloud/modals/RegisterWorkspaceSetupModal/RegisterWorkspaceSetupStepTwoModal.tsx rename to apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisterWorkspaceSetupModal/RegisterWorkspaceSetupStepTwoModal.tsx diff --git a/apps/meteor/client/views/admin/cloud/modals/RegisterWorkspaceSetupModal/index.tsx b/apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisterWorkspaceSetupModal/index.tsx similarity index 100% rename from apps/meteor/client/views/admin/cloud/modals/RegisterWorkspaceSetupModal/index.tsx rename to apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisterWorkspaceSetupModal/index.tsx diff --git a/apps/meteor/client/views/admin/cloud/modals/RegisterWorkspaceTokenModal.tsx b/apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisterWorkspaceTokenModal.tsx similarity index 100% rename from apps/meteor/client/views/admin/cloud/modals/RegisterWorkspaceTokenModal.tsx rename to apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisterWorkspaceTokenModal.tsx diff --git a/apps/meteor/client/views/admin/cloud/modals/RegisteredWorkspaceModal.tsx b/apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisteredWorkspaceModal.tsx similarity index 100% rename from apps/meteor/client/views/admin/cloud/modals/RegisteredWorkspaceModal.tsx rename to apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisteredWorkspaceModal.tsx diff --git a/apps/meteor/package.json b/apps/meteor/package.json index f1cf61a4da4f..1289d1d2505f 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -101,7 +101,6 @@ "@types/chai-datetime": "0.0.38", "@types/chai-dom": "1.11.2", "@types/chai-spies": "~1.0.5", - "@types/clipboard": "^2.0.7", "@types/codemirror": "^5.60.12", "@types/cookie-parser": "^1.4.5", "@types/cors": "^2.8.15", @@ -306,7 +305,6 @@ "chalk": "^4.0.0", "change-case": "^4.1.2", "chart.js": "^3.8.0", - "clipboard": "^2.0.11", "codemirror": "^5.65.15", "colorette": "^2.0.20", "colors": "^1.4.0", diff --git a/yarn.lock b/yarn.lock index b8a59a03ed48..65dab4a0a1ad 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8659,7 +8659,6 @@ __metadata: "@types/chai-datetime": 0.0.38 "@types/chai-dom": 1.11.2 "@types/chai-spies": ~1.0.5 - "@types/clipboard": ^2.0.7 "@types/codemirror": ^5.60.12 "@types/cookie": ^0.5.3 "@types/cookie-parser": ^1.4.5 @@ -8751,7 +8750,6 @@ __metadata: chalk: ^4.0.0 change-case: ^4.1.2 chart.js: ^3.8.0 - clipboard: ^2.0.11 codemirror: ^5.65.15 colorette: ^2.0.20 colors: ^1.4.0 @@ -12114,15 +12112,6 @@ __metadata: languageName: node linkType: hard -"@types/clipboard@npm:^2.0.7": - version: 2.0.7 - resolution: "@types/clipboard@npm:2.0.7" - dependencies: - clipboard: "*" - checksum: 9ab127a8a60a72fab044ae634da4d766fdf0242c06feca5c1b22f128e7cbebafc7dc89fce5e9e4251c5a93f35a608f71d0e9d251d9591d03f667703801c8a914 - languageName: node - linkType: hard - "@types/codemirror@npm:^5.60.12": version: 5.60.12 resolution: "@types/codemirror@npm:5.60.12" @@ -17182,17 +17171,6 @@ __metadata: languageName: node linkType: hard -"clipboard@npm:*, clipboard@npm:^2.0.11": - version: 2.0.11 - resolution: "clipboard@npm:2.0.11" - dependencies: - good-listener: ^1.2.2 - select: ^1.1.2 - tiny-emitter: ^2.0.0 - checksum: 413055a6038e43898e0e895216b58ed54fbf386f091cb00188875ef35b186cefbd258acdf4cb4b0ac87cbc00de936f41b45dde9fe1fd1a57f7babb28363b8748 - languageName: node - linkType: hard - "clipboardy@npm:1.2.3": version: 1.2.3 resolution: "clipboardy@npm:1.2.3" @@ -19199,13 +19177,6 @@ __metadata: languageName: node linkType: hard -"delegate@npm:^3.1.2": - version: 3.2.0 - resolution: "delegate@npm:3.2.0" - checksum: d943058fe05897228b158cbd1bab05164df28c8f54127873231d6b03b0a5acc1b3ee1f98ac70ccc9b79cd84aa47118a7de111fee2923753491583905069da27d - languageName: node - linkType: hard - "delegates@npm:^1.0.0": version: 1.0.0 resolution: "delegates@npm:1.0.0" @@ -22951,15 +22922,6 @@ __metadata: languageName: node linkType: hard -"good-listener@npm:^1.2.2": - version: 1.2.2 - resolution: "good-listener@npm:1.2.2" - dependencies: - delegate: ^3.1.2 - checksum: f39fb82c4e41524f56104cfd2d7aef1a88e72f3f75139115fbdf98cc7d844e0c1b39218b2e83438c6188727bf904ed78c7f0f2feff67b32833bc3af7f0202b33 - languageName: node - linkType: hard - "google-auth-library@npm:^8.0.1, google-auth-library@npm:^8.0.2": version: 8.7.0 resolution: "google-auth-library@npm:8.7.0" @@ -34954,13 +34916,6 @@ __metadata: languageName: node linkType: hard -"select@npm:^1.1.2": - version: 1.1.2 - resolution: "select@npm:1.1.2" - checksum: 4346151e94f226ea6131e44e68e6d837f3fdee64831b756dd657cc0b02f4cb5107f867cb34a1d1216ab7737d0bf0645d44546afb030bbd8d64e891f5e4c4814e - languageName: node - linkType: hard - "selfsigned@npm:^2.1.1": version: 2.1.1 resolution: "selfsigned@npm:2.1.1" @@ -37416,13 +37371,6 @@ __metadata: languageName: node linkType: hard -"tiny-emitter@npm:^2.0.0": - version: 2.1.0 - resolution: "tiny-emitter@npm:2.1.0" - checksum: fbcfb5145751a0e3b109507a828eb6d6d4501352ab7bb33eccef46e22e9d9ad3953158870a6966a59e57ab7c3f9cfac7cab8521db4de6a5e757012f4677df2dd - languageName: node - linkType: hard - "tiny-events@npm:^1.0.1": version: 1.0.1 resolution: "tiny-events@npm:1.0.1" From 952ec1621ad677cf2f648fbe19aa99416ae6909b Mon Sep 17 00:00:00 2001 From: Tiago Evangelista Pinto Date: Mon, 27 Nov 2023 20:09:50 -0300 Subject: [PATCH 51/76] regression: Registration Wizard UI fixes (#31072) --- .../root/MainLayout/RegisterUsername.tsx | 7 ++++++- .../contexts/SetupWizardContext.tsx | 2 ++ .../providers/SetupWizardProvider.tsx | 21 ++++++++++++++----- .../views/setupWizard/steps/AdminInfoStep.tsx | 8 ++++++- .../setupWizard/steps/RegisterServerStep.tsx | 7 +++++-- apps/meteor/ee/app/license/server/startup.ts | 2 +- apps/meteor/package.json | 2 +- .../rocketchat-i18n/i18n/af.i18n.json | 2 +- .../rocketchat-i18n/i18n/ar.i18n.json | 4 ++-- .../rocketchat-i18n/i18n/ca.i18n.json | 4 ++-- .../rocketchat-i18n/i18n/de.i18n.json | 4 ++-- .../rocketchat-i18n/i18n/en.i18n.json | 2 +- .../rocketchat-i18n/i18n/es.i18n.json | 4 ++-- .../rocketchat-i18n/i18n/fi.i18n.json | 4 ++-- .../rocketchat-i18n/i18n/fr.i18n.json | 4 ++-- .../rocketchat-i18n/i18n/hu.i18n.json | 4 ++-- .../rocketchat-i18n/i18n/ja.i18n.json | 4 ++-- .../rocketchat-i18n/i18n/nl.i18n.json | 4 ++-- .../rocketchat-i18n/i18n/pl.i18n.json | 4 ++-- .../rocketchat-i18n/i18n/pt-BR.i18n.json | 4 ++-- .../rocketchat-i18n/i18n/ru.i18n.json | 4 ++-- .../rocketchat-i18n/i18n/sv.i18n.json | 4 ++-- .../rocketchat-i18n/i18n/zh-TW.i18n.json | 4 ++-- yarn.lock | 10 ++++----- 24 files changed, 73 insertions(+), 46 deletions(-) diff --git a/apps/meteor/client/views/root/MainLayout/RegisterUsername.tsx b/apps/meteor/client/views/root/MainLayout/RegisterUsername.tsx index fec006cec966..8bb7c2af81a4 100644 --- a/apps/meteor/client/views/root/MainLayout/RegisterUsername.tsx +++ b/apps/meteor/client/views/root/MainLayout/RegisterUsername.tsx @@ -18,6 +18,7 @@ import { useQuery, useMutation } from '@tanstack/react-query'; import React, { useEffect } from 'react'; import { useForm } from 'react-hook-form'; +import MarkdownText from '../../../components/MarkdownText'; import { queryClient } from '../../../lib/queryClient'; type RegisterUsernamePayload = { @@ -106,7 +107,11 @@ const RegisterUsername = () => { - {errors.username && {errors.username.message}} + {errors.username && ( + + + + )} )} diff --git a/apps/meteor/client/views/setupWizard/contexts/SetupWizardContext.tsx b/apps/meteor/client/views/setupWizard/contexts/SetupWizardContext.tsx index 873677df4f95..6ce73e16a3f2 100644 --- a/apps/meteor/client/views/setupWizard/contexts/SetupWizardContext.tsx +++ b/apps/meteor/client/views/setupWizard/contexts/SetupWizardContext.tsx @@ -29,6 +29,7 @@ type SetupWizarContextValue = { goToStep: (step: number) => void; registerAdminUser: (user: Omit['onSubmit']>[0], 'keepPosted'>) => Promise; registerServer: (params: { email: string; resend?: boolean }) => Promise; + saveAgreementData: (agreement: boolean) => Promise; saveWorkspaceData: () => Promise; saveOrganizationData: (data: SetupWizardData['organizationData']) => Promise; completeSetupWizard: () => Promise; @@ -59,6 +60,7 @@ export const SetupWizardContext = createContext({ goToStep: () => undefined, registerAdminUser: async () => undefined, registerServer: async () => undefined, + saveAgreementData: async () => undefined, saveWorkspaceData: async () => undefined, saveOrganizationData: async () => undefined, validateEmail: () => true, diff --git a/apps/meteor/client/views/setupWizard/providers/SetupWizardProvider.tsx b/apps/meteor/client/views/setupWizard/providers/SetupWizardProvider.tsx index e728151ee989..3cfbde7e1eda 100644 --- a/apps/meteor/client/views/setupWizard/providers/SetupWizardProvider.tsx +++ b/apps/meteor/client/views/setupWizard/providers/SetupWizardProvider.tsx @@ -96,6 +96,18 @@ const SetupWizardProvider = ({ children }: { children: ReactElement }): ReactEle [registerUser, setForceLogin, defineUsername, dispatchSettings, loginWithPassword, dispatchToastMessage, t], ); + const saveAgreementData = useCallback( + async (agreement): Promise => { + await dispatchSettings([ + { + _id: 'Cloud_Service_Agree_PrivacyTerms', + value: agreement, + }, + ]); + }, + [dispatchSettings], + ); + const saveWorkspaceData = useCallback(async (): Promise => { const { serverData: { updates, agreement }, @@ -114,12 +126,9 @@ const SetupWizardProvider = ({ children }: { children: ReactElement }): ReactEle _id: 'Allow_Marketing_Emails', value: updates, }, - { - _id: 'Cloud_Service_Agree_PrivacyTerms', - value: agreement, - }, ]); - }, [dispatchSettings, setupWizardData]); + await saveAgreementData(agreement); + }, [dispatchSettings, saveAgreementData, setupWizardData]); const saveOrganizationData = useCallback( async (organizationData: ContextType['setupWizardData']['organizationData']): Promise => { @@ -184,6 +193,7 @@ const SetupWizardProvider = ({ children }: { children: ReactElement }): ReactEle registerAdminUser, validateEmail: _validateEmail, registerServer, + saveAgreementData, saveWorkspaceData, saveOrganizationData, completeSetupWizard, @@ -201,6 +211,7 @@ const SetupWizardProvider = ({ children }: { children: ReactElement }): ReactEle registerAdminUser, _validateEmail, registerServer, + saveAgreementData, saveWorkspaceData, saveOrganizationData, completeSetupWizard, diff --git a/apps/meteor/client/views/setupWizard/steps/AdminInfoStep.tsx b/apps/meteor/client/views/setupWizard/steps/AdminInfoStep.tsx index 68e47fd39774..b2640d0a4a14 100644 --- a/apps/meteor/client/views/setupWizard/steps/AdminInfoStep.tsx +++ b/apps/meteor/client/views/setupWizard/steps/AdminInfoStep.tsx @@ -1,10 +1,16 @@ import { AdminInfoPage } from '@rocket.chat/onboarding-ui'; +import { escapeRegExp } from '@rocket.chat/string-helpers'; import { useSetting, useTranslation } from '@rocket.chat/ui-contexts'; import type { ReactElement, ComponentProps } from 'react'; import React from 'react'; import { useSetupWizardContext } from '../contexts/SetupWizardContext'; +const toRegExp = (username: string): RegExp => new RegExp(`^${escapeRegExp(username).trim()}$`, 'i'); +const usernameBlackList = ['all', 'here', 'admin'].map(toRegExp); +const hasBlockedName = (username: string): boolean => + !!usernameBlackList.length && usernameBlackList.some((restrictedUsername) => restrictedUsername.test(escapeRegExp(username).trim())); + const AdminInfoStep = (): ReactElement => { const t = useTranslation(); const regexpForUsernameValidation = useSetting('UTF8_User_Names_Validation'); @@ -14,7 +20,7 @@ const AdminInfoStep = (): ReactElement => { // TODO: check if username exists const validateUsername = (username: string): boolean | string => { - if (!usernameRegExp.test(username)) { + if (!usernameRegExp.test(username) || hasBlockedName(username)) { return t('Invalid_username'); } diff --git a/apps/meteor/client/views/setupWizard/steps/RegisterServerStep.tsx b/apps/meteor/client/views/setupWizard/steps/RegisterServerStep.tsx index 09747e360dbe..e6831658c786 100644 --- a/apps/meteor/client/views/setupWizard/steps/RegisterServerStep.tsx +++ b/apps/meteor/client/views/setupWizard/steps/RegisterServerStep.tsx @@ -15,7 +15,8 @@ const SERVER_OPTIONS = { const RegisterServerStep = (): ReactElement => { const t = useTranslation(); - const { currentStep, goToNextStep, setSetupWizardData, registerServer, maxSteps, completeSetupWizard } = useSetupWizardContext(); + const { currentStep, goToNextStep, setSetupWizardData, registerServer, maxSteps, completeSetupWizard, saveAgreementData } = + useSetupWizardContext(); const [serverOption, setServerOption] = useState(SERVER_OPTIONS.REGISTERED); const invalidateLicenseQuery = useInvalidateLicense(); @@ -61,7 +62,8 @@ const RegisterServerStep = (): ReactElement => { }, ); - const handleConfirmOffline: ComponentProps['onSubmit'] = ({ token }) => { + const handleConfirmOffline: ComponentProps['onSubmit'] = async ({ token, agreement }) => { + await saveAgreementData(agreement); mutate(token); }; @@ -71,6 +73,7 @@ const RegisterServerStep = (): ReactElement => { termsHref='https://rocket.chat/terms' policyHref='https://rocket.chat/privacy' clientKey={clientKey || ''} + onCopySecurityCode={(): void => dispatchToastMessage({ type: 'success', message: t('Copied') })} onBackButtonClick={(): void => setServerOption(SERVER_OPTIONS.REGISTERED)} onSubmit={handleConfirmOffline} /> diff --git a/apps/meteor/ee/app/license/server/startup.ts b/apps/meteor/ee/app/license/server/startup.ts index 9c9c546abaa3..1078fb092dfe 100644 --- a/apps/meteor/ee/app/license/server/startup.ts +++ b/apps/meteor/ee/app/license/server/startup.ts @@ -8,8 +8,8 @@ import moment from 'moment'; import { syncWorkspace } from '../../../../app/cloud/server/functions/syncWorkspace'; import { settings } from '../../../../app/settings/server'; import { callbacks } from '../../../../lib/callbacks'; -import { getAppCount } from './lib/getAppCount'; import { applyLicense } from './applyLicense'; +import { getAppCount } from './lib/getAppCount'; settings.watch('Site_Url', (value) => { if (value) { diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 1289d1d2505f..fdc1ea141503 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -257,7 +257,7 @@ "@rocket.chat/models": "workspace:^", "@rocket.chat/mp3-encoder": "0.24.0", "@rocket.chat/omnichannel-services": "workspace:^", - "@rocket.chat/onboarding-ui": "~0.33.1", + "@rocket.chat/onboarding-ui": "~0.33.2", "@rocket.chat/password-policies": "workspace:^", "@rocket.chat/pdf-worker": "workspace:^", "@rocket.chat/poplib": "workspace:^", diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/af.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/af.i18n.json index c4f8b74a0e51..fb73b5c09450 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/af.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/af.i18n.json @@ -2757,4 +2757,4 @@ "registration.component.form.invalidConfirmPass": "Die wagwoord bevestiging pas nie by die wagwoord nie", "registration.component.form.confirmPassword": "Bevestig jou wagwoord", "registration.component.form.sendConfirmationEmail": "Stuur bevestiging e-pos" -} \ No newline at end of file +} diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ar.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ar.i18n.json index d3603a98aa3e..d6ca0531a43f 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/ar.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/ar.i18n.json @@ -1645,7 +1645,7 @@ "error-avatar-invalid-url": "عنوان URL:‏ {{url}} للصورة الرمزية غير صالح", "error-avatar-url-handling": "خطأ أثناء ضبط إعداد الصورة الرمزية من عنوان URL‏ ({{url}}) لـ {{username}}", "error-business-hours-are-closed": "ساعات العمل مغلقة", - "error-blocked-username": "{{field}} محظور ولا يمكن استخدامه!", + "error-blocked-username": "**{{field}}** محظور ولا يمكن استخدامه!", "error-canned-response-not-found": "لم يتم العثور على ردود مسجلة", "error-cannot-delete-app-user": "غير مسموح بحذف مستخدم التطبيق، قم بإلغاء تثبيت التطبيق المقابل لإزالته.", "error-cant-invite-for-direct-room": "لا يمكن دعوة المستخدم في الغرفة المباشرة", @@ -4808,4 +4808,4 @@ "RegisterWorkspace_Features_Omnichannel_Title": "قناة متعددة الاتجاهات", "RegisterWorkspace_Setup_Label": "البريد الإلكتروني لحساب السحابة", "cloud.RegisterWorkspace_Setup_Terms_Privacy": "أوافق على <1>البنود والشروط و<3>سياسة الخصوصية" -} \ No newline at end of file +} diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ca.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ca.i18n.json index 8c82d5cc56b7..06e87d381009 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/ca.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/ca.i18n.json @@ -1635,7 +1635,7 @@ "error-avatar-invalid-url": "URL de l'avatar no vàlid: {{url}}", "error-avatar-url-handling": "Error durant la configuració d'avatar d'usuari des de l'adreça URL ({{url}}) per a l'usuari {{username}}", "error-business-hours-are-closed": "L'horari comercial està tancat", - "error-blocked-username": "{{field}} està bloquejat i no es pot utilitzar.", + "error-blocked-username": "**{{field}}** està bloquejat i no es pot utilitzar.", "error-canned-response-not-found": "Resposta predefinida no trobada", "error-cannot-delete-app-user": "No es permet esborrar l'usuari de l'aplicació, desinstal l'aplicació corresponent per eliminar-la.", "error-cant-invite-for-direct-room": "No es pot convidar a l'usuari a sales directes", @@ -4688,4 +4688,4 @@ "registration.component.form.sendConfirmationEmail": "Envia correu-e de confirmació", "RegisterWorkspace_Features_Marketplace_Title": "Mercat", "RegisterWorkspace_Features_Omnichannel_Title": "LiveChat" -} \ No newline at end of file +} diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/de.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/de.i18n.json index 45c48e596596..2072a0f05464 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/de.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/de.i18n.json @@ -1844,7 +1844,7 @@ "error-avatar-invalid-url": "Ungültige Avatar-URL: {{url}}", "error-avatar-url-handling": "Fehler beim Übernehmen des Avatars- von URL ({{url}}) für {{username}}", "error-business-hours-are-closed": "Geschäftszeiten sind geschlossen", - "error-blocked-username": "{{field}} ist blockiert und kann nicht verwendet werden!", + "error-blocked-username": "**{{field}}** ist blockiert und kann nicht verwendet werden!", "error-canned-response-not-found": "Vorformulierte Antwort nicht gefunden", "error-cannot-delete-app-user": "Das Löschen von App-Benutzern ist nicht erlaubt, deinstallieren Sie die entsprechende App, um sie zu entfernen.", "error-cant-add-federated-users": "Es können keine Verbund-Benutzer zu einem Nicht-Verbundraum hinzugefügt werden", @@ -5419,4 +5419,4 @@ "RegisterWorkspace_Connection_Error": "Beim Verbinden ist ein Fehler aufgetreten", "cloud.RegisterWorkspace_Setup_Terms_Privacy": "Ich bin mit den Nutzungsvereinbarung und den Datenschutzbestimmungen einverstanden", "Uninstall_grandfathered_app": "{{appName}} deinstallieren?" -} \ No newline at end of file +} diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json index 9f829456e0cd..6e84aec4ab7c 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json @@ -1949,7 +1949,7 @@ "error-business-hours-are-closed": "Business Hours are closed", "error-business-hour-finish-time-before-start-time": "Finish time must be after start time", "error-business-hour-finish-time-equals-start-time": "Start and Finish time cannot be the same", - "error-blocked-username": "{{field}} is blocked and can't be used!", + "error-blocked-username": "**{{field}}** is blocked and can't be used!", "error-canned-response-not-found": "Canned Response Not Found", "error-cannot-delete-app-user": "Deleting app user is not allowed, uninstall the corresponding app to remove it.", "error-cant-add-federated-users": "Can't add federated users to a non-federated room", diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/es.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/es.i18n.json index d77b268b93f4..6418ccdd0a06 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/es.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/es.i18n.json @@ -1633,7 +1633,7 @@ "error-avatar-invalid-url": "URL de avatar no válida: {{url}}", "error-avatar-url-handling": "Error al gestionar el ajuste de avatar desde una dirección URL ({{url}}) para {{username}}", "error-business-hours-are-closed": "El horario comercial ha finalizado", - "error-blocked-username": "{{field}} está bloqueado y no se puede usar.", + "error-blocked-username": "**{{field}}** está bloqueado y no se puede usar.", "error-canned-response-not-found": "Respuesta predefinida no encontrada", "error-cannot-delete-app-user": "No se permite eliminar el usuario de la aplicación; desinstale la aplicación correspondiente para que se elimine.", "error-cant-invite-for-direct-room": "No se puede invitar al usuario a salas directas", @@ -4764,4 +4764,4 @@ "RegisterWorkspace_Features_Omnichannel_Title": "Omnichannel", "RegisterWorkspace_Setup_Label": "Cuenta de correo electrónico en la nube", "cloud.RegisterWorkspace_Setup_Terms_Privacy": "Acepto los <1>términos y condiciones y la <3>política de privacidad" -} \ No newline at end of file +} diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/fi.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/fi.i18n.json index 1065283f064e..c006e364aaef 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/fi.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/fi.i18n.json @@ -1861,7 +1861,7 @@ "error-avatar-invalid-url": "Virheellinen avatarin URL-osoite: {{url}}", "error-avatar-url-handling": "Virhe käsiteltäessä avatar-asetusta URL-osoitteesta ({{url}}) käyttäjälle {{username}}", "error-business-hours-are-closed": "Aukioloaika on suljettu", - "error-blocked-username": "{{field}} on estetty eikä sitä voi käyttää!", + "error-blocked-username": "**{{field}}** on estetty eikä sitä voi käyttää!", "error-canned-response-not-found": "Valmista vastausta ei löydy", "error-cannot-delete-app-user": "Sovelluskäyttäjän poistaminen ei ole sallittua. Poista käyttäjä poistamalla kyseinen sovellus.", "error-cant-add-federated-users": "Liittoutuneita käyttäjiä ei voi lisätä organisaation sisäiseen huoneeseen", @@ -5630,4 +5630,4 @@ "Uninstall_grandfathered_app": "Poistetaanko {{appName}}?", "App_will_lose_grandfathered_status": "**Tämä {{context}}sovellus menettää aikaisemmin käytetössä olleen sovelluksen tilansa.** \n \nYhteisöversion työtiloissa voi olla käytössä enintään {{limit}} {{context}} sovellusta. aikaisemmin Aikaisemmin käytössä olleet sovellukset lasketaan mukaan rajoitukseen, mutta rajoitusta ei sovelleta niihin.", "Theme_Appearence": "Teeman ulkoasu" -} \ No newline at end of file +} diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/fr.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/fr.i18n.json index 2f3d924c5e0f..2ddd8ed54d11 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/fr.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/fr.i18n.json @@ -1648,7 +1648,7 @@ "error-avatar-invalid-url": "URL d'avatar non valide : {{url}}", "error-avatar-url-handling": "Erreur lors du traitement du paramètre d'avatar à partir d'une URL ({{url}}) pour {{username}}", "error-business-hours-are-closed": "Les heures d'ouverture sont fermées", - "error-blocked-username": "{{field}} est bloqué et ne peut pas être utilisé !", + "error-blocked-username": "**{{field}}** est bloqué et ne peut pas être utilisé !", "error-canned-response-not-found": "Réponse standardisée introuvable", "error-cannot-delete-app-user": "La suppression de l'utilisateur de l'application n'est pas autorisée, désinstallez l'application correspondante pour le supprimer.", "error-cant-invite-for-direct-room": "Impossible d'inviter l'utilisateur dans les salons directs", @@ -4808,4 +4808,4 @@ "RegisterWorkspace_Features_Omnichannel_Title": "Omnicanal", "RegisterWorkspace_Setup_Label": "E-mail du compte cloud", "cloud.RegisterWorkspace_Setup_Terms_Privacy": "J'accepte les <1>Conditions d'utilisation et la <3>Politique de confidentialité" -} \ No newline at end of file +} diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/hu.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/hu.i18n.json index 3ecd99a4e6c4..57413e32ea93 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/hu.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/hu.i18n.json @@ -1812,7 +1812,7 @@ "error-avatar-invalid-url": "Érvénytelen profilkép URL: {{url}}", "error-avatar-url-handling": "Hiba történt {{username}} {{url}} URL-éről érkező profilkép-beállításának kezelésekor", "error-business-hours-are-closed": "A munkaidő véget ért", - "error-blocked-username": "A(z) {{field}} tiltva van és nem használható!", + "error-blocked-username": "A(z) **{{field}}** tiltva van és nem használható!", "error-canned-response-not-found": "A sablonválasz nem található", "error-cannot-delete-app-user": "Az alkalmazás felhasználójának törlése nem engedélyezett, távolítsa el a megfelelő alkalmazást a felhasználó eltávolításához.", "error-cant-add-federated-users": "Nem lehet föderált felhasználókat hozzáadni egy nem föderált szobához", @@ -5327,4 +5327,4 @@ "Join_your_team": "Csatlakozás csapathoz", "Create_an_account": "Fiók létrehozása", "RegisterWorkspace_Features_Marketplace_Title": "Piactér" -} \ No newline at end of file +} diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ja.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ja.i18n.json index 5b8c68f4d3b2..d7ead75bdd58 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/ja.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/ja.i18n.json @@ -1630,7 +1630,7 @@ "error-avatar-invalid-url": "無効なアバターURL：{{url}}", "error-avatar-url-handling": "{{username}}のURL（{{url}}）からアバター設定を処理中にエラーが発生しました", "error-business-hours-are-closed": "営業時間は閉じられています", - "error-blocked-username": "{{field}}がブロックされており、使用できません！", + "error-blocked-username": "**{{field}}**がブロックされており、使用できません！", "error-canned-response-not-found": "返信定型文が見つかりません", "error-cannot-delete-app-user": "アプリユーザーの削除は許可されていません。対応するアプリをアンインストールして削除してください。", "error-cant-invite-for-direct-room": "ユーザーをダイレクトルームに招待できません", @@ -4762,4 +4762,4 @@ "RegisterWorkspace_Features_Omnichannel_Title": "オムニチャネル", "RegisterWorkspace_Setup_Label": "クラウドアカウントメール", "cloud.RegisterWorkspace_Setup_Terms_Privacy": "<1>使用と<3>プライバシーポリシーに同意します" -} \ No newline at end of file +} diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/nl.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/nl.i18n.json index 3af1970a8b59..a1af1ab57981 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/nl.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/nl.i18n.json @@ -1643,7 +1643,7 @@ "error-avatar-invalid-url": "Ongeldige avatar-URL: {{url}}", "error-avatar-url-handling": "Fout bij het afhandelen van avatar-instellingen vanaf een URL ({{url}}) voor {{username}}", "error-business-hours-are-closed": "De openingstijden zijn gesloten", - "error-blocked-username": "{{field}} is geblokkeerd en kan niet worden gebruikt!", + "error-blocked-username": "**{{field}}** is geblokkeerd en kan niet worden gebruikt!", "error-canned-response-not-found": "Standaardantwoord niet gevonden", "error-cannot-delete-app-user": "Het verwijderen van de app-gebruiker is niet toegestaan, verwijder de bijhorende app om deze te verwijderen.", "error-cant-invite-for-direct-room": "Kan gebruiker niet uitnodigen in directe kamers", @@ -4796,4 +4796,4 @@ "RegisterWorkspace_Features_Omnichannel_Title": "Omnichannel", "RegisterWorkspace_Setup_Label": "E-mailadres van cloudaccount", "cloud.RegisterWorkspace_Setup_Terms_Privacy": "Ik ga akkoord met de <1>Algemene voorwaarden en <3>Privacybeleid" -} \ No newline at end of file +} diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/pl.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/pl.i18n.json index f1350cbad455..7ee4ca550dbd 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/pl.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/pl.i18n.json @@ -1783,7 +1783,7 @@ "error-avatar-invalid-url": "Nieprawidłowy awatar URL: {{url}}", "error-avatar-url-handling": "Błąd podczas przenoszenia ustawienia awatara z URL ({{url}}) do użytkownika {{username}}", "error-business-hours-are-closed": "Godziny pracy są zamknięte", - "error-blocked-username": "{{field}} jest zablokowane i nie może być użyte!", + "error-blocked-username": "**{{field}}** jest zablokowane i nie może być użyte!", "error-canned-response-not-found": "Predefiniowana odpowiedź nie odnaleziona", "error-cannot-delete-app-user": "Usuwanie użytkownika aplikacyjnego jest niedozwolone, odinstaluj odpowiednią aplikację aby móc go usunąć.", "error-cant-add-federated-users": "Nie można dodać użytkowników federacyjnych do pokoju niefederacyjnego", @@ -5262,4 +5262,4 @@ "RegisterWorkspace_Setup_Label": "E-mail konta w chmurze", "RegisterWorkspace_Syncing_Complete": "Synchronizacja zakończona", "cloud.RegisterWorkspace_Setup_Terms_Privacy": "Zgadzam się z <1>zasadami i warunkami i <3>Polityką prywatności." -} \ No newline at end of file +} diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/pt-BR.i18n.json index 57b9fe9f4306..7f3fe43326d3 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/pt-BR.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/pt-BR.i18n.json @@ -1686,7 +1686,7 @@ "error-avatar-invalid-url": "URL inválido de avatar: {{url}}", "error-avatar-url-handling": "Erro durante o manuseio configuração avatar a partir de uma URL ({{url}}) para {{username}}", "error-business-hours-are-closed": "Horário de expediente fechado", - "error-blocked-username": "{{field}} está bloqueado e não pode ser usado!", + "error-blocked-username": "**{{field}}** está bloqueado e não pode ser usado!", "error-canned-response-not-found": "Resposta modelo não encontrada", "error-cannot-delete-app-user": "Excluir um usuário de aplicativo não é permitido, desinstale o app correspondente para removê-lo.", "error-cant-invite-for-direct-room": "Não é possível convidar usuários para salas diretas", @@ -4900,4 +4900,4 @@ "RegisterWorkspace_Features_Omnichannel_Title": "Omnichannel", "RegisterWorkspace_Setup_Label": "E-mail da conta da nuvem", "cloud.RegisterWorkspace_Setup_Terms_Privacy": "Eu concordo com os <1>Termos e condições e a <3>Política de privacidade" -} \ No newline at end of file +} diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ru.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ru.i18n.json index 3c665654e89b..6e2fdd4f81a0 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/ru.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/ru.i18n.json @@ -1775,7 +1775,7 @@ "error-avatar-invalid-url": "Неверный URL аватара: {{url}}", "error-avatar-url-handling": "Ошибка установки аватара из URL ({{url}}) для {{username}}", "error-business-hours-are-closed": "Рабочие часы окончены", - "error-blocked-username": "{{field}} запрещен к использованию!", + "error-blocked-username": "**{{field}}** запрещен к использованию!", "error-canned-response-not-found": "Заготовленный ответ не найден", "error-cannot-delete-app-user": "Удаление пользователя приложения не разрешено, удалите соответствующее приложение, чтобы удалить его.", "error-cant-add-federated-users": "Невозможно добавить федеративных пользователей в нефедеративный чат", @@ -5005,4 +5005,4 @@ "RegisterWorkspace_Setup_Label": "Адрес электронной почты учетной записи в облаке", "cloud.RegisterWorkspace_Setup_Terms_Privacy": "Я принимаю <1>Положения и условия и <3>Политику конфиденциальности", "Theme_Appearence": "Внешний вид" -} \ No newline at end of file +} diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/sv.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/sv.i18n.json index ce6007c4df8e..16dce6f118e3 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/sv.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/sv.i18n.json @@ -1862,7 +1862,7 @@ "error-avatar-invalid-url": "Ogiltig avatar-URL: {{url}}", "error-avatar-url-handling": "Fel vid hantering av avatarinställning från en URL ({{url}}) för {{username}}", "error-business-hours-are-closed": "Kontorstiden är slut", - "error-blocked-username": "{{field}} är låst och kan inte användas.", + "error-blocked-username": "**{{field}}** är låst och kan inte användas.", "error-canned-response-not-found": "Standardsvaret hittades inte", "error-cannot-delete-app-user": "Det är inte tillåtet att ta bort appanvändaren. Avinstallera den motsvarande appen om du vill ta bort användaren.", "error-cant-add-federated-users": "Kan inte lägga till samordnade användare i ett icke federerat rum", @@ -5634,4 +5634,4 @@ "Uninstall_grandfathered_app": "Avinstallera {{appName}}?", "App_will_lose_grandfathered_status": "**Denna {{context}}-app kommer att förlora sin status som gammal app.** \n \nArbetsytorna i Community Edition kan ha upp till {{limit}} __kontext__-appar aktiverade. Gamla appar inkluderas i gränsen, men gränsen tillämpas inte på dem.", "Theme_Appearence": "Utseende för tema" -} \ No newline at end of file +} diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/zh-TW.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/zh-TW.i18n.json index c3c9c4558fae..491727c2b669 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/zh-TW.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/zh-TW.i18n.json @@ -1623,7 +1623,7 @@ "error-avatar-invalid-url": "無效的大頭貼網址：{{url}}", "error-avatar-url-handling": "錯誤從{{username}}一個 URL（{{url}}）辦理大頭貼設定", "error-business-hours-are-closed": "營業時間已關閉", - "error-blocked-username": "{{field}} 被封鎖且無法使用！", + "error-blocked-username": "**{{field}}** 被封鎖且無法使用！", "error-canned-response-not-found": "找不到罐頭訊息", "error-cannot-delete-app-user": "禁止刪除應用程式使用者，請反安裝相關應用程式來移除它。", "error-cant-invite-for-direct-room": "無法邀請使用者進入私訊", @@ -4512,4 +4512,4 @@ "RegisterWorkspace_Features_Omnichannel_Title": "Omnichannel", "RegisterWorkspace_Setup_Label": "雲端帳戶電子郵件", "cloud.RegisterWorkspace_Setup_Terms_Privacy": "我同意<1>條款及條件和<3>隱私權政策" -} \ No newline at end of file +} diff --git a/yarn.lock b/yarn.lock index 65dab4a0a1ad..eca07824cf6f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8612,7 +8612,7 @@ __metadata: "@rocket.chat/models": "workspace:^" "@rocket.chat/mp3-encoder": 0.24.0 "@rocket.chat/omnichannel-services": "workspace:^" - "@rocket.chat/onboarding-ui": ~0.33.1 + "@rocket.chat/onboarding-ui": ~0.33.2 "@rocket.chat/password-policies": "workspace:^" "@rocket.chat/pdf-worker": "workspace:^" "@rocket.chat/poplib": "workspace:^" @@ -9056,9 +9056,9 @@ __metadata: languageName: unknown linkType: soft -"@rocket.chat/onboarding-ui@npm:~0.33.1": - version: 0.33.1 - resolution: "@rocket.chat/onboarding-ui@npm:0.33.1" +"@rocket.chat/onboarding-ui@npm:~0.33.2": + version: 0.33.2 + resolution: "@rocket.chat/onboarding-ui@npm:0.33.2" dependencies: i18next: ~21.6.16 react-hook-form: ~7.27.1 @@ -9073,7 +9073,7 @@ __metadata: react: 17.0.2 react-dom: 17.0.2 react-i18next: ~11.15.4 - checksum: 48be4af0c4d6ca4f4746d21cc76d0a0087ff4b768e578a18e62bee3736b1b4860aa9ff1a73b3b4c3590149ce9ea7cf8d7fcfe964d37000a8a71766b08a4bcdce + checksum: abbfde9f8ac5655b9dbd30872aabe585f2814d58c1c66d672b4aaf3ef3f69d0e31e626924bab19b052d242a0abdb9c7a0d3ff907a7f21742ec15a6dc367951af languageName: node linkType: hard From 24be62584552cf1ba590c819416781af94d34f1d Mon Sep 17 00:00:00 2001 From: rocketchat-github-ci Date: Mon, 27 Nov 2023 23:16:10 +0000 Subject: [PATCH 52/76] Release 6.5.0-rc.14 [no ci] --- .changeset/bump-patch-1701126964872.md | 5 ++++ .changeset/pre.json | 1 + apps/meteor/.docker/Dockerfile.rhel | 2 +- apps/meteor/CHANGELOG.md | 26 +++++++++++++++++++ apps/meteor/app/utils/rocketchat.info | 2 +- apps/meteor/ee/server/services/CHANGELOG.md | 10 +++++++ apps/meteor/ee/server/services/package.json | 2 +- apps/meteor/package.json | 2 +- ee/apps/account-service/CHANGELOG.md | 10 +++++++ ee/apps/account-service/package.json | 2 +- ee/apps/authorization-service/CHANGELOG.md | 10 +++++++ ee/apps/authorization-service/package.json | 2 +- ee/apps/ddp-streamer/CHANGELOG.md | 12 +++++++++ ee/apps/ddp-streamer/package.json | 2 +- ee/apps/omnichannel-transcript/CHANGELOG.md | 11 ++++++++ ee/apps/omnichannel-transcript/package.json | 2 +- ee/apps/presence-service/CHANGELOG.md | 10 +++++++ ee/apps/presence-service/package.json | 2 +- ee/apps/queue-worker/CHANGELOG.md | 10 +++++++ ee/apps/queue-worker/package.json | 2 +- ee/apps/stream-hub-service/CHANGELOG.md | 9 +++++++ ee/apps/stream-hub-service/package.json | 2 +- ee/packages/api-client/CHANGELOG.md | 7 +++++ ee/packages/api-client/package.json | 2 +- ee/packages/ddp-client/CHANGELOG.md | 7 +++++ ee/packages/ddp-client/package.json | 2 +- ee/packages/license/CHANGELOG.md | 6 +++++ ee/packages/license/package.json | 2 +- ee/packages/omnichannel-services/CHANGELOG.md | 11 ++++++++ ee/packages/omnichannel-services/package.json | 2 +- ee/packages/pdf-worker/CHANGELOG.md | 6 +++++ ee/packages/pdf-worker/package.json | 2 +- ee/packages/presence/CHANGELOG.md | 8 ++++++ ee/packages/presence/package.json | 2 +- package.json | 2 +- packages/core-services/CHANGELOG.md | 8 ++++++ packages/core-services/package.json | 2 +- packages/core-typings/CHANGELOG.md | 2 ++ packages/core-typings/package.json | 2 +- packages/cron/CHANGELOG.md | 7 +++++ packages/cron/package.json | 2 +- packages/fuselage-ui-kit/CHANGELOG.md | 8 ++++++ packages/fuselage-ui-kit/package.json | 6 ++--- packages/gazzodown/CHANGELOG.md | 8 ++++++ packages/gazzodown/package.json | 8 +++--- packages/instance-status/CHANGELOG.md | 6 +++++ packages/instance-status/package.json | 2 +- packages/livechat/CHANGELOG.md | 6 +++++ packages/livechat/package.json | 2 +- packages/model-typings/CHANGELOG.md | 6 +++++ packages/model-typings/package.json | 2 +- packages/models/CHANGELOG.md | 6 +++++ packages/models/package.json | 2 +- packages/rest-typings/CHANGELOG.md | 7 +++++ packages/rest-typings/package.json | 2 +- packages/ui-client/CHANGELOG.md | 6 +++++ packages/ui-client/package.json | 4 +-- packages/ui-contexts/CHANGELOG.md | 8 ++++++ packages/ui-contexts/package.json | 2 +- packages/ui-video-conf/CHANGELOG.md | 6 +++++ packages/ui-video-conf/package.json | 4 +-- packages/uikit-playground/CHANGELOG.md | 7 +++++ packages/uikit-playground/package.json | 2 +- packages/web-ui-registration/CHANGELOG.md | 6 +++++ packages/web-ui-registration/package.json | 4 +-- yarn.lock | 16 ++++++------ 66 files changed, 305 insertions(+), 49 deletions(-) create mode 100644 .changeset/bump-patch-1701126964872.md diff --git a/.changeset/bump-patch-1701126964872.md b/.changeset/bump-patch-1701126964872.md new file mode 100644 index 000000000000..e1eaa7980afb --- /dev/null +++ b/.changeset/bump-patch-1701126964872.md @@ -0,0 +1,5 @@ +--- +'@rocket.chat/meteor': patch +--- + +Bump @rocket.chat/meteor version. diff --git a/.changeset/pre.json b/.changeset/pre.json index ed40ceee399c..0464637bd391 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -73,6 +73,7 @@ "bump-patch-1700789984107", "bump-patch-1700801891621", "bump-patch-1701008644667", + "bump-patch-1701126964872", "cool-rockets-talk", "cool-zoos-move", "cuddly-ties-run", diff --git a/apps/meteor/.docker/Dockerfile.rhel b/apps/meteor/.docker/Dockerfile.rhel index 686c6e35d45b..ff06c70c83ba 100644 --- a/apps/meteor/.docker/Dockerfile.rhel +++ b/apps/meteor/.docker/Dockerfile.rhel @@ -1,6 +1,6 @@ FROM registry.access.redhat.com/ubi8/nodejs-12 -ENV RC_VERSION 6.5.0-rc.13 +ENV RC_VERSION 6.5.0-rc.14 MAINTAINER buildmaster@rocket.chat diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md index 816527adb037..9ef797b5f86d 100644 --- a/apps/meteor/CHANGELOG.md +++ b/apps/meteor/CHANGELOG.md @@ -1,5 +1,31 @@ # @rocket.chat/meteor +## 6.5.0-rc.14 + +### Patch Changes + +- Bump @rocket.chat/meteor version. + - @rocket.chat/core-typings@6.5.0-rc.14 + - @rocket.chat/rest-typings@6.5.0-rc.14 + - @rocket.chat/api-client@0.1.18-rc.7 + - @rocket.chat/license@0.1.0-rc.14 + - @rocket.chat/omnichannel-services@0.1.0-rc.14 + - @rocket.chat/pdf-worker@0.0.24-rc.7 + - @rocket.chat/presence@0.1.0-rc.14 + - @rocket.chat/core-services@0.3.0-rc.14 + - @rocket.chat/cron@0.0.20-rc.7 + - @rocket.chat/gazzodown@3.0.0-rc.14 + - @rocket.chat/model-typings@0.2.0-rc.14 + - @rocket.chat/ui-contexts@3.0.0-rc.14 + - @rocket.chat/server-cloud-communication@0.0.1 + - @rocket.chat/fuselage-ui-kit@3.0.0-rc.14 + - @rocket.chat/models@0.0.24-rc.7 + - @rocket.chat/ui-theming@0.1.1-rc.0 + - @rocket.chat/ui-client@3.0.0-rc.14 + - @rocket.chat/ui-video-conf@3.0.0-rc.14 + - @rocket.chat/web-ui-registration@3.0.0-rc.13 + - @rocket.chat/instance-status@0.0.24-rc.7 + ## 6.5.0-rc.13 ### Patch Changes diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info index 08e2f3a6a5b9..cf07b51cb9c5 100644 --- a/apps/meteor/app/utils/rocketchat.info +++ b/apps/meteor/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "6.5.0-rc.13" + "version": "6.5.0-rc.14" } diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md index 6b7be8c7efb7..d2e72605d8c9 100644 --- a/apps/meteor/ee/server/services/CHANGELOG.md +++ b/apps/meteor/ee/server/services/CHANGELOG.md @@ -1,5 +1,15 @@ # rocketchat-services +## 1.1.18-rc.7 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.14 +- @rocket.chat/rest-typings@6.5.0-rc.14 +- @rocket.chat/core-services@0.3.0-rc.14 +- @rocket.chat/model-typings@0.2.0-rc.14 +- @rocket.chat/models@0.0.24-rc.7 + ## 1.1.18-rc.6 ### Patch Changes diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json index 998c4ca39216..e74b84282917 100644 --- a/apps/meteor/ee/server/services/package.json +++ b/apps/meteor/ee/server/services/package.json @@ -1,7 +1,7 @@ { "name": "rocketchat-services", "private": true, - "version": "1.1.18-rc.6", + "version": "1.1.18-rc.7", "description": "Rocket.Chat Authorization service", "main": "index.js", "scripts": { diff --git a/apps/meteor/package.json b/apps/meteor/package.json index fdc1ea141503..59a11bfa0bc5 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/meteor", "description": "The Ultimate Open Source WebChat Platform", - "version": "6.5.0-rc.13", + "version": "6.5.0-rc.14", "private": true, "author": { "name": "Rocket.Chat", diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md index f239f1898b17..22e55ccf412b 100644 --- a/ee/apps/account-service/CHANGELOG.md +++ b/ee/apps/account-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/account-service +## 0.3.0-rc.14 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.14 +- @rocket.chat/rest-typings@6.5.0-rc.14 +- @rocket.chat/core-services@0.3.0-rc.14 +- @rocket.chat/model-typings@0.2.0-rc.14 +- @rocket.chat/models@0.0.24-rc.7 + ## 0.3.0-rc.13 ### Patch Changes diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json index 503baab54c52..f447abf91149 100644 --- a/ee/apps/account-service/package.json +++ b/ee/apps/account-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/account-service", "private": true, - "version": "0.3.0-rc.13", + "version": "0.3.0-rc.14", "description": "Rocket.Chat Account service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/authorization-service/CHANGELOG.md b/ee/apps/authorization-service/CHANGELOG.md index 37e1fcddabd0..ecd58d99b995 100644 --- a/ee/apps/authorization-service/CHANGELOG.md +++ b/ee/apps/authorization-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/authorization-service +## 0.3.0-rc.14 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.14 +- @rocket.chat/rest-typings@6.5.0-rc.14 +- @rocket.chat/core-services@0.3.0-rc.14 +- @rocket.chat/model-typings@0.2.0-rc.14 +- @rocket.chat/models@0.0.24-rc.7 + ## 0.3.0-rc.13 ### Patch Changes diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json index 8c3d2785b822..85b9548b934e 100644 --- a/ee/apps/authorization-service/package.json +++ b/ee/apps/authorization-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/authorization-service", "private": true, - "version": "0.3.0-rc.13", + "version": "0.3.0-rc.14", "description": "Rocket.Chat Authorization service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/ddp-streamer/CHANGELOG.md b/ee/apps/ddp-streamer/CHANGELOG.md index b0cf5c056856..fddadc9dd8b8 100644 --- a/ee/apps/ddp-streamer/CHANGELOG.md +++ b/ee/apps/ddp-streamer/CHANGELOG.md @@ -1,5 +1,17 @@ # @rocket.chat/ddp-streamer +## 0.2.0-rc.14 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.14 +- @rocket.chat/rest-typings@6.5.0-rc.14 +- @rocket.chat/core-services@0.3.0-rc.14 +- @rocket.chat/model-typings@0.2.0-rc.14 +- @rocket.chat/ui-contexts@3.0.0-rc.14 +- @rocket.chat/models@0.0.24-rc.7 +- @rocket.chat/instance-status@0.0.24-rc.7 + ## 0.2.0-rc.13 ### Patch Changes diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json index f5d027dafd08..708836fb0f3c 100644 --- a/ee/apps/ddp-streamer/package.json +++ b/ee/apps/ddp-streamer/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/ddp-streamer", "private": true, - "version": "0.2.0-rc.13", + "version": "0.2.0-rc.14", "description": "Rocket.Chat DDP-Streamer service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/omnichannel-transcript/CHANGELOG.md b/ee/apps/omnichannel-transcript/CHANGELOG.md index 74396c098466..1331166c0857 100644 --- a/ee/apps/omnichannel-transcript/CHANGELOG.md +++ b/ee/apps/omnichannel-transcript/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/omnichannel-transcript +## 0.3.0-rc.14 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.14 +- @rocket.chat/omnichannel-services@0.1.0-rc.14 +- @rocket.chat/pdf-worker@0.0.24-rc.7 +- @rocket.chat/core-services@0.3.0-rc.14 +- @rocket.chat/model-typings@0.2.0-rc.14 +- @rocket.chat/models@0.0.24-rc.7 + ## 0.3.0-rc.13 ### Patch Changes diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json index 46f93fbbc249..c97550e2c95b 100644 --- a/ee/apps/omnichannel-transcript/package.json +++ b/ee/apps/omnichannel-transcript/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/omnichannel-transcript", "private": true, - "version": "0.3.0-rc.13", + "version": "0.3.0-rc.14", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/presence-service/CHANGELOG.md b/ee/apps/presence-service/CHANGELOG.md index d19ec0bc1ad6..7aee7a99873a 100644 --- a/ee/apps/presence-service/CHANGELOG.md +++ b/ee/apps/presence-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/presence-service +## 0.3.0-rc.14 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.14 +- @rocket.chat/presence@0.1.0-rc.14 +- @rocket.chat/core-services@0.3.0-rc.14 +- @rocket.chat/model-typings@0.2.0-rc.14 +- @rocket.chat/models@0.0.24-rc.7 + ## 0.3.0-rc.13 ### Patch Changes diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json index a76edcc20068..8dfebc688978 100644 --- a/ee/apps/presence-service/package.json +++ b/ee/apps/presence-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/presence-service", "private": true, - "version": "0.3.0-rc.13", + "version": "0.3.0-rc.14", "description": "Rocket.Chat Presence service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/queue-worker/CHANGELOG.md b/ee/apps/queue-worker/CHANGELOG.md index abf41755463f..231ef1082925 100644 --- a/ee/apps/queue-worker/CHANGELOG.md +++ b/ee/apps/queue-worker/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/queue-worker +## 0.3.0-rc.14 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.14 +- @rocket.chat/omnichannel-services@0.1.0-rc.14 +- @rocket.chat/core-services@0.3.0-rc.14 +- @rocket.chat/model-typings@0.2.0-rc.14 +- @rocket.chat/models@0.0.24-rc.7 + ## 0.3.0-rc.13 ### Patch Changes diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json index a4320b751971..ebb27e18c8aa 100644 --- a/ee/apps/queue-worker/package.json +++ b/ee/apps/queue-worker/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/queue-worker", "private": true, - "version": "0.3.0-rc.13", + "version": "0.3.0-rc.14", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/stream-hub-service/CHANGELOG.md b/ee/apps/stream-hub-service/CHANGELOG.md index 90da7e09898f..86746ac7a956 100644 --- a/ee/apps/stream-hub-service/CHANGELOG.md +++ b/ee/apps/stream-hub-service/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/stream-hub-service +## 0.3.0-rc.14 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.14 +- @rocket.chat/core-services@0.3.0-rc.14 +- @rocket.chat/model-typings@0.2.0-rc.14 +- @rocket.chat/models@0.0.24-rc.7 + ## 0.3.0-rc.13 ### Patch Changes diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json index 014a0de8935a..95e0b9adf4b0 100644 --- a/ee/apps/stream-hub-service/package.json +++ b/ee/apps/stream-hub-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/stream-hub-service", "private": true, - "version": "0.3.0-rc.13", + "version": "0.3.0-rc.14", "description": "Rocket.Chat Stream Hub service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/packages/api-client/CHANGELOG.md b/ee/packages/api-client/CHANGELOG.md index 99bdb4b27bec..26744b180a68 100644 --- a/ee/packages/api-client/CHANGELOG.md +++ b/ee/packages/api-client/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/api-client +## 0.1.18-rc.7 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.14 +- @rocket.chat/rest-typings@6.5.0-rc.14 + ## 0.1.18-rc.6 ### Patch Changes diff --git a/ee/packages/api-client/package.json b/ee/packages/api-client/package.json index df3e005d22ca..5b770d80da37 100644 --- a/ee/packages/api-client/package.json +++ b/ee/packages/api-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/api-client", - "version": "0.1.18-rc.6", + "version": "0.1.18-rc.7", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/ddp-client/CHANGELOG.md b/ee/packages/ddp-client/CHANGELOG.md index 0b94bf3852c5..0df8ddc9e8ce 100644 --- a/ee/packages/ddp-client/CHANGELOG.md +++ b/ee/packages/ddp-client/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/ddp-client +## 0.2.9-rc.7 + +### Patch Changes + +- @rocket.chat/rest-typings@6.5.0-rc.14 +- @rocket.chat/api-client@0.1.18-rc.7 + ## 0.2.9-rc.6 ### Patch Changes diff --git a/ee/packages/ddp-client/package.json b/ee/packages/ddp-client/package.json index 48c7de60cfcc..b72e044ed39b 100644 --- a/ee/packages/ddp-client/package.json +++ b/ee/packages/ddp-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ddp-client", - "version": "0.2.9-rc.6", + "version": "0.2.9-rc.7", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/license/CHANGELOG.md b/ee/packages/license/CHANGELOG.md index 15f788056e9a..b75604b3f24b 100644 --- a/ee/packages/license/CHANGELOG.md +++ b/ee/packages/license/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/license +## 0.1.0-rc.14 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.14 + ## 0.1.0-rc.13 ### Patch Changes diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json index 61b8006ab7dc..fb3f4c372e0a 100644 --- a/ee/packages/license/package.json +++ b/ee/packages/license/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/license", - "version": "0.1.0-rc.13", + "version": "0.1.0-rc.14", "private": true, "devDependencies": { "@swc/core": "^1.3.95", diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md index 46e508d12d04..fc20de231bee 100644 --- a/ee/packages/omnichannel-services/CHANGELOG.md +++ b/ee/packages/omnichannel-services/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/omnichannel-services +## 0.1.0-rc.14 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.14 +- @rocket.chat/rest-typings@6.5.0-rc.14 +- @rocket.chat/pdf-worker@0.0.24-rc.7 +- @rocket.chat/core-services@0.3.0-rc.14 +- @rocket.chat/model-typings@0.2.0-rc.14 +- @rocket.chat/models@0.0.24-rc.7 + ## 0.1.0-rc.13 ### Patch Changes diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json index 0f7ba0958d8c..6a56e910c4f9 100644 --- a/ee/packages/omnichannel-services/package.json +++ b/ee/packages/omnichannel-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/omnichannel-services", - "version": "0.1.0-rc.13", + "version": "0.1.0-rc.14", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/ee/packages/pdf-worker/CHANGELOG.md b/ee/packages/pdf-worker/CHANGELOG.md index 287116312315..308b6fd58030 100644 --- a/ee/packages/pdf-worker/CHANGELOG.md +++ b/ee/packages/pdf-worker/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/pdf-worker +## 0.0.24-rc.7 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.14 + ## 0.0.24-rc.6 ### Patch Changes diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json index e6dba65b3bce..586ca093a529 100644 --- a/ee/packages/pdf-worker/package.json +++ b/ee/packages/pdf-worker/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/pdf-worker", - "version": "0.0.24-rc.6", + "version": "0.0.24-rc.7", "private": true, "devDependencies": { "@storybook/addon-essentials": "~6.5.16", diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md index b99ba756e739..ea313d2393b0 100644 --- a/ee/packages/presence/CHANGELOG.md +++ b/ee/packages/presence/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/presence +## 0.1.0-rc.14 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.14 +- @rocket.chat/core-services@0.3.0-rc.14 +- @rocket.chat/models@0.0.24-rc.7 + ## 0.1.0-rc.13 ### Patch Changes diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json index 71d312417b4c..0cbba501eacc 100644 --- a/ee/packages/presence/package.json +++ b/ee/packages/presence/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/presence", - "version": "0.1.0-rc.13", + "version": "0.1.0-rc.14", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/package.json b/package.json index 15b4a03617b4..69e2f27cf778 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket.chat", - "version": "6.5.0-rc.13", + "version": "6.5.0-rc.14", "description": "Rocket.Chat Monorepo", "main": "index.js", "private": true, diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md index 7aad838ff5d9..b2b01dadf25c 100644 --- a/packages/core-services/CHANGELOG.md +++ b/packages/core-services/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/core-services +## 0.3.0-rc.14 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.14 +- @rocket.chat/rest-typings@6.5.0-rc.14 +- @rocket.chat/models@0.0.24-rc.7 + ## 0.3.0-rc.13 ### Patch Changes diff --git a/packages/core-services/package.json b/packages/core-services/package.json index 90be95383ba1..21bcfd6ac778 100644 --- a/packages/core-services/package.json +++ b/packages/core-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/core-services", - "version": "0.3.0-rc.13", + "version": "0.3.0-rc.14", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md index 23a3bd0eaf22..c33e78ff701e 100644 --- a/packages/core-typings/CHANGELOG.md +++ b/packages/core-typings/CHANGELOG.md @@ -1,5 +1,7 @@ # @rocket.chat/core-typings +## 6.5.0-rc.14 + ## 6.5.0-rc.13 ## 6.5.0-rc.12 diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json index cd42eca67b13..06e8bd869f83 100644 --- a/packages/core-typings/package.json +++ b/packages/core-typings/package.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/package", "name": "@rocket.chat/core-typings", - "version": "6.5.0-rc.13", + "version": "6.5.0-rc.14", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "eslint": "~8.45.0", diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md index 72badf0706e6..1d43804e0c25 100644 --- a/packages/cron/CHANGELOG.md +++ b/packages/cron/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/cron +## 0.0.20-rc.7 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.14 +- @rocket.chat/models@0.0.24-rc.7 + ## 0.0.20-rc.6 ### Patch Changes diff --git a/packages/cron/package.json b/packages/cron/package.json index 632bdb9f35ff..8b9af209542a 100644 --- a/packages/cron/package.json +++ b/packages/cron/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/cron", - "version": "0.0.20-rc.6", + "version": "0.0.20-rc.7", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md index 4d4ba730ebee..2d40756b258a 100644 --- a/packages/fuselage-ui-kit/CHANGELOG.md +++ b/packages/fuselage-ui-kit/CHANGELOG.md @@ -1,5 +1,13 @@ # Change Log +## 3.0.0-rc.14 + +### Patch Changes + +- @rocket.chat/gazzodown@3.0.0-rc.14 +- @rocket.chat/ui-contexts@3.0.0-rc.14 +- @rocket.chat/ui-video-conf@3.0.0-rc.14 + ## 3.0.0-rc.13 ### Patch Changes diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index 8510c701ad51..ffe82900f3f3 100644 --- a/packages/fuselage-ui-kit/package.json +++ b/packages/fuselage-ui-kit/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/fuselage-ui-kit", "private": true, - "version": "3.0.0-rc.13", + "version": "3.0.0-rc.14", "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system", "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/", "author": { @@ -48,9 +48,9 @@ "@rocket.chat/icons": "*", "@rocket.chat/prettier-config": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.13", + "@rocket.chat/ui-contexts": "3.0.0-rc.14", "@rocket.chat/ui-kit": "*", - "@rocket.chat/ui-video-conf": "3.0.0-rc.13", + "@rocket.chat/ui-video-conf": "3.0.0-rc.14", "@tanstack/react-query": "*", "react": "*", "react-dom": "*" diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md index d86c21fe200c..5fd3dacd58db 100644 --- a/packages/gazzodown/CHANGELOG.md +++ b/packages/gazzodown/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/gazzodown +## 3.0.0-rc.14 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.14 +- @rocket.chat/ui-contexts@3.0.0-rc.14 +- @rocket.chat/ui-client@3.0.0-rc.14 + ## 3.0.0-rc.13 ### Patch Changes diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json index 3eb1e56687d0..c0c3eb027a86 100644 --- a/packages/gazzodown/package.json +++ b/packages/gazzodown/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/gazzodown", - "version": "3.0.0-rc.13", + "version": "3.0.0-rc.14", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -65,14 +65,14 @@ "/dist" ], "peerDependencies": { - "@rocket.chat/core-typings": "6.5.0-rc.13", + "@rocket.chat/core-typings": "6.5.0-rc.14", "@rocket.chat/css-in-js": "*", "@rocket.chat/fuselage": "*", "@rocket.chat/fuselage-tokens": "*", "@rocket.chat/message-parser": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-client": "3.0.0-rc.13", - "@rocket.chat/ui-contexts": "3.0.0-rc.13", + "@rocket.chat/ui-client": "3.0.0-rc.14", + "@rocket.chat/ui-contexts": "3.0.0-rc.14", "katex": "*", "react": "*" }, diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md index 0f285899fe2a..80358d41edc4 100644 --- a/packages/instance-status/CHANGELOG.md +++ b/packages/instance-status/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/instance-status +## 0.0.24-rc.7 + +### Patch Changes + +- @rocket.chat/models@0.0.24-rc.7 + ## 0.0.24-rc.6 ### Patch Changes diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json index 8c380ec06478..9d3df9223d01 100644 --- a/packages/instance-status/package.json +++ b/packages/instance-status/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/instance-status", - "version": "0.0.24-rc.6", + "version": "0.0.24-rc.7", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md index adf18e41d143..b927beea140b 100644 --- a/packages/livechat/CHANGELOG.md +++ b/packages/livechat/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/livechat Change Log +## 1.14.9-rc.7 + +### Patch Changes + +- @rocket.chat/gazzodown@3.0.0-rc.14 + ## 1.14.9-rc.6 ### Patch Changes diff --git a/packages/livechat/package.json b/packages/livechat/package.json index b977bbac89f9..a3c1cbacec48 100644 --- a/packages/livechat/package.json +++ b/packages/livechat/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/livechat", - "version": "1.14.9-rc.6", + "version": "1.14.9-rc.7", "files": [ "/build" ], diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md index 0ea27788a8da..d82ebb5cabe3 100644 --- a/packages/model-typings/CHANGELOG.md +++ b/packages/model-typings/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/model-typings +## 0.2.0-rc.14 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.14 + ## 0.2.0-rc.13 ### Patch Changes diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json index b36e928fa169..31ae66e2d642 100644 --- a/packages/model-typings/package.json +++ b/packages/model-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/model-typings", - "version": "0.2.0-rc.13", + "version": "0.2.0-rc.14", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md index 51879e3029b1..cb1fcc6c78fa 100644 --- a/packages/models/CHANGELOG.md +++ b/packages/models/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/models +## 0.0.24-rc.7 + +### Patch Changes + +- @rocket.chat/model-typings@0.2.0-rc.14 + ## 0.0.24-rc.6 ### Patch Changes diff --git a/packages/models/package.json b/packages/models/package.json index e5ad15b10d4a..3796ea560a18 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/models", - "version": "0.0.24-rc.6", + "version": "0.0.24-rc.7", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md index 035f25e765dc..30d77f40c438 100644 --- a/packages/rest-typings/CHANGELOG.md +++ b/packages/rest-typings/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/rest-typings +## 6.5.0-rc.14 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.14 +- @rocket.chat/license@0.1.0-rc.14 + ## 6.5.0-rc.13 ### Patch Changes diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json index 9a1a26470964..80af790f3a14 100644 --- a/packages/rest-typings/package.json +++ b/packages/rest-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/rest-typings", - "version": "6.5.0-rc.13", + "version": "6.5.0-rc.14", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "@types/jest": "~29.5.7", diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md index 5c25dc92fd96..c8b0c4443e97 100644 --- a/packages/ui-client/CHANGELOG.md +++ b/packages/ui-client/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/ui-client +## 3.0.0-rc.14 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.14 + ## 3.0.0-rc.13 ### Patch Changes diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json index df6cd9fe3342..5867b2ad6520 100644 --- a/packages/ui-client/package.json +++ b/packages/ui-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-client", - "version": "3.0.0-rc.13", + "version": "3.0.0-rc.14", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -61,7 +61,7 @@ "@rocket.chat/fuselage": "*", "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.13", + "@rocket.chat/ui-contexts": "3.0.0-rc.14", "react": "~17.0.2" }, "volta": { diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md index 922372ca4231..38d95f861211 100644 --- a/packages/ui-contexts/CHANGELOG.md +++ b/packages/ui-contexts/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/ui-contexts +## 3.0.0-rc.14 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.14 +- @rocket.chat/rest-typings@6.5.0-rc.14 +- @rocket.chat/ddp-client@0.2.9-rc.7 + ## 3.0.0-rc.13 ### Patch Changes diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json index c2895b1d6211..a6115e726601 100644 --- a/packages/ui-contexts/package.json +++ b/packages/ui-contexts/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-contexts", - "version": "3.0.0-rc.13", + "version": "3.0.0-rc.14", "private": true, "devDependencies": { "@rocket.chat/core-typings": "workspace:^", diff --git a/packages/ui-video-conf/CHANGELOG.md b/packages/ui-video-conf/CHANGELOG.md index 85fc6e1d1a63..81a039f78eac 100644 --- a/packages/ui-video-conf/CHANGELOG.md +++ b/packages/ui-video-conf/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/ui-video-conf +## 3.0.0-rc.14 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.14 + ## 3.0.0-rc.13 ### Patch Changes diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json index bb1623e8607c..1df3a88db851 100644 --- a/packages/ui-video-conf/package.json +++ b/packages/ui-video-conf/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-video-conf", - "version": "3.0.0-rc.13", + "version": "3.0.0-rc.14", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -35,7 +35,7 @@ "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.13", + "@rocket.chat/ui-contexts": "3.0.0-rc.14", "react": "^17.0.2", "react-dom": "^17.0.2" }, diff --git a/packages/uikit-playground/CHANGELOG.md b/packages/uikit-playground/CHANGELOG.md index c6a89a212ee2..c5034b373304 100644 --- a/packages/uikit-playground/CHANGELOG.md +++ b/packages/uikit-playground/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/uikit-playground +## 0.2.9-rc.7 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.14 +- @rocket.chat/fuselage-ui-kit@3.0.0-rc.14 + ## 0.2.9-rc.6 ### Patch Changes diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json index 02540796c297..1fc694af3894 100644 --- a/packages/uikit-playground/package.json +++ b/packages/uikit-playground/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/uikit-playground", "private": true, - "version": "0.2.9-rc.6", + "version": "0.2.9-rc.7", "type": "module", "scripts": { "dev": "vite", diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md index 61ea615d647e..dfd2a900d761 100644 --- a/packages/web-ui-registration/CHANGELOG.md +++ b/packages/web-ui-registration/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/web-ui-registration +## 3.0.0-rc.13 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.14 + ## 3.0.0-rc.12 ### Patch Changes diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json index f005fdc774cc..9e97e0c70dcb 100644 --- a/packages/web-ui-registration/package.json +++ b/packages/web-ui-registration/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/web-ui-registration", - "version": "3.0.0-rc.12", + "version": "3.0.0-rc.13", "private": true, "homepage": "https://rocket.chat", "main": "./dist/index.js", @@ -51,7 +51,7 @@ "peerDependencies": { "@rocket.chat/layout": "*", "@rocket.chat/tools": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.13", + "@rocket.chat/ui-contexts": "3.0.0-rc.14", "@tanstack/react-query": "*", "react": "*", "react-hook-form": "*", diff --git a/yarn.lock b/yarn.lock index eca07824cf6f..8687f3df02ce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8217,9 +8217,9 @@ __metadata: "@rocket.chat/icons": "*" "@rocket.chat/prettier-config": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-contexts": 3.0.0-rc.12 + "@rocket.chat/ui-contexts": 3.0.0-rc.13 "@rocket.chat/ui-kit": "*" - "@rocket.chat/ui-video-conf": 3.0.0-rc.12 + "@rocket.chat/ui-video-conf": 3.0.0-rc.13 "@tanstack/react-query": "*" react: "*" react-dom: "*" @@ -8301,14 +8301,14 @@ __metadata: ts-jest: ~29.0.5 typescript: ~5.2.2 peerDependencies: - "@rocket.chat/core-typings": 6.5.0-rc.12 + "@rocket.chat/core-typings": 6.5.0-rc.13 "@rocket.chat/css-in-js": "*" "@rocket.chat/fuselage": "*" "@rocket.chat/fuselage-tokens": "*" "@rocket.chat/message-parser": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-client": 3.0.0-rc.12 - "@rocket.chat/ui-contexts": 3.0.0-rc.12 + "@rocket.chat/ui-client": 3.0.0-rc.13 + "@rocket.chat/ui-contexts": 3.0.0-rc.13 katex: "*" react: "*" languageName: unknown @@ -9470,7 +9470,7 @@ __metadata: "@rocket.chat/fuselage": "*" "@rocket.chat/fuselage-hooks": "*" "@rocket.chat/icons": "*" - "@rocket.chat/ui-contexts": 3.0.0-rc.12 + "@rocket.chat/ui-contexts": 3.0.0-rc.13 react: ~17.0.2 languageName: unknown linkType: soft @@ -9623,7 +9623,7 @@ __metadata: "@rocket.chat/fuselage-hooks": "*" "@rocket.chat/icons": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-contexts": 3.0.0-rc.12 + "@rocket.chat/ui-contexts": 3.0.0-rc.13 react: ^17.0.2 react-dom: ^17.0.2 languageName: unknown @@ -9709,7 +9709,7 @@ __metadata: peerDependencies: "@rocket.chat/layout": "*" "@rocket.chat/tools": "*" - "@rocket.chat/ui-contexts": 3.0.0-rc.12 + "@rocket.chat/ui-contexts": 3.0.0-rc.13 "@tanstack/react-query": "*" react: "*" react-hook-form: "*" From 54b3f5f6f298c78d949aab7d611b4ab2281e11c4 Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Tue, 28 Nov 2023 14:06:23 -0300 Subject: [PATCH 53/76] chore: Reduce amount of logs on info level (#31050) --- apps/meteor/app/api/server/v1/cloud.ts | 4 ---- apps/meteor/server/services/omnichannel/queue.ts | 2 +- packages/logger/src/getPino.ts | 8 +++++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/apps/meteor/app/api/server/v1/cloud.ts b/apps/meteor/app/api/server/v1/cloud.ts index 507495b150de..44e15db0925d 100644 --- a/apps/meteor/app/api/server/v1/cloud.ts +++ b/apps/meteor/app/api/server/v1/cloud.ts @@ -74,10 +74,6 @@ API.v1.addRoute( return API.v1.unauthorized(); } - if (process.env.NODE_ENV === 'development') { - return API.v1.success({ offline: true }); - } - return API.v1.success({ offline: !(await registerPreIntentWorkspaceWizard()) }); }, }, diff --git a/apps/meteor/server/services/omnichannel/queue.ts b/apps/meteor/server/services/omnichannel/queue.ts index 9617704b8950..603c5197ed30 100644 --- a/apps/meteor/server/services/omnichannel/queue.ts +++ b/apps/meteor/server/services/omnichannel/queue.ts @@ -72,7 +72,7 @@ export class OmnichannelQueue implements IOmnichannelQueue { const queue = await this.nextQueue(); const queueDelayTimeout = this.delay(); - queueLogger.info(`Executing queue ${queue || 'Public'} with timeout of ${queueDelayTimeout}`); + queueLogger.debug(`Executing queue ${queue || 'Public'} with timeout of ${queueDelayTimeout}`); setTimeout(this.checkQueue.bind(this, queue), queueDelayTimeout); } diff --git a/packages/logger/src/getPino.ts b/packages/logger/src/getPino.ts index 310afa35cb59..9361e168d11e 100644 --- a/packages/logger/src/getPino.ts +++ b/packages/logger/src/getPino.ts @@ -16,12 +16,14 @@ function logMethod(this: Logger, args: unknown[], method: any): void { return method.apply(this, args); } +const infoLevel = process.env.LESS_INFO_LOGS ? 20 : 35; + const mainPino = pino({ hooks: { logMethod }, customLevels: { - http: 35, - method: 35, - subscription: 35, + http: infoLevel, + method: infoLevel, + subscription: infoLevel, startup: 51, }, level: 'warn', From 957e70c7e092e845908f540c23d91cbc693e52aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlia=20Jaeger=20Foresti?= <60678893+juliajforesti@users.noreply.github.com> Date: Tue, 28 Nov 2023 19:30:51 -0300 Subject: [PATCH 54/76] chore: remove sidebar palette in favor of dark palette (#30920) --- .../ui-theming/src/SidebarPaletteStyleTag.tsx | 11 +-- ee/packages/ui-theming/src/paletteDark.ts | 4 +- ee/packages/ui-theming/src/sidebarPalette.ts | 26 ------ .../ui-theming/src/sidebarPaletteDark.ts | 88 ------------------- 4 files changed, 3 insertions(+), 126 deletions(-) delete mode 100644 ee/packages/ui-theming/src/sidebarPalette.ts delete mode 100644 ee/packages/ui-theming/src/sidebarPaletteDark.ts diff --git a/ee/packages/ui-theming/src/SidebarPaletteStyleTag.tsx b/ee/packages/ui-theming/src/SidebarPaletteStyleTag.tsx index 593f8ab2cdf7..3b1ab5500960 100644 --- a/ee/packages/ui-theming/src/SidebarPaletteStyleTag.tsx +++ b/ee/packages/ui-theming/src/SidebarPaletteStyleTag.tsx @@ -5,18 +5,9 @@ import { createPortal } from 'react-dom'; import { convertToCss } from './helpers/convertToCss'; import { useCreateStyleContainer } from './hooks/useCreateStyleContainer'; import { darkPalette } from './paletteDark'; -import { defaultSidebarPalette } from './sidebarPalette'; export const SidebarPaletteStyleTag = memo(function SidebarPaletteStyleTag(): ReactElement | null { - // Commented code below: sidebar palette currently the same in both themes. - - // const [, , theme] = useThemeMode(); - // const palette = convertToCss( - // theme === 'dark' ? filterOnlyChangedColors(darkPalette, sidebarPaletteDark) : { ...darkPalette, ...defaultSidebarPalette }, - // '.rcx-sidebar--main', - // ); - - const palette = convertToCss({ ...darkPalette, ...defaultSidebarPalette }, '.rcx-sidebar--main'); + const palette = convertToCss({ ...darkPalette }, '.rcx-sidebar--main'); return <>{createPortal(palette, useCreateStyleContainer('sidebar-palette'))}; }); diff --git a/ee/packages/ui-theming/src/paletteDark.ts b/ee/packages/ui-theming/src/paletteDark.ts index f8db2983defc..e36133650a6c 100644 --- a/ee/packages/ui-theming/src/paletteDark.ts +++ b/ee/packages/ui-theming/src/paletteDark.ts @@ -24,7 +24,7 @@ export const palette = [ { name: 'surface-neutral', token: '', color: '#2D3039' }, { name: 'surface-disabled', token: 'N800', color: '#24272E' }, { name: 'surface-hover', token: '', color: '#1A1E23' }, - { name: 'surface-selected', token: 'N700', color: '#3C3F44' }, + { name: 'surface-selected', token: '', color: '#4C5362' }, { name: 'surface-dark', token: 'N400', color: '#E4E7EA' }, { name: 'surface-featured', token: '', color: '#5F1477' }, { name: 'surface-featured-hover', token: '', color: '#4A105D' }, @@ -49,7 +49,7 @@ export const palette = [ { name: 'font-annotation', token: 'N600', color: '#9EA2A8' }, { name: 'font-hint', token: 'N600', color: '#9EA2A8' }, { name: 'font-secondary-info', token: '', color: '#9EA2A8' }, - { name: 'font-default', token: 'N400', color: '#E4E7EA' }, + { name: 'font-default', token: 'N400', color: '#C1C7D0' }, { name: 'font-titles-labels', token: '', color: '#F2F3F5' }, { name: 'font-info', token: '', color: '#739EDE' }, { name: 'font-danger', token: '', color: '#D88892' }, diff --git a/ee/packages/ui-theming/src/sidebarPalette.ts b/ee/packages/ui-theming/src/sidebarPalette.ts deleted file mode 100644 index 4fb673383b3e..000000000000 --- a/ee/packages/ui-theming/src/sidebarPalette.ts +++ /dev/null @@ -1,26 +0,0 @@ -export const palette = [ - { - category: 'Font', - description: 'These should be applied according to surfaces', - list: [ - { name: 'font-titles-labels', token: '', color: '#E4E7EA' }, - { name: 'font-default', token: '', color: '#9EA2A8' }, - ], - }, -]; - -export const defaultSidebarPalette = { - ...palette.reduce( - (rec, group) => ({ - ...rec, - ...group.list.reduce( - (rec, item) => ({ - ...rec, - [item.name]: item.color, - }), - {} as Record, - ), - }), - {} as Record, - ), -}; diff --git a/ee/packages/ui-theming/src/sidebarPaletteDark.ts b/ee/packages/ui-theming/src/sidebarPaletteDark.ts deleted file mode 100644 index 2b7801f118fb..000000000000 --- a/ee/packages/ui-theming/src/sidebarPaletteDark.ts +++ /dev/null @@ -1,88 +0,0 @@ -import { darkPalette } from './paletteDark'; - -export const palette = [ - { - category: 'Surface', - description: 'Use as a container on top of the background', - list: [ - { name: 'surface-tint', token: '', color: '#262931' }, - { name: 'surface-hover', token: '', color: '#1B1D22' }, - { name: 'surface-selected', token: 'N900', color: '#31363F' }, - ], - }, - { - category: 'Font', - description: 'These should be applied according to surfaces', - list: [ - { name: 'font-titles-labels', token: '', color: '#E4E7EA' }, - { name: 'font-default', token: '', color: '#9EA2A8' }, - ], - }, - { - category: 'Status Bullet', - description: 'Used to show user status', - list: [ - { name: 'status-bullet-online', token: '', color: '#1CBF89' }, - { name: 'status-bullet-away', token: '', color: '#B08C30' }, - { name: 'status-bullet-busy', token: '', color: '#C75765' }, - { name: 'status-bullet-disabled', token: '', color: '#CC7F42' }, - { name: 'status-bullet-offline', token: '', color: '#8B9098' }, - { name: 'status-bullet-loading', token: '', color: '#8B9098' }, - ], - }, - { - category: 'Badge', - description: 'Badge Background', - list: [ - { name: 'badge-background-level-0', token: '', color: '#404754' }, - { name: 'badge-background-level-1', token: '', color: '#484C51' }, - { name: 'badge-background-level-2', token: '', color: '#2C65BA' }, - { name: 'badge-background-level-3', token: '', color: '#955828' }, - { name: 'badge-background-level-4', token: '', color: '#B43C4C' }, - ], - }, - { - category: 'Stroke', - description: "Use as component's outline, stroke, dividers", - list: [ - { name: 'stroke-light', token: '', color: '#333842' }, - { name: 'stroke-medium', token: '', color: '#324677' }, - ], - }, - { - category: 'Button', - description: 'Secondary Background', - list: [ - { name: 'button-background-secondary-default', token: '', color: '#0D0F11' }, - { name: 'button-background-secondary-hover', token: '', color: '#3A404B' }, - { name: 'button-background-secondary-press', token: '', color: '#4C5362' }, - { name: 'button-background-secondary-focus', token: '', color: '#0D0F11' }, - { name: 'button-background-secondary-keyfocus', token: '', color: '#2F343D' }, - { name: 'button-background-secondary-disabled', token: '', color: '#2F343D' }, - ], - }, - { - description: 'Font', - list: [ - { name: 'button-font-on-secondary', token: '', color: '#E4E7EA' }, - { name: 'button-font-on-secondary-disabled', token: '', color: '#6C727A' }, - { name: 'button-icon-disabled-color', token: '', color: '#6C727A' }, - ], - }, -]; - -export const sidebarPaletteDark = { - ...palette.reduce( - (rec, group) => ({ - ...rec, - ...group.list.reduce( - (rec, item) => ({ - ...rec, - [item.name]: item.color, - }), - {} as Record, - ), - }), - { ...darkPalette } as Record, - ), -}; From cb3eef392bb2aa79efd9967962c32afd09d58232 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Wed, 29 Nov 2023 15:21:13 -0300 Subject: [PATCH 55/76] chore: small changes related to license ux (#31095) --- .../functions/getWorkspaceAccessToken.ts | 8 ++ .../getWorkspaceAccessTokenWithScope.ts | 7 -- .../registerPreIntentWorkspaceWizard.ts | 2 +- .../server/functions/syncWorkspace/index.ts | 21 ++-- .../syncWorkspace/legacySyncWorkspace.ts | 44 +++---- apps/meteor/app/cloud/server/index.ts | 28 ++++- .../SubscriptionCalloutLimits.tsx | 4 + .../admin/subscription/SubscriptionPage.tsx | 102 ++++++++-------- .../workspace/VersionCard/VersionCard.tsx | 25 +--- .../VersionCard/getVersionStatus.spec.ts | 110 ++++++++++++++++++ .../workspace/VersionCard/getVersionStatus.ts | 29 +++++ apps/meteor/ee/app/license/server/startup.ts | 6 +- .../rocketchat-i18n/i18n/en.i18n.json | 4 +- ee/packages/license/src/validation/logKind.ts | 11 ++ .../license/src/validation/validateLimits.ts | 22 +++- 15 files changed, 296 insertions(+), 127 deletions(-) create mode 100644 apps/meteor/client/views/admin/workspace/VersionCard/getVersionStatus.spec.ts create mode 100644 apps/meteor/client/views/admin/workspace/VersionCard/getVersionStatus.ts create mode 100644 ee/packages/license/src/validation/logKind.ts diff --git a/apps/meteor/app/cloud/server/functions/getWorkspaceAccessToken.ts b/apps/meteor/app/cloud/server/functions/getWorkspaceAccessToken.ts index d5b92c97ef7d..7e970edfdfc2 100644 --- a/apps/meteor/app/cloud/server/functions/getWorkspaceAccessToken.ts +++ b/apps/meteor/app/cloud/server/functions/getWorkspaceAccessToken.ts @@ -46,6 +46,14 @@ export class CloudWorkspaceAccessTokenError extends Error { } } +export const isAbortError = (error: unknown): error is { type: 'AbortError' } => { + if (typeof error !== 'object' || error === null) { + return false; + } + + return 'type' in error && error.type === 'AbortError'; +}; + export class CloudWorkspaceAccessTokenEmptyError extends Error { constructor() { super('Workspace access token is empty'); diff --git a/apps/meteor/app/cloud/server/functions/getWorkspaceAccessTokenWithScope.ts b/apps/meteor/app/cloud/server/functions/getWorkspaceAccessTokenWithScope.ts index 62d50630dd24..92ff94a4b8f0 100644 --- a/apps/meteor/app/cloud/server/functions/getWorkspaceAccessTokenWithScope.ts +++ b/apps/meteor/app/cloud/server/functions/getWorkspaceAccessTokenWithScope.ts @@ -64,13 +64,6 @@ export async function getWorkspaceAccessTokenWithScope(scope = '', throwOnError expiresAt, }; } catch (err: any) { - SystemLogger.error({ - msg: 'Failed to get Workspace AccessToken from Rocket.Chat Cloud', - url: '/api/oauth/token', - scope, - err, - }); - if (err instanceof CloudWorkspaceAccessTokenError) { SystemLogger.error('Server has been unregistered from cloud'); void removeWorkspaceRegistrationInfo(); diff --git a/apps/meteor/app/cloud/server/functions/registerPreIntentWorkspaceWizard.ts b/apps/meteor/app/cloud/server/functions/registerPreIntentWorkspaceWizard.ts index ce415d2aa983..e0865c24156a 100644 --- a/apps/meteor/app/cloud/server/functions/registerPreIntentWorkspaceWizard.ts +++ b/apps/meteor/app/cloud/server/functions/registerPreIntentWorkspaceWizard.ts @@ -21,7 +21,7 @@ export async function registerPreIntentWorkspaceWizard(): Promise { const response = await fetch(`${cloudUrl}/api/v2/register/workspace/pre-intent`, { method: 'POST', body: regInfo, - timeout: 10 * 1000, + timeout: 3 * 1000, }); if (!response.ok) { throw new Error((await response.json()).error); diff --git a/apps/meteor/app/cloud/server/functions/syncWorkspace/index.ts b/apps/meteor/app/cloud/server/functions/syncWorkspace/index.ts index 4dca8bc35321..ccc0695b22cf 100644 --- a/apps/meteor/app/cloud/server/functions/syncWorkspace/index.ts +++ b/apps/meteor/app/cloud/server/functions/syncWorkspace/index.ts @@ -1,11 +1,16 @@ import { CloudWorkspaceRegistrationError } from '../../../../../lib/errors/CloudWorkspaceRegistrationError'; import { SystemLogger } from '../../../../../server/lib/logger/system'; -import { CloudWorkspaceAccessTokenEmptyError, CloudWorkspaceAccessTokenError } from '../getWorkspaceAccessToken'; +import { CloudWorkspaceAccessTokenEmptyError, CloudWorkspaceAccessTokenError, isAbortError } from '../getWorkspaceAccessToken'; import { getCachedSupportedVersionsToken } from '../supportedVersionsToken/supportedVersionsToken'; import { announcementSync } from './announcementSync'; import { legacySyncWorkspace } from './legacySyncWorkspace'; import { syncCloudData } from './syncCloudData'; +/** + * Syncs the workspace with the cloud + * @returns {Promise} + * @throws {Error} - If there is an unexpected error during sync like a network error + */ export async function syncWorkspace() { try { await syncCloudData(); @@ -14,14 +19,15 @@ export async function syncWorkspace() { } catch (err) { switch (true) { case err instanceof CloudWorkspaceRegistrationError: - case err instanceof CloudWorkspaceAccessTokenError: - case err instanceof CloudWorkspaceAccessTokenEmptyError: { + case err instanceof CloudWorkspaceAccessTokenError: { // There is no access token, so we can't sync SystemLogger.info('Workspace does not have a valid access token, sync aborted'); break; } default: { - SystemLogger.error({ msg: 'Error during workspace sync', err }); + if (!(err instanceof CloudWorkspaceAccessTokenEmptyError) && !isAbortError(err)) { + SystemLogger.error({ msg: 'Error during workspace sync', err }); + } SystemLogger.info({ msg: 'Falling back to legacy sync', function: 'syncCloudData', @@ -32,13 +38,14 @@ export async function syncWorkspace() { } catch (err) { switch (true) { case err instanceof CloudWorkspaceRegistrationError: - case err instanceof CloudWorkspaceAccessTokenError: - case err instanceof CloudWorkspaceAccessTokenEmptyError: { + case err instanceof CloudWorkspaceAccessTokenError: { // There is no access token, so we can't sync break; } default: { - SystemLogger.error({ msg: 'Error during fallback workspace sync', err }); + if (!(err instanceof CloudWorkspaceAccessTokenEmptyError) && !isAbortError(err)) { + SystemLogger.error({ msg: 'Error during fallback workspace sync', err }); + } throw err; } } diff --git a/apps/meteor/app/cloud/server/functions/syncWorkspace/legacySyncWorkspace.ts b/apps/meteor/app/cloud/server/functions/syncWorkspace/legacySyncWorkspace.ts index bde316fae828..2bff8e1526d2 100644 --- a/apps/meteor/app/cloud/server/functions/syncWorkspace/legacySyncWorkspace.ts +++ b/apps/meteor/app/cloud/server/functions/syncWorkspace/legacySyncWorkspace.ts @@ -5,7 +5,6 @@ import { v, compile } from 'suretype'; import { CloudWorkspaceConnectionError } from '../../../../../lib/errors/CloudWorkspaceConnectionError'; import { CloudWorkspaceRegistrationError } from '../../../../../lib/errors/CloudWorkspaceRegistrationError'; -import { SystemLogger } from '../../../../../server/lib/logger/system'; import { settings } from '../../../../settings/server'; import type { WorkspaceRegistrationData } from '../buildRegistrationData'; import { buildWorkspaceRegistrationData } from '../buildRegistrationData'; @@ -99,6 +98,7 @@ const fetchWorkspaceClientPayload = async ({ Authorization: `Bearer ${token}`, }, body: workspaceRegistrationData, + timeout: 3000, }); if (!response.ok) { @@ -145,37 +145,25 @@ const consumeWorkspaceSyncPayload = async (result: Serialized { } } - setImmediate(() => syncWorkspace()); + setImmediate(async () => { + try { + await syncWorkspace(); + } catch (e: any) { + if (e instanceof CloudWorkspaceAccessTokenEmptyError) { + return; + } + if (e.type && e.type === 'AbortError') { + return; + } + SystemLogger.error('An error occurred syncing workspace.', e.message); + } + }); await cronJobs.add(licenseCronName, '0 */12 * * *', async () => { - await syncWorkspace(); + try { + await syncWorkspace(); + } catch (e: any) { + if (e instanceof CloudWorkspaceAccessTokenEmptyError) { + return; + } + if (e.type && e.type === 'AbortError') { + return; + } + SystemLogger.error('An error occurred syncing workspace.', e.message); + } }); }); diff --git a/apps/meteor/client/views/admin/subscription/SubscriptionCalloutLimits.tsx b/apps/meteor/client/views/admin/subscription/SubscriptionCalloutLimits.tsx index e408d5e85b7b..074e349081bd 100644 --- a/apps/meteor/client/views/admin/subscription/SubscriptionCalloutLimits.tsx +++ b/apps/meteor/client/views/admin/subscription/SubscriptionCalloutLimits.tsx @@ -42,6 +42,10 @@ export const SubscriptionCalloutLimits = () => { return undefined; } + if (rule.max === -1) { + return undefined; + } + return [key, rule.behavior]; }) .filter(Boolean) as Array<[keyof typeof limits, LicenseBehavior]>; diff --git a/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx b/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx index d0dd1ec0be4e..8cda1c28dc19 100644 --- a/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx +++ b/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx @@ -1,4 +1,4 @@ -import { Box, Button, ButtonGroup, Callout, Grid, Throbber } from '@rocket.chat/fuselage'; +import { Accordion, Box, Button, ButtonGroup, Callout, Grid, Throbber } from '@rocket.chat/fuselage'; import { useSessionStorage } from '@rocket.chat/fuselage-hooks'; import { useRouter } from '@rocket.chat/ui-contexts'; import { t } from 'i18next'; @@ -107,60 +107,64 @@ const SubscriptionPage = () => { {isLicenseLoading && } {!isLicenseLoading && ( - - - {showLicense && ( - + <> + {showLicense && ( + + 
{JSON.stringify(licensesData, null, 2)}
+ + + )} + + + + {license && } + {!license && } - )} - - {license && } - {!license && } - - - - - - {seatsLimit.value !== undefined && ( - - {seatsLimit.max !== Infinity ? ( - - ) : ( - - )} + + - )} - - {macLimit.value !== undefined && ( - - {macLimit.max !== Infinity ? ( - - ) : ( - - )} - - )} - {!license && ( - <> - {limits?.marketplaceApps !== undefined && ( - - - - )} - - - + {seatsLimit.value !== undefined && ( + + {seatsLimit.max !== Infinity ? ( + + ) : ( + + )} - - + )} + + {macLimit.value !== undefined && ( + + {macLimit.max !== Infinity ? ( + + ) : ( + + )} - - )} - - - + )} + + {!license && ( + <> + {limits?.marketplaceApps !== undefined && ( + + + + )} + + + + + + + + + )} + + + + )} diff --git a/apps/meteor/client/views/admin/workspace/VersionCard/VersionCard.tsx b/apps/meteor/client/views/admin/workspace/VersionCard/VersionCard.tsx index 12dc3b76e162..54da2af94a98 100644 --- a/apps/meteor/client/views/admin/workspace/VersionCard/VersionCard.tsx +++ b/apps/meteor/client/views/admin/workspace/VersionCard/VersionCard.tsx @@ -8,7 +8,6 @@ import { useModal, useMediaUrl } from '@rocket.chat/ui-contexts'; import type { ReactElement, ReactNode } from 'react'; import React, { useMemo } from 'react'; import { Trans, useTranslation } from 'react-i18next'; -import semver from 'semver'; import { useFormatDate } from '../../../../hooks/useFormatDate'; import { useLicense, useLicenseName } from '../../../../hooks/useLicense'; @@ -19,7 +18,7 @@ import type { VersionActionItem } from './components/VersionCardActionItem'; import VersionCardActionItemList from './components/VersionCardActionItemList'; import { VersionCardSkeleton } from './components/VersionCardSkeleton'; import { VersionTag } from './components/VersionTag'; -import type { VersionStatus } from './components/VersionTag'; +import { getVersionStatus } from './getVersionStatus'; import RegisterWorkspaceModal from './modals/RegisterWorkspaceModal'; const SUPPORT_EXTERNAL_LINK = 'https://go.rocket.chat/i/version-support'; @@ -222,25 +221,3 @@ const decodeBase64 = (b64: string): SupportedVersions | undefined => { return JSON.parse(atob(bodyEncoded)); }; - -const getVersionStatus = ( - serverVersion: string, - versions: SupportedVersions['versions'], -): { label: VersionStatus; expiration: Date | undefined } => { - const coercedServerVersion = String(semver.coerce(serverVersion)); - const highestVersion = versions.reduce((prev, current) => (prev.version > current.version ? prev : current)); - const currentVersionData = versions.find((v) => v.version.includes(coercedServerVersion) || v.version.includes(serverVersion)); - const isSupported = currentVersionData?.version === coercedServerVersion || currentVersionData?.version === serverVersion; - - const versionStatus: { - label: VersionStatus; - expiration: Date | undefined; - } = { - label: 'outdated', - ...(semver.gte(coercedServerVersion, highestVersion.version) && { label: 'latest' }), - ...(isSupported && semver.gt(highestVersion.version, coercedServerVersion) && { label: 'available_version' }), - expiration: currentVersionData?.expiration, - }; - - return versionStatus; -}; diff --git a/apps/meteor/client/views/admin/workspace/VersionCard/getVersionStatus.spec.ts b/apps/meteor/client/views/admin/workspace/VersionCard/getVersionStatus.spec.ts new file mode 100644 index 000000000000..40b3c5753c22 --- /dev/null +++ b/apps/meteor/client/views/admin/workspace/VersionCard/getVersionStatus.spec.ts @@ -0,0 +1,110 @@ +import { getVersionStatus } from './getVersionStatus'; + +describe('if the server version from server and the highest version from cloud are the same', () => { + describe('the expiration date is in the future', () => { + it('should return as latest version', () => { + const status = getVersionStatus('3.0.0', [ + { + version: '3.0.0', + expiration: new Date(new Date().setFullYear(new Date().getFullYear() + 1)), + security: false, + infoUrl: '', + }, + ]); + + expect(status.label).toBe('latest'); + }); + }); + + describe('the expiration date is in the past', () => { + it('should return as outdated version', () => { + const status = getVersionStatus('3.0.0', [ + { + version: '3.0.0', + expiration: new Date('2020-01-01'), + security: false, + infoUrl: '', + }, + ]); + + expect(status.label).toBe('outdated'); + }); + }); +}); + +describe('if the server version is not in the list of supported versions', () => { + it('should return as outdated version', () => { + const status = getVersionStatus('2.0.0', [ + { + version: '3.0.0', + expiration: new Date(), + security: false, + infoUrl: '', + }, + ]); + + expect(status.label).toBe('outdated'); + }); +}); + +describe('if the server version is in the list of supported versions but is not the highest', () => { + describe('the expiration date is in the future', () => { + it('should return as available version', () => { + const status = getVersionStatus('3.0.0', [ + { + version: '3.0.0', + expiration: new Date(new Date().setFullYear(new Date().getFullYear() + 1)), + security: false, + infoUrl: '', + }, + { + version: '4.0.0', + expiration: new Date(), + security: false, + infoUrl: '', + }, + ]); + expect(status.label).toBe('available_version'); + }); + }); + describe('the expiration date is in the past', () => { + it('should return as outdated version', () => { + const status = getVersionStatus('3.0.0', [ + { + version: '3.0.0', + expiration: new Date('2020-01-01'), + security: false, + infoUrl: '', + }, + { + version: '4.0.0', + expiration: new Date(), + security: false, + infoUrl: '', + }, + ]); + expect(status.label).toBe('outdated'); + }); + }); +}); + +describe('if the server version is not in the list of supported versions but is the highest', () => { + it('should return as latest version', () => { + const status = getVersionStatus('4.0.0', [ + { + version: '2.0.0', + expiration: new Date(), + security: false, + infoUrl: '', + }, + { + version: '3.0.0', + expiration: new Date(), + security: false, + infoUrl: '', + }, + ]); + + expect(status.label).toBe('outdated'); + }); +}); diff --git a/apps/meteor/client/views/admin/workspace/VersionCard/getVersionStatus.ts b/apps/meteor/client/views/admin/workspace/VersionCard/getVersionStatus.ts new file mode 100644 index 000000000000..7216fac607e0 --- /dev/null +++ b/apps/meteor/client/views/admin/workspace/VersionCard/getVersionStatus.ts @@ -0,0 +1,29 @@ +import type { SupportedVersions } from '@rocket.chat/server-cloud-communication'; +import semver from 'semver'; + +import type { VersionStatus } from './components/VersionTag'; + +export const getVersionStatus = ( + serverVersion: string, + versions: SupportedVersions['versions'], +): { label: VersionStatus; expiration: Date | undefined } => { + const coercedServerVersion = String(semver.coerce(serverVersion)); + const highestVersion = versions.reduce((prev, current) => (prev.version > current.version ? prev : current)); + const currentVersionData = versions.find((v) => v.version.includes(coercedServerVersion) || v.version.includes(serverVersion)); + const currentVersionIsExpired = currentVersionData?.expiration && new Date(currentVersionData.expiration) < new Date(); + + const isSupported = + !currentVersionIsExpired && (currentVersionData?.version === coercedServerVersion || currentVersionData?.version === serverVersion); + + const versionStatus: { + label: VersionStatus; + expiration: Date | undefined; + } = { + label: 'outdated', + ...(isSupported && semver.gte(coercedServerVersion, highestVersion.version) && { label: 'latest' }), + ...(isSupported && semver.gt(highestVersion.version, coercedServerVersion) && { label: 'available_version' }), + expiration: currentVersionData?.expiration, + }; + + return versionStatus; +}; diff --git a/apps/meteor/ee/app/license/server/startup.ts b/apps/meteor/ee/app/license/server/startup.ts index 1078fb092dfe..f18048de00ab 100644 --- a/apps/meteor/ee/app/license/server/startup.ts +++ b/apps/meteor/ee/app/license/server/startup.ts @@ -83,7 +83,11 @@ const syncByTrigger = async (contexts: string[]) => { }), ); - await syncWorkspace(); + try { + await syncWorkspace(); + } catch (error) { + console.error(error); + } }; // When settings are loaded, apply the current license if there is one. diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json index 6e84aec4ab7c..b9a5857e2151 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json @@ -5958,8 +5958,8 @@ "onboarding.form.standaloneServerForm.servicesUnavailable": "Some of the services will be unavailable or will require manual setup", "onboarding.form.standaloneServerForm.publishOwnApp": "In order to send push notitications you need to compile and publish your own app to Google Play and App Store", "onboarding.form.standaloneServerForm.manuallyIntegrate": "Need to manually integrate with external services", - "subscription.callout.servicesDisruptionsMayOccur": "Services Disruptions may occur", - "subscription.callout.servicesDisruptionsOccurring": "Services Disruptions occurring", + "subscription.callout.servicesDisruptionsMayOccur": "Services disruptions may occur", + "subscription.callout.servicesDisruptionsOccurring": "Services disruptions occurring", "subscription.callout.capabilitiesDisabled": "Capabilities disabled", "subscription.callout.description.limitsExceeded_one": "Your workspace exceeded the <1>{{val}} license limit. <3>Manage your subscription to increase limits.", "subscription.callout.description.limitsExceeded_other": "Your workspace exceeded the <1>{{val, list}} license limits. <3>Manage your subscription to increase limits.", diff --git a/ee/packages/license/src/validation/logKind.ts b/ee/packages/license/src/validation/logKind.ts new file mode 100644 index 000000000000..99a7c9d6d419 --- /dev/null +++ b/ee/packages/license/src/validation/logKind.ts @@ -0,0 +1,11 @@ +import type { LicenseBehavior } from '../definition/LicenseBehavior'; + +export const logKind = (behavior: LicenseBehavior) => { + switch (behavior) { + case 'prevent_installation': + case 'invalidate_license': + return 'error'; + default: + return 'info'; + } +}; diff --git a/ee/packages/license/src/validation/validateLimits.ts b/ee/packages/license/src/validation/validateLimits.ts index d90f5e5f014c..1cae603716b6 100644 --- a/ee/packages/license/src/validation/validateLimits.ts +++ b/ee/packages/license/src/validation/validateLimits.ts @@ -6,6 +6,7 @@ import type { LicenseManager } from '../license'; import { logger } from '../logger'; import { getCurrentValueForLicenseLimit } from './getCurrentValueForLicenseLimit'; import { getResultingBehavior } from './getResultingBehavior'; +import { logKind } from './logKind'; import { validateLimit } from './validateLimit'; export async function validateLimits( @@ -30,11 +31,22 @@ export async function validateLimits( .filter(({ max, behavior }) => validateLimit(max, currentValue, behavior, extraCount)) .map((limit) => { if (!options.suppressLog) { - logger.error({ - msg: 'Limit validation failed', - kind: limitKey, - limit, - }); + switch (logKind(limit.behavior)) { + case 'error': + logger.error({ + msg: 'Limit validation failed', + kind: limitKey, + limit, + }); + break; + case 'info': + logger.info({ + msg: 'Limit validation failed', + kind: limitKey, + limit, + }); + break; + } } return getResultingBehavior(limit, { reason: 'limit', limit: limitKey }); }); From 7553d67b66e1c784391f20a06e8864c6180d57dc Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Thu, 30 Nov 2023 15:47:57 -0300 Subject: [PATCH 56/76] add license into registration data (#31116) --- .../app/cloud/server/functions/buildRegistrationData.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/meteor/app/cloud/server/functions/buildRegistrationData.ts b/apps/meteor/app/cloud/server/functions/buildRegistrationData.ts index cc08b42b4556..fcbd3e9d74bf 100644 --- a/apps/meteor/app/cloud/server/functions/buildRegistrationData.ts +++ b/apps/meteor/app/cloud/server/functions/buildRegistrationData.ts @@ -31,6 +31,7 @@ export type WorkspaceRegistrationData = { deploymentPlatform: string; version: string; licenseVersion: number; + license?: string; enterpriseReady: boolean; setupComplete: boolean; connectionDisable: boolean; @@ -64,6 +65,8 @@ export async function buildWorkspaceRegistrationData('Enterprise_License'); + return { uniqueId: stats.uniqueId, deploymentFingerprintHash, @@ -88,6 +91,7 @@ export async function buildWorkspaceRegistrationData Date: Thu, 30 Nov 2023 16:24:40 -0300 Subject: [PATCH 57/76] chore: allow to remove license (#31107) --- apps/meteor/app/api/server/v1/cloud.ts | 46 +++++++++++ .../server/functions/getWorkspaceLicense.ts | 1 - .../cloud/server/functions/removeLicense.ts | 52 +++++++++++++ .../server/functions/syncWorkspace/index.ts | 2 +- .../functions/syncWorkspace/syncCloudData.ts | 8 +- .../admin/subscription/SubscriptionPage.tsx | 52 +++++++++---- .../subscription/components/UpgradeButton.tsx | 12 +-- .../components/UpgradeToGetMore.tsx | 16 ++-- .../components/cards/FeaturesCard.tsx | 8 +- .../subscription/hooks/useRemoveLicense.ts | 30 ++++++++ .../workspace/VersionCard/VersionCard.tsx | 2 +- .../VersionCard/components/VersionTag.tsx | 21 ++++- .../VersionCard/getVersionStatus.spec.ts | 77 ++++++++++++++++++- .../workspace/VersionCard/getVersionStatus.ts | 36 +++++---- .../ee/app/license/server/applyLicense.ts | 19 +++++ apps/meteor/ee/app/license/server/settings.ts | 40 +++++----- apps/meteor/ee/app/license/server/startup.ts | 13 +++- apps/meteor/lib/callbacks.ts | 1 + .../rocketchat-i18n/i18n/en.i18n.json | 1 + .../license/src/definition/ILicenseV3.ts | 1 + ee/packages/license/src/definition/events.ts | 1 + ee/packages/license/src/events/listeners.ts | 4 + ee/packages/license/src/index.ts | 30 ++++++++ ee/packages/license/src/license.ts | 19 +++-- .../src/cloud/WorkspaceSyncPayload.ts | 1 + packages/rest-typings/src/v1/cloud.ts | 3 + 26 files changed, 408 insertions(+), 88 deletions(-) create mode 100644 apps/meteor/app/cloud/server/functions/removeLicense.ts create mode 100644 apps/meteor/client/views/admin/subscription/hooks/useRemoveLicense.ts diff --git a/apps/meteor/app/api/server/v1/cloud.ts b/apps/meteor/app/api/server/v1/cloud.ts index 44e15db0925d..19f3f2512c91 100644 --- a/apps/meteor/app/api/server/v1/cloud.ts +++ b/apps/meteor/app/api/server/v1/cloud.ts @@ -1,11 +1,18 @@ import { CloudAnnouncements } from '@rocket.chat/models'; import { check } from 'meteor/check'; +import { CloudWorkspaceRegistrationError } from '../../../../lib/errors/CloudWorkspaceRegistrationError'; +import { SystemLogger } from '../../../../server/lib/logger/system'; import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission'; import { hasRoleAsync } from '../../../authorization/server/functions/hasRole'; import { getCheckoutUrl } from '../../../cloud/server/functions/getCheckoutUrl'; import { getConfirmationPoll } from '../../../cloud/server/functions/getConfirmationPoll'; +import { + CloudWorkspaceAccessTokenEmptyError, + CloudWorkspaceAccessTokenError, +} from '../../../cloud/server/functions/getWorkspaceAccessToken'; import { registerPreIntentWorkspaceWizard } from '../../../cloud/server/functions/registerPreIntentWorkspaceWizard'; +import { removeLicense } from '../../../cloud/server/functions/removeLicense'; import { retrieveRegistrationStatus } from '../../../cloud/server/functions/retrieveRegistrationStatus'; import { saveRegistrationData, saveRegistrationDataManual } from '../../../cloud/server/functions/saveRegistrationData'; import { startRegisterWorkspaceSetupWizard } from '../../../cloud/server/functions/startRegisterWorkspaceSetupWizard'; @@ -146,6 +153,45 @@ API.v1.addRoute( }, ); +API.v1.addRoute( + 'cloud.removeLicense', + { + authRequired: true, + permissionsRequired: ['manage-cloud'], + rateLimiterOptions: { numRequestsAllowed: 2, intervalTimeInMS: 60000 }, + }, + { + async post() { + try { + await removeLicense(); + return API.v1.success({ success: true }); + } catch (error) { + switch (true) { + case error instanceof CloudWorkspaceRegistrationError: + case error instanceof CloudWorkspaceAccessTokenEmptyError: + case error instanceof CloudWorkspaceAccessTokenError: { + SystemLogger.info({ + msg: 'Manual license removal failed', + endpoint: 'cloud.removeLicense', + error, + }); + break; + } + default: { + SystemLogger.error({ + msg: 'Manual license removal failed', + endpoint: 'cloud.removeLicense', + error, + }); + break; + } + } + } + return API.v1.failure('License removal failed'); + }, + }, +); + /** * Declaring endpoint here because we don't want this available to the sdk client */ diff --git a/apps/meteor/app/cloud/server/functions/getWorkspaceLicense.ts b/apps/meteor/app/cloud/server/functions/getWorkspaceLicense.ts index ca97e2a6fcdd..f6c62a0ed1ad 100644 --- a/apps/meteor/app/cloud/server/functions/getWorkspaceLicense.ts +++ b/apps/meteor/app/cloud/server/functions/getWorkspaceLicense.ts @@ -67,7 +67,6 @@ export async function getWorkspaceLicense() { if (currentLicense.value && Date.parse(payload.updatedAt) <= currentLicense._updatedAt.getTime()) { return; } - await callbacks.run('workspaceLicenseChanged', payload.license); return { updated: true, license: payload.license }; diff --git a/apps/meteor/app/cloud/server/functions/removeLicense.ts b/apps/meteor/app/cloud/server/functions/removeLicense.ts new file mode 100644 index 000000000000..b9afe2ddf09a --- /dev/null +++ b/apps/meteor/app/cloud/server/functions/removeLicense.ts @@ -0,0 +1,52 @@ +import { serverFetch as fetch } from '@rocket.chat/server-fetch'; + +import { callbacks } from '../../../../lib/callbacks'; +import { CloudWorkspaceConnectionError } from '../../../../lib/errors/CloudWorkspaceConnectionError'; +import { CloudWorkspaceRegistrationError } from '../../../../lib/errors/CloudWorkspaceRegistrationError'; +import { settings } from '../../../settings/server'; +import { CloudWorkspaceAccessTokenEmptyError, getWorkspaceAccessToken } from './getWorkspaceAccessToken'; +import { retrieveRegistrationStatus } from './retrieveRegistrationStatus'; +import { syncWorkspace } from './syncWorkspace'; + +export async function removeLicense() { + try { + const { workspaceRegistered } = await retrieveRegistrationStatus(); + if (!workspaceRegistered) { + throw new CloudWorkspaceRegistrationError('Workspace is not registered'); + } + + const token = await getWorkspaceAccessToken(true); + if (!token) { + throw new CloudWorkspaceAccessTokenEmptyError(); + } + + const workspaceRegistrationClientUri = settings.get('Cloud_Workspace_Registration_Client_Uri'); + const response = await fetch(`${workspaceRegistrationClientUri}/client/downgrade`, { + method: 'POST', + headers: { + Authorization: `Bearer ${token}`, + }, + }); + + if (!response.ok) { + try { + const { error } = await response.json(); + throw new CloudWorkspaceConnectionError(`Failed to connect to Rocket.Chat Cloud: ${error}`); + } catch (error) { + throw new CloudWorkspaceConnectionError(`Failed to connect to Rocket.Chat Cloud: ${response.statusText}`); + } + } + + await syncWorkspace(); + } catch (err) { + switch (true) { + case err instanceof CloudWorkspaceConnectionError: + case err instanceof CloudWorkspaceRegistrationError: + case err instanceof CloudWorkspaceAccessTokenEmptyError: + await callbacks.run('workspaceLicenseRemoved'); + break; + default: + throw err; + } + } +} diff --git a/apps/meteor/app/cloud/server/functions/syncWorkspace/index.ts b/apps/meteor/app/cloud/server/functions/syncWorkspace/index.ts index ccc0695b22cf..4c1d78440648 100644 --- a/apps/meteor/app/cloud/server/functions/syncWorkspace/index.ts +++ b/apps/meteor/app/cloud/server/functions/syncWorkspace/index.ts @@ -13,8 +13,8 @@ import { syncCloudData } from './syncCloudData'; */ export async function syncWorkspace() { try { - await syncCloudData(); await announcementSync(); + await syncCloudData(); await getCachedSupportedVersionsToken.reset(); } catch (err) { switch (true) { diff --git a/apps/meteor/app/cloud/server/functions/syncWorkspace/syncCloudData.ts b/apps/meteor/app/cloud/server/functions/syncWorkspace/syncCloudData.ts index 51f302097136..fc55fc9e34fd 100644 --- a/apps/meteor/app/cloud/server/functions/syncWorkspace/syncCloudData.ts +++ b/apps/meteor/app/cloud/server/functions/syncWorkspace/syncCloudData.ts @@ -67,12 +67,16 @@ export async function syncCloudData() { const workspaceRegistrationData = await buildWorkspaceRegistrationData(undefined); - const { license } = await fetchWorkspaceSyncPayload({ + const { license, removeLicense = false } = await fetchWorkspaceSyncPayload({ token, data: workspaceRegistrationData, }); - await callbacks.run('workspaceLicenseChanged', license); + if (removeLicense) { + await callbacks.run('workspaceLicenseRemoved'); + } else { + await callbacks.run('workspaceLicenseChanged', license); + } SystemLogger.info({ msg: 'Synced with Rocket.Chat Cloud', diff --git a/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx b/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx index 8cda1c28dc19..40fd57fb70b1 100644 --- a/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx +++ b/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx @@ -1,6 +1,6 @@ -import { Accordion, Box, Button, ButtonGroup, Callout, Grid, Throbber } from '@rocket.chat/fuselage'; -import { useSessionStorage } from '@rocket.chat/fuselage-hooks'; -import { useRouter } from '@rocket.chat/ui-contexts'; +import { Accordion, Box, Button, ButtonGroup, Callout, Grid } from '@rocket.chat/fuselage'; +import { useDebouncedValue, useSessionStorage } from '@rocket.chat/fuselage-hooks'; +import { useSearchParameter, useRouter } from '@rocket.chat/ui-contexts'; import { t } from 'i18next'; import React, { memo, useCallback, useEffect } from 'react'; import tinykeys from 'tinykeys'; @@ -23,6 +23,7 @@ import MACCard from './components/cards/MACCard'; import PlanCard from './components/cards/PlanCard'; import PlanCardCommunity from './components/cards/PlanCard/PlanCardCommunity'; import SeatsCard from './components/cards/SeatsCard'; +import { useRemoveLicense } from './hooks/useRemoveLicense'; import { useWorkspaceSync } from './hooks/useWorkspaceSync'; function useShowLicense() { @@ -51,7 +52,9 @@ const SubscriptionPage = () => { const syncLicenseUpdate = useWorkspaceSync(); const invalidateLicenseQuery = useInvalidateLicense(); - const { subscriptionSuccess } = router.getSearchParameters(); + const subscriptionSuccess = useSearchParameter('subscriptionSuccess'); + + const showSubscriptionCallout = useDebouncedValue(subscriptionSuccess || syncLicenseUpdate.isLoading, 10000); const { license, limits, activeModules = [] } = licensesData || {}; const { isEnterprise = true } = enterpriseData || {}; @@ -69,37 +72,48 @@ const SubscriptionPage = () => { const handleSyncLicenseUpdate = useCallback(() => { syncLicenseUpdate.mutate(undefined, { - onSuccess: () => invalidateLicenseQuery(), + onSuccess: () => invalidateLicenseQuery(100), }); }, [invalidateLicenseQuery, syncLicenseUpdate]); useEffect(() => { if (subscriptionSuccess && syncLicenseUpdate.isIdle) { handleSyncLicenseUpdate(); + return; + } + + if (subscriptionSuccess) { + router.navigate( + { + name: router.getRouteName()!, + params: Object.fromEntries(Object.entries(router.getSearchParameters()).filter(([key]) => key !== 'subscriptionSuccess')), + }, + { + replace: true, + }, + ); } - }, [handleSyncLicenseUpdate, subscriptionSuccess, syncLicenseUpdate]); + }, [handleSyncLicenseUpdate, router, subscriptionSuccess, syncLicenseUpdate.isIdle]); + + const removeLicense = useRemoveLicense(); return ( {isRegistered && ( - )} - + {t(isEnterprise ? 'Manage_subscription' : 'Upgrade')} - {subscriptionSuccess && ( + {(showSubscriptionCallout || syncLicenseUpdate.isLoading) && ( {t('Sync_license_update_Callout')} @@ -110,7 +124,7 @@ const SubscriptionPage = () => { <> {showLicense && ( - + 
{JSON.stringify(licensesData, null, 2)}
 @@ -162,7 +176,13 @@ const SubscriptionPage = () => { )} - + + {Boolean(licensesData?.trial || licensesData?.license?.information.cancellable) && ( + + )} + )} diff --git a/apps/meteor/client/views/admin/subscription/components/UpgradeButton.tsx b/apps/meteor/client/views/admin/subscription/components/UpgradeButton.tsx index 25dec88b866f..684cb03d4756 100644 --- a/apps/meteor/client/views/admin/subscription/components/UpgradeButton.tsx +++ b/apps/meteor/client/views/admin/subscription/components/UpgradeButton.tsx @@ -1,8 +1,9 @@ -import { Button, ButtonGroup } from '@rocket.chat/fuselage'; +import { Button } from '@rocket.chat/fuselage'; import type { ButtonProps } from '@rocket.chat/fuselage/dist/components/Button/Button'; import type { ReactElement } from 'react'; import React, { memo } from 'react'; +import { useExternalLink } from '../../../../hooks/useExternalLink'; import { useCheckoutUrl } from '../hooks/useCheckoutUrl'; const UpgradeButton = ({ @@ -14,14 +15,13 @@ const UpgradeButton = ({ target: string; action: string; }): ReactElement => { + const handleOpenLink = useExternalLink(); const url = useCheckoutUrl()({ target, action }); return ( - - - + ); }; diff --git a/apps/meteor/client/views/admin/subscription/components/UpgradeToGetMore.tsx b/apps/meteor/client/views/admin/subscription/components/UpgradeToGetMore.tsx index 40b1750da713..a3c079319b53 100644 --- a/apps/meteor/client/views/admin/subscription/components/UpgradeToGetMore.tsx +++ b/apps/meteor/client/views/admin/subscription/components/UpgradeToGetMore.tsx @@ -1,13 +1,15 @@ -import { Box, States, StatesIcon, StatesTitle, StatesSubtitle, Grid, Button } from '@rocket.chat/fuselage'; +import { Box, States, StatesIcon, StatesTitle, StatesSubtitle, Grid, Button, ButtonGroup } from '@rocket.chat/fuselage'; import { Card, CardBody, CardTitle, FramedIcon } from '@rocket.chat/ui-client'; import React, { memo } from 'react'; import { useTranslation } from 'react-i18next'; +import { useExternalLink } from '../../../../hooks/useExternalLink'; import { PRICING_LINK } from '../utils/links'; type UpgradeToGetMoreProps = { activeModules: string[]; isEnterprise: boolean; + children: React.ReactNode; }; const enterpriseModules = [ @@ -19,8 +21,9 @@ const enterpriseModules = [ 'auditing', ]; -const UpgradeToGetMore = ({ activeModules }: UpgradeToGetMoreProps) => { +const UpgradeToGetMore = ({ activeModules, children }: UpgradeToGetMoreProps) => { const { t } = useTranslation(); + const handleOpenLink = useExternalLink(); const upgradeModules = enterpriseModules .filter((module) => !activeModules.includes(module)) @@ -63,9 +66,12 @@ const UpgradeToGetMore = ({ activeModules }: UpgradeToGetMoreProps) => { ))} - + + + {children} + ); }; diff --git a/apps/meteor/client/views/admin/subscription/components/cards/FeaturesCard.tsx b/apps/meteor/client/views/admin/subscription/components/cards/FeaturesCard.tsx index 7c5e67e622a6..3a2318b70d6d 100644 --- a/apps/meteor/client/views/admin/subscription/components/cards/FeaturesCard.tsx +++ b/apps/meteor/client/views/admin/subscription/components/cards/FeaturesCard.tsx @@ -22,7 +22,7 @@ type FeaturesCardProps = { const FeaturesCard = ({ activeModules, isEnterprise }: FeaturesCardProps): ReactElement => { const { t } = useTranslation(); - const mediaQuery = useMediaQuery('(min-width: 1180px)'); + const isSmall = useMediaQuery('(min-width: 1180px)'); const getFeatureSet = (modules: string[], isEnterprise: boolean): FeatureSet[] => { const featureSet: FeatureSet[] = [ @@ -78,11 +78,11 @@ const FeaturesCard = ({ activeModules, isEnterprise }: FeaturesCardProps): React - + {getFeatureSet(activeModules, isEnterprise).map(({ type, title, infoText }, index) => ( - + - + {t(title)} {infoText && } diff --git a/apps/meteor/client/views/admin/subscription/hooks/useRemoveLicense.ts b/apps/meteor/client/views/admin/subscription/hooks/useRemoveLicense.ts new file mode 100644 index 000000000000..ac3d64647536 --- /dev/null +++ b/apps/meteor/client/views/admin/subscription/hooks/useRemoveLicense.ts @@ -0,0 +1,30 @@ +import { useEndpoint, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts'; +import { useMutation } from '@tanstack/react-query'; + +import { useInvalidateLicense } from '../../../../hooks/useLicense'; + +export const useRemoveLicense = () => { + const t = useTranslation(); + const dispatchToastMessage = useToastMessageDispatch(); + + const invalidateLicense = useInvalidateLicense(); + + const removeLicense = useEndpoint('POST', '/v1/cloud.removeLicense'); + + return useMutation({ + mutationFn: () => removeLicense(), + onSuccess: () => { + invalidateLicense(100); + dispatchToastMessage({ + type: 'success', + message: t('Removed'), + }); + }, + onError: (error) => { + dispatchToastMessage({ + type: 'error', + message: error, + }); + }, + }); +}; diff --git a/apps/meteor/client/views/admin/workspace/VersionCard/VersionCard.tsx b/apps/meteor/client/views/admin/workspace/VersionCard/VersionCard.tsx index 54da2af94a98..68f83f4eb505 100644 --- a/apps/meteor/client/views/admin/workspace/VersionCard/VersionCard.tsx +++ b/apps/meteor/client/views/admin/workspace/VersionCard/VersionCard.tsx @@ -181,7 +181,7 @@ const VersionCard = ({ serverInfo }: VersionCardProps): ReactElement => { {t('Version_version', { version: serverVersion })} - {!isAirgapped && versions && } + {!isAirgapped && versions && } diff --git a/apps/meteor/client/views/admin/workspace/VersionCard/components/VersionTag.tsx b/apps/meteor/client/views/admin/workspace/VersionCard/components/VersionTag.tsx index c890ba6716e2..4671661352e4 100644 --- a/apps/meteor/client/views/admin/workspace/VersionCard/components/VersionTag.tsx +++ b/apps/meteor/client/views/admin/workspace/VersionCard/components/VersionTag.tsx @@ -6,17 +6,30 @@ export type VersionStatus = 'outdated' | 'latest' | 'available_version' | undefi type VersionTagProps = { versionStatus: VersionStatus; + title?: string; }; -export const VersionTag = ({ versionStatus }: VersionTagProps) => { +export const VersionTag = ({ versionStatus, title }: VersionTagProps) => { const { t } = useTranslation(); if (versionStatus === 'outdated') { - return {t('Outdated')}; + return ( + + {t('Outdated')} + + ); } if (versionStatus === 'latest') { - return {t('Latest')}; + return ( + + {t('Latest')} + + ); } - return {t('New_version_available')}; + return ( + + {t('New_version_available')} + + ); }; diff --git a/apps/meteor/client/views/admin/workspace/VersionCard/getVersionStatus.spec.ts b/apps/meteor/client/views/admin/workspace/VersionCard/getVersionStatus.spec.ts index 40b3c5753c22..a15af110996b 100644 --- a/apps/meteor/client/views/admin/workspace/VersionCard/getVersionStatus.spec.ts +++ b/apps/meteor/client/views/admin/workspace/VersionCard/getVersionStatus.spec.ts @@ -59,7 +59,7 @@ describe('if the server version is in the list of supported versions but is not }, { version: '4.0.0', - expiration: new Date(), + expiration: new Date(new Date().setFullYear(new Date().getFullYear() + 1)), security: false, infoUrl: '', }, @@ -106,5 +106,80 @@ describe('if the server version is not in the list of supported versions but is ]); expect(status.label).toBe('outdated'); + expect(status.version).toBe('4.0.0'); + }); +}); + +describe('prerelease version', () => { + it('should not suggest available version the highest version is a prerelease from a different tag', () => { + const status = getVersionStatus('3.0.0', [ + { + version: '3.0.0', + expiration: new Date(new Date().setFullYear(new Date().getFullYear() + 1)), + security: false, + infoUrl: '', + }, + { + version: '4.0.0-develop', + expiration: new Date(new Date().setFullYear(new Date().getFullYear() + 1)), + security: false, + infoUrl: '', + }, + ]); + + expect(status.label).toBe('latest'); + expect(status.version).toBe('3.0.0'); + }); + + it('should suggest available version the highest version is a prerelease from the same tag', () => { + const status = getVersionStatus('6.5.0-rc.14', [ + { + version: '6.5.0-rc.14', + expiration: new Date(new Date().setFullYear(new Date().getFullYear() + 1)), + security: false, + infoUrl: '', + }, + { + version: '6.5.0-rc.15', + expiration: new Date(new Date().setFullYear(new Date().getFullYear() + 1)), + security: false, + infoUrl: '', + }, + { + version: '4.0.0-develop', + expiration: new Date(new Date().setFullYear(new Date().getFullYear() + 1)), + security: false, + infoUrl: '', + }, + ]); + + expect(status.label).toBe('available_version'); + expect(status.version).toBe('6.5.0-rc.15'); + }); + + it('should suggest available version the highest version even if the current one is a prerelease', () => { + const status = getVersionStatus('6.5.0-rc.14', [ + { + version: '6.5.0-rc.14', + expiration: new Date(new Date().setFullYear(new Date().getFullYear() + 1)), + security: false, + infoUrl: '', + }, + { + version: '6.5.0-rc.15', + expiration: new Date(new Date().setFullYear(new Date().getFullYear() + 1)), + security: false, + infoUrl: '', + }, + { + version: '7.0.0', + expiration: new Date(new Date().setFullYear(new Date().getFullYear() + 1)), + security: false, + infoUrl: '', + }, + ]); + + expect(status.label).toBe('available_version'); + expect(status.version).toBe('7.0.0'); }); }); diff --git a/apps/meteor/client/views/admin/workspace/VersionCard/getVersionStatus.ts b/apps/meteor/client/views/admin/workspace/VersionCard/getVersionStatus.ts index 7216fac607e0..705087f58153 100644 --- a/apps/meteor/client/views/admin/workspace/VersionCard/getVersionStatus.ts +++ b/apps/meteor/client/views/admin/workspace/VersionCard/getVersionStatus.ts @@ -6,24 +6,32 @@ import type { VersionStatus } from './components/VersionTag'; export const getVersionStatus = ( serverVersion: string, versions: SupportedVersions['versions'], -): { label: VersionStatus; expiration: Date | undefined } => { - const coercedServerVersion = String(semver.coerce(serverVersion)); - const highestVersion = versions.reduce((prev, current) => (prev.version > current.version ? prev : current)); - const currentVersionData = versions.find((v) => v.version.includes(coercedServerVersion) || v.version.includes(serverVersion)); +): { label: VersionStatus; expiration: Date | undefined; version: string } => { + const highestVersion = versions + .sort((prev, current) => semver.compare(current.version, prev.version)) + .filter((v) => { + const [prerelease] = semver.prerelease(v.version) || []; + const [currentPrerelease] = semver.prerelease(serverVersion) || []; + + return !prerelease || prerelease === currentPrerelease; + })[0]; + + const currentVersionData = + versions.find((v) => v.version === serverVersion) || + versions.find((v) => + semver.satisfies(String(semver.coerce(v.version)), `=${semver.major(serverVersion)}.${semver.minor(serverVersion)}.x`), + ); + const currentVersionIsExpired = currentVersionData?.expiration && new Date(currentVersionData.expiration) < new Date(); - const isSupported = - !currentVersionIsExpired && (currentVersionData?.version === coercedServerVersion || currentVersionData?.version === serverVersion); + const isSupported = !currentVersionIsExpired && !!currentVersionData; - const versionStatus: { - label: VersionStatus; - expiration: Date | undefined; - } = { + return { label: 'outdated', - ...(isSupported && semver.gte(coercedServerVersion, highestVersion.version) && { label: 'latest' }), - ...(isSupported && semver.gt(highestVersion.version, coercedServerVersion) && { label: 'available_version' }), + version: serverVersion, + ...(isSupported && semver.gte(currentVersionData?.version, highestVersion.version) && { label: 'latest' }), + ...(isSupported && + semver.gt(highestVersion.version, currentVersionData?.version) && { label: 'available_version', version: highestVersion.version }), expiration: currentVersionData?.expiration, }; - - return versionStatus; }; diff --git a/apps/meteor/ee/app/license/server/applyLicense.ts b/apps/meteor/ee/app/license/server/applyLicense.ts index 759d58481abe..c274c9e27fdb 100644 --- a/apps/meteor/ee/app/license/server/applyLicense.ts +++ b/apps/meteor/ee/app/license/server/applyLicense.ts @@ -16,3 +16,22 @@ export const applyLicense = async (license: string, isNewLicense: boolean): Prom return false; } }; + +export const applyLicenseOrRemove = async (license: string, isNewLicense: boolean): Promise => { + const enterpriseLicense = (license ?? '').trim(); + if (!enterpriseLicense) { + License.remove(); + return false; + } + + if (enterpriseLicense === License.encryptedLicense) { + return false; + } + + try { + return License.setLicense(enterpriseLicense, isNewLicense); + } catch { + License.remove(); + return false; + } +}; diff --git a/apps/meteor/ee/app/license/server/settings.ts b/apps/meteor/ee/app/license/server/settings.ts index a5a474f591f2..590a937fe18f 100644 --- a/apps/meteor/ee/app/license/server/settings.ts +++ b/apps/meteor/ee/app/license/server/settings.ts @@ -1,27 +1,23 @@ -import { Meteor } from 'meteor/meteor'; - import { settingsRegistry } from '../../../../app/settings/server'; -Meteor.startup(async () => { - // The proper name for this group is Premium, but we can't change it because it's already in use and we will break the settings - // TODO: Keep this until next major updates - await settingsRegistry.addGroup('Enterprise', async function () { - await this.section('Enterprise', async function () { - await this.add('Enterprise_License', '', { - type: 'string', - i18nLabel: 'Premium_License', - alert: 'Premium_License_alert', - }); - await this.add('Enterprise_License_Data', '', { - type: 'string', - hidden: true, - public: false, - }); - await this.add('Enterprise_License_Status', '', { - readonly: true, - type: 'string', - i18nLabel: 'Status', - }); +// The proper name for this group is Premium, but we can't change it because it's already in use and we will break the settings +// TODO: Keep this until next major updates +await settingsRegistry.addGroup('Enterprise', async function () { + await this.section('Enterprise', async function () { + await this.add('Enterprise_License', '', { + type: 'string', + i18nLabel: 'Premium_License', + alert: 'Premium_License_alert', + }); + await this.add('Enterprise_License_Data', '', { + type: 'string', + hidden: true, + public: false, + }); + await this.add('Enterprise_License_Status', '', { + readonly: true, + type: 'string', + i18nLabel: 'Status', }); }); }); diff --git a/apps/meteor/ee/app/license/server/startup.ts b/apps/meteor/ee/app/license/server/startup.ts index f18048de00ab..1f05ae27ce9d 100644 --- a/apps/meteor/ee/app/license/server/startup.ts +++ b/apps/meteor/ee/app/license/server/startup.ts @@ -8,7 +8,7 @@ import moment from 'moment'; import { syncWorkspace } from '../../../../app/cloud/server/functions/syncWorkspace'; import { settings } from '../../../../app/settings/server'; import { callbacks } from '../../../../lib/callbacks'; -import { applyLicense } from './applyLicense'; +import { applyLicense, applyLicenseOrRemove } from './applyLicense'; import { getAppCount } from './lib/getAppCount'; settings.watch('Site_Url', (value) => { @@ -26,6 +26,11 @@ License.onInvalidateLicense(async () => { await Settings.updateValueById('Enterprise_License_Status', 'Invalid'); }); +License.onRemoveLicense(async () => { + await Settings.updateValueById('Enterprise_License', ''); + await Settings.updateValueById('Enterprise_License_Status', 'Invalid'); +}); + /** * This is a debounced function that will sync the workspace data to the cloud. * it caches the context, waits for a second and then syncs the data. @@ -100,9 +105,11 @@ settings.onReady(async () => { } // After the current license is already loaded, watch the setting value to react to new licenses being applied. - settings.watch('Enterprise_License', async (license) => applyLicense(license, true)); + settings.change('Enterprise_License', (license) => applyLicenseOrRemove(license, true)); + + callbacks.add('workspaceLicenseRemoved', () => License.remove()); - callbacks.add('workspaceLicenseChanged', async (updatedLicense) => applyLicense(updatedLicense, true)); + callbacks.add('workspaceLicenseChanged', (updatedLicense) => applyLicense(updatedLicense, true)); License.onInstall(async () => void api.broadcast('license.actions', {} as Record, boolean>)); diff --git a/apps/meteor/lib/callbacks.ts b/apps/meteor/lib/callbacks.ts index fa36ee4f4a71..d1ffcc3e7880 100644 --- a/apps/meteor/lib/callbacks.ts +++ b/apps/meteor/lib/callbacks.ts @@ -40,6 +40,7 @@ interface EventLikeCallbackSignatures { 'afterDeactivateUser': (user: IUser) => void; 'afterDeleteMessage': (message: IMessage, room: IRoom) => void; 'workspaceLicenseChanged': (license: string) => void; + 'workspaceLicenseRemoved': () => void; 'afterReadMessages': (rid: IRoom['_id'], params: { uid: IUser['_id']; lastSeen?: Date; tmid?: IMessage['_id'] }) => void; 'beforeReadMessages': (rid: IRoom['_id'], uid: IUser['_id']) => void; 'afterDeleteUser': (user: IUser) => void; diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json index b9a5857e2151..8f51a67ac8b7 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json @@ -883,6 +883,7 @@ "Cancel": "Cancel", "Cancel_message_input": "Cancel", "Canceled": "Canceled", + "Cancel_subscription": "Cancel subscription", "Canned_Response_Created": "Canned Response created", "Canned_Response_Updated": "Canned Response updated", "Canned_Response_Delete_Warning": "Deleting a canned response cannot be undone.", diff --git a/ee/packages/license/src/definition/ILicenseV3.ts b/ee/packages/license/src/definition/ILicenseV3.ts index eabc276cd09d..d99f80c71bfc 100644 --- a/ee/packages/license/src/definition/ILicenseV3.ts +++ b/ee/packages/license/src/definition/ILicenseV3.ts @@ -12,6 +12,7 @@ export interface ILicenseV3 { notifyAdminsAt?: Timestamp; notifyUsersAt?: Timestamp; trial: boolean; + cancellable?: boolean; offline: boolean; createdAt: Timestamp; grantedBy: { diff --git a/ee/packages/license/src/definition/events.ts b/ee/packages/license/src/definition/events.ts index f19dc13cc82e..2156c298849c 100644 --- a/ee/packages/license/src/definition/events.ts +++ b/ee/packages/license/src/definition/events.ts @@ -16,6 +16,7 @@ export type LicenseEvents = ModuleValidation & BehaviorTriggered & LimitReached & { installed: undefined; + removed: undefined; validate: undefined; invalidate: undefined; module: { module: LicenseModule; valid: boolean }; diff --git a/ee/packages/license/src/events/listeners.ts b/ee/packages/license/src/events/listeners.ts index 29caca3984c3..add2f397ba8f 100644 --- a/ee/packages/license/src/events/listeners.ts +++ b/ee/packages/license/src/events/listeners.ts @@ -18,6 +18,10 @@ export function onInstall(this: LicenseManager, cb: () => void) { this.on('installed', cb); } +export function onRemoveLicense(this: LicenseManager, cb: () => void) { + this.on('removed', cb); +} + export function onInvalidate(this: LicenseManager, cb: () => void) { if (!this.hasValidLicense()) { cb(); diff --git a/ee/packages/license/src/index.ts b/ee/packages/license/src/index.ts index b9464eb1e37c..cf0bc0c74f4b 100644 --- a/ee/packages/license/src/index.ts +++ b/ee/packages/license/src/index.ts @@ -16,10 +16,13 @@ import { onValidateLicense, onInstall, onInvalidate, + onRemoveLicense, } from './events/listeners'; import { overwriteClassOnLicense } from './events/overwriteClassOnLicense'; import { LicenseManager } from './license'; +import { logger } from './logger'; import { getModules, hasModule } from './modules'; +import { showLicense } from './showLicense'; import { getTags } from './tags'; import { getCurrentValueForLicenseLimit, setLicenseLimitCounter } from './validation/getCurrentValueForLicenseLimit'; import { validateFormat } from './validation/validateFormat'; @@ -69,6 +72,31 @@ interface License { } export class LicenseImp extends LicenseManager implements License { + constructor() { + super(); + this.onValidateLicense(() => showLicense.call(this, this.getLicense(), this.hasValidLicense())); + + this.onValidateLicense(() => { + logger.startup({ + msg: 'License installed', + version: this.getLicense()?.version, + hash: this._lockedLicense?.slice(-8), + }); + }); + + this.onRemoveLicense(() => { + logger.startup({ + msg: 'License removed', + }); + }); + + this.onInvalidateLicense(() => { + logger.startup({ + msg: 'License invalidated', + }); + }); + } + validateFormat = validateFormat; hasModule = hasModule; @@ -91,6 +119,8 @@ export class LicenseImp extends LicenseManager implements License { onInstall = onInstall; + onRemoveLicense = onRemoveLicense; + onInvalidate = onInvalidate; onValidFeature = onValidFeature; diff --git a/ee/packages/license/src/license.ts b/ee/packages/license/src/license.ts index 00f7cf4e1476..5d4a33024f8b 100644 --- a/ee/packages/license/src/license.ts +++ b/ee/packages/license/src/license.ts @@ -17,7 +17,6 @@ import { behaviorTriggered, behaviorTriggeredToggled, licenseInvalidated, licens import { logger } from './logger'; import { getModules, invalidateAll, replaceModules } from './modules'; import { applyPendingLicense, clearPendingLicense, hasPendingLicense, isPendingLicense, setPendingLicense } from './pendingLicense'; -import { showLicense } from './showLicense'; import { replaceTags } from './tags'; import { decrypt } from './token'; import { convertToV3 } from './v2/convertToV3'; @@ -44,13 +43,13 @@ export class LicenseManager extends Emitter { private workspaceUrl: string | undefined; - private _license: ILicenseV3 | undefined; + protected _license: ILicenseV3 | undefined; private _unmodifiedLicense: ILicenseV2 | ILicenseV3 | undefined; private _valid: boolean | undefined; - private _lockedLicense: string | undefined; + protected _lockedLicense: string | undefined; private states = new Map>(); @@ -62,11 +61,6 @@ export class LicenseManager extends Emitter { return state; } - constructor() { - super(); - this.on('installed', () => showLicense.call(this, this._license, this._valid)); - } - public get license(): ILicenseV3 | undefined { return this._license; } @@ -146,8 +140,17 @@ export class LicenseManager extends Emitter { private invalidateLicense(): void { this._valid = false; this.states.clear(); + invalidateAll.call(this); licenseInvalidated.call(this); + } + + public remove(): void { + if (!this._license) { + return; + } + this.clearLicenseData(); invalidateAll.call(this); + this.emit('removed'); } private async setLicenseV3( diff --git a/packages/core-typings/src/cloud/WorkspaceSyncPayload.ts b/packages/core-typings/src/cloud/WorkspaceSyncPayload.ts index fb95cfa4553c..fef2638e6507 100644 --- a/packages/core-typings/src/cloud/WorkspaceSyncPayload.ts +++ b/packages/core-typings/src/cloud/WorkspaceSyncPayload.ts @@ -46,6 +46,7 @@ export interface WorkspaceSyncResponse { workspaceId: string; publicKey: string; license: unknown; + removeLicense?: boolean; } export interface WorkspaceCommsRequestPayload { diff --git a/packages/rest-typings/src/v1/cloud.ts b/packages/rest-typings/src/v1/cloud.ts index 1146488bb5ff..fcacf85855e2 100644 --- a/packages/rest-typings/src/v1/cloud.ts +++ b/packages/rest-typings/src/v1/cloud.ts @@ -91,6 +91,9 @@ export type CloudEndpoints = { '/v1/cloud.syncWorkspace': { POST: () => { success: boolean }; }; + '/v1/cloud.removeLicense': { + POST: () => { success: boolean }; + }; '/v1/cloud.announcements': { GET: () => { announcements: Cloud.Announcement[] }; }; From b62742cb449b2c093b5380a74cce3a0af48e744f Mon Sep 17 00:00:00 2001 From: Yash Rajpal <58601732+yash-rajpal@users.noreply.github.com> Date: Fri, 1 Dec 2023 00:55:26 +0530 Subject: [PATCH 58/76] chore: bump `message-parser` package version (#31119) --- apps/meteor/ee/server/services/package.json | 2 +- apps/meteor/package.json | 2 +- packages/core-services/package.json | 2 +- packages/core-typings/package.json | 2 +- packages/gazzodown/package.json | 2 +- packages/livechat/package.json | 2 +- packages/rest-typings/package.json | 2 +- yarn.lock | 38 ++++++++++----------- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json index e74b84282917..f456c68aa9da 100644 --- a/apps/meteor/ee/server/services/package.json +++ b/apps/meteor/ee/server/services/package.json @@ -22,7 +22,7 @@ "@rocket.chat/core-services": "workspace:^", "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/emitter": "~0.31.25", - "@rocket.chat/message-parser": "~0.31.26", + "@rocket.chat/message-parser": "~0.31.27", "@rocket.chat/model-typings": "workspace:^", "@rocket.chat/models": "workspace:^", "@rocket.chat/rest-typings": "workspace:^", diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 59a11bfa0bc5..3f944a3352bc 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -252,7 +252,7 @@ "@rocket.chat/logger": "workspace:^", "@rocket.chat/logo": "~0.31.28", "@rocket.chat/memo": "~0.31.25", - "@rocket.chat/message-parser": "~0.31.26", + "@rocket.chat/message-parser": "~0.31.27", "@rocket.chat/model-typings": "workspace:^", "@rocket.chat/models": "workspace:^", "@rocket.chat/mp3-encoder": "0.24.0", diff --git a/packages/core-services/package.json b/packages/core-services/package.json index 21bcfd6ac778..82e977b80b5a 100644 --- a/packages/core-services/package.json +++ b/packages/core-services/package.json @@ -37,7 +37,7 @@ "@rocket.chat/apps-engine": "1.41.0", "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/icons": "~0.32.0", - "@rocket.chat/message-parser": "~0.31.26", + "@rocket.chat/message-parser": "~0.31.27", "@rocket.chat/models": "workspace:^", "@rocket.chat/rest-typings": "workspace:^", "@rocket.chat/ui-kit": "~0.32.1", diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json index 06e8bd869f83..8f79fde6200a 100644 --- a/packages/core-typings/package.json +++ b/packages/core-typings/package.json @@ -24,7 +24,7 @@ "dependencies": { "@rocket.chat/apps-engine": "1.41.0", "@rocket.chat/icons": "~0.32.0", - "@rocket.chat/message-parser": "~0.31.26", + "@rocket.chat/message-parser": "~0.31.27", "@rocket.chat/ui-kit": "~0.32.1" }, "volta": { diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json index c0c3eb027a86..5e6a86202dec 100644 --- a/packages/gazzodown/package.json +++ b/packages/gazzodown/package.json @@ -8,7 +8,7 @@ "@rocket.chat/css-in-js": "~0.31.25", "@rocket.chat/fuselage": "~0.38.1", "@rocket.chat/fuselage-tokens": "~0.32.0", - "@rocket.chat/message-parser": "~0.31.26", + "@rocket.chat/message-parser": "~0.31.27", "@rocket.chat/styled": "~0.31.25", "@rocket.chat/ui-client": "workspace:^", "@rocket.chat/ui-contexts": "workspace:^", diff --git a/packages/livechat/package.json b/packages/livechat/package.json index a3c1cbacec48..aa04831c77ac 100644 --- a/packages/livechat/package.json +++ b/packages/livechat/package.json @@ -94,7 +94,7 @@ }, "dependencies": { "@rocket.chat/gazzodown": "workspace:^", - "@rocket.chat/message-parser": "~0.31.26", + "@rocket.chat/message-parser": "~0.31.27", "@rocket.chat/random": "workspace:~", "@rocket.chat/sdk": "^1.0.0-alpha.42", "@rocket.chat/ui-kit": "~0.32.1", diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json index 80af790f3a14..31a27e629d1f 100644 --- a/packages/rest-typings/package.json +++ b/packages/rest-typings/package.json @@ -27,7 +27,7 @@ "@rocket.chat/apps-engine": "1.41.0", "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/license": "workspace:^", - "@rocket.chat/message-parser": "~0.31.26", + "@rocket.chat/message-parser": "~0.31.27", "@rocket.chat/ui-kit": "~0.32.1", "ajv": "^8.11.0", "ajv-formats": "^2.1.1" diff --git a/yarn.lock b/yarn.lock index 8687f3df02ce..47d8ecd8a26c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7878,7 +7878,7 @@ __metadata: "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/eslint-config": "workspace:^" "@rocket.chat/icons": ~0.32.0 - "@rocket.chat/message-parser": ~0.31.26 + "@rocket.chat/message-parser": ~0.31.27 "@rocket.chat/models": "workspace:^" "@rocket.chat/rest-typings": "workspace:^" "@rocket.chat/ui-kit": ~0.32.1 @@ -7903,7 +7903,7 @@ __metadata: "@rocket.chat/apps-engine": 1.41.0 "@rocket.chat/eslint-config": "workspace:^" "@rocket.chat/icons": ~0.32.0 - "@rocket.chat/message-parser": ~0.31.26 + "@rocket.chat/message-parser": ~0.31.27 "@rocket.chat/ui-kit": ~0.32.1 eslint: ~8.45.0 mongodb: ^4.17.1 @@ -8217,9 +8217,9 @@ __metadata: "@rocket.chat/icons": "*" "@rocket.chat/prettier-config": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-contexts": 3.0.0-rc.13 + "@rocket.chat/ui-contexts": 3.0.0-rc.14 "@rocket.chat/ui-kit": "*" - "@rocket.chat/ui-video-conf": 3.0.0-rc.13 + "@rocket.chat/ui-video-conf": 3.0.0-rc.14 "@tanstack/react-query": "*" react: "*" react-dom: "*" @@ -8259,7 +8259,7 @@ __metadata: "@rocket.chat/css-in-js": ~0.31.25 "@rocket.chat/fuselage": ~0.38.1 "@rocket.chat/fuselage-tokens": ~0.32.0 - "@rocket.chat/message-parser": ~0.31.26 + "@rocket.chat/message-parser": ~0.31.27 "@rocket.chat/styled": ~0.31.25 "@rocket.chat/ui-client": "workspace:^" "@rocket.chat/ui-contexts": "workspace:^" @@ -8301,14 +8301,14 @@ __metadata: ts-jest: ~29.0.5 typescript: ~5.2.2 peerDependencies: - "@rocket.chat/core-typings": 6.5.0-rc.13 + "@rocket.chat/core-typings": 6.5.0-rc.14 "@rocket.chat/css-in-js": "*" "@rocket.chat/fuselage": "*" "@rocket.chat/fuselage-tokens": "*" "@rocket.chat/message-parser": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-client": 3.0.0-rc.13 - "@rocket.chat/ui-contexts": 3.0.0-rc.13 + "@rocket.chat/ui-client": 3.0.0-rc.14 + "@rocket.chat/ui-contexts": 3.0.0-rc.14 katex: "*" react: "*" languageName: unknown @@ -8409,7 +8409,7 @@ __metadata: "@rocket.chat/fuselage-tokens": ~0.32.0 "@rocket.chat/gazzodown": "workspace:^" "@rocket.chat/logo": ~0.31.28 - "@rocket.chat/message-parser": ~0.31.26 + "@rocket.chat/message-parser": ~0.31.27 "@rocket.chat/random": "workspace:~" "@rocket.chat/sdk": ^1.0.0-alpha.42 "@rocket.chat/ui-kit": ~0.32.1 @@ -8538,12 +8538,12 @@ __metadata: languageName: node linkType: hard -"@rocket.chat/message-parser@npm:~0.31.26": - version: 0.31.26 - resolution: "@rocket.chat/message-parser@npm:0.31.26" +"@rocket.chat/message-parser@npm:~0.31.27": + version: 0.31.27 + resolution: "@rocket.chat/message-parser@npm:0.31.27" dependencies: tldts: ~5.7.112 - checksum: d845409037ee51acd05b636aa6677053edc70b8fb759ee081cce42ec71070e3b45b4407dcfd4f49ea4373cb37f25c9b45f543f230a5fb20a55355077487669b2 + checksum: 27f206171ce744d66ba727b5329cacafb29b00e9e95ae0109fba839a48d2b3cc4a087f91120e6dbee040a482a8e9738b5063419aaae25ef6c8727bc3d8c007c2 languageName: node linkType: hard @@ -8606,7 +8606,7 @@ __metadata: "@rocket.chat/logger": "workspace:^" "@rocket.chat/logo": ~0.31.28 "@rocket.chat/memo": ~0.31.25 - "@rocket.chat/message-parser": ~0.31.26 + "@rocket.chat/message-parser": ~0.31.27 "@rocket.chat/mock-providers": "workspace:^" "@rocket.chat/model-typings": "workspace:^" "@rocket.chat/models": "workspace:^" @@ -9277,7 +9277,7 @@ __metadata: "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/eslint-config": "workspace:^" "@rocket.chat/license": "workspace:^" - "@rocket.chat/message-parser": ~0.31.26 + "@rocket.chat/message-parser": ~0.31.27 "@rocket.chat/ui-kit": ~0.32.1 "@types/jest": ~29.5.7 ajv: ^8.11.0 @@ -9470,7 +9470,7 @@ __metadata: "@rocket.chat/fuselage": "*" "@rocket.chat/fuselage-hooks": "*" "@rocket.chat/icons": "*" - "@rocket.chat/ui-contexts": 3.0.0-rc.13 + "@rocket.chat/ui-contexts": 3.0.0-rc.14 react: ~17.0.2 languageName: unknown linkType: soft @@ -9623,7 +9623,7 @@ __metadata: "@rocket.chat/fuselage-hooks": "*" "@rocket.chat/icons": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-contexts": 3.0.0-rc.13 + "@rocket.chat/ui-contexts": 3.0.0-rc.14 react: ^17.0.2 react-dom: ^17.0.2 languageName: unknown @@ -9709,7 +9709,7 @@ __metadata: peerDependencies: "@rocket.chat/layout": "*" "@rocket.chat/tools": "*" - "@rocket.chat/ui-contexts": 3.0.0-rc.13 + "@rocket.chat/ui-contexts": 3.0.0-rc.14 "@tanstack/react-query": "*" react: "*" react-hook-form: "*" @@ -34499,7 +34499,7 @@ __metadata: "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/emitter": ~0.31.25 "@rocket.chat/icons": ~0.32.0 - "@rocket.chat/message-parser": ~0.31.26 + "@rocket.chat/message-parser": ~0.31.27 "@rocket.chat/model-typings": "workspace:^" "@rocket.chat/models": "workspace:^" "@rocket.chat/rest-typings": "workspace:^" From f49f62dacda0b610c0bbe5fe0255b5316a746515 Mon Sep 17 00:00:00 2001 From: Hugo Costa Date: Thu, 30 Nov 2023 16:27:19 -0300 Subject: [PATCH 59/76] regression: condition to show buy now in the MACCard (#31097) --- .../admin/subscription/components/cards/MACCard.tsx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/meteor/client/views/admin/subscription/components/cards/MACCard.tsx b/apps/meteor/client/views/admin/subscription/components/cards/MACCard.tsx index 05065e2e4d40..f60292df064b 100644 --- a/apps/meteor/client/views/admin/subscription/components/cards/MACCard.tsx +++ b/apps/meteor/client/views/admin/subscription/components/cards/MACCard.tsx @@ -24,21 +24,24 @@ const MACCard = ({ total: max, }; - const nearLimit = pieGraph && pieGraph.used / pieGraph.total >= 0.8; + const nearLimit = pieGraph && pieGraph.used > 0 && pieGraph.used / pieGraph.total >= 0.8; const macLeft = pieGraph.total - pieGraph.used; + const shouldShowBuyMore = !hideManageSubscription && nearLimit; + const shouldShowUpgrade = hideManageSubscription && nearLimit; + const card: CardProps = { title: t('Monthly_active_contacts'), infoText: t('MAC_InfoText'), - ...(!hideManageSubscription && { + ...(shouldShowBuyMore && { upgradeButton: ( {t('Buy_more')} ), - ...(nearLimit && { + ...(shouldShowUpgrade && { upgradeButton: ( {t('Upgrade')} From 47baff55a23ee44ef84b9730c71ef723ad602b1a Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Thu, 30 Nov 2023 19:10:41 -0300 Subject: [PATCH 60/76] chore: Use draft release on supported versions (#31123) --- .github/workflows/ci.yml | 35 ++++++++++++++++++- .../plugin/compile-version.js | 7 +++- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc38dcd7fe65..611ee887112c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -80,9 +80,42 @@ jobs: echo "DOCKER_TAG: ${DOCKER_TAG}" echo "gh-docker-tag=${DOCKER_TAG}" >> $GITHUB_OUTPUT + notify-draft-services: + name: 🚀 Notify external services - draft + runs-on: ubuntu-20.04 + needs: [release-versions] + if: github.event_name == 'release' + steps: + - name: Register release on cloud as Draft + run: | + REPO_VERSION=$(node -p "require('./package.json').version") + + if [[ '${{ github.event_name }}' = 'release' ]]; then + GIT_TAG="${GITHUB_REF#*tags/}" + GIT_BRANCH="" + ARTIFACT_NAME="${REPO_VERSION}" + RC_VERSION=$GIT_TAG + + if [[ '${{ needs.release-versions.outputs.release }}' = 'release-candidate' ]]; then + RC_RELEASE=candidate + elif [[ '${{ needs.release-versions.outputs.release }}' = 'latest' ]]; then + RC_RELEASE=stable + fi + else + GIT_TAG="" + GIT_BRANCH="${GITHUB_REF#*heads/}" + ARTIFACT_NAME="${REPO_VERSION}.$GITHUB_SHA" + RC_VERSION="${REPO_VERSION}" + RC_RELEASE=develop + fi; + + curl -H "Content-Type: application/json" -H "X-Update-Token: $UPDATE_TOKEN" -d \ + "{\"nodeVersion\": \"${{ needs.release-versions.outputs.node-version }}\", \"compatibleMongoVersions\": [\"4.4\", \"5.0\", \"6.0\"], \"commit\": \"$GITHUB_SHA\", \"tag\": \"$RC_VERSION\", \"branch\": \"$GIT_BRANCH\", \"artifactName\": \"$ARTIFACT_NAME\", \"releaseType\": \"draft\", \"draftAs\": \"$RC_RELEASE\"}" \ + https://releases.rocket.chat/update + packages-build: name: 📦 Build Packages - needs: [release-versions] + needs: [release-versions, notify-draft-services] runs-on: ubuntu-20.04 steps: - name: Github Info diff --git a/apps/meteor/packages/rocketchat-version/plugin/compile-version.js b/apps/meteor/packages/rocketchat-version/plugin/compile-version.js index 084f14a1abd0..268f60885d9d 100644 --- a/apps/meteor/packages/rocketchat-version/plugin/compile-version.js +++ b/apps/meteor/packages/rocketchat-version/plugin/compile-version.js @@ -11,8 +11,13 @@ class VersionCompiler { async processFilesForTarget(files) { const processVersionFile = async function (file) { const data = await new Promise((resolve, reject) => { + const currentVersion = + JSON.parse(fs.readFileSync(path.resolve(process.cwd(), './package.json'), { encoding: 'utf8' }))?.version || ''; + + const url = `https://releases.rocket.chat/v2/server/supportedVersions?includeDraftType=stable&includeDraftTag=${currentVersion}`; + https - .get('https://releases.rocket.chat/v2/server/supportedVersions', function (response) { + .get(url, function (response) { let data = ''; response.on('data', function (chunk) { data += chunk; From a05136286db8c8b10f4f8edee821f556655724c7 Mon Sep 17 00:00:00 2001 From: Tasso Evangelista Date: Thu, 30 Nov 2023 19:11:00 -0300 Subject: [PATCH 61/76] regression: Interactive Cloud announcements (#31090) --------- Co-authored-by: Guilherme Gazzo Co-authored-by: Diego Sampaio --- apps/meteor/app/api/server/v1/cloud.ts | 21 -- .../syncWorkspace/handleCommsSync.ts | 41 ++- .../client/views/banners/BannerRegion.tsx | 2 - .../views/banners/hooks/useRemoteBanners.ts | 84 ------ .../views/cloud/CloudAnnouncementHandler.tsx | 11 +- .../views/cloud/CloudAnnouncementsRegion.tsx | 36 ++- ...nvalidCloudAnnouncementInteractionError.ts | 3 + .../errors/InvalidCoreAppInteractionError.ts | 3 + .../server/models/CloudAnnouncements.ts | 6 - apps/meteor/server/models/raw/Banners.ts | 23 +- .../server/models/raw/CloudAnnouncements.ts | 15 - apps/meteor/server/models/startup.ts | 1 - .../core-apps/cloudAnnouncements.module.ts | 275 ++++++++++++++++-- apps/meteor/server/services/banner/service.ts | 12 +- .../services/nps/getAndCreateNpsSurvey.ts | 1 + .../server/services/nps/notification.ts | 1 + .../core-services/src/types/IUiKitCoreApp.ts | 1 + packages/core-typings/src/IBanner.ts | 11 + .../core-typings/src/cloud/Announcement.ts | 24 +- .../src/cloud/WorkspaceSyncPayload.ts | 7 + packages/core-typings/src/cloud/index.ts | 1 + .../src/uikit/ServerInteraction.ts | 1 + packages/model-typings/src/index.ts | 1 - .../model-typings/src/models/IBannersModel.ts | 2 + .../src/models/ICloudAnnouncementsModel.ts | 8 - packages/models/src/index.ts | 2 - packages/rest-typings/src/v1/cloud.ts | 5 +- 27 files changed, 383 insertions(+), 215 deletions(-) delete mode 100644 apps/meteor/client/views/banners/hooks/useRemoteBanners.ts create mode 100644 apps/meteor/lib/errors/InvalidCloudAnnouncementInteractionError.ts create mode 100644 apps/meteor/lib/errors/InvalidCoreAppInteractionError.ts delete mode 100644 apps/meteor/server/models/CloudAnnouncements.ts delete mode 100644 apps/meteor/server/models/raw/CloudAnnouncements.ts delete mode 100644 packages/model-typings/src/models/ICloudAnnouncementsModel.ts diff --git a/apps/meteor/app/api/server/v1/cloud.ts b/apps/meteor/app/api/server/v1/cloud.ts index 19f3f2512c91..257612628bff 100644 --- a/apps/meteor/app/api/server/v1/cloud.ts +++ b/apps/meteor/app/api/server/v1/cloud.ts @@ -1,4 +1,3 @@ -import { CloudAnnouncements } from '@rocket.chat/models'; import { check } from 'meteor/check'; import { CloudWorkspaceRegistrationError } from '../../../../lib/errors/CloudWorkspaceRegistrationError'; @@ -219,23 +218,3 @@ API.v1.addRoute( }, }, ); - -API.v1.addRoute( - 'cloud.announcements', - { authRequired: true }, - { - async get() { - const now = new Date(); - const announcements = await CloudAnnouncements.find( - { - $or: [{ 'selector.roles': { $elemMatch: { $in: this.user.roles } } }, { selector: { $exists: false } }], - platform: { $in: ['web'] }, - startAt: { $lte: now }, - expireAt: { $gte: now }, - }, - { sort: { startAt: 1 } }, - ).toArray(); - return API.v1.success({ announcements }); - }, - }, -); diff --git a/apps/meteor/app/cloud/server/functions/syncWorkspace/handleCommsSync.ts b/apps/meteor/app/cloud/server/functions/syncWorkspace/handleCommsSync.ts index c8b07f8826cf..9d3934cc0a3c 100644 --- a/apps/meteor/app/cloud/server/functions/syncWorkspace/handleCommsSync.ts +++ b/apps/meteor/app/cloud/server/functions/syncWorkspace/handleCommsSync.ts @@ -1,6 +1,5 @@ import { NPS, Banner } from '@rocket.chat/core-services'; -import { type Cloud, type Serialized } from '@rocket.chat/core-typings'; -import { CloudAnnouncements } from '@rocket.chat/models'; +import type { Cloud, Serialized } from '@rocket.chat/core-typings'; import { getAndCreateNpsSurvey } from '../../../../../server/services/nps/getAndCreateNpsSurvey'; @@ -40,13 +39,18 @@ export const handleBannerOnWorkspaceSync = async (banners: Exclude): Cloud.Announcement => ({ - ...announcement, - _updatedAt: new Date(announcement._updatedAt), - expireAt: new Date(announcement.expireAt), - startAt: new Date(announcement.startAt), - createdAt: new Date(announcement.createdAt), -}); +const deserializeAnnouncement = (announcement: Serialized): Cloud.Announcement => { + const { inactivedAt, _updatedAt, expireAt, startAt, createdAt } = announcement; + + return { + ...announcement, + _updatedAt: new Date(_updatedAt), + expireAt: new Date(expireAt), + startAt: new Date(startAt), + createdAt: new Date(createdAt), + inactivedAt: inactivedAt ? new Date(inactivedAt) : undefined, + }; +}; export const handleAnnouncementsOnWorkspaceSync = async ( announcements: Exclude['announcements'], undefined>, @@ -54,12 +58,21 @@ export const handleAnnouncementsOnWorkspaceSync = async ( const { create, delete: deleteIds } = announcements; if (deleteIds) { - await CloudAnnouncements.deleteMany({ _id: { $in: deleteIds } }); + await Promise.all(deleteIds.map((bannerId) => Banner.disable(bannerId))); } - for await (const announcement of create.map(deserializeAnnouncement)) { - const { _id, ...rest } = announcement; + await Promise.all( + create.map(deserializeAnnouncement).map((announcement) => { + const { view, selector } = announcement; - await CloudAnnouncements.updateOne({ _id }, { $set: rest }, { upsert: true }); - } + return Banner.create({ + ...announcement, + ...(selector?.roles ? { roles: selector.roles } : {}), + view: { + ...view, + appId: 'cloud-announcements-core', + }, + }); + }), + ); }; diff --git a/apps/meteor/client/views/banners/BannerRegion.tsx b/apps/meteor/client/views/banners/BannerRegion.tsx index b79c156db842..6bf51148ac03 100644 --- a/apps/meteor/client/views/banners/BannerRegion.tsx +++ b/apps/meteor/client/views/banners/BannerRegion.tsx @@ -5,13 +5,11 @@ import { useSyncExternalStore } from 'use-sync-external-store/shim'; import * as banners from '../../lib/banners'; import LegacyBanner from './LegacyBanner'; import UiKitBanner from './UiKitBanner'; -import { useRemoteBanners } from './hooks/useRemoteBanners'; import { useUserBanners } from './hooks/useUserBanners'; const BannerRegion = (): ReactElement | null => { const payload = useSyncExternalStore(...banners.firstSubscription); - useRemoteBanners(); useUserBanners(); if (!payload) { diff --git a/apps/meteor/client/views/banners/hooks/useRemoteBanners.ts b/apps/meteor/client/views/banners/hooks/useRemoteBanners.ts deleted file mode 100644 index 96731f6c66a5..000000000000 --- a/apps/meteor/client/views/banners/hooks/useRemoteBanners.ts +++ /dev/null @@ -1,84 +0,0 @@ -import { BannerPlatform } from '@rocket.chat/core-typings'; -import type { IBanner, Serialized, UiKit } from '@rocket.chat/core-typings'; -import { useEndpoint, useStream, useUserId, ServerContext } from '@rocket.chat/ui-contexts'; -import { useContext, useEffect } from 'react'; - -import * as banners from '../../../lib/banners'; -import { useUiKitActionManager } from '../../../uikit/hooks/useUiKitActionManager'; - -export const useRemoteBanners = () => { - const uid = useUserId(); - - const serverContext = useContext(ServerContext); - const getBanners = useEndpoint('GET', '/v1/banners'); - const subscribeToNotifyLoggedIn = useStream('notify-logged'); - const subscribeToNotifyUser = useStream('notify-user'); - - const actionManager = useUiKitActionManager(); - - useEffect(() => { - if (!uid) { - return; - } - - const controller = new AbortController(); - - const { signal } = controller; - - const mapBanner = (banner: Serialized): UiKit.BannerView => ({ - ...banner.view, - viewId: banner.view.viewId || banner._id, - }); - - const fetchInitialBanners = async (): Promise => { - const response = await getBanners({ - platform: BannerPlatform.Web, - }); - - if (signal?.aborted) { - return; - } - - response.banners.forEach((banner) => { - actionManager.openView('banner', mapBanner(banner)); - }); - }; - - fetchInitialBanners(); - - const unsubscribeFromBannerChanged = subscribeToNotifyLoggedIn('banner-changed', async (event): Promise => { - const response = await serverContext.callEndpoint({ - method: 'GET', - pathPattern: '/v1/banners/:id', - keys: { id: event.bannerId }, - params: { platform: BannerPlatform.Web }, - }); - - if (signal?.aborted) { - return; - } - - if (!response.banners.length) { - actionManager.disposeView(event.bannerId); - return; - } - - response.banners.forEach((banner) => { - actionManager.openView('banner', mapBanner(banner)); - }); - }); - - const unsubscribeBanners = subscribeToNotifyUser(`${uid}/banners`, async (banner) => { - actionManager.openView('banner', banner.view); - }); - - return () => { - controller.abort(); - - unsubscribeFromBannerChanged(); - unsubscribeBanners(); - - banners.clear(); - }; - }, [getBanners, serverContext, subscribeToNotifyLoggedIn, uid, subscribeToNotifyUser, actionManager]); -}; diff --git a/apps/meteor/client/views/cloud/CloudAnnouncementHandler.tsx b/apps/meteor/client/views/cloud/CloudAnnouncementHandler.tsx index c345188d0873..b65fc5cf75d3 100644 --- a/apps/meteor/client/views/cloud/CloudAnnouncementHandler.tsx +++ b/apps/meteor/client/views/cloud/CloudAnnouncementHandler.tsx @@ -1,11 +1,11 @@ -import type { Cloud, UiKit } from '@rocket.chat/core-typings'; +import type { IBanner, UiKit } from '@rocket.chat/core-typings'; import { useEffect, useRef } from 'react'; import { useTranslation } from 'react-i18next'; import { exhaustiveCheck } from '../../../lib/utils/exhaustiveCheck'; import { useUiKitActionManager } from '../../uikit/hooks/useUiKitActionManager'; -type CloudAnnouncementHandlerProps = Pick; +type CloudAnnouncementHandlerProps = Pick; const CloudAnnouncementHandler = ({ dictionary = {}, surface, view }: CloudAnnouncementHandlerProps) => { const { i18n } = useTranslation(); @@ -23,13 +23,14 @@ const CloudAnnouncementHandler = ({ dictionary = {}, surface, view }: CloudAnnou const actionManager = useUiKitActionManager(); - const viewRef = useRef({ ...view, appId: 'cloud-announcements-core' }); - viewRef.current = { ...view, appId: 'cloud-announcements-core' }; + const viewRef = useRef({ ...view, appId: view.appId || 'cloud-announcements-core' }); + viewRef.current = { ...view, appId: view.appId || 'cloud-announcements-core' }; useEffect(() => { switch (surface) { case 'modal': { - const modalView = viewRef.current as UiKit.ModalView; + // TODO fixme + const modalView = viewRef.current as unknown as UiKit.ModalView; actionManager.openView('modal', modalView); diff --git a/apps/meteor/client/views/cloud/CloudAnnouncementsRegion.tsx b/apps/meteor/client/views/cloud/CloudAnnouncementsRegion.tsx index 69510848111c..7352b54e757f 100644 --- a/apps/meteor/client/views/cloud/CloudAnnouncementsRegion.tsx +++ b/apps/meteor/client/views/cloud/CloudAnnouncementsRegion.tsx @@ -1,23 +1,47 @@ -import { useEndpoint, useUserId } from '@rocket.chat/ui-contexts'; -import { useQuery } from '@tanstack/react-query'; -import React from 'react'; +import { BannerPlatform } from '@rocket.chat/core-typings'; +import { useEndpoint, useStream, useUserId } from '@rocket.chat/ui-contexts'; +import { useQuery, useQueryClient } from '@tanstack/react-query'; +import React, { useEffect } from 'react'; import CloudAnnouncementHandler from './CloudAnnouncementHandler'; const CloudAnnouncementsRegion = () => { const uid = useUserId(); - const getAnnouncements = useEndpoint('GET', '/v1/cloud.announcements'); + const getAnnouncements = useEndpoint('GET', '/v1/banners'); const { isSuccess, data: announcements } = useQuery({ queryKey: ['cloud', 'announcements'], - queryFn: () => getAnnouncements(), - select: (data) => data.announcements, + queryFn: () => getAnnouncements({ platform: BannerPlatform.Web }), + select: (data) => data.banners, enabled: !!uid, staleTime: 0, refetchInterval: 1000 * 60 * 5, }); + const subscribeToNotifyLoggedIn = useStream('notify-logged'); + const subscribeToNotifyUser = useStream('notify-user'); + const queryClient = useQueryClient(); + + useEffect(() => { + if (!uid) { + return; + } + + const unsubscribeFromBannerChanged = subscribeToNotifyLoggedIn('banner-changed', async () => { + queryClient.invalidateQueries(['cloud', 'announcements']); + }); + + const unsubscribeBanners = subscribeToNotifyUser(`${uid}/banners`, async () => { + queryClient.invalidateQueries(['cloud', 'announcements']); + }); + + return () => { + unsubscribeFromBannerChanged(); + unsubscribeBanners(); + }; + }, [subscribeToNotifyLoggedIn, uid, subscribeToNotifyUser, queryClient]); + if (!isSuccess) { return null; } diff --git a/apps/meteor/lib/errors/InvalidCloudAnnouncementInteractionError.ts b/apps/meteor/lib/errors/InvalidCloudAnnouncementInteractionError.ts new file mode 100644 index 000000000000..a8e042fdbe63 --- /dev/null +++ b/apps/meteor/lib/errors/InvalidCloudAnnouncementInteractionError.ts @@ -0,0 +1,3 @@ +export class InvalidCloudAnnouncementInteractionError extends Error { + name = InvalidCloudAnnouncementInteractionError.name; +} diff --git a/apps/meteor/lib/errors/InvalidCoreAppInteractionError.ts b/apps/meteor/lib/errors/InvalidCoreAppInteractionError.ts new file mode 100644 index 000000000000..8db9daa92eaa --- /dev/null +++ b/apps/meteor/lib/errors/InvalidCoreAppInteractionError.ts @@ -0,0 +1,3 @@ +export class InvalidCoreAppInteractionError extends Error { + name = InvalidCoreAppInteractionError.name; +} diff --git a/apps/meteor/server/models/CloudAnnouncements.ts b/apps/meteor/server/models/CloudAnnouncements.ts deleted file mode 100644 index 4f6692d67fc9..000000000000 --- a/apps/meteor/server/models/CloudAnnouncements.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { registerModel } from '@rocket.chat/models'; - -import { db } from '../database/utils'; -import { CloudAnnouncementsRaw } from './raw/CloudAnnouncements'; - -registerModel('ICloudAnnouncementsModel', new CloudAnnouncementsRaw(db)); diff --git a/apps/meteor/server/models/raw/Banners.ts b/apps/meteor/server/models/raw/Banners.ts index 74ce5abf50ec..2f3dd5f1207e 100644 --- a/apps/meteor/server/models/raw/Banners.ts +++ b/apps/meteor/server/models/raw/Banners.ts @@ -46,10 +46,29 @@ export class BannersRaw extends BaseRaw implements IBannersModel { $or: [{ roles: { $in: roles } }, { roles: { $exists: false } }], }; - return this.col.find(query, options); + return this.find(query, options); } disable(bannerId: string): Promise { - return this.col.updateOne({ _id: bannerId, active: { $ne: false } }, { $set: { active: false, inactivedAt: new Date() } }); + return this.updateOne({ _id: bannerId, active: { $ne: false } }, { $set: { active: false, inactivedAt: new Date() } }); + } + + createOrUpdate(banner: IBanner): Promise { + const invalidPlatform = banner.platform?.some((platform) => !Object.values(BannerPlatform).includes(platform)); + if (invalidPlatform) { + throw new Error('Invalid platform'); + } + + if (banner.startAt > banner.expireAt) { + throw new Error('Start date cannot be later than expire date'); + } + + if (banner.expireAt < new Date()) { + throw new Error('Cannot create banner already expired'); + } + + const { _id: bannerId, ...doc } = banner; + + return this.updateOne({ _id: bannerId }, { $set: { active: true, ...doc } }, { upsert: true }); } } diff --git a/apps/meteor/server/models/raw/CloudAnnouncements.ts b/apps/meteor/server/models/raw/CloudAnnouncements.ts deleted file mode 100644 index b801762170be..000000000000 --- a/apps/meteor/server/models/raw/CloudAnnouncements.ts +++ /dev/null @@ -1,15 +0,0 @@ -import type { Cloud } from '@rocket.chat/core-typings'; -import type { ICloudAnnouncementsModel } from '@rocket.chat/model-typings'; -import type { Db, DeleteResult } from 'mongodb'; - -import { BaseRaw } from './BaseRaw'; - -export class CloudAnnouncementsRaw extends BaseRaw implements ICloudAnnouncementsModel { - constructor(db: Db) { - super(db, 'cloud_announcements'); - } - - removeByViewId(viewId: string): Promise { - return this.deleteMany({ $or: [{ 'view.id': viewId }, { 'view.viewId': viewId }] }); - } -} diff --git a/apps/meteor/server/models/startup.ts b/apps/meteor/server/models/startup.ts index d355d1febd16..14b26e0f188f 100644 --- a/apps/meteor/server/models/startup.ts +++ b/apps/meteor/server/models/startup.ts @@ -68,4 +68,3 @@ import './Imports'; import './AppsTokens'; import './CronHistory'; import './Migrations'; -import './CloudAnnouncements'; diff --git a/apps/meteor/server/modules/core-apps/cloudAnnouncements.module.ts b/apps/meteor/server/modules/core-apps/cloudAnnouncements.module.ts index cf57c2a3faa7..89073efbfb0d 100644 --- a/apps/meteor/server/modules/core-apps/cloudAnnouncements.module.ts +++ b/apps/meteor/server/modules/core-apps/cloudAnnouncements.module.ts @@ -1,36 +1,273 @@ +import { Banner } from '@rocket.chat/core-services'; import type { IUiKitCoreApp, UiKitCoreAppPayload } from '@rocket.chat/core-services'; -import { CloudAnnouncements } from '@rocket.chat/models'; +import type { Cloud, IBanner, IUser, UiKit } from '@rocket.chat/core-typings'; +import { Banners } from '@rocket.chat/models'; +import { serverFetch as fetch } from '@rocket.chat/server-fetch'; + +import { getWorkspaceAccessToken } from '../../../app/cloud/server'; +import { syncWorkspace } from '../../../app/cloud/server/functions/syncWorkspace'; +import { settings } from '../../../app/settings/server'; +import { CloudWorkspaceConnectionError } from '../../../lib/errors/CloudWorkspaceConnectionError'; +import { InvalidCloudAnnouncementInteractionError } from '../../../lib/errors/InvalidCloudAnnouncementInteractionError'; +import { InvalidCoreAppInteractionError } from '../../../lib/errors/InvalidCoreAppInteractionError'; +import { SystemLogger } from '../../lib/logger/system'; + +type CloudAnnouncementInteractant = + | { + user: Pick; + } + | { + visitor: Pick['visitor'], 'id' | 'username' | 'name' | 'department' | 'phone'>; + }; + +type CloudAnnouncementInteractionRequest = UiKit.UserInteraction & CloudAnnouncementInteractant; export class CloudAnnouncementsModule implements IUiKitCoreApp { appId = 'cloud-announcements-core'; - // TODO: forward to Cloud Workspace API and update announcements - blockAction(_payload: UiKitCoreAppPayload): Promise { - return Promise.resolve(); + protected async getWorkspaceAccessToken() { + return getWorkspaceAccessToken(true); } - // TODO: forward to Cloud Workspace API and update announcements - viewSubmit(_payload: UiKitCoreAppPayload): Promise { - return Promise.resolve(); + protected getCloudUrl() { + return settings.get('Cloud_Url'); } - // TODO: forward to Cloud Workspace API and update announcements - async viewClosed(payload: UiKitCoreAppPayload): Promise { - const { view } = payload.payload; + blockAction(payload: UiKitCoreAppPayload): Promise { + return this.handlePayload(payload); + } - if (!view) { - // TODO: should we throw an error here? - return; - } + viewSubmit(payload: UiKitCoreAppPayload): Promise { + return this.handlePayload(payload); + } + + async viewClosed(payload: UiKitCoreAppPayload): Promise { + const { + payload: { view: { viewId } = {} }, + user: { _id: userId } = {}, + } = payload; - const viewId = view.id || view.viewId; + if (!userId) { + throw new Error('invalid user'); + } if (!viewId) { - // TODO: should we throw an error here? - return; + throw new Error('invalid view'); + } + + if (!payload.triggerId) { + throw new Error('invalid triggerId'); + } + + await Banner.dismiss(userId, viewId); + + const announcement = await Banners.findOneById>(viewId, { projection: { surface: 1 } }); + + const type = announcement?.surface === 'banner' ? 'banner.close' : 'modal.close'; + + // for viewClosed we just need to let Cloud know that the banner was closed, no need to wait for the response + setImmediate(async () => { + await this.handlePayload(payload); + }); + + return { + type, + triggerId: payload.triggerId, + appId: payload.appId, + viewId, + }; + } + + protected async handlePayload(payload: UiKitCoreAppPayload): Promise { + const interactant = this.getInteractant(payload); + const interaction = this.getInteraction(payload); + + try { + const serverInteraction = await this.pushUserInteraction(interactant, interaction); + + if (serverInteraction.appId !== this.appId) { + throw new InvalidCloudAnnouncementInteractionError(`Invalid appId`); + } + + if (serverInteraction.triggerId !== interaction.triggerId) { + throw new InvalidCloudAnnouncementInteractionError(`Invalid triggerId`); + } + + return serverInteraction; + } catch (error) { + SystemLogger.error(error); + } + } + + protected getInteractant(payload: UiKitCoreAppPayload): CloudAnnouncementInteractant { + if (payload.user) { + return { + user: { + _id: payload.user._id, + username: payload.user.username, + name: payload.user.name, + }, + }; + } + + if (payload.visitor) { + return { + visitor: { + id: payload.visitor.id, + username: payload.visitor.username, + name: payload.visitor.name, + department: payload.visitor.department, + phone: payload.visitor.phone, + }, + }; + } + + throw new CloudWorkspaceConnectionError(`Invalid user data received from Rocket.Chat Cloud`); + } + + /** + * Transform the payload received from the Core App back to the format the UI sends from the client + */ + protected getInteraction(payload: UiKitCoreAppPayload): UiKit.UserInteraction { + if (payload.type === 'blockAction' && payload.container?.type === 'message') { + const { + actionId, + payload: { blockId, value }, + message, + room, + triggerId, + } = payload; + + if (!actionId || !blockId || !triggerId) { + throw new InvalidCoreAppInteractionError(); + } + + return { + type: 'blockAction', + actionId, + payload: { + blockId, + value, + }, + container: { + type: 'message', + id: String(message), + }, + mid: String(message), + tmid: undefined, + rid: String(room), + triggerId, + }; + } + + if (payload.type === 'blockAction' && payload.container?.type === 'view') { + const { + actionId, + payload: { blockId, value }, + container: { id }, + triggerId, + } = payload; + + if (!actionId || !blockId || !triggerId) { + throw new InvalidCoreAppInteractionError(); + } + + return { + type: 'blockAction', + actionId, + payload: { + blockId, + value, + }, + container: { + type: 'view', + id, + }, + triggerId, + }; + } + + if (payload.type === 'viewClosed') { + const { + payload: { view, isCleared }, + triggerId, + } = payload; + + if (!view?.id || !triggerId) { + throw new InvalidCoreAppInteractionError(); + } + + return { + type: 'viewClosed', + payload: { + viewId: view.id, + view: view as any, + isCleared: Boolean(isCleared), + }, + triggerId, + }; + } + + if (payload.type === 'viewSubmit') { + const { + payload: { view }, + triggerId, + } = payload; + + if (!view?.id || !triggerId) { + throw new InvalidCoreAppInteractionError(); + } + + return { + type: 'viewSubmit', + payload: { + view: view as any, + }, + triggerId, + viewId: view.id, + }; + } + + throw new InvalidCoreAppInteractionError(); + } + + protected async pushUserInteraction( + interactant: CloudAnnouncementInteractant, + userInteraction: UiKit.UserInteraction, + ): Promise { + const token = await this.getWorkspaceAccessToken(); + + const request: CloudAnnouncementInteractionRequest = { + ...interactant, + ...userInteraction, + }; + + const response = await fetch(`${this.getCloudUrl()}/api/v3/comms/workspace/interaction`, { + method: 'POST', + headers: { + Authorization: `Bearer ${token}`, + }, + body: JSON.stringify(request), + }); + + if (!response.ok) { + const { error } = await response.json(); + throw new CloudWorkspaceConnectionError(`Failed to connect to Rocket.Chat Cloud: ${error}`); + } + + const payload: Cloud.WorkspaceInteractionResponsePayload = await response.json(); + + const { serverInteraction, serverAction } = payload; + + if (serverAction) { + switch (serverAction) { + case 'syncWorkspace': { + await syncWorkspace(); + break; + } + } } - await CloudAnnouncements.removeByViewId(viewId); - return undefined; + return serverInteraction; } } diff --git a/apps/meteor/server/services/banner/service.ts b/apps/meteor/server/services/banner/service.ts index d20b9e780875..76f8d19e4729 100644 --- a/apps/meteor/server/services/banner/service.ts +++ b/apps/meteor/server/services/banner/service.ts @@ -29,10 +29,10 @@ export class BannerService extends ServiceClassInternal implements IBannerServic async create(doc: Optional): Promise { const bannerId = doc._id || uuidv4(); - doc.view.appId = 'banner-core'; + doc.view.appId = doc.view.appId ?? 'banner-core'; doc.view.viewId = bannerId; - await Banners.create({ + await Banners.createOrUpdate({ ...doc, _id: bannerId, }); @@ -64,7 +64,13 @@ export class BannerService extends ServiceClassInternal implements IBannerServic const dismissed = new Set(result.map(({ bannerId }) => bannerId)); - return banners.filter((banner) => !dismissed.has(banner._id)); + return banners + .filter((banner) => !dismissed.has(banner._id)) + .map((banner) => ({ + ...banner, + // add surface to legacy banners + surface: !banner.surface ? 'banner' : banner.surface, + })); } async dismiss(userId: string, bannerId: string): Promise { diff --git a/apps/meteor/server/services/nps/getAndCreateNpsSurvey.ts b/apps/meteor/server/services/nps/getAndCreateNpsSurvey.ts index 8e4c06941c81..cb39a1053b15 100644 --- a/apps/meteor/server/services/nps/getAndCreateNpsSurvey.ts +++ b/apps/meteor/server/services/nps/getAndCreateNpsSurvey.ts @@ -57,6 +57,7 @@ export const getAndCreateNpsSurvey = async function getNpsSurvey(npsId: string) username: 'rocket.cat', }, view: surveyData.survey, + surface: 'banner', }; await Banner.create(banner); diff --git a/apps/meteor/server/services/nps/notification.ts b/apps/meteor/server/services/nps/notification.ts index 50cfa52331e7..e8e7e621d2c7 100644 --- a/apps/meteor/server/services/nps/notification.ts +++ b/apps/meteor/server/services/nps/notification.ts @@ -21,6 +21,7 @@ export const getBannerForAdmins = (expireAt: Date): Omit => { username: 'rocket.cat', }, _updatedAt: new Date(), + surface: 'banner', view: { viewId: Random.id(), appId: '', diff --git a/packages/core-services/src/types/IUiKitCoreApp.ts b/packages/core-services/src/types/IUiKitCoreApp.ts index 98799918e594..5ba521b73642 100644 --- a/packages/core-services/src/types/IUiKitCoreApp.ts +++ b/packages/core-services/src/types/IUiKitCoreApp.ts @@ -2,6 +2,7 @@ import type { IUser } from '@rocket.chat/core-typings'; import type { IServiceClass } from './ServiceClass'; +// TODO: Fix this type to match `UiKit.UserInteraction` from `@rocket.chat/core-typings` export type UiKitCoreAppPayload = { appId: string; type: 'blockAction' | 'viewClosed' | 'viewSubmit'; diff --git a/packages/core-typings/src/IBanner.ts b/packages/core-typings/src/IBanner.ts index 275c3353aa1f..b89858dac899 100644 --- a/packages/core-typings/src/IBanner.ts +++ b/packages/core-typings/src/IBanner.ts @@ -6,10 +6,18 @@ export enum BannerPlatform { Web = 'web', Mobile = 'mobile', } + +type Dictionary = { + [lng: string]: { + [key: string]: string; + }; +}; + export interface IBanner extends IRocketChatRecord { platform: BannerPlatform[]; // pĺatforms a banner could be shown expireAt: Date; // date when banner should not be shown anymore startAt: Date; // start date a banner should be presented + /** @deprecated a new `selector` field should be created for filtering instead */ roles?: string[]; // only show the banner to this roles createdBy: Pick; createdAt: Date; @@ -17,6 +25,9 @@ export interface IBanner extends IRocketChatRecord { active?: boolean; inactivedAt?: Date; snapshot?: string; + + dictionary?: Dictionary; + surface: 'banner' | 'modal'; } export type InactiveBanner = IBanner & { diff --git a/packages/core-typings/src/cloud/Announcement.ts b/packages/core-typings/src/cloud/Announcement.ts index 7c9541efe75a..8542af634a85 100644 --- a/packages/core-typings/src/cloud/Announcement.ts +++ b/packages/core-typings/src/cloud/Announcement.ts @@ -1,28 +1,8 @@ /* eslint-disable @typescript-eslint/naming-convention */ +import type { IBanner } from '../IBanner'; -import type { IRocketChatRecord } from '../IRocketChatRecord'; -import type * as UiKit from '../uikit'; - -type TargetPlatform = 'web' | 'mobile'; - -type Dictionary = { - [lng: string]: { - [key: string]: string; - }; -}; - -type Creator = 'cloud' | 'system'; - -export interface Announcement extends IRocketChatRecord { +export interface Announcement extends IBanner { selector?: { roles?: string[]; }; - platform: TargetPlatform[]; - expireAt: Date; - startAt: Date; - createdBy: Creator; - createdAt: Date; - dictionary?: Dictionary; - view: UiKit.View; - surface: 'banner' | 'modal'; } diff --git a/packages/core-typings/src/cloud/WorkspaceSyncPayload.ts b/packages/core-typings/src/cloud/WorkspaceSyncPayload.ts index fef2638e6507..2d0437dcd7f6 100644 --- a/packages/core-typings/src/cloud/WorkspaceSyncPayload.ts +++ b/packages/core-typings/src/cloud/WorkspaceSyncPayload.ts @@ -1,5 +1,6 @@ /* eslint-disable @typescript-eslint/naming-convention */ +import type { UiKit } from '..'; import type { IBanner } from '../IBanner'; import type { Announcement } from './Announcement'; import type { NpsSurveyAnnouncement } from './NpsSurveyAnnouncement'; @@ -55,6 +56,7 @@ export interface WorkspaceCommsRequestPayload { deploymentPlatform: string; version: string; } + export interface WorkspaceCommsResponsePayload { nps?: NpsSurveyAnnouncement | null; // Potentially consolidate into announcements announcements?: { @@ -62,3 +64,8 @@ export interface WorkspaceCommsResponsePayload { delete: Announcement['_id'][]; }; } + +export interface WorkspaceInteractionResponsePayload { + serverInteraction: UiKit.ServerInteraction; + serverAction?: 'syncWorkspace'; +} diff --git a/packages/core-typings/src/cloud/index.ts b/packages/core-typings/src/cloud/index.ts index da0565a215ed..8232ffce267f 100644 --- a/packages/core-typings/src/cloud/index.ts +++ b/packages/core-typings/src/cloud/index.ts @@ -7,4 +7,5 @@ export { WorkspaceSyncResponse, WorkspaceCommsRequestPayload, WorkspaceCommsResponsePayload, + WorkspaceInteractionResponsePayload, } from './WorkspaceSyncPayload'; diff --git a/packages/core-typings/src/uikit/ServerInteraction.ts b/packages/core-typings/src/uikit/ServerInteraction.ts index a5b8aabca26e..3addb7f4ad82 100644 --- a/packages/core-typings/src/uikit/ServerInteraction.ts +++ b/packages/core-typings/src/uikit/ServerInteraction.ts @@ -20,6 +20,7 @@ type CloseModalServerInteraction = { type: 'modal.close'; triggerId: string; appId: string; + viewId: ModalView['id']; }; type OpenBannerServerInteraction = { diff --git a/packages/model-typings/src/index.ts b/packages/model-typings/src/index.ts index a1874b144347..23e77ff1de29 100644 --- a/packages/model-typings/src/index.ts +++ b/packages/model-typings/src/index.ts @@ -79,4 +79,3 @@ export * from './models/IAuditLogModel'; export * from './models/ICronHistoryModel'; export * from './models/IMigrationsModel'; export * from './models/IModerationReportsModel'; -export * from './models/ICloudAnnouncementsModel'; diff --git a/packages/model-typings/src/models/IBannersModel.ts b/packages/model-typings/src/models/IBannersModel.ts index 4fe496bb954c..e0706c2b184a 100644 --- a/packages/model-typings/src/models/IBannersModel.ts +++ b/packages/model-typings/src/models/IBannersModel.ts @@ -9,4 +9,6 @@ export interface IBannersModel extends IBaseModel { findActiveByRoleOrId(roles: string[], platform: BannerPlatform, bannerId?: string, options?: FindOptions): FindCursor; disable(bannerId: string): Promise; + + createOrUpdate(banner: Optional): Promise; } diff --git a/packages/model-typings/src/models/ICloudAnnouncementsModel.ts b/packages/model-typings/src/models/ICloudAnnouncementsModel.ts deleted file mode 100644 index faa13bb3ff76..000000000000 --- a/packages/model-typings/src/models/ICloudAnnouncementsModel.ts +++ /dev/null @@ -1,8 +0,0 @@ -import type { Cloud } from '@rocket.chat/core-typings'; -import type { DeleteResult } from 'mongodb'; - -import type { IBaseModel } from './IBaseModel'; - -export interface ICloudAnnouncementsModel extends IBaseModel { - removeByViewId(viewId: string): Promise; -} diff --git a/packages/models/src/index.ts b/packages/models/src/index.ts index 1e83fe72b93e..e1cf91f1b0ee 100644 --- a/packages/models/src/index.ts +++ b/packages/models/src/index.ts @@ -78,7 +78,6 @@ import type { ICronHistoryModel, IMigrationsModel, IModerationReportsModel, - ICloudAnnouncementsModel, } from '@rocket.chat/model-typings'; import { proxify } from './proxify'; @@ -171,4 +170,3 @@ export const AuditLog = proxify('IAuditLogModel'); export const CronHistory = proxify('ICronHistoryModel'); export const Migrations = proxify('IMigrationsModel'); export const ModerationReports = proxify('IModerationReportsModel'); -export const CloudAnnouncements = proxify('ICloudAnnouncementsModel'); diff --git a/packages/rest-typings/src/v1/cloud.ts b/packages/rest-typings/src/v1/cloud.ts index fcacf85855e2..7602034b6912 100644 --- a/packages/rest-typings/src/v1/cloud.ts +++ b/packages/rest-typings/src/v1/cloud.ts @@ -1,4 +1,4 @@ -import type { CloudRegistrationIntentData, CloudConfirmationPollData, CloudRegistrationStatus, Cloud } from '@rocket.chat/core-typings'; +import type { CloudRegistrationIntentData, CloudConfirmationPollData, CloudRegistrationStatus } from '@rocket.chat/core-typings'; import Ajv from 'ajv'; const ajv = new Ajv({ @@ -94,7 +94,4 @@ export type CloudEndpoints = { '/v1/cloud.removeLicense': { POST: () => { success: boolean }; }; - '/v1/cloud.announcements': { - GET: () => { announcements: Cloud.Announcement[] }; - }; }; From 198378595e3503fea0b2d6a8ecfdd5954e1905de Mon Sep 17 00:00:00 2001 From: Hugo Costa Date: Thu, 30 Nov 2023 19:12:04 -0300 Subject: [PATCH 62/76] regression: seats cap contextual bar (#31096) --------- Co-authored-by: Guilherme Gazzo --- .../views/admin/users/AdminUserUpgrade.tsx | 32 +++++++++++++++ .../views/admin/users/AdminUsersPage.tsx | 24 +++++------- .../admin/users/ReachedSeatsCapModal.tsx | 39 ------------------- .../UserPageHeaderContentWithSeatsCap.tsx | 39 ++++--------------- .../rocketchat-i18n/i18n/en.i18n.json | 2 +- 5 files changed, 50 insertions(+), 86 deletions(-) create mode 100644 apps/meteor/client/views/admin/users/AdminUserUpgrade.tsx delete mode 100644 apps/meteor/ee/client/views/admin/users/ReachedSeatsCapModal.tsx diff --git a/apps/meteor/client/views/admin/users/AdminUserUpgrade.tsx b/apps/meteor/client/views/admin/users/AdminUserUpgrade.tsx new file mode 100644 index 000000000000..6b2baa1e2b9c --- /dev/null +++ b/apps/meteor/client/views/admin/users/AdminUserUpgrade.tsx @@ -0,0 +1,32 @@ +import { Button, ButtonGroup, ContextualbarEmptyContent, ContextualbarFooter } from '@rocket.chat/fuselage'; +import { useRouter, useTranslation } from '@rocket.chat/ui-contexts'; +import React from 'react'; + +import { ContextualbarScrollableContent } from '../../../components/Contextualbar'; +import { useExternalLink } from '../../../hooks/useExternalLink'; +import { useCheckoutUrl } from '../subscription/hooks/useCheckoutUrl'; + +const AdminUserUpgrade = () => { + const t = useTranslation(); + const router = useRouter(); + const manageSubscriptionUrl = useCheckoutUrl()({ target: 'user-page', action: 'buy_more' }); + const openExternalLink = useExternalLink(); + + return ( + <> + + + + + + + + + + + ); +}; + +export default AdminUserUpgrade; diff --git a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx index 70fe8636175c..2fd4c86d16b4 100644 --- a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx +++ b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx @@ -1,7 +1,7 @@ -import { Button, ButtonGroup } from '@rocket.chat/fuselage'; +import { Button, ButtonGroup, ContextualbarIcon } from '@rocket.chat/fuselage'; import { usePermission, useRouteParameter, useTranslation, useRouter } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; -import React, { useEffect, useRef } from 'react'; +import React, { useRef } from 'react'; import UserPageHeaderContentWithSeatsCap from '../../../../ee/client/views/admin/users/UserPageHeaderContentWithSeatsCap'; import { useSeatsCap } from '../../../../ee/client/views/admin/users/useSeatsCap'; @@ -12,10 +12,12 @@ import AdminInviteUsers from './AdminInviteUsers'; import AdminUserForm from './AdminUserForm'; import AdminUserFormWithData from './AdminUserFormWithData'; import AdminUserInfoWithData from './AdminUserInfoWithData'; +import AdminUserUpgrade from './AdminUserUpgrade'; import UsersTable from './UsersTable'; const UsersPage = (): ReactElement => { const t = useTranslation(); + const seatsCap = useSeatsCap(); const reload = useRef(() => null); @@ -28,21 +30,13 @@ const UsersPage = (): ReactElement => { const isCreateUserDisabled = useShouldPreventAction('activeUsers'); - useEffect(() => { - if (!context || !seatsCap) { - return; - } - - if (isCreateUserDisabled && !['edit', 'info'].includes(context)) { - router.navigate('/admin/users'); - } - }, [router, context, seatsCap, isCreateUserDisabled]); - const handleReload = (): void => { seatsCap?.reload(); reload.current(); }; + const isRoutePrevented = context && ['new', 'invite'].includes(context) && isCreateUserDisabled; + return ( @@ -71,6 +65,7 @@ const UsersPage = (): ReactElement => { {context && ( + {context === 'upgrade' && } {context === 'info' && t('User_Info')} {context === 'edit' && t('Edit_User')} @@ -81,8 +76,9 @@ const UsersPage = (): ReactElement => { {context === 'info' && id && } {context === 'edit' && id && } - {context === 'new' && } - {context === 'invite' && } + {!isRoutePrevented && context === 'new' && } + {!isRoutePrevented && context === 'invite' && } + {isRoutePrevented && } )} diff --git a/apps/meteor/ee/client/views/admin/users/ReachedSeatsCapModal.tsx b/apps/meteor/ee/client/views/admin/users/ReachedSeatsCapModal.tsx deleted file mode 100644 index a8c5fcf9ea2d..000000000000 --- a/apps/meteor/ee/client/views/admin/users/ReachedSeatsCapModal.tsx +++ /dev/null @@ -1,39 +0,0 @@ -import { Modal, Button, Box } from '@rocket.chat/fuselage'; -import type { ReactElement } from 'react'; -import React from 'react'; -import { useTranslation } from 'react-i18next'; - -type ReachedSeatsCapModalProps = { - onClose: () => void; - onContinue: () => void; - onBuyMoreSeats: () => void; - showContinue: boolean; -}; - -const ReachedSeatsCapModal = ({ onClose, onContinue, onBuyMoreSeats, showContinue }: ReachedSeatsCapModalProps): ReactElement => { - const { t } = useTranslation(); - - return ( - - - {t('Seat_limit_reached')} - - - - - {t('Seat_limit_reached_Description')} - - - - - {showContinue && } - - - - - ); -}; - -export default ReachedSeatsCapModal; diff --git a/apps/meteor/ee/client/views/admin/users/UserPageHeaderContentWithSeatsCap.tsx b/apps/meteor/ee/client/views/admin/users/UserPageHeaderContentWithSeatsCap.tsx index 4a2b618ff4b2..6fddef20a956 100644 --- a/apps/meteor/ee/client/views/admin/users/UserPageHeaderContentWithSeatsCap.tsx +++ b/apps/meteor/ee/client/views/admin/users/UserPageHeaderContentWithSeatsCap.tsx @@ -1,12 +1,11 @@ import { Button, ButtonGroup, Margins } from '@rocket.chat/fuselage'; -import { useSetModal, useTranslation, useRouter } from '@rocket.chat/ui-contexts'; +import { useTranslation, useRouter } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React from 'react'; import { useExternalLink } from '../../../../../client/hooks/useExternalLink'; import { useShouldPreventAction } from '../../../../../client/hooks/useShouldPreventAction'; import { useCheckoutUrl } from '../../../../../client/views/admin/subscription/hooks/useCheckoutUrl'; -import ReachedSeatsCapModal from './ReachedSeatsCapModal'; import SeatsCapUsage from './SeatsCapUsage'; type UserPageHeaderContentWithSeatsCapProps = { @@ -20,40 +19,16 @@ const UserPageHeaderContentWithSeatsCap = ({ activeUsers, maxActiveUsers }: User const t = useTranslation(); const router = useRouter(); - const setModal = useSetModal(); - const closeModal = (): void => setModal(null); - - const openExternalLink = useExternalLink(); const manageSubscriptionUrl = useCheckoutUrl()({ target: 'user-page', action: 'buy_more' }); + const openExternalLink = useExternalLink(); - const withReachedLimit = (fn: () => void) => (): void => { - if (isCreateUserDisabled) { - setModal( - { - router.navigate('/admin/users/new'); - closeModal(); - }} - onBuyMoreSeats={() => { - openExternalLink(manageSubscriptionUrl); - }} - showContinue={!isCreateUserDisabled} - />, - ); - return; - } - - fn(); - }; - - const handleNewButtonClick = withReachedLimit(() => { + const handleNewButtonClick = () => { router.navigate('/admin/users/new'); - }); + }; - const handleInviteButtonClick = withReachedLimit(() => { + const handleInviteButtonClick = () => { router.navigate('/admin/users/invite'); - }); + }; return ( <> @@ -68,7 +43,7 @@ const UserPageHeaderContentWithSeatsCap = ({ activeUsers, maxActiveUsers }: User {t('New_user')} {isCreateUserDisabled && ( - )} diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json index 8f51a67ac8b7..8bcb42394641 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json @@ -6188,6 +6188,6 @@ "Unlock_premium_capabilities": "Unlock premium capabilities", "Unlimited_seats": "Unlimited seats", "Seat_limit_reached": "Seat limit reached", - "Seat_limit_reached_Description": "Your workspace has reached its contractual seat limit and soon you won't be able to add more users.", + "Seat_limit_reached_Description": "Your workspace reached its contractual seat limit. Buy more seats to add more users.", "Buy_more_seats": "Buy more seats" } From 6f846602964d1e6f7b6f25648bf05aebe38a473b Mon Sep 17 00:00:00 2001 From: rocketchat-github-ci Date: Thu, 30 Nov 2023 22:20:55 +0000 Subject: [PATCH 63/76] Release 6.5.0-rc.15 [no ci] --- .changeset/bump-patch-1701382849135.md | 5 ++++ .changeset/pre.json | 1 + apps/meteor/.docker/Dockerfile.rhel | 2 +- apps/meteor/CHANGELOG.md | 26 +++++++++++++++++++ apps/meteor/app/utils/rocketchat.info | 2 +- apps/meteor/ee/server/services/CHANGELOG.md | 10 +++++++ apps/meteor/ee/server/services/package.json | 2 +- apps/meteor/package.json | 2 +- ee/apps/account-service/CHANGELOG.md | 10 +++++++ ee/apps/account-service/package.json | 2 +- ee/apps/authorization-service/CHANGELOG.md | 10 +++++++ ee/apps/authorization-service/package.json | 2 +- ee/apps/ddp-streamer/CHANGELOG.md | 12 +++++++++ ee/apps/ddp-streamer/package.json | 2 +- ee/apps/omnichannel-transcript/CHANGELOG.md | 11 ++++++++ ee/apps/omnichannel-transcript/package.json | 2 +- ee/apps/presence-service/CHANGELOG.md | 10 +++++++ ee/apps/presence-service/package.json | 2 +- ee/apps/queue-worker/CHANGELOG.md | 10 +++++++ ee/apps/queue-worker/package.json | 2 +- ee/apps/stream-hub-service/CHANGELOG.md | 9 +++++++ ee/apps/stream-hub-service/package.json | 2 +- ee/packages/api-client/CHANGELOG.md | 7 +++++ ee/packages/api-client/package.json | 2 +- ee/packages/ddp-client/CHANGELOG.md | 7 +++++ ee/packages/ddp-client/package.json | 2 +- ee/packages/license/CHANGELOG.md | 6 +++++ ee/packages/license/package.json | 2 +- ee/packages/omnichannel-services/CHANGELOG.md | 11 ++++++++ ee/packages/omnichannel-services/package.json | 2 +- ee/packages/pdf-worker/CHANGELOG.md | 6 +++++ ee/packages/pdf-worker/package.json | 2 +- ee/packages/presence/CHANGELOG.md | 8 ++++++ ee/packages/presence/package.json | 2 +- package.json | 2 +- packages/core-services/CHANGELOG.md | 8 ++++++ packages/core-services/package.json | 2 +- packages/core-typings/CHANGELOG.md | 2 ++ packages/core-typings/package.json | 2 +- packages/cron/CHANGELOG.md | 7 +++++ packages/cron/package.json | 2 +- packages/fuselage-ui-kit/CHANGELOG.md | 8 ++++++ packages/fuselage-ui-kit/package.json | 6 ++--- packages/gazzodown/CHANGELOG.md | 8 ++++++ packages/gazzodown/package.json | 8 +++--- packages/instance-status/CHANGELOG.md | 6 +++++ packages/instance-status/package.json | 2 +- packages/livechat/CHANGELOG.md | 6 +++++ packages/livechat/package.json | 2 +- packages/model-typings/CHANGELOG.md | 6 +++++ packages/model-typings/package.json | 2 +- packages/models/CHANGELOG.md | 6 +++++ packages/models/package.json | 2 +- packages/rest-typings/CHANGELOG.md | 7 +++++ packages/rest-typings/package.json | 2 +- packages/ui-client/CHANGELOG.md | 6 +++++ packages/ui-client/package.json | 4 +-- packages/ui-contexts/CHANGELOG.md | 8 ++++++ packages/ui-contexts/package.json | 2 +- packages/ui-video-conf/CHANGELOG.md | 6 +++++ packages/ui-video-conf/package.json | 4 +-- packages/uikit-playground/CHANGELOG.md | 7 +++++ packages/uikit-playground/package.json | 2 +- packages/web-ui-registration/CHANGELOG.md | 6 +++++ packages/web-ui-registration/package.json | 4 +-- 65 files changed, 297 insertions(+), 41 deletions(-) create mode 100644 .changeset/bump-patch-1701382849135.md diff --git a/.changeset/bump-patch-1701382849135.md b/.changeset/bump-patch-1701382849135.md new file mode 100644 index 000000000000..e1eaa7980afb --- /dev/null +++ b/.changeset/bump-patch-1701382849135.md @@ -0,0 +1,5 @@ +--- +'@rocket.chat/meteor': patch +--- + +Bump @rocket.chat/meteor version. diff --git a/.changeset/pre.json b/.changeset/pre.json index 0464637bd391..92561a077e4c 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -74,6 +74,7 @@ "bump-patch-1700801891621", "bump-patch-1701008644667", "bump-patch-1701126964872", + "bump-patch-1701382849135", "cool-rockets-talk", "cool-zoos-move", "cuddly-ties-run", diff --git a/apps/meteor/.docker/Dockerfile.rhel b/apps/meteor/.docker/Dockerfile.rhel index ff06c70c83ba..100d183da9b6 100644 --- a/apps/meteor/.docker/Dockerfile.rhel +++ b/apps/meteor/.docker/Dockerfile.rhel @@ -1,6 +1,6 @@ FROM registry.access.redhat.com/ubi8/nodejs-12 -ENV RC_VERSION 6.5.0-rc.14 +ENV RC_VERSION 6.5.0-rc.15 MAINTAINER buildmaster@rocket.chat diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md index 9ef797b5f86d..333a8a0ab7c7 100644 --- a/apps/meteor/CHANGELOG.md +++ b/apps/meteor/CHANGELOG.md @@ -1,5 +1,31 @@ # @rocket.chat/meteor +## 6.5.0-rc.15 + +### Patch Changes + +- Bump @rocket.chat/meteor version. + - @rocket.chat/core-typings@6.5.0-rc.15 + - @rocket.chat/rest-typings@6.5.0-rc.15 + - @rocket.chat/api-client@0.1.18-rc.8 + - @rocket.chat/license@0.1.0-rc.15 + - @rocket.chat/omnichannel-services@0.1.0-rc.15 + - @rocket.chat/pdf-worker@0.0.24-rc.8 + - @rocket.chat/presence@0.1.0-rc.15 + - @rocket.chat/core-services@0.3.0-rc.15 + - @rocket.chat/cron@0.0.20-rc.8 + - @rocket.chat/gazzodown@3.0.0-rc.15 + - @rocket.chat/model-typings@0.2.0-rc.15 + - @rocket.chat/ui-contexts@3.0.0-rc.15 + - @rocket.chat/server-cloud-communication@0.0.1 + - @rocket.chat/fuselage-ui-kit@3.0.0-rc.15 + - @rocket.chat/models@0.0.24-rc.8 + - @rocket.chat/ui-theming@0.1.1-rc.0 + - @rocket.chat/ui-client@3.0.0-rc.15 + - @rocket.chat/ui-video-conf@3.0.0-rc.15 + - @rocket.chat/web-ui-registration@3.0.0-rc.14 + - @rocket.chat/instance-status@0.0.24-rc.8 + ## 6.5.0-rc.14 ### Patch Changes diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info index cf07b51cb9c5..44b66d538ab1 100644 --- a/apps/meteor/app/utils/rocketchat.info +++ b/apps/meteor/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "6.5.0-rc.14" + "version": "6.5.0-rc.15" } diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md index d2e72605d8c9..fc495568d14d 100644 --- a/apps/meteor/ee/server/services/CHANGELOG.md +++ b/apps/meteor/ee/server/services/CHANGELOG.md @@ -1,5 +1,15 @@ # rocketchat-services +## 1.1.18-rc.8 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.15 +- @rocket.chat/rest-typings@6.5.0-rc.15 +- @rocket.chat/core-services@0.3.0-rc.15 +- @rocket.chat/model-typings@0.2.0-rc.15 +- @rocket.chat/models@0.0.24-rc.8 + ## 1.1.18-rc.7 ### Patch Changes diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json index f456c68aa9da..2d320dd4b2ac 100644 --- a/apps/meteor/ee/server/services/package.json +++ b/apps/meteor/ee/server/services/package.json @@ -1,7 +1,7 @@ { "name": "rocketchat-services", "private": true, - "version": "1.1.18-rc.7", + "version": "1.1.18-rc.8", "description": "Rocket.Chat Authorization service", "main": "index.js", "scripts": { diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 3f944a3352bc..61e62b75390d 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/meteor", "description": "The Ultimate Open Source WebChat Platform", - "version": "6.5.0-rc.14", + "version": "6.5.0-rc.15", "private": true, "author": { "name": "Rocket.Chat", diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md index 22e55ccf412b..b202571818f6 100644 --- a/ee/apps/account-service/CHANGELOG.md +++ b/ee/apps/account-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/account-service +## 0.3.0-rc.15 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.15 +- @rocket.chat/rest-typings@6.5.0-rc.15 +- @rocket.chat/core-services@0.3.0-rc.15 +- @rocket.chat/model-typings@0.2.0-rc.15 +- @rocket.chat/models@0.0.24-rc.8 + ## 0.3.0-rc.14 ### Patch Changes diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json index f447abf91149..66aff56c1e0a 100644 --- a/ee/apps/account-service/package.json +++ b/ee/apps/account-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/account-service", "private": true, - "version": "0.3.0-rc.14", + "version": "0.3.0-rc.15", "description": "Rocket.Chat Account service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/authorization-service/CHANGELOG.md b/ee/apps/authorization-service/CHANGELOG.md index ecd58d99b995..5efbdba06e1d 100644 --- a/ee/apps/authorization-service/CHANGELOG.md +++ b/ee/apps/authorization-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/authorization-service +## 0.3.0-rc.15 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.15 +- @rocket.chat/rest-typings@6.5.0-rc.15 +- @rocket.chat/core-services@0.3.0-rc.15 +- @rocket.chat/model-typings@0.2.0-rc.15 +- @rocket.chat/models@0.0.24-rc.8 + ## 0.3.0-rc.14 ### Patch Changes diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json index 85b9548b934e..5abc1042e991 100644 --- a/ee/apps/authorization-service/package.json +++ b/ee/apps/authorization-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/authorization-service", "private": true, - "version": "0.3.0-rc.14", + "version": "0.3.0-rc.15", "description": "Rocket.Chat Authorization service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/ddp-streamer/CHANGELOG.md b/ee/apps/ddp-streamer/CHANGELOG.md index fddadc9dd8b8..76f1389d1ab5 100644 --- a/ee/apps/ddp-streamer/CHANGELOG.md +++ b/ee/apps/ddp-streamer/CHANGELOG.md @@ -1,5 +1,17 @@ # @rocket.chat/ddp-streamer +## 0.2.0-rc.15 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.15 +- @rocket.chat/rest-typings@6.5.0-rc.15 +- @rocket.chat/core-services@0.3.0-rc.15 +- @rocket.chat/model-typings@0.2.0-rc.15 +- @rocket.chat/ui-contexts@3.0.0-rc.15 +- @rocket.chat/models@0.0.24-rc.8 +- @rocket.chat/instance-status@0.0.24-rc.8 + ## 0.2.0-rc.14 ### Patch Changes diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json index 708836fb0f3c..4592c16d6955 100644 --- a/ee/apps/ddp-streamer/package.json +++ b/ee/apps/ddp-streamer/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/ddp-streamer", "private": true, - "version": "0.2.0-rc.14", + "version": "0.2.0-rc.15", "description": "Rocket.Chat DDP-Streamer service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/omnichannel-transcript/CHANGELOG.md b/ee/apps/omnichannel-transcript/CHANGELOG.md index 1331166c0857..6066e9c1b4aa 100644 --- a/ee/apps/omnichannel-transcript/CHANGELOG.md +++ b/ee/apps/omnichannel-transcript/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/omnichannel-transcript +## 0.3.0-rc.15 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.15 +- @rocket.chat/omnichannel-services@0.1.0-rc.15 +- @rocket.chat/pdf-worker@0.0.24-rc.8 +- @rocket.chat/core-services@0.3.0-rc.15 +- @rocket.chat/model-typings@0.2.0-rc.15 +- @rocket.chat/models@0.0.24-rc.8 + ## 0.3.0-rc.14 ### Patch Changes diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json index c97550e2c95b..72a6d1e1ea4b 100644 --- a/ee/apps/omnichannel-transcript/package.json +++ b/ee/apps/omnichannel-transcript/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/omnichannel-transcript", "private": true, - "version": "0.3.0-rc.14", + "version": "0.3.0-rc.15", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/presence-service/CHANGELOG.md b/ee/apps/presence-service/CHANGELOG.md index 7aee7a99873a..47ebeb339e4a 100644 --- a/ee/apps/presence-service/CHANGELOG.md +++ b/ee/apps/presence-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/presence-service +## 0.3.0-rc.15 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.15 +- @rocket.chat/presence@0.1.0-rc.15 +- @rocket.chat/core-services@0.3.0-rc.15 +- @rocket.chat/model-typings@0.2.0-rc.15 +- @rocket.chat/models@0.0.24-rc.8 + ## 0.3.0-rc.14 ### Patch Changes diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json index 8dfebc688978..bcb07ecad287 100644 --- a/ee/apps/presence-service/package.json +++ b/ee/apps/presence-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/presence-service", "private": true, - "version": "0.3.0-rc.14", + "version": "0.3.0-rc.15", "description": "Rocket.Chat Presence service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/queue-worker/CHANGELOG.md b/ee/apps/queue-worker/CHANGELOG.md index 231ef1082925..facb8a0d4a36 100644 --- a/ee/apps/queue-worker/CHANGELOG.md +++ b/ee/apps/queue-worker/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/queue-worker +## 0.3.0-rc.15 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.15 +- @rocket.chat/omnichannel-services@0.1.0-rc.15 +- @rocket.chat/core-services@0.3.0-rc.15 +- @rocket.chat/model-typings@0.2.0-rc.15 +- @rocket.chat/models@0.0.24-rc.8 + ## 0.3.0-rc.14 ### Patch Changes diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json index ebb27e18c8aa..be3c4ab84bf5 100644 --- a/ee/apps/queue-worker/package.json +++ b/ee/apps/queue-worker/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/queue-worker", "private": true, - "version": "0.3.0-rc.14", + "version": "0.3.0-rc.15", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/stream-hub-service/CHANGELOG.md b/ee/apps/stream-hub-service/CHANGELOG.md index 86746ac7a956..da2f48603227 100644 --- a/ee/apps/stream-hub-service/CHANGELOG.md +++ b/ee/apps/stream-hub-service/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/stream-hub-service +## 0.3.0-rc.15 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.15 +- @rocket.chat/core-services@0.3.0-rc.15 +- @rocket.chat/model-typings@0.2.0-rc.15 +- @rocket.chat/models@0.0.24-rc.8 + ## 0.3.0-rc.14 ### Patch Changes diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json index 95e0b9adf4b0..eec82f0b9e72 100644 --- a/ee/apps/stream-hub-service/package.json +++ b/ee/apps/stream-hub-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/stream-hub-service", "private": true, - "version": "0.3.0-rc.14", + "version": "0.3.0-rc.15", "description": "Rocket.Chat Stream Hub service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/packages/api-client/CHANGELOG.md b/ee/packages/api-client/CHANGELOG.md index 26744b180a68..5ae0aae487c2 100644 --- a/ee/packages/api-client/CHANGELOG.md +++ b/ee/packages/api-client/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/api-client +## 0.1.18-rc.8 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.15 +- @rocket.chat/rest-typings@6.5.0-rc.15 + ## 0.1.18-rc.7 ### Patch Changes diff --git a/ee/packages/api-client/package.json b/ee/packages/api-client/package.json index 5b770d80da37..a17fe965c5cd 100644 --- a/ee/packages/api-client/package.json +++ b/ee/packages/api-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/api-client", - "version": "0.1.18-rc.7", + "version": "0.1.18-rc.8", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/ddp-client/CHANGELOG.md b/ee/packages/ddp-client/CHANGELOG.md index 0df8ddc9e8ce..05eab6119aef 100644 --- a/ee/packages/ddp-client/CHANGELOG.md +++ b/ee/packages/ddp-client/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/ddp-client +## 0.2.9-rc.8 + +### Patch Changes + +- @rocket.chat/rest-typings@6.5.0-rc.15 +- @rocket.chat/api-client@0.1.18-rc.8 + ## 0.2.9-rc.7 ### Patch Changes diff --git a/ee/packages/ddp-client/package.json b/ee/packages/ddp-client/package.json index b72e044ed39b..6f1065eeda4d 100644 --- a/ee/packages/ddp-client/package.json +++ b/ee/packages/ddp-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ddp-client", - "version": "0.2.9-rc.7", + "version": "0.2.9-rc.8", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/license/CHANGELOG.md b/ee/packages/license/CHANGELOG.md index b75604b3f24b..4aa810a89ba6 100644 --- a/ee/packages/license/CHANGELOG.md +++ b/ee/packages/license/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/license +## 0.1.0-rc.15 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.15 + ## 0.1.0-rc.14 ### Patch Changes diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json index fb3f4c372e0a..a507917ec2e5 100644 --- a/ee/packages/license/package.json +++ b/ee/packages/license/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/license", - "version": "0.1.0-rc.14", + "version": "0.1.0-rc.15", "private": true, "devDependencies": { "@swc/core": "^1.3.95", diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md index fc20de231bee..008b26a27b1a 100644 --- a/ee/packages/omnichannel-services/CHANGELOG.md +++ b/ee/packages/omnichannel-services/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/omnichannel-services +## 0.1.0-rc.15 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.15 +- @rocket.chat/rest-typings@6.5.0-rc.15 +- @rocket.chat/pdf-worker@0.0.24-rc.8 +- @rocket.chat/core-services@0.3.0-rc.15 +- @rocket.chat/model-typings@0.2.0-rc.15 +- @rocket.chat/models@0.0.24-rc.8 + ## 0.1.0-rc.14 ### Patch Changes diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json index 6a56e910c4f9..675c894efcd1 100644 --- a/ee/packages/omnichannel-services/package.json +++ b/ee/packages/omnichannel-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/omnichannel-services", - "version": "0.1.0-rc.14", + "version": "0.1.0-rc.15", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/ee/packages/pdf-worker/CHANGELOG.md b/ee/packages/pdf-worker/CHANGELOG.md index 308b6fd58030..c6756622040b 100644 --- a/ee/packages/pdf-worker/CHANGELOG.md +++ b/ee/packages/pdf-worker/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/pdf-worker +## 0.0.24-rc.8 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.15 + ## 0.0.24-rc.7 ### Patch Changes diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json index 586ca093a529..97e0cda7583a 100644 --- a/ee/packages/pdf-worker/package.json +++ b/ee/packages/pdf-worker/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/pdf-worker", - "version": "0.0.24-rc.7", + "version": "0.0.24-rc.8", "private": true, "devDependencies": { "@storybook/addon-essentials": "~6.5.16", diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md index ea313d2393b0..48136b8f8b5c 100644 --- a/ee/packages/presence/CHANGELOG.md +++ b/ee/packages/presence/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/presence +## 0.1.0-rc.15 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.15 +- @rocket.chat/core-services@0.3.0-rc.15 +- @rocket.chat/models@0.0.24-rc.8 + ## 0.1.0-rc.14 ### Patch Changes diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json index 0cbba501eacc..f8fe18f9a3eb 100644 --- a/ee/packages/presence/package.json +++ b/ee/packages/presence/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/presence", - "version": "0.1.0-rc.14", + "version": "0.1.0-rc.15", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/package.json b/package.json index 69e2f27cf778..e21c1ffcc968 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket.chat", - "version": "6.5.0-rc.14", + "version": "6.5.0-rc.15", "description": "Rocket.Chat Monorepo", "main": "index.js", "private": true, diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md index b2b01dadf25c..e45059832286 100644 --- a/packages/core-services/CHANGELOG.md +++ b/packages/core-services/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/core-services +## 0.3.0-rc.15 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.15 +- @rocket.chat/rest-typings@6.5.0-rc.15 +- @rocket.chat/models@0.0.24-rc.8 + ## 0.3.0-rc.14 ### Patch Changes diff --git a/packages/core-services/package.json b/packages/core-services/package.json index 82e977b80b5a..ab7ac9792aa7 100644 --- a/packages/core-services/package.json +++ b/packages/core-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/core-services", - "version": "0.3.0-rc.14", + "version": "0.3.0-rc.15", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md index c33e78ff701e..5ac0b9d3e10b 100644 --- a/packages/core-typings/CHANGELOG.md +++ b/packages/core-typings/CHANGELOG.md @@ -1,5 +1,7 @@ # @rocket.chat/core-typings +## 6.5.0-rc.15 + ## 6.5.0-rc.14 ## 6.5.0-rc.13 diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json index 8f79fde6200a..1f6112161219 100644 --- a/packages/core-typings/package.json +++ b/packages/core-typings/package.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/package", "name": "@rocket.chat/core-typings", - "version": "6.5.0-rc.14", + "version": "6.5.0-rc.15", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "eslint": "~8.45.0", diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md index 1d43804e0c25..31df166b339e 100644 --- a/packages/cron/CHANGELOG.md +++ b/packages/cron/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/cron +## 0.0.20-rc.8 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.15 +- @rocket.chat/models@0.0.24-rc.8 + ## 0.0.20-rc.7 ### Patch Changes diff --git a/packages/cron/package.json b/packages/cron/package.json index 8b9af209542a..d78b8457579b 100644 --- a/packages/cron/package.json +++ b/packages/cron/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/cron", - "version": "0.0.20-rc.7", + "version": "0.0.20-rc.8", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md index 2d40756b258a..6134b0f6a5f0 100644 --- a/packages/fuselage-ui-kit/CHANGELOG.md +++ b/packages/fuselage-ui-kit/CHANGELOG.md @@ -1,5 +1,13 @@ # Change Log +## 3.0.0-rc.15 + +### Patch Changes + +- @rocket.chat/gazzodown@3.0.0-rc.15 +- @rocket.chat/ui-contexts@3.0.0-rc.15 +- @rocket.chat/ui-video-conf@3.0.0-rc.15 + ## 3.0.0-rc.14 ### Patch Changes diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index ffe82900f3f3..3e1d19974eb1 100644 --- a/packages/fuselage-ui-kit/package.json +++ b/packages/fuselage-ui-kit/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/fuselage-ui-kit", "private": true, - "version": "3.0.0-rc.14", + "version": "3.0.0-rc.15", "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system", "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/", "author": { @@ -48,9 +48,9 @@ "@rocket.chat/icons": "*", "@rocket.chat/prettier-config": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.14", + "@rocket.chat/ui-contexts": "3.0.0-rc.15", "@rocket.chat/ui-kit": "*", - "@rocket.chat/ui-video-conf": "3.0.0-rc.14", + "@rocket.chat/ui-video-conf": "3.0.0-rc.15", "@tanstack/react-query": "*", "react": "*", "react-dom": "*" diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md index 5fd3dacd58db..69855c6f68d2 100644 --- a/packages/gazzodown/CHANGELOG.md +++ b/packages/gazzodown/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/gazzodown +## 3.0.0-rc.15 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.15 +- @rocket.chat/ui-contexts@3.0.0-rc.15 +- @rocket.chat/ui-client@3.0.0-rc.15 + ## 3.0.0-rc.14 ### Patch Changes diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json index 5e6a86202dec..913d301a517a 100644 --- a/packages/gazzodown/package.json +++ b/packages/gazzodown/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/gazzodown", - "version": "3.0.0-rc.14", + "version": "3.0.0-rc.15", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -65,14 +65,14 @@ "/dist" ], "peerDependencies": { - "@rocket.chat/core-typings": "6.5.0-rc.14", + "@rocket.chat/core-typings": "6.5.0-rc.15", "@rocket.chat/css-in-js": "*", "@rocket.chat/fuselage": "*", "@rocket.chat/fuselage-tokens": "*", "@rocket.chat/message-parser": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-client": "3.0.0-rc.14", - "@rocket.chat/ui-contexts": "3.0.0-rc.14", + "@rocket.chat/ui-client": "3.0.0-rc.15", + "@rocket.chat/ui-contexts": "3.0.0-rc.15", "katex": "*", "react": "*" }, diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md index 80358d41edc4..a0801c83d302 100644 --- a/packages/instance-status/CHANGELOG.md +++ b/packages/instance-status/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/instance-status +## 0.0.24-rc.8 + +### Patch Changes + +- @rocket.chat/models@0.0.24-rc.8 + ## 0.0.24-rc.7 ### Patch Changes diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json index 9d3df9223d01..d9dbc9b45476 100644 --- a/packages/instance-status/package.json +++ b/packages/instance-status/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/instance-status", - "version": "0.0.24-rc.7", + "version": "0.0.24-rc.8", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md index b927beea140b..56f1187cd467 100644 --- a/packages/livechat/CHANGELOG.md +++ b/packages/livechat/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/livechat Change Log +## 1.14.9-rc.8 + +### Patch Changes + +- @rocket.chat/gazzodown@3.0.0-rc.15 + ## 1.14.9-rc.7 ### Patch Changes diff --git a/packages/livechat/package.json b/packages/livechat/package.json index aa04831c77ac..3e9622e254ad 100644 --- a/packages/livechat/package.json +++ b/packages/livechat/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/livechat", - "version": "1.14.9-rc.7", + "version": "1.14.9-rc.8", "files": [ "/build" ], diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md index d82ebb5cabe3..67cf39b7d66e 100644 --- a/packages/model-typings/CHANGELOG.md +++ b/packages/model-typings/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/model-typings +## 0.2.0-rc.15 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.15 + ## 0.2.0-rc.14 ### Patch Changes diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json index 31ae66e2d642..c9abfaf5ec3e 100644 --- a/packages/model-typings/package.json +++ b/packages/model-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/model-typings", - "version": "0.2.0-rc.14", + "version": "0.2.0-rc.15", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md index cb1fcc6c78fa..7864286b3ca6 100644 --- a/packages/models/CHANGELOG.md +++ b/packages/models/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/models +## 0.0.24-rc.8 + +### Patch Changes + +- @rocket.chat/model-typings@0.2.0-rc.15 + ## 0.0.24-rc.7 ### Patch Changes diff --git a/packages/models/package.json b/packages/models/package.json index 3796ea560a18..55123632ea7c 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/models", - "version": "0.0.24-rc.7", + "version": "0.0.24-rc.8", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md index 30d77f40c438..44c27b65ef70 100644 --- a/packages/rest-typings/CHANGELOG.md +++ b/packages/rest-typings/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/rest-typings +## 6.5.0-rc.15 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.15 +- @rocket.chat/license@0.1.0-rc.15 + ## 6.5.0-rc.14 ### Patch Changes diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json index 31a27e629d1f..8bbf1d4d0351 100644 --- a/packages/rest-typings/package.json +++ b/packages/rest-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/rest-typings", - "version": "6.5.0-rc.14", + "version": "6.5.0-rc.15", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "@types/jest": "~29.5.7", diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md index c8b0c4443e97..d9844a8e0a7a 100644 --- a/packages/ui-client/CHANGELOG.md +++ b/packages/ui-client/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/ui-client +## 3.0.0-rc.15 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.15 + ## 3.0.0-rc.14 ### Patch Changes diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json index 5867b2ad6520..6d45538c9c98 100644 --- a/packages/ui-client/package.json +++ b/packages/ui-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-client", - "version": "3.0.0-rc.14", + "version": "3.0.0-rc.15", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -61,7 +61,7 @@ "@rocket.chat/fuselage": "*", "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.14", + "@rocket.chat/ui-contexts": "3.0.0-rc.15", "react": "~17.0.2" }, "volta": { diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md index 38d95f861211..01ef60bac109 100644 --- a/packages/ui-contexts/CHANGELOG.md +++ b/packages/ui-contexts/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/ui-contexts +## 3.0.0-rc.15 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.15 +- @rocket.chat/rest-typings@6.5.0-rc.15 +- @rocket.chat/ddp-client@0.2.9-rc.8 + ## 3.0.0-rc.14 ### Patch Changes diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json index a6115e726601..8c309766e9b1 100644 --- a/packages/ui-contexts/package.json +++ b/packages/ui-contexts/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-contexts", - "version": "3.0.0-rc.14", + "version": "3.0.0-rc.15", "private": true, "devDependencies": { "@rocket.chat/core-typings": "workspace:^", diff --git a/packages/ui-video-conf/CHANGELOG.md b/packages/ui-video-conf/CHANGELOG.md index 81a039f78eac..f2ebe0d8b11e 100644 --- a/packages/ui-video-conf/CHANGELOG.md +++ b/packages/ui-video-conf/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/ui-video-conf +## 3.0.0-rc.15 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.15 + ## 3.0.0-rc.14 ### Patch Changes diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json index 1df3a88db851..28144214deb8 100644 --- a/packages/ui-video-conf/package.json +++ b/packages/ui-video-conf/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-video-conf", - "version": "3.0.0-rc.14", + "version": "3.0.0-rc.15", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -35,7 +35,7 @@ "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.14", + "@rocket.chat/ui-contexts": "3.0.0-rc.15", "react": "^17.0.2", "react-dom": "^17.0.2" }, diff --git a/packages/uikit-playground/CHANGELOG.md b/packages/uikit-playground/CHANGELOG.md index c5034b373304..7807989d6f07 100644 --- a/packages/uikit-playground/CHANGELOG.md +++ b/packages/uikit-playground/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/uikit-playground +## 0.2.9-rc.8 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.15 +- @rocket.chat/fuselage-ui-kit@3.0.0-rc.15 + ## 0.2.9-rc.7 ### Patch Changes diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json index 1fc694af3894..86ed1d61af6a 100644 --- a/packages/uikit-playground/package.json +++ b/packages/uikit-playground/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/uikit-playground", "private": true, - "version": "0.2.9-rc.7", + "version": "0.2.9-rc.8", "type": "module", "scripts": { "dev": "vite", diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md index dfd2a900d761..4fc69ee51902 100644 --- a/packages/web-ui-registration/CHANGELOG.md +++ b/packages/web-ui-registration/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/web-ui-registration +## 3.0.0-rc.14 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.15 + ## 3.0.0-rc.13 ### Patch Changes diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json index 9e97e0c70dcb..89aa2301514c 100644 --- a/packages/web-ui-registration/package.json +++ b/packages/web-ui-registration/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/web-ui-registration", - "version": "3.0.0-rc.13", + "version": "3.0.0-rc.14", "private": true, "homepage": "https://rocket.chat", "main": "./dist/index.js", @@ -51,7 +51,7 @@ "peerDependencies": { "@rocket.chat/layout": "*", "@rocket.chat/tools": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.14", + "@rocket.chat/ui-contexts": "3.0.0-rc.15", "@tanstack/react-query": "*", "react": "*", "react-hook-form": "*", From 2ddf1473fcd1ca522d3b1daaf4a9a6dffcaf8640 Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Thu, 30 Nov 2023 19:26:49 -0300 Subject: [PATCH 64/76] chore: Fix notify-draft-services (#31124) --- .github/workflows/ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 611ee887112c..3fb5869aba16 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -86,6 +86,11 @@ jobs: needs: [release-versions] if: github.event_name == 'release' steps: + - uses: Bhacaz/checkout-files@v2 + with: + files: package.json + branch: ${{ github.ref }} + - name: Register release on cloud as Draft run: | REPO_VERSION=$(node -p "require('./package.json').version") From e074217ae5d3fa36b075a0be3fffecc6b44f2804 Mon Sep 17 00:00:00 2001 From: rocketchat-github-ci Date: Thu, 30 Nov 2023 22:33:13 +0000 Subject: [PATCH 65/76] Release 6.5.0-rc.16 [no ci] --- .changeset/bump-patch-1701383588348.md | 5 ++++ .changeset/pre.json | 1 + apps/meteor/.docker/Dockerfile.rhel | 2 +- apps/meteor/CHANGELOG.md | 26 +++++++++++++++++++ apps/meteor/app/utils/rocketchat.info | 2 +- apps/meteor/ee/server/services/CHANGELOG.md | 10 +++++++ apps/meteor/ee/server/services/package.json | 2 +- apps/meteor/package.json | 2 +- ee/apps/account-service/CHANGELOG.md | 10 +++++++ ee/apps/account-service/package.json | 2 +- ee/apps/authorization-service/CHANGELOG.md | 10 +++++++ ee/apps/authorization-service/package.json | 2 +- ee/apps/ddp-streamer/CHANGELOG.md | 12 +++++++++ ee/apps/ddp-streamer/package.json | 2 +- ee/apps/omnichannel-transcript/CHANGELOG.md | 11 ++++++++ ee/apps/omnichannel-transcript/package.json | 2 +- ee/apps/presence-service/CHANGELOG.md | 10 +++++++ ee/apps/presence-service/package.json | 2 +- ee/apps/queue-worker/CHANGELOG.md | 10 +++++++ ee/apps/queue-worker/package.json | 2 +- ee/apps/stream-hub-service/CHANGELOG.md | 9 +++++++ ee/apps/stream-hub-service/package.json | 2 +- ee/packages/api-client/CHANGELOG.md | 7 +++++ ee/packages/api-client/package.json | 2 +- ee/packages/ddp-client/CHANGELOG.md | 7 +++++ ee/packages/ddp-client/package.json | 2 +- ee/packages/license/CHANGELOG.md | 6 +++++ ee/packages/license/package.json | 2 +- ee/packages/omnichannel-services/CHANGELOG.md | 11 ++++++++ ee/packages/omnichannel-services/package.json | 2 +- ee/packages/pdf-worker/CHANGELOG.md | 6 +++++ ee/packages/pdf-worker/package.json | 2 +- ee/packages/presence/CHANGELOG.md | 8 ++++++ ee/packages/presence/package.json | 2 +- package.json | 2 +- packages/core-services/CHANGELOG.md | 8 ++++++ packages/core-services/package.json | 2 +- packages/core-typings/CHANGELOG.md | 2 ++ packages/core-typings/package.json | 2 +- packages/cron/CHANGELOG.md | 7 +++++ packages/cron/package.json | 2 +- packages/fuselage-ui-kit/CHANGELOG.md | 8 ++++++ packages/fuselage-ui-kit/package.json | 6 ++--- packages/gazzodown/CHANGELOG.md | 8 ++++++ packages/gazzodown/package.json | 8 +++--- packages/instance-status/CHANGELOG.md | 6 +++++ packages/instance-status/package.json | 2 +- packages/livechat/CHANGELOG.md | 6 +++++ packages/livechat/package.json | 2 +- packages/model-typings/CHANGELOG.md | 6 +++++ packages/model-typings/package.json | 2 +- packages/models/CHANGELOG.md | 6 +++++ packages/models/package.json | 2 +- packages/rest-typings/CHANGELOG.md | 7 +++++ packages/rest-typings/package.json | 2 +- packages/ui-client/CHANGELOG.md | 6 +++++ packages/ui-client/package.json | 4 +-- packages/ui-contexts/CHANGELOG.md | 8 ++++++ packages/ui-contexts/package.json | 2 +- packages/ui-video-conf/CHANGELOG.md | 6 +++++ packages/ui-video-conf/package.json | 4 +-- packages/uikit-playground/CHANGELOG.md | 7 +++++ packages/uikit-playground/package.json | 2 +- packages/web-ui-registration/CHANGELOG.md | 6 +++++ packages/web-ui-registration/package.json | 4 +-- 65 files changed, 297 insertions(+), 41 deletions(-) create mode 100644 .changeset/bump-patch-1701383588348.md diff --git a/.changeset/bump-patch-1701383588348.md b/.changeset/bump-patch-1701383588348.md new file mode 100644 index 000000000000..e1eaa7980afb --- /dev/null +++ b/.changeset/bump-patch-1701383588348.md @@ -0,0 +1,5 @@ +--- +'@rocket.chat/meteor': patch +--- + +Bump @rocket.chat/meteor version. diff --git a/.changeset/pre.json b/.changeset/pre.json index 92561a077e4c..36834052bc90 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -75,6 +75,7 @@ "bump-patch-1701008644667", "bump-patch-1701126964872", "bump-patch-1701382849135", + "bump-patch-1701383588348", "cool-rockets-talk", "cool-zoos-move", "cuddly-ties-run", diff --git a/apps/meteor/.docker/Dockerfile.rhel b/apps/meteor/.docker/Dockerfile.rhel index 100d183da9b6..53887d1e1409 100644 --- a/apps/meteor/.docker/Dockerfile.rhel +++ b/apps/meteor/.docker/Dockerfile.rhel @@ -1,6 +1,6 @@ FROM registry.access.redhat.com/ubi8/nodejs-12 -ENV RC_VERSION 6.5.0-rc.15 +ENV RC_VERSION 6.5.0-rc.16 MAINTAINER buildmaster@rocket.chat diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md index 333a8a0ab7c7..6b7534af8cd9 100644 --- a/apps/meteor/CHANGELOG.md +++ b/apps/meteor/CHANGELOG.md @@ -1,5 +1,31 @@ # @rocket.chat/meteor +## 6.5.0-rc.16 + +### Patch Changes + +- Bump @rocket.chat/meteor version. + - @rocket.chat/core-typings@6.5.0-rc.16 + - @rocket.chat/rest-typings@6.5.0-rc.16 + - @rocket.chat/api-client@0.1.18-rc.9 + - @rocket.chat/license@0.1.0-rc.16 + - @rocket.chat/omnichannel-services@0.1.0-rc.16 + - @rocket.chat/pdf-worker@0.0.24-rc.9 + - @rocket.chat/presence@0.1.0-rc.16 + - @rocket.chat/core-services@0.3.0-rc.16 + - @rocket.chat/cron@0.0.20-rc.9 + - @rocket.chat/gazzodown@3.0.0-rc.16 + - @rocket.chat/model-typings@0.2.0-rc.16 + - @rocket.chat/ui-contexts@3.0.0-rc.16 + - @rocket.chat/server-cloud-communication@0.0.1 + - @rocket.chat/fuselage-ui-kit@3.0.0-rc.16 + - @rocket.chat/models@0.0.24-rc.9 + - @rocket.chat/ui-theming@0.1.1-rc.0 + - @rocket.chat/ui-client@3.0.0-rc.16 + - @rocket.chat/ui-video-conf@3.0.0-rc.16 + - @rocket.chat/web-ui-registration@3.0.0-rc.15 + - @rocket.chat/instance-status@0.0.24-rc.9 + ## 6.5.0-rc.15 ### Patch Changes diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info index 44b66d538ab1..6a8eca95fc53 100644 --- a/apps/meteor/app/utils/rocketchat.info +++ b/apps/meteor/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "6.5.0-rc.15" + "version": "6.5.0-rc.16" } diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md index fc495568d14d..e62e93385508 100644 --- a/apps/meteor/ee/server/services/CHANGELOG.md +++ b/apps/meteor/ee/server/services/CHANGELOG.md @@ -1,5 +1,15 @@ # rocketchat-services +## 1.1.18-rc.9 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.16 +- @rocket.chat/rest-typings@6.5.0-rc.16 +- @rocket.chat/core-services@0.3.0-rc.16 +- @rocket.chat/model-typings@0.2.0-rc.16 +- @rocket.chat/models@0.0.24-rc.9 + ## 1.1.18-rc.8 ### Patch Changes diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json index 2d320dd4b2ac..923a2b5af1b8 100644 --- a/apps/meteor/ee/server/services/package.json +++ b/apps/meteor/ee/server/services/package.json @@ -1,7 +1,7 @@ { "name": "rocketchat-services", "private": true, - "version": "1.1.18-rc.8", + "version": "1.1.18-rc.9", "description": "Rocket.Chat Authorization service", "main": "index.js", "scripts": { diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 61e62b75390d..3924e57f06a8 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/meteor", "description": "The Ultimate Open Source WebChat Platform", - "version": "6.5.0-rc.15", + "version": "6.5.0-rc.16", "private": true, "author": { "name": "Rocket.Chat", diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md index b202571818f6..b9d381308432 100644 --- a/ee/apps/account-service/CHANGELOG.md +++ b/ee/apps/account-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/account-service +## 0.3.0-rc.16 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.16 +- @rocket.chat/rest-typings@6.5.0-rc.16 +- @rocket.chat/core-services@0.3.0-rc.16 +- @rocket.chat/model-typings@0.2.0-rc.16 +- @rocket.chat/models@0.0.24-rc.9 + ## 0.3.0-rc.15 ### Patch Changes diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json index 66aff56c1e0a..3ea79ca905b5 100644 --- a/ee/apps/account-service/package.json +++ b/ee/apps/account-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/account-service", "private": true, - "version": "0.3.0-rc.15", + "version": "0.3.0-rc.16", "description": "Rocket.Chat Account service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/authorization-service/CHANGELOG.md b/ee/apps/authorization-service/CHANGELOG.md index 5efbdba06e1d..b3afc30f68ca 100644 --- a/ee/apps/authorization-service/CHANGELOG.md +++ b/ee/apps/authorization-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/authorization-service +## 0.3.0-rc.16 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.16 +- @rocket.chat/rest-typings@6.5.0-rc.16 +- @rocket.chat/core-services@0.3.0-rc.16 +- @rocket.chat/model-typings@0.2.0-rc.16 +- @rocket.chat/models@0.0.24-rc.9 + ## 0.3.0-rc.15 ### Patch Changes diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json index 5abc1042e991..63f5f9b1e895 100644 --- a/ee/apps/authorization-service/package.json +++ b/ee/apps/authorization-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/authorization-service", "private": true, - "version": "0.3.0-rc.15", + "version": "0.3.0-rc.16", "description": "Rocket.Chat Authorization service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/ddp-streamer/CHANGELOG.md b/ee/apps/ddp-streamer/CHANGELOG.md index 76f1389d1ab5..7603d5980a2a 100644 --- a/ee/apps/ddp-streamer/CHANGELOG.md +++ b/ee/apps/ddp-streamer/CHANGELOG.md @@ -1,5 +1,17 @@ # @rocket.chat/ddp-streamer +## 0.2.0-rc.16 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.16 +- @rocket.chat/rest-typings@6.5.0-rc.16 +- @rocket.chat/core-services@0.3.0-rc.16 +- @rocket.chat/model-typings@0.2.0-rc.16 +- @rocket.chat/ui-contexts@3.0.0-rc.16 +- @rocket.chat/models@0.0.24-rc.9 +- @rocket.chat/instance-status@0.0.24-rc.9 + ## 0.2.0-rc.15 ### Patch Changes diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json index 4592c16d6955..bc4c45b58c89 100644 --- a/ee/apps/ddp-streamer/package.json +++ b/ee/apps/ddp-streamer/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/ddp-streamer", "private": true, - "version": "0.2.0-rc.15", + "version": "0.2.0-rc.16", "description": "Rocket.Chat DDP-Streamer service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/omnichannel-transcript/CHANGELOG.md b/ee/apps/omnichannel-transcript/CHANGELOG.md index 6066e9c1b4aa..5765b2a45146 100644 --- a/ee/apps/omnichannel-transcript/CHANGELOG.md +++ b/ee/apps/omnichannel-transcript/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/omnichannel-transcript +## 0.3.0-rc.16 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.16 +- @rocket.chat/omnichannel-services@0.1.0-rc.16 +- @rocket.chat/pdf-worker@0.0.24-rc.9 +- @rocket.chat/core-services@0.3.0-rc.16 +- @rocket.chat/model-typings@0.2.0-rc.16 +- @rocket.chat/models@0.0.24-rc.9 + ## 0.3.0-rc.15 ### Patch Changes diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json index 72a6d1e1ea4b..6866d372f595 100644 --- a/ee/apps/omnichannel-transcript/package.json +++ b/ee/apps/omnichannel-transcript/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/omnichannel-transcript", "private": true, - "version": "0.3.0-rc.15", + "version": "0.3.0-rc.16", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/presence-service/CHANGELOG.md b/ee/apps/presence-service/CHANGELOG.md index 47ebeb339e4a..8a0a90b866b3 100644 --- a/ee/apps/presence-service/CHANGELOG.md +++ b/ee/apps/presence-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/presence-service +## 0.3.0-rc.16 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.16 +- @rocket.chat/presence@0.1.0-rc.16 +- @rocket.chat/core-services@0.3.0-rc.16 +- @rocket.chat/model-typings@0.2.0-rc.16 +- @rocket.chat/models@0.0.24-rc.9 + ## 0.3.0-rc.15 ### Patch Changes diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json index bcb07ecad287..cd6320d2e7d2 100644 --- a/ee/apps/presence-service/package.json +++ b/ee/apps/presence-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/presence-service", "private": true, - "version": "0.3.0-rc.15", + "version": "0.3.0-rc.16", "description": "Rocket.Chat Presence service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/queue-worker/CHANGELOG.md b/ee/apps/queue-worker/CHANGELOG.md index facb8a0d4a36..c825b615488f 100644 --- a/ee/apps/queue-worker/CHANGELOG.md +++ b/ee/apps/queue-worker/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/queue-worker +## 0.3.0-rc.16 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.16 +- @rocket.chat/omnichannel-services@0.1.0-rc.16 +- @rocket.chat/core-services@0.3.0-rc.16 +- @rocket.chat/model-typings@0.2.0-rc.16 +- @rocket.chat/models@0.0.24-rc.9 + ## 0.3.0-rc.15 ### Patch Changes diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json index be3c4ab84bf5..f296b4544494 100644 --- a/ee/apps/queue-worker/package.json +++ b/ee/apps/queue-worker/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/queue-worker", "private": true, - "version": "0.3.0-rc.15", + "version": "0.3.0-rc.16", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/stream-hub-service/CHANGELOG.md b/ee/apps/stream-hub-service/CHANGELOG.md index da2f48603227..4d7a294971ee 100644 --- a/ee/apps/stream-hub-service/CHANGELOG.md +++ b/ee/apps/stream-hub-service/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/stream-hub-service +## 0.3.0-rc.16 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.16 +- @rocket.chat/core-services@0.3.0-rc.16 +- @rocket.chat/model-typings@0.2.0-rc.16 +- @rocket.chat/models@0.0.24-rc.9 + ## 0.3.0-rc.15 ### Patch Changes diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json index eec82f0b9e72..01e3a2368bc6 100644 --- a/ee/apps/stream-hub-service/package.json +++ b/ee/apps/stream-hub-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/stream-hub-service", "private": true, - "version": "0.3.0-rc.15", + "version": "0.3.0-rc.16", "description": "Rocket.Chat Stream Hub service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/packages/api-client/CHANGELOG.md b/ee/packages/api-client/CHANGELOG.md index 5ae0aae487c2..5937612dd5dd 100644 --- a/ee/packages/api-client/CHANGELOG.md +++ b/ee/packages/api-client/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/api-client +## 0.1.18-rc.9 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.16 +- @rocket.chat/rest-typings@6.5.0-rc.16 + ## 0.1.18-rc.8 ### Patch Changes diff --git a/ee/packages/api-client/package.json b/ee/packages/api-client/package.json index a17fe965c5cd..3447c9adebec 100644 --- a/ee/packages/api-client/package.json +++ b/ee/packages/api-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/api-client", - "version": "0.1.18-rc.8", + "version": "0.1.18-rc.9", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/ddp-client/CHANGELOG.md b/ee/packages/ddp-client/CHANGELOG.md index 05eab6119aef..d0cf49662a40 100644 --- a/ee/packages/ddp-client/CHANGELOG.md +++ b/ee/packages/ddp-client/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/ddp-client +## 0.2.9-rc.9 + +### Patch Changes + +- @rocket.chat/rest-typings@6.5.0-rc.16 +- @rocket.chat/api-client@0.1.18-rc.9 + ## 0.2.9-rc.8 ### Patch Changes diff --git a/ee/packages/ddp-client/package.json b/ee/packages/ddp-client/package.json index 6f1065eeda4d..ee1da81229eb 100644 --- a/ee/packages/ddp-client/package.json +++ b/ee/packages/ddp-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ddp-client", - "version": "0.2.9-rc.8", + "version": "0.2.9-rc.9", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/license/CHANGELOG.md b/ee/packages/license/CHANGELOG.md index 4aa810a89ba6..4e9e8dc531ba 100644 --- a/ee/packages/license/CHANGELOG.md +++ b/ee/packages/license/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/license +## 0.1.0-rc.16 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.16 + ## 0.1.0-rc.15 ### Patch Changes diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json index a507917ec2e5..7a7bf8724052 100644 --- a/ee/packages/license/package.json +++ b/ee/packages/license/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/license", - "version": "0.1.0-rc.15", + "version": "0.1.0-rc.16", "private": true, "devDependencies": { "@swc/core": "^1.3.95", diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md index 008b26a27b1a..56c5fda3ec64 100644 --- a/ee/packages/omnichannel-services/CHANGELOG.md +++ b/ee/packages/omnichannel-services/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/omnichannel-services +## 0.1.0-rc.16 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.16 +- @rocket.chat/rest-typings@6.5.0-rc.16 +- @rocket.chat/pdf-worker@0.0.24-rc.9 +- @rocket.chat/core-services@0.3.0-rc.16 +- @rocket.chat/model-typings@0.2.0-rc.16 +- @rocket.chat/models@0.0.24-rc.9 + ## 0.1.0-rc.15 ### Patch Changes diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json index 675c894efcd1..86ade01e68a6 100644 --- a/ee/packages/omnichannel-services/package.json +++ b/ee/packages/omnichannel-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/omnichannel-services", - "version": "0.1.0-rc.15", + "version": "0.1.0-rc.16", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/ee/packages/pdf-worker/CHANGELOG.md b/ee/packages/pdf-worker/CHANGELOG.md index c6756622040b..d874486a7709 100644 --- a/ee/packages/pdf-worker/CHANGELOG.md +++ b/ee/packages/pdf-worker/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/pdf-worker +## 0.0.24-rc.9 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.16 + ## 0.0.24-rc.8 ### Patch Changes diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json index 97e0cda7583a..4c85c3a5f0f1 100644 --- a/ee/packages/pdf-worker/package.json +++ b/ee/packages/pdf-worker/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/pdf-worker", - "version": "0.0.24-rc.8", + "version": "0.0.24-rc.9", "private": true, "devDependencies": { "@storybook/addon-essentials": "~6.5.16", diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md index 48136b8f8b5c..8d92e1c2a106 100644 --- a/ee/packages/presence/CHANGELOG.md +++ b/ee/packages/presence/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/presence +## 0.1.0-rc.16 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.16 +- @rocket.chat/core-services@0.3.0-rc.16 +- @rocket.chat/models@0.0.24-rc.9 + ## 0.1.0-rc.15 ### Patch Changes diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json index f8fe18f9a3eb..fcf6e4f1c867 100644 --- a/ee/packages/presence/package.json +++ b/ee/packages/presence/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/presence", - "version": "0.1.0-rc.15", + "version": "0.1.0-rc.16", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/package.json b/package.json index e21c1ffcc968..505c115106a7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket.chat", - "version": "6.5.0-rc.15", + "version": "6.5.0-rc.16", "description": "Rocket.Chat Monorepo", "main": "index.js", "private": true, diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md index e45059832286..db7207161261 100644 --- a/packages/core-services/CHANGELOG.md +++ b/packages/core-services/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/core-services +## 0.3.0-rc.16 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.16 +- @rocket.chat/rest-typings@6.5.0-rc.16 +- @rocket.chat/models@0.0.24-rc.9 + ## 0.3.0-rc.15 ### Patch Changes diff --git a/packages/core-services/package.json b/packages/core-services/package.json index ab7ac9792aa7..e400965011ea 100644 --- a/packages/core-services/package.json +++ b/packages/core-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/core-services", - "version": "0.3.0-rc.15", + "version": "0.3.0-rc.16", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md index 5ac0b9d3e10b..c0676b7c69da 100644 --- a/packages/core-typings/CHANGELOG.md +++ b/packages/core-typings/CHANGELOG.md @@ -1,5 +1,7 @@ # @rocket.chat/core-typings +## 6.5.0-rc.16 + ## 6.5.0-rc.15 ## 6.5.0-rc.14 diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json index 1f6112161219..a630a70aebc0 100644 --- a/packages/core-typings/package.json +++ b/packages/core-typings/package.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/package", "name": "@rocket.chat/core-typings", - "version": "6.5.0-rc.15", + "version": "6.5.0-rc.16", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "eslint": "~8.45.0", diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md index 31df166b339e..eb782d8b8c4c 100644 --- a/packages/cron/CHANGELOG.md +++ b/packages/cron/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/cron +## 0.0.20-rc.9 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.16 +- @rocket.chat/models@0.0.24-rc.9 + ## 0.0.20-rc.8 ### Patch Changes diff --git a/packages/cron/package.json b/packages/cron/package.json index d78b8457579b..2fa1aae1da12 100644 --- a/packages/cron/package.json +++ b/packages/cron/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/cron", - "version": "0.0.20-rc.8", + "version": "0.0.20-rc.9", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md index 6134b0f6a5f0..f3123cf3493f 100644 --- a/packages/fuselage-ui-kit/CHANGELOG.md +++ b/packages/fuselage-ui-kit/CHANGELOG.md @@ -1,5 +1,13 @@ # Change Log +## 3.0.0-rc.16 + +### Patch Changes + +- @rocket.chat/gazzodown@3.0.0-rc.16 +- @rocket.chat/ui-contexts@3.0.0-rc.16 +- @rocket.chat/ui-video-conf@3.0.0-rc.16 + ## 3.0.0-rc.15 ### Patch Changes diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index 3e1d19974eb1..84cd5055eb13 100644 --- a/packages/fuselage-ui-kit/package.json +++ b/packages/fuselage-ui-kit/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/fuselage-ui-kit", "private": true, - "version": "3.0.0-rc.15", + "version": "3.0.0-rc.16", "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system", "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/", "author": { @@ -48,9 +48,9 @@ "@rocket.chat/icons": "*", "@rocket.chat/prettier-config": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.15", + "@rocket.chat/ui-contexts": "3.0.0-rc.16", "@rocket.chat/ui-kit": "*", - "@rocket.chat/ui-video-conf": "3.0.0-rc.15", + "@rocket.chat/ui-video-conf": "3.0.0-rc.16", "@tanstack/react-query": "*", "react": "*", "react-dom": "*" diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md index 69855c6f68d2..de181aa8e343 100644 --- a/packages/gazzodown/CHANGELOG.md +++ b/packages/gazzodown/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/gazzodown +## 3.0.0-rc.16 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.16 +- @rocket.chat/ui-contexts@3.0.0-rc.16 +- @rocket.chat/ui-client@3.0.0-rc.16 + ## 3.0.0-rc.15 ### Patch Changes diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json index 913d301a517a..376d5e835fe6 100644 --- a/packages/gazzodown/package.json +++ b/packages/gazzodown/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/gazzodown", - "version": "3.0.0-rc.15", + "version": "3.0.0-rc.16", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -65,14 +65,14 @@ "/dist" ], "peerDependencies": { - "@rocket.chat/core-typings": "6.5.0-rc.15", + "@rocket.chat/core-typings": "6.5.0-rc.16", "@rocket.chat/css-in-js": "*", "@rocket.chat/fuselage": "*", "@rocket.chat/fuselage-tokens": "*", "@rocket.chat/message-parser": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-client": "3.0.0-rc.15", - "@rocket.chat/ui-contexts": "3.0.0-rc.15", + "@rocket.chat/ui-client": "3.0.0-rc.16", + "@rocket.chat/ui-contexts": "3.0.0-rc.16", "katex": "*", "react": "*" }, diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md index a0801c83d302..142638c77e88 100644 --- a/packages/instance-status/CHANGELOG.md +++ b/packages/instance-status/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/instance-status +## 0.0.24-rc.9 + +### Patch Changes + +- @rocket.chat/models@0.0.24-rc.9 + ## 0.0.24-rc.8 ### Patch Changes diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json index d9dbc9b45476..c05f2870a22a 100644 --- a/packages/instance-status/package.json +++ b/packages/instance-status/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/instance-status", - "version": "0.0.24-rc.8", + "version": "0.0.24-rc.9", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md index 56f1187cd467..7732f412c78d 100644 --- a/packages/livechat/CHANGELOG.md +++ b/packages/livechat/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/livechat Change Log +## 1.14.9-rc.9 + +### Patch Changes + +- @rocket.chat/gazzodown@3.0.0-rc.16 + ## 1.14.9-rc.8 ### Patch Changes diff --git a/packages/livechat/package.json b/packages/livechat/package.json index 3e9622e254ad..1232ccf81d2b 100644 --- a/packages/livechat/package.json +++ b/packages/livechat/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/livechat", - "version": "1.14.9-rc.8", + "version": "1.14.9-rc.9", "files": [ "/build" ], diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md index 67cf39b7d66e..d1f5876aa1af 100644 --- a/packages/model-typings/CHANGELOG.md +++ b/packages/model-typings/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/model-typings +## 0.2.0-rc.16 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.16 + ## 0.2.0-rc.15 ### Patch Changes diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json index c9abfaf5ec3e..5f0cd096e589 100644 --- a/packages/model-typings/package.json +++ b/packages/model-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/model-typings", - "version": "0.2.0-rc.15", + "version": "0.2.0-rc.16", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md index 7864286b3ca6..53978aa04f73 100644 --- a/packages/models/CHANGELOG.md +++ b/packages/models/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/models +## 0.0.24-rc.9 + +### Patch Changes + +- @rocket.chat/model-typings@0.2.0-rc.16 + ## 0.0.24-rc.8 ### Patch Changes diff --git a/packages/models/package.json b/packages/models/package.json index 55123632ea7c..7c9efc492d74 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/models", - "version": "0.0.24-rc.8", + "version": "0.0.24-rc.9", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md index 44c27b65ef70..0a6cda24992a 100644 --- a/packages/rest-typings/CHANGELOG.md +++ b/packages/rest-typings/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/rest-typings +## 6.5.0-rc.16 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.16 +- @rocket.chat/license@0.1.0-rc.16 + ## 6.5.0-rc.15 ### Patch Changes diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json index 8bbf1d4d0351..b938f7f56982 100644 --- a/packages/rest-typings/package.json +++ b/packages/rest-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/rest-typings", - "version": "6.5.0-rc.15", + "version": "6.5.0-rc.16", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "@types/jest": "~29.5.7", diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md index d9844a8e0a7a..26bc0df77b4c 100644 --- a/packages/ui-client/CHANGELOG.md +++ b/packages/ui-client/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/ui-client +## 3.0.0-rc.16 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.16 + ## 3.0.0-rc.15 ### Patch Changes diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json index 6d45538c9c98..aeebf13427b0 100644 --- a/packages/ui-client/package.json +++ b/packages/ui-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-client", - "version": "3.0.0-rc.15", + "version": "3.0.0-rc.16", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -61,7 +61,7 @@ "@rocket.chat/fuselage": "*", "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.15", + "@rocket.chat/ui-contexts": "3.0.0-rc.16", "react": "~17.0.2" }, "volta": { diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md index 01ef60bac109..fa257ad5aa08 100644 --- a/packages/ui-contexts/CHANGELOG.md +++ b/packages/ui-contexts/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/ui-contexts +## 3.0.0-rc.16 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.16 +- @rocket.chat/rest-typings@6.5.0-rc.16 +- @rocket.chat/ddp-client@0.2.9-rc.9 + ## 3.0.0-rc.15 ### Patch Changes diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json index 8c309766e9b1..1b4a36319483 100644 --- a/packages/ui-contexts/package.json +++ b/packages/ui-contexts/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-contexts", - "version": "3.0.0-rc.15", + "version": "3.0.0-rc.16", "private": true, "devDependencies": { "@rocket.chat/core-typings": "workspace:^", diff --git a/packages/ui-video-conf/CHANGELOG.md b/packages/ui-video-conf/CHANGELOG.md index f2ebe0d8b11e..a3ef0dad7ca2 100644 --- a/packages/ui-video-conf/CHANGELOG.md +++ b/packages/ui-video-conf/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/ui-video-conf +## 3.0.0-rc.16 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.16 + ## 3.0.0-rc.15 ### Patch Changes diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json index 28144214deb8..a787aefabe80 100644 --- a/packages/ui-video-conf/package.json +++ b/packages/ui-video-conf/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-video-conf", - "version": "3.0.0-rc.15", + "version": "3.0.0-rc.16", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -35,7 +35,7 @@ "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.15", + "@rocket.chat/ui-contexts": "3.0.0-rc.16", "react": "^17.0.2", "react-dom": "^17.0.2" }, diff --git a/packages/uikit-playground/CHANGELOG.md b/packages/uikit-playground/CHANGELOG.md index 7807989d6f07..d7a0801648f1 100644 --- a/packages/uikit-playground/CHANGELOG.md +++ b/packages/uikit-playground/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/uikit-playground +## 0.2.9-rc.9 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.16 +- @rocket.chat/fuselage-ui-kit@3.0.0-rc.16 + ## 0.2.9-rc.8 ### Patch Changes diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json index 86ed1d61af6a..1a35f7a5c701 100644 --- a/packages/uikit-playground/package.json +++ b/packages/uikit-playground/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/uikit-playground", "private": true, - "version": "0.2.9-rc.8", + "version": "0.2.9-rc.9", "type": "module", "scripts": { "dev": "vite", diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md index 4fc69ee51902..89d4eecf51ea 100644 --- a/packages/web-ui-registration/CHANGELOG.md +++ b/packages/web-ui-registration/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/web-ui-registration +## 3.0.0-rc.15 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.16 + ## 3.0.0-rc.14 ### Patch Changes diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json index 89aa2301514c..14e59e6d3c28 100644 --- a/packages/web-ui-registration/package.json +++ b/packages/web-ui-registration/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/web-ui-registration", - "version": "3.0.0-rc.14", + "version": "3.0.0-rc.15", "private": true, "homepage": "https://rocket.chat", "main": "./dist/index.js", @@ -51,7 +51,7 @@ "peerDependencies": { "@rocket.chat/layout": "*", "@rocket.chat/tools": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.15", + "@rocket.chat/ui-contexts": "3.0.0-rc.16", "@tanstack/react-query": "*", "react": "*", "react-hook-form": "*", From cea577b98fa030b0ff32a4d8068eb547c3dd054b Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Thu, 30 Nov 2023 22:03:59 -0300 Subject: [PATCH 66/76] chore: fix invalid auth (#31125) --------- Co-authored-by: Guilherme Gazzo --- .github/workflows/ci.yml | 2 ++ apps/meteor/client/lib/utils/isOverLicenseLimits.ts | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3fb5869aba16..a462d5d76c8a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -92,6 +92,8 @@ jobs: branch: ${{ github.ref }} - name: Register release on cloud as Draft + env: + UPDATE_TOKEN: ${{ secrets.UPDATE_TOKEN }} run: | REPO_VERSION=$(node -p "require('./package.json').version") diff --git a/apps/meteor/client/lib/utils/isOverLicenseLimits.ts b/apps/meteor/client/lib/utils/isOverLicenseLimits.ts index e2978a2d4c28..20e0a2b7ca42 100644 --- a/apps/meteor/client/lib/utils/isOverLicenseLimits.ts +++ b/apps/meteor/client/lib/utils/isOverLicenseLimits.ts @@ -9,4 +9,4 @@ type Limits = Record< >; export const isOverLicenseLimits = (limits: Limits): boolean => - Object.values(limits).some((limit) => limit.value !== undefined && limit.max !== -1 && limit.value > limit.max); + Object.values(limits).some((limit) => limit.value !== undefined && limit.max > 0 && limit.value > limit.max); From b41d65d5e5995719c844f356e95f9f256c1683fe Mon Sep 17 00:00:00 2001 From: rocketchat-github-ci Date: Fri, 1 Dec 2023 01:09:58 +0000 Subject: [PATCH 67/76] Release 6.5.0-rc.17 [no ci] --- .changeset/bump-patch-1701392992806.md | 5 ++++ .changeset/pre.json | 1 + apps/meteor/.docker/Dockerfile.rhel | 2 +- apps/meteor/CHANGELOG.md | 26 +++++++++++++++++++ apps/meteor/app/utils/rocketchat.info | 2 +- apps/meteor/ee/server/services/CHANGELOG.md | 10 +++++++ apps/meteor/ee/server/services/package.json | 2 +- apps/meteor/package.json | 2 +- ee/apps/account-service/CHANGELOG.md | 10 +++++++ ee/apps/account-service/package.json | 2 +- ee/apps/authorization-service/CHANGELOG.md | 10 +++++++ ee/apps/authorization-service/package.json | 2 +- ee/apps/ddp-streamer/CHANGELOG.md | 12 +++++++++ ee/apps/ddp-streamer/package.json | 2 +- ee/apps/omnichannel-transcript/CHANGELOG.md | 11 ++++++++ ee/apps/omnichannel-transcript/package.json | 2 +- ee/apps/presence-service/CHANGELOG.md | 10 +++++++ ee/apps/presence-service/package.json | 2 +- ee/apps/queue-worker/CHANGELOG.md | 10 +++++++ ee/apps/queue-worker/package.json | 2 +- ee/apps/stream-hub-service/CHANGELOG.md | 9 +++++++ ee/apps/stream-hub-service/package.json | 2 +- ee/packages/api-client/CHANGELOG.md | 7 +++++ ee/packages/api-client/package.json | 2 +- ee/packages/ddp-client/CHANGELOG.md | 7 +++++ ee/packages/ddp-client/package.json | 2 +- ee/packages/license/CHANGELOG.md | 6 +++++ ee/packages/license/package.json | 2 +- ee/packages/omnichannel-services/CHANGELOG.md | 11 ++++++++ ee/packages/omnichannel-services/package.json | 2 +- ee/packages/pdf-worker/CHANGELOG.md | 6 +++++ ee/packages/pdf-worker/package.json | 2 +- ee/packages/presence/CHANGELOG.md | 8 ++++++ ee/packages/presence/package.json | 2 +- package.json | 2 +- packages/core-services/CHANGELOG.md | 8 ++++++ packages/core-services/package.json | 2 +- packages/core-typings/CHANGELOG.md | 2 ++ packages/core-typings/package.json | 2 +- packages/cron/CHANGELOG.md | 7 +++++ packages/cron/package.json | 2 +- packages/fuselage-ui-kit/CHANGELOG.md | 8 ++++++ packages/fuselage-ui-kit/package.json | 6 ++--- packages/gazzodown/CHANGELOG.md | 8 ++++++ packages/gazzodown/package.json | 8 +++--- packages/instance-status/CHANGELOG.md | 6 +++++ packages/instance-status/package.json | 2 +- packages/livechat/CHANGELOG.md | 6 +++++ packages/livechat/package.json | 2 +- packages/model-typings/CHANGELOG.md | 6 +++++ packages/model-typings/package.json | 2 +- packages/models/CHANGELOG.md | 6 +++++ packages/models/package.json | 2 +- packages/rest-typings/CHANGELOG.md | 7 +++++ packages/rest-typings/package.json | 2 +- packages/ui-client/CHANGELOG.md | 6 +++++ packages/ui-client/package.json | 4 +-- packages/ui-contexts/CHANGELOG.md | 8 ++++++ packages/ui-contexts/package.json | 2 +- packages/ui-video-conf/CHANGELOG.md | 6 +++++ packages/ui-video-conf/package.json | 4 +-- packages/uikit-playground/CHANGELOG.md | 7 +++++ packages/uikit-playground/package.json | 2 +- packages/web-ui-registration/CHANGELOG.md | 6 +++++ packages/web-ui-registration/package.json | 4 +-- 65 files changed, 297 insertions(+), 41 deletions(-) create mode 100644 .changeset/bump-patch-1701392992806.md diff --git a/.changeset/bump-patch-1701392992806.md b/.changeset/bump-patch-1701392992806.md new file mode 100644 index 000000000000..e1eaa7980afb --- /dev/null +++ b/.changeset/bump-patch-1701392992806.md @@ -0,0 +1,5 @@ +--- +'@rocket.chat/meteor': patch +--- + +Bump @rocket.chat/meteor version. diff --git a/.changeset/pre.json b/.changeset/pre.json index 36834052bc90..3974af17bd4f 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -76,6 +76,7 @@ "bump-patch-1701126964872", "bump-patch-1701382849135", "bump-patch-1701383588348", + "bump-patch-1701392992806", "cool-rockets-talk", "cool-zoos-move", "cuddly-ties-run", diff --git a/apps/meteor/.docker/Dockerfile.rhel b/apps/meteor/.docker/Dockerfile.rhel index 53887d1e1409..f3c7b0c5707a 100644 --- a/apps/meteor/.docker/Dockerfile.rhel +++ b/apps/meteor/.docker/Dockerfile.rhel @@ -1,6 +1,6 @@ FROM registry.access.redhat.com/ubi8/nodejs-12 -ENV RC_VERSION 6.5.0-rc.16 +ENV RC_VERSION 6.5.0-rc.17 MAINTAINER buildmaster@rocket.chat diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md index 6b7534af8cd9..ab5931b6c165 100644 --- a/apps/meteor/CHANGELOG.md +++ b/apps/meteor/CHANGELOG.md @@ -1,5 +1,31 @@ # @rocket.chat/meteor +## 6.5.0-rc.17 + +### Patch Changes + +- Bump @rocket.chat/meteor version. + - @rocket.chat/core-typings@6.5.0-rc.17 + - @rocket.chat/rest-typings@6.5.0-rc.17 + - @rocket.chat/api-client@0.1.18-rc.10 + - @rocket.chat/license@0.1.0-rc.17 + - @rocket.chat/omnichannel-services@0.1.0-rc.17 + - @rocket.chat/pdf-worker@0.0.24-rc.10 + - @rocket.chat/presence@0.1.0-rc.17 + - @rocket.chat/core-services@0.3.0-rc.17 + - @rocket.chat/cron@0.0.20-rc.10 + - @rocket.chat/gazzodown@3.0.0-rc.17 + - @rocket.chat/model-typings@0.2.0-rc.17 + - @rocket.chat/ui-contexts@3.0.0-rc.17 + - @rocket.chat/server-cloud-communication@0.0.1 + - @rocket.chat/fuselage-ui-kit@3.0.0-rc.17 + - @rocket.chat/models@0.0.24-rc.10 + - @rocket.chat/ui-theming@0.1.1-rc.0 + - @rocket.chat/ui-client@3.0.0-rc.17 + - @rocket.chat/ui-video-conf@3.0.0-rc.17 + - @rocket.chat/web-ui-registration@3.0.0-rc.16 + - @rocket.chat/instance-status@0.0.24-rc.10 + ## 6.5.0-rc.16 ### Patch Changes diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info index 6a8eca95fc53..15346de9a267 100644 --- a/apps/meteor/app/utils/rocketchat.info +++ b/apps/meteor/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "6.5.0-rc.16" + "version": "6.5.0-rc.17" } diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md index e62e93385508..192892c6609e 100644 --- a/apps/meteor/ee/server/services/CHANGELOG.md +++ b/apps/meteor/ee/server/services/CHANGELOG.md @@ -1,5 +1,15 @@ # rocketchat-services +## 1.1.18-rc.10 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.17 +- @rocket.chat/rest-typings@6.5.0-rc.17 +- @rocket.chat/core-services@0.3.0-rc.17 +- @rocket.chat/model-typings@0.2.0-rc.17 +- @rocket.chat/models@0.0.24-rc.10 + ## 1.1.18-rc.9 ### Patch Changes diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json index 923a2b5af1b8..cd8d3b6fc6a6 100644 --- a/apps/meteor/ee/server/services/package.json +++ b/apps/meteor/ee/server/services/package.json @@ -1,7 +1,7 @@ { "name": "rocketchat-services", "private": true, - "version": "1.1.18-rc.9", + "version": "1.1.18-rc.10", "description": "Rocket.Chat Authorization service", "main": "index.js", "scripts": { diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 3924e57f06a8..890fbdaa8082 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/meteor", "description": "The Ultimate Open Source WebChat Platform", - "version": "6.5.0-rc.16", + "version": "6.5.0-rc.17", "private": true, "author": { "name": "Rocket.Chat", diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md index b9d381308432..61a283103955 100644 --- a/ee/apps/account-service/CHANGELOG.md +++ b/ee/apps/account-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/account-service +## 0.3.0-rc.17 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.17 +- @rocket.chat/rest-typings@6.5.0-rc.17 +- @rocket.chat/core-services@0.3.0-rc.17 +- @rocket.chat/model-typings@0.2.0-rc.17 +- @rocket.chat/models@0.0.24-rc.10 + ## 0.3.0-rc.16 ### Patch Changes diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json index 3ea79ca905b5..cff285a02e3d 100644 --- a/ee/apps/account-service/package.json +++ b/ee/apps/account-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/account-service", "private": true, - "version": "0.3.0-rc.16", + "version": "0.3.0-rc.17", "description": "Rocket.Chat Account service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/authorization-service/CHANGELOG.md b/ee/apps/authorization-service/CHANGELOG.md index b3afc30f68ca..b4077d22de06 100644 --- a/ee/apps/authorization-service/CHANGELOG.md +++ b/ee/apps/authorization-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/authorization-service +## 0.3.0-rc.17 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.17 +- @rocket.chat/rest-typings@6.5.0-rc.17 +- @rocket.chat/core-services@0.3.0-rc.17 +- @rocket.chat/model-typings@0.2.0-rc.17 +- @rocket.chat/models@0.0.24-rc.10 + ## 0.3.0-rc.16 ### Patch Changes diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json index 63f5f9b1e895..0be4df5dc35b 100644 --- a/ee/apps/authorization-service/package.json +++ b/ee/apps/authorization-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/authorization-service", "private": true, - "version": "0.3.0-rc.16", + "version": "0.3.0-rc.17", "description": "Rocket.Chat Authorization service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/ddp-streamer/CHANGELOG.md b/ee/apps/ddp-streamer/CHANGELOG.md index 7603d5980a2a..c704ef0a3b15 100644 --- a/ee/apps/ddp-streamer/CHANGELOG.md +++ b/ee/apps/ddp-streamer/CHANGELOG.md @@ -1,5 +1,17 @@ # @rocket.chat/ddp-streamer +## 0.2.0-rc.17 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.17 +- @rocket.chat/rest-typings@6.5.0-rc.17 +- @rocket.chat/core-services@0.3.0-rc.17 +- @rocket.chat/model-typings@0.2.0-rc.17 +- @rocket.chat/ui-contexts@3.0.0-rc.17 +- @rocket.chat/models@0.0.24-rc.10 +- @rocket.chat/instance-status@0.0.24-rc.10 + ## 0.2.0-rc.16 ### Patch Changes diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json index bc4c45b58c89..4031bc9e464e 100644 --- a/ee/apps/ddp-streamer/package.json +++ b/ee/apps/ddp-streamer/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/ddp-streamer", "private": true, - "version": "0.2.0-rc.16", + "version": "0.2.0-rc.17", "description": "Rocket.Chat DDP-Streamer service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/omnichannel-transcript/CHANGELOG.md b/ee/apps/omnichannel-transcript/CHANGELOG.md index 5765b2a45146..1f9d515d27b3 100644 --- a/ee/apps/omnichannel-transcript/CHANGELOG.md +++ b/ee/apps/omnichannel-transcript/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/omnichannel-transcript +## 0.3.0-rc.17 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.17 +- @rocket.chat/omnichannel-services@0.1.0-rc.17 +- @rocket.chat/pdf-worker@0.0.24-rc.10 +- @rocket.chat/core-services@0.3.0-rc.17 +- @rocket.chat/model-typings@0.2.0-rc.17 +- @rocket.chat/models@0.0.24-rc.10 + ## 0.3.0-rc.16 ### Patch Changes diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json index 6866d372f595..0bda6cc42983 100644 --- a/ee/apps/omnichannel-transcript/package.json +++ b/ee/apps/omnichannel-transcript/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/omnichannel-transcript", "private": true, - "version": "0.3.0-rc.16", + "version": "0.3.0-rc.17", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/presence-service/CHANGELOG.md b/ee/apps/presence-service/CHANGELOG.md index 8a0a90b866b3..bb68cd70d5e4 100644 --- a/ee/apps/presence-service/CHANGELOG.md +++ b/ee/apps/presence-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/presence-service +## 0.3.0-rc.17 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.17 +- @rocket.chat/presence@0.1.0-rc.17 +- @rocket.chat/core-services@0.3.0-rc.17 +- @rocket.chat/model-typings@0.2.0-rc.17 +- @rocket.chat/models@0.0.24-rc.10 + ## 0.3.0-rc.16 ### Patch Changes diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json index cd6320d2e7d2..dadca060d196 100644 --- a/ee/apps/presence-service/package.json +++ b/ee/apps/presence-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/presence-service", "private": true, - "version": "0.3.0-rc.16", + "version": "0.3.0-rc.17", "description": "Rocket.Chat Presence service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/queue-worker/CHANGELOG.md b/ee/apps/queue-worker/CHANGELOG.md index c825b615488f..4894b5940137 100644 --- a/ee/apps/queue-worker/CHANGELOG.md +++ b/ee/apps/queue-worker/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/queue-worker +## 0.3.0-rc.17 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.17 +- @rocket.chat/omnichannel-services@0.1.0-rc.17 +- @rocket.chat/core-services@0.3.0-rc.17 +- @rocket.chat/model-typings@0.2.0-rc.17 +- @rocket.chat/models@0.0.24-rc.10 + ## 0.3.0-rc.16 ### Patch Changes diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json index f296b4544494..f1b0cddbc1d7 100644 --- a/ee/apps/queue-worker/package.json +++ b/ee/apps/queue-worker/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/queue-worker", "private": true, - "version": "0.3.0-rc.16", + "version": "0.3.0-rc.17", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/stream-hub-service/CHANGELOG.md b/ee/apps/stream-hub-service/CHANGELOG.md index 4d7a294971ee..16b537a06ac2 100644 --- a/ee/apps/stream-hub-service/CHANGELOG.md +++ b/ee/apps/stream-hub-service/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/stream-hub-service +## 0.3.0-rc.17 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.17 +- @rocket.chat/core-services@0.3.0-rc.17 +- @rocket.chat/model-typings@0.2.0-rc.17 +- @rocket.chat/models@0.0.24-rc.10 + ## 0.3.0-rc.16 ### Patch Changes diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json index 01e3a2368bc6..9f95972a7fc0 100644 --- a/ee/apps/stream-hub-service/package.json +++ b/ee/apps/stream-hub-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/stream-hub-service", "private": true, - "version": "0.3.0-rc.16", + "version": "0.3.0-rc.17", "description": "Rocket.Chat Stream Hub service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/packages/api-client/CHANGELOG.md b/ee/packages/api-client/CHANGELOG.md index 5937612dd5dd..72360b0e6dfd 100644 --- a/ee/packages/api-client/CHANGELOG.md +++ b/ee/packages/api-client/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/api-client +## 0.1.18-rc.10 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.17 +- @rocket.chat/rest-typings@6.5.0-rc.17 + ## 0.1.18-rc.9 ### Patch Changes diff --git a/ee/packages/api-client/package.json b/ee/packages/api-client/package.json index 3447c9adebec..b54cf7f54d18 100644 --- a/ee/packages/api-client/package.json +++ b/ee/packages/api-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/api-client", - "version": "0.1.18-rc.9", + "version": "0.1.18-rc.10", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/ddp-client/CHANGELOG.md b/ee/packages/ddp-client/CHANGELOG.md index d0cf49662a40..2a8968a47285 100644 --- a/ee/packages/ddp-client/CHANGELOG.md +++ b/ee/packages/ddp-client/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/ddp-client +## 0.2.9-rc.10 + +### Patch Changes + +- @rocket.chat/rest-typings@6.5.0-rc.17 +- @rocket.chat/api-client@0.1.18-rc.10 + ## 0.2.9-rc.9 ### Patch Changes diff --git a/ee/packages/ddp-client/package.json b/ee/packages/ddp-client/package.json index ee1da81229eb..041420c4e8ed 100644 --- a/ee/packages/ddp-client/package.json +++ b/ee/packages/ddp-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ddp-client", - "version": "0.2.9-rc.9", + "version": "0.2.9-rc.10", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/license/CHANGELOG.md b/ee/packages/license/CHANGELOG.md index 4e9e8dc531ba..386ee2917e9e 100644 --- a/ee/packages/license/CHANGELOG.md +++ b/ee/packages/license/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/license +## 0.1.0-rc.17 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.17 + ## 0.1.0-rc.16 ### Patch Changes diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json index 7a7bf8724052..db5c4c25d148 100644 --- a/ee/packages/license/package.json +++ b/ee/packages/license/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/license", - "version": "0.1.0-rc.16", + "version": "0.1.0-rc.17", "private": true, "devDependencies": { "@swc/core": "^1.3.95", diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md index 56c5fda3ec64..1777da2c3e72 100644 --- a/ee/packages/omnichannel-services/CHANGELOG.md +++ b/ee/packages/omnichannel-services/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/omnichannel-services +## 0.1.0-rc.17 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.17 +- @rocket.chat/rest-typings@6.5.0-rc.17 +- @rocket.chat/pdf-worker@0.0.24-rc.10 +- @rocket.chat/core-services@0.3.0-rc.17 +- @rocket.chat/model-typings@0.2.0-rc.17 +- @rocket.chat/models@0.0.24-rc.10 + ## 0.1.0-rc.16 ### Patch Changes diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json index 86ade01e68a6..477ac222ba44 100644 --- a/ee/packages/omnichannel-services/package.json +++ b/ee/packages/omnichannel-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/omnichannel-services", - "version": "0.1.0-rc.16", + "version": "0.1.0-rc.17", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/ee/packages/pdf-worker/CHANGELOG.md b/ee/packages/pdf-worker/CHANGELOG.md index d874486a7709..bd848b4de12e 100644 --- a/ee/packages/pdf-worker/CHANGELOG.md +++ b/ee/packages/pdf-worker/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/pdf-worker +## 0.0.24-rc.10 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.17 + ## 0.0.24-rc.9 ### Patch Changes diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json index 4c85c3a5f0f1..4d7ceb8587e0 100644 --- a/ee/packages/pdf-worker/package.json +++ b/ee/packages/pdf-worker/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/pdf-worker", - "version": "0.0.24-rc.9", + "version": "0.0.24-rc.10", "private": true, "devDependencies": { "@storybook/addon-essentials": "~6.5.16", diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md index 8d92e1c2a106..575dcc9bec7e 100644 --- a/ee/packages/presence/CHANGELOG.md +++ b/ee/packages/presence/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/presence +## 0.1.0-rc.17 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.17 +- @rocket.chat/core-services@0.3.0-rc.17 +- @rocket.chat/models@0.0.24-rc.10 + ## 0.1.0-rc.16 ### Patch Changes diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json index fcf6e4f1c867..7643a7be3b5c 100644 --- a/ee/packages/presence/package.json +++ b/ee/packages/presence/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/presence", - "version": "0.1.0-rc.16", + "version": "0.1.0-rc.17", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/package.json b/package.json index 505c115106a7..fde4786580b4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket.chat", - "version": "6.5.0-rc.16", + "version": "6.5.0-rc.17", "description": "Rocket.Chat Monorepo", "main": "index.js", "private": true, diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md index db7207161261..b42d6f089a6d 100644 --- a/packages/core-services/CHANGELOG.md +++ b/packages/core-services/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/core-services +## 0.3.0-rc.17 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.17 +- @rocket.chat/rest-typings@6.5.0-rc.17 +- @rocket.chat/models@0.0.24-rc.10 + ## 0.3.0-rc.16 ### Patch Changes diff --git a/packages/core-services/package.json b/packages/core-services/package.json index e400965011ea..371307e6f979 100644 --- a/packages/core-services/package.json +++ b/packages/core-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/core-services", - "version": "0.3.0-rc.16", + "version": "0.3.0-rc.17", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md index c0676b7c69da..d9006f847557 100644 --- a/packages/core-typings/CHANGELOG.md +++ b/packages/core-typings/CHANGELOG.md @@ -1,5 +1,7 @@ # @rocket.chat/core-typings +## 6.5.0-rc.17 + ## 6.5.0-rc.16 ## 6.5.0-rc.15 diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json index a630a70aebc0..4c265d71452d 100644 --- a/packages/core-typings/package.json +++ b/packages/core-typings/package.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/package", "name": "@rocket.chat/core-typings", - "version": "6.5.0-rc.16", + "version": "6.5.0-rc.17", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "eslint": "~8.45.0", diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md index eb782d8b8c4c..4bf2649f0b6e 100644 --- a/packages/cron/CHANGELOG.md +++ b/packages/cron/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/cron +## 0.0.20-rc.10 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.17 +- @rocket.chat/models@0.0.24-rc.10 + ## 0.0.20-rc.9 ### Patch Changes diff --git a/packages/cron/package.json b/packages/cron/package.json index 2fa1aae1da12..4d0822f120c4 100644 --- a/packages/cron/package.json +++ b/packages/cron/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/cron", - "version": "0.0.20-rc.9", + "version": "0.0.20-rc.10", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md index f3123cf3493f..ffb96864472f 100644 --- a/packages/fuselage-ui-kit/CHANGELOG.md +++ b/packages/fuselage-ui-kit/CHANGELOG.md @@ -1,5 +1,13 @@ # Change Log +## 3.0.0-rc.17 + +### Patch Changes + +- @rocket.chat/gazzodown@3.0.0-rc.17 +- @rocket.chat/ui-contexts@3.0.0-rc.17 +- @rocket.chat/ui-video-conf@3.0.0-rc.17 + ## 3.0.0-rc.16 ### Patch Changes diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index 84cd5055eb13..e9aea12446ff 100644 --- a/packages/fuselage-ui-kit/package.json +++ b/packages/fuselage-ui-kit/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/fuselage-ui-kit", "private": true, - "version": "3.0.0-rc.16", + "version": "3.0.0-rc.17", "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system", "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/", "author": { @@ -48,9 +48,9 @@ "@rocket.chat/icons": "*", "@rocket.chat/prettier-config": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.16", + "@rocket.chat/ui-contexts": "3.0.0-rc.17", "@rocket.chat/ui-kit": "*", - "@rocket.chat/ui-video-conf": "3.0.0-rc.16", + "@rocket.chat/ui-video-conf": "3.0.0-rc.17", "@tanstack/react-query": "*", "react": "*", "react-dom": "*" diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md index de181aa8e343..4d5cc754bcc5 100644 --- a/packages/gazzodown/CHANGELOG.md +++ b/packages/gazzodown/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/gazzodown +## 3.0.0-rc.17 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.17 +- @rocket.chat/ui-contexts@3.0.0-rc.17 +- @rocket.chat/ui-client@3.0.0-rc.17 + ## 3.0.0-rc.16 ### Patch Changes diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json index 376d5e835fe6..aee7dd156cc5 100644 --- a/packages/gazzodown/package.json +++ b/packages/gazzodown/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/gazzodown", - "version": "3.0.0-rc.16", + "version": "3.0.0-rc.17", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -65,14 +65,14 @@ "/dist" ], "peerDependencies": { - "@rocket.chat/core-typings": "6.5.0-rc.16", + "@rocket.chat/core-typings": "6.5.0-rc.17", "@rocket.chat/css-in-js": "*", "@rocket.chat/fuselage": "*", "@rocket.chat/fuselage-tokens": "*", "@rocket.chat/message-parser": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-client": "3.0.0-rc.16", - "@rocket.chat/ui-contexts": "3.0.0-rc.16", + "@rocket.chat/ui-client": "3.0.0-rc.17", + "@rocket.chat/ui-contexts": "3.0.0-rc.17", "katex": "*", "react": "*" }, diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md index 142638c77e88..2468f6ee5f01 100644 --- a/packages/instance-status/CHANGELOG.md +++ b/packages/instance-status/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/instance-status +## 0.0.24-rc.10 + +### Patch Changes + +- @rocket.chat/models@0.0.24-rc.10 + ## 0.0.24-rc.9 ### Patch Changes diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json index c05f2870a22a..cf542f3cd168 100644 --- a/packages/instance-status/package.json +++ b/packages/instance-status/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/instance-status", - "version": "0.0.24-rc.9", + "version": "0.0.24-rc.10", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md index 7732f412c78d..2c1dc7a78940 100644 --- a/packages/livechat/CHANGELOG.md +++ b/packages/livechat/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/livechat Change Log +## 1.14.9-rc.10 + +### Patch Changes + +- @rocket.chat/gazzodown@3.0.0-rc.17 + ## 1.14.9-rc.9 ### Patch Changes diff --git a/packages/livechat/package.json b/packages/livechat/package.json index 1232ccf81d2b..b1f0dfb4e96b 100644 --- a/packages/livechat/package.json +++ b/packages/livechat/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/livechat", - "version": "1.14.9-rc.9", + "version": "1.14.9-rc.10", "files": [ "/build" ], diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md index d1f5876aa1af..db49b1b00f30 100644 --- a/packages/model-typings/CHANGELOG.md +++ b/packages/model-typings/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/model-typings +## 0.2.0-rc.17 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.17 + ## 0.2.0-rc.16 ### Patch Changes diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json index 5f0cd096e589..7dd8e3c8cede 100644 --- a/packages/model-typings/package.json +++ b/packages/model-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/model-typings", - "version": "0.2.0-rc.16", + "version": "0.2.0-rc.17", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md index 53978aa04f73..9e7b55ca6bad 100644 --- a/packages/models/CHANGELOG.md +++ b/packages/models/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/models +## 0.0.24-rc.10 + +### Patch Changes + +- @rocket.chat/model-typings@0.2.0-rc.17 + ## 0.0.24-rc.9 ### Patch Changes diff --git a/packages/models/package.json b/packages/models/package.json index 7c9efc492d74..5dad303dde6a 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/models", - "version": "0.0.24-rc.9", + "version": "0.0.24-rc.10", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md index 0a6cda24992a..a4a03893e53b 100644 --- a/packages/rest-typings/CHANGELOG.md +++ b/packages/rest-typings/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/rest-typings +## 6.5.0-rc.17 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.17 +- @rocket.chat/license@0.1.0-rc.17 + ## 6.5.0-rc.16 ### Patch Changes diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json index b938f7f56982..74a378edf714 100644 --- a/packages/rest-typings/package.json +++ b/packages/rest-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/rest-typings", - "version": "6.5.0-rc.16", + "version": "6.5.0-rc.17", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "@types/jest": "~29.5.7", diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md index 26bc0df77b4c..246745ce168d 100644 --- a/packages/ui-client/CHANGELOG.md +++ b/packages/ui-client/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/ui-client +## 3.0.0-rc.17 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.17 + ## 3.0.0-rc.16 ### Patch Changes diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json index aeebf13427b0..600f02864ada 100644 --- a/packages/ui-client/package.json +++ b/packages/ui-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-client", - "version": "3.0.0-rc.16", + "version": "3.0.0-rc.17", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -61,7 +61,7 @@ "@rocket.chat/fuselage": "*", "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.16", + "@rocket.chat/ui-contexts": "3.0.0-rc.17", "react": "~17.0.2" }, "volta": { diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md index fa257ad5aa08..e0cf9651d057 100644 --- a/packages/ui-contexts/CHANGELOG.md +++ b/packages/ui-contexts/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/ui-contexts +## 3.0.0-rc.17 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.17 +- @rocket.chat/rest-typings@6.5.0-rc.17 +- @rocket.chat/ddp-client@0.2.9-rc.10 + ## 3.0.0-rc.16 ### Patch Changes diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json index 1b4a36319483..d60c466648a6 100644 --- a/packages/ui-contexts/package.json +++ b/packages/ui-contexts/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-contexts", - "version": "3.0.0-rc.16", + "version": "3.0.0-rc.17", "private": true, "devDependencies": { "@rocket.chat/core-typings": "workspace:^", diff --git a/packages/ui-video-conf/CHANGELOG.md b/packages/ui-video-conf/CHANGELOG.md index a3ef0dad7ca2..3b042d416ac1 100644 --- a/packages/ui-video-conf/CHANGELOG.md +++ b/packages/ui-video-conf/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/ui-video-conf +## 3.0.0-rc.17 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.17 + ## 3.0.0-rc.16 ### Patch Changes diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json index a787aefabe80..a2b2eb0d44bf 100644 --- a/packages/ui-video-conf/package.json +++ b/packages/ui-video-conf/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-video-conf", - "version": "3.0.0-rc.16", + "version": "3.0.0-rc.17", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -35,7 +35,7 @@ "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.16", + "@rocket.chat/ui-contexts": "3.0.0-rc.17", "react": "^17.0.2", "react-dom": "^17.0.2" }, diff --git a/packages/uikit-playground/CHANGELOG.md b/packages/uikit-playground/CHANGELOG.md index d7a0801648f1..d315bab24f7e 100644 --- a/packages/uikit-playground/CHANGELOG.md +++ b/packages/uikit-playground/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/uikit-playground +## 0.2.9-rc.10 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.17 +- @rocket.chat/fuselage-ui-kit@3.0.0-rc.17 + ## 0.2.9-rc.9 ### Patch Changes diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json index 1a35f7a5c701..da4dd6d569a7 100644 --- a/packages/uikit-playground/package.json +++ b/packages/uikit-playground/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/uikit-playground", "private": true, - "version": "0.2.9-rc.9", + "version": "0.2.9-rc.10", "type": "module", "scripts": { "dev": "vite", diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md index 89d4eecf51ea..1dea96996a01 100644 --- a/packages/web-ui-registration/CHANGELOG.md +++ b/packages/web-ui-registration/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/web-ui-registration +## 3.0.0-rc.16 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.17 + ## 3.0.0-rc.15 ### Patch Changes diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json index 14e59e6d3c28..5443606e86bd 100644 --- a/packages/web-ui-registration/package.json +++ b/packages/web-ui-registration/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/web-ui-registration", - "version": "3.0.0-rc.15", + "version": "3.0.0-rc.16", "private": true, "homepage": "https://rocket.chat", "main": "./dist/index.js", @@ -51,7 +51,7 @@ "peerDependencies": { "@rocket.chat/layout": "*", "@rocket.chat/tools": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.16", + "@rocket.chat/ui-contexts": "3.0.0-rc.17", "@tanstack/react-query": "*", "react": "*", "react-hook-form": "*", From ba26019813018e8a4e2f10236d1c44c83c0c9f56 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Thu, 30 Nov 2023 22:42:22 -0300 Subject: [PATCH 68/76] test: created tests to max limit -1/0 and License.remove (#31126) --- ee/packages/license/src/license.spec.ts | 40 +++++++++++++++++++ .../validation/validateLicenseLimits.spec.ts | 38 ++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 ee/packages/license/src/validation/validateLicenseLimits.spec.ts diff --git a/ee/packages/license/src/license.spec.ts b/ee/packages/license/src/license.spec.ts index 010063673905..406dfd696e2e 100644 --- a/ee/packages/license/src/license.spec.ts +++ b/ee/packages/license/src/license.spec.ts @@ -419,3 +419,43 @@ describe('License.setLicense', () => { expect(syncCallback).toHaveBeenCalledTimes(1); }); }); + +describe('License.removeLicense', () => { + it('should trigger the sync event even if the module callback throws an error', async () => { + const licenseManager = await getReadyLicenseManager(); + + const removeLicense = jest.fn(); + const moduleCallback = jest.fn(); + + licenseManager.on('removed', removeLicense); + + licenseManager.onModule(moduleCallback); + + const license = await new MockedLicenseBuilder().withGratedModules(['auditing']).withLimits('activeUsers', [ + { + max: 10, + behavior: 'disable_modules', + modules: ['auditing'], + }, + ]); + + await expect(licenseManager.setLicense(await license.sign(), true)).resolves.toBe(true); + await expect(removeLicense).toHaveBeenCalledTimes(0); + await expect(moduleCallback).toHaveBeenNthCalledWith(1, { + module: 'auditing', + valid: true, + }); + + removeLicense.mockClear(); + moduleCallback.mockClear(); + await licenseManager.remove(); + + await expect(removeLicense).toHaveBeenCalledTimes(1); + await expect(moduleCallback).toHaveBeenNthCalledWith(1, { + module: 'auditing', + valid: false, + }); + + await expect(licenseManager.hasValidLicense()).toBe(false); + }); +}); diff --git a/ee/packages/license/src/validation/validateLicenseLimits.spec.ts b/ee/packages/license/src/validation/validateLicenseLimits.spec.ts new file mode 100644 index 000000000000..3e863517cc94 --- /dev/null +++ b/ee/packages/license/src/validation/validateLicenseLimits.spec.ts @@ -0,0 +1,38 @@ +import { MockedLicenseBuilder, getReadyLicenseManager } from '../../__tests__/MockedLicenseBuilder'; + +describe('validateLicenseLimits', () => { + describe('limit max: -1', () => { + it('should return prevent_action when the limit is reached', async () => { + const licenseManager = await getReadyLicenseManager(); + + const license = await new MockedLicenseBuilder().withLimits('activeUsers', [ + { + max: -1, + behavior: 'prevent_action', + }, + ]); + + await expect(licenseManager.setLicense(await license.sign())).resolves.toBe(true); + + licenseManager.setLicenseLimitCounter('activeUsers', () => 99999999); + await expect(licenseManager.shouldPreventAction('activeUsers')).resolves.toBe(false); + }); + }); + describe('limit max: 0', () => { + it('should return prevent_action when the limit is reached', async () => { + const licenseManager = await getReadyLicenseManager(); + + const license = await new MockedLicenseBuilder().withLimits('activeUsers', [ + { + max: 0, + behavior: 'prevent_action', + }, + ]); + + await expect(licenseManager.setLicense(await license.sign())).resolves.toBe(true); + + licenseManager.setLicenseLimitCounter('activeUsers', () => 99999999); + await expect(licenseManager.shouldPreventAction('activeUsers')).resolves.toBe(true); + }); + }); +}); From ba121d7dd6e42df80e2c23960af5cadd3cade1ba Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Thu, 30 Nov 2023 22:42:33 -0300 Subject: [PATCH 69/76] chore: get right type from supported version (#31127) --- .../packages/rocketchat-version/plugin/compile-version.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/meteor/packages/rocketchat-version/plugin/compile-version.js b/apps/meteor/packages/rocketchat-version/plugin/compile-version.js index 268f60885d9d..672dd5d64c39 100644 --- a/apps/meteor/packages/rocketchat-version/plugin/compile-version.js +++ b/apps/meteor/packages/rocketchat-version/plugin/compile-version.js @@ -14,7 +14,9 @@ class VersionCompiler { const currentVersion = JSON.parse(fs.readFileSync(path.resolve(process.cwd(), './package.json'), { encoding: 'utf8' }))?.version || ''; - const url = `https://releases.rocket.chat/v2/server/supportedVersions?includeDraftType=stable&includeDraftTag=${currentVersion}`; + const type = currentVersion.includes('-rc.') ? 'candidate' : currentVersion.includes('-develop') ? 'develop' : 'stable'; + + const url = `https://releases.rocket.chat/v2/server/supportedVersions?includeDraftType=${type}&includeDraftTag=${currentVersion}`; https .get(url, function (response) { From a199adb29c75597dcdbcb8f2cd205325c3f7d9af Mon Sep 17 00:00:00 2001 From: rocketchat-github-ci Date: Fri, 1 Dec 2023 01:48:31 +0000 Subject: [PATCH 70/76] Release 6.5.0-rc.18 [no ci] --- .changeset/bump-patch-1701395305753.md | 5 ++++ .changeset/pre.json | 1 + apps/meteor/.docker/Dockerfile.rhel | 2 +- apps/meteor/CHANGELOG.md | 26 +++++++++++++++++++ apps/meteor/app/utils/rocketchat.info | 2 +- apps/meteor/ee/server/services/CHANGELOG.md | 10 +++++++ apps/meteor/ee/server/services/package.json | 2 +- apps/meteor/package.json | 2 +- ee/apps/account-service/CHANGELOG.md | 10 +++++++ ee/apps/account-service/package.json | 2 +- ee/apps/authorization-service/CHANGELOG.md | 10 +++++++ ee/apps/authorization-service/package.json | 2 +- ee/apps/ddp-streamer/CHANGELOG.md | 12 +++++++++ ee/apps/ddp-streamer/package.json | 2 +- ee/apps/omnichannel-transcript/CHANGELOG.md | 11 ++++++++ ee/apps/omnichannel-transcript/package.json | 2 +- ee/apps/presence-service/CHANGELOG.md | 10 +++++++ ee/apps/presence-service/package.json | 2 +- ee/apps/queue-worker/CHANGELOG.md | 10 +++++++ ee/apps/queue-worker/package.json | 2 +- ee/apps/stream-hub-service/CHANGELOG.md | 9 +++++++ ee/apps/stream-hub-service/package.json | 2 +- ee/packages/api-client/CHANGELOG.md | 7 +++++ ee/packages/api-client/package.json | 2 +- ee/packages/ddp-client/CHANGELOG.md | 7 +++++ ee/packages/ddp-client/package.json | 2 +- ee/packages/license/CHANGELOG.md | 6 +++++ ee/packages/license/package.json | 2 +- ee/packages/omnichannel-services/CHANGELOG.md | 11 ++++++++ ee/packages/omnichannel-services/package.json | 2 +- ee/packages/pdf-worker/CHANGELOG.md | 6 +++++ ee/packages/pdf-worker/package.json | 2 +- ee/packages/presence/CHANGELOG.md | 8 ++++++ ee/packages/presence/package.json | 2 +- package.json | 2 +- packages/core-services/CHANGELOG.md | 8 ++++++ packages/core-services/package.json | 2 +- packages/core-typings/CHANGELOG.md | 2 ++ packages/core-typings/package.json | 2 +- packages/cron/CHANGELOG.md | 7 +++++ packages/cron/package.json | 2 +- packages/fuselage-ui-kit/CHANGELOG.md | 8 ++++++ packages/fuselage-ui-kit/package.json | 6 ++--- packages/gazzodown/CHANGELOG.md | 8 ++++++ packages/gazzodown/package.json | 8 +++--- packages/instance-status/CHANGELOG.md | 6 +++++ packages/instance-status/package.json | 2 +- packages/livechat/CHANGELOG.md | 6 +++++ packages/livechat/package.json | 2 +- packages/model-typings/CHANGELOG.md | 6 +++++ packages/model-typings/package.json | 2 +- packages/models/CHANGELOG.md | 6 +++++ packages/models/package.json | 2 +- packages/rest-typings/CHANGELOG.md | 7 +++++ packages/rest-typings/package.json | 2 +- packages/ui-client/CHANGELOG.md | 6 +++++ packages/ui-client/package.json | 4 +-- packages/ui-contexts/CHANGELOG.md | 8 ++++++ packages/ui-contexts/package.json | 2 +- packages/ui-video-conf/CHANGELOG.md | 6 +++++ packages/ui-video-conf/package.json | 4 +-- packages/uikit-playground/CHANGELOG.md | 7 +++++ packages/uikit-playground/package.json | 2 +- packages/web-ui-registration/CHANGELOG.md | 6 +++++ packages/web-ui-registration/package.json | 4 +-- 65 files changed, 297 insertions(+), 41 deletions(-) create mode 100644 .changeset/bump-patch-1701395305753.md diff --git a/.changeset/bump-patch-1701395305753.md b/.changeset/bump-patch-1701395305753.md new file mode 100644 index 000000000000..e1eaa7980afb --- /dev/null +++ b/.changeset/bump-patch-1701395305753.md @@ -0,0 +1,5 @@ +--- +'@rocket.chat/meteor': patch +--- + +Bump @rocket.chat/meteor version. diff --git a/.changeset/pre.json b/.changeset/pre.json index 3974af17bd4f..140c3c7c4817 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -77,6 +77,7 @@ "bump-patch-1701382849135", "bump-patch-1701383588348", "bump-patch-1701392992806", + "bump-patch-1701395305753", "cool-rockets-talk", "cool-zoos-move", "cuddly-ties-run", diff --git a/apps/meteor/.docker/Dockerfile.rhel b/apps/meteor/.docker/Dockerfile.rhel index f3c7b0c5707a..93bafe8e2154 100644 --- a/apps/meteor/.docker/Dockerfile.rhel +++ b/apps/meteor/.docker/Dockerfile.rhel @@ -1,6 +1,6 @@ FROM registry.access.redhat.com/ubi8/nodejs-12 -ENV RC_VERSION 6.5.0-rc.17 +ENV RC_VERSION 6.5.0-rc.18 MAINTAINER buildmaster@rocket.chat diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md index ab5931b6c165..504045b1248e 100644 --- a/apps/meteor/CHANGELOG.md +++ b/apps/meteor/CHANGELOG.md @@ -1,5 +1,31 @@ # @rocket.chat/meteor +## 6.5.0-rc.18 + +### Patch Changes + +- Bump @rocket.chat/meteor version. + - @rocket.chat/core-typings@6.5.0-rc.18 + - @rocket.chat/rest-typings@6.5.0-rc.18 + - @rocket.chat/api-client@0.1.18-rc.11 + - @rocket.chat/license@0.1.0-rc.18 + - @rocket.chat/omnichannel-services@0.1.0-rc.18 + - @rocket.chat/pdf-worker@0.0.24-rc.11 + - @rocket.chat/presence@0.1.0-rc.18 + - @rocket.chat/core-services@0.3.0-rc.18 + - @rocket.chat/cron@0.0.20-rc.11 + - @rocket.chat/gazzodown@3.0.0-rc.18 + - @rocket.chat/model-typings@0.2.0-rc.18 + - @rocket.chat/ui-contexts@3.0.0-rc.18 + - @rocket.chat/server-cloud-communication@0.0.1 + - @rocket.chat/fuselage-ui-kit@3.0.0-rc.18 + - @rocket.chat/models@0.0.24-rc.11 + - @rocket.chat/ui-theming@0.1.1-rc.0 + - @rocket.chat/ui-client@3.0.0-rc.18 + - @rocket.chat/ui-video-conf@3.0.0-rc.18 + - @rocket.chat/web-ui-registration@3.0.0-rc.17 + - @rocket.chat/instance-status@0.0.24-rc.11 + ## 6.5.0-rc.17 ### Patch Changes diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info index 15346de9a267..0195633a0399 100644 --- a/apps/meteor/app/utils/rocketchat.info +++ b/apps/meteor/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "6.5.0-rc.17" + "version": "6.5.0-rc.18" } diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md index 192892c6609e..fcc72b82d8f0 100644 --- a/apps/meteor/ee/server/services/CHANGELOG.md +++ b/apps/meteor/ee/server/services/CHANGELOG.md @@ -1,5 +1,15 @@ # rocketchat-services +## 1.1.18-rc.11 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.18 +- @rocket.chat/rest-typings@6.5.0-rc.18 +- @rocket.chat/core-services@0.3.0-rc.18 +- @rocket.chat/model-typings@0.2.0-rc.18 +- @rocket.chat/models@0.0.24-rc.11 + ## 1.1.18-rc.10 ### Patch Changes diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json index cd8d3b6fc6a6..26398c6747d3 100644 --- a/apps/meteor/ee/server/services/package.json +++ b/apps/meteor/ee/server/services/package.json @@ -1,7 +1,7 @@ { "name": "rocketchat-services", "private": true, - "version": "1.1.18-rc.10", + "version": "1.1.18-rc.11", "description": "Rocket.Chat Authorization service", "main": "index.js", "scripts": { diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 890fbdaa8082..3f488756e07d 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/meteor", "description": "The Ultimate Open Source WebChat Platform", - "version": "6.5.0-rc.17", + "version": "6.5.0-rc.18", "private": true, "author": { "name": "Rocket.Chat", diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md index 61a283103955..2a0099c724c0 100644 --- a/ee/apps/account-service/CHANGELOG.md +++ b/ee/apps/account-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/account-service +## 0.3.0-rc.18 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.18 +- @rocket.chat/rest-typings@6.5.0-rc.18 +- @rocket.chat/core-services@0.3.0-rc.18 +- @rocket.chat/model-typings@0.2.0-rc.18 +- @rocket.chat/models@0.0.24-rc.11 + ## 0.3.0-rc.17 ### Patch Changes diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json index cff285a02e3d..9530dc6db926 100644 --- a/ee/apps/account-service/package.json +++ b/ee/apps/account-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/account-service", "private": true, - "version": "0.3.0-rc.17", + "version": "0.3.0-rc.18", "description": "Rocket.Chat Account service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/authorization-service/CHANGELOG.md b/ee/apps/authorization-service/CHANGELOG.md index b4077d22de06..e3a3e895e61e 100644 --- a/ee/apps/authorization-service/CHANGELOG.md +++ b/ee/apps/authorization-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/authorization-service +## 0.3.0-rc.18 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.18 +- @rocket.chat/rest-typings@6.5.0-rc.18 +- @rocket.chat/core-services@0.3.0-rc.18 +- @rocket.chat/model-typings@0.2.0-rc.18 +- @rocket.chat/models@0.0.24-rc.11 + ## 0.3.0-rc.17 ### Patch Changes diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json index 0be4df5dc35b..2b45803ad8b1 100644 --- a/ee/apps/authorization-service/package.json +++ b/ee/apps/authorization-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/authorization-service", "private": true, - "version": "0.3.0-rc.17", + "version": "0.3.0-rc.18", "description": "Rocket.Chat Authorization service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/ddp-streamer/CHANGELOG.md b/ee/apps/ddp-streamer/CHANGELOG.md index c704ef0a3b15..3ed536ceab0e 100644 --- a/ee/apps/ddp-streamer/CHANGELOG.md +++ b/ee/apps/ddp-streamer/CHANGELOG.md @@ -1,5 +1,17 @@ # @rocket.chat/ddp-streamer +## 0.2.0-rc.18 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.18 +- @rocket.chat/rest-typings@6.5.0-rc.18 +- @rocket.chat/core-services@0.3.0-rc.18 +- @rocket.chat/model-typings@0.2.0-rc.18 +- @rocket.chat/ui-contexts@3.0.0-rc.18 +- @rocket.chat/models@0.0.24-rc.11 +- @rocket.chat/instance-status@0.0.24-rc.11 + ## 0.2.0-rc.17 ### Patch Changes diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json index 4031bc9e464e..21b91966ee9c 100644 --- a/ee/apps/ddp-streamer/package.json +++ b/ee/apps/ddp-streamer/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/ddp-streamer", "private": true, - "version": "0.2.0-rc.17", + "version": "0.2.0-rc.18", "description": "Rocket.Chat DDP-Streamer service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/omnichannel-transcript/CHANGELOG.md b/ee/apps/omnichannel-transcript/CHANGELOG.md index 1f9d515d27b3..f95a4179958d 100644 --- a/ee/apps/omnichannel-transcript/CHANGELOG.md +++ b/ee/apps/omnichannel-transcript/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/omnichannel-transcript +## 0.3.0-rc.18 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.18 +- @rocket.chat/omnichannel-services@0.1.0-rc.18 +- @rocket.chat/pdf-worker@0.0.24-rc.11 +- @rocket.chat/core-services@0.3.0-rc.18 +- @rocket.chat/model-typings@0.2.0-rc.18 +- @rocket.chat/models@0.0.24-rc.11 + ## 0.3.0-rc.17 ### Patch Changes diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json index 0bda6cc42983..eca2b7ff5e4b 100644 --- a/ee/apps/omnichannel-transcript/package.json +++ b/ee/apps/omnichannel-transcript/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/omnichannel-transcript", "private": true, - "version": "0.3.0-rc.17", + "version": "0.3.0-rc.18", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/presence-service/CHANGELOG.md b/ee/apps/presence-service/CHANGELOG.md index bb68cd70d5e4..beea60fc96ba 100644 --- a/ee/apps/presence-service/CHANGELOG.md +++ b/ee/apps/presence-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/presence-service +## 0.3.0-rc.18 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.18 +- @rocket.chat/presence@0.1.0-rc.18 +- @rocket.chat/core-services@0.3.0-rc.18 +- @rocket.chat/model-typings@0.2.0-rc.18 +- @rocket.chat/models@0.0.24-rc.11 + ## 0.3.0-rc.17 ### Patch Changes diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json index dadca060d196..9aad4cebbd63 100644 --- a/ee/apps/presence-service/package.json +++ b/ee/apps/presence-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/presence-service", "private": true, - "version": "0.3.0-rc.17", + "version": "0.3.0-rc.18", "description": "Rocket.Chat Presence service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/queue-worker/CHANGELOG.md b/ee/apps/queue-worker/CHANGELOG.md index 4894b5940137..a2fa7519fe9c 100644 --- a/ee/apps/queue-worker/CHANGELOG.md +++ b/ee/apps/queue-worker/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/queue-worker +## 0.3.0-rc.18 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.18 +- @rocket.chat/omnichannel-services@0.1.0-rc.18 +- @rocket.chat/core-services@0.3.0-rc.18 +- @rocket.chat/model-typings@0.2.0-rc.18 +- @rocket.chat/models@0.0.24-rc.11 + ## 0.3.0-rc.17 ### Patch Changes diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json index f1b0cddbc1d7..90461cac5f6b 100644 --- a/ee/apps/queue-worker/package.json +++ b/ee/apps/queue-worker/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/queue-worker", "private": true, - "version": "0.3.0-rc.17", + "version": "0.3.0-rc.18", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/stream-hub-service/CHANGELOG.md b/ee/apps/stream-hub-service/CHANGELOG.md index 16b537a06ac2..e6f2dd17534e 100644 --- a/ee/apps/stream-hub-service/CHANGELOG.md +++ b/ee/apps/stream-hub-service/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/stream-hub-service +## 0.3.0-rc.18 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.18 +- @rocket.chat/core-services@0.3.0-rc.18 +- @rocket.chat/model-typings@0.2.0-rc.18 +- @rocket.chat/models@0.0.24-rc.11 + ## 0.3.0-rc.17 ### Patch Changes diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json index 9f95972a7fc0..4feb23f600d8 100644 --- a/ee/apps/stream-hub-service/package.json +++ b/ee/apps/stream-hub-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/stream-hub-service", "private": true, - "version": "0.3.0-rc.17", + "version": "0.3.0-rc.18", "description": "Rocket.Chat Stream Hub service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/packages/api-client/CHANGELOG.md b/ee/packages/api-client/CHANGELOG.md index 72360b0e6dfd..2d2eefdb8539 100644 --- a/ee/packages/api-client/CHANGELOG.md +++ b/ee/packages/api-client/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/api-client +## 0.1.18-rc.11 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.18 +- @rocket.chat/rest-typings@6.5.0-rc.18 + ## 0.1.18-rc.10 ### Patch Changes diff --git a/ee/packages/api-client/package.json b/ee/packages/api-client/package.json index b54cf7f54d18..9a49098ca248 100644 --- a/ee/packages/api-client/package.json +++ b/ee/packages/api-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/api-client", - "version": "0.1.18-rc.10", + "version": "0.1.18-rc.11", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/ddp-client/CHANGELOG.md b/ee/packages/ddp-client/CHANGELOG.md index 2a8968a47285..4a1953cc796a 100644 --- a/ee/packages/ddp-client/CHANGELOG.md +++ b/ee/packages/ddp-client/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/ddp-client +## 0.2.9-rc.11 + +### Patch Changes + +- @rocket.chat/rest-typings@6.5.0-rc.18 +- @rocket.chat/api-client@0.1.18-rc.11 + ## 0.2.9-rc.10 ### Patch Changes diff --git a/ee/packages/ddp-client/package.json b/ee/packages/ddp-client/package.json index 041420c4e8ed..95387af7e377 100644 --- a/ee/packages/ddp-client/package.json +++ b/ee/packages/ddp-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ddp-client", - "version": "0.2.9-rc.10", + "version": "0.2.9-rc.11", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/license/CHANGELOG.md b/ee/packages/license/CHANGELOG.md index 386ee2917e9e..632500c3b161 100644 --- a/ee/packages/license/CHANGELOG.md +++ b/ee/packages/license/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/license +## 0.1.0-rc.18 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.18 + ## 0.1.0-rc.17 ### Patch Changes diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json index db5c4c25d148..8b08de8ed931 100644 --- a/ee/packages/license/package.json +++ b/ee/packages/license/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/license", - "version": "0.1.0-rc.17", + "version": "0.1.0-rc.18", "private": true, "devDependencies": { "@swc/core": "^1.3.95", diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md index 1777da2c3e72..ca46bc68332f 100644 --- a/ee/packages/omnichannel-services/CHANGELOG.md +++ b/ee/packages/omnichannel-services/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/omnichannel-services +## 0.1.0-rc.18 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.18 +- @rocket.chat/rest-typings@6.5.0-rc.18 +- @rocket.chat/pdf-worker@0.0.24-rc.11 +- @rocket.chat/core-services@0.3.0-rc.18 +- @rocket.chat/model-typings@0.2.0-rc.18 +- @rocket.chat/models@0.0.24-rc.11 + ## 0.1.0-rc.17 ### Patch Changes diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json index 477ac222ba44..9fd964848e4a 100644 --- a/ee/packages/omnichannel-services/package.json +++ b/ee/packages/omnichannel-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/omnichannel-services", - "version": "0.1.0-rc.17", + "version": "0.1.0-rc.18", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/ee/packages/pdf-worker/CHANGELOG.md b/ee/packages/pdf-worker/CHANGELOG.md index bd848b4de12e..9b443a9f9a45 100644 --- a/ee/packages/pdf-worker/CHANGELOG.md +++ b/ee/packages/pdf-worker/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/pdf-worker +## 0.0.24-rc.11 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.18 + ## 0.0.24-rc.10 ### Patch Changes diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json index 4d7ceb8587e0..6fb5c14e0202 100644 --- a/ee/packages/pdf-worker/package.json +++ b/ee/packages/pdf-worker/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/pdf-worker", - "version": "0.0.24-rc.10", + "version": "0.0.24-rc.11", "private": true, "devDependencies": { "@storybook/addon-essentials": "~6.5.16", diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md index 575dcc9bec7e..353b47a7587c 100644 --- a/ee/packages/presence/CHANGELOG.md +++ b/ee/packages/presence/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/presence +## 0.1.0-rc.18 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.18 +- @rocket.chat/core-services@0.3.0-rc.18 +- @rocket.chat/models@0.0.24-rc.11 + ## 0.1.0-rc.17 ### Patch Changes diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json index 7643a7be3b5c..4de5adafb7e7 100644 --- a/ee/packages/presence/package.json +++ b/ee/packages/presence/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/presence", - "version": "0.1.0-rc.17", + "version": "0.1.0-rc.18", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/package.json b/package.json index fde4786580b4..100b0e8945d4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket.chat", - "version": "6.5.0-rc.17", + "version": "6.5.0-rc.18", "description": "Rocket.Chat Monorepo", "main": "index.js", "private": true, diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md index b42d6f089a6d..364c6bfc2ceb 100644 --- a/packages/core-services/CHANGELOG.md +++ b/packages/core-services/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/core-services +## 0.3.0-rc.18 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.18 +- @rocket.chat/rest-typings@6.5.0-rc.18 +- @rocket.chat/models@0.0.24-rc.11 + ## 0.3.0-rc.17 ### Patch Changes diff --git a/packages/core-services/package.json b/packages/core-services/package.json index 371307e6f979..428778289a64 100644 --- a/packages/core-services/package.json +++ b/packages/core-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/core-services", - "version": "0.3.0-rc.17", + "version": "0.3.0-rc.18", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md index d9006f847557..124863f294d4 100644 --- a/packages/core-typings/CHANGELOG.md +++ b/packages/core-typings/CHANGELOG.md @@ -1,5 +1,7 @@ # @rocket.chat/core-typings +## 6.5.0-rc.18 + ## 6.5.0-rc.17 ## 6.5.0-rc.16 diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json index 4c265d71452d..b15217d3a507 100644 --- a/packages/core-typings/package.json +++ b/packages/core-typings/package.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/package", "name": "@rocket.chat/core-typings", - "version": "6.5.0-rc.17", + "version": "6.5.0-rc.18", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "eslint": "~8.45.0", diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md index 4bf2649f0b6e..4969b4e883c1 100644 --- a/packages/cron/CHANGELOG.md +++ b/packages/cron/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/cron +## 0.0.20-rc.11 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.18 +- @rocket.chat/models@0.0.24-rc.11 + ## 0.0.20-rc.10 ### Patch Changes diff --git a/packages/cron/package.json b/packages/cron/package.json index 4d0822f120c4..53feeca8a5ab 100644 --- a/packages/cron/package.json +++ b/packages/cron/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/cron", - "version": "0.0.20-rc.10", + "version": "0.0.20-rc.11", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md index ffb96864472f..e2a6924cc727 100644 --- a/packages/fuselage-ui-kit/CHANGELOG.md +++ b/packages/fuselage-ui-kit/CHANGELOG.md @@ -1,5 +1,13 @@ # Change Log +## 3.0.0-rc.18 + +### Patch Changes + +- @rocket.chat/gazzodown@3.0.0-rc.18 +- @rocket.chat/ui-contexts@3.0.0-rc.18 +- @rocket.chat/ui-video-conf@3.0.0-rc.18 + ## 3.0.0-rc.17 ### Patch Changes diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index e9aea12446ff..762e12605ca3 100644 --- a/packages/fuselage-ui-kit/package.json +++ b/packages/fuselage-ui-kit/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/fuselage-ui-kit", "private": true, - "version": "3.0.0-rc.17", + "version": "3.0.0-rc.18", "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system", "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/", "author": { @@ -48,9 +48,9 @@ "@rocket.chat/icons": "*", "@rocket.chat/prettier-config": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.17", + "@rocket.chat/ui-contexts": "3.0.0-rc.18", "@rocket.chat/ui-kit": "*", - "@rocket.chat/ui-video-conf": "3.0.0-rc.17", + "@rocket.chat/ui-video-conf": "3.0.0-rc.18", "@tanstack/react-query": "*", "react": "*", "react-dom": "*" diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md index 4d5cc754bcc5..c18602fd43ea 100644 --- a/packages/gazzodown/CHANGELOG.md +++ b/packages/gazzodown/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/gazzodown +## 3.0.0-rc.18 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.18 +- @rocket.chat/ui-contexts@3.0.0-rc.18 +- @rocket.chat/ui-client@3.0.0-rc.18 + ## 3.0.0-rc.17 ### Patch Changes diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json index aee7dd156cc5..feddfb4f797b 100644 --- a/packages/gazzodown/package.json +++ b/packages/gazzodown/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/gazzodown", - "version": "3.0.0-rc.17", + "version": "3.0.0-rc.18", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -65,14 +65,14 @@ "/dist" ], "peerDependencies": { - "@rocket.chat/core-typings": "6.5.0-rc.17", + "@rocket.chat/core-typings": "6.5.0-rc.18", "@rocket.chat/css-in-js": "*", "@rocket.chat/fuselage": "*", "@rocket.chat/fuselage-tokens": "*", "@rocket.chat/message-parser": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-client": "3.0.0-rc.17", - "@rocket.chat/ui-contexts": "3.0.0-rc.17", + "@rocket.chat/ui-client": "3.0.0-rc.18", + "@rocket.chat/ui-contexts": "3.0.0-rc.18", "katex": "*", "react": "*" }, diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md index 2468f6ee5f01..f1907a541e8f 100644 --- a/packages/instance-status/CHANGELOG.md +++ b/packages/instance-status/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/instance-status +## 0.0.24-rc.11 + +### Patch Changes + +- @rocket.chat/models@0.0.24-rc.11 + ## 0.0.24-rc.10 ### Patch Changes diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json index cf542f3cd168..39f4384b7c50 100644 --- a/packages/instance-status/package.json +++ b/packages/instance-status/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/instance-status", - "version": "0.0.24-rc.10", + "version": "0.0.24-rc.11", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md index 2c1dc7a78940..66fd6b4be445 100644 --- a/packages/livechat/CHANGELOG.md +++ b/packages/livechat/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/livechat Change Log +## 1.14.9-rc.11 + +### Patch Changes + +- @rocket.chat/gazzodown@3.0.0-rc.18 + ## 1.14.9-rc.10 ### Patch Changes diff --git a/packages/livechat/package.json b/packages/livechat/package.json index b1f0dfb4e96b..eede2104b6e7 100644 --- a/packages/livechat/package.json +++ b/packages/livechat/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/livechat", - "version": "1.14.9-rc.10", + "version": "1.14.9-rc.11", "files": [ "/build" ], diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md index db49b1b00f30..7bc413906a4d 100644 --- a/packages/model-typings/CHANGELOG.md +++ b/packages/model-typings/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/model-typings +## 0.2.0-rc.18 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.18 + ## 0.2.0-rc.17 ### Patch Changes diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json index 7dd8e3c8cede..a53c7814962e 100644 --- a/packages/model-typings/package.json +++ b/packages/model-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/model-typings", - "version": "0.2.0-rc.17", + "version": "0.2.0-rc.18", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md index 9e7b55ca6bad..cc414b2b84ce 100644 --- a/packages/models/CHANGELOG.md +++ b/packages/models/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/models +## 0.0.24-rc.11 + +### Patch Changes + +- @rocket.chat/model-typings@0.2.0-rc.18 + ## 0.0.24-rc.10 ### Patch Changes diff --git a/packages/models/package.json b/packages/models/package.json index 5dad303dde6a..a8e4de5a051b 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/models", - "version": "0.0.24-rc.10", + "version": "0.0.24-rc.11", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md index a4a03893e53b..866ab05fd184 100644 --- a/packages/rest-typings/CHANGELOG.md +++ b/packages/rest-typings/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/rest-typings +## 6.5.0-rc.18 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.18 +- @rocket.chat/license@0.1.0-rc.18 + ## 6.5.0-rc.17 ### Patch Changes diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json index 74a378edf714..511209cd87c2 100644 --- a/packages/rest-typings/package.json +++ b/packages/rest-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/rest-typings", - "version": "6.5.0-rc.17", + "version": "6.5.0-rc.18", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "@types/jest": "~29.5.7", diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md index 246745ce168d..f2716f814c02 100644 --- a/packages/ui-client/CHANGELOG.md +++ b/packages/ui-client/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/ui-client +## 3.0.0-rc.18 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.18 + ## 3.0.0-rc.17 ### Patch Changes diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json index 600f02864ada..dfaa782b291d 100644 --- a/packages/ui-client/package.json +++ b/packages/ui-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-client", - "version": "3.0.0-rc.17", + "version": "3.0.0-rc.18", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -61,7 +61,7 @@ "@rocket.chat/fuselage": "*", "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.17", + "@rocket.chat/ui-contexts": "3.0.0-rc.18", "react": "~17.0.2" }, "volta": { diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md index e0cf9651d057..6d4473c80039 100644 --- a/packages/ui-contexts/CHANGELOG.md +++ b/packages/ui-contexts/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/ui-contexts +## 3.0.0-rc.18 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.18 +- @rocket.chat/rest-typings@6.5.0-rc.18 +- @rocket.chat/ddp-client@0.2.9-rc.11 + ## 3.0.0-rc.17 ### Patch Changes diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json index d60c466648a6..69dc69dc48ab 100644 --- a/packages/ui-contexts/package.json +++ b/packages/ui-contexts/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-contexts", - "version": "3.0.0-rc.17", + "version": "3.0.0-rc.18", "private": true, "devDependencies": { "@rocket.chat/core-typings": "workspace:^", diff --git a/packages/ui-video-conf/CHANGELOG.md b/packages/ui-video-conf/CHANGELOG.md index 3b042d416ac1..ae6b43b22354 100644 --- a/packages/ui-video-conf/CHANGELOG.md +++ b/packages/ui-video-conf/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/ui-video-conf +## 3.0.0-rc.18 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.18 + ## 3.0.0-rc.17 ### Patch Changes diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json index a2b2eb0d44bf..d6b8eba9e173 100644 --- a/packages/ui-video-conf/package.json +++ b/packages/ui-video-conf/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-video-conf", - "version": "3.0.0-rc.17", + "version": "3.0.0-rc.18", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -35,7 +35,7 @@ "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.17", + "@rocket.chat/ui-contexts": "3.0.0-rc.18", "react": "^17.0.2", "react-dom": "^17.0.2" }, diff --git a/packages/uikit-playground/CHANGELOG.md b/packages/uikit-playground/CHANGELOG.md index d315bab24f7e..e20bc9d55cd6 100644 --- a/packages/uikit-playground/CHANGELOG.md +++ b/packages/uikit-playground/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/uikit-playground +## 0.2.9-rc.11 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.18 +- @rocket.chat/fuselage-ui-kit@3.0.0-rc.18 + ## 0.2.9-rc.10 ### Patch Changes diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json index da4dd6d569a7..c12fd44a1189 100644 --- a/packages/uikit-playground/package.json +++ b/packages/uikit-playground/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/uikit-playground", "private": true, - "version": "0.2.9-rc.10", + "version": "0.2.9-rc.11", "type": "module", "scripts": { "dev": "vite", diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md index 1dea96996a01..586a5a860698 100644 --- a/packages/web-ui-registration/CHANGELOG.md +++ b/packages/web-ui-registration/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/web-ui-registration +## 3.0.0-rc.17 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.18 + ## 3.0.0-rc.16 ### Patch Changes diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json index 5443606e86bd..fd549a4df8d0 100644 --- a/packages/web-ui-registration/package.json +++ b/packages/web-ui-registration/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/web-ui-registration", - "version": "3.0.0-rc.16", + "version": "3.0.0-rc.17", "private": true, "homepage": "https://rocket.chat", "main": "./dist/index.js", @@ -51,7 +51,7 @@ "peerDependencies": { "@rocket.chat/layout": "*", "@rocket.chat/tools": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.17", + "@rocket.chat/ui-contexts": "3.0.0-rc.18", "@tanstack/react-query": "*", "react": "*", "react-hook-form": "*", From ea0610e980cd6e5b1359a907309f453141e9902f Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Fri, 1 Dec 2023 10:34:58 -0300 Subject: [PATCH 71/76] chore: Improve supported versions handling (#31130) Co-authored-by: Diego Sampaio --- .github/workflows/ci.yml | 2 +- .../supportedVersionsChooseLatest.ts | 2 +- .../plugin/compile-version.js | 23 +++++++++++++------ 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a462d5d76c8a..be796470323a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,7 +84,6 @@ jobs: name: 🚀 Notify external services - draft runs-on: ubuntu-20.04 needs: [release-versions] - if: github.event_name == 'release' steps: - uses: Bhacaz/checkout-files@v2 with: @@ -92,6 +91,7 @@ jobs: branch: ${{ github.ref }} - name: Register release on cloud as Draft + if: github.event_name == 'release' env: UPDATE_TOKEN: ${{ secrets.UPDATE_TOKEN }} run: | diff --git a/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsChooseLatest.ts b/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsChooseLatest.ts index f0683535de6b..3493401144cf 100644 --- a/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsChooseLatest.ts +++ b/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsChooseLatest.ts @@ -1,7 +1,7 @@ import type { SignedSupportedVersions } from '@rocket.chat/server-cloud-communication'; export const supportedVersionsChooseLatest = async (...tokens: (SignedSupportedVersions | undefined)[]) => { - const [token] = (tokens.filter(Boolean) as SignedSupportedVersions[]).sort((a, b) => { + const [token] = (tokens.filter((r) => r?.timestamp != null) as SignedSupportedVersions[]).sort((a, b) => { return new Date(a.timestamp).getTime() - new Date(b.timestamp).getTime(); }); diff --git a/apps/meteor/packages/rocketchat-version/plugin/compile-version.js b/apps/meteor/packages/rocketchat-version/plugin/compile-version.js index 672dd5d64c39..d22aa55437ff 100644 --- a/apps/meteor/packages/rocketchat-version/plugin/compile-version.js +++ b/apps/meteor/packages/rocketchat-version/plugin/compile-version.js @@ -18,6 +18,16 @@ class VersionCompiler { const url = `https://releases.rocket.chat/v2/server/supportedVersions?includeDraftType=${type}&includeDraftTag=${currentVersion}`; + function handleError(err) { + console.error(err); + // TODO remove this when we are ready to fail + // if (process.env.NODE_ENV !== 'development') { + // reject(err); + // return; + // } + resolve({}); + } + https .get(url, function (response) { let data = ''; @@ -25,15 +35,14 @@ class VersionCompiler { data += chunk; }); response.on('end', function () { - resolve(JSON.parse(data)); + const supportedVersions = JSON.parse(data); + if (!supportedVersions?.signed) { + return handleError(new Error(`Invalid supportedVersions result:\n URL: ${url} \n RESULT: ${data}`)); + } + resolve(supportedVersions); }); response.on('error', function (err) { - console.error(err); - if (process.env.NODE_ENV !== 'development') { - reject(err); - return; - } - resolve({}); + handleError(err); }); }) .end(); From 07d01b0e37c9e27b1251dd82ca84ac39869eeff7 Mon Sep 17 00:00:00 2001 From: rocketchat-github-ci Date: Fri, 1 Dec 2023 13:40:38 +0000 Subject: [PATCH 72/76] Release 6.5.0-rc.19 [no ci] --- .changeset/bump-patch-1701438032525.md | 5 ++++ .changeset/pre.json | 1 + apps/meteor/.docker/Dockerfile.rhel | 2 +- apps/meteor/CHANGELOG.md | 26 +++++++++++++++++++ apps/meteor/app/utils/rocketchat.info | 2 +- apps/meteor/ee/server/services/CHANGELOG.md | 10 +++++++ apps/meteor/ee/server/services/package.json | 2 +- apps/meteor/package.json | 2 +- ee/apps/account-service/CHANGELOG.md | 10 +++++++ ee/apps/account-service/package.json | 2 +- ee/apps/authorization-service/CHANGELOG.md | 10 +++++++ ee/apps/authorization-service/package.json | 2 +- ee/apps/ddp-streamer/CHANGELOG.md | 12 +++++++++ ee/apps/ddp-streamer/package.json | 2 +- ee/apps/omnichannel-transcript/CHANGELOG.md | 11 ++++++++ ee/apps/omnichannel-transcript/package.json | 2 +- ee/apps/presence-service/CHANGELOG.md | 10 +++++++ ee/apps/presence-service/package.json | 2 +- ee/apps/queue-worker/CHANGELOG.md | 10 +++++++ ee/apps/queue-worker/package.json | 2 +- ee/apps/stream-hub-service/CHANGELOG.md | 9 +++++++ ee/apps/stream-hub-service/package.json | 2 +- ee/packages/api-client/CHANGELOG.md | 7 +++++ ee/packages/api-client/package.json | 2 +- ee/packages/ddp-client/CHANGELOG.md | 7 +++++ ee/packages/ddp-client/package.json | 2 +- ee/packages/license/CHANGELOG.md | 6 +++++ ee/packages/license/package.json | 2 +- ee/packages/omnichannel-services/CHANGELOG.md | 11 ++++++++ ee/packages/omnichannel-services/package.json | 2 +- ee/packages/pdf-worker/CHANGELOG.md | 6 +++++ ee/packages/pdf-worker/package.json | 2 +- ee/packages/presence/CHANGELOG.md | 8 ++++++ ee/packages/presence/package.json | 2 +- package.json | 2 +- packages/core-services/CHANGELOG.md | 8 ++++++ packages/core-services/package.json | 2 +- packages/core-typings/CHANGELOG.md | 2 ++ packages/core-typings/package.json | 2 +- packages/cron/CHANGELOG.md | 7 +++++ packages/cron/package.json | 2 +- packages/fuselage-ui-kit/CHANGELOG.md | 8 ++++++ packages/fuselage-ui-kit/package.json | 6 ++--- packages/gazzodown/CHANGELOG.md | 8 ++++++ packages/gazzodown/package.json | 8 +++--- packages/instance-status/CHANGELOG.md | 6 +++++ packages/instance-status/package.json | 2 +- packages/livechat/CHANGELOG.md | 6 +++++ packages/livechat/package.json | 2 +- packages/model-typings/CHANGELOG.md | 6 +++++ packages/model-typings/package.json | 2 +- packages/models/CHANGELOG.md | 6 +++++ packages/models/package.json | 2 +- packages/rest-typings/CHANGELOG.md | 7 +++++ packages/rest-typings/package.json | 2 +- packages/ui-client/CHANGELOG.md | 6 +++++ packages/ui-client/package.json | 4 +-- packages/ui-contexts/CHANGELOG.md | 8 ++++++ packages/ui-contexts/package.json | 2 +- packages/ui-video-conf/CHANGELOG.md | 6 +++++ packages/ui-video-conf/package.json | 4 +-- packages/uikit-playground/CHANGELOG.md | 7 +++++ packages/uikit-playground/package.json | 2 +- packages/web-ui-registration/CHANGELOG.md | 6 +++++ packages/web-ui-registration/package.json | 4 +-- 65 files changed, 297 insertions(+), 41 deletions(-) create mode 100644 .changeset/bump-patch-1701438032525.md diff --git a/.changeset/bump-patch-1701438032525.md b/.changeset/bump-patch-1701438032525.md new file mode 100644 index 000000000000..e1eaa7980afb --- /dev/null +++ b/.changeset/bump-patch-1701438032525.md @@ -0,0 +1,5 @@ +--- +'@rocket.chat/meteor': patch +--- + +Bump @rocket.chat/meteor version. diff --git a/.changeset/pre.json b/.changeset/pre.json index 140c3c7c4817..a97761ad6667 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -78,6 +78,7 @@ "bump-patch-1701383588348", "bump-patch-1701392992806", "bump-patch-1701395305753", + "bump-patch-1701438032525", "cool-rockets-talk", "cool-zoos-move", "cuddly-ties-run", diff --git a/apps/meteor/.docker/Dockerfile.rhel b/apps/meteor/.docker/Dockerfile.rhel index 93bafe8e2154..ebbb0a2b5aeb 100644 --- a/apps/meteor/.docker/Dockerfile.rhel +++ b/apps/meteor/.docker/Dockerfile.rhel @@ -1,6 +1,6 @@ FROM registry.access.redhat.com/ubi8/nodejs-12 -ENV RC_VERSION 6.5.0-rc.18 +ENV RC_VERSION 6.5.0-rc.19 MAINTAINER buildmaster@rocket.chat diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md index 504045b1248e..54c106b87e46 100644 --- a/apps/meteor/CHANGELOG.md +++ b/apps/meteor/CHANGELOG.md @@ -1,5 +1,31 @@ # @rocket.chat/meteor +## 6.5.0-rc.19 + +### Patch Changes + +- Bump @rocket.chat/meteor version. + - @rocket.chat/core-typings@6.5.0-rc.19 + - @rocket.chat/rest-typings@6.5.0-rc.19 + - @rocket.chat/api-client@0.1.18-rc.12 + - @rocket.chat/license@0.1.0-rc.19 + - @rocket.chat/omnichannel-services@0.1.0-rc.19 + - @rocket.chat/pdf-worker@0.0.24-rc.12 + - @rocket.chat/presence@0.1.0-rc.19 + - @rocket.chat/core-services@0.3.0-rc.19 + - @rocket.chat/cron@0.0.20-rc.12 + - @rocket.chat/gazzodown@3.0.0-rc.19 + - @rocket.chat/model-typings@0.2.0-rc.19 + - @rocket.chat/ui-contexts@3.0.0-rc.19 + - @rocket.chat/server-cloud-communication@0.0.1 + - @rocket.chat/fuselage-ui-kit@3.0.0-rc.19 + - @rocket.chat/models@0.0.24-rc.12 + - @rocket.chat/ui-theming@0.1.1-rc.0 + - @rocket.chat/ui-client@3.0.0-rc.19 + - @rocket.chat/ui-video-conf@3.0.0-rc.19 + - @rocket.chat/web-ui-registration@3.0.0-rc.18 + - @rocket.chat/instance-status@0.0.24-rc.12 + ## 6.5.0-rc.18 ### Patch Changes diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info index 0195633a0399..1c8882ba159c 100644 --- a/apps/meteor/app/utils/rocketchat.info +++ b/apps/meteor/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "6.5.0-rc.18" + "version": "6.5.0-rc.19" } diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md index fcc72b82d8f0..3ecbf0a60e22 100644 --- a/apps/meteor/ee/server/services/CHANGELOG.md +++ b/apps/meteor/ee/server/services/CHANGELOG.md @@ -1,5 +1,15 @@ # rocketchat-services +## 1.1.18-rc.12 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.19 +- @rocket.chat/rest-typings@6.5.0-rc.19 +- @rocket.chat/core-services@0.3.0-rc.19 +- @rocket.chat/model-typings@0.2.0-rc.19 +- @rocket.chat/models@0.0.24-rc.12 + ## 1.1.18-rc.11 ### Patch Changes diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json index 26398c6747d3..27e307f61f57 100644 --- a/apps/meteor/ee/server/services/package.json +++ b/apps/meteor/ee/server/services/package.json @@ -1,7 +1,7 @@ { "name": "rocketchat-services", "private": true, - "version": "1.1.18-rc.11", + "version": "1.1.18-rc.12", "description": "Rocket.Chat Authorization service", "main": "index.js", "scripts": { diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 3f488756e07d..635ace163a94 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/meteor", "description": "The Ultimate Open Source WebChat Platform", - "version": "6.5.0-rc.18", + "version": "6.5.0-rc.19", "private": true, "author": { "name": "Rocket.Chat", diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md index 2a0099c724c0..bd72ce7ff510 100644 --- a/ee/apps/account-service/CHANGELOG.md +++ b/ee/apps/account-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/account-service +## 0.3.0-rc.19 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.19 +- @rocket.chat/rest-typings@6.5.0-rc.19 +- @rocket.chat/core-services@0.3.0-rc.19 +- @rocket.chat/model-typings@0.2.0-rc.19 +- @rocket.chat/models@0.0.24-rc.12 + ## 0.3.0-rc.18 ### Patch Changes diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json index 9530dc6db926..de0ec594600e 100644 --- a/ee/apps/account-service/package.json +++ b/ee/apps/account-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/account-service", "private": true, - "version": "0.3.0-rc.18", + "version": "0.3.0-rc.19", "description": "Rocket.Chat Account service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/authorization-service/CHANGELOG.md b/ee/apps/authorization-service/CHANGELOG.md index e3a3e895e61e..3bae0941450f 100644 --- a/ee/apps/authorization-service/CHANGELOG.md +++ b/ee/apps/authorization-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/authorization-service +## 0.3.0-rc.19 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.19 +- @rocket.chat/rest-typings@6.5.0-rc.19 +- @rocket.chat/core-services@0.3.0-rc.19 +- @rocket.chat/model-typings@0.2.0-rc.19 +- @rocket.chat/models@0.0.24-rc.12 + ## 0.3.0-rc.18 ### Patch Changes diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json index 2b45803ad8b1..f0835e4f4f74 100644 --- a/ee/apps/authorization-service/package.json +++ b/ee/apps/authorization-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/authorization-service", "private": true, - "version": "0.3.0-rc.18", + "version": "0.3.0-rc.19", "description": "Rocket.Chat Authorization service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/ddp-streamer/CHANGELOG.md b/ee/apps/ddp-streamer/CHANGELOG.md index 3ed536ceab0e..708f9152415b 100644 --- a/ee/apps/ddp-streamer/CHANGELOG.md +++ b/ee/apps/ddp-streamer/CHANGELOG.md @@ -1,5 +1,17 @@ # @rocket.chat/ddp-streamer +## 0.2.0-rc.19 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.19 +- @rocket.chat/rest-typings@6.5.0-rc.19 +- @rocket.chat/core-services@0.3.0-rc.19 +- @rocket.chat/model-typings@0.2.0-rc.19 +- @rocket.chat/ui-contexts@3.0.0-rc.19 +- @rocket.chat/models@0.0.24-rc.12 +- @rocket.chat/instance-status@0.0.24-rc.12 + ## 0.2.0-rc.18 ### Patch Changes diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json index 21b91966ee9c..aab550739a2c 100644 --- a/ee/apps/ddp-streamer/package.json +++ b/ee/apps/ddp-streamer/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/ddp-streamer", "private": true, - "version": "0.2.0-rc.18", + "version": "0.2.0-rc.19", "description": "Rocket.Chat DDP-Streamer service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/omnichannel-transcript/CHANGELOG.md b/ee/apps/omnichannel-transcript/CHANGELOG.md index f95a4179958d..9cd4b501f18b 100644 --- a/ee/apps/omnichannel-transcript/CHANGELOG.md +++ b/ee/apps/omnichannel-transcript/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/omnichannel-transcript +## 0.3.0-rc.19 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.19 +- @rocket.chat/omnichannel-services@0.1.0-rc.19 +- @rocket.chat/pdf-worker@0.0.24-rc.12 +- @rocket.chat/core-services@0.3.0-rc.19 +- @rocket.chat/model-typings@0.2.0-rc.19 +- @rocket.chat/models@0.0.24-rc.12 + ## 0.3.0-rc.18 ### Patch Changes diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json index eca2b7ff5e4b..2a6309236ba6 100644 --- a/ee/apps/omnichannel-transcript/package.json +++ b/ee/apps/omnichannel-transcript/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/omnichannel-transcript", "private": true, - "version": "0.3.0-rc.18", + "version": "0.3.0-rc.19", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/presence-service/CHANGELOG.md b/ee/apps/presence-service/CHANGELOG.md index beea60fc96ba..8ba8ceae3dfe 100644 --- a/ee/apps/presence-service/CHANGELOG.md +++ b/ee/apps/presence-service/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/presence-service +## 0.3.0-rc.19 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.19 +- @rocket.chat/presence@0.1.0-rc.19 +- @rocket.chat/core-services@0.3.0-rc.19 +- @rocket.chat/model-typings@0.2.0-rc.19 +- @rocket.chat/models@0.0.24-rc.12 + ## 0.3.0-rc.18 ### Patch Changes diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json index 9aad4cebbd63..e09f98be1319 100644 --- a/ee/apps/presence-service/package.json +++ b/ee/apps/presence-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/presence-service", "private": true, - "version": "0.3.0-rc.18", + "version": "0.3.0-rc.19", "description": "Rocket.Chat Presence service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/queue-worker/CHANGELOG.md b/ee/apps/queue-worker/CHANGELOG.md index a2fa7519fe9c..c2369ef5c95a 100644 --- a/ee/apps/queue-worker/CHANGELOG.md +++ b/ee/apps/queue-worker/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/queue-worker +## 0.3.0-rc.19 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.19 +- @rocket.chat/omnichannel-services@0.1.0-rc.19 +- @rocket.chat/core-services@0.3.0-rc.19 +- @rocket.chat/model-typings@0.2.0-rc.19 +- @rocket.chat/models@0.0.24-rc.12 + ## 0.3.0-rc.18 ### Patch Changes diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json index 90461cac5f6b..473e78d8ab25 100644 --- a/ee/apps/queue-worker/package.json +++ b/ee/apps/queue-worker/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/queue-worker", "private": true, - "version": "0.3.0-rc.18", + "version": "0.3.0-rc.19", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/stream-hub-service/CHANGELOG.md b/ee/apps/stream-hub-service/CHANGELOG.md index e6f2dd17534e..51ec60cb4b03 100644 --- a/ee/apps/stream-hub-service/CHANGELOG.md +++ b/ee/apps/stream-hub-service/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/stream-hub-service +## 0.3.0-rc.19 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.19 +- @rocket.chat/core-services@0.3.0-rc.19 +- @rocket.chat/model-typings@0.2.0-rc.19 +- @rocket.chat/models@0.0.24-rc.12 + ## 0.3.0-rc.18 ### Patch Changes diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json index 4feb23f600d8..3be8dc748295 100644 --- a/ee/apps/stream-hub-service/package.json +++ b/ee/apps/stream-hub-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/stream-hub-service", "private": true, - "version": "0.3.0-rc.18", + "version": "0.3.0-rc.19", "description": "Rocket.Chat Stream Hub service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/packages/api-client/CHANGELOG.md b/ee/packages/api-client/CHANGELOG.md index 2d2eefdb8539..9421dd207efb 100644 --- a/ee/packages/api-client/CHANGELOG.md +++ b/ee/packages/api-client/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/api-client +## 0.1.18-rc.12 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.19 +- @rocket.chat/rest-typings@6.5.0-rc.19 + ## 0.1.18-rc.11 ### Patch Changes diff --git a/ee/packages/api-client/package.json b/ee/packages/api-client/package.json index 9a49098ca248..183ae027f997 100644 --- a/ee/packages/api-client/package.json +++ b/ee/packages/api-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/api-client", - "version": "0.1.18-rc.11", + "version": "0.1.18-rc.12", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/ddp-client/CHANGELOG.md b/ee/packages/ddp-client/CHANGELOG.md index 4a1953cc796a..11cfdb9c636d 100644 --- a/ee/packages/ddp-client/CHANGELOG.md +++ b/ee/packages/ddp-client/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/ddp-client +## 0.2.9-rc.12 + +### Patch Changes + +- @rocket.chat/rest-typings@6.5.0-rc.19 +- @rocket.chat/api-client@0.1.18-rc.12 + ## 0.2.9-rc.11 ### Patch Changes diff --git a/ee/packages/ddp-client/package.json b/ee/packages/ddp-client/package.json index 95387af7e377..2369869ec5be 100644 --- a/ee/packages/ddp-client/package.json +++ b/ee/packages/ddp-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ddp-client", - "version": "0.2.9-rc.11", + "version": "0.2.9-rc.12", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/license/CHANGELOG.md b/ee/packages/license/CHANGELOG.md index 632500c3b161..464df7952527 100644 --- a/ee/packages/license/CHANGELOG.md +++ b/ee/packages/license/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/license +## 0.1.0-rc.19 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.19 + ## 0.1.0-rc.18 ### Patch Changes diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json index 8b08de8ed931..964e18ec0c14 100644 --- a/ee/packages/license/package.json +++ b/ee/packages/license/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/license", - "version": "0.1.0-rc.18", + "version": "0.1.0-rc.19", "private": true, "devDependencies": { "@swc/core": "^1.3.95", diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md index ca46bc68332f..5a40b504731e 100644 --- a/ee/packages/omnichannel-services/CHANGELOG.md +++ b/ee/packages/omnichannel-services/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/omnichannel-services +## 0.1.0-rc.19 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.19 +- @rocket.chat/rest-typings@6.5.0-rc.19 +- @rocket.chat/pdf-worker@0.0.24-rc.12 +- @rocket.chat/core-services@0.3.0-rc.19 +- @rocket.chat/model-typings@0.2.0-rc.19 +- @rocket.chat/models@0.0.24-rc.12 + ## 0.1.0-rc.18 ### Patch Changes diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json index 9fd964848e4a..9d33bedb7468 100644 --- a/ee/packages/omnichannel-services/package.json +++ b/ee/packages/omnichannel-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/omnichannel-services", - "version": "0.1.0-rc.18", + "version": "0.1.0-rc.19", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/ee/packages/pdf-worker/CHANGELOG.md b/ee/packages/pdf-worker/CHANGELOG.md index 9b443a9f9a45..901a00d41c14 100644 --- a/ee/packages/pdf-worker/CHANGELOG.md +++ b/ee/packages/pdf-worker/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/pdf-worker +## 0.0.24-rc.12 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.19 + ## 0.0.24-rc.11 ### Patch Changes diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json index 6fb5c14e0202..a9a17107657a 100644 --- a/ee/packages/pdf-worker/package.json +++ b/ee/packages/pdf-worker/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/pdf-worker", - "version": "0.0.24-rc.11", + "version": "0.0.24-rc.12", "private": true, "devDependencies": { "@storybook/addon-essentials": "~6.5.16", diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md index 353b47a7587c..fb542b3d9bcd 100644 --- a/ee/packages/presence/CHANGELOG.md +++ b/ee/packages/presence/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/presence +## 0.1.0-rc.19 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.19 +- @rocket.chat/core-services@0.3.0-rc.19 +- @rocket.chat/models@0.0.24-rc.12 + ## 0.1.0-rc.18 ### Patch Changes diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json index 4de5adafb7e7..f9fda5da951b 100644 --- a/ee/packages/presence/package.json +++ b/ee/packages/presence/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/presence", - "version": "0.1.0-rc.18", + "version": "0.1.0-rc.19", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/package.json b/package.json index 100b0e8945d4..4363d7216d35 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket.chat", - "version": "6.5.0-rc.18", + "version": "6.5.0-rc.19", "description": "Rocket.Chat Monorepo", "main": "index.js", "private": true, diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md index 364c6bfc2ceb..f297bbb10be8 100644 --- a/packages/core-services/CHANGELOG.md +++ b/packages/core-services/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/core-services +## 0.3.0-rc.19 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.19 +- @rocket.chat/rest-typings@6.5.0-rc.19 +- @rocket.chat/models@0.0.24-rc.12 + ## 0.3.0-rc.18 ### Patch Changes diff --git a/packages/core-services/package.json b/packages/core-services/package.json index 428778289a64..fbf0d36659d2 100644 --- a/packages/core-services/package.json +++ b/packages/core-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/core-services", - "version": "0.3.0-rc.18", + "version": "0.3.0-rc.19", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md index 124863f294d4..7c945d1ee4c6 100644 --- a/packages/core-typings/CHANGELOG.md +++ b/packages/core-typings/CHANGELOG.md @@ -1,5 +1,7 @@ # @rocket.chat/core-typings +## 6.5.0-rc.19 + ## 6.5.0-rc.18 ## 6.5.0-rc.17 diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json index b15217d3a507..75474e893bfb 100644 --- a/packages/core-typings/package.json +++ b/packages/core-typings/package.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/package", "name": "@rocket.chat/core-typings", - "version": "6.5.0-rc.18", + "version": "6.5.0-rc.19", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "eslint": "~8.45.0", diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md index 4969b4e883c1..15ec56895913 100644 --- a/packages/cron/CHANGELOG.md +++ b/packages/cron/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/cron +## 0.0.20-rc.12 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.19 +- @rocket.chat/models@0.0.24-rc.12 + ## 0.0.20-rc.11 ### Patch Changes diff --git a/packages/cron/package.json b/packages/cron/package.json index 53feeca8a5ab..2aaca4a053d8 100644 --- a/packages/cron/package.json +++ b/packages/cron/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/cron", - "version": "0.0.20-rc.11", + "version": "0.0.20-rc.12", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md index e2a6924cc727..0b3ed82caf3f 100644 --- a/packages/fuselage-ui-kit/CHANGELOG.md +++ b/packages/fuselage-ui-kit/CHANGELOG.md @@ -1,5 +1,13 @@ # Change Log +## 3.0.0-rc.19 + +### Patch Changes + +- @rocket.chat/gazzodown@3.0.0-rc.19 +- @rocket.chat/ui-contexts@3.0.0-rc.19 +- @rocket.chat/ui-video-conf@3.0.0-rc.19 + ## 3.0.0-rc.18 ### Patch Changes diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index 762e12605ca3..28df5b9d50e6 100644 --- a/packages/fuselage-ui-kit/package.json +++ b/packages/fuselage-ui-kit/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/fuselage-ui-kit", "private": true, - "version": "3.0.0-rc.18", + "version": "3.0.0-rc.19", "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system", "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/", "author": { @@ -48,9 +48,9 @@ "@rocket.chat/icons": "*", "@rocket.chat/prettier-config": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.18", + "@rocket.chat/ui-contexts": "3.0.0-rc.19", "@rocket.chat/ui-kit": "*", - "@rocket.chat/ui-video-conf": "3.0.0-rc.18", + "@rocket.chat/ui-video-conf": "3.0.0-rc.19", "@tanstack/react-query": "*", "react": "*", "react-dom": "*" diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md index c18602fd43ea..16a650ba145f 100644 --- a/packages/gazzodown/CHANGELOG.md +++ b/packages/gazzodown/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/gazzodown +## 3.0.0-rc.19 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.19 +- @rocket.chat/ui-contexts@3.0.0-rc.19 +- @rocket.chat/ui-client@3.0.0-rc.19 + ## 3.0.0-rc.18 ### Patch Changes diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json index feddfb4f797b..d63071ecce37 100644 --- a/packages/gazzodown/package.json +++ b/packages/gazzodown/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/gazzodown", - "version": "3.0.0-rc.18", + "version": "3.0.0-rc.19", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -65,14 +65,14 @@ "/dist" ], "peerDependencies": { - "@rocket.chat/core-typings": "6.5.0-rc.18", + "@rocket.chat/core-typings": "6.5.0-rc.19", "@rocket.chat/css-in-js": "*", "@rocket.chat/fuselage": "*", "@rocket.chat/fuselage-tokens": "*", "@rocket.chat/message-parser": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-client": "3.0.0-rc.18", - "@rocket.chat/ui-contexts": "3.0.0-rc.18", + "@rocket.chat/ui-client": "3.0.0-rc.19", + "@rocket.chat/ui-contexts": "3.0.0-rc.19", "katex": "*", "react": "*" }, diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md index f1907a541e8f..c7c55c54560f 100644 --- a/packages/instance-status/CHANGELOG.md +++ b/packages/instance-status/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/instance-status +## 0.0.24-rc.12 + +### Patch Changes + +- @rocket.chat/models@0.0.24-rc.12 + ## 0.0.24-rc.11 ### Patch Changes diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json index 39f4384b7c50..b30de485e97d 100644 --- a/packages/instance-status/package.json +++ b/packages/instance-status/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/instance-status", - "version": "0.0.24-rc.11", + "version": "0.0.24-rc.12", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md index 66fd6b4be445..a25c4a17e9be 100644 --- a/packages/livechat/CHANGELOG.md +++ b/packages/livechat/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/livechat Change Log +## 1.14.9-rc.12 + +### Patch Changes + +- @rocket.chat/gazzodown@3.0.0-rc.19 + ## 1.14.9-rc.11 ### Patch Changes diff --git a/packages/livechat/package.json b/packages/livechat/package.json index eede2104b6e7..8f6dc2123a6f 100644 --- a/packages/livechat/package.json +++ b/packages/livechat/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/livechat", - "version": "1.14.9-rc.11", + "version": "1.14.9-rc.12", "files": [ "/build" ], diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md index 7bc413906a4d..f4b69034a7f4 100644 --- a/packages/model-typings/CHANGELOG.md +++ b/packages/model-typings/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/model-typings +## 0.2.0-rc.19 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.19 + ## 0.2.0-rc.18 ### Patch Changes diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json index a53c7814962e..6a34363cc5ee 100644 --- a/packages/model-typings/package.json +++ b/packages/model-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/model-typings", - "version": "0.2.0-rc.18", + "version": "0.2.0-rc.19", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md index cc414b2b84ce..54bab4afdb69 100644 --- a/packages/models/CHANGELOG.md +++ b/packages/models/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/models +## 0.0.24-rc.12 + +### Patch Changes + +- @rocket.chat/model-typings@0.2.0-rc.19 + ## 0.0.24-rc.11 ### Patch Changes diff --git a/packages/models/package.json b/packages/models/package.json index a8e4de5a051b..5803aec0804b 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/models", - "version": "0.0.24-rc.11", + "version": "0.0.24-rc.12", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md index 866ab05fd184..810ad5c03c13 100644 --- a/packages/rest-typings/CHANGELOG.md +++ b/packages/rest-typings/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/rest-typings +## 6.5.0-rc.19 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.19 +- @rocket.chat/license@0.1.0-rc.19 + ## 6.5.0-rc.18 ### Patch Changes diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json index 511209cd87c2..42acfabb3210 100644 --- a/packages/rest-typings/package.json +++ b/packages/rest-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/rest-typings", - "version": "6.5.0-rc.18", + "version": "6.5.0-rc.19", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "@types/jest": "~29.5.7", diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md index f2716f814c02..50cd5d386338 100644 --- a/packages/ui-client/CHANGELOG.md +++ b/packages/ui-client/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/ui-client +## 3.0.0-rc.19 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.19 + ## 3.0.0-rc.18 ### Patch Changes diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json index dfaa782b291d..6537dae83873 100644 --- a/packages/ui-client/package.json +++ b/packages/ui-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-client", - "version": "3.0.0-rc.18", + "version": "3.0.0-rc.19", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -61,7 +61,7 @@ "@rocket.chat/fuselage": "*", "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.18", + "@rocket.chat/ui-contexts": "3.0.0-rc.19", "react": "~17.0.2" }, "volta": { diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md index 6d4473c80039..4d68cd85061a 100644 --- a/packages/ui-contexts/CHANGELOG.md +++ b/packages/ui-contexts/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/ui-contexts +## 3.0.0-rc.19 + +### Patch Changes + +- @rocket.chat/core-typings@6.5.0-rc.19 +- @rocket.chat/rest-typings@6.5.0-rc.19 +- @rocket.chat/ddp-client@0.2.9-rc.12 + ## 3.0.0-rc.18 ### Patch Changes diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json index 69dc69dc48ab..9d33e40b6788 100644 --- a/packages/ui-contexts/package.json +++ b/packages/ui-contexts/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-contexts", - "version": "3.0.0-rc.18", + "version": "3.0.0-rc.19", "private": true, "devDependencies": { "@rocket.chat/core-typings": "workspace:^", diff --git a/packages/ui-video-conf/CHANGELOG.md b/packages/ui-video-conf/CHANGELOG.md index ae6b43b22354..9c39905431bb 100644 --- a/packages/ui-video-conf/CHANGELOG.md +++ b/packages/ui-video-conf/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/ui-video-conf +## 3.0.0-rc.19 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.19 + ## 3.0.0-rc.18 ### Patch Changes diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json index d6b8eba9e173..82dd31a5e258 100644 --- a/packages/ui-video-conf/package.json +++ b/packages/ui-video-conf/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-video-conf", - "version": "3.0.0-rc.18", + "version": "3.0.0-rc.19", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -35,7 +35,7 @@ "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.18", + "@rocket.chat/ui-contexts": "3.0.0-rc.19", "react": "^17.0.2", "react-dom": "^17.0.2" }, diff --git a/packages/uikit-playground/CHANGELOG.md b/packages/uikit-playground/CHANGELOG.md index e20bc9d55cd6..366290fce576 100644 --- a/packages/uikit-playground/CHANGELOG.md +++ b/packages/uikit-playground/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/uikit-playground +## 0.2.9-rc.12 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.19 +- @rocket.chat/fuselage-ui-kit@3.0.0-rc.19 + ## 0.2.9-rc.11 ### Patch Changes diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json index c12fd44a1189..5438fdbd611e 100644 --- a/packages/uikit-playground/package.json +++ b/packages/uikit-playground/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/uikit-playground", "private": true, - "version": "0.2.9-rc.11", + "version": "0.2.9-rc.12", "type": "module", "scripts": { "dev": "vite", diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md index 586a5a860698..50d5c79ecf82 100644 --- a/packages/web-ui-registration/CHANGELOG.md +++ b/packages/web-ui-registration/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/web-ui-registration +## 3.0.0-rc.18 + +### Patch Changes + +- @rocket.chat/ui-contexts@3.0.0-rc.19 + ## 3.0.0-rc.17 ### Patch Changes diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json index fd549a4df8d0..0811689d3705 100644 --- a/packages/web-ui-registration/package.json +++ b/packages/web-ui-registration/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/web-ui-registration", - "version": "3.0.0-rc.17", + "version": "3.0.0-rc.18", "private": true, "homepage": "https://rocket.chat", "main": "./dist/index.js", @@ -51,7 +51,7 @@ "peerDependencies": { "@rocket.chat/layout": "*", "@rocket.chat/tools": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.18", + "@rocket.chat/ui-contexts": "3.0.0-rc.19", "@tanstack/react-query": "*", "react": "*", "react-hook-form": "*", From ae7e55c47fcb5454b7055d2432568287a3358db4 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Fri, 1 Dec 2023 12:18:47 -0300 Subject: [PATCH 73/76] regression: cancel plans button --- .../admin/subscription/components/UpgradeToGetMore.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/meteor/client/views/admin/subscription/components/UpgradeToGetMore.tsx b/apps/meteor/client/views/admin/subscription/components/UpgradeToGetMore.tsx index a3c079319b53..05f83c787b4e 100644 --- a/apps/meteor/client/views/admin/subscription/components/UpgradeToGetMore.tsx +++ b/apps/meteor/client/views/admin/subscription/components/UpgradeToGetMore.tsx @@ -35,7 +35,11 @@ const UpgradeToGetMore = ({ activeModules, children }: UpgradeToGetMoreProps) => }); if (upgradeModules?.length === 0) { - return null; + return ( + + {children} + + ); } return ( From 2a3306701302355027922b648beca39a8a70bb0a Mon Sep 17 00:00:00 2001 From: rocketchat-github-ci Date: Fri, 1 Dec 2023 17:26:58 +0000 Subject: [PATCH 74/76] Release 6.5.0 [no ci] --- .changeset/angry-kids-occur.md | 4 - .changeset/blue-trainers-explain.md | 6 - .changeset/brave-snakes-scream.md | 5 - .changeset/brown-comics-cheat.md | 8 - .changeset/brown-donuts-drive.md | 5 - .changeset/bump-patch-1699478965737.md | 5 - .changeset/bump-patch-1699591347357.md | 5 - .changeset/bump-patch-1699738736996.md | 5 - .changeset/bump-patch-1699940713809.md | 5 - .changeset/bump-patch-1699991612617.md | 5 - .changeset/bump-patch-1699998565522.md | 5 - .changeset/bump-patch-1700263798234.md | 5 - .changeset/bump-patch-1700616232353.md | 5 - .changeset/bump-patch-1700695874400.md | 5 - .changeset/bump-patch-1700748014961.md | 5 - .changeset/bump-patch-1700789984107.md | 5 - .changeset/bump-patch-1700801891621.md | 5 - .changeset/bump-patch-1701008644667.md | 5 - .changeset/bump-patch-1701126964872.md | 5 - .changeset/bump-patch-1701382849135.md | 5 - .changeset/bump-patch-1701383588348.md | 5 - .changeset/bump-patch-1701392992806.md | 5 - .changeset/bump-patch-1701395305753.md | 5 - .changeset/bump-patch-1701438032525.md | 5 - .changeset/cool-rockets-talk.md | 5 - .changeset/cool-zoos-move.md | 5 - .changeset/cuddly-ties-run.md | 5 - .changeset/cyan-mangos-do.md | 5 - .changeset/dirty-rings-fry.md | 5 - .changeset/dull-trainers-drive.md | 5 - .changeset/eleven-gorillas-deliver.md | 5 - .changeset/empty-files-know.md | 5 - .changeset/fluffy-monkeys-sing.md | 5 - .changeset/fuzzy-plums-travel.md | 5 - .changeset/gentle-radios-relate.md | 5 - .changeset/great-queens-joke.md | 5 - .changeset/heavy-ads-carry.md | 5 - .changeset/hip-pans-argue.md | 5 - .changeset/honest-socks-sniff.md | 5 - .changeset/khaki-feet-dance.md | 5 - .changeset/kind-books-love.md | 5 - .changeset/large-pandas-beam.md | 5 - .changeset/late-pants-switch.md | 6 - .changeset/lazy-shoes-teach.md | 5 - .changeset/long-cars-dream.md | 5 - .changeset/lucky-vans-develop.md | 5 - .changeset/nice-chairs-add.md | 13 -- .changeset/ninety-carrots-flow.md | 5 - .changeset/ninety-files-sing.md | 5 - .changeset/odd-hounds-thank.md | 5 - .changeset/old-buckets-camp.md | 7 - .changeset/old-zoos-hang.md | 5 - .changeset/perfect-onions-develop.md | 5 - .changeset/perfect-pianos-yawn.md | 5 - .changeset/popular-actors-cheat.md | 6 - .changeset/pre.json | 152 ---------------- .changeset/proud-shrimps-cheat.md | 5 - .changeset/quiet-countries-provide.md | 5 - .changeset/quiet-phones-reply.md | 5 - .changeset/rich-dogs-smell.md | 5 - .changeset/rotten-dryers-allow.md | 5 - .changeset/rotten-pears-watch.md | 8 - .changeset/selfish-hounds-pay.md | 5 - .changeset/selfish-panthers-stare.md | 5 - .changeset/serious-cats-fetch.md | 5 - .changeset/seven-carpets-march.md | 5 - .changeset/seven-emus-pay.md | 10 -- .changeset/shiny-pillows-run.md | 5 - .changeset/six-pens-look.md | 5 - .changeset/slow-coats-shout.md | 7 - .changeset/soft-cows-juggle.md | 5 - .changeset/sour-hotels-flash.md | 5 - .changeset/stale-masks-learn.md | 5 - .changeset/strange-papayas-yell.md | 5 - .changeset/sweet-chefs-exist.md | 5 - .changeset/sweet-feet-relate.md | 5 - .changeset/tall-moons-beam.md | 5 - .changeset/thick-ads-run.md | 12 -- .changeset/thick-spoons-compete.md | 5 - .changeset/thirty-jokes-compete.md | 5 - .changeset/thirty-pumpkins-fix.md | 8 - .changeset/tidy-bears-applaud.md | 10 -- .changeset/tidy-cows-destroy.md | 5 - .changeset/tiny-wolves-deliver.md | 5 - .changeset/tough-apples-turn.md | 5 - .changeset/tough-carrots-walk.md | 7 - .changeset/twelve-files-deny.md | 22 --- .changeset/twenty-colts-hope.md | 5 - .changeset/warm-melons-type.md | 7 - .changeset/weak-cameras-pay.md | 5 - .changeset/weak-elephants-kneel.md | 5 - .changeset/wicked-humans-hang.md | 5 - .changeset/wicked-jars-double.md | 5 - .changeset/workspace-status-admin-page.md | 5 - apps/meteor/.docker/Dockerfile.rhel | 2 +- apps/meteor/CHANGELOG.md | 163 ++++++++++++++++++ apps/meteor/app/utils/rocketchat.info | 2 +- apps/meteor/ee/server/services/CHANGELOG.md | 19 ++ apps/meteor/ee/server/services/package.json | 2 +- apps/meteor/package.json | 2 +- ee/apps/account-service/CHANGELOG.md | 25 +++ ee/apps/account-service/package.json | 2 +- ee/apps/authorization-service/CHANGELOG.md | 25 +++ ee/apps/authorization-service/package.json | 2 +- ee/apps/ddp-streamer/CHANGELOG.md | 28 +++ ee/apps/ddp-streamer/package.json | 2 +- ee/apps/omnichannel-transcript/CHANGELOG.md | 26 +++ ee/apps/omnichannel-transcript/package.json | 2 +- ee/apps/presence-service/CHANGELOG.md | 25 +++ ee/apps/presence-service/package.json | 2 +- ee/apps/queue-worker/CHANGELOG.md | 24 +++ ee/apps/queue-worker/package.json | 2 +- ee/apps/stream-hub-service/CHANGELOG.md | 23 +++ ee/apps/stream-hub-service/package.json | 2 +- ee/packages/api-client/CHANGELOG.md | 15 ++ ee/packages/api-client/package.json | 2 +- ee/packages/ddp-client/CHANGELOG.md | 14 ++ ee/packages/ddp-client/package.json | 2 +- ee/packages/license/CHANGELOG.md | 21 +++ ee/packages/license/package.json | 2 +- ee/packages/omnichannel-services/CHANGELOG.md | 28 +++ ee/packages/omnichannel-services/package.json | 2 +- ee/packages/pdf-worker/CHANGELOG.md | 13 ++ ee/packages/pdf-worker/package.json | 2 +- ee/packages/presence/CHANGELOG.md | 22 +++ ee/packages/presence/package.json | 2 +- ee/packages/ui-theming/CHANGELOG.md | 6 + ee/packages/ui-theming/package.json | 2 +- package.json | 2 +- packages/core-services/CHANGELOG.md | 24 +++ packages/core-services/package.json | 2 +- packages/core-typings/CHANGELOG.md | 28 +++ packages/core-typings/package.json | 2 +- packages/cron/CHANGELOG.md | 14 ++ packages/cron/package.json | 2 +- packages/fuselage-ui-kit/CHANGELOG.md | 10 ++ packages/fuselage-ui-kit/package.json | 6 +- packages/gazzodown/CHANGELOG.md | 17 ++ packages/gazzodown/package.json | 8 +- packages/i18n/CHANGELOG.md | 6 + packages/i18n/package.json | 2 +- packages/instance-status/CHANGELOG.md | 6 + packages/instance-status/package.json | 2 +- packages/jwt/CHANGELOG.md | 8 + packages/jwt/package.json | 2 +- packages/livechat/CHANGELOG.md | 7 + packages/livechat/package.json | 2 +- packages/mock-providers/CHANGELOG.md | 7 + packages/mock-providers/package.json | 2 +- packages/model-typings/CHANGELOG.md | 25 +++ packages/model-typings/package.json | 2 +- packages/models/CHANGELOG.md | 10 ++ packages/models/package.json | 2 +- packages/rest-typings/CHANGELOG.md | 28 +++ packages/rest-typings/package.json | 2 +- packages/server-fetch/CHANGELOG.md | 6 + packages/server-fetch/package.json | 2 +- packages/tools/CHANGELOG.md | 6 + packages/tools/package.json | 2 +- packages/ui-client/CHANGELOG.md | 7 + packages/ui-client/package.json | 4 +- packages/ui-contexts/CHANGELOG.md | 17 ++ packages/ui-contexts/package.json | 2 +- packages/ui-video-conf/CHANGELOG.md | 7 + packages/ui-video-conf/package.json | 4 +- packages/uikit-playground/CHANGELOG.md | 8 + packages/uikit-playground/package.json | 2 +- packages/web-ui-registration/CHANGELOG.md | 10 ++ packages/web-ui-registration/package.json | 4 +- 169 files changed, 775 insertions(+), 725 deletions(-) delete mode 100644 .changeset/angry-kids-occur.md delete mode 100644 .changeset/blue-trainers-explain.md delete mode 100644 .changeset/brave-snakes-scream.md delete mode 100644 .changeset/brown-comics-cheat.md delete mode 100644 .changeset/brown-donuts-drive.md delete mode 100644 .changeset/bump-patch-1699478965737.md delete mode 100644 .changeset/bump-patch-1699591347357.md delete mode 100644 .changeset/bump-patch-1699738736996.md delete mode 100644 .changeset/bump-patch-1699940713809.md delete mode 100644 .changeset/bump-patch-1699991612617.md delete mode 100644 .changeset/bump-patch-1699998565522.md delete mode 100644 .changeset/bump-patch-1700263798234.md delete mode 100644 .changeset/bump-patch-1700616232353.md delete mode 100644 .changeset/bump-patch-1700695874400.md delete mode 100644 .changeset/bump-patch-1700748014961.md delete mode 100644 .changeset/bump-patch-1700789984107.md delete mode 100644 .changeset/bump-patch-1700801891621.md delete mode 100644 .changeset/bump-patch-1701008644667.md delete mode 100644 .changeset/bump-patch-1701126964872.md delete mode 100644 .changeset/bump-patch-1701382849135.md delete mode 100644 .changeset/bump-patch-1701383588348.md delete mode 100644 .changeset/bump-patch-1701392992806.md delete mode 100644 .changeset/bump-patch-1701395305753.md delete mode 100644 .changeset/bump-patch-1701438032525.md delete mode 100644 .changeset/cool-rockets-talk.md delete mode 100644 .changeset/cool-zoos-move.md delete mode 100644 .changeset/cuddly-ties-run.md delete mode 100644 .changeset/cyan-mangos-do.md delete mode 100644 .changeset/dirty-rings-fry.md delete mode 100644 .changeset/dull-trainers-drive.md delete mode 100644 .changeset/eleven-gorillas-deliver.md delete mode 100644 .changeset/empty-files-know.md delete mode 100644 .changeset/fluffy-monkeys-sing.md delete mode 100644 .changeset/fuzzy-plums-travel.md delete mode 100644 .changeset/gentle-radios-relate.md delete mode 100644 .changeset/great-queens-joke.md delete mode 100644 .changeset/heavy-ads-carry.md delete mode 100644 .changeset/hip-pans-argue.md delete mode 100644 .changeset/honest-socks-sniff.md delete mode 100644 .changeset/khaki-feet-dance.md delete mode 100644 .changeset/kind-books-love.md delete mode 100644 .changeset/large-pandas-beam.md delete mode 100644 .changeset/late-pants-switch.md delete mode 100644 .changeset/lazy-shoes-teach.md delete mode 100644 .changeset/long-cars-dream.md delete mode 100644 .changeset/lucky-vans-develop.md delete mode 100644 .changeset/nice-chairs-add.md delete mode 100644 .changeset/ninety-carrots-flow.md delete mode 100644 .changeset/ninety-files-sing.md delete mode 100644 .changeset/odd-hounds-thank.md delete mode 100644 .changeset/old-buckets-camp.md delete mode 100644 .changeset/old-zoos-hang.md delete mode 100644 .changeset/perfect-onions-develop.md delete mode 100644 .changeset/perfect-pianos-yawn.md delete mode 100644 .changeset/popular-actors-cheat.md delete mode 100644 .changeset/pre.json delete mode 100644 .changeset/proud-shrimps-cheat.md delete mode 100644 .changeset/quiet-countries-provide.md delete mode 100644 .changeset/quiet-phones-reply.md delete mode 100644 .changeset/rich-dogs-smell.md delete mode 100644 .changeset/rotten-dryers-allow.md delete mode 100644 .changeset/rotten-pears-watch.md delete mode 100644 .changeset/selfish-hounds-pay.md delete mode 100644 .changeset/selfish-panthers-stare.md delete mode 100644 .changeset/serious-cats-fetch.md delete mode 100644 .changeset/seven-carpets-march.md delete mode 100644 .changeset/seven-emus-pay.md delete mode 100644 .changeset/shiny-pillows-run.md delete mode 100644 .changeset/six-pens-look.md delete mode 100644 .changeset/slow-coats-shout.md delete mode 100644 .changeset/soft-cows-juggle.md delete mode 100644 .changeset/sour-hotels-flash.md delete mode 100644 .changeset/stale-masks-learn.md delete mode 100644 .changeset/strange-papayas-yell.md delete mode 100644 .changeset/sweet-chefs-exist.md delete mode 100644 .changeset/sweet-feet-relate.md delete mode 100644 .changeset/tall-moons-beam.md delete mode 100644 .changeset/thick-ads-run.md delete mode 100644 .changeset/thick-spoons-compete.md delete mode 100644 .changeset/thirty-jokes-compete.md delete mode 100644 .changeset/thirty-pumpkins-fix.md delete mode 100644 .changeset/tidy-bears-applaud.md delete mode 100644 .changeset/tidy-cows-destroy.md delete mode 100644 .changeset/tiny-wolves-deliver.md delete mode 100644 .changeset/tough-apples-turn.md delete mode 100644 .changeset/tough-carrots-walk.md delete mode 100644 .changeset/twelve-files-deny.md delete mode 100644 .changeset/twenty-colts-hope.md delete mode 100644 .changeset/warm-melons-type.md delete mode 100644 .changeset/weak-cameras-pay.md delete mode 100644 .changeset/weak-elephants-kneel.md delete mode 100644 .changeset/wicked-humans-hang.md delete mode 100644 .changeset/wicked-jars-double.md delete mode 100644 .changeset/workspace-status-admin-page.md diff --git a/.changeset/angry-kids-occur.md b/.changeset/angry-kids-occur.md deleted file mode 100644 index d0b4961dd564..000000000000 --- a/.changeset/angry-kids-occur.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- -Fixed GDPR removal to correctly wipe everything related to the user apart from _id & activity fields diff --git a/.changeset/blue-trainers-explain.md b/.changeset/blue-trainers-explain.md deleted file mode 100644 index dee7f5decd6f..000000000000 --- a/.changeset/blue-trainers-explain.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"@rocket.chat/ui-contexts": patch -"@rocket.chat/web-ui-registration": patch ---- - -Fixed an issue in the invite registration flow in which the user would not be automatically redirected to the homepage upon succesfully submiting the user registration form. diff --git a/.changeset/brave-snakes-scream.md b/.changeset/brave-snakes-scream.md deleted file mode 100644 index 914f248cd821..000000000000 --- a/.changeset/brave-snakes-scream.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -Fixed an issue where broadcasted events were published twice within the same instance diff --git a/.changeset/brown-comics-cheat.md b/.changeset/brown-comics-cheat.md deleted file mode 100644 index a7907979881b..000000000000 --- a/.changeset/brown-comics-cheat.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -"@rocket.chat/meteor": patch -"@rocket.chat/core-typings": patch -"@rocket.chat/model-typings": patch ---- - -chore: Calculate & Store MAC stats -Added new info to the stats: `omnichannelContactsBySource`, `uniqueContactsOfLastMonth`, `uniqueContactsOfLastWeek`, `uniqueContactsOfYesterday` diff --git a/.changeset/brown-donuts-drive.md b/.changeset/brown-donuts-drive.md deleted file mode 100644 index 8e072b97aaba..000000000000 --- a/.changeset/brown-donuts-drive.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": minor ---- - -Added a new admin page called `Subscription`, this page is responsible of managing the current workspace subscription and it has a overview of the usage and limits of the plan diff --git a/.changeset/bump-patch-1699478965737.md b/.changeset/bump-patch-1699478965737.md deleted file mode 100644 index e1eaa7980afb..000000000000 --- a/.changeset/bump-patch-1699478965737.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Bump @rocket.chat/meteor version. diff --git a/.changeset/bump-patch-1699591347357.md b/.changeset/bump-patch-1699591347357.md deleted file mode 100644 index e1eaa7980afb..000000000000 --- a/.changeset/bump-patch-1699591347357.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Bump @rocket.chat/meteor version. diff --git a/.changeset/bump-patch-1699738736996.md b/.changeset/bump-patch-1699738736996.md deleted file mode 100644 index e1eaa7980afb..000000000000 --- a/.changeset/bump-patch-1699738736996.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Bump @rocket.chat/meteor version. diff --git a/.changeset/bump-patch-1699940713809.md b/.changeset/bump-patch-1699940713809.md deleted file mode 100644 index e1eaa7980afb..000000000000 --- a/.changeset/bump-patch-1699940713809.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Bump @rocket.chat/meteor version. diff --git a/.changeset/bump-patch-1699991612617.md b/.changeset/bump-patch-1699991612617.md deleted file mode 100644 index e1eaa7980afb..000000000000 --- a/.changeset/bump-patch-1699991612617.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Bump @rocket.chat/meteor version. diff --git a/.changeset/bump-patch-1699998565522.md b/.changeset/bump-patch-1699998565522.md deleted file mode 100644 index e1eaa7980afb..000000000000 --- a/.changeset/bump-patch-1699998565522.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Bump @rocket.chat/meteor version. diff --git a/.changeset/bump-patch-1700263798234.md b/.changeset/bump-patch-1700263798234.md deleted file mode 100644 index e1eaa7980afb..000000000000 --- a/.changeset/bump-patch-1700263798234.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Bump @rocket.chat/meteor version. diff --git a/.changeset/bump-patch-1700616232353.md b/.changeset/bump-patch-1700616232353.md deleted file mode 100644 index e1eaa7980afb..000000000000 --- a/.changeset/bump-patch-1700616232353.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Bump @rocket.chat/meteor version. diff --git a/.changeset/bump-patch-1700695874400.md b/.changeset/bump-patch-1700695874400.md deleted file mode 100644 index e1eaa7980afb..000000000000 --- a/.changeset/bump-patch-1700695874400.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Bump @rocket.chat/meteor version. diff --git a/.changeset/bump-patch-1700748014961.md b/.changeset/bump-patch-1700748014961.md deleted file mode 100644 index e1eaa7980afb..000000000000 --- a/.changeset/bump-patch-1700748014961.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Bump @rocket.chat/meteor version. diff --git a/.changeset/bump-patch-1700789984107.md b/.changeset/bump-patch-1700789984107.md deleted file mode 100644 index e1eaa7980afb..000000000000 --- a/.changeset/bump-patch-1700789984107.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Bump @rocket.chat/meteor version. diff --git a/.changeset/bump-patch-1700801891621.md b/.changeset/bump-patch-1700801891621.md deleted file mode 100644 index e1eaa7980afb..000000000000 --- a/.changeset/bump-patch-1700801891621.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Bump @rocket.chat/meteor version. diff --git a/.changeset/bump-patch-1701008644667.md b/.changeset/bump-patch-1701008644667.md deleted file mode 100644 index e1eaa7980afb..000000000000 --- a/.changeset/bump-patch-1701008644667.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Bump @rocket.chat/meteor version. diff --git a/.changeset/bump-patch-1701126964872.md b/.changeset/bump-patch-1701126964872.md deleted file mode 100644 index e1eaa7980afb..000000000000 --- a/.changeset/bump-patch-1701126964872.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Bump @rocket.chat/meteor version. diff --git a/.changeset/bump-patch-1701382849135.md b/.changeset/bump-patch-1701382849135.md deleted file mode 100644 index e1eaa7980afb..000000000000 --- a/.changeset/bump-patch-1701382849135.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Bump @rocket.chat/meteor version. diff --git a/.changeset/bump-patch-1701383588348.md b/.changeset/bump-patch-1701383588348.md deleted file mode 100644 index e1eaa7980afb..000000000000 --- a/.changeset/bump-patch-1701383588348.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Bump @rocket.chat/meteor version. diff --git a/.changeset/bump-patch-1701392992806.md b/.changeset/bump-patch-1701392992806.md deleted file mode 100644 index e1eaa7980afb..000000000000 --- a/.changeset/bump-patch-1701392992806.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Bump @rocket.chat/meteor version. diff --git a/.changeset/bump-patch-1701395305753.md b/.changeset/bump-patch-1701395305753.md deleted file mode 100644 index e1eaa7980afb..000000000000 --- a/.changeset/bump-patch-1701395305753.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Bump @rocket.chat/meteor version. diff --git a/.changeset/bump-patch-1701438032525.md b/.changeset/bump-patch-1701438032525.md deleted file mode 100644 index e1eaa7980afb..000000000000 --- a/.changeset/bump-patch-1701438032525.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Bump @rocket.chat/meteor version. diff --git a/.changeset/cool-rockets-talk.md b/.changeset/cool-rockets-talk.md deleted file mode 100644 index 8dc5af53dd88..000000000000 --- a/.changeset/cool-rockets-talk.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -add support to DeepL open api diff --git a/.changeset/cool-zoos-move.md b/.changeset/cool-zoos-move.md deleted file mode 100644 index dda6fbe2b02e..000000000000 --- a/.changeset/cool-zoos-move.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -fixed threads breaking when sending messages too fast diff --git a/.changeset/cuddly-ties-run.md b/.changeset/cuddly-ties-run.md deleted file mode 100644 index cb3873899841..000000000000 --- a/.changeset/cuddly-ties-run.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -fix: custom-css injection diff --git a/.changeset/cyan-mangos-do.md b/.changeset/cyan-mangos-do.md deleted file mode 100644 index e188686c82d5..000000000000 --- a/.changeset/cyan-mangos-do.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -fix: UI issue on marketplace filters diff --git a/.changeset/dirty-rings-fry.md b/.changeset/dirty-rings-fry.md deleted file mode 100644 index 06a0fd6a2966..000000000000 --- a/.changeset/dirty-rings-fry.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -Fixed issue with the creation of groups with the name of an already existing room throwing `internalError` diff --git a/.changeset/dull-trainers-drive.md b/.changeset/dull-trainers-drive.md deleted file mode 100644 index f5a673cd8c30..000000000000 --- a/.changeset/dull-trainers-drive.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -fix: Remove model-level query restrictions for monitors diff --git a/.changeset/eleven-gorillas-deliver.md b/.changeset/eleven-gorillas-deliver.md deleted file mode 100644 index 403bd294828b..000000000000 --- a/.changeset/eleven-gorillas-deliver.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Fix trying to upload same file again and again. diff --git a/.changeset/empty-files-know.md b/.changeset/empty-files-know.md deleted file mode 100644 index 5e6fb8f751b2..000000000000 --- a/.changeset/empty-files-know.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Fix unnecessary username validation on accounts profile form diff --git a/.changeset/fluffy-monkeys-sing.md b/.changeset/fluffy-monkeys-sing.md deleted file mode 100644 index db93491b0ecd..000000000000 --- a/.changeset/fluffy-monkeys-sing.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -Changed the name of the administration Logs page to "Records", implemented a tab layout in this page and added a new tab called "Analytic reports" that shows the most recent result of the statistics endpoint. diff --git a/.changeset/fuzzy-plums-travel.md b/.changeset/fuzzy-plums-travel.md deleted file mode 100644 index fec86862a711..000000000000 --- a/.changeset/fuzzy-plums-travel.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/gazzodown": patch ---- - -fixed an issue with mentions showing usernames instead of names on smaller screens diff --git a/.changeset/gentle-radios-relate.md b/.changeset/gentle-radios-relate.md deleted file mode 100644 index 8d5f12b3a286..000000000000 --- a/.changeset/gentle-radios-relate.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -Fixed DM room with "guest" user kept as "read only" after reactivating user diff --git a/.changeset/great-queens-joke.md b/.changeset/great-queens-joke.md deleted file mode 100644 index 232430641a62..000000000000 --- a/.changeset/great-queens-joke.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Fix rocket.cat's app request message escaping diff --git a/.changeset/heavy-ads-carry.md b/.changeset/heavy-ads-carry.md deleted file mode 100644 index c04e52fb48a0..000000000000 --- a/.changeset/heavy-ads-carry.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -fix: Change plan name from Enterprise to Premium on marketplace filtering diff --git a/.changeset/hip-pans-argue.md b/.changeset/hip-pans-argue.md deleted file mode 100644 index af8050383467..000000000000 --- a/.changeset/hip-pans-argue.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -fix: Omnichannel webhook is not retrying requests diff --git a/.changeset/honest-socks-sniff.md b/.changeset/honest-socks-sniff.md deleted file mode 100644 index efdaea336774..000000000000 --- a/.changeset/honest-socks-sniff.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -fix: Google Maps and Katex config settings were not visible diff --git a/.changeset/khaki-feet-dance.md b/.changeset/khaki-feet-dance.md deleted file mode 100644 index a419afa34143..000000000000 --- a/.changeset/khaki-feet-dance.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -feat: Save visitor's activity on agent's interaction diff --git a/.changeset/kind-books-love.md b/.changeset/kind-books-love.md deleted file mode 100644 index 40ce15453ff4..000000000000 --- a/.changeset/kind-books-love.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -Fixed message disappearing from room after erased even if "Show Deleted Status" is enabled diff --git a/.changeset/large-pandas-beam.md b/.changeset/large-pandas-beam.md deleted file mode 100644 index 19f1eade9a9b..000000000000 --- a/.changeset/large-pandas-beam.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": minor ---- - -New setting to automatically enable autotranslate when joining rooms diff --git a/.changeset/late-pants-switch.md b/.changeset/late-pants-switch.md deleted file mode 100644 index d376ee7b87f8..000000000000 --- a/.changeset/late-pants-switch.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'@rocket.chat/meteor': minor -'@rocket.chat/i18n': patch ---- - -Updated slack bridge to add support for connecting using slack apps in addition to the slack legacy bot diff --git a/.changeset/lazy-shoes-teach.md b/.changeset/lazy-shoes-teach.md deleted file mode 100644 index 7737f39cd671..000000000000 --- a/.changeset/lazy-shoes-teach.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': minor ---- - -chore: adding some portugueses translations to the app details page diff --git a/.changeset/long-cars-dream.md b/.changeset/long-cars-dream.md deleted file mode 100644 index 95f226d6dfb4..000000000000 --- a/.changeset/long-cars-dream.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Fixed intermittent errors caused by the removal of subscriptions and inquiries when lacking permissions. diff --git a/.changeset/lucky-vans-develop.md b/.changeset/lucky-vans-develop.md deleted file mode 100644 index e57b7a1e68d5..000000000000 --- a/.changeset/lucky-vans-develop.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -Fixed issue with file attachments in rooms' messages export having no content diff --git a/.changeset/nice-chairs-add.md b/.changeset/nice-chairs-add.md deleted file mode 100644 index dfc9d763e1c0..000000000000 --- a/.changeset/nice-chairs-add.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -"@rocket.chat/meteor": minor -"@rocket.chat/core-typings": minor ---- - -Added `push` statistic, containing three bits. Each bit represents a boolean: -``` -1 1 1 -| | | -| | +- push enabled = 0b1 = 1 -| +--- push gateway enabled = 0b10 = 2 -+----- push gateway changed = 0b100 = 4 -``` diff --git a/.changeset/ninety-carrots-flow.md b/.changeset/ninety-carrots-flow.md deleted file mode 100644 index 3dcfaa8208db..000000000000 --- a/.changeset/ninety-carrots-flow.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -test: read receipts diff --git a/.changeset/ninety-files-sing.md b/.changeset/ninety-files-sing.md deleted file mode 100644 index b5cf45ea81d8..000000000000 --- a/.changeset/ninety-files-sing.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -regression: changed UniqueID modal being displayed wrongly during startup diff --git a/.changeset/odd-hounds-thank.md b/.changeset/odd-hounds-thank.md deleted file mode 100644 index aaddc5d51a38..000000000000 --- a/.changeset/odd-hounds-thank.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -chore: Change plan name Enterprise to Premium on marketplace diff --git a/.changeset/old-buckets-camp.md b/.changeset/old-buckets-camp.md deleted file mode 100644 index e91a59816445..000000000000 --- a/.changeset/old-buckets-camp.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -Add the date and time to the email sent when a new device logs in - - diff --git a/.changeset/old-zoos-hang.md b/.changeset/old-zoos-hang.md deleted file mode 100644 index eb39a6c9d83c..000000000000 --- a/.changeset/old-zoos-hang.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -fix: mobile ringing notification missing call id diff --git a/.changeset/perfect-onions-develop.md b/.changeset/perfect-onions-develop.md deleted file mode 100644 index 3ca5c3e00bb7..000000000000 --- a/.changeset/perfect-onions-develop.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Fix i18n translations using sprintf post processor diff --git a/.changeset/perfect-pianos-yawn.md b/.changeset/perfect-pianos-yawn.md deleted file mode 100644 index 349bca33ecf7..000000000000 --- a/.changeset/perfect-pianos-yawn.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/presence': minor ---- - -Add peak connections monitoring and methods to get and reset the counter diff --git a/.changeset/popular-actors-cheat.md b/.changeset/popular-actors-cheat.md deleted file mode 100644 index aad5ec6ae638..000000000000 --- a/.changeset/popular-actors-cheat.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"@rocket.chat/meteor": patch -"@rocket.chat/model-typings": patch ---- - -Do not allow auto-translation to be enabled in E2E rooms diff --git a/.changeset/pre.json b/.changeset/pre.json deleted file mode 100644 index a97761ad6667..000000000000 --- a/.changeset/pre.json +++ /dev/null @@ -1,152 +0,0 @@ -{ - "mode": "pre", - "tag": "rc", - "initialVersions": { - "@rocket.chat/meteor": "6.5.0-develop", - "rocketchat-services": "1.1.14", - "@rocket.chat/account-service": "0.2.14", - "@rocket.chat/authorization-service": "0.2.14", - "@rocket.chat/ddp-streamer": "0.1.14", - "@rocket.chat/omnichannel-transcript": "0.2.14", - "@rocket.chat/presence-service": "0.2.14", - "@rocket.chat/queue-worker": "0.2.14", - "@rocket.chat/stream-hub-service": "0.2.14", - "@rocket.chat/api-client": "0.1.14", - "@rocket.chat/ddp-client": "0.2.5", - "@rocket.chat/license": "0.0.1", - "@rocket.chat/omnichannel-services": "0.0.20", - "@rocket.chat/pdf-worker": "0.0.20", - "@rocket.chat/presence": "0.0.20", - "@rocket.chat/ui-theming": "0.1.0", - "@rocket.chat/account-utils": "0.0.1", - "@rocket.chat/agenda": "0.0.2", - "@rocket.chat/base64": "1.0.12", - "@rocket.chat/cas-validate": "0.0.1", - "@rocket.chat/core-services": "0.2.5", - "@rocket.chat/core-typings": "6.4.5", - "@rocket.chat/cron": "0.0.16", - "@rocket.chat/eslint-config": "0.6.0", - "@rocket.chat/favicon": "0.0.1", - "@rocket.chat/fuselage-ui-kit": "2.0.5", - "@rocket.chat/gazzodown": "2.0.5", - "@rocket.chat/i18n": "0.0.2", - "@rocket.chat/instance-status": "0.0.20", - "@rocket.chat/jwt": "0.0.1", - "@rocket.chat/livechat": "1.14.5", - "@rocket.chat/log-format": "0.0.1", - "@rocket.chat/logger": "0.0.1", - "@rocket.chat/mock-providers": "0.0.2", - "@rocket.chat/model-typings": "0.1.5", - "@rocket.chat/models": "0.0.20", - "@rocket.chat/poplib": "0.0.1", - "@rocket.chat/password-policies": "0.0.1", - "@rocket.chat/random": "1.2.1", - "@rocket.chat/release-action": "2.2.0", - "@rocket.chat/rest-typings": "6.4.5", - "@rocket.chat/server-cloud-communication": "0.0.1", - "@rocket.chat/server-fetch": "0.0.1", - "@rocket.chat/sha256": "1.0.9", - "@rocket.chat/tools": "0.1.0", - "@rocket.chat/ui-client": "2.0.5", - "@rocket.chat/ui-composer": "0.0.1", - "@rocket.chat/ui-contexts": "2.0.5", - "@rocket.chat/ui-video-conf": "2.0.5", - "@rocket.chat/uikit-playground": "0.2.5", - "@rocket.chat/web-ui-registration": "2.0.5" - }, - "changesets": [ - "angry-kids-occur", - "blue-trainers-explain", - "brave-snakes-scream", - "brown-comics-cheat", - "brown-donuts-drive", - "bump-patch-1699478965737", - "bump-patch-1699591347357", - "bump-patch-1699738736996", - "bump-patch-1699940713809", - "bump-patch-1699991612617", - "bump-patch-1699998565522", - "bump-patch-1700263798234", - "bump-patch-1700616232353", - "bump-patch-1700695874400", - "bump-patch-1700748014961", - "bump-patch-1700789984107", - "bump-patch-1700801891621", - "bump-patch-1701008644667", - "bump-patch-1701126964872", - "bump-patch-1701382849135", - "bump-patch-1701383588348", - "bump-patch-1701392992806", - "bump-patch-1701395305753", - "bump-patch-1701438032525", - "cool-rockets-talk", - "cool-zoos-move", - "cuddly-ties-run", - "cyan-mangos-do", - "dirty-rings-fry", - "dull-trainers-drive", - "eleven-gorillas-deliver", - "empty-files-know", - "fluffy-monkeys-sing", - "fuzzy-plums-travel", - "gentle-radios-relate", - "great-queens-joke", - "heavy-ads-carry", - "hip-pans-argue", - "honest-socks-sniff", - "khaki-feet-dance", - "kind-books-love", - "large-pandas-beam", - "late-pants-switch", - "lazy-shoes-teach", - "long-cars-dream", - "lucky-vans-develop", - "nice-chairs-add", - "ninety-carrots-flow", - "ninety-files-sing", - "odd-hounds-thank", - "old-buckets-camp", - "old-zoos-hang", - "perfect-onions-develop", - "perfect-pianos-yawn", - "popular-actors-cheat", - "proud-shrimps-cheat", - "quiet-countries-provide", - "quiet-phones-reply", - "rich-dogs-smell", - "rotten-dryers-allow", - "rotten-pears-watch", - "selfish-hounds-pay", - "selfish-panthers-stare", - "serious-cats-fetch", - "seven-carpets-march", - "seven-emus-pay", - "shiny-pillows-run", - "six-pens-look", - "slow-coats-shout", - "soft-cows-juggle", - "sour-hotels-flash", - "stale-masks-learn", - "strange-papayas-yell", - "sweet-chefs-exist", - "sweet-feet-relate", - "tall-moons-beam", - "thick-ads-run", - "thick-spoons-compete", - "thirty-jokes-compete", - "thirty-pumpkins-fix", - "tidy-bears-applaud", - "tidy-cows-destroy", - "tiny-wolves-deliver", - "tough-apples-turn", - "tough-carrots-walk", - "twelve-files-deny", - "twenty-colts-hope", - "warm-melons-type", - "weak-cameras-pay", - "weak-elephants-kneel", - "wicked-humans-hang", - "wicked-jars-double", - "workspace-status-admin-page" - ] -} diff --git a/.changeset/proud-shrimps-cheat.md b/.changeset/proud-shrimps-cheat.md deleted file mode 100644 index cad8bc8bfa32..000000000000 --- a/.changeset/proud-shrimps-cheat.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -fix: Unable to send attachments via email as an omni-agent diff --git a/.changeset/quiet-countries-provide.md b/.changeset/quiet-countries-provide.md deleted file mode 100644 index 0c8753aa381a..000000000000 --- a/.changeset/quiet-countries-provide.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -New permission for testing push notifications diff --git a/.changeset/quiet-phones-reply.md b/.changeset/quiet-phones-reply.md deleted file mode 100644 index f2735e615491..000000000000 --- a/.changeset/quiet-phones-reply.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Search users using full name too on share message modal diff --git a/.changeset/rich-dogs-smell.md b/.changeset/rich-dogs-smell.md deleted file mode 100644 index be27db28e227..000000000000 --- a/.changeset/rich-dogs-smell.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': minor ---- - -Fix typing indicator of Apps user diff --git a/.changeset/rotten-dryers-allow.md b/.changeset/rotten-dryers-allow.md deleted file mode 100644 index 154dea572780..000000000000 --- a/.changeset/rotten-dryers-allow.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -Add pagination & tooltips to agent's dropdown on forwarding modal diff --git a/.changeset/rotten-pears-watch.md b/.changeset/rotten-pears-watch.md deleted file mode 100644 index 9cd76a9ff8a4..000000000000 --- a/.changeset/rotten-pears-watch.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -fix: wrong client hash calculation due to race condition on assets - -Some deployments may suffer from some reloads if running multiple instances. It's caused by different client hashes generated due to a possible race condition on custom assets load at the startup time. Forcing the clients to talk to the right backend instances, which causes reloads if sticky sessions are not enabled. -This change removes the assets from the hash calculation preventing the race condition and possible different hashes. After this change, the clients will not reload when the admin changes assets. diff --git a/.changeset/selfish-hounds-pay.md b/.changeset/selfish-hounds-pay.md deleted file mode 100644 index 3ca321bd392f..000000000000 --- a/.changeset/selfish-hounds-pay.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -fix: Monitors now able to forward a chat without taking it first diff --git a/.changeset/selfish-panthers-stare.md b/.changeset/selfish-panthers-stare.md deleted file mode 100644 index cfc7c1ba891f..000000000000 --- a/.changeset/selfish-panthers-stare.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -Fixed Canned responses stream not working, causing users to refresh to see newly created responses. diff --git a/.changeset/serious-cats-fetch.md b/.changeset/serious-cats-fetch.md deleted file mode 100644 index 4718d3597e59..000000000000 --- a/.changeset/serious-cats-fetch.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Fixed a problem that would prevent private apps from being shown on air-gapped environments diff --git a/.changeset/seven-carpets-march.md b/.changeset/seven-carpets-march.md deleted file mode 100644 index 46fd1b7ddb62..000000000000 --- a/.changeset/seven-carpets-march.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Add new permission to allow kick users from rooms without being a member diff --git a/.changeset/seven-emus-pay.md b/.changeset/seven-emus-pay.md deleted file mode 100644 index 169c42d5ab54..000000000000 --- a/.changeset/seven-emus-pay.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -"@rocket.chat/meteor": patch -"@rocket.chat/core-services": patch -"@rocket.chat/core-typings": patch -"@rocket.chat/rest-typings": patch -"@rocket.chat/ddp-client": patch ---- - -feat: Improve UI when MAC limits are reached -feat: Limit endpoints on MAC limit reached diff --git a/.changeset/shiny-pillows-run.md b/.changeset/shiny-pillows-run.md deleted file mode 100644 index 9a85d37a2f9d..000000000000 --- a/.changeset/shiny-pillows-run.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -fix: cloud alerts not working diff --git a/.changeset/six-pens-look.md b/.changeset/six-pens-look.md deleted file mode 100644 index 0ddc1100654c..000000000000 --- a/.changeset/six-pens-look.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': minor ---- - -feat: Setup wizard content updates and enforcing cloud connectivity diff --git a/.changeset/slow-coats-shout.md b/.changeset/slow-coats-shout.md deleted file mode 100644 index 4a226e84d161..000000000000 --- a/.changeset/slow-coats-shout.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -"@rocket.chat/meteor": minor ---- - -Add the daily and monthly peaks of concurrent connections to statistics - - Added `dailyPeakConnections` statistic for monitoring the daily peak of concurrent connections in a workspace; - - Added `maxMonthlyPeakConnections` statistic for monitoring the last 30 days peak of concurrent connections in a workspace; diff --git a/.changeset/soft-cows-juggle.md b/.changeset/soft-cows-juggle.md deleted file mode 100644 index 6fcb20506483..000000000000 --- a/.changeset/soft-cows-juggle.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -download translation files through CDN diff --git a/.changeset/sour-hotels-flash.md b/.changeset/sour-hotels-flash.md deleted file mode 100644 index ac54cf3d3825..000000000000 --- a/.changeset/sour-hotels-flash.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -Replace the old Enterprise labels to newest Premium diff --git a/.changeset/stale-masks-learn.md b/.changeset/stale-masks-learn.md deleted file mode 100644 index 1523b02b0c95..000000000000 --- a/.changeset/stale-masks-learn.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/server-fetch': patch ---- - -Fixed an issue where the payload of an HTTP request made by an app wouldn't be correctly encoded in some cases diff --git a/.changeset/strange-papayas-yell.md b/.changeset/strange-papayas-yell.md deleted file mode 100644 index ca194dd2f9d4..000000000000 --- a/.changeset/strange-papayas-yell.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -fix: Disables GenericMenu without any sections or items diff --git a/.changeset/sweet-chefs-exist.md b/.changeset/sweet-chefs-exist.md deleted file mode 100644 index 6ceee63dd762..000000000000 --- a/.changeset/sweet-chefs-exist.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Check for room scoped permissions for starting discussions diff --git a/.changeset/sweet-feet-relate.md b/.changeset/sweet-feet-relate.md deleted file mode 100644 index f7da740ebcc0..000000000000 --- a/.changeset/sweet-feet-relate.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -fix: user dropdown menu position on RTL layout diff --git a/.changeset/tall-moons-beam.md b/.changeset/tall-moons-beam.md deleted file mode 100644 index d712e5b7531c..000000000000 --- a/.changeset/tall-moons-beam.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -Enable the option `Only allow verified users to login` to SaaS environment diff --git a/.changeset/thick-ads-run.md b/.changeset/thick-ads-run.md deleted file mode 100644 index d7a3668d0464..000000000000 --- a/.changeset/thick-ads-run.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -fix: immediate auto reload issues - -Immediate auto reload increases server load on restarts/upgrades and increases the chance of getting 404 on Meteor's config file blocking the UI on a loading screen - -This change adds delays on front and backend codes on automatic client reload: - -- Front-end, adds a warning message including the old and new hashes, and a delay of 60 seconds after being notified by the server -- Back-end, delays the client notifications on a random value between 2 and 10 minutes per connection, allowing different clients to reload at different moments and distributing the load along the time. diff --git a/.changeset/thick-spoons-compete.md b/.changeset/thick-spoons-compete.md deleted file mode 100644 index cf6e9eb2697d..000000000000 --- a/.changeset/thick-spoons-compete.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': minor ---- - -Added new Omnichannel setting 'Hide conversation after closing' diff --git a/.changeset/thirty-jokes-compete.md b/.changeset/thirty-jokes-compete.md deleted file mode 100644 index 9d4095e7771b..000000000000 --- a/.changeset/thirty-jokes-compete.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -chore: Deprecate un-used meteor method for omnichannel analytics diff --git a/.changeset/thirty-pumpkins-fix.md b/.changeset/thirty-pumpkins-fix.md deleted file mode 100644 index 11b92b064e15..000000000000 --- a/.changeset/thirty-pumpkins-fix.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -'@rocket.chat/core-typings': minor -'@rocket.chat/rest-typings': minor -'@rocket.chat/tools': minor -'@rocket.chat/meteor': minor ---- - -Added option to select between two script engine options for the integrations diff --git a/.changeset/tidy-bears-applaud.md b/.changeset/tidy-bears-applaud.md deleted file mode 100644 index cff12f3dc7d3..000000000000 --- a/.changeset/tidy-bears-applaud.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -"@rocket.chat/meteor": minor -"@rocket.chat/core-typings": minor -"@rocket.chat/model-typings": minor -"@rocket.chat/rest-typings": minor ---- - -Create a deployment fingerprint to identify possible deployment changes caused by database cloning. A question to the admin will confirm if it's a regular deployment change or an intent of a new deployment and correct identification values as needed. -The fingerprint is composed by `${siteUrl}${dbConnectionString}` and hashed via `sha256` in `base64`. -An environment variable named `AUTO_ACCEPT_FINGERPRINT`, when set to `true`, can be used to auto-accept an expected fingerprint change as a regular deployment update. diff --git a/.changeset/tidy-cows-destroy.md b/.changeset/tidy-cows-destroy.md deleted file mode 100644 index 0b222f8157a9..000000000000 --- a/.changeset/tidy-cows-destroy.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -feat: Community users will now be able to customize their Business hour timezone diff --git a/.changeset/tiny-wolves-deliver.md b/.changeset/tiny-wolves-deliver.md deleted file mode 100644 index f89564a9b53c..000000000000 --- a/.changeset/tiny-wolves-deliver.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/ui-theming': patch ---- - -fix: light-theme font-disabled color diff --git a/.changeset/tough-apples-turn.md b/.changeset/tough-apples-turn.md deleted file mode 100644 index 056a0645186e..000000000000 --- a/.changeset/tough-apples-turn.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -Forward headers when using proxy for file uploads diff --git a/.changeset/tough-carrots-walk.md b/.changeset/tough-carrots-walk.md deleted file mode 100644 index 2851e697b85e..000000000000 --- a/.changeset/tough-carrots-walk.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -'@rocket.chat/rest-typings': minor -'@rocket.chat/license': patch -'@rocket.chat/meteor': patch ---- - -feat: added `licenses.info` endpoint diff --git a/.changeset/twelve-files-deny.md b/.changeset/twelve-files-deny.md deleted file mode 100644 index 123bf0a7764b..000000000000 --- a/.changeset/twelve-files-deny.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -'@rocket.chat/license': minor -'@rocket.chat/jwt': minor -'@rocket.chat/omnichannel-services': minor -'@rocket.chat/omnichannel-transcript': minor -'@rocket.chat/authorization-service': minor -'@rocket.chat/stream-hub-service': minor -'@rocket.chat/presence-service': minor -'@rocket.chat/account-service': minor -'@rocket.chat/core-services': minor -'@rocket.chat/model-typings': minor -'@rocket.chat/core-typings': minor -'@rocket.chat/rest-typings': minor -'@rocket.chat/ddp-streamer': minor -'@rocket.chat/queue-worker': minor -'@rocket.chat/presence': minor -'@rocket.chat/meteor': minor ---- - -Implemented the License library, it is used to handle the functionality like expiration date, modules, limits, etc. -Also added a version v3 of the license, which contains an extended list of features. -v2 is still supported, since we convert it to v3 on the fly. diff --git a/.changeset/twenty-colts-hope.md b/.changeset/twenty-colts-hope.md deleted file mode 100644 index 28178729872f..000000000000 --- a/.changeset/twenty-colts-hope.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -Fixed an issue in which the engagement dashboard page tabs had no reactivity and would not change their content upon being clicked on. diff --git a/.changeset/warm-melons-type.md b/.changeset/warm-melons-type.md deleted file mode 100644 index 5b187b8a7f11..000000000000 --- a/.changeset/warm-melons-type.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -"@rocket.chat/meteor": patch -"@rocket.chat/core-typings": patch -"@rocket.chat/omnichannel-services": patch ---- - -feat: Disable and annonimize visitors instead of removing diff --git a/.changeset/weak-cameras-pay.md b/.changeset/weak-cameras-pay.md deleted file mode 100644 index 724f3af69a29..000000000000 --- a/.changeset/weak-cameras-pay.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -Fixed issue with message read receipts not being created when accessing a room the first time diff --git a/.changeset/weak-elephants-kneel.md b/.changeset/weak-elephants-kneel.md deleted file mode 100644 index f97820f9269e..000000000000 --- a/.changeset/weak-elephants-kneel.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -fix: `TypeError`: Cannot use 'in' operator in `undefined` for every message sent diff --git a/.changeset/wicked-humans-hang.md b/.changeset/wicked-humans-hang.md deleted file mode 100644 index e793bc978902..000000000000 --- a/.changeset/wicked-humans-hang.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -Improve cache of static files diff --git a/.changeset/wicked-jars-double.md b/.changeset/wicked-jars-double.md deleted file mode 100644 index 23deffe8606f..000000000000 --- a/.changeset/wicked-jars-double.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -Handle the username update in the background diff --git a/.changeset/workspace-status-admin-page.md b/.changeset/workspace-status-admin-page.md deleted file mode 100644 index b590387a01c5..000000000000 --- a/.changeset/workspace-status-admin-page.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": minor ---- - -Added a new Admin page called `Workspace info` in place of Information page, to make it easier to check the license diff --git a/apps/meteor/.docker/Dockerfile.rhel b/apps/meteor/.docker/Dockerfile.rhel index ebbb0a2b5aeb..c97c3dfc3706 100644 --- a/apps/meteor/.docker/Dockerfile.rhel +++ b/apps/meteor/.docker/Dockerfile.rhel @@ -1,6 +1,6 @@ FROM registry.access.redhat.com/ubi8/nodejs-12 -ENV RC_VERSION 6.5.0-rc.19 +ENV RC_VERSION 6.5.0 MAINTAINER buildmaster@rocket.chat diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md index 54c106b87e46..874fc20d33b6 100644 --- a/apps/meteor/CHANGELOG.md +++ b/apps/meteor/CHANGELOG.md @@ -1,5 +1,168 @@ # @rocket.chat/meteor +## 6.5.0 + +### Minor Changes + +- a31d5336c9: Added a new admin page called `Subscription`, this page is responsible of managing the current workspace subscription and it has a overview of the usage and limits of the plan +- 1642bad3ae: New setting to automatically enable autotranslate when joining rooms +- 747ec6c70e: Updated slack bridge to add support for connecting using slack apps in addition to the slack legacy bot +- 47303b5232: chore: adding some portugueses translations to the app details page +- c0ef13a0bf: Added `push` statistic, containing three bits. Each bit represents a boolean: + ``` + 1 1 1 + | | | + | | +- push enabled = 0b1 = 1 + | +--- push gateway enabled = 0b10 = 2 + +----- push gateway changed = 0b100 = 4 + ``` +- 809eb63d79: Fix typing indicator of Apps user +- ee2c7d1228: feat: Setup wizard content updates and enforcing cloud connectivity +- c38711b346: Add the daily and monthly peaks of concurrent connections to statistics + - Added `dailyPeakConnections` statistic for monitoring the daily peak of concurrent connections in a workspace; + - Added `maxMonthlyPeakConnections` statistic for monitoring the last 30 days peak of concurrent connections in a workspace; +- f3dd1277e6: Added new Omnichannel setting 'Hide conversation after closing' +- 92613680b7: Added option to select between two script engine options for the integrations +- ec1b2b9846: Create a deployment fingerprint to identify possible deployment changes caused by database cloning. A question to the admin will confirm if it's a regular deployment change or an intent of a new deployment and correct identification values as needed. + The fingerprint is composed by `${siteUrl}${dbConnectionString}` and hashed via `sha256` in `base64`. + An environment variable named `AUTO_ACCEPT_FINGERPRINT`, when set to `true`, can be used to auto-accept an expected fingerprint change as a regular deployment update. +- 5f81a0f3cb: Implemented the License library, it is used to handle the functionality like expiration date, modules, limits, etc. + Also added a version v3 of the license, which contains an extended list of features. + v2 is still supported, since we convert it to v3 on the fly. +- 5d55a9394e: Added a new Admin page called `Workspace info` in place of Information page, to make it easier to check the license + +### Patch Changes + +- 72e8ece564: Fixed GDPR removal to correctly wipe everything related to the user apart from \_id & activity fields +- 8a02759e40: Fixed an issue where broadcasted events were published twice within the same instance +- dea1fe9191: chore: Calculate & Store MAC stats + Added new info to the stats: `omnichannelContactsBySource`, `uniqueContactsOfLastMonth`, `uniqueContactsOfLastWeek`, `uniqueContactsOfYesterday` +- e134eef8cb: Bump @rocket.chat/meteor version. +- ae4feeca3c: Bump @rocket.chat/meteor version. +- cba9c283a1: Bump @rocket.chat/meteor version. +- d94ebb9ceb: Bump @rocket.chat/meteor version. +- cf63ab42bb: Bump @rocket.chat/meteor version. +- 0e63407a4f: Bump @rocket.chat/meteor version. +- 3173a17012: Bump @rocket.chat/meteor version. +- 22bd4578d8: Bump @rocket.chat/meteor version. +- 4856b718e0: Bump @rocket.chat/meteor version. +- 3231645104: Bump @rocket.chat/meteor version. +- 550188e34b: Bump @rocket.chat/meteor version. +- 79d5478f80: Bump @rocket.chat/meteor version. +- 0db5206ed3: Bump @rocket.chat/meteor version. +- 24be625845: Bump @rocket.chat/meteor version. +- 6f84660296: Bump @rocket.chat/meteor version. +- e074217ae5: Bump @rocket.chat/meteor version. +- b41d65d5e5: Bump @rocket.chat/meteor version. +- a199adb29c: Bump @rocket.chat/meteor version. +- 07d01b0e37: Bump @rocket.chat/meteor version. +- Bump @rocket.chat/meteor version. +- 38e3933504: add support to DeepL open api +- e8eeb2a79d: fixed threads breaking when sending messages too fast +- 18ed36cdd1: fix: custom-css injection +- b85df55030: fix: UI issue on marketplace filters +- 7e96fbd75f: Fixed issue with the creation of groups with the name of an already existing room throwing `internalError` +- 75f0ae31d9: fix: Remove model-level query restrictions for monitors +- 2124868d4f: Fix trying to upload same file again and again. +- 93a0859e87: Fix unnecessary username validation on accounts profile form +- 27c75f15f3: Changed the name of the administration Logs page to "Records", implemented a tab layout in this page and added a new tab called "Analytic reports" that shows the most recent result of the statistics endpoint. +- f5c0d6b45d: Fixed DM room with "guest" user kept as "read only" after reactivating user +- 928177b602: Fix rocket.cat's app request message escaping +- 058650128d: fix: Change plan name from Enterprise to Premium on marketplace filtering +- bba3c9da6a: fix: Omnichannel webhook is not retrying requests +- 88833b24e9: fix: Google Maps and Katex config settings were not visible +- dea1fe9191: feat: Save visitor's activity on agent's interaction +- c714962b0e: Fixed message disappearing from room after erased even if "Show Deleted Status" is enabled +- e24d071675: Fixed intermittent errors caused by the removal of subscriptions and inquiries when lacking permissions. +- 3650ab81b5: Fixed issue with file attachments in rooms' messages export having no content +- afdcad7e67: test: read receipts +- 150a580851: regression: changed UniqueID modal being displayed wrongly during startup +- 06a8e30289: chore: Change plan name Enterprise to Premium on marketplace +- 7ed7cb41ce: Add the date and time to the email sent when a new device logs in +- dd254a9bf5: fix: mobile ringing notification missing call id +- 704ed0fc7b: Fix i18n translations using sprintf post processor +- 223dce18a3: Do not allow auto-translation to be enabled in E2E rooms +- 4344d838a9: fix: Unable to send attachments via email as an omni-agent +- ab78404954: New permission for testing push notifications +- b14e159d9b: Search users using full name too on share message modal +- a82d8c2bb0: Add pagination & tooltips to agent's dropdown on forwarding modal +- 3ce070a3de: fix: wrong client hash calculation due to race condition on assets + + Some deployments may suffer from some reloads if running multiple instances. It's caused by different client hashes generated due to a possible race condition on custom assets load at the startup time. Forcing the clients to talk to the right backend instances, which causes reloads if sticky sessions are not enabled. + This change removes the assets from the hash calculation preventing the race condition and possible different hashes. After this change, the clients will not reload when the admin changes assets. + +- 134b71df44: fix: Monitors now able to forward a chat without taking it first +- aaf11e92dc: Fixed Canned responses stream not working, causing users to refresh to see newly created responses. +- bd1c8b1e45: Fixed a problem that would prevent private apps from being shown on air-gapped environments +- a8718eddc0: Add new permission to allow kick users from rooms without being a member +- 5b9d6883bf: feat: Improve UI when MAC limits are reached + feat: Limit endpoints on MAC limit reached +- 1f2b384c62: fix: cloud alerts not working +- 3fd0bc4120: download translation files through CDN +- 7342800286: Replace the old Enterprise labels to newest Premium +- 696bbc4f94: fix: Disables GenericMenu without any sections or items +- 2a1aa293a5: Check for room scoped permissions for starting discussions +- 3a62ac4ece: fix: user dropdown menu position on RTL layout +- ad7e52b742: Enable the option `Only allow verified users to login` to SaaS environment +- 8668485fda: fix: immediate auto reload issues + + Immediate auto reload increases server load on restarts/upgrades and increases the chance of getting 404 on Meteor's config file blocking the UI on a loading screen + + This change adds delays on front and backend codes on automatic client reload: + + - Front-end, adds a warning message including the old and new hashes, and a delay of 60 seconds after being notified by the server + - Back-end, delays the client notifications on a random value between 2 and 10 minutes per connection, allowing different clients to reload at different moments and distributing the load along the time. + +- 7493442650: chore: Deprecate un-used meteor method for omnichannel analytics +- f7b07a0fc5: feat: Community users will now be able to customize their Business hour timezone +- 54d8ad4392: Forward headers when using proxy for file uploads +- a98f3ff303: feat: added `licenses.info` endpoint +- 3488f6b024: Fixed an issue in which the engagement dashboard page tabs had no reactivity and would not change their content upon being clicked on. +- dea1fe9191: feat: Disable and annonimize visitors instead of removing +- ff2263a3c1: Fixed issue with message read receipts not being created when accessing a room the first time +- 26b8c8124c: fix: `TypeError`: Cannot use 'in' operator in `undefined` for every message sent +- 76c7b957ee: Improve cache of static files +- 4a59798da8: Handle the username update in the background +- Updated dependencies [7da1edf866] +- Updated dependencies [dea1fe9191] +- Updated dependencies [c2f337664e] +- Updated dependencies [747ec6c70e] +- Updated dependencies [c0ef13a0bf] +- Updated dependencies [c38711b346] +- Updated dependencies [223dce18a3] +- Updated dependencies [5b9d6883bf] +- Updated dependencies [35363420f0] +- Updated dependencies [92613680b7] +- Updated dependencies [ec1b2b9846] +- Updated dependencies [8e89b5a3b0] +- Updated dependencies [a98f3ff303] +- Updated dependencies [5f81a0f3cb] +- Updated dependencies [dea1fe9191] + - @rocket.chat/ui-contexts@3.0.0 + - @rocket.chat/web-ui-registration@3.0.0 + - @rocket.chat/core-typings@6.5.0 + - @rocket.chat/model-typings@0.2.0 + - @rocket.chat/gazzodown@3.0.0 + - @rocket.chat/i18n@0.0.3 + - @rocket.chat/presence@0.1.0 + - @rocket.chat/core-services@0.3.0 + - @rocket.chat/rest-typings@6.5.0 + - @rocket.chat/server-fetch@0.0.2 + - @rocket.chat/tools@0.2.0 + - @rocket.chat/ui-theming@0.1.1 + - @rocket.chat/license@0.1.0 + - @rocket.chat/jwt@0.1.0 + - @rocket.chat/omnichannel-services@0.1.0 + - @rocket.chat/fuselage-ui-kit@3.0.0 + - @rocket.chat/ui-client@3.0.0 + - @rocket.chat/ui-video-conf@3.0.0 + - @rocket.chat/api-client@0.1.18 + - @rocket.chat/pdf-worker@0.0.24 + - @rocket.chat/cron@0.0.20 + - @rocket.chat/models@0.0.24 + - @rocket.chat/server-cloud-communication@0.0.1 + - @rocket.chat/instance-status@0.0.24 + ## 6.5.0-rc.19 ### Patch Changes diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info index 1c8882ba159c..2cd7972686ee 100644 --- a/apps/meteor/app/utils/rocketchat.info +++ b/apps/meteor/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "6.5.0-rc.19" + "version": "6.5.0" } diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md index 3ecbf0a60e22..07a89f2d7235 100644 --- a/apps/meteor/ee/server/services/CHANGELOG.md +++ b/apps/meteor/ee/server/services/CHANGELOG.md @@ -1,5 +1,24 @@ # rocketchat-services +## 1.1.18 + +### Patch Changes + +- Updated dependencies [dea1fe9191] +- Updated dependencies [c0ef13a0bf] +- Updated dependencies [223dce18a3] +- Updated dependencies [5b9d6883bf] +- Updated dependencies [92613680b7] +- Updated dependencies [ec1b2b9846] +- Updated dependencies [a98f3ff303] +- Updated dependencies [5f81a0f3cb] +- Updated dependencies [dea1fe9191] + - @rocket.chat/core-typings@6.5.0 + - @rocket.chat/model-typings@0.2.0 + - @rocket.chat/core-services@0.3.0 + - @rocket.chat/rest-typings@6.5.0 + - @rocket.chat/models@0.0.24 + ## 1.1.18-rc.12 ### Patch Changes diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json index 27e307f61f57..468e444d56f8 100644 --- a/apps/meteor/ee/server/services/package.json +++ b/apps/meteor/ee/server/services/package.json @@ -1,7 +1,7 @@ { "name": "rocketchat-services", "private": true, - "version": "1.1.18-rc.12", + "version": "1.1.18", "description": "Rocket.Chat Authorization service", "main": "index.js", "scripts": { diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 635ace163a94..d1f40d4a8117 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/meteor", "description": "The Ultimate Open Source WebChat Platform", - "version": "6.5.0-rc.19", + "version": "6.5.0", "private": true, "author": { "name": "Rocket.Chat", diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md index bd72ce7ff510..0cc9b7bc1486 100644 --- a/ee/apps/account-service/CHANGELOG.md +++ b/ee/apps/account-service/CHANGELOG.md @@ -1,5 +1,30 @@ # @rocket.chat/account-service +## 0.3.0 + +### Minor Changes + +- 5f81a0f3cb: Implemented the License library, it is used to handle the functionality like expiration date, modules, limits, etc. + Also added a version v3 of the license, which contains an extended list of features. + v2 is still supported, since we convert it to v3 on the fly. + +### Patch Changes + +- Updated dependencies [dea1fe9191] +- Updated dependencies [c0ef13a0bf] +- Updated dependencies [223dce18a3] +- Updated dependencies [5b9d6883bf] +- Updated dependencies [92613680b7] +- Updated dependencies [ec1b2b9846] +- Updated dependencies [a98f3ff303] +- Updated dependencies [5f81a0f3cb] +- Updated dependencies [dea1fe9191] + - @rocket.chat/core-typings@6.5.0 + - @rocket.chat/model-typings@0.2.0 + - @rocket.chat/core-services@0.3.0 + - @rocket.chat/rest-typings@6.5.0 + - @rocket.chat/models@0.0.24 + ## 0.3.0-rc.19 ### Patch Changes diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json index de0ec594600e..33e668e52e5f 100644 --- a/ee/apps/account-service/package.json +++ b/ee/apps/account-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/account-service", "private": true, - "version": "0.3.0-rc.19", + "version": "0.3.0", "description": "Rocket.Chat Account service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/authorization-service/CHANGELOG.md b/ee/apps/authorization-service/CHANGELOG.md index 3bae0941450f..90cad488c774 100644 --- a/ee/apps/authorization-service/CHANGELOG.md +++ b/ee/apps/authorization-service/CHANGELOG.md @@ -1,5 +1,30 @@ # @rocket.chat/authorization-service +## 0.3.0 + +### Minor Changes + +- 5f81a0f3cb: Implemented the License library, it is used to handle the functionality like expiration date, modules, limits, etc. + Also added a version v3 of the license, which contains an extended list of features. + v2 is still supported, since we convert it to v3 on the fly. + +### Patch Changes + +- Updated dependencies [dea1fe9191] +- Updated dependencies [c0ef13a0bf] +- Updated dependencies [223dce18a3] +- Updated dependencies [5b9d6883bf] +- Updated dependencies [92613680b7] +- Updated dependencies [ec1b2b9846] +- Updated dependencies [a98f3ff303] +- Updated dependencies [5f81a0f3cb] +- Updated dependencies [dea1fe9191] + - @rocket.chat/core-typings@6.5.0 + - @rocket.chat/model-typings@0.2.0 + - @rocket.chat/core-services@0.3.0 + - @rocket.chat/rest-typings@6.5.0 + - @rocket.chat/models@0.0.24 + ## 0.3.0-rc.19 ### Patch Changes diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json index f0835e4f4f74..5ec688afa7a4 100644 --- a/ee/apps/authorization-service/package.json +++ b/ee/apps/authorization-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/authorization-service", "private": true, - "version": "0.3.0-rc.19", + "version": "0.3.0", "description": "Rocket.Chat Authorization service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/ddp-streamer/CHANGELOG.md b/ee/apps/ddp-streamer/CHANGELOG.md index 708f9152415b..2790871dc26b 100644 --- a/ee/apps/ddp-streamer/CHANGELOG.md +++ b/ee/apps/ddp-streamer/CHANGELOG.md @@ -1,5 +1,33 @@ # @rocket.chat/ddp-streamer +## 0.2.0 + +### Minor Changes + +- 5f81a0f3cb: Implemented the License library, it is used to handle the functionality like expiration date, modules, limits, etc. + Also added a version v3 of the license, which contains an extended list of features. + v2 is still supported, since we convert it to v3 on the fly. + +### Patch Changes + +- Updated dependencies [7da1edf866] +- Updated dependencies [dea1fe9191] +- Updated dependencies [c0ef13a0bf] +- Updated dependencies [223dce18a3] +- Updated dependencies [5b9d6883bf] +- Updated dependencies [92613680b7] +- Updated dependencies [ec1b2b9846] +- Updated dependencies [a98f3ff303] +- Updated dependencies [5f81a0f3cb] +- Updated dependencies [dea1fe9191] + - @rocket.chat/ui-contexts@3.0.0 + - @rocket.chat/core-typings@6.5.0 + - @rocket.chat/model-typings@0.2.0 + - @rocket.chat/core-services@0.3.0 + - @rocket.chat/rest-typings@6.5.0 + - @rocket.chat/models@0.0.24 + - @rocket.chat/instance-status@0.0.24 + ## 0.2.0-rc.19 ### Patch Changes diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json index aab550739a2c..f5641474c55b 100644 --- a/ee/apps/ddp-streamer/package.json +++ b/ee/apps/ddp-streamer/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/ddp-streamer", "private": true, - "version": "0.2.0-rc.19", + "version": "0.2.0", "description": "Rocket.Chat DDP-Streamer service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/omnichannel-transcript/CHANGELOG.md b/ee/apps/omnichannel-transcript/CHANGELOG.md index 9cd4b501f18b..d7ad0294e408 100644 --- a/ee/apps/omnichannel-transcript/CHANGELOG.md +++ b/ee/apps/omnichannel-transcript/CHANGELOG.md @@ -1,5 +1,31 @@ # @rocket.chat/omnichannel-transcript +## 0.3.0 + +### Minor Changes + +- 5f81a0f3cb: Implemented the License library, it is used to handle the functionality like expiration date, modules, limits, etc. + Also added a version v3 of the license, which contains an extended list of features. + v2 is still supported, since we convert it to v3 on the fly. + +### Patch Changes + +- Updated dependencies [dea1fe9191] +- Updated dependencies [c0ef13a0bf] +- Updated dependencies [223dce18a3] +- Updated dependencies [5b9d6883bf] +- Updated dependencies [92613680b7] +- Updated dependencies [ec1b2b9846] +- Updated dependencies [5f81a0f3cb] +- Updated dependencies [dea1fe9191] + - @rocket.chat/core-typings@6.5.0 + - @rocket.chat/model-typings@0.2.0 + - @rocket.chat/core-services@0.3.0 + - @rocket.chat/tools@0.2.0 + - @rocket.chat/omnichannel-services@0.1.0 + - @rocket.chat/pdf-worker@0.0.24 + - @rocket.chat/models@0.0.24 + ## 0.3.0-rc.19 ### Patch Changes diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json index 2a6309236ba6..b30ef724a494 100644 --- a/ee/apps/omnichannel-transcript/package.json +++ b/ee/apps/omnichannel-transcript/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/omnichannel-transcript", "private": true, - "version": "0.3.0-rc.19", + "version": "0.3.0", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/presence-service/CHANGELOG.md b/ee/apps/presence-service/CHANGELOG.md index 8ba8ceae3dfe..d8f7c18a73d9 100644 --- a/ee/apps/presence-service/CHANGELOG.md +++ b/ee/apps/presence-service/CHANGELOG.md @@ -1,5 +1,30 @@ # @rocket.chat/presence-service +## 0.3.0 + +### Minor Changes + +- 5f81a0f3cb: Implemented the License library, it is used to handle the functionality like expiration date, modules, limits, etc. + Also added a version v3 of the license, which contains an extended list of features. + v2 is still supported, since we convert it to v3 on the fly. + +### Patch Changes + +- Updated dependencies [dea1fe9191] +- Updated dependencies [c0ef13a0bf] +- Updated dependencies [c38711b346] +- Updated dependencies [223dce18a3] +- Updated dependencies [5b9d6883bf] +- Updated dependencies [92613680b7] +- Updated dependencies [ec1b2b9846] +- Updated dependencies [5f81a0f3cb] +- Updated dependencies [dea1fe9191] + - @rocket.chat/core-typings@6.5.0 + - @rocket.chat/model-typings@0.2.0 + - @rocket.chat/presence@0.1.0 + - @rocket.chat/core-services@0.3.0 + - @rocket.chat/models@0.0.24 + ## 0.3.0-rc.19 ### Patch Changes diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json index e09f98be1319..3d3490d169ae 100644 --- a/ee/apps/presence-service/package.json +++ b/ee/apps/presence-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/presence-service", "private": true, - "version": "0.3.0-rc.19", + "version": "0.3.0", "description": "Rocket.Chat Presence service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/queue-worker/CHANGELOG.md b/ee/apps/queue-worker/CHANGELOG.md index c2369ef5c95a..ae9269affed1 100644 --- a/ee/apps/queue-worker/CHANGELOG.md +++ b/ee/apps/queue-worker/CHANGELOG.md @@ -1,5 +1,29 @@ # @rocket.chat/queue-worker +## 0.3.0 + +### Minor Changes + +- 5f81a0f3cb: Implemented the License library, it is used to handle the functionality like expiration date, modules, limits, etc. + Also added a version v3 of the license, which contains an extended list of features. + v2 is still supported, since we convert it to v3 on the fly. + +### Patch Changes + +- Updated dependencies [dea1fe9191] +- Updated dependencies [c0ef13a0bf] +- Updated dependencies [223dce18a3] +- Updated dependencies [5b9d6883bf] +- Updated dependencies [92613680b7] +- Updated dependencies [ec1b2b9846] +- Updated dependencies [5f81a0f3cb] +- Updated dependencies [dea1fe9191] + - @rocket.chat/core-typings@6.5.0 + - @rocket.chat/model-typings@0.2.0 + - @rocket.chat/core-services@0.3.0 + - @rocket.chat/omnichannel-services@0.1.0 + - @rocket.chat/models@0.0.24 + ## 0.3.0-rc.19 ### Patch Changes diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json index 473e78d8ab25..0e26ceea7b22 100644 --- a/ee/apps/queue-worker/package.json +++ b/ee/apps/queue-worker/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/queue-worker", "private": true, - "version": "0.3.0-rc.19", + "version": "0.3.0", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/stream-hub-service/CHANGELOG.md b/ee/apps/stream-hub-service/CHANGELOG.md index 51ec60cb4b03..6bfff89143be 100644 --- a/ee/apps/stream-hub-service/CHANGELOG.md +++ b/ee/apps/stream-hub-service/CHANGELOG.md @@ -1,5 +1,28 @@ # @rocket.chat/stream-hub-service +## 0.3.0 + +### Minor Changes + +- 5f81a0f3cb: Implemented the License library, it is used to handle the functionality like expiration date, modules, limits, etc. + Also added a version v3 of the license, which contains an extended list of features. + v2 is still supported, since we convert it to v3 on the fly. + +### Patch Changes + +- Updated dependencies [dea1fe9191] +- Updated dependencies [c0ef13a0bf] +- Updated dependencies [223dce18a3] +- Updated dependencies [5b9d6883bf] +- Updated dependencies [92613680b7] +- Updated dependencies [ec1b2b9846] +- Updated dependencies [5f81a0f3cb] +- Updated dependencies [dea1fe9191] + - @rocket.chat/core-typings@6.5.0 + - @rocket.chat/model-typings@0.2.0 + - @rocket.chat/core-services@0.3.0 + - @rocket.chat/models@0.0.24 + ## 0.3.0-rc.19 ### Patch Changes diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json index 3be8dc748295..04cb745254b4 100644 --- a/ee/apps/stream-hub-service/package.json +++ b/ee/apps/stream-hub-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/stream-hub-service", "private": true, - "version": "0.3.0-rc.19", + "version": "0.3.0", "description": "Rocket.Chat Stream Hub service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/packages/api-client/CHANGELOG.md b/ee/packages/api-client/CHANGELOG.md index 9421dd207efb..1e42f8d3fbfe 100644 --- a/ee/packages/api-client/CHANGELOG.md +++ b/ee/packages/api-client/CHANGELOG.md @@ -1,5 +1,20 @@ # @rocket.chat/api-client +## 0.1.18 + +### Patch Changes + +- Updated dependencies [dea1fe9191] +- Updated dependencies [c0ef13a0bf] +- Updated dependencies [5b9d6883bf] +- Updated dependencies [92613680b7] +- Updated dependencies [ec1b2b9846] +- Updated dependencies [a98f3ff303] +- Updated dependencies [5f81a0f3cb] +- Updated dependencies [dea1fe9191] + - @rocket.chat/core-typings@6.5.0 + - @rocket.chat/rest-typings@6.5.0 + ## 0.1.18-rc.12 ### Patch Changes diff --git a/ee/packages/api-client/package.json b/ee/packages/api-client/package.json index 183ae027f997..5530e42393ee 100644 --- a/ee/packages/api-client/package.json +++ b/ee/packages/api-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/api-client", - "version": "0.1.18-rc.12", + "version": "0.1.18", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/ddp-client/CHANGELOG.md b/ee/packages/ddp-client/CHANGELOG.md index 11cfdb9c636d..2f84d3e07644 100644 --- a/ee/packages/ddp-client/CHANGELOG.md +++ b/ee/packages/ddp-client/CHANGELOG.md @@ -1,5 +1,19 @@ # @rocket.chat/ddp-client +## 0.2.9 + +### Patch Changes + +- 5b9d6883bf: feat: Improve UI when MAC limits are reached + feat: Limit endpoints on MAC limit reached +- Updated dependencies [5b9d6883bf] +- Updated dependencies [92613680b7] +- Updated dependencies [ec1b2b9846] +- Updated dependencies [a98f3ff303] +- Updated dependencies [5f81a0f3cb] + - @rocket.chat/rest-typings@6.5.0 + - @rocket.chat/api-client@0.1.18 + ## 0.2.9-rc.12 ### Patch Changes diff --git a/ee/packages/ddp-client/package.json b/ee/packages/ddp-client/package.json index 2369869ec5be..680d970743c9 100644 --- a/ee/packages/ddp-client/package.json +++ b/ee/packages/ddp-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ddp-client", - "version": "0.2.9-rc.12", + "version": "0.2.9", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/license/CHANGELOG.md b/ee/packages/license/CHANGELOG.md index 464df7952527..bb7835e90d17 100644 --- a/ee/packages/license/CHANGELOG.md +++ b/ee/packages/license/CHANGELOG.md @@ -1,5 +1,26 @@ # @rocket.chat/license +## 0.1.0 + +### Minor Changes + +- 5f81a0f3cb: Implemented the License library, it is used to handle the functionality like expiration date, modules, limits, etc. + Also added a version v3 of the license, which contains an extended list of features. + v2 is still supported, since we convert it to v3 on the fly. + +### Patch Changes + +- a98f3ff303: feat: added `licenses.info` endpoint +- Updated dependencies [dea1fe9191] +- Updated dependencies [c0ef13a0bf] +- Updated dependencies [5b9d6883bf] +- Updated dependencies [92613680b7] +- Updated dependencies [ec1b2b9846] +- Updated dependencies [5f81a0f3cb] +- Updated dependencies [dea1fe9191] + - @rocket.chat/core-typings@6.5.0 + - @rocket.chat/jwt@0.1.0 + ## 0.1.0-rc.19 ### Patch Changes diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json index 964e18ec0c14..e2d253f7d11d 100644 --- a/ee/packages/license/package.json +++ b/ee/packages/license/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/license", - "version": "0.1.0-rc.19", + "version": "0.1.0", "private": true, "devDependencies": { "@swc/core": "^1.3.95", diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md index 5a40b504731e..0e1170004d2a 100644 --- a/ee/packages/omnichannel-services/CHANGELOG.md +++ b/ee/packages/omnichannel-services/CHANGELOG.md @@ -1,5 +1,33 @@ # @rocket.chat/omnichannel-services +## 0.1.0 + +### Minor Changes + +- 5f81a0f3cb: Implemented the License library, it is used to handle the functionality like expiration date, modules, limits, etc. + Also added a version v3 of the license, which contains an extended list of features. + v2 is still supported, since we convert it to v3 on the fly. + +### Patch Changes + +- dea1fe9191: feat: Disable and annonimize visitors instead of removing +- Updated dependencies [dea1fe9191] +- Updated dependencies [c0ef13a0bf] +- Updated dependencies [223dce18a3] +- Updated dependencies [5b9d6883bf] +- Updated dependencies [92613680b7] +- Updated dependencies [ec1b2b9846] +- Updated dependencies [a98f3ff303] +- Updated dependencies [5f81a0f3cb] +- Updated dependencies [dea1fe9191] + - @rocket.chat/core-typings@6.5.0 + - @rocket.chat/model-typings@0.2.0 + - @rocket.chat/core-services@0.3.0 + - @rocket.chat/rest-typings@6.5.0 + - @rocket.chat/tools@0.2.0 + - @rocket.chat/pdf-worker@0.0.24 + - @rocket.chat/models@0.0.24 + ## 0.1.0-rc.19 ### Patch Changes diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json index 9d33bedb7468..8fb37352ed86 100644 --- a/ee/packages/omnichannel-services/package.json +++ b/ee/packages/omnichannel-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/omnichannel-services", - "version": "0.1.0-rc.19", + "version": "0.1.0", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/ee/packages/pdf-worker/CHANGELOG.md b/ee/packages/pdf-worker/CHANGELOG.md index 901a00d41c14..b64c1ce32bdb 100644 --- a/ee/packages/pdf-worker/CHANGELOG.md +++ b/ee/packages/pdf-worker/CHANGELOG.md @@ -1,5 +1,18 @@ # @rocket.chat/pdf-worker +## 0.0.24 + +### Patch Changes + +- Updated dependencies [dea1fe9191] +- Updated dependencies [c0ef13a0bf] +- Updated dependencies [5b9d6883bf] +- Updated dependencies [92613680b7] +- Updated dependencies [ec1b2b9846] +- Updated dependencies [5f81a0f3cb] +- Updated dependencies [dea1fe9191] + - @rocket.chat/core-typings@6.5.0 + ## 0.0.24-rc.12 ### Patch Changes diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json index a9a17107657a..5c151bdc150f 100644 --- a/ee/packages/pdf-worker/package.json +++ b/ee/packages/pdf-worker/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/pdf-worker", - "version": "0.0.24-rc.12", + "version": "0.0.24", "private": true, "devDependencies": { "@storybook/addon-essentials": "~6.5.16", diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md index fb542b3d9bcd..29759422a237 100644 --- a/ee/packages/presence/CHANGELOG.md +++ b/ee/packages/presence/CHANGELOG.md @@ -1,5 +1,27 @@ # @rocket.chat/presence +## 0.1.0 + +### Minor Changes + +- c38711b346: Add peak connections monitoring and methods to get and reset the counter +- 5f81a0f3cb: Implemented the License library, it is used to handle the functionality like expiration date, modules, limits, etc. + Also added a version v3 of the license, which contains an extended list of features. + v2 is still supported, since we convert it to v3 on the fly. + +### Patch Changes + +- Updated dependencies [dea1fe9191] +- Updated dependencies [c0ef13a0bf] +- Updated dependencies [5b9d6883bf] +- Updated dependencies [92613680b7] +- Updated dependencies [ec1b2b9846] +- Updated dependencies [5f81a0f3cb] +- Updated dependencies [dea1fe9191] + - @rocket.chat/core-typings@6.5.0 + - @rocket.chat/core-services@0.3.0 + - @rocket.chat/models@0.0.24 + ## 0.1.0-rc.19 ### Patch Changes diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json index f9fda5da951b..0c3d7d3bde30 100644 --- a/ee/packages/presence/package.json +++ b/ee/packages/presence/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/presence", - "version": "0.1.0-rc.19", + "version": "0.1.0", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/ee/packages/ui-theming/CHANGELOG.md b/ee/packages/ui-theming/CHANGELOG.md index 45a65c34bf22..6501554003db 100644 --- a/ee/packages/ui-theming/CHANGELOG.md +++ b/ee/packages/ui-theming/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/ui-theming +## 0.1.1 + +### Patch Changes + +- 8e89b5a3b0: fix: light-theme font-disabled color + ## 0.1.1-rc.0 ### Patch Changes diff --git a/ee/packages/ui-theming/package.json b/ee/packages/ui-theming/package.json index f1a904fd6f65..30d9f0fe02d2 100644 --- a/ee/packages/ui-theming/package.json +++ b/ee/packages/ui-theming/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-theming", - "version": "0.1.1-rc.0", + "version": "0.1.1", "private": true, "devDependencies": { "@rocket.chat/css-in-js": "~0.31.25", diff --git a/package.json b/package.json index 4363d7216d35..dc4244dfd6f3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket.chat", - "version": "6.5.0-rc.19", + "version": "6.5.0", "description": "Rocket.Chat Monorepo", "main": "index.js", "private": true, diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md index f297bbb10be8..fbb68e3b6a07 100644 --- a/packages/core-services/CHANGELOG.md +++ b/packages/core-services/CHANGELOG.md @@ -1,5 +1,29 @@ # @rocket.chat/core-services +## 0.3.0 + +### Minor Changes + +- 5f81a0f3cb: Implemented the License library, it is used to handle the functionality like expiration date, modules, limits, etc. + Also added a version v3 of the license, which contains an extended list of features. + v2 is still supported, since we convert it to v3 on the fly. + +### Patch Changes + +- 5b9d6883bf: feat: Improve UI when MAC limits are reached + feat: Limit endpoints on MAC limit reached +- Updated dependencies [dea1fe9191] +- Updated dependencies [c0ef13a0bf] +- Updated dependencies [5b9d6883bf] +- Updated dependencies [92613680b7] +- Updated dependencies [ec1b2b9846] +- Updated dependencies [a98f3ff303] +- Updated dependencies [5f81a0f3cb] +- Updated dependencies [dea1fe9191] + - @rocket.chat/core-typings@6.5.0 + - @rocket.chat/rest-typings@6.5.0 + - @rocket.chat/models@0.0.24 + ## 0.3.0-rc.19 ### Patch Changes diff --git a/packages/core-services/package.json b/packages/core-services/package.json index fbf0d36659d2..533deb715e29 100644 --- a/packages/core-services/package.json +++ b/packages/core-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/core-services", - "version": "0.3.0-rc.19", + "version": "0.3.0", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md index 7c945d1ee4c6..8229232f7471 100644 --- a/packages/core-typings/CHANGELOG.md +++ b/packages/core-typings/CHANGELOG.md @@ -1,5 +1,33 @@ # @rocket.chat/core-typings +## 6.5.0 + +### Minor Changes + +- c0ef13a0bf: Added `push` statistic, containing three bits. Each bit represents a boolean: + ``` + 1 1 1 + | | | + | | +- push enabled = 0b1 = 1 + | +--- push gateway enabled = 0b10 = 2 + +----- push gateway changed = 0b100 = 4 + ``` +- 92613680b7: Added option to select between two script engine options for the integrations +- ec1b2b9846: Create a deployment fingerprint to identify possible deployment changes caused by database cloning. A question to the admin will confirm if it's a regular deployment change or an intent of a new deployment and correct identification values as needed. + The fingerprint is composed by `${siteUrl}${dbConnectionString}` and hashed via `sha256` in `base64`. + An environment variable named `AUTO_ACCEPT_FINGERPRINT`, when set to `true`, can be used to auto-accept an expected fingerprint change as a regular deployment update. +- 5f81a0f3cb: Implemented the License library, it is used to handle the functionality like expiration date, modules, limits, etc. + Also added a version v3 of the license, which contains an extended list of features. + v2 is still supported, since we convert it to v3 on the fly. + +### Patch Changes + +- dea1fe9191: chore: Calculate & Store MAC stats + Added new info to the stats: `omnichannelContactsBySource`, `uniqueContactsOfLastMonth`, `uniqueContactsOfLastWeek`, `uniqueContactsOfYesterday` +- 5b9d6883bf: feat: Improve UI when MAC limits are reached + feat: Limit endpoints on MAC limit reached +- dea1fe9191: feat: Disable and annonimize visitors instead of removing + ## 6.5.0-rc.19 ## 6.5.0-rc.18 diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json index 75474e893bfb..3eec6d260888 100644 --- a/packages/core-typings/package.json +++ b/packages/core-typings/package.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/package", "name": "@rocket.chat/core-typings", - "version": "6.5.0-rc.19", + "version": "6.5.0", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "eslint": "~8.45.0", diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md index 15ec56895913..02a65ed11468 100644 --- a/packages/cron/CHANGELOG.md +++ b/packages/cron/CHANGELOG.md @@ -1,5 +1,19 @@ # @rocket.chat/cron +## 0.0.20 + +### Patch Changes + +- Updated dependencies [dea1fe9191] +- Updated dependencies [c0ef13a0bf] +- Updated dependencies [5b9d6883bf] +- Updated dependencies [92613680b7] +- Updated dependencies [ec1b2b9846] +- Updated dependencies [5f81a0f3cb] +- Updated dependencies [dea1fe9191] + - @rocket.chat/core-typings@6.5.0 + - @rocket.chat/models@0.0.24 + ## 0.0.20-rc.12 ### Patch Changes diff --git a/packages/cron/package.json b/packages/cron/package.json index 2aaca4a053d8..2797c3cb34b3 100644 --- a/packages/cron/package.json +++ b/packages/cron/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/cron", - "version": "0.0.20-rc.12", + "version": "0.0.20", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md index 0b3ed82caf3f..99cdbb4bd792 100644 --- a/packages/fuselage-ui-kit/CHANGELOG.md +++ b/packages/fuselage-ui-kit/CHANGELOG.md @@ -1,5 +1,15 @@ # Change Log +## 3.0.0 + +### Patch Changes + +- Updated dependencies [7da1edf866] +- Updated dependencies [c2f337664e] + - @rocket.chat/ui-contexts@3.0.0 + - @rocket.chat/gazzodown@3.0.0 + - @rocket.chat/ui-video-conf@3.0.0 + ## 3.0.0-rc.19 ### Patch Changes diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index 28df5b9d50e6..cc1a105e3503 100644 --- a/packages/fuselage-ui-kit/package.json +++ b/packages/fuselage-ui-kit/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/fuselage-ui-kit", "private": true, - "version": "3.0.0-rc.19", + "version": "3.0.0", "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system", "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/", "author": { @@ -48,9 +48,9 @@ "@rocket.chat/icons": "*", "@rocket.chat/prettier-config": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.19", + "@rocket.chat/ui-contexts": "3.0.0", "@rocket.chat/ui-kit": "*", - "@rocket.chat/ui-video-conf": "3.0.0-rc.19", + "@rocket.chat/ui-video-conf": "3.0.0", "@tanstack/react-query": "*", "react": "*", "react-dom": "*" diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md index 16a650ba145f..aa6e24f891db 100644 --- a/packages/gazzodown/CHANGELOG.md +++ b/packages/gazzodown/CHANGELOG.md @@ -1,5 +1,22 @@ # @rocket.chat/gazzodown +## 3.0.0 + +### Patch Changes + +- c2f337664e: fixed an issue with mentions showing usernames instead of names on smaller screens +- Updated dependencies [7da1edf866] +- Updated dependencies [dea1fe9191] +- Updated dependencies [c0ef13a0bf] +- Updated dependencies [5b9d6883bf] +- Updated dependencies [92613680b7] +- Updated dependencies [ec1b2b9846] +- Updated dependencies [5f81a0f3cb] +- Updated dependencies [dea1fe9191] + - @rocket.chat/ui-contexts@3.0.0 + - @rocket.chat/core-typings@6.5.0 + - @rocket.chat/ui-client@3.0.0 + ## 3.0.0-rc.19 ### Patch Changes diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json index d63071ecce37..faa009c231de 100644 --- a/packages/gazzodown/package.json +++ b/packages/gazzodown/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/gazzodown", - "version": "3.0.0-rc.19", + "version": "3.0.0", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -65,14 +65,14 @@ "/dist" ], "peerDependencies": { - "@rocket.chat/core-typings": "6.5.0-rc.19", + "@rocket.chat/core-typings": "6.5.0", "@rocket.chat/css-in-js": "*", "@rocket.chat/fuselage": "*", "@rocket.chat/fuselage-tokens": "*", "@rocket.chat/message-parser": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-client": "3.0.0-rc.19", - "@rocket.chat/ui-contexts": "3.0.0-rc.19", + "@rocket.chat/ui-client": "3.0.0", + "@rocket.chat/ui-contexts": "3.0.0", "katex": "*", "react": "*" }, diff --git a/packages/i18n/CHANGELOG.md b/packages/i18n/CHANGELOG.md index 460d2b868bd7..c2a74c4a5327 100644 --- a/packages/i18n/CHANGELOG.md +++ b/packages/i18n/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/i18n +## 0.0.3 + +### Patch Changes + +- 747ec6c70e: Updated slack bridge to add support for connecting using slack apps in addition to the slack legacy bot + ## 0.0.3-rc.0 ### Patch Changes diff --git a/packages/i18n/package.json b/packages/i18n/package.json index 86d60ed24c3c..7c2cdb2548b4 100644 --- a/packages/i18n/package.json +++ b/packages/i18n/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/i18n", - "version": "0.0.3-rc.0", + "version": "0.0.3", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md index c7c55c54560f..3bb16663fe3b 100644 --- a/packages/instance-status/CHANGELOG.md +++ b/packages/instance-status/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/instance-status +## 0.0.24 + +### Patch Changes + +- @rocket.chat/models@0.0.24 + ## 0.0.24-rc.12 ### Patch Changes diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json index b30de485e97d..5072f71164e0 100644 --- a/packages/instance-status/package.json +++ b/packages/instance-status/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/instance-status", - "version": "0.0.24-rc.12", + "version": "0.0.24", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/packages/jwt/CHANGELOG.md b/packages/jwt/CHANGELOG.md index 20eeaf8727ce..7f571b1cf1df 100644 --- a/packages/jwt/CHANGELOG.md +++ b/packages/jwt/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/jwt +## 0.1.0 + +### Minor Changes + +- 5f81a0f3cb: Implemented the License library, it is used to handle the functionality like expiration date, modules, limits, etc. + Also added a version v3 of the license, which contains an extended list of features. + v2 is still supported, since we convert it to v3 on the fly. + ## 0.1.0-rc.0 ### Minor Changes diff --git a/packages/jwt/package.json b/packages/jwt/package.json index be389ab3e046..d9a3e32c977c 100644 --- a/packages/jwt/package.json +++ b/packages/jwt/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/jwt", - "version": "0.1.0-rc.0", + "version": "0.1.0", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md index a25c4a17e9be..fa45e1d0b9d7 100644 --- a/packages/livechat/CHANGELOG.md +++ b/packages/livechat/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/livechat Change Log +## 1.14.9 + +### Patch Changes + +- Updated dependencies [c2f337664e] + - @rocket.chat/gazzodown@3.0.0 + ## 1.14.9-rc.12 ### Patch Changes diff --git a/packages/livechat/package.json b/packages/livechat/package.json index 8f6dc2123a6f..c83ae42ec9ab 100644 --- a/packages/livechat/package.json +++ b/packages/livechat/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/livechat", - "version": "1.14.9-rc.12", + "version": "1.14.9", "files": [ "/build" ], diff --git a/packages/mock-providers/CHANGELOG.md b/packages/mock-providers/CHANGELOG.md index 8165d50cc90c..2e9a3f48b899 100644 --- a/packages/mock-providers/CHANGELOG.md +++ b/packages/mock-providers/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/mock-providers +## 0.0.3 + +### Patch Changes + +- Updated dependencies [747ec6c70e] + - @rocket.chat/i18n@0.0.3 + ## 0.0.3-rc.0 ### Patch Changes diff --git a/packages/mock-providers/package.json b/packages/mock-providers/package.json index 4c173f5de311..5ae0ad5fbdb1 100644 --- a/packages/mock-providers/package.json +++ b/packages/mock-providers/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/mock-providers", - "version": "0.0.3-rc.0", + "version": "0.0.3", "private": true, "dependencies": { "@rocket.chat/i18n": "workspace:~", diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md index f4b69034a7f4..869b9d2d54c1 100644 --- a/packages/model-typings/CHANGELOG.md +++ b/packages/model-typings/CHANGELOG.md @@ -1,5 +1,30 @@ # @rocket.chat/model-typings +## 0.2.0 + +### Minor Changes + +- ec1b2b9846: Create a deployment fingerprint to identify possible deployment changes caused by database cloning. A question to the admin will confirm if it's a regular deployment change or an intent of a new deployment and correct identification values as needed. + The fingerprint is composed by `${siteUrl}${dbConnectionString}` and hashed via `sha256` in `base64`. + An environment variable named `AUTO_ACCEPT_FINGERPRINT`, when set to `true`, can be used to auto-accept an expected fingerprint change as a regular deployment update. +- 5f81a0f3cb: Implemented the License library, it is used to handle the functionality like expiration date, modules, limits, etc. + Also added a version v3 of the license, which contains an extended list of features. + v2 is still supported, since we convert it to v3 on the fly. + +### Patch Changes + +- dea1fe9191: chore: Calculate & Store MAC stats + Added new info to the stats: `omnichannelContactsBySource`, `uniqueContactsOfLastMonth`, `uniqueContactsOfLastWeek`, `uniqueContactsOfYesterday` +- 223dce18a3: Do not allow auto-translation to be enabled in E2E rooms +- Updated dependencies [dea1fe9191] +- Updated dependencies [c0ef13a0bf] +- Updated dependencies [5b9d6883bf] +- Updated dependencies [92613680b7] +- Updated dependencies [ec1b2b9846] +- Updated dependencies [5f81a0f3cb] +- Updated dependencies [dea1fe9191] + - @rocket.chat/core-typings@6.5.0 + ## 0.2.0-rc.19 ### Patch Changes diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json index 6a34363cc5ee..2209995e21be 100644 --- a/packages/model-typings/package.json +++ b/packages/model-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/model-typings", - "version": "0.2.0-rc.19", + "version": "0.2.0", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md index 54bab4afdb69..e5fdb024c333 100644 --- a/packages/models/CHANGELOG.md +++ b/packages/models/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/models +## 0.0.24 + +### Patch Changes + +- Updated dependencies [dea1fe9191] +- Updated dependencies [223dce18a3] +- Updated dependencies [ec1b2b9846] +- Updated dependencies [5f81a0f3cb] + - @rocket.chat/model-typings@0.2.0 + ## 0.0.24-rc.12 ### Patch Changes diff --git a/packages/models/package.json b/packages/models/package.json index 5803aec0804b..8856ceab3d4a 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/models", - "version": "0.0.24-rc.12", + "version": "0.0.24", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md index 810ad5c03c13..3bc136c490b3 100644 --- a/packages/rest-typings/CHANGELOG.md +++ b/packages/rest-typings/CHANGELOG.md @@ -1,5 +1,33 @@ # @rocket.chat/rest-typings +## 6.5.0 + +### Minor Changes + +- 92613680b7: Added option to select between two script engine options for the integrations +- ec1b2b9846: Create a deployment fingerprint to identify possible deployment changes caused by database cloning. A question to the admin will confirm if it's a regular deployment change or an intent of a new deployment and correct identification values as needed. + The fingerprint is composed by `${siteUrl}${dbConnectionString}` and hashed via `sha256` in `base64`. + An environment variable named `AUTO_ACCEPT_FINGERPRINT`, when set to `true`, can be used to auto-accept an expected fingerprint change as a regular deployment update. +- a98f3ff303: feat: added `licenses.info` endpoint +- 5f81a0f3cb: Implemented the License library, it is used to handle the functionality like expiration date, modules, limits, etc. + Also added a version v3 of the license, which contains an extended list of features. + v2 is still supported, since we convert it to v3 on the fly. + +### Patch Changes + +- 5b9d6883bf: feat: Improve UI when MAC limits are reached + feat: Limit endpoints on MAC limit reached +- Updated dependencies [dea1fe9191] +- Updated dependencies [c0ef13a0bf] +- Updated dependencies [5b9d6883bf] +- Updated dependencies [92613680b7] +- Updated dependencies [ec1b2b9846] +- Updated dependencies [a98f3ff303] +- Updated dependencies [5f81a0f3cb] +- Updated dependencies [dea1fe9191] + - @rocket.chat/core-typings@6.5.0 + - @rocket.chat/license@0.1.0 + ## 6.5.0-rc.19 ### Patch Changes diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json index 42acfabb3210..9d06aad70c55 100644 --- a/packages/rest-typings/package.json +++ b/packages/rest-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/rest-typings", - "version": "6.5.0-rc.19", + "version": "6.5.0", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "@types/jest": "~29.5.7", diff --git a/packages/server-fetch/CHANGELOG.md b/packages/server-fetch/CHANGELOG.md index 8f3300bcf11e..5d2cb827e3cc 100644 --- a/packages/server-fetch/CHANGELOG.md +++ b/packages/server-fetch/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/server-fetch +## 0.0.2 + +### Patch Changes + +- 35363420f0: Fixed an issue where the payload of an HTTP request made by an app wouldn't be correctly encoded in some cases + ## 0.0.2-rc.0 ### Patch Changes diff --git a/packages/server-fetch/package.json b/packages/server-fetch/package.json index 8ef2e1b9a7ad..5bfe772477b8 100644 --- a/packages/server-fetch/package.json +++ b/packages/server-fetch/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/server-fetch", - "version": "0.0.2-rc.0", + "version": "0.0.2", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/tools/CHANGELOG.md b/packages/tools/CHANGELOG.md index f72e09c4d313..f68310825d88 100644 --- a/packages/tools/CHANGELOG.md +++ b/packages/tools/CHANGELOG.md @@ -1,5 +1,11 @@ # @rocket.chat/tools +## 0.2.0 + +### Minor Changes + +- 92613680b7: Added option to select between two script engine options for the integrations + ## 0.2.0-rc.0 ### Minor Changes diff --git a/packages/tools/package.json b/packages/tools/package.json index 72f25887198a..59610a393177 100644 --- a/packages/tools/package.json +++ b/packages/tools/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/tools", - "version": "0.2.0-rc.0", + "version": "0.2.0", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md index 50cd5d386338..430507f15f54 100644 --- a/packages/ui-client/CHANGELOG.md +++ b/packages/ui-client/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/ui-client +## 3.0.0 + +### Patch Changes + +- Updated dependencies [7da1edf866] + - @rocket.chat/ui-contexts@3.0.0 + ## 3.0.0-rc.19 ### Patch Changes diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json index 6537dae83873..f5011147776d 100644 --- a/packages/ui-client/package.json +++ b/packages/ui-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-client", - "version": "3.0.0-rc.19", + "version": "3.0.0", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -61,7 +61,7 @@ "@rocket.chat/fuselage": "*", "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.19", + "@rocket.chat/ui-contexts": "3.0.0", "react": "~17.0.2" }, "volta": { diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md index 4d68cd85061a..6e0f2022b888 100644 --- a/packages/ui-contexts/CHANGELOG.md +++ b/packages/ui-contexts/CHANGELOG.md @@ -1,5 +1,22 @@ # @rocket.chat/ui-contexts +## 3.0.0 + +### Patch Changes + +- 7da1edf866: Fixed an issue in the invite registration flow in which the user would not be automatically redirected to the homepage upon succesfully submiting the user registration form. +- Updated dependencies [dea1fe9191] +- Updated dependencies [c0ef13a0bf] +- Updated dependencies [5b9d6883bf] +- Updated dependencies [92613680b7] +- Updated dependencies [ec1b2b9846] +- Updated dependencies [a98f3ff303] +- Updated dependencies [5f81a0f3cb] +- Updated dependencies [dea1fe9191] + - @rocket.chat/core-typings@6.5.0 + - @rocket.chat/rest-typings@6.5.0 + - @rocket.chat/ddp-client@0.2.9 + ## 3.0.0-rc.19 ### Patch Changes diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json index 9d33e40b6788..aa8dd18a8b78 100644 --- a/packages/ui-contexts/package.json +++ b/packages/ui-contexts/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-contexts", - "version": "3.0.0-rc.19", + "version": "3.0.0", "private": true, "devDependencies": { "@rocket.chat/core-typings": "workspace:^", diff --git a/packages/ui-video-conf/CHANGELOG.md b/packages/ui-video-conf/CHANGELOG.md index 9c39905431bb..8a18b550da0f 100644 --- a/packages/ui-video-conf/CHANGELOG.md +++ b/packages/ui-video-conf/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/ui-video-conf +## 3.0.0 + +### Patch Changes + +- Updated dependencies [7da1edf866] + - @rocket.chat/ui-contexts@3.0.0 + ## 3.0.0-rc.19 ### Patch Changes diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json index 82dd31a5e258..108a7ec0cde6 100644 --- a/packages/ui-video-conf/package.json +++ b/packages/ui-video-conf/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-video-conf", - "version": "3.0.0-rc.19", + "version": "3.0.0", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -35,7 +35,7 @@ "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.19", + "@rocket.chat/ui-contexts": "3.0.0", "react": "^17.0.2", "react-dom": "^17.0.2" }, diff --git a/packages/uikit-playground/CHANGELOG.md b/packages/uikit-playground/CHANGELOG.md index 366290fce576..260935c50f21 100644 --- a/packages/uikit-playground/CHANGELOG.md +++ b/packages/uikit-playground/CHANGELOG.md @@ -1,5 +1,13 @@ # @rocket.chat/uikit-playground +## 0.2.9 + +### Patch Changes + +- Updated dependencies [7da1edf866] + - @rocket.chat/ui-contexts@3.0.0 + - @rocket.chat/fuselage-ui-kit@3.0.0 + ## 0.2.9-rc.12 ### Patch Changes diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json index 5438fdbd611e..6afbd34e675a 100644 --- a/packages/uikit-playground/package.json +++ b/packages/uikit-playground/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/uikit-playground", "private": true, - "version": "0.2.9-rc.12", + "version": "0.2.9", "type": "module", "scripts": { "dev": "vite", diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md index 50d5c79ecf82..76b400173d19 100644 --- a/packages/web-ui-registration/CHANGELOG.md +++ b/packages/web-ui-registration/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/web-ui-registration +## 3.0.0 + +### Patch Changes + +- 7da1edf866: Fixed an issue in the invite registration flow in which the user would not be automatically redirected to the homepage upon succesfully submiting the user registration form. +- Updated dependencies [7da1edf866] +- Updated dependencies [92613680b7] + - @rocket.chat/ui-contexts@3.0.0 + - @rocket.chat/tools@0.2.0 + ## 3.0.0-rc.18 ### Patch Changes diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json index 0811689d3705..122b0f064304 100644 --- a/packages/web-ui-registration/package.json +++ b/packages/web-ui-registration/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/web-ui-registration", - "version": "3.0.0-rc.18", + "version": "3.0.0", "private": true, "homepage": "https://rocket.chat", "main": "./dist/index.js", @@ -51,7 +51,7 @@ "peerDependencies": { "@rocket.chat/layout": "*", "@rocket.chat/tools": "*", - "@rocket.chat/ui-contexts": "3.0.0-rc.19", + "@rocket.chat/ui-contexts": "3.0.0", "@tanstack/react-query": "*", "react": "*", "react-hook-form": "*", From 5224eab2982965e3df15a97226dd32b59218aa22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlia=20Jaeger=20Foresti?= <60678893+juliajforesti@users.noreply.github.com> Date: Mon, 4 Dec 2023 14:15:22 -0300 Subject: [PATCH 75/76] feat: Image gallery with swiper (#30623) --- apps/meteor/.meteor/packages | 1 - apps/meteor/.meteor/versions | 1 - apps/meteor/app/api/server/v1/channels.ts | 45 +- .../emoji-custom/client/lib/emojiCustom.js | 46 -- apps/meteor/app/theme/client/main.css | 1 - .../app/theme/client/vendor/photoswipe.css | 422 ------------------ apps/meteor/app/ui/client/index.ts | 1 - .../ui/client/views/app/photoswipeContent.ts | 203 --------- .../components/ImageGallery/ImageGallery.tsx | 138 ++++++ .../ImageGallery/ImageGalleryLoader.tsx | 22 + .../ImageGallery/hooks/useImageGallery.ts | 21 + .../ImageGallery/hooks/useImagesList.ts | 69 +++ .../client/components/ImageGallery/index.ts | 1 + .../message/content/Attachments.tsx | 5 +- .../content/attachments/AttachmentsItem.tsx | 5 +- .../content/attachments/FileAttachment.tsx | 2 +- .../attachments/file/ImageAttachment.tsx | 4 +- .../attachments/structure/AttachmentImage.tsx | 12 +- .../variants/room/RoomMessageContent.tsx | 2 +- .../client/contexts/ImageGalleryContext.ts | 13 + apps/meteor/client/importPackages.ts | 1 - apps/meteor/client/lib/lists/ImagesList.ts | 39 ++ .../client/providers/ImageGalleryProvider.tsx | 44 ++ .../moderation/helpers/ContextMessage.tsx | 2 +- .../RoomFiles/components/FileItem.js | 54 +-- .../RoomFiles/components/ImageItem.tsx | 34 ++ .../RoomFiles/hooks/useFilesList.ts | 2 +- .../views/room/providers/RoomProvider.tsx | 5 +- apps/meteor/package.json | 4 +- apps/meteor/server/models/raw/Uploads.ts | 25 +- .../model-typings/src/models/IUploadsModel.ts | 10 +- .../src/v1/channels/ChannelsImagesProps.ts | 14 + .../rest-typings/src/v1/channels/channels.ts | 6 + .../rest-typings/src/v1/channels/index.ts | 1 + yarn.lock | 55 +-- 35 files changed, 559 insertions(+), 751 deletions(-) delete mode 100644 apps/meteor/app/theme/client/vendor/photoswipe.css delete mode 100644 apps/meteor/app/ui/client/index.ts delete mode 100644 apps/meteor/app/ui/client/views/app/photoswipeContent.ts create mode 100644 apps/meteor/client/components/ImageGallery/ImageGallery.tsx create mode 100644 apps/meteor/client/components/ImageGallery/ImageGalleryLoader.tsx create mode 100644 apps/meteor/client/components/ImageGallery/hooks/useImageGallery.ts create mode 100644 apps/meteor/client/components/ImageGallery/hooks/useImagesList.ts create mode 100644 apps/meteor/client/components/ImageGallery/index.ts create mode 100644 apps/meteor/client/contexts/ImageGalleryContext.ts create mode 100644 apps/meteor/client/lib/lists/ImagesList.ts create mode 100644 apps/meteor/client/providers/ImageGalleryProvider.tsx create mode 100644 apps/meteor/client/views/room/contextualBar/RoomFiles/components/ImageItem.tsx create mode 100644 packages/rest-typings/src/v1/channels/ChannelsImagesProps.ts diff --git a/apps/meteor/.meteor/packages b/apps/meteor/.meteor/packages index ae788af78034..e99aa0bdfb67 100644 --- a/apps/meteor/.meteor/packages +++ b/apps/meteor/.meteor/packages @@ -72,6 +72,5 @@ autoupdate@1.8.0 # photoswipe -jquery zodern:types zodern:standard-minifier-js diff --git a/apps/meteor/.meteor/versions b/apps/meteor/.meteor/versions index 66f61e2cd8cc..6dab889e3e38 100644 --- a/apps/meteor/.meteor/versions +++ b/apps/meteor/.meteor/versions @@ -43,7 +43,6 @@ hot-code-push@1.0.4 http@2.0.0 id-map@1.1.1 inter-process-messaging@0.1.1 -jquery@3.0.0 kadira:flow-router@2.12.1 localstorage@1.2.0 logging@1.3.2 diff --git a/apps/meteor/app/api/server/v1/channels.ts b/apps/meteor/app/api/server/v1/channels.ts index 8e0541b8040b..1c84926edb63 100644 --- a/apps/meteor/app/api/server/v1/channels.ts +++ b/apps/meteor/app/api/server/v1/channels.ts @@ -1,5 +1,5 @@ import { Team, Room } from '@rocket.chat/core-services'; -import type { IRoom, ISubscription, IUser, RoomType } from '@rocket.chat/core-typings'; +import type { IRoom, ISubscription, IUser, RoomType, IUpload } from '@rocket.chat/core-typings'; import { Integrations, Messages, Rooms, Subscriptions, Uploads, Users } from '@rocket.chat/models'; import { isChannelsAddAllProps, @@ -18,6 +18,7 @@ import { isChannelsConvertToTeamProps, isChannelsSetReadOnlyProps, isChannelsDeleteProps, + isChannelsImagesProps, } from '@rocket.chat/rest-typings'; import { Meteor } from 'meteor/meteor'; @@ -803,6 +804,48 @@ API.v1.addRoute( }, ); +API.v1.addRoute( + 'channels.images', + { authRequired: true, validateParams: isChannelsImagesProps }, + { + async get() { + const room = await Rooms.findOneById>(this.queryParams.roomId, { + projection: { t: 1, teamId: 1, prid: 1 }, + }); + + if (!room || !(await canAccessRoomAsync(room, { _id: this.userId }))) { + return API.v1.unauthorized(); + } + + let initialImage: IUpload | null = null; + if (this.queryParams.startingFromId) { + initialImage = await Uploads.findOneById(this.queryParams.startingFromId); + } + + const { offset, count } = await getPaginationItems(this.queryParams); + + const { cursor, totalCount } = Uploads.findImagesByRoomId(room._id, initialImage?.uploadedAt, { + skip: offset, + limit: count, + }); + + const [files, total] = await Promise.all([cursor.toArray(), totalCount]); + + // If the initial image was not returned in the query, insert it as the first element of the list + if (initialImage && !files.find(({ _id }) => _id === (initialImage as IUpload)._id)) { + files.splice(0, 0, initialImage); + } + + return API.v1.success({ + files, + count, + offset, + total, + }); + }, + }, +); + API.v1.addRoute( 'channels.getIntegrations', { authRequired: true }, diff --git a/apps/meteor/app/emoji-custom/client/lib/emojiCustom.js b/apps/meteor/app/emoji-custom/client/lib/emojiCustom.js index 1340ead95789..64f1df9bd932 100644 --- a/apps/meteor/app/emoji-custom/client/lib/emojiCustom.js +++ b/apps/meteor/app/emoji-custom/client/lib/emojiCustom.js @@ -1,11 +1,9 @@ import { escapeRegExp } from '@rocket.chat/string-helpers'; -import $ from 'jquery'; import { Meteor } from 'meteor/meteor'; import { Session } from 'meteor/session'; import { emoji, updateRecent } from '../../../emoji/client'; import { CachedCollectionManager } from '../../../ui-cached-collection/client'; -import { LegacyRoomManager } from '../../../ui-utils/client'; import { getURL } from '../../../utils/client'; import { sdk } from '../../../utils/client/lib/SDKClient'; import { isSetNotNull } from './function-isSet'; @@ -45,9 +43,6 @@ export const deleteEmojiCustom = function (emojiData) { }; export const updateEmojiCustom = function (emojiData) { - let key = `emoji_random_${emojiData.name}`; - Session.set(key, Math.round(Math.random() * 1000)); - const previousExists = isSetNotNull(() => emojiData.previousName); const currentAliases = isSetNotNull(() => emojiData.aliases); @@ -88,47 +83,6 @@ export const updateEmojiCustom = function (emojiData) { } } - const url = getEmojiUrlFromName(emojiData.name, emojiData.extension); - - // update in admin interface - if (previousExists && emojiData.name !== emojiData.previousName) { - $(document) - .find(`.emojiAdminPreview-image[data-emoji='${emojiData.previousName}']`) - .css('background-image', `url('${url})'`) - .attr('data-emoji', `${emojiData.name}`); - } else { - $(document).find(`.emojiAdminPreview-image[data-emoji='${emojiData.name}']`).css('background-image', `url('${url}')`); - } - - // update in picker - if (previousExists && emojiData.name !== emojiData.previousName) { - $(document) - .find(`li[data-emoji='${emojiData.previousName}'] span`) - .css('background-image', `url('${url}')`) - .attr('data-emoji', `${emojiData.name}`); - $(document) - .find(`li[data-emoji='${emojiData.previousName}']`) - .attr('data-emoji', `${emojiData.name}`) - .attr('class', `emoji-${emojiData.name}`); - } else { - $(document).find(`li[data-emoji='${emojiData.name}'] span`).css('background-image', `url('${url}')`); - } - - // update in picker and opened rooms - for (key in LegacyRoomManager.openedRooms) { - if (LegacyRoomManager.openedRooms.hasOwnProperty(key)) { - const room = LegacyRoomManager.openedRooms[key]; - if (previousExists && emojiData.name !== emojiData.previousName) { - $(room.dom) - .find(`span[data-emoji='${emojiData.previousName}']`) - .css('background-image', `url('${url}')`) - .attr('data-emoji', `${emojiData.name}`); - } else { - $(room.dom).find(`span[data-emoji='${emojiData.name}']`).css('background-image', `url('${url}')`); - } - } - } - updateRecent('rocket'); }; diff --git a/apps/meteor/app/theme/client/main.css b/apps/meteor/app/theme/client/main.css index 6c0a20d844bb..33b7a8f0d290 100644 --- a/apps/meteor/app/theme/client/main.css +++ b/apps/meteor/app/theme/client/main.css @@ -21,7 +21,6 @@ /* Legacy theming */ @import 'imports/general/theme_old.css'; -@import './vendor/photoswipe.css'; @import './vendor/fontello/css/fontello.css'; @import './rocketchat.font.css'; @import './mentionLink.css'; diff --git a/apps/meteor/app/theme/client/vendor/photoswipe.css b/apps/meteor/app/theme/client/vendor/photoswipe.css deleted file mode 100644 index 53f352ff7018..000000000000 --- a/apps/meteor/app/theme/client/vendor/photoswipe.css +++ /dev/null @@ -1,422 +0,0 @@ -.pswp__button { - position: relative; - - display: block; - float: right; - overflow: visible; - - width: 44px; - height: 44px; - margin: 0; - padding: 0; - - cursor: pointer; - transition: opacity 0.2s; - - opacity: 0.75; - border: 0; - background: none; - box-shadow: none; - appearance: none; - - &:focus, - &:hover { - opacity: 1; - } - - &:active { - opacity: 0.9; - outline: none; - } - - &::-moz-focus-inner { - padding: 0; - - border: 0; - } -} - -.pswp__ui--over-close .pswp__button--close { - opacity: 1; -} - -.pswp__button, -.pswp__button--arrow--left::before, -.pswp__button--arrow--right::before { - width: 44px; - height: 44px; - - background: url(/images/gallery-skin.svg) 0 0 no-repeat; - background-size: 264px 88px; -} - -@media (-webkit-min-device-pixel-ratio: 1.1), - (-webkit-min-device-pixel-ratio: 1.09375), - (min-resolution: 105dpi), - (min-resolution: 1.1dppx) { - .pswp--svg .pswp__button--arrow--left, - .pswp--svg .pswp__button--arrow--right { - background: none; - } -} - -.pswp__button--close { - background-position: 0 -44px; -} - -.pswp__button--share { - background-position: -44px -44px; -} - -.pswp__button--fs { - display: none; -} - -.pswp--supports-fs .pswp__button--fs { - display: block; -} - -.pswp--fs .pswp__button--fs { - background-position: -44px 0; -} - -.pswp__button--zoom { - display: none; - - background-position: -88px 0; -} - -.pswp--zoom-allowed .pswp__button--zoom { - display: block; -} - -.pswp--zoomed-in .pswp__button--zoom { - background-position: -132px 0; -} - -.pswp--touch .pswp__button--arrow--left, -.pswp--touch .pswp__button--arrow--right { - visibility: hidden; -} - -.pswp__button--arrow--left, -.pswp__button--arrow--right { - position: absolute; - top: 50%; - - width: 70px; - height: 100px; - margin-top: -50px; - - background: none; -} - -.pswp__button--arrow--left { - left: 0; -} - -.pswp__button--arrow--right { - right: 0; -} - -.pswp__button--arrow--left::before, -.pswp__button--arrow--right::before { - position: absolute; - top: 35px; - - width: 32px; - height: 30px; - - content: ''; - - background-color: rgba(0, 0, 0, 0.3); -} - -.pswp__button--arrow--left::before { - left: 6px; - - background-position: -138px -44px; -} - -.pswp__button--arrow--right::before { - right: 6px; - - background-position: -94px -44px; -} - -/* - - 4. Caption - - */ -.pswp__caption { - position: absolute; - bottom: 0; - left: 0; - - width: 100%; - min-height: 44px; - - & small { - color: #bbbbbb; - - font-size: 11px; - } -} - -.pswp__caption__center { - max-width: 420px; - margin: 0 auto; - padding: 10px; - - text-align: left; - - color: #cccccc; - - font-size: 13px; - line-height: 20px; -} - -.pswp__caption--empty { - display: none; -} - -/* Fake caption element, used to calculate height of next/prev image */ -.pswp__caption--fake { - visibility: hidden; -} - -/* - - 5. Loading indicator (preloader) - - You can play with it here - http://codepen.io/dimsemenov/pen/yyBWoR - - */ -.pswp__preloader { - position: absolute; - top: 0; - left: 50%; - - width: 44px; - height: 44px; - margin-left: -22px; - - transition: opacity 0.25s ease-out; - - opacity: 0; - direction: ltr; - will-change: opacity; -} - -.pswp__preloader__icn { - width: 20px; - height: 20px; - margin: 12px; -} - -.pswp__preloader--active { - opacity: 1; -} - -.pswp--css_animation { - & .pswp__preloader--active { - opacity: 1; - - & .pswp__preloader__icn { - position: absolute; - top: 15px; - left: 15px; - - width: 14px; - height: 14px; - margin: 0; - - animation: clockwise 500ms linear infinite; - - opacity: 0.75; - background: none; - } - - & .pswp__preloader__donut { - position: absolute; - top: 0; - left: 0; - - box-sizing: border-box; - width: 14px; - height: 14px; - margin: 0; - - animation: donut-rotate 1000ms cubic-bezier(0.4, 0, 0.22, 1) infinite; - - border: 1px solid #ffffff; - border-bottom-color: transparent; - border-left-color: transparent; - border-radius: 50%; - background: none; - } - - & .pswp__preloader__cut { - /* - The idea of animating inner circle is based on Polymer ("material") loading indicator - by Keanu Lee https://blog.keanulee.com/2014/10/20/the-tale-of-three-spinners.html - */ - position: relative; - - overflow: hidden; - - width: 7px; - height: 14px; - } - } -} - -@media screen and (max-width: 1024px) { - .pswp__preloader { - position: relative; - top: auto; - left: auto; - - float: right; - - margin: 0; - } -} - -@-webkit-keyframes clockwise { - 0% { - transform: rotate(0deg); - } - - 100% { - transform: rotate(360deg); - } -} - -@keyframes clockwise { - 0% { - transform: rotate(0deg); - } - - 100% { - transform: rotate(360deg); - } -} - -@-webkit-keyframes donut-rotate { - 0% { - transform: rotate(0); - } - - 50% { - transform: rotate(-140deg); - } - - 100% { - transform: rotate(0); - } -} - -@keyframes donut-rotate { - 0% { - transform: rotate(0); - } - - 50% { - transform: rotate(-140deg); - } - - 100% { - transform: rotate(0); - } -} - -/* - - 6. Additional styles - - */ - -/* root element of UI */ -.pswp__ui { - z-index: 1550; - - visibility: visible; - - opacity: 1; - -webkit-font-smoothing: auto; -} - -/* top black bar with buttons and "1 of X" indicator */ -.pswp__top-bar { - position: absolute; - top: 0; - left: 0; - - width: 100%; - height: 44px; -} - -.pswp__caption, -.pswp__top-bar, -.pswp--has_mouse .pswp__button--arrow--left, -.pswp--has_mouse .pswp__button--arrow--right { - transition: opacity 333ms cubic-bezier(0.4, 0, 0.22, 1); - -webkit-backface-visibility: hidden; - will-change: opacity; -} - -/* pswp--has_mouse class is added only when two subsequent mousemove events occur */ -.pswp--has_mouse .pswp__button--arrow--left, -.pswp--has_mouse .pswp__button--arrow--right { - visibility: visible; -} - -.pswp__top-bar, -.pswp__caption { - background-color: rgba(0, 0, 0, 0.5); -} - -/* pswp__ui--fit class is added when main image "fits" between top bar and bottom bar (caption) */ -.pswp__ui--fit .pswp__top-bar, -.pswp__ui--fit .pswp__caption { - background-color: rgba(0, 0, 0, 0.3); -} - -/* pswp__ui--idle class is added when mouse isn't moving for several seconds (JS option timeToIdle) */ -.pswp__ui--idle .pswp__top-bar { - opacity: 0; -} - -.pswp__ui--idle .pswp__button--arrow--left, -.pswp__ui--idle .pswp__button--arrow--right { - opacity: 0; -} - -/* - pswp__ui--hidden class is added when controls are hidden - e.g. when user taps to toggle visibility of controls -*/ -.pswp__ui--hidden .pswp__top-bar, -.pswp__ui--hidden .pswp__caption, -.pswp__ui--hidden .pswp__button--arrow--left, -.pswp__ui--hidden .pswp__button--arrow--right { - /* Force paint & create composition layer for controls. */ - opacity: 0.001; -} - -/* pswp__ui--one-slide class is added when there is just one item in gallery */ -.pswp__ui--one-slide .pswp__button--arrow--left, -.pswp__ui--one-slide .pswp__button--arrow--right, -.pswp__ui--one-slide .pswp__counter { - display: none; -} - -.pswp__element--disabled { - display: none !important; -} - -.pswp--minimal--dark .pswp__top-bar { - background: none; -} diff --git a/apps/meteor/app/ui/client/index.ts b/apps/meteor/app/ui/client/index.ts deleted file mode 100644 index 7a2b4aaa89b7..000000000000 --- a/apps/meteor/app/ui/client/index.ts +++ /dev/null @@ -1 +0,0 @@ -import './views/app/photoswipeContent.ts'; // without the *.ts extension, *.html gets loaded first diff --git a/apps/meteor/app/ui/client/views/app/photoswipeContent.ts b/apps/meteor/app/ui/client/views/app/photoswipeContent.ts deleted file mode 100644 index 5c76a6b15d18..000000000000 --- a/apps/meteor/app/ui/client/views/app/photoswipeContent.ts +++ /dev/null @@ -1,203 +0,0 @@ -import { escapeHTML } from '@rocket.chat/string-helpers'; -import { Meteor } from 'meteor/meteor'; -import type PhotoSwipe from 'photoswipe'; -import PhotoSwipeUIDefault from 'photoswipe/dist/photoswipe-ui-default'; - -import { createAnchor } from '../../../../../client/lib/utils/createAnchor'; - -const parseLength = (x: unknown): number | undefined => { - const length = typeof x === 'string' ? parseInt(x, 10) : undefined; - return Number.isFinite(length) ? length : undefined; -}; - -const getImageSize = (src: string): Promise<[w: number, h: number]> => - new Promise((resolve, reject) => { - const img = new Image(); - - img.addEventListener('load', () => { - resolve([img.naturalWidth, img.naturalHeight]); - }); - - img.addEventListener('error', (error) => { - reject(error.error); - }); - - img.src = src; - }); - -type Slide = PhotoSwipe.Item & { description?: string; title?: string }; - -const fromElementToSlide = async (element: Element): Promise => { - if (!(element instanceof HTMLElement)) { - return null; - } - - const title = element.dataset.title || element.title; - const { description } = element.dataset; - - if (element instanceof HTMLAnchorElement) { - const src = element.dataset.src || element.href; - let w = parseLength(element.dataset.width); - let h = parseLength(element.dataset.height); - - if (w === undefined || h === undefined) { - [w, h] = await getImageSize(src); - } - - return { src, w, h, title, description }; - } - - if (element instanceof HTMLImageElement) { - let msrc: string | undefined; - let { src } = element; - let w: number | undefined = element.naturalWidth; - let h: number | undefined = element.naturalHeight; - - if (element.dataset.src) { - msrc = element.src; - src = element.dataset.src; - w = parseLength(element.dataset.width); - h = parseLength(element.dataset.height); - - if (w === undefined || h === undefined) { - [w, h] = await getImageSize(src); - } - } - - return { msrc, src, w, h, title, description }; - } - - return null; -}; - -let currentGallery: PhotoSwipe | null = null; - -const initGallery = async (items: Slide[], options: PhotoSwipe.Options): Promise => { - const anchor = createAnchor('photoswipe-root'); - - anchor.innerHTML = ``; - const [{ default: PhotoSwipe }] = await Promise.all([import('photoswipe'), import('photoswipe/dist/photoswipe.css')]); - - if (!currentGallery) { - const container = document.getElementById('pswp'); - - if (!container) { - throw new Error('Photoswipe container element not found'); - } - - currentGallery = new PhotoSwipe(container, PhotoSwipeUIDefault, items, options); - - currentGallery.listen('destroy', () => { - anchor.innerHTML = ''; - currentGallery = null; - }); - - currentGallery.init(); - } -}; - -const defaultGalleryOptions = { - bgOpacity: 0.7, - counterEl: false, - index: 0, - wheelToZoom: true, - padding: { top: 20, bottom: 40, left: 100, right: 100 }, - addCaptionHTMLFn(item: Slide, captionEl: HTMLElement): boolean { - captionEl.children[0].innerHTML = ` - ${escapeHTML(item.title ?? '')}
- ${escapeHTML(item.description ?? '')} - `; - return true; - }, -}; - -const createEventListenerFor = - (className: string) => - (event: Event): void => { - event.preventDefault(); - event.stopPropagation(); - - const { currentTarget } = event; - - const galleryItems = Array.from(document.querySelectorAll(className)); - - const sortedElements = galleryItems.sort((a, b) => { - if (a === currentTarget) { - return -1; - } - - if (b === currentTarget) { - return 1; - } - - return 0; - }); - - const slidePromises = sortedElements.map((element) => fromElementToSlide(element)); - - let hasOpenedGallery = false; - - void slidePromises.reduce( - (p, curr) => - p - .then(() => curr) - .then(async (slide) => { - if (!slide) { - return; - } - - if (!currentGallery) { - // If the gallery doesn't exist and has been opened this run the user closed it before all promises ran. - // This means it shouldn't be opened again. - if (hasOpenedGallery) { - return; - } - hasOpenedGallery = true; - return initGallery([slide], defaultGalleryOptions); - } - - currentGallery.items.push(slide); - currentGallery.invalidateCurrItems(); - currentGallery.updateSize(true); - }), - Promise.resolve(), - ); - }; - -Meteor.startup(() => { - $(document).on('click', '.gallery-item', createEventListenerFor('.gallery-item')); -}); diff --git a/apps/meteor/client/components/ImageGallery/ImageGallery.tsx b/apps/meteor/client/components/ImageGallery/ImageGallery.tsx new file mode 100644 index 000000000000..2946e3e692a2 --- /dev/null +++ b/apps/meteor/client/components/ImageGallery/ImageGallery.tsx @@ -0,0 +1,138 @@ +import { css } from '@rocket.chat/css-in-js'; +import { Box, IconButton, Throbber } from '@rocket.chat/fuselage'; +import React, { useRef, useState } from 'react'; +import { FocusScope } from 'react-aria'; +import { createPortal } from 'react-dom'; +import { Keyboard, Navigation, Zoom, A11y } from 'swiper'; +import type { SwiperRef } from 'swiper/react'; +import { type SwiperClass, Swiper, SwiperSlide } from 'swiper/react'; + +// Import Swiper styles +import 'swiper/swiper.css'; +import 'swiper/modules/navigation/navigation.min.css'; +import 'swiper/modules/keyboard/keyboard.min.css'; +import 'swiper/modules/zoom/zoom.min.css'; + +import ImageGalleryLoader from './ImageGalleryLoader'; +import { useImageGallery } from './hooks/useImageGallery'; + +const swiperStyle = css` + .swiper { + width: 100%; + height: 100%; + } + .swiper-container { + position: absolute; + z-index: 99; + top: 0; + + overflow: hidden; + + width: 100%; + height: 100%; + + background-color: var(--rcx-color-surface-overlay, rgba(0, 0, 0, 0.6)); + } + + .rcx-swiper-close-button, + .rcx-swiper-prev-button, + .rcx-swiper-next-button { + color: var(--rcx-color-font-pure-white, #ffffff) !important; + } + + .rcx-swiper-close-button { + position: absolute; + z-index: 10; + top: 10px; + right: 10px; + } + + .rcx-swiper-prev-button, + .rcx-swiper-next-button { + position: absolute; + z-index: 10; + top: 50%; + + cursor: pointer; + } + + .rcx-swiper-prev-button.swiper-button-disabled, + .rcx-swiper-next-button.swiper-button-disabled { + cursor: auto; + pointer-events: none; + + opacity: 0.35; + } + + .rcx-swiper-prev-button.swiper-button-hidden, + .rcx-swiper-next-button.swiper-button-hidden { + cursor: auto; + pointer-events: none; + + opacity: 0; + } + + .rcx-swiper-prev-button, + .swiper-rtl .rcx-swiper-next-button { + right: auto; + left: 10px; + } + + .rcx-swiper-next-button, + .swiper-rtl .rcx-swiper-prev-button { + right: 10px; + left: auto; + } +`; + +const ImageGallery = () => { + const swiperRef = useRef(null); + const [, setSwiperInst] = useState(); + + const { isLoading, loadMore, images, onClose } = useImageGallery(); + + if (isLoading) { + return ; + } + + return createPortal( + + +
+ + + + String(keyCode) === '27' && onClose()} + modules={[Navigation, Zoom, Keyboard, A11y]} + onInit={(swiper) => setSwiperInst(swiper)} + onReachEnd={loadMore} + > + {images?.map(({ _id, url }) => ( + +
+ +
+ +
+
+ + ))} + +
+ + , + document.body, + ); +}; + +export default ImageGallery; diff --git a/apps/meteor/client/components/ImageGallery/ImageGalleryLoader.tsx b/apps/meteor/client/components/ImageGallery/ImageGalleryLoader.tsx new file mode 100644 index 000000000000..a495f345194e --- /dev/null +++ b/apps/meteor/client/components/ImageGallery/ImageGalleryLoader.tsx @@ -0,0 +1,22 @@ +import { css } from '@rocket.chat/css-in-js'; +import { IconButton, ModalBackdrop, Throbber } from '@rocket.chat/fuselage'; +import React from 'react'; +import { createPortal } from 'react-dom'; + +const closeButtonStyle = css` + position: absolute; + z-index: 10; + top: 10px; + right: 10px; +`; + +const ImageGalleryLoader = ({ onClose }: { onClose: () => void }) => + createPortal( + + + + , + document.body, + ); + +export default ImageGalleryLoader; diff --git a/apps/meteor/client/components/ImageGallery/hooks/useImageGallery.ts b/apps/meteor/client/components/ImageGallery/hooks/useImageGallery.ts new file mode 100644 index 000000000000..9d058a010fdc --- /dev/null +++ b/apps/meteor/client/components/ImageGallery/hooks/useImageGallery.ts @@ -0,0 +1,21 @@ +import { useMemo, useContext } from 'react'; + +import { ImageGalleryContext } from '../../../contexts/ImageGalleryContext'; +import { useRecordList } from '../../../hooks/lists/useRecordList'; +import { useRoom } from '../../../views/room/contexts/RoomContext'; +import { useImagesList } from './useImagesList'; + +export const useImageGallery = () => { + const { _id: rid } = useRoom(); + const { imageId, onClose } = useContext(ImageGalleryContext); + + const { filesList, loadMoreItems } = useImagesList(useMemo(() => ({ roomId: rid, startingFromId: imageId }), [imageId, rid])); + const { phase, items: filesItems } = useRecordList(filesList); + + return { + images: filesItems, + isLoading: phase === 'loading', + loadMore: () => loadMoreItems(filesItems.length - 1), + onClose, + }; +}; diff --git a/apps/meteor/client/components/ImageGallery/hooks/useImagesList.ts b/apps/meteor/client/components/ImageGallery/hooks/useImagesList.ts new file mode 100644 index 000000000000..da05c7880746 --- /dev/null +++ b/apps/meteor/client/components/ImageGallery/hooks/useImagesList.ts @@ -0,0 +1,69 @@ +import type { ChannelsImagesProps } from '@rocket.chat/rest-typings'; +import { useUserId, useEndpoint } from '@rocket.chat/ui-contexts'; +import { useCallback, useEffect, useState } from 'react'; + +import { useScrollableRecordList } from '../../../hooks/lists/useScrollableRecordList'; +import { useStreamUpdatesForMessageList } from '../../../hooks/lists/useStreamUpdatesForMessageList'; +import { useComponentDidUpdate } from '../../../hooks/useComponentDidUpdate'; +import { ImagesList } from '../../../lib/lists/ImagesList'; +import type { MessageList } from '../../../lib/lists/MessageList'; + +export const useImagesList = ( + options: ChannelsImagesProps, +): { + filesList: ImagesList; + initialItemCount: number; + reload: () => void; + loadMoreItems: (start: number) => void; +} => { + const [filesList, setFilesList] = useState(() => new ImagesList(options)); + const reload = useCallback(() => setFilesList(new ImagesList(options)), [options]); + const uid = useUserId(); + + useComponentDidUpdate(() => { + options && reload(); + }, [options, reload]); + + useEffect(() => { + if (filesList.options !== options) { + filesList.updateFilters(options); + } + }, [filesList, options]); + + const apiEndPoint = '/v1/channels.images'; + + const getFiles = useEndpoint('GET', apiEndPoint); + + const fetchMessages = useCallback( + async (start, end) => { + const { files, total } = await getFiles({ + roomId: options.roomId, + startingFromId: options.startingFromId, + offset: start, + count: end, + }); + + return { + items: files.map((file) => ({ + ...file, + uploadedAt: file.uploadedAt ? new Date(file.uploadedAt) : undefined, + modifiedAt: file.modifiedAt ? new Date(file.modifiedAt) : undefined, + })), + itemCount: total, + }; + }, + [getFiles, options.roomId, options.startingFromId], + ); + + const { loadMoreItems, initialItemCount } = useScrollableRecordList(filesList, fetchMessages, 5); + + // TODO: chapter day : frontend create useStreamUpdatesForUploadList + useStreamUpdatesForMessageList(filesList as unknown as MessageList, uid, options.roomId || null); + + return { + reload, + filesList, + loadMoreItems, + initialItemCount, + }; +}; diff --git a/apps/meteor/client/components/ImageGallery/index.ts b/apps/meteor/client/components/ImageGallery/index.ts new file mode 100644 index 000000000000..db657797badb --- /dev/null +++ b/apps/meteor/client/components/ImageGallery/index.ts @@ -0,0 +1 @@ +export { default } from './ImageGallery'; diff --git a/apps/meteor/client/components/message/content/Attachments.tsx b/apps/meteor/client/components/message/content/Attachments.tsx index b08215c94a5f..2c1b6675cb7b 100644 --- a/apps/meteor/client/components/message/content/Attachments.tsx +++ b/apps/meteor/client/components/message/content/Attachments.tsx @@ -7,13 +7,14 @@ import AttachmentsItem from './attachments/AttachmentsItem'; type AttachmentsProps = { attachments: MessageAttachmentBase[]; collapsed?: boolean; + id?: string | undefined; }; -const Attachments = ({ attachments, collapsed }: AttachmentsProps): ReactElement => { +const Attachments = ({ attachments, collapsed, id }: AttachmentsProps): ReactElement => { return ( <> {attachments?.map((attachment, index) => ( - + ))} ); diff --git a/apps/meteor/client/components/message/content/attachments/AttachmentsItem.tsx b/apps/meteor/client/components/message/content/attachments/AttachmentsItem.tsx index 6ca97fe7ecde..589549d4bcc1 100644 --- a/apps/meteor/client/components/message/content/attachments/AttachmentsItem.tsx +++ b/apps/meteor/client/components/message/content/attachments/AttachmentsItem.tsx @@ -9,11 +9,12 @@ import { QuoteAttachment } from './QuoteAttachment'; type AttachmentsItemProps = { attachment: MessageAttachmentBase; + id: string | undefined; }; -const AttachmentsItem = ({ attachment }: AttachmentsItemProps): ReactElement => { +const AttachmentsItem = ({ attachment, id }: AttachmentsItemProps): ReactElement => { if (isFileAttachment(attachment)) { - return ; + return ; } if (isQuoteAttachment(attachment)) { diff --git a/apps/meteor/client/components/message/content/attachments/FileAttachment.tsx b/apps/meteor/client/components/message/content/attachments/FileAttachment.tsx index 423464b72569..942ace9055d3 100644 --- a/apps/meteor/client/components/message/content/attachments/FileAttachment.tsx +++ b/apps/meteor/client/components/message/content/attachments/FileAttachment.tsx @@ -8,7 +8,7 @@ import { GenericFileAttachment } from './file/GenericFileAttachment'; import { ImageAttachment } from './file/ImageAttachment'; import { VideoAttachment } from './file/VideoAttachment'; -export const FileAttachment: FC = (attachment) => { +export const FileAttachment: FC = (attachment) => { if (isFileImageAttachment(attachment)) { return ; } diff --git a/apps/meteor/client/components/message/content/attachments/file/ImageAttachment.tsx b/apps/meteor/client/components/message/content/attachments/file/ImageAttachment.tsx index 70c29fafacb3..13cd375c7eeb 100644 --- a/apps/meteor/client/components/message/content/attachments/file/ImageAttachment.tsx +++ b/apps/meteor/client/components/message/content/attachments/file/ImageAttachment.tsx @@ -9,7 +9,8 @@ import MessageContentBody from '../../../MessageContentBody'; import AttachmentImage from '../structure/AttachmentImage'; import { useLoadImage } from './hooks/useLoadImage'; -export const ImageAttachment: FC = ({ +export const ImageAttachment: FC = ({ + id, title, image_url: url, image_preview: imagePreview, @@ -38,6 +39,7 @@ export const ImageAttachment: FC = ({ dataSrc={getURL(link || url)} src={getURL(url)} previewUrl={`data:image/png;base64,${imagePreview}`} + id={id} /> diff --git a/apps/meteor/client/components/message/content/attachments/structure/AttachmentImage.tsx b/apps/meteor/client/components/message/content/attachments/structure/AttachmentImage.tsx index 00249bb857fc..a82e3a7daa5e 100644 --- a/apps/meteor/client/components/message/content/attachments/structure/AttachmentImage.tsx +++ b/apps/meteor/client/components/message/content/attachments/structure/AttachmentImage.tsx @@ -14,6 +14,7 @@ type AttachmentImageProps = { src: string; loadImage?: boolean; setLoadImage: () => void; + id: string | undefined; } & Dimensions & ({ loadImage: true } | { loadImage: false; setLoadImage: () => void }); @@ -36,7 +37,7 @@ const getDimensions = ( return { width, height, ratio: (height / width) * 100 }; }; -const AttachmentImage: FC = ({ previewUrl, dataSrc, loadImage = true, setLoadImage, src, ...size }) => { +const AttachmentImage: FC = ({ id, previewUrl, dataSrc, loadImage = true, setLoadImage, src, ...size }) => { const limits = useAttachmentDimensions(); const [error, setError] = useState(false); @@ -77,7 +78,14 @@ const AttachmentImage: FC = ({ previewUrl, dataSrc, loadIm right: 0, }} > - + diff --git a/apps/meteor/client/components/message/variants/room/RoomMessageContent.tsx b/apps/meteor/client/components/message/variants/room/RoomMessageContent.tsx index b22627bea8d2..7f4cf6694b7a 100644 --- a/apps/meteor/client/components/message/variants/room/RoomMessageContent.tsx +++ b/apps/meteor/client/components/message/variants/room/RoomMessageContent.tsx @@ -64,7 +64,7 @@ const RoomMessageContent = ({ message, unread, all, mention, searchText }: RoomM )} - {!!normalizedMessage?.attachments?.length && } + {!!normalizedMessage?.attachments?.length && } {oembedEnabled && !!normalizedMessage.urls?.length && } diff --git a/apps/meteor/client/contexts/ImageGalleryContext.ts b/apps/meteor/client/contexts/ImageGalleryContext.ts new file mode 100644 index 000000000000..2fea5e46a40f --- /dev/null +++ b/apps/meteor/client/contexts/ImageGalleryContext.ts @@ -0,0 +1,13 @@ +import { createContext } from 'react'; + +export type ImageGalleryContextValue = { + imageId: string; + isOpen: boolean; + onClose: () => void; +}; + +export const ImageGalleryContext = createContext({ + imageId: '', + isOpen: false, + onClose: () => undefined, +}); diff --git a/apps/meteor/client/importPackages.ts b/apps/meteor/client/importPackages.ts index 60446388ed9f..ec10c6dd014c 100644 --- a/apps/meteor/client/importPackages.ts +++ b/apps/meteor/client/importPackages.ts @@ -38,7 +38,6 @@ import '../app/slashcommands-open/client'; import '../app/slashcommands-topic/client'; import '../app/slashcommands-unarchiveroom/client'; import '../app/tokenpass/client'; -import '../app/ui/client'; import '../app/webdav/client'; import '../app/webrtc/client'; import '../app/wordpress/client'; diff --git a/apps/meteor/client/lib/lists/ImagesList.ts b/apps/meteor/client/lib/lists/ImagesList.ts new file mode 100644 index 000000000000..540d5bb1c0f7 --- /dev/null +++ b/apps/meteor/client/lib/lists/ImagesList.ts @@ -0,0 +1,39 @@ +import type { IUpload } from '@rocket.chat/core-typings'; + +import { RecordList } from './RecordList'; + +type FilesMessage = Omit & Required>; + +export type ImagesListOptions = { + roomId: Required['rid']; + startingFromId: string; + count?: number; + offset?: number; +}; + +const isFileMessageInRoom = (upload: IUpload, rid: IUpload['rid']): upload is FilesMessage => upload.rid === rid && 'rid' in upload; + +export class ImagesList extends RecordList { + public constructor(private _options: ImagesListOptions) { + super(); + } + + public get options(): ImagesListOptions { + return this._options; + } + + public updateFilters(options: ImagesListOptions): void { + this._options = options; + this.clear(); + } + + protected filter(message: IUpload): boolean { + const { roomId } = this._options; + + if (!isFileMessageInRoom(message, roomId)) { + return false; + } + + return true; + } +} diff --git a/apps/meteor/client/providers/ImageGalleryProvider.tsx b/apps/meteor/client/providers/ImageGalleryProvider.tsx new file mode 100644 index 000000000000..6d14e28c53ce --- /dev/null +++ b/apps/meteor/client/providers/ImageGalleryProvider.tsx @@ -0,0 +1,44 @@ +import React, { type ReactNode, useEffect, useState } from 'react'; + +import ImageGallery from '../components/ImageGallery/ImageGallery'; +import { ImageGalleryContext } from '../contexts/ImageGalleryContext'; + +type ImageGalleryProviderProps = { + children: ReactNode; +}; + +const ImageGalleryProvider = ({ children }: ImageGalleryProviderProps) => { + const [imageId, setImageId] = useState(); + + useEffect(() => { + document.addEventListener('click', (event: Event) => { + const target = event?.target as HTMLElement | null; + if (target?.classList.contains('gallery-item')) { + return setImageId(target.dataset.id || target?.parentElement?.parentElement?.dataset.id); + } + + if (target?.classList.contains('gallery-item-container')) { + return setImageId(target.dataset.id); + } + if ( + target?.classList.contains('gallery-item') && + target?.parentElement?.parentElement?.classList.contains('gallery-item-container') + ) { + return setImageId(target.dataset.id || target?.parentElement?.parentElement?.dataset.id); + } + + if (target?.classList.contains('rcx-avatar__element') && target?.parentElement?.classList.contains('gallery-item')) { + return setImageId(target.dataset.id || target?.parentElement?.parentElement?.dataset.id); + } + }); + }, []); + + return ( + setImageId(undefined) }}> + {children} + {!!imageId && } + + ); +}; + +export default ImageGalleryProvider; diff --git a/apps/meteor/client/views/admin/moderation/helpers/ContextMessage.tsx b/apps/meteor/client/views/admin/moderation/helpers/ContextMessage.tsx index 09caf368b793..5d8ecfed60a9 100644 --- a/apps/meteor/client/views/admin/moderation/helpers/ContextMessage.tsx +++ b/apps/meteor/client/views/admin/moderation/helpers/ContextMessage.tsx @@ -77,7 +77,7 @@ const ContextMessage = ({ )} {message.blocks && } - {message.attachments && } + {message.attachments && } diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.js b/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.js index a8ae3e8e26a8..30cbce6a14e1 100644 --- a/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.js +++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.js @@ -1,9 +1,10 @@ import { css } from '@rocket.chat/css-in-js'; -import { Box, Avatar, Palette } from '@rocket.chat/fuselage'; +import { Box, Palette } from '@rocket.chat/fuselage'; import React from 'react'; import { useFormatDateAndTime } from '../../../../../hooks/useFormatDateAndTime'; import FileItemIcon from './FileItemIcon'; +import ImageItem from './ImageItem'; import MenuItem from './MenuItem'; const hoverClass = css` @@ -20,32 +21,35 @@ const FileItem = ({ fileData, isDeletionAllowed, onClickDelete }) => { return ( - - {typeGroup === 'image' ? : } - - - {name} - - - @{user?.username} - - - {format(uploadedAt)} + {typeGroup === 'image' ? ( + + ) : ( + + + + + {name} + + + @{user?.username} + + + {format(uploadedAt)} + - + )} { + return ( + + {url && } + + {name && ( + + {name} + + )} + {username && ( + + @{username} + + )} + + {timestamp} + + + + ); +}; + +export default ImageItem; diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/hooks/useFilesList.ts b/apps/meteor/client/views/room/contextualBar/RoomFiles/hooks/useFilesList.ts index 8119606e7948..7875b97576f5 100644 --- a/apps/meteor/client/views/room/contextualBar/RoomFiles/hooks/useFilesList.ts +++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/hooks/useFilesList.ts @@ -19,7 +19,7 @@ export const useFilesList = ( } => { const [filesList, setFilesList] = useState(() => new FilesList(options)); const reload = useCallback(() => setFilesList(new FilesList(options)), [options]); - const room = useUserRoom(options.rid as string); + const room = useUserRoom(options.rid); const uid = useUserId(); useComponentDidUpdate(() => { diff --git a/apps/meteor/client/views/room/providers/RoomProvider.tsx b/apps/meteor/client/views/room/providers/RoomProvider.tsx index 82c66c6f5d8d..47d65562460a 100644 --- a/apps/meteor/client/views/room/providers/RoomProvider.tsx +++ b/apps/meteor/client/views/room/providers/RoomProvider.tsx @@ -10,6 +10,7 @@ import { useReactiveQuery } from '../../../hooks/useReactiveQuery'; import { useReactiveValue } from '../../../hooks/useReactiveValue'; import { RoomManager } from '../../../lib/RoomManager'; import { roomCoordinator } from '../../../lib/rooms/roomCoordinator'; +import ImageGalleryProvider from '../../../providers/ImageGalleryProvider'; import RoomNotFound from '../RoomNotFound'; import RoomSkeleton from '../RoomSkeleton'; import { useRoomRolesManagement } from '../body/hooks/useRoomRolesManagement'; @@ -109,7 +110,9 @@ const RoomProvider = ({ rid, children }: RoomProviderProps): ReactElement => { return ( - {children} + + {children} + ); diff --git a/apps/meteor/package.json b/apps/meteor/package.json index bf632810853b..fb5204d1ed4b 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -135,7 +135,6 @@ "@types/nodemailer": "^6.4.13", "@types/oauth2-server": "^3.0.15", "@types/parseurl": "^1.3.2", - "@types/photoswipe": "^4.1.5", "@types/prometheus-gc-stats": "^0.6.3", "@types/proxyquire": "^1.3.30", "@types/psl": "^1.1.2", @@ -351,7 +350,6 @@ "ip-range-check": "^0.2.0", "is-svg": "^4.3.2", "isolated-vm": "4.4.2", - "jquery": "^3.6.0", "jschardet": "^3.0.0", "jsdom": "^16.7.0", "jsrsasign": "^10.5.24", @@ -388,7 +386,6 @@ "path": "^0.12.7", "path-to-regexp": "^6.2.1", "pdfjs-dist": "^2.13.216", - "photoswipe": "^4.1.3", "pino": "^8.15.0", "postis": "^2.2.0", "prom-client": "^14.0.1", @@ -418,6 +415,7 @@ "strict-uri-encode": "^2.0.0", "string-strip-html": "^7.0.3", "suretype": "~2.4.1", + "swiper": "^9.3.2", "tar-stream": "^1.6.2", "textarea-caret": "^3.1.0", "tinykeys": "^1.4.0", diff --git a/apps/meteor/server/models/raw/Uploads.ts b/apps/meteor/server/models/raw/Uploads.ts index 1c02fffab2a8..f2dd26113eaa 100644 --- a/apps/meteor/server/models/raw/Uploads.ts +++ b/apps/meteor/server/models/raw/Uploads.ts @@ -1,5 +1,5 @@ // TODO: Lib imports should not exists inside the raw models -import type { IUpload, RocketChatRecordDeleted } from '@rocket.chat/core-typings'; +import type { IUpload, RocketChatRecordDeleted, IRoom } from '@rocket.chat/core-typings'; import type { FindPaginated, IUploadsModel } from '@rocket.chat/model-typings'; import { escapeRegExp } from '@rocket.chat/string-helpers'; import type { Collection, FindCursor, Db, IndexDescription, WithId, Filter, FindOptions } from 'mongodb'; @@ -57,4 +57,27 @@ export class UploadsRaw extends BaseUploadModelRaw implements IUploadsModel { options, ); } + + findImagesByRoomId( + rid: IRoom['_id'], + uploadedAt?: Date, + options: Omit, 'sort'> = {}, + ): FindPaginated>> { + return this.findPaginated( + { + rid, + _hidden: { $ne: true }, + typeGroup: 'image', + ...(Boolean(uploadedAt) && { + uploadedAt: { + $lte: uploadedAt, + }, + }), + }, + { + ...options, + sort: { uploadedAt: -1 }, + }, + ); + } } diff --git a/packages/model-typings/src/models/IUploadsModel.ts b/packages/model-typings/src/models/IUploadsModel.ts index d5be641c9c37..1e80fcfe39b5 100644 --- a/packages/model-typings/src/models/IUploadsModel.ts +++ b/packages/model-typings/src/models/IUploadsModel.ts @@ -1,5 +1,5 @@ -import type { IUpload } from '@rocket.chat/core-typings'; -import type { FindCursor, WithId, Filter } from 'mongodb'; +import type { IRoom, IUpload } from '@rocket.chat/core-typings'; +import type { FindCursor, WithId, Filter, FindOptions } from 'mongodb'; import type { FindPaginated } from './IBaseModel'; import type { IBaseUploadsModel } from './IBaseUploadsModel'; @@ -8,4 +8,10 @@ export interface IUploadsModel extends IBaseUploadsModel { findNotHiddenFilesOfRoom(roomId: string, searchText: string, fileType: string, limit: number): FindCursor; findPaginatedWithoutThumbs(query: Filter, options?: any): FindPaginated>>; + + findImagesByRoomId( + rid: IRoom['_id'], + uploadedAt?: Date, + options?: Omit, 'sort'>, + ): FindPaginated>>; } diff --git a/packages/rest-typings/src/v1/channels/ChannelsImagesProps.ts b/packages/rest-typings/src/v1/channels/ChannelsImagesProps.ts new file mode 100644 index 000000000000..52c065b7c393 --- /dev/null +++ b/packages/rest-typings/src/v1/channels/ChannelsImagesProps.ts @@ -0,0 +1,14 @@ +import Ajv from 'ajv'; + +const ajv = new Ajv({ + coerceTypes: true, +}); + +export type ChannelsImagesProps = { + roomId: string; + startingFromId: string; + count?: number; + offset?: number; +}; +const channelsImagesPropsSchema = {}; +export const isChannelsImagesProps = ajv.compile(channelsImagesPropsSchema); diff --git a/packages/rest-typings/src/v1/channels/channels.ts b/packages/rest-typings/src/v1/channels/channels.ts index e5ae6175ffdf..eccdf3499847 100644 --- a/packages/rest-typings/src/v1/channels/channels.ts +++ b/packages/rest-typings/src/v1/channels/channels.ts @@ -10,6 +10,7 @@ import type { ChannelsDeleteProps } from './ChannelsDeleteProps'; import type { ChannelsGetAllUserMentionsByChannelProps } from './ChannelsGetAllUserMentionsByChannelProps'; import type { ChannelsGetIntegrationsProps } from './ChannelsGetIntegrationsProps'; import type { ChannelsHistoryProps } from './ChannelsHistoryProps'; +import type { ChannelsImagesProps } from './ChannelsImagesProps'; import type { ChannelsInviteProps } from './ChannelsInviteProps'; import type { ChannelsJoinProps } from './ChannelsJoinProps'; import type { ChannelsKickProps } from './ChannelsKickProps'; @@ -38,6 +39,11 @@ export type ChannelsEndpoints = { files: IUpload[]; }>; }; + '/v1/channels.images': { + GET: (params: ChannelsImagesProps) => PaginatedResult<{ + files: IUpload[]; + }>; + }; '/v1/channels.members': { GET: ( params: PaginatedRequest< diff --git a/packages/rest-typings/src/v1/channels/index.ts b/packages/rest-typings/src/v1/channels/index.ts index 981296e244fe..f0cf81ba622d 100644 --- a/packages/rest-typings/src/v1/channels/index.ts +++ b/packages/rest-typings/src/v1/channels/index.ts @@ -7,6 +7,7 @@ export * from './ChannelsCreateProps'; export * from './ChannelsDeleteProps'; export * from './ChannelsGetAllUserMentionsByChannelProps'; export * from './ChannelsHistoryProps'; +export * from './ChannelsImagesProps'; export * from './ChannelsJoinProps'; export * from './ChannelsKickProps'; export * from './ChannelsLeaveProps'; diff --git a/yarn.lock b/yarn.lock index 1aeb50860298..cd3958856cfc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8217,9 +8217,9 @@ __metadata: "@rocket.chat/icons": "*" "@rocket.chat/prettier-config": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-contexts": 3.0.0-rc.14 + "@rocket.chat/ui-contexts": 3.0.0 "@rocket.chat/ui-kit": "*" - "@rocket.chat/ui-video-conf": 3.0.0-rc.14 + "@rocket.chat/ui-video-conf": 3.0.0 "@tanstack/react-query": "*" react: "*" react-dom: "*" @@ -8307,8 +8307,8 @@ __metadata: "@rocket.chat/fuselage-tokens": "*" "@rocket.chat/message-parser": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-client": 3.0.0-rc.14 - "@rocket.chat/ui-contexts": 3.0.0-rc.14 + "@rocket.chat/ui-client": 3.0.0 + "@rocket.chat/ui-contexts": 3.0.0 katex: "*" react: "*" languageName: unknown @@ -8697,7 +8697,6 @@ __metadata: "@types/oauth2-server": ^3.0.15 "@types/object-path": ^0.11.3 "@types/parseurl": ^1.3.2 - "@types/photoswipe": ^4.1.5 "@types/prometheus-gc-stats": ^0.6.3 "@types/proxy-from-env": ^1.0.3 "@types/proxyquire": ^1.3.30 @@ -8811,7 +8810,6 @@ __metadata: is-svg: ^4.3.2 isolated-vm: 4.4.2 jest: ~29.6.4 - jquery: ^3.6.0 jschardet: ^3.0.0 jsdom: ^16.7.0 jsdom-global: ^3.0.2 @@ -8852,7 +8850,6 @@ __metadata: path: ^0.12.7 path-to-regexp: ^6.2.1 pdfjs-dist: ^2.13.216 - photoswipe: ^4.1.3 pino: ^8.15.0 pino-pretty: ^7.6.1 playwright-qase-reporter: ^1.2.1 @@ -8900,6 +8897,7 @@ __metadata: stylelint-order: ^5.0.0 supertest: ^6.2.3 suretype: ~2.4.1 + swiper: ^9.3.2 tar-stream: ^1.6.2 template-file: ^6.0.1 textarea-caret: ^3.1.0 @@ -9470,7 +9468,7 @@ __metadata: "@rocket.chat/fuselage": "*" "@rocket.chat/fuselage-hooks": "*" "@rocket.chat/icons": "*" - "@rocket.chat/ui-contexts": 3.0.0-rc.14 + "@rocket.chat/ui-contexts": 3.0.0 react: ~17.0.2 languageName: unknown linkType: soft @@ -9623,7 +9621,7 @@ __metadata: "@rocket.chat/fuselage-hooks": "*" "@rocket.chat/icons": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-contexts": 3.0.0-rc.14 + "@rocket.chat/ui-contexts": 3.0.0 react: ^17.0.2 react-dom: ^17.0.2 languageName: unknown @@ -9709,7 +9707,7 @@ __metadata: peerDependencies: "@rocket.chat/layout": "*" "@rocket.chat/tools": "*" - "@rocket.chat/ui-contexts": 3.0.0-rc.14 + "@rocket.chat/ui-contexts": 3.0.0 "@tanstack/react-query": "*" react: "*" react-hook-form: "*" @@ -12862,13 +12860,6 @@ __metadata: languageName: node linkType: hard -"@types/photoswipe@npm:^4.1.5": - version: 4.1.5 - resolution: "@types/photoswipe@npm:4.1.5" - checksum: a6b5fd6b029b8e84bc43f680549abf33dbc02e551e8dd176e29ca82e80edf66d0b62777fd42fe415d9e52b7a570718cac684aaea544f8dc084d1cb8bcc422f0f - languageName: node - linkType: hard - "@types/polka@npm:^0.5.6": version: 0.5.6 resolution: "@types/polka@npm:0.5.6" @@ -26297,13 +26288,6 @@ __metadata: languageName: node linkType: hard -"jquery@npm:^3.6.0": - version: 3.6.0 - resolution: "jquery@npm:3.6.0" - checksum: 8fd5fef4aa48fd374ec716dd1c1df1af407814a228e15c1260ca140de3a697c2a77c30c54ff1d238b6a3ab4ddc445ddeef9adce6c6d28e4869d85eb9d3951c0e - languageName: node - linkType: hard - "js-git@npm:^0.7.8": version: 0.7.8 resolution: "js-git@npm:0.7.8" @@ -31018,13 +31002,6 @@ __metadata: languageName: node linkType: hard -"photoswipe@npm:^4.1.3": - version: 4.1.3 - resolution: "photoswipe@npm:4.1.3" - checksum: 2eecc188d81642832cd5086e3954a6b5546b70651b6a76752625d9ff7b5e63ede9347316edc8110d7dba90acf55d2e8b2e917f454ed46c2594b09084c383aa37 - languageName: node - linkType: hard - "picocolors@npm:^0.2.1": version: 0.2.1 resolution: "picocolors@npm:0.2.1" @@ -35914,6 +35891,13 @@ __metadata: languageName: node linkType: hard +"ssr-window@npm:^4.0.2": + version: 4.0.2 + resolution: "ssr-window@npm:4.0.2" + checksum: df182600927f4f3225224cf8c02338ea637c9750519505bbfb9a9236741a2a7ec088386fb948bca7b447b8303d9109e7dc7672e3de041c79ac2a0e03665af7d2 + languageName: node + linkType: hard + "ssri@npm:^6.0.1": version: 6.0.2 resolution: "ssri@npm:6.0.2" @@ -36881,6 +36865,15 @@ __metadata: languageName: node linkType: hard +"swiper@npm:^9.3.2": + version: 9.3.2 + resolution: "swiper@npm:9.3.2" + dependencies: + ssr-window: ^4.0.2 + checksum: 9ccb6a0ef67d71ac780d7d1f3b2c2daf6f1846d3df8810aff6dcb8501c87b7769540a869cdd83eb902e5278396e5379cb32d9ed397234f7700ef55f0209f4592 + languageName: node + linkType: hard + "symbol-tree@npm:^3.2.4": version: 3.2.4 resolution: "symbol-tree@npm:3.2.4" From 92ee9fa284e5a243122b1411c4d91daa2a409f8b Mon Sep 17 00:00:00 2001 From: Heitor Tanoue <68477006+heitortanoue@users.noreply.github.com> Date: Mon, 4 Dec 2023 15:11:25 -0300 Subject: [PATCH 76/76] fix: Discussion messages deleted despite the "Do not delete discussion messages" retention policy enabled (#31113) --- .changeset/fifty-ducks-sing.md | 5 +++++ apps/meteor/app/retention-policy/server/cronPruneMessages.ts | 4 ++++ 2 files changed, 9 insertions(+) create mode 100644 .changeset/fifty-ducks-sing.md diff --git a/.changeset/fifty-ducks-sing.md b/.changeset/fifty-ducks-sing.md new file mode 100644 index 000000000000..3f8d3bda1aa5 --- /dev/null +++ b/.changeset/fifty-ducks-sing.md @@ -0,0 +1,5 @@ +--- +"@rocket.chat/meteor": patch +--- + +fix: Discussion messages deleted despite the "Do not delete discussion messages" retention policy enabled diff --git a/apps/meteor/app/retention-policy/server/cronPruneMessages.ts b/apps/meteor/app/retention-policy/server/cronPruneMessages.ts index 6ab3ff1de226..fb0e691abd69 100644 --- a/apps/meteor/app/retention-policy/server/cronPruneMessages.ts +++ b/apps/meteor/app/retention-policy/server/cronPruneMessages.ts @@ -24,6 +24,8 @@ async function job(): Promise { const ignoreDiscussion = settings.get('RetentionPolicy_DoNotPruneDiscussion'); const ignoreThreads = settings.get('RetentionPolicy_DoNotPruneThreads'); + const ignoreDiscussionQuery = ignoreDiscussion ? { prid: { $exists: false } } : {}; + // get all rooms with default values for await (const type of types) { const maxAge = maxTimes[type] || 0; @@ -34,6 +36,7 @@ async function job(): Promise { 't': type, '$or': [{ 'retention.enabled': { $eq: true } }, { 'retention.enabled': { $exists: false } }], 'retention.overrideGlobal': { $ne: true }, + ...ignoreDiscussionQuery, }, { projection: { _id: 1 } }, ).toArray(); @@ -56,6 +59,7 @@ async function job(): Promise { 'retention.enabled': { $eq: true }, 'retention.overrideGlobal': { $eq: true }, 'retention.maxAge': { $gte: 0 }, + ...ignoreDiscussionQuery, }, { projection: { _id: 1, retention: 1 } }, ).toArray();