From 1178bb9d4d625cad539368a83d1badccc0ad8a09 Mon Sep 17 00:00:00 2001 From: Robin Monnier Date: Tue, 8 Oct 2024 08:32:57 +0200 Subject: [PATCH] fix: remove warnings (#1256) --- .eslintrc | 39 ------------------- app/(header-default)/carte/[slug]/page.tsx | 2 - .../sections/entreprise/dirigeant-content.tsx | 2 +- app/(header-default)/lp/agent-public/page.tsx | 4 +- utils/server-side-helper/app/get-session.ts | 9 +++-- 5 files changed, 7 insertions(+), 49 deletions(-) diff --git a/.eslintrc b/.eslintrc index 3b130a893..20dcd6550 100644 --- a/.eslintrc +++ b/.eslintrc @@ -6,45 +6,6 @@ "allow": ["warn", "error"] } ], - "import/order": [ - "warn", - { - "pathGroupsExcludedImportTypes": ["builtin"], - "pathGroups": [ - { - "group": "internal", - "pattern": "#clients/**" - }, - { - "group": "internal", - "pattern": "#components/**" - }, - { - "group": "internal", - "pattern": "#components-ui/**" - }, - { - "group": "internal", - "pattern": "#models/**" - }, - { - "group": "internal", - "pattern": "#public/*" - }, - { - "group": "internal", - "pattern": "#utils/*" - } - ], - "newlines-between": "never", - "groups": [ - "builtin", - "external", - "internal", - ["parent", "sibling", "index"] - ] - } - ], "@next/next/no-css-tags": "off", "@next/next/no-head-element": "off", "@next/next/no-html-link-for-pages": "off", diff --git a/app/(header-default)/carte/[slug]/page.tsx b/app/(header-default)/carte/[slug]/page.tsx index d6839d216..e10750772 100644 --- a/app/(header-default)/carte/[slug]/page.tsx +++ b/app/(header-default)/carte/[slug]/page.tsx @@ -8,7 +8,6 @@ import { getEtablissementWithLatLongFromSlug } from '#models/core/etablissement' import extractParamsAppRouter, { AppRouterProps, } from '#utils/server-side-helper/app/extract-params'; -import getSession from '#utils/server-side-helper/app/get-session'; export const generateMetadata = async ( props: AppRouterProps @@ -26,7 +25,6 @@ export const generateMetadata = async ( const EtablissementMapPage = async (props: AppRouterProps) => { const { slug } = extractParamsAppRouter(props); - const session = await getSession(); const etablissement = await getEtablissementWithLatLongFromSlug(slug); return ( diff --git a/app/(header-default)/dirigeants/[slug]/_component/sections/entreprise/dirigeant-content.tsx b/app/(header-default)/dirigeants/[slug]/_component/sections/entreprise/dirigeant-content.tsx index 87f3239b4..14aa7d1e8 100644 --- a/app/(header-default)/dirigeants/[slug]/_component/sections/entreprise/dirigeant-content.tsx +++ b/app/(header-default)/dirigeants/[slug]/_component/sections/entreprise/dirigeant-content.tsx @@ -39,7 +39,7 @@ export function DirigeantContent({ const defaultDenom = dirigeant.denomination || dirigeant.siren; //@ts-ignore infos.push([ - + → voir les dirigeants de {defaultDenom} , ]); diff --git a/app/(header-default)/lp/agent-public/page.tsx b/app/(header-default)/lp/agent-public/page.tsx index 4bcab0345..aaa0550fa 100644 --- a/app/(header-default)/lp/agent-public/page.tsx +++ b/app/(header-default)/lp/agent-public/page.tsx @@ -1,4 +1,3 @@ -import { IronSession } from 'iron-session'; import { Metadata } from 'next'; import { default as ButtonProConnect } from '#components-ui/button-pro-connect'; import Container from '#components-ui/container'; @@ -19,14 +18,13 @@ export const metadata: Metadata = { }, }; -const isLoggedInMessage = (session: IronSession | null) => ( +const isLoggedInMessage = (session: ISession | null) => (
Vous êtes connecté en tant que : {session?.user?.email}
); const LandingPageAgent = async (props: AppRouterProps) => { - const { pathFrom } = props.searchParams; const session = await getSession(); return ( diff --git a/utils/server-side-helper/app/get-session.ts b/utils/server-side-helper/app/get-session.ts index b3ba3c607..c802e859d 100644 --- a/utils/server-side-helper/app/get-session.ts +++ b/utils/server-side-helper/app/get-session.ts @@ -1,8 +1,9 @@ -import { getIronSession, IronSession } from 'iron-session'; -import { cookies } from 'next/headers'; import { ISession } from '#models/user/session'; import { sessionOptions } from '#utils/session'; +import { getIronSession } from 'iron-session'; +import { cookies } from 'next/headers'; -export default async function getSession(): Promise | null> { - return await getIronSession(cookies(), sessionOptions); +export default async function getSession(): Promise { + const ironSession = await getIronSession(cookies(), sessionOptions); + return { ...ironSession }; }