[1.0.0] #19

Merged
ashir merged 80 commits from dev into main 2026-04-30 18:37:18 +00:00
2 changed files with 10 additions and 14 deletions
Showing only changes of commit c6fbd0dc30 - Show all commits
+2 -2
View File
@@ -1,8 +1,8 @@
import apiClient from "@/api/client"; import apiClient from "@/api/client";
export const getNewsApi = async (page = 1, limit = 10) => { export const getNewsApi = async (page = 1, limit = 10, search = "") => {
const res = await apiClient.get( const res = await apiClient.get(
`/newsMedia/getAll?page=${page}&limit=${limit}`, `/newsMedia/getAll?page=${page}&limit=${limit}&search=${search}`,
); );
return res.data; return res.data;
}; };
+8 -12
View File
@@ -73,7 +73,7 @@ export default function NewsPage() {
const fetchAll = useCallback(async () => { const fetchAll = useCallback(async () => {
setLoading(true); setLoading(true);
try { try {
const res = await getNewsApi(currentPage, itemsPerPage); const res = await getNewsApi(currentPage, itemsPerPage, searchText);
setNews(res?.data || []); setNews(res?.data || []);
setTotalItems(res?.meta?.total || 0); setTotalItems(res?.meta?.total || 0);
@@ -82,18 +82,12 @@ export default function NewsPage() {
} finally { } finally {
setLoading(false); setLoading(false);
} }
}, [currentPage, itemsPerPage]); }, [currentPage, itemsPerPage, searchText]);
useEffect(() => { useEffect(() => {
fetchAll(); fetchAll();
}, [fetchAll]); }, [fetchAll]);
const filteredNews = news.filter(
(item) =>
item.Headline?.toLowerCase().includes(searchText.toLowerCase()) ||
item.Author?.toLowerCase().includes(searchText.toLowerCase()),
);
const totalPages = Math.ceil(totalItems / itemsPerPage); const totalPages = Math.ceil(totalItems / itemsPerPage);
function handleChange(e: any) { function handleChange(e: any) {
@@ -171,8 +165,10 @@ export default function NewsPage() {
<Input <Input
placeholder="Filter headline..." placeholder="Filter headline..."
value={searchText} value={searchText}
onChange={(e) => setSearchText(e.target.value)} onChange={(e) => {
className="w-[250px] text-base" setSearchText(e.target.value);
setCurrentPage(1); // reset page
}}
/> />
<select <select
@@ -246,7 +242,7 @@ export default function NewsPage() {
<Loader2 className="h-8 w-8 animate-spin mx-auto text-primary" /> <Loader2 className="h-8 w-8 animate-spin mx-auto text-primary" />
</TableCell> </TableCell>
</TableRow> </TableRow>
) : filteredNews.length === 0 ? ( ) : news.length === 0 ? (
<TableRow> <TableRow>
<TableCell <TableCell
colSpan={7} colSpan={7}
@@ -256,7 +252,7 @@ export default function NewsPage() {
</TableCell> </TableCell>
</TableRow> </TableRow>
) : ( ) : (
filteredNews.map((item) => ( news.map((item) => (
<TableRow key={item.Id} className="hover:bg-muted/50"> <TableRow key={item.Id} className="hover:bg-muted/50">
<TableCell className="font-mono text-xs"> <TableCell className="font-mono text-xs">
{item.Id} {item.Id}