From b202a2c4dd025e119975c771f8cd711fa6aec9df Mon Sep 17 00:00:00 2001
From: mjac0bs <mjacobs@akamai.com>
Date: Wed, 20 Mar 2024 15:31:36 -0700
Subject: [PATCH 1/3] Use isInitialLoading for disabled query with restricted
 user

---
 packages/manager/src/features/Users/UsersLanding.tsx  |  4 ++--
 .../src/features/Users/UsersLandingTableBody.tsx      | 11 +++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/packages/manager/src/features/Users/UsersLanding.tsx b/packages/manager/src/features/Users/UsersLanding.tsx
index a8e5744c58d..4ab073b7c6a 100644
--- a/packages/manager/src/features/Users/UsersLanding.tsx
+++ b/packages/manager/src/features/Users/UsersLanding.tsx
@@ -49,7 +49,7 @@ export const UsersLanding = () => {
     ['user_type']: showProxyUserTable ? 'child' : undefined,
   };
 
-  const { data: users, error, isLoading, refetch } = useAccountUsers({
+  const { data: users, error, isInitialLoading, refetch } = useAccountUsers({
     filters: usersFilter,
     params: {
       page: pagination.page,
@@ -162,7 +162,7 @@ export const UsersLanding = () => {
         <TableBody>
           <UsersLandingTableBody
             error={error}
-            isLoading={isLoading}
+            isLoading={isInitialLoading}
             numCols={numCols}
             onDelete={handleDelete}
             users={users?.data}
diff --git a/packages/manager/src/features/Users/UsersLandingTableBody.tsx b/packages/manager/src/features/Users/UsersLandingTableBody.tsx
index 84578c988bb..53aaaf3f5ee 100644
--- a/packages/manager/src/features/Users/UsersLandingTableBody.tsx
+++ b/packages/manager/src/features/Users/UsersLandingTableBody.tsx
@@ -18,10 +18,6 @@ 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} />;
   }
@@ -30,10 +26,13 @@ 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} />
       ))}
     </>

From 8e4cef2dbbba82a607105b639cfc99a48d578d63 Mon Sep 17 00:00:00 2001
From: mjac0bs <mjacobs@akamai.com>
Date: Wed, 20 Mar 2024 15:50:56 -0700
Subject: [PATCH 2/3] Add isInitialLoading to proxy table and add comment

---
 packages/manager/src/features/Users/UsersLanding.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/manager/src/features/Users/UsersLanding.tsx b/packages/manager/src/features/Users/UsersLanding.tsx
index 4ab073b7c6a..33bbb915719 100644
--- a/packages/manager/src/features/Users/UsersLanding.tsx
+++ b/packages/manager/src/features/Users/UsersLanding.tsx
@@ -49,6 +49,7 @@ export const UsersLanding = () => {
     ['user_type']: showProxyUserTable ? 'child' : undefined,
   };
 
+  // Since this query is disabled for restricted users, use isInitialLoading.
   const { data: users, error, isInitialLoading, refetch } = useAccountUsers({
     filters: usersFilter,
     params: {
@@ -59,10 +60,11 @@ export const UsersLanding = () => {
 
   const isRestrictedUser = profile?.restricted;
 
+  // Since this query is disabled for restricted users, use isInitialLoading.
   const {
     data: proxyUser,
     error: proxyUserError,
-    isLoading: isLoadingProxyUser,
+    isInitialLoading: isLoadingProxyUser,
   } = useAccountUsers({
     enabled:
       flags.parentChildAccountAccess && showProxyUserTable && !isRestrictedUser,

From e96018db5d352d01281613a64e2553afa1181396 Mon Sep 17 00:00:00 2001
From: mjac0bs <mjacobs@akamai.com>
Date: Wed, 20 Mar 2024 16:21:01 -0700
Subject: [PATCH 3/3] Added changeset: Loading state missing from Users &
 Grants table

---
 packages/manager/.changeset/pr-10303-fixed-1710976860713.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 packages/manager/.changeset/pr-10303-fixed-1710976860713.md

diff --git a/packages/manager/.changeset/pr-10303-fixed-1710976860713.md b/packages/manager/.changeset/pr-10303-fixed-1710976860713.md
new file mode 100644
index 00000000000..9a034ffd722
--- /dev/null
+++ b/packages/manager/.changeset/pr-10303-fixed-1710976860713.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Fixed
+---
+
+Loading state missing from Users & Grants table ([#10303](https://github.com/linode/manager/pull/10303))