Merge branch 'develop' into improve/deepl

RocketChat · Nov 7, 2023 · d1a269f · d1a269f
2 parents d765c39 + 5b47d5e
commit d1a269f
Show file tree

Hide file tree

Showing 177 changed files with 4,735 additions and 2,106 deletions.
diff --git a/.changeset/blue-trainers-explain.md b/.changeset/blue-trainers-explain.md
@@ -0,0 +1,6 @@
+---
+"@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/.github/workflows/ci-code-check.yml b/.github/workflows/ci-code-check.yml
@@ -27,7 +27,7 @@ jobs:
         with:
           swap-size-gb: 4
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup NodeJS
         uses: ./.github/actions/setup-node

diff --git a/.github/workflows/ci-test-e2e.yml b/.github/workflows/ci-test-e2e.yml
@@ -88,7 +88,7 @@ jobs:
           mongodb-version: ${{ matrix.mongodb-version }}
           mongodb-replica-set: rs0
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup NodeJS
         uses: ./.github/actions/setup-node

diff --git a/.github/workflows/ci-test-unit.yml b/.github/workflows/ci-test-unit.yml
@@ -21,7 +21,7 @@ jobs:
     name: Unit Tests
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup NodeJS
         uses: ./.github/actions/setup-node

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -100,7 +100,7 @@ jobs:
         with:
           swap-size-gb: 4
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup NodeJS
         uses: ./.github/actions/setup-node
@@ -138,7 +138,7 @@ jobs:
           echo "github.event_name: ${{ github.event_name }}"
           cat $GITHUB_EVENT_PATH
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: ./.github/actions/meteor-build
         with:
@@ -162,7 +162,7 @@ jobs:
           echo "github.event_name: ${{ github.event_name }}"
           cat $GITHUB_EVENT_PATH
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: ./.github/actions/meteor-build
         with:
@@ -187,7 +187,7 @@ jobs:
         platform: ['official', 'alpine']
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # we only build and publish the actual docker images if not a PR from a fork
       - uses: ./.github/actions/build-docker
@@ -216,7 +216,7 @@ jobs:
         platform: ['official', 'alpine']
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: ./.github/actions/build-docker
         with:
@@ -415,7 +415,7 @@ jobs:
     needs: [build, checks, release-versions]
     if: github.event_name == 'release' || github.ref == 'refs/heads/develop'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Restore build
         uses: actions/download-artifact@v3

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           # We must fetch at least the immediate parents so that if this is
           # a pull request then we can checkout the head.

diff --git a/.github/workflows/new-release.yml b/.github/workflows/new-release.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.event.inputs.base-ref }}
           fetch-depth: 0

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           token: ${{ secrets.CI_PAT }}

diff --git a/apps/meteor/.docker/Dockerfile b/apps/meteor/.docker/Dockerfile
@@ -14,9 +14,11 @@ RUN groupadd -g 65533 -r rocketchat \
 ADD --chown=rocketchat:rocketchat . /app
 
 RUN aptMark="$(apt-mark showmanual)" \
-    && apt-get install -y --no-install-recommends g++ make python ca-certificates \
+    && apt-get install -y --no-install-recommends g++ make python3 ca-certificates \
     && cd /app/bundle/programs/server \
     && npm install \
+	&& cd npm/node_modules/isolated-vm \
+	&& npm install \
     && apt-mark auto '.*' > /dev/null \
     && apt-mark manual $aptMark > /dev/null \
     && find /usr/local -type f -executable -exec ldd '{}' ';' \

diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md
@@ -1,5 +1,151 @@
 # @rocket.chat/meteor
 
