Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 9 additions & 14 deletions web/sdk/admin/views/users/details/security/block-user.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,18 @@ import {
useMutation,
useTransport,
} from "@connectrpc/connect-query";
import {
AdminServiceQueries,
FrontierServiceQueries,
} from "@raystack/proton/frontier";
import { FrontierServiceQueries } from "@raystack/proton/frontier";
import { useQueryClient } from "@tanstack/react-query";
import { handleConnectError } from "~/utils/error";
import { useTerminology } from "../../../../hooks/useTerminology";

type ButtonColorType = ComponentProps<typeof Button>["color"];

type SearchUsersQueryData = {
users: Array<{
type GetUserQueryData = {
user?: {
id: string;
state?: string;
}>;
};
};

export const BlockUserDialog = () => {
Expand All @@ -36,20 +33,18 @@ export const BlockUserDialog = () => {

const optimisticUpdateState = useCallback(
(state: string) => {
queryClient.setQueryData<SearchUsersQueryData>(
queryClient.setQueryData<GetUserQueryData>(
createConnectQueryKey({
schema: AdminServiceQueries.searchUsers,
schema: FrontierServiceQueries.getUser,
transport,
input: { query: { search: user?.id || "" } },
input: { id: user?.id || "" },
cardinality: "finite",
}),
oldData => {
if (!oldData) return oldData;
if (!oldData?.user) return oldData;
return {
...oldData,
users: oldData.users.map(u =>
u.id === user?.id ? { ...u, state } : u,
),
user: { ...oldData.user, state },
};
},
);
Expand Down
8 changes: 4 additions & 4 deletions web/sdk/admin/views/users/details/user-details.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { UserDetailsLayout } from "./layout";
import { UserProvider } from "./user-context";
import { useQuery } from "@connectrpc/connect-query";
import type { User } from "@raystack/proton/frontier";
import { AdminServiceQueries } from "@raystack/proton/frontier";
import { FrontierServiceQueries } from "@raystack/proton/frontier";
import { UserDetailsSecurityContent } from "./security/security";
import { useTerminology } from "../../../hooks/useTerminology";

Expand Down Expand Up @@ -35,8 +35,8 @@ interface UserDetailsByUserIdProps {
export const UserDetailsByUserId = ({ userId, currentPath, onNavigate }: UserDetailsByUserIdProps) => {
const t = useTerminology();
const { data, isLoading, refetch } = useQuery(
AdminServiceQueries.searchUsers,
{ query: { search: userId } },
FrontierServiceQueries.getUser,
{ id: userId },
{
enabled: !!userId,
staleTime: 0,
Expand All @@ -45,7 +45,7 @@ export const UserDetailsByUserId = ({ userId, currentPath, onNavigate }: UserDet
retryDelay: 1000,
},
);
const user = data?.users?.[0];
const user = data?.user;

if (isLoading) {
return (
Expand Down
Loading