From 4caf97cf479cd13ab0a708f016dcf2bdb3f09e83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Soulas?= <soulascedric@gmail.com>
Date: Mon, 1 Jul 2024 11:40:30 +0200
Subject: [PATCH] feat(admin-react): remove subscription v1 menu items and
 improve organism wording

---
 .../(list)/check-legal-information/page.tsx   |  2 +-
 .../(admin)/subscriptions/(list)/layout.tsx   | 26 ++++++-------------
 .../subscriptions/(list)/up-to-date/page.tsx  |  2 +-
 .../subscriptions/(list)/validated/page.tsx   |  2 +-
 .../src/components/header/Header.tsx          |  2 +-
 5 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/packages/reva-admin-react/src/app/(admin)/subscriptions/(list)/check-legal-information/page.tsx b/packages/reva-admin-react/src/app/(admin)/subscriptions/(list)/check-legal-information/page.tsx
index b901bcdf9..9ca89e34a 100644
--- a/packages/reva-admin-react/src/app/(admin)/subscriptions/(list)/check-legal-information/page.tsx
+++ b/packages/reva-admin-react/src/app/(admin)/subscriptions/(list)/check-legal-information/page.tsx
@@ -63,7 +63,7 @@ const ValidatedSubscriptionRequestsPage = () => {
     subscriptionRequestPage &&
     getLegalVerificationPendingSubscriptionRequestsStatus === "success" && (
       <SearchList
-        title="Maisons-mères à vérifier"
+        title="Comptes administrateur à vérifier"
         searchFilter={searchFilter}
         searchResultsPage={subscriptionRequestPage}
       >
diff --git a/packages/reva-admin-react/src/app/(admin)/subscriptions/(list)/layout.tsx b/packages/reva-admin-react/src/app/(admin)/subscriptions/(list)/layout.tsx
index 883e35e64..6ee245118 100644
--- a/packages/reva-admin-react/src/app/(admin)/subscriptions/(list)/layout.tsx
+++ b/packages/reva-admin-react/src/app/(admin)/subscriptions/(list)/layout.tsx
@@ -81,14 +81,10 @@ const SubscriptionsLayout = ({ children }: { children: ReactNode }) => {
     if (showLegalMenuItems) {
       return [
         menuItem(
-          "Anciennes inscriptions à vérifier",
-          hrefSideMenu("pending"),
-          currentPathname,
-        ),
-        menuItem(
-          "Anciennes inscriptions refusées",
-          hrefSideMenu("rejected"),
+          "Inscriptions à vérifier",
+          hrefSideMenu("pending-v2"),
           currentPathname,
+          subscriptionCountByStatus?.PENDING_SUBSCRIPTION,
         ),
         menuItem(
           "Inscriptions refusées",
@@ -96,26 +92,21 @@ const SubscriptionsLayout = ({ children }: { children: ReactNode }) => {
           currentPathname,
           subscriptionCountByStatus?.REJECTED_SUBSCRIPTION,
         ),
+
         menuItem(
-          "Inscriptions à vérifier",
-          hrefSideMenu("pending-v2"),
-          currentPathname,
-          subscriptionCountByStatus?.PENDING_SUBSCRIPTION,
-        ),
-        menuItem(
-          "Maisons-mères à vérifier",
+          "Comptes administrateur à vérifier",
           hrefSideMenu("check-legal-information"),
           currentPathname,
           subscriptionCountByStatus?.PENDING_LEGAL_VERIFICATION,
         ),
         menuItem(
-          "Maisons-mères non actualisées",
+          "Comptes administrateur incomplets",
           hrefSideMenu("validated"),
           currentPathname,
           subscriptionCountByStatus?.NEED_LEGAL_VERIFICATION,
         ),
         menuItem(
-          "Maisons-mères vérifiées",
+          "Comptes administrateur vérifiés",
           hrefSideMenu("up-to-date"),
           currentPathname,
           subscriptionCountByStatus?.APPROVED,
@@ -137,12 +128,11 @@ const SubscriptionsLayout = ({ children }: { children: ReactNode }) => {
   return (
     <div className="flex flex-col flex-1 md:flex-row gap-10 md:gap-0">
       <SideMenu
-        className="flex-shrink-0 flex-grow-0 md:basis-[372px]"
+        className="flex-shrink-0 flex-grow-0 md:basis-[420px]"
         align="left"
         burgerMenuButtonText="Inscriptions"
         sticky
         fullHeight
-        title="Inscriptions"
         items={items}
       />
       <div className="mt-3 w-full">{children}</div>
diff --git a/packages/reva-admin-react/src/app/(admin)/subscriptions/(list)/up-to-date/page.tsx b/packages/reva-admin-react/src/app/(admin)/subscriptions/(list)/up-to-date/page.tsx
index 96011d907..bcc25825e 100644
--- a/packages/reva-admin-react/src/app/(admin)/subscriptions/(list)/up-to-date/page.tsx
+++ b/packages/reva-admin-react/src/app/(admin)/subscriptions/(list)/up-to-date/page.tsx
@@ -60,7 +60,7 @@ const ValidatedSubscriptionRequestsPage = () => {
     subscriptionRequestPage &&
     getLegalVerificationPendingSubscriptionRequestsStatus === "success" && (
       <SearchList
-        title="Maisons-mères vérifiées"
+        title="Comptes administrateur vérifiés"
         searchFilter={searchFilter}
         searchResultsPage={subscriptionRequestPage}
       >
diff --git a/packages/reva-admin-react/src/app/(admin)/subscriptions/(list)/validated/page.tsx b/packages/reva-admin-react/src/app/(admin)/subscriptions/(list)/validated/page.tsx
index e9f32545d..202fec7fc 100644
--- a/packages/reva-admin-react/src/app/(admin)/subscriptions/(list)/validated/page.tsx
+++ b/packages/reva-admin-react/src/app/(admin)/subscriptions/(list)/validated/page.tsx
@@ -55,7 +55,7 @@ const ValidatedSubscriptionRequestsPage = () => {
     subscriptionRequestPage &&
     getValidatedSubscriptionRequestsStatus === "success" && (
       <SearchList
-        title="Maisons-mères non actualisées"
+        title="Comptes administrateur incomplets"
         searchFilter={searchFilter}
         searchResultsPage={subscriptionRequestPage}
       >
diff --git a/packages/reva-admin-react/src/components/header/Header.tsx b/packages/reva-admin-react/src/components/header/Header.tsx
index 81ab90eba..6dda1dd26 100644
--- a/packages/reva-admin-react/src/components/header/Header.tsx
+++ b/packages/reva-admin-react/src/components/header/Header.tsx
@@ -55,7 +55,7 @@ export const Header = () => {
               {
                 text: "Inscriptions",
                 linkProps: {
-                  href: "/subscriptions/pending",
+                  href: "/subscriptions/pending-v2",
                   target: "_self",
                 },
                 isActive: currentPathname.startsWith("/subscriptions"),