+## 6.4.5
+
+### Patch Changes
+
+- 40ac9ea019: Bump @rocket.chat/meteor version.
+- Bump @rocket.chat/meteor version.
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+
+## 6.4.4
+
+### Patch Changes
+
+- 9e61d9c8b5: Bump @rocket.chat/meteor version.
+- Bump @rocket.chat/meteor version.
+- e832e9fe96: Fixed widget's `nextAgent` API sending an array of chars instead of an object for `departmentId` parameter
+- a20c4799a4: fix: custom-css injection
+- 4789616afd: Fixed a problem that would prevent private apps from being shown on air-gapped environments
+- e832e9fe96: Fixed a problem caused by `onlyAvailable` property of `livechat/users/agent` endpoint not having the proper type validation
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+
+## 6.4.3
+
+### Patch Changes
+
+- a8676a3c5e: Bump @rocket.chat/meteor version.
+- Bump @rocket.chat/meteor version.
+- 69d89c4700: Fix unnecessary username validation on accounts profile form
+- 02f4491d5a: fix: Omnichannel webhook is not retrying requests
+- 02f4491d5a: Fixed intermittent errors caused by the removal of subscriptions and inquiries when lacking permissions.
+- 25a2129beb: Rolled back a change of route from `/admin/workspace` to `/admin/info`
+- 02f4491d5a: Add pagination & tooltips to agent's dropdown on forwarding modal
+- 02f4491d5a: Added new Omnichannel setting 'Hide conversation after closing'
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+
+## 6.4.2
+
+### Patch Changes
+
+- eceeaf3b5d: Bump @rocket.chat/meteor version.
+- Bump @rocket.chat/meteor version.
+- 8e155d4212: fixed threads breaking when sending messages too fast
+- 3f7ce23a90: fix: mobile ringing notification missing call id
+- 36bcec8e40: Forward headers when using proxy for file uploads
+- d20033723c: Handle the username update in the background
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+
+## 6.4.1
+
+### Patch Changes
+
+- b289bbf26c: Bump @rocket.chat/meteor version.
+- Bump @rocket.chat/meteor version.
+- 636a412866: fix: Remove model-level query restrictions for monitors
+- 5e3473a2c9: New setting to automatically enable autotranslate when joining rooms
+- 2fa78b0563: fix: Monitors now able to forward a chat without taking it first
+- 0d14dc49c3: Add new permission to allow kick users from rooms without being a member
+- 919fe1f33d: download translation files through CDN
+- eb4881ca53: fix: user dropdown menu position on RTL layout
+- 5ee909bd94: Improve cache of static files
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+
 ## 6.4.0
 
 ### Minor Changes

diff --git a/apps/meteor/app/integrations/lib/outgoingEvents.ts b/apps/meteor/app/integrations/lib/outgoingEvents.ts
@@ -1,8 +1,9 @@
 import type { OutgoingIntegrationEvent } from '@rocket.chat/core-typings';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
 
 export const outgoingEvents: Record<
 	OutgoingIntegrationEvent,
