Skip to content

fix: [M3-7811] - Fix Users & Grants query filtering on user_type #10230

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

Merged
mjac0bs merged 4 commits into from
Feb 27, 2024
Merged

fix: [M3-7811] - Fix Users & Grants query filtering on user_type #10230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cf92756
Use an API supported simple filter on one user_type
Feb 26, 2024
c70ed23
Filter on child accounts for proxy user too
Feb 26, 2024
38d7902
Add changeset
Feb 26, 2024
8147a97
Use correct number of columns for Business Partner table
Feb 26, 2024
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
5 changes: 5 additions & 0 deletions packages/manager/.changeset/pr-10230-upcoming-features-1708982538087.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@linode/manager": Upcoming Features
---

Fix Users & Grants filtering error based on `user_type` ([#10230](https://github.com/linode/manager/pull/10230))
15 changes: 6 additions & 9 deletions packages/manager/src/features/Users/UsersLanding.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,16 @@ export const UsersLanding = () => {
const pagination = usePagination(1, 'account-users');
const order = useOrder();

const showProxyUserTable =
flags.parentChildAccountAccess &&
(profile?.user_type === 'child' || profile?.user_type === 'proxy');

const usersFilter: Filter = {
['+order']: order.order,
['+order_by']: order.orderBy,
['user_type']: showProxyUserTable ? 'child' : undefined,
};

if (flags.parentChildAccountAccess) {
usersFilter['user_type'] = { '+neq': 'proxy' };
}

const { data: users, error, isLoading, refetch } = useAccountUsers({
filters: usersFilter,
params: {
Expand All @@ -61,10 +62,6 @@ export const UsersLanding = () => {

const isRestrictedUser = profile?.restricted;

const showProxyUserTable =
flags.parentChildAccountAccess &&
(profile?.user_type === 'child' || profile?.user_type === 'proxy');

const showChildAccountAccessCol = Boolean(
flags.parentChildAccountAccess && profile?.user_type === 'parent'
);
Expand Down Expand Up @@ -100,7 +97,7 @@ export const UsersLanding = () => {
<UsersLandingTableBody
error={proxyUserError}
isLoading={isLoadingProxyUser}
numCols={numCols}
numCols={4}
onDelete={handleDelete}
users={proxyUser?.data}
/>
Expand Down