refactor(web): simplify users hooks API

web/src/components/users/FirstUser.jsx

@@ -25,12 +25,7 @@ import { Table, Thead, Tr, Th, Tbody, Td } from "@patternfly/react-table";
 import { useNavigate } from "react-router-dom";
 import { RowActions, ButtonLink } from "~/components/core";
 import { _ } from "~/i18n";
-import {
-  useFirstUser,
-  useFirstUserChanges,
-  useFirstUserMutation,
-  useRemoveFirstUserMutation,
-} from "~/queries/users";
+import { useFirstUser, useFirstUserChanges, useRemoveFirstUserMutation } from "~/queries/users";
 
 const UserNotDefined = ({ actionCb }) => {
   return (
@@ -78,7 +73,7 @@ const UserData = ({ user, actions }) => {
 };
 
 export default function FirstUser() {
-  const { data: user } = useFirstUser();
+  const user = useFirstUser();
   const removeUser = useRemoveFirstUserMutation();
   const navigate = useNavigate();
 

web/src/components/users/FirstUserForm.jsx

@@ -83,7 +83,7 @@ const UsernameSuggestions = ({
 // close to the related input.
 // TODO: extract the suggestions logic.
 export default function FirstUserForm() {
-  const { data: firstUser } = useFirstUser();
+  const firstUser = useFirstUser();
   const setFirstUser = useFirstUserMutation();
   const client = useInstallerClient();
   const { cancellablePromise } = useCancellablePromise();

web/src/components/users/RootAuthMethods.jsx

@@ -59,9 +59,7 @@ export default function RootAuthMethods() {
   const [isSSHKeyFormOpen, setIsSSHKeyFormOpen] = useState(false);
   const [isPasswordFormOpen, setIsPasswordFormOpen] = useState(false);
 
-  const {
-    data: { password: isPasswordDefined, sshkey: sshKey },
-  } = useRootUser();
+  const { password: isPasswordDefined, sshkey: sshKey } = useRootUser();
 
   useRootUserChanges();
 

web/src/queries/users.ts

@@ -36,7 +36,10 @@ const firstUserQuery = () => ({
 /**
  * Hook that returns the first user.
  */
-const useFirstUser = () => useSuspenseQuery(firstUserQuery());
+const useFirstUser = () => {
+  const { data: firstUser } = useSuspenseQuery(firstUserQuery());
+  return firstUser;
+};
 
 /*
  * Hook that returns a mutation to change the first user.
@@ -113,7 +116,10 @@ const rootUserQuery = () => ({
   queryFn: () => fetch("/api/users/root").then((res) => res.json()),
 });
 
-const useRootUser = () => useSuspenseQuery(rootUserQuery());
+const useRootUser = () => {
+  const { data: rootUser } = useSuspenseQuery(rootUserQuery());
+  return rootUser;
+};
 
 /*
  * Hook that returns a mutation to change the root user configuration.