@@ -92,8 +80,7 @@ export default function SolicitudCard({
- Pueblo:{' '}
- {towns.find((town) => town.id === caso.town_id)?.name || ''}
+ Pueblo: {getTownById(caso.town_id)?.name || ''}
)}
@@ -172,22 +159,20 @@ export default function SolicitudCard({
- {session && session.user && session.user.email && session.user.email === email && !isEdit && (
+ {canEdit && showEdit && (
Editar
)}
- {isHref && (
+ {showLink && (
- {button.text}
+ Ver solicitud
)}
diff --git a/src/context/TownProvider.tsx b/src/context/TownProvider.tsx
index 1e7ede0e..d7c5922b 100644
--- a/src/context/TownProvider.tsx
+++ b/src/context/TownProvider.tsx
@@ -1,16 +1,20 @@
'use client';
-import React, { createContext, ReactNode, useContext } from 'react';
+
+import { useQuery } from '@tanstack/react-query';
+import { townService } from '@/lib/service';
import { Town } from '@/types/Town';
-const TownsContext = createContext
([]);
+export const useTowns = () => {
+ const {
+ data: towns,
+ isLoading,
+ error,
+ } = useQuery({
+ queryKey: ['towns'],
+ queryFn: () => townService.getTowns(),
+ });
-type TownsProviderProps = {
- children: ReactNode;
- towns: Town[];
-};
+ const getTownById = (id: number) => towns?.find((t) => t.id === id);
-export const TownsProvider: React.FC = ({ children, towns }) => {
- return {children};
+ return { towns: towns ?? [], isLoading, error, getTownById };
};
-
-export const useTowns = () => useContext(TownsContext);
diff --git a/src/helpers/format.js b/src/helpers/format.js
index 2f96a9cc..d156714d 100644
--- a/src/helpers/format.js
+++ b/src/helpers/format.js
@@ -1,7 +1,7 @@
import SolicitudCard from '@/components/SolicitudCard';
import ReactDOMServer from 'react-dom/server';
-export const getMarkerBySolicitud = (solicitud, towns) => {
+export const getMarkerBySolicitud = (solicitud) => {
// TODO think if possible getLatLng from a given location
if (!solicitud.latitude || !solicitud.longitude) {
return null;
@@ -10,7 +10,7 @@ export const getMarkerBySolicitud = (solicitud, towns) => {
return {
id: solicitud.id,
coordinates: [solicitud.longitude, solicitud.latitude],
- descriptionHTML: getMarkerDescriptionBySolicitudAndTowns(solicitud, towns),
+ descriptionHTML: getMarkerDescriptionBySolicitudAndTowns(solicitud),
color: getMarkerColorBySolicitud(solicitud),
width: '400px',
};
@@ -28,8 +28,10 @@ export const getMarkerColorBySolicitud = (solicitud) => {
return '#000000';
}
};
-export const getMarkerDescriptionBySolicitudAndTowns = (solicitud, towns) => {
- return ReactDOMServer.renderToString();
+export const getMarkerDescriptionBySolicitudAndTowns = (solicitud) => {
+ return ReactDOMServer.renderToString(
+ ,
+ );
};
export const getMarkerByPuntoDeRecogida = (ptoDeRecogida) => {
diff --git a/src/lib/service.ts b/src/lib/service.ts
index 9d17ac96..f0aebddf 100644
--- a/src/lib/service.ts
+++ b/src/lib/service.ts
@@ -21,6 +21,17 @@ export const helpRequestService = {
if (error) throw error;
return data;
},
+ async getOne(id: number) {
+ const supabase = await getSupabaseClient();
+ const { data, error } = await supabase
+ .from('help_requests')
+ .select('*')
+ .eq('id', id)
+ .eq('type', 'necesita')
+ .single();
+ if (error) throw error;
+ return data;
+ },
async getRequestsByUser(user_id: string | undefined) {
if (user_id === undefined) return [];
@@ -88,6 +99,12 @@ export const townService = {
async create(townName: string) {
return await supabase.from('towns').insert({ name: townName }).select('id');
},
+ async getTowns() {
+ const supabase = await getSupabaseClient();
+ const { data, error } = await supabase.from('towns').select();
+ if (error) throw error;
+ return data;
+ },
async createIfNotExists(townName: string) {
const response = await this.getByName(townName);
if (response.error) return response;
@@ -217,15 +234,6 @@ export const mapService = {
},
};
-export const townsService = {
- async getTowns() {
- const supabase = await getSupabaseClient();
- const { data, error } = await supabase.from('towns').select();
- if (error) throw error;
- return data;
- },
-};
-
// Add this function to test the connection
export const testSupabaseConnection = async () => {
try {
diff --git a/src/lib/supabase/middleware.ts b/src/lib/supabase/middleware.ts
index 9814ec19..03a11751 100644
--- a/src/lib/supabase/middleware.ts
+++ b/src/lib/supabase/middleware.ts
@@ -29,21 +29,8 @@ export async function updateSession(request: NextRequest) {
// supabase.auth.getUser(). A simple mistake could make it very hard to debug
// issues with users being randomly logged out.
- const {
- data: { user },
- } = await supabase.auth.getUser();
const url = request.nextUrl.clone();
- if (
- !user &&
- (request.nextUrl.pathname.startsWith('/ofertas') || request.nextUrl.pathname.startsWith('/solicitudes'))
- ) {
- // no user, no access to their offers or requests. Redirect to log in
-
- url.pathname = '/auth';
- return NextResponse.redirect(url);
- }
-
if (request.nextUrl.pathname === '/casos-activos') {
url.pathname = '/casos-activos/solicitudes';
return NextResponse.redirect(url);