Merge branch 'develop' into regression/thread-message-jump

apps/meteor/app/api/server/v1/users.ts

@@ -439,7 +439,15 @@ API.v1.addRoute(
 				throw new Meteor.Error('error-invalid-query', isValidQuery.errors.join('\n'));
 			}
 
-			const actualSort = sort?.name ? { nameInsensitive: sort.name, ...sort } : sort || { username: 1 };
+			const actualSort = sort || { username: 1 };
+
+			if (sort?.status) {
+				actualSort.active = sort.status;
+			}
+
+			if (sort?.name) {
+				actualSort.nameInsensitive = sort.name;
+			}
 
 			const limit =
 				count !== 0

apps/meteor/client/views/omnichannel/agents/AgentEditWithData.tsx

@@ -20,20 +20,20 @@ const AgentEditWithData = ({ uid, reload }: AgentEditWithDataProps): ReactElemen
 
 	const getAgentDepartments = useEndpoint('GET', '/v1/livechat/agents/:agentId/departments', { agentId: uid });
 
-	const { data, isLoading: state, error } = useQuery(['getAgent'], async () => getAgent());
+	const { data, isInitialLoading: isLoading, error } = useQuery(['getAgent'], async () => getAgent());
 	const {
 		data: userDepartments,
-		isLoading: userDepartmentsState,
+		isLoading: isUserDepartmentsLoading,
 		error: userDepartmentsError,
-	} = useQuery(['getAgentDepartments'], async () => getAgentDepartments());
+	} = useQuery({ queryKey: ['getAgentDepartments'], queryFn: async () => getAgentDepartments(), cacheTime: 0 });
 
 	const {
 		data: availableDepartments,
-		isLoading: availableDepartmentsState,
+		isLoading: isAvailableDepartmentsLoading,
 		error: availableDepartmentsError,
 	} = useQuery(['getDepartments'], async () => getDepartments({ showArchived: 'true' }));
 
-	if (state || availableDepartmentsState || userDepartmentsState || !userDepartments || !availableDepartments) {
+	if (isLoading || isAvailableDepartmentsLoading || isUserDepartmentsLoading || !userDepartments || !availableDepartments) {
 		return <FormSkeleton />;
 	}
 

apps/meteor/packages/rocketchat-i18n/i18n/de-IN.i18n.json

@@ -3117,4 +3117,4 @@
   "Your_question": "Deine Frage",
   "Your_server_link": "Dein Server-Link",
   "Your_workspace_is_ready": "Dein Arbeitsbereich ist einsatzbereit 🎉"
-}
+}

apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json

@@ -265,8 +265,10 @@
   "Accounts_TwoFactorAuthentication_RememberFor_Description": "Do not request two factor authorization code if it was already provided before in the given time.",
   "Accounts_UseDefaultBlockedDomainsList": "Use Default Blocked Domains List",
   "Accounts_UseDNSDomainCheck": "Use DNS Domain Check",
+  "API_EmbedDisabledFor": "Disable Embed for Users",
   "Accounts_UserAddedEmail_Default": "<h1>Welcome to <strong>[Site_Name]</strong></h1><p>Go to <a href=\"[Site_URL]\">[Site_URL]</a> and try the best open source chat solution available today!</p><p>You may login using your email: [email] and password: [password]. You may be required to change it after your first login.",
   "Accounts_UserAddedEmail_Description": "You may use the following placeholders: <br/><ul><li>[name], [fname], [lname] for the user's full name, first name or last name, respectively.</li><li>[email] for the user's email.</li><li>[password] for the user's password.</li><li>[Site_Name] and [Site_URL] for the Application Name and URL respectively.</li></ul>",
+  "API_EmbedDisabledFor_Description": "Comma-separated list of usernames to disable the embedded link previews.",
   "Accounts_UserAddedEmailSubject_Default": "You have been added to [Site_Name]",
   "Accounts_Verify_Email_For_External_Accounts": "Mark Email for External Accounts Verified",
   "Action": "Action",
@@ -348,14 +350,23 @@
   "Alias_Format": "Alias Format",
   "Alias_Format_Description": "Import messages from Slack with an alias; %s is replaced by the username of the user. If empty, no alias will be used.",
   "Alias_Set": "Alias Set",
