Merge pull request 'Nico / 4-Feb-2026' (#60) from nico/4-feb-26 into staggingweb

Reviewed-on: http://wibugit.wibudev.com/wibu/desa-darmasaba/pulls/60
This commit is contained in:
2026-02-04 11:49:22 +08:00
9 changed files with 207 additions and 17 deletions

View File

@@ -19,19 +19,27 @@ function Content({ kategoriBuku }: { kategoriBuku: string }) {
const searchQuery = searchParams.get('search') || '';
const router = useTransitionRouter()
// Convert kebab-case back to original category name format
// This reverses the transformation done in layoutTabs: item.name.toLowerCase().replace(/\s+/g, '-')
const convertKebabCaseToOriginal = (kebabStr: string): string => {
// Replace hyphens with spaces
return kebabStr.replace(/-/g, ' ');
};
const decodedKategoriBuku = decodeURIComponent(kategoriBuku);
const originalKategoriName = convertKebabCaseToOriginal(decodedKategoriBuku);
const loadData = useCallback(async (searchQuery: string = '', page: number = 1) => {
try {
setIsLoading(true);
const currentKategoriFilter = decodedKategoriBuku.toLowerCase() === 'semua' ? '' : decodedKategoriBuku;
const currentKategoriFilter = decodedKategoriBuku.toLowerCase() === 'semua' ? '' : originalKategoriName;
await state.dataPerpustakaan.findMany.load(page, 3, searchQuery, currentKategoriFilter);
setCurrentPage(page);
setTotalPages(state.dataPerpustakaan.findMany.totalPages);
} finally {
setIsLoading(false);
}
}, [state.dataPerpustakaan.findMany, decodedKategoriBuku]);
}, [state.dataPerpustakaan.findMany, originalKategoriName, decodedKategoriBuku]);
useShallowEffect(() => {
loadData(searchQuery);

View File

@@ -123,7 +123,7 @@ const getWorkStatus = (day: string, currentTime: string): { status: string; mess
let workHoursMessage = "";
if (["Senin", "Selasa", "Rabu", "Kamis"].includes(day)) {
workHoursMessage = "07:30 - 15:10";
workHoursMessage = "07:30 - 15:30";
} else if (day === "Jumat") {
workHoursMessage = "07:30 - 12:00";
}