diff --git a/src/smart-components/access-management/users-and-user-groups/user-groups/edit-user-group/EditUserGroupServiceAccounts.tsx b/src/smart-components/access-management/users-and-user-groups/user-groups/edit-user-group/EditUserGroupServiceAccounts.tsx index 4231db48d..890830baf 100644 --- a/src/smart-components/access-management/users-and-user-groups/user-groups/edit-user-group/EditUserGroupServiceAccounts.tsx +++ b/src/smart-components/access-management/users-and-user-groups/user-groups/edit-user-group/EditUserGroupServiceAccounts.tsx @@ -1,9 +1,8 @@ import { EmptyState, EmptyStateBody, EmptyStateHeader, EmptyStateIcon, Pagination } from '@patternfly/react-core'; -import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'; +import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { DataView, DataViewState, DataViewTable, DataViewToolbar, useDataViewPagination, useDataViewSelection } from '@patternfly/react-data-view'; import { useDispatch, useSelector } from 'react-redux'; import { fetchServiceAccountsForGroup } from '../../../../../redux/actions/group-actions'; -import { RBACStore } from '../../../../../redux/store'; import { mappedProps } from '../../../../../helpers/shared/helpers'; import { fetchServiceAccounts } from '../../../../../redux/actions/service-account-actions'; import useChrome from '@redhat-cloud-services/frontend-components/useChrome'; @@ -54,7 +53,11 @@ const reducer = ({ serviceAccountReducer }: { serviceAccountReducer: ServiceAcco offset: serviceAccountReducer.offset, }); -const EditGroupServiceAccountsTable: React.FunctionComponent = ({ groupId, onChange, initialServiceAccountIds }) => { +const EditGroupServiceAccountsTable: React.FunctionComponent = ({ + groupId, + onChange, + initialServiceAccountIds, +}) => { const dispatch = useDispatch(); const pagination = useDataViewPagination({ perPage: 20 }); const { page, perPage, onSetPage, onPerPageSelect } = pagination; @@ -99,10 +102,6 @@ const EditGroupServiceAccountsTable: React.FunctionComponent ({ - groupServiceAccounts: state.groupReducer?.selectedGroup?.serviceAccounts?.data || [], - })); - const fetchData = useCallback( async (apiProps: { count: number; limit: number; offset: number; orderBy: string }) => { if (groupId) { diff --git a/src/smart-components/access-management/users-and-user-groups/user-groups/edit-user-group/EditUserGroupUsers.tsx b/src/smart-components/access-management/users-and-user-groups/user-groups/edit-user-group/EditUserGroupUsers.tsx index 7b0b17ee3..a8cc9b482 100644 --- a/src/smart-components/access-management/users-and-user-groups/user-groups/edit-user-group/EditUserGroupUsers.tsx +++ b/src/smart-components/access-management/users-and-user-groups/user-groups/edit-user-group/EditUserGroupUsers.tsx @@ -1,5 +1,5 @@ import { EmptyState, EmptyStateBody, EmptyStateHeader, EmptyStateIcon, Pagination } from '@patternfly/react-core'; -import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'; +import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { DataView, DataViewState, DataViewTable, DataViewToolbar, useDataViewPagination, useDataViewSelection } from '@patternfly/react-data-view'; import { useDispatch, useSelector } from 'react-redux'; import { RBACStore } from '../../../../../redux/store'; @@ -71,9 +71,8 @@ const EditGroupUsersTable: React.FunctionComponent = ( onSelect(true, initialSelectedUsers); }, [initialUserIds]); - const { users, groupUsers, totalCount, isLoading } = useSelector((state: RBACStore) => ({ + const { users, totalCount, isLoading } = useSelector((state: RBACStore) => ({ users: state.userReducer?.users?.data || [], - groupUsers: state.groupReducer?.selectedGroup?.members?.data || [], totalCount: state.userReducer?.users?.meta?.count, isLoading: state.userReducer?.isUserDataLoading, }));