From 0e2b947ce468f1a53a46ebf043ef76ae9d918081 Mon Sep 17 00:00:00 2001 From: Douglas Fabris Date: Wed, 7 Oct 2020 14:52:07 -0300 Subject: [PATCH 1/7] [FIX] Missing "Bio" in user's profile view (#19166) --- app/lib/server/functions/getFullUserData.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/lib/server/functions/getFullUserData.js b/app/lib/server/functions/getFullUserData.js index 9dec322a8dde..7eb7b2e96431 100644 --- a/app/lib/server/functions/getFullUserData.js +++ b/app/lib/server/functions/getFullUserData.js @@ -15,6 +15,7 @@ const defaultFields = { utcOffset: 1, type: 1, active: 1, + bio: 1, reason: 1, statusText: 1, avatarETag: 1, From 9697dd338f80e14a5b7b9edc4f4666ae3fa8eff9 Mon Sep 17 00:00:00 2001 From: gabriellsh <40830821+gabriellsh@users.noreply.github.com> Date: Wed, 7 Oct 2020 14:56:06 -0300 Subject: [PATCH 2/7] [FIX] Omnichannel: triggers page not rendering (#19134) --- client/omnichannel/triggers/TriggersTable.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/omnichannel/triggers/TriggersTable.js b/client/omnichannel/triggers/TriggersTable.js index f59f0900faa7..b10534e1c69e 100644 --- a/client/omnichannel/triggers/TriggersTable.js +++ b/client/omnichannel/triggers/TriggersTable.js @@ -1,5 +1,5 @@ -import { Table, Callout, Icon } from '@rocket.chat/fuselage'; -import { useMutableCallback, Button } from '@rocket.chat/fuselage-hooks'; +import { Table, Callout, Icon, Button } from '@rocket.chat/fuselage'; +import { useMutableCallback } from '@rocket.chat/fuselage-hooks'; import React, { useState, memo, useMemo } from 'react'; import GenericTable from '../../components/GenericTable'; From 8fce6e9cde69d76447ae5be38e95a165dc2ff9c1 Mon Sep 17 00:00:00 2001 From: Renato Becker Date: Wed, 7 Oct 2020 14:57:33 -0300 Subject: [PATCH 3/7] [FIX] VisitorAutoComplete component (#19133) --- ee/client/audit/VisitorAutoComplete.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/client/audit/VisitorAutoComplete.js b/ee/client/audit/VisitorAutoComplete.js index e54c933240a6..1e9a033933da 100644 --- a/ee/client/audit/VisitorAutoComplete.js +++ b/ee/client/audit/VisitorAutoComplete.js @@ -8,7 +8,7 @@ const query = (term = '') => ({ selector: JSON.stringify({ term }) }); const VisitorAutoComplete = React.memo((props) => { const [filter, setFilter] = useState(''); const { data } = useEndpointDataExperimental('livechat/visitors.autocomplete', useMemo(() => query(filter), [filter])); - const options = useMemo(() => (data && data.items.map((user) => ({ value: user.username, label: user.name }))) || [], [data]); + const options = useMemo(() => (data && data.items.map((user) => ({ value: user._id, label: user.name }))) || [], [data]); return Date: Wed, 7 Oct 2020 14:58:39 -0300 Subject: [PATCH 4/7] [FIX] Admin Sidebar overflowing (#19101) --- client/account/sidebarItems.js | 6 +++++- client/admin/sidebarItems.js | 5 ++++- client/components/basic/Sidebar.js | 2 +- client/omnichannel/routes.js | 6 +++++- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/client/account/sidebarItems.js b/client/account/sidebarItems.js index 1c4d0b386e52..13a74fbbcba2 100644 --- a/client/account/sidebarItems.js +++ b/client/account/sidebarItems.js @@ -1,9 +1,13 @@ +import { HTML } from 'meteor/htmljs'; + import { hasPermission } from '../../app/authorization/client'; import { createTemplateForComponent } from '../reactAdapters'; import { settings } from '../../app/settings'; import { createSidebarItems } from '../helpers/createSidebarItems'; -createTemplateForComponent('accountFlex', () => import('./AccountSidebar')); +createTemplateForComponent('accountFlex', () => import('./AccountSidebar'), { + renderContainerView: () => HTML.DIV({ style: 'height: 100%; position: relative;' }), // eslint-disable-line new-cap +}); export const { registerSidebarItem: registerAccountSidebarItem, diff --git a/client/admin/sidebarItems.js b/client/admin/sidebarItems.js index ec3f2fa381ea..b6ddc658015c 100644 --- a/client/admin/sidebarItems.js +++ b/client/admin/sidebarItems.js @@ -1,10 +1,13 @@ +import { HTML } from 'meteor/htmljs'; import { Meteor } from 'meteor/meteor'; import { hasPermission, hasRole } from '../../app/authorization/client'; import { createTemplateForComponent } from '../reactAdapters'; import { createSidebarItems } from '../helpers/createSidebarItems'; -createTemplateForComponent('adminFlex', () => import('./sidebar/AdminSidebar')); +createTemplateForComponent('adminFlex', () => import('./sidebar/AdminSidebar'), { + renderContainerView: () => HTML.DIV({ style: 'height: 100%; position: relative;' }), // eslint-disable-line new-cap +}); export const { registerSidebarItem: registerAdminSidebarItem, diff --git a/client/components/basic/Sidebar.js b/client/components/basic/Sidebar.js index c0eb249aacc2..fa963cd50db2 100644 --- a/client/components/basic/Sidebar.js +++ b/client/components/basic/Sidebar.js @@ -6,7 +6,7 @@ import { useTranslation } from '../../contexts/TranslationContext'; import { useRoutePath } from '../../contexts/RouterContext'; import { ActionButton } from './Buttons/ActionButton'; -const Sidebar = ({ children, ...props }) => +const Sidebar = ({ children, ...props }) => {children} ; diff --git a/client/omnichannel/routes.js b/client/omnichannel/routes.js index 3f6769ae5793..ce1de888c520 100644 --- a/client/omnichannel/routes.js +++ b/client/omnichannel/routes.js @@ -1,7 +1,11 @@ +import { HTML } from 'meteor/htmljs'; + import { createTemplateForComponent } from '../reactAdapters'; import { createRouteGroup } from '../helpers/createRouteGroup'; -createTemplateForComponent('omnichannelFlex', () => import('./sidebar/OmnichannelSidebar')); +createTemplateForComponent('omnichannelFlex', () => import('./sidebar/OmnichannelSidebar'), { + renderContainerView: () => HTML.DIV({ style: 'height: 100%; position: relative;' }), // eslint-disable-line new-cap +}); export const registerOmnichannelRoute = createRouteGroup('omnichannel', '/omnichannel', () => import('./OmnichannelRouter')); From 4786af53515be54501302c4cc475f09eb8310ae6 Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Fri, 9 Oct 2020 00:07:20 -0300 Subject: [PATCH 5/7] [FIX] Performance issues when using new Oplog implementation (#19181) Co-authored-by: Diego Sampaio --- app/models/server/models/_oplogHandle.ts | 2 +- mongodb.aug.d.ts | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 mongodb.aug.d.ts diff --git a/app/models/server/models/_oplogHandle.ts b/app/models/server/models/_oplogHandle.ts index eb0e7eba779a..811a8fb9db3c 100644 --- a/app/models/server/models/_oplogHandle.ts +++ b/app/models/server/models/_oplogHandle.ts @@ -105,7 +105,7 @@ class OplogHandle { this.stream = oplogCollection.find(oplogSelector, { tailable: true, - // awaitData: true, + awaitData: true, }).stream(); // Prevent warning about many listeners, we add 11 diff --git a/mongodb.aug.d.ts b/mongodb.aug.d.ts new file mode 100644 index 000000000000..450b440065b2 --- /dev/null +++ b/mongodb.aug.d.ts @@ -0,0 +1,8 @@ +import 'mongodb'; + +declare module 'mongodb' { + // eslint-disable-next-line @typescript-eslint/interface-name-prefix + export interface FindOneOptions { + awaitData?: boolean; + } +} From d6b7675683ed2ddeaf1dc7edd3c64d7072bbdd86 Mon Sep 17 00:00:00 2001 From: Douglas Fabris Date: Fri, 9 Oct 2020 00:11:01 -0300 Subject: [PATCH 6/7] [FIX] Adding missing custom fields translation in my account's profile (#19179) --- client/components/CustomFieldsForm.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/components/CustomFieldsForm.js b/client/components/CustomFieldsForm.js index b1f0836f0bf9..8f83aa0adebe 100644 --- a/client/components/CustomFieldsForm.js +++ b/client/components/CustomFieldsForm.js @@ -16,7 +16,7 @@ const CustomTextInput = ({ name, required, minLength, maxLength, setState, state }, [state, required, minLength, t]); return useMemo(() => - {name} + {t(name)} setState(e.currentTarget.value)}/> @@ -30,7 +30,7 @@ const CustomSelect = ({ name, required, options, setState, state, className }) = const verify = useMemo(() => (!state.length && required ? t('Field_required') : ''), [required, state.length, t]); return useMemo(() => - {name} + {t(name)}