From 7aafe48906ebfd0a37495b66548751325c507deb Mon Sep 17 00:00:00 2001 From: Naumov Alexey Date: Mon, 7 Jun 2021 15:29:47 +0300 Subject: [PATCH] feat(core-connections): CB-1037 remove unnecessary optional chaining --- .../ConnectionAccess/ConnectionAccessGrantedList.tsx | 4 +++- .../ConnectionForm/ConnectionAccess/getFilteredSubjects.ts | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/webapp/packages/core-connections/src/ConnectionForm/ConnectionAccess/ConnectionAccessGrantedList.tsx b/webapp/packages/core-connections/src/ConnectionForm/ConnectionAccess/ConnectionAccessGrantedList.tsx index fe71d2559b..f3003e9499 100644 --- a/webapp/packages/core-connections/src/ConnectionForm/ConnectionAccess/ConnectionAccessGrantedList.tsx +++ b/webapp/packages/core-connections/src/ConnectionForm/ConnectionAccess/ConnectionAccessGrantedList.tsx @@ -69,7 +69,9 @@ export const ConnectionAccessGrantedList: React.FC = observer(function Co const translate = useTranslate(); const [selectedSubjects] = useState>(() => observable(new Map())); const [filterState] = useState(() => observable({ filterValue: '' })); - const subjectsSelected = useMemo(() => computed(() => Array.from(selectedSubjects.values()).some(Boolean)), []); + const subjectsSelected = useMemo(() => computed( + () => Array.from(selectedSubjects.values()).some(Boolean) + ), [selectedSubjects]); const revoke = useCallback(() => { const subjectsToRevoke = []; diff --git a/webapp/packages/core-connections/src/ConnectionForm/ConnectionAccess/getFilteredSubjects.ts b/webapp/packages/core-connections/src/ConnectionForm/ConnectionAccess/getFilteredSubjects.ts index b3679f8b7c..5fd9d160bc 100644 --- a/webapp/packages/core-connections/src/ConnectionForm/ConnectionAccess/getFilteredSubjects.ts +++ b/webapp/packages/core-connections/src/ConnectionForm/ConnectionAccess/getFilteredSubjects.ts @@ -14,7 +14,7 @@ import type { AdminRoleInfo, AdminUserInfoFragment } from '@cloudbeaver/core-sdk */ export function getFilteredUsers(users: AdminUserInfoFragment[], filter: string): AdminUserInfoFragment[] { return users - .filter(user => user.userId?.toLowerCase().includes(filter.toLowerCase())) + .filter(user => user.userId.toLowerCase().includes(filter.toLowerCase())) .sort((a, b) => (a.userId).localeCompare(b.userId)); }