From e31856737c7c6859d5d2da6f9e69f64a56043b98 Mon Sep 17 00:00:00 2001 From: eric Date: Fri, 4 Oct 2024 11:47:18 +0300 Subject: [PATCH 1/2] Updated facilities/index.js lines 107 - 117 --- pages/facilities/index.js | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pages/facilities/index.js b/pages/facilities/index.js index c235226..63c9eb3 100644 --- a/pages/facilities/index.js +++ b/pages/facilities/index.js @@ -31,6 +31,8 @@ function FacilityHome(props) { const router = useRouter() + + console.log({props}) // const facilities = props?.data?.results const filters = props?.filters @@ -102,17 +104,17 @@ function FacilityHome(props) { })() // FilterOptions - const countyFilterOptions = filters['county']?.map(({ id, name }) => ({ value: id, label: name })) - const subCountyFilterOptions = filters['sub_county']?.map(({ id, name }) => ({ value: id, label: name })) - const constituencyFilterOptions = filters['constituency']?.map(({ id, name }) => ({ value: id, label: name })) - const wardFilterOptions = filters['ward']?.map(({ id, name }) => ({ value: id, label: name })) - const facilityTypeFilterOptions = filters['facility_type']?.map(({ id, name }) => ({ value: id, label: name })) - const facilityTypeDetailsFilterOptions = filters['facility_type_details']?.map(({ id, name }) => ({ value: id, label: name })) - const kephLevelFilterOptions = filters['keph_level']?.map(({ id, name }) => ({ value: id, label: name })) - const ownerTypeFilterOptions = filters['owner_type']?.map(({ id, name }) => ({ value: id, label: name })) - const ownerFilterOptions = filters['owner']?.map(({ id, name }) => ({ value: id, label: name })) + const countyFilterOptions = filters?.county?.map(({ id, name }) => ({ value: id, label: name })) + const subCountyFilterOptions = filters?.sub_county?.map(({ id, name }) => ({ value: id, label: name })) + const constituencyFilterOptions = filters?.constituency?.map(({ id, name }) => ({ value: id, label: name })) + const wardFilterOptions = filters?.ward?.map(({ id, name }) => ({ value: id, label: name })) + const facilityTypeFilterOptions = filters?.facility_type?.map(({ id, name }) => ({ value: id, label: name })) + const facilityTypeDetailsFilterOptions = filters?.facility_type_details?.map(({ id, name }) => ({ value: id, label: name })) + const kephLevelFilterOptions = filters?.keph_level?.map(({ id, name }) => ({ value: id, label: name })) + const ownerTypeFilterOptions = filters?.owner_type?.map(({ id, name }) => ({ value: id, label: name })) + const ownerFilterOptions = filters?.owner?.map(({ id, name }) => ({ value: id, label: name })) // const serviceFilterOptions = filters['service']?.map(({ id, name }) => ({ value: id, label: name })) - const operationStatusFilterOptions = filters['operation_status']?.map(({ id, name }) => ({ value: id, label: name })) + const operationStatusFilterOptions = filters?.operation_status?.map(({ id, name }) => ({ value: id, label: name })) @@ -1358,6 +1360,7 @@ export async function getServerSideProps(ctx) { const page = ctx?.query?.page + const { response: user } = await getUserDetails(token, `${process.env.NEXT_PUBLIC_API_URL}/rest-auth/user/`) const userGroup = user?.groups[0]?.id @@ -1373,7 +1376,7 @@ export async function getServerSideProps(ctx) { let url = nextURL ?? previousURL ?? defaultURL - const filters = await fetchFilters(token) + // const filters = await fetchFilters(token) // console.log({filters}) @@ -1461,7 +1464,7 @@ export async function getServerSideProps(ctx) { facilities: facilities?.results ?? null, next: facilities?.next ?? null, previous: facilities?.previous ?? null, - filters, + filters: await fetchFilters(token), path: ctx.asPath || '/facilities', current_url, current_page: facilities?.current_page ?? null, From f8e19d251b406afb97738a8cfcbb187084f93cd9 Mon Sep 17 00:00:00 2001 From: eric Date: Fri, 4 Oct 2024 11:49:19 +0300 Subject: [PATCH 2/2] Updated facilities/index.js getServerSideProps --- pages/facilities/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pages/facilities/index.js b/pages/facilities/index.js index 63c9eb3..1789cfe 100644 --- a/pages/facilities/index.js +++ b/pages/facilities/index.js @@ -32,7 +32,7 @@ function FacilityHome(props) { const router = useRouter() - console.log({props}) + // const facilities = props?.data?.results const filters = props?.filters @@ -1376,7 +1376,7 @@ export async function getServerSideProps(ctx) { let url = nextURL ?? previousURL ?? defaultURL - // const filters = await fetchFilters(token) + const filters = await fetchFilters(token) // console.log({filters}) @@ -1432,7 +1432,7 @@ export async function getServerSideProps(ctx) { - console.log({ url }) + // console.log({ url }) facilities = (await (await fetch(url, { headers: { @@ -1464,7 +1464,7 @@ export async function getServerSideProps(ctx) { facilities: facilities?.results ?? null, next: facilities?.next ?? null, previous: facilities?.previous ?? null, - filters: await fetchFilters(token), + filters, path: ctx.asPath || '/facilities', current_url, current_page: facilities?.current_page ?? null,