Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Is a member of][User groups] 'Refresh' button functionality #297

Merged
merged 1 commit into from
Mar 7, 2024
Merged

[Is a member of][User groups] 'Refresh' button functionality #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion src/components/MemberOf/MemberOfUserGroups.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ function filterUserGroupsData<Type extends TypeWithCN>(

interface MemberOfUserGroupsProps {
user: Partial<User>;
isUserDataLoading: boolean;
onRefreshUserData: () => void;
}

const MemberOfUserGroups = (props: MemberOfUserGroupsProps) => {
Expand Down Expand Up @@ -85,6 +87,10 @@ const MemberOfUserGroups = (props: MemberOfUserGroupsProps) => {
}
}, [fullUserGroupsQuery]);

React.useEffect(() => {
fullUserGroupsQuery.refetch();
}, [props.user]);

const [groupsNamesSelected, setGroupsNamesSelected] = React.useState<
string[]
>([]);
Expand Down Expand Up @@ -121,6 +127,10 @@ const MemberOfUserGroups = (props: MemberOfUserGroupsProps) => {
};
const availableUserGroupsItems: AvailableItems[] = parseAvailableItems();

// Buttons functionality
// - Refresh
const isRefreshButtonEnabled = !props.isUserDataLoading;

// 'Add' function
// TODO: Adapt to work with real data
const onAddUserGroup = (items: AvailableItems[]) => {
Expand All @@ -145,7 +155,8 @@ const MemberOfUserGroups = (props: MemberOfUserGroupsProps) => {
<MemberOfToolbarUserGroups
searchText={searchValue}
onSearchTextChange={setSearchValue}
refreshButtonEnabled={true}
refreshButtonEnabled={isRefreshButtonEnabled}
onRefreshButtonClick={props.onRefreshUserData}
deleteButtonEnabled={someItemSelected}
onDeleteButtonClick={() => setShowDeleteModal(true)}
addButtonEnabled={true}
Expand Down
10 changes: 9 additions & 1 deletion src/pages/ActiveUsers/UserMemberOf.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ const UserMemberOf = (props: PropsToUserMemberOf) => {
}
}, [userData, userQuery.isFetching]);

const onRefreshUserData = () => {
userQuery.refetch();
};

// 'User groups' length to show in tab badge
const [userGroupsLength, setUserGroupLength] = React.useState(0);

Expand Down Expand Up @@ -454,7 +458,11 @@ const UserMemberOf = (props: PropsToUserMemberOf) => {
</TabTitleText>
}
>
<MemberOfUserGroups user={user} />
<MemberOfUserGroups
user={user}
isUserDataLoading={userQuery.isFetching}
onRefreshUserData={onRefreshUserData}
/>
</Tab>
<Tab
eventKey={1}
Expand Down
Loading