-	{ label: string; value: OutgoingIntegrationEvent; use: { channel: boolean; triggerWords: boolean; targetRoom: boolean } }
+	{ label: TranslationKey; value: OutgoingIntegrationEvent; use: { channel: boolean; triggerWords: boolean; targetRoom: boolean } }
 > = {
 	sendMessage: {
 		label: 'Integrations_Outgoing_Type_SendMessage',

diff --git a/apps/meteor/app/integrations/server/lib/updateHistory.ts b/apps/meteor/app/integrations/server/lib/updateHistory.ts
@@ -1,4 +1,4 @@
-import type { IIntegrationHistory, IIntegration, IMessage, AtLeast } from '@rocket.chat/core-typings';
+import type { IIntegrationHistory, OutgoingIntegrationEvent, IIntegration, IMessage, AtLeast } from '@rocket.chat/core-typings';
 import { IntegrationHistory } from '@rocket.chat/models';
 import { Random } from '@rocket.chat/random';
 
@@ -26,7 +26,7 @@ export const updateHistory = async ({
 	historyId: IIntegrationHistory['_id'];
 	step: IIntegrationHistory['step'];
 	integration?: IIntegration;
-	event?: string;
+	event?: OutgoingIntegrationEvent;
 	triggerWord?: string;
 	ranPrepareScript?: boolean;
 	prepareSentMessage?: { channel: string; message: Partial<IMessage> }[];

diff --git a/apps/meteor/client/components/Omnichannel/Tags.tsx b/apps/meteor/client/components/Omnichannel/Tags.tsx
@@ -4,7 +4,7 @@ import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-context
 import type { ChangeEvent, ReactElement } from 'react';
 import React, { useMemo, useState } from 'react';
 
-import { useFormsSubscription } from '../../views/omnichannel/additionalForms';
+import { CurrentChatTags } from '../../views/omnichannel/additionalForms';
 import { FormSkeleton } from './Skeleton';
 import { useLivechatTags } from './hooks/useLivechatTags';
 
@@ -18,12 +18,6 @@ type TagsProps = {
 
 const Tags = ({ tags = [], handler, error, tagRequired, department }: TagsProps): ReactElement => {
 	const t = useTranslation();
-	const forms = useFormsSubscription() as any;
-
-	// TODO: Refactor the formsSubscription to use components instead of hooks (since the only thing the hook does is return a component)
-	const { useCurrentChatTags } = forms;
-	// Conditional hook was required since the whole formSubscription uses hooks in an incorrect manner
-	const EETagsComponent = useCurrentChatTags?.();
 
 	const { data: tagsResult, isInitialLoading } = useLivechatTags({
 		department,
@@ -75,9 +69,9 @@ const Tags = ({ tags = [], handler, error, tagRequired, department }: TagsProps)
 				{t('Tags')}
 			</FieldLabel>
 
-			{EETagsComponent && tagsResult?.tags && tagsResult?.tags.length ? (
+			{tagsResult?.tags && tagsResult?.tags.length ? (
 				<FieldRow>
-					<EETagsComponent
+					<CurrentChatTags
 						value={paginatedTagValue}
 						handler={(tags: { label: string; value: string }[]): void => {
 							handler(tags.map((tag) => tag.label));

diff --git a/apps/meteor/client/components/Omnichannel/modals/EnterpriseDepartmentsModal.tsx b/apps/meteor/client/components/Omnichannel/modals/EnterpriseDepartmentsModal.tsx
@@ -37,7 +37,7 @@ const EnterpriseDepartmentsModal = ({ closeModal }: { closeModal: () => void }):
 			<Modal.Content fontScale='p2'>
 				<Modal.HeroImage src='/images/departments.svg' />
 				<Box fontScale='h3' mbe={28}>
-					{t('Enterprise_Departments_title')}
+					{t('Premium_Departments_title')}
 				</Box>
 				{t('Premium_Departments_description_upgrade')}
 			</Modal.Content>

diff --git a/apps/meteor/client/providers/AppsProvider.tsx b/apps/meteor/client/providers/AppsProvider.tsx
@@ -65,13 +65,12 @@ const AppsProvider: FC = ({ children }) => {
 		},
 		{
 			staleTime: Infinity,
-			keepPreviousData: true,
 			onSettled: () => queryClient.invalidateQueries(['marketplace', 'apps-stored']),
 		},
 	);
 
 	const store = useQuery(
-		['marketplace', 'apps-stored', isAdminUser],
+		['marketplace', 'apps-stored', instance.data, marketplace.data],
 		() => {
 			if (!marketplace.isFetched && !instance.isFetched) {
 				throw new Error('Apps not loaded');

diff --git a/apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx b/apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx
@@ -68,7 +68,7 @@ export const VoipFooter = ({
 
 	const holdTitle = ((): string => {
 		if (!isEnterprise) {
-			return t('Hold_EE_only');
+			return t('Hold_Premium_only');
 		}
 		return paused ? t('Resume') : t('Hold');
 	})();

diff --git a/apps/meteor/client/sidebar/header/CreateChannel/CreateChannelModal.tsx b/apps/meteor/client/sidebar/header/CreateChannel/CreateChannelModal.tsx
@@ -49,7 +49,7 @@ type CreateChannelModalPayload = {
 
 const getFederationHintKey = (licenseModule: ReturnType<typeof useHasLicenseModule>, featureToggle: boolean): TranslationKey => {
 	if (licenseModule === 'loading' || !licenseModule) {
-		return 'error-this-is-an-ee-feature';
+		return 'error-this-is-a-premium-feature';
 	}
 	if (!featureToggle) {
 		return 'Federation_Matrix_Federated_Description_disabled';

diff --git a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallDialPad.tsx b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallDialPad.tsx
@@ -19,7 +19,7 @@ export const OmniChannelCallDialPad = ({ ...props }): ReactElement => {
 			onClick={(): void => openDialModal()}
 			disabled={!outBoundCallsEnabledForUser}
 			aria-label={t('Open_Dialpad')}
-			data-tooltip={outBoundCallsAllowed ? t('New_Call') : t('New_Call_Enterprise_Edition_Only')}
+			data-tooltip={outBoundCallsAllowed ? t('New_Call') : t('New_Call_Premium_Only')}
 			{...props}
 		/>
 	);