+  "AutoLinker_Email": "AutoLinker Email",
   "Aliases": "Aliases",
+  "AutoLinker_Phone": "AutoLinker Phone",
+  "AutoLinker_Phone_Description": "Automatically linked for Phone numbers. e.g. `(123)456-7890`",
   "All": "All",
+  "AutoLinker_StripPrefix": "AutoLinker Strip Prefix",
   "All_Apps": "All Apps",
+  "AutoLinker_StripPrefix_Description": "Short display. e.g. https://rocket.chat => rocket.chat",
   "All_added_tokens_will_be_required_by_the_user": "All added tokens will be required by the user",
   "All_categories": "All categories",
+  "AutoLinker_Urls_Scheme": "AutoLinker Scheme:// URLs",
   "All_channels": "All channels",
+  "AutoLinker_Urls_TLD": "AutoLinker TLD URLs",
   "All_closed_chats_have_been_removed": "All closed chats have been removed",
+  "AutoLinker_Urls_www": "AutoLinker 'www' URLs",
   "All_logs": "All logs",
+  "AutoLinker_UrlsRegExp": "AutoLinker URL Regular Expression",
   "All_messages": "All messages",
   "All_Prices": "All prices",
   "All_status": "All status",
@@ -591,6 +602,7 @@
   "Apps_Manual_Update_Modal_Title": "This app is already installed",
   "Apps_Manual_Update_Modal_Body": "Do you want to update it?",
   "Apps_User_Already_Exists": "The username \"__username__\" is already being used. Rename or remove the user using it to install this App",
+  "AutoLinker": "AutoLinker",
   "Apps_WhatIsIt": "Apps: What Are They?",
   "Apps_WhatIsIt_paragraph1": "A new icon in the administration area! What does this mean and what are Apps?",
   "Apps_WhatIsIt_paragraph2": "First off, Apps in this context do not refer to the mobile applications. In fact, it would be best to think of them in terms of plugins or advanced integrations.",
@@ -1241,6 +1253,7 @@
   "Country_Nepal": "Nepal",
   "Country_Netherlands": "Netherlands",
   "Country_Netherlands_Antilles": "Netherlands Antilles",
+  "If_you_dont_have_one_send_an_email_to_omni_rocketchat_to_get_yours": "If you don't have one send an email to [omni@rocket.chat](mailto:omni@rocket.chat) to get yours.",
   "Country_New_Caledonia": "New Caledonia",
   "Country_New_Zealand": "New Zealand",
   "Country_Nicaragua": "Nicaragua",
@@ -1539,9 +1552,12 @@
   "Dialed_number_doesnt_exist": "Dialed number doesn't exist",
   "Dialed_number_is_incomplete": "Dialed number is not complete",
   "Different_Style_For_User_Mentions": "Different style for user mentions",
+  "Livechat_Facebook_API_Key": "OmniChannel API Key",
   "Direct": "Direct",
   "Direction": "Direction",
+  "Livechat_Facebook_API_Secret": "OmniChannel API Secret",
   "Direct_Message": "Direct Message",
+  "Livechat_Facebook_Enabled": "Facebook integration enabled",
   "Direct_message_creation_description": "You are about to create a chat with multiple users. Add the ones you would like to talk, everyone in the same place, using direct messages.",
   "Direct_message_someone": "Direct message someone",
   "Direct_message_you_have_joined": "You have joined a new direct message with",
@@ -1629,14 +1645,24 @@
   "Dry_run": "Dry run",
   "Dry_run_description": "Will only send one email, to the same address as in From. The email must belong to a valid user.",
   "Duplicate_archived_channel_name": "An archived Channel with name `#%s` exists",
+  "Markdown_Headers": "Allow Markdown headers in messages",
+  "Markdown_Marked_Breaks": "Enable Marked Breaks",
   "Duplicate_archived_private_group_name": "An archived Private Group with name '%s' exists",
   "Duplicate_channel_name": "A Channel with name '%s' exists",
+  "Markdown_Marked_GFM": "Enable Marked GFM",
   "Duplicate_file_name_found": "Duplicate file name found.",
