Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

♻️ use server mainNewsletter route to reduce vercel API calls (NGC-1498) #810

Merged
merged 1 commit into from
Feb 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/app/(large-layout)/stats/_components/StatsContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
useCurrentMonthWebsites,
useGetSharedSimulationEvents,
} from '@/helpers/matomo'
import { useNumberSubscribers } from '@/hooks/useNumberSubscriber'
import { useMainNewsletter } from '@/hooks/useMainNewsletter'
import type { UseQueryResult } from '@tanstack/react-query'
import AcquisitionBlock from './content/AcquisitionBlock'
import MetabaseIframe from './content/MetabaseIframe'
Expand Down Expand Up @@ -70,7 +70,7 @@ export default function StatsContent() {
const currentMonthWebsites = useCurrentMonthWebsites()
const currentMonthSocials = useCurrentMonthSocials()
const allSharedSimulationEvents = useGetSharedSimulationEvents()
const allSubscribers = useNumberSubscribers()
const { data: mainNewsletter } = useMainNewsletter()

return (
<div>
Expand Down Expand Up @@ -127,7 +127,7 @@ export default function StatsContent() {
currentMonthIframeVisitsData,
]) => (
<AcquisitionBlock
allSubscribers={allSubscribers}
mainNewsletter={mainNewsletter}
allSharedSimulationEventsData={allSharedSimulationEventsData}
currentMonthWebsitesData={currentMonthWebsitesData}
currentMonthSocialsData={currentMonthSocialsData}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import Trans from '@/components/translation/Trans'
import Card from '@/design-system/layout/Card'
import { useLocale } from '@/hooks/useLocale'
import type { Newsletter } from '@/hooks/useMainNewsletter'
import { formatPercentage, formatValue } from '../utils/formatFigure'
import Sources from './Sources'

type Props = {
allSubscribers: any
mainNewsletter?: Newsletter
allSharedSimulationEventsData: any
currentMonthWebsitesData: any
currentMonthSocialsData: any
Expand All @@ -14,7 +15,7 @@ type Props = {
}

export default function AcquisitionBlock({
allSubscribers,
mainNewsletter,
allSharedSimulationEventsData,
currentMonthWebsitesData,
currentMonthSocialsData,
Expand All @@ -27,9 +28,11 @@ export default function AcquisitionBlock({
<div className="mt-4">
<div className="flex flex-row gap-4">
<Card className="flex-1">
<strong className="text-3xl">
{formatValue(allSubscribers?.data, locale)}
</strong>{' '}
{!!mainNewsletter && (
<strong className="text-3xl">
{formatValue(mainNewsletter.totalSubscribers, locale)}
</strong>
)}
<p className="mb-0 text-sm">
<Trans>inscrits à l'infolettre</Trans>
</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ import { useGetNewsletterSubscriptions } from '@/hooks/settings/useGetNewsletter
import { useSaveSimulation } from '@/hooks/simulation/useSaveSimulation'
import { useClientTranslation } from '@/hooks/useClientTranslation'
import { useLocale } from '@/hooks/useLocale'
import { useNumberSubscribers } from '@/hooks/useNumberSubscriber'
import { useMainNewsletter } from '@/hooks/useMainNewsletter'
import { useCurrentSimulation, useUser } from '@/publicodes-state'
import { formatEmail } from '@/utils/format/formatEmail'
import { trackEvent } from '@/utils/matomo/trackEvent'
import { captureException } from '@sentry/react'
import { useEffect, useRef } from 'react'
import type { SubmitHandler} from 'react-hook-form';
import type { SubmitHandler } from 'react-hook-form'
import { useForm as useReactHookForm } from 'react-hook-form'
import { twMerge } from 'tailwind-merge'
import Confirmation from './carbone/getResultsByEmail/Confirmation'
Expand Down Expand Up @@ -100,7 +100,7 @@ export default function GetResultsByEmail({
const { saveSimulation, isPending, isSuccess, isError, error } =
useSaveSimulation()

const { data: numberSubscribers } = useNumberSubscribers()
const { data: mainNewsletter } = useMainNewsletter()

const onSubmit: SubmitHandler<Inputs> = async (data) => {
// If the mutation is pending, we do nothing
Expand Down Expand Up @@ -175,7 +175,7 @@ export default function GetResultsByEmail({
</strong>
{t('comme {{numberSubscribers}} personnes.', {
numberSubscribers:
numberSubscribers?.toLocaleString(locale, {
mainNewsletter?.totalSubscribers.toLocaleString(locale, {
maximumFractionDigits: 0,
}) ?? '---',
})}
Expand Down
25 changes: 0 additions & 25 deletions src/app/api/get-newsletter-subscribers-number/route.ts

This file was deleted.

2 changes: 2 additions & 0 deletions src/constants/urls.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ export const AUTHENTICATION_URL = SERVER_URL + '/authentication/v1'

export const GROUP_URL = SERVER_URL + '/groups/v1'

export const NEWSLETTER_URL = SERVER_URL + '/newsletters/v1'

export const NORTHSTAR_RATING_URL = SERVER_URL + '/northstar-ratings/v1'

export const ORGANISATION_URL = SERVER_URL + '/organisations/v1'
Expand Down
6 changes: 3 additions & 3 deletions src/design-system/cms/NewslettersBlock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { subscribeToNewsletterBlog } from '@/constants/tracking/pages/newsletter
import { useGetNewsletterSubscriptions } from '@/hooks/settings/useGetNewsletterSubscriptions'
import { useUpdateUserSettings } from '@/hooks/settings/useUpdateUserSettings'
import { useLocale } from '@/hooks/useLocale'
import { useNumberSubscribers } from '@/hooks/useNumberSubscriber'
import { useMainNewsletter } from '@/hooks/useMainNewsletter'
import { useUser } from '@/publicodes-state'
import { formatEmail } from '@/utils/format/formatEmail'
import { trackEvent } from '@/utils/matomo/trackEvent'
Expand Down Expand Up @@ -50,7 +50,7 @@ function SuccessMessage() {
}

export default function NewslettersBlock() {
const { data: numberSubscribers } = useNumberSubscribers()
const { data: mainNewsletter } = useMainNewsletter()

const locale = useLocale()

Expand Down Expand Up @@ -143,7 +143,7 @@ export default function NewslettersBlock() {
<CheckIcon className="mr-2 h-4 w-4 stroke-green-500" />

<span className="text-sm text-gray-600">
{numberSubscribers?.toLocaleString(locale) ?? 0}{' '}
{mainNewsletter?.totalSubscribers.toLocaleString(locale) ?? 0}{' '}
<Trans>personnes inscrites</Trans>
</span>
</p>
Expand Down
21 changes: 21 additions & 0 deletions src/hooks/useMainNewsletter.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { keepPreviousData, useQuery } from '@tanstack/react-query'
import axios from 'axios'
import { LIST_MAIN_NEWSLETTER } from '../constants/brevo'
import { NEWSLETTER_URL } from '../constants/urls'

export type Newsletter = {
id: number
name: string
totalSubscribers: number
}

export function useMainNewsletter() {
return useQuery({
queryKey: ['mainNewsletter'],
queryFn: () =>
axios
.get<Newsletter>(`${NEWSLETTER_URL}/${LIST_MAIN_NEWSLETTER}`)
.then((res) => res.data),
placeholderData: keepPreviousData,
})
}
15 changes: 0 additions & 15 deletions src/hooks/useNumberSubscriber.ts

This file was deleted.

Loading