Rahaf/SweetHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: enrich reservation pages with property details via GetRentPropertyById
All checks were successful
Build frontend / build (push) Successful in 43s
Details

Browse Source
This commit is contained in:
Claw AI
2026-04-05 18:40:09 +00:00
parent 149058ddfc
commit 2346f518ce
2 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/owner/reservations/page.js
View File

@ -22,6 +22,7 @@ import {
} from 'lucide-react'; } from 'lucide-react';
import toast, { Toaster } from 'react-hot-toast'; import toast, { Toaster } from 'react-hot-toast';
import AuthService from '../../services/AuthService'; import AuthService from '../../services/AuthService';
import { getRentProperty } from '../../utils/api';
const API_BASE = process.env.NEXT_PUBLIC_API_URL || 'https://45.93.137.91.nip.io/api'; const API_BASE = process.env.NEXT_PUBLIC_API_URL || 'https://45.93.137.91.nip.io/api';
@ -266,9 +267,26 @@ export default function OwnerReservationRequestsPage() {
if (!res.ok) throw new Error(`HTTP ${res.status}`); if (!res.ok) throw new Error(`HTTP ${res.status}`);
const json = await res.json(); const json = await res.json();
const list = json.data || json || []; let list = json.data || json || [];
setReservations(Array.isArray(list) ? list : []); if (!Array.isArray(list)) list = [];
setFiltered(Array.isArray(list) ? list : []);
// Enrich each reservation with property details
const enriched = await Promise.all(
list.map(async (r) => {
if (!r.property && r.propertyId) {
try {
const propRes = await getRentProperty(r.propertyId);
r.property = propRes?.data || propRes || null;
} catch (e) {
console.warn('Failed to load property', r.propertyId);
}
}
return r;
})
);
setReservations(enriched);
setFiltered(enriched);
} catch (err) { } catch (err) {
console.error('Failed to load owner reservations:', err); console.error('Failed to load owner reservations:', err);
toast.error('فشل تحميل طلبات الحجز'); toast.error('فشل تحميل طلبات الحجز');

24
app/reservations/page.js
View File

@ -19,6 +19,7 @@ import {
} from 'lucide-react'; } from 'lucide-react';
import toast, { Toaster } from 'react-hot-toast'; import toast, { Toaster } from 'react-hot-toast';
import AuthService from '../services/AuthService'; import AuthService from '../services/AuthService';
import { getRentProperty } from '../utils/api';
const API_BASE = process.env.NEXT_PUBLIC_API_URL || 'https://45.93.137.91.nip.io/api'; const API_BASE = process.env.NEXT_PUBLIC_API_URL || 'https://45.93.137.91.nip.io/api';
@ -226,9 +227,26 @@ export default function UserReservationsPage() {
if (!res.ok) throw new Error(`HTTP ${res.status}`); if (!res.ok) throw new Error(`HTTP ${res.status}`);
const json = await res.json(); const json = await res.json();
const list = json.data || json || []; let list = json.data || json || [];
setReservations(Array.isArray(list) ? list : []); if (!Array.isArray(list)) list = [];
setFiltered(Array.isArray(list) ? list : []);
// Enrich each reservation with property details
const enriched = await Promise.all(
list.map(async (r) => {
if (!r.property && r.propertyId) {
try {
const propRes = await getRentProperty(r.propertyId);
r.property = propRes?.data || propRes || null;
} catch (e) {
console.warn('Failed to load property', r.propertyId);
}
}
return r;
})
);
setReservations(enriched);
setFiltered(enriched);
} catch (err) { } catch (err) {
console.error('Failed to load reservations:', err); console.error('Failed to load reservations:', err);
toast.error('فشل تحميل الحجوزات'); toast.error('فشل تحميل الحجوزات');