+  "Markdown_Marked_Pedantic": "Enable Marked Pedantic",
+  "Markdown_Marked_SmartLists": "Enable Marked Smart Lists",
   "Duplicate_private_group_name": "A Private Group with name '%s' exists",
+  "Markdown_Marked_Smartypants": "Enable Marked Smartypants",
   "Duplicated_Email_address_will_be_ignored": "Duplicated email address will be ignored.",
+  "Markdown_Marked_Tables": "Enable Marked Tables",
   "duplicated-account": "Duplicated account",
   "E2E Encryption": "E2E Encryption",
+  "Markdown_Parser": "Markdown Parser",
+  "Markdown_SupportSchemesForLink": "Markdown Support Schemes for Link",
   "E2E Encryption_Description": "Keep conversations private, ensuring only the sender and intenteded recipients are able to read them.",
+  "Markdown_SupportSchemesForLink_Description": "Comma-separated list of allowed schemes",
   "E2E_enable": "Enable E2E",
   "E2E_disable": "Disable E2E",
   "E2E_Enable_alert": "This feature is currently in beta! Please report bugs to github.com/RocketChat/Rocket.Chat/issues and be aware of:<br/>- Encrypted messages of encrypted rooms will not be found by search operations.<br/>- The mobile apps may not support the encrypted messages (they are implementing it).<br/>- Bots may not be able to see encrypted messages until they implement support for it.<br/>- Uploads will not be encrypted in this version.",
@@ -1662,6 +1688,7 @@
   "Edit_Custom_Field": "Edit Custom Field",
   "Edit_Department": "Edit Department",
   "Edit_Federated_User_Not_Allowed": "Not possible to edit a federated user",
+  "Message_AllowSnippeting": "Allow Message Snippeting",
   "Edit_Invite": "Edit Invite",
   "Edit_previous_message": "`%s` - Edit previous message",
   "Edit_Priority": "Edit Priority",
@@ -1670,6 +1697,8 @@
   "Edit_Tag": "Edit Tag",
   "Edit_Trigger": "Edit Trigger",
   "Edit_Unit": "Edit Unit",
+  "Message_Attachments_GroupAttach": "Group Attachment Buttons",
+  "Message_Attachments_GroupAttachDescription": "This groups the icons under an expandable menu. Takes up less screen space.",
   "Edit_User": "Edit User",
   "edit-livechat-room-customfields": "Edit Livechat Room Custom Fields",
   "edit-livechat-room-customfields_description": "Permission to edit the custom fields of livechat room",
@@ -1702,13 +1731,16 @@
   "edit-room-retention-policy": "Edit Room's Retention Policy",
   "edit-room-retention-policy_description": "Permission to edit a room’s retention policy, to automatically delete messages in it",
   "edit-omnichannel-contact": "Edit Omnichannel Contact",
+  "Use_Legacy_Message_Template": "Use legacy message template",
   "edit-omnichannel-contact_description": "Permission to edit Omnichannel Contact",
   "Edit_Contact_Profile": "Edit Contact Profile",
   "edited": "edited",
   "Editing_room": "Editing room",
   "Editing_user": "Editing user",
   "Editor": "Editor",
+  "Message_ShowEditedStatus": "Show Edited Status",
   "Education": "Education",
+  "Message_ShowFormattingTips": "Show Formatting Tips",
   "Email": "Email",
   "Email_Description": "Configurations for sending broadcast emails from inside Rocket.Chat.",
   "Email_address_to_send_offline_messages": "Email Address to Send Offline Messages",
@@ -1933,6 +1965,7 @@
   "error-password-policy-not-met-oneLowercase": "Password does not meet the server's policy of at least one lowercase character",
   "error-password-policy-not-met-oneNumber": "Password does not meet the server's policy of at least one numerical character",
   "error-password-policy-not-met-oneSpecial": "Password does not meet the server's policy of at least one special character",
+  "Please_go_to_the_Administration_page_then_Livechat_Facebook": "Please go to the Administration page then Omnichannel > Facebook",
   "error-password-policy-not-met-oneUppercase": "Password does not meet the server's policy of at least one uppercase character",
   "error-password-policy-not-met-repeatingCharacters": "Password not not meet the server's policy of forbidden repeating characters (you have too many of the same characters next to each other)",
   "error-password-same-as-current": "Entered password same as current password",
@@ -2101,6 +2134,7 @@
   "FEDERATION_Test_Setup": "Test setup",
   "FEDERATION_Test_Setup_Error": "Could not find your server using your setup, please review your settings.",
   "FEDERATION_Test_Setup_Success": "Your federation setup is working and other servers can find you!",
+  "Retry_Count": "Retry Count",
   "FEDERATION_Unique_Id": "Unique ID",
   "FEDERATION_Unique_Id_Description": "This is your federation unique ID, used to identify your peer on the mesh.",
   "Federation_Matrix": "Federation V2",
@@ -2312,9 +2346,12 @@
   "Graphql_Enabled": "GraphQL Enabled",
   "Graphql_Subscription_Port": "GraphQL Subscription Port",
   "Grid_view": "Grid View",
+  "Snippet_Messages": "Snippet Messages",
   "Group": "Group",
   "Group_by": "Group by",
   "Group_by_Type": "Group by Type",
+  "snippet-message": "Snippet Message",
+  "snippet-message_description": "Permission to create snippet message",
   "Group_discussions": "Group discussions",
   "Group_favorites": "Group favorites",
   "Group_mentions_disabled_x_members": "Group mentions `@all` and `@here` have been disabled for rooms with more than __total__ members.",
@@ -2759,6 +2796,7 @@
   "LDAP_Authentication_UserDN": "User DN",
   "LDAP_Authentication_UserDN_Description": "The LDAP user that performs user lookups to authenticate other users when they sign in. <br/>This is typically a service account created specifically for third-party integrations. Use a fully qualified name, such as `cn=Administrator,cn=Users,dc=Example,dc=com`.",
   "LDAP_Avatar_Field": "User Avatar Field",
+  "You_have_to_set_an_API_token_first_in_order_to_use_the_integration": "You have to set an API token first in order to use the integration.",
   "LDAP_Avatar_Field_Description": " Which field will be used as *avatar* for users. Leave empty to use `thumbnailPhoto` first and `jpegPhoto` as fallback.",
   "LDAP_Background_Sync": "Background Sync",
   "LDAP_Background_Sync_Avatars": "Avatar Background Sync",
@@ -3310,7 +3348,9 @@
   "Message_TimeFormat_Description": "See also: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
   "Message_too_long": "Message too long",
   "Message_UserId": "User Id",
+  "Message_view_mode_info": "This changes the amount of space messages take up on screen.",
   "Message_VideoRecorderEnabled": "Video Recorder Enabled",
+  "MessageBox_view_mode": "MessageBox View Mode",
   "Message_VideoRecorderEnabledDescription": "Requires 'video/webm' files to be an accepted media type within 'File Upload' settings.",
   "messages": "messages",
   "Messages": "Messages",
@@ -3502,6 +3542,7 @@
   "None": "None",
   "Nonprofit": "Nonprofit",
   "Not_authorized": "Not authorized",
+  "Normal": "Normal",
   "Not_Available": "Not Available",
   "Not_enough_data": "Not enough data",
   "Not_following": "Not following",
@@ -5093,7 +5134,9 @@
   "user-generate-access-token_description": "Permission for users to generate access tokens",
   "UserData_EnableDownload": "Enable User Data Download",
   "UserData_FileSystemPath": "System Path (Exported Files)",
+  "view-livechat-facebook": "View Omnichannel Facebook",
   "UserData_FileSystemZipPath": "System Path (Compressed File)",
+  "view-livechat-facebook_description": "Permission to view Omnichannel Facebook",
   "UserData_MessageLimitPerRequest": "Message Limit per Request",
   "UserData_ProcessingFrequency": "Processing Frequency (Minutes)",
   "UserDataDownload": "User Data Download",
@@ -5190,6 +5233,7 @@
   "videoconf-ring-users_description": "Permission to ring other users when calling",
   "Video_record": "Video record",
   "Videos": "Videos",
+  "View_mode": "View Mode",
   "View_All": "View All Members",
   "View_channels": "View Channels",
   "view-agent-canned-responses": "View Agent Canned Responses",