fix: [M3-7817] - Show correct status of Child Account Enabled column …

…for parent users (#10233) * Add a restricted check and flip the conditional result * Added changeset: Show correct status of Child Account Enabled column for parent users * Show accurate Child Account Access status without refresh * Add bug fix for loading table state
linode · Mar 8, 2024 · 0a6c1ad · 0a6c1ad
1 parent 433f3fd
commit 0a6c1ad
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/packages/manager/.changeset/pr-10233-upcoming-features-1709140962559.md b/packages/manager/.changeset/pr-10233-upcoming-features-1709140962559.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Show correct status of Child Account Enabled column for parent users ([#10233](https://github.com/linode/manager/pull/10233))
diff --git a/packages/manager/src/features/Users/UserPermissions.tsx b/packages/manager/src/features/Users/UserPermissions.tsx
@@ -720,6 +720,14 @@ class UserPermissions extends React.Component<CombinedProps, State> {
               variant: 'success',
             }
           );
+
+          // Refresh the data on /account/users/:currentUser:/grants/ so it is accurate.
+          this.props.queryClient.invalidateQueries([
+            'account',
+            'users',
+            'grants',
+            currentUsername,
+          ]);
         })
         .catch((errResponse) => {
           this.setState({

diff --git a/packages/manager/src/features/Users/UserRow.tsx b/packages/manager/src/features/Users/UserRow.tsx
@@ -52,7 +52,9 @@ export const UserRow = ({ onDelete, user }: Props) => {
       {showChildAccountAccessCol && (
         <Hidden lgDown>
           <TableCell>
-            {grants?.global?.child_account_access ? 'Enabled' : 'Disabled'}
+            {user.restricted && !grants?.global?.child_account_access
+              ? 'Disabled'
+              : 'Enabled'}
           </TableCell>
         </Hidden>
       )}

diff --git a/packages/manager/src/features/Users/UsersLandingTableBody.tsx b/packages/manager/src/features/Users/UsersLandingTableBody.tsx
@@ -18,6 +18,10 @@ interface Props {
 export const UsersLandingTableBody = (props: Props) => {
   const { error, isLoading, numCols, onDelete, users } = props;
 
+  if ((isLoading && !users) || (isLoading && users?.length === 0)) {
+    return <TableRowEmpty colSpan={numCols} />;
+  }
+
   if (isLoading) {
     return <TableRowLoading columns={numCols} rows={1} />;
   }
@@ -26,13 +30,10 @@ export const UsersLandingTableBody = (props: Props) => {
     return <TableRowError colSpan={numCols} message={error[0].reason} />;
   }
 
-  if (!users || users.length === 0) {
-    return <TableRowEmpty colSpan={numCols} />;
-  }
-
   return (
+    // eslint-disable-next-line react/jsx-no-useless-fragment
     <>
-      {users.map((user) => (
+      {users?.map((user) => (
         <UserRow key={user.username} onDelete={onDelete} user={user} />
       ))}
     </>