Skip to content

Commit bf28433

Browse files
committed
自分とメモが表示されるのを修正
1 parent ac2fbdb commit bf28433

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

web/components/search/table.tsx

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"use client";
22
import type { User } from "common/types";
3-
import { useEffect, useState } from "react";
4-
import { useAll } from "~/api/user";
3+
import { useEffect, useMemo, useState } from "react";
4+
import { useAll, useMyID } from "~/api/user";
55
import { useModal } from "../common/modal/ModalProvider";
66
import { HumanListItem } from "../human/humanListItem";
77

@@ -10,22 +10,28 @@ export default function UserTable({ query }: { query: string }) {
1010
const {
1111
state: { data },
1212
} = useAll();
13-
13+
const { state } = useMyID();
1414
const [users, setUsers] = useState<User[] | null>(null);
1515

16+
const filteredData = useMemo(() => {
17+
return (
18+
data?.filter((item) => item.id !== state.data && item.id !== 0) ?? null
19+
);
20+
}, [data, state.data]);
21+
1622
useEffect(() => {
1723
function searchByUserName(query: string) {
18-
const filteredUsers = data?.filter((user) =>
24+
const filteredUsers = filteredData?.filter((user) =>
1925
user.name.toLowerCase().includes(query.toLowerCase()),
2026
);
2127
setUsers(filteredUsers || null);
2228
}
2329
if (!query) {
24-
setUsers(data);
30+
setUsers(filteredData);
2531
} else {
2632
searchByUserName(query);
2733
}
28-
}, [query, data]);
34+
}, [query, filteredData]);
2935

3036
return (
3137
<div>

web/hooks/useCustomizedSWR.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ export function useCustomizedSWR<T>(
7777
console.error(
7878
`useSWR: Schema Parse Error | in incoming data | at schema ${CACHE_KEY} | Error: ${result.error.message}`,
7979
);
80-
console.log("data:", data);
8180
}
8281
setState({
8382
data: data,

0 commit comments

Comments
 (0)