feat(admin-react): remove subscription v1 menu items and improve orga…

…nism wording
SocialGouv · Jul 1, 2024 · 4caf97c · 4caf97c
1 parent 056ff79
commit 4caf97c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 22 deletions.
diff --git a/...es/reva-admin-react/src/app/(admin)/subscriptions/(list)/check-legal-information/page.tsx b/...es/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
@@ -81,41 +81,32 @@ 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",
           hrefSideMenu("rejected-v2"),
           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
@@ -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
@@ -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
@@ -55,7 +55,7 @@ export const Header = () => {
               {
                 text: "Inscriptions",
                 linkProps: {
-                  href: "/subscriptions/pending",
+                  href: "/subscriptions/pending-v2",
                   target: "_self",
                 },
                 isActive: currentPathname.startsWith("/subscriptions"),