Browse Source

Merge branch 'v4454_fixes_after_tests' into 'release/2.3.beta'

v4454 Corrections après tests michel

See merge request opentalent/app_nuxt3!21
Olivier Massot 2 năm trước cách đây
mục cha
commit
32a27e12b1
31 tập tin đã thay đổi với 172 bổ sung134 xóa
  1. 6 0
      assets/css/global.scss
  2. 3 0
      assets/css/vuetify.scss
  3. 2 1
      components/Layout/Header/HomeBtn.vue
  4. 11 13
      components/Layout/Header/Menu.vue
  5. 2 5
      components/Layout/Header/Notification.vue
  6. 2 2
      components/Layout/SubHeader/Breadcrumbs.vue
  7. 3 4
      components/Layout/SubHeader/PersonnalizedList.vue
  8. 36 9
      components/Ui/Input/DateRangePicker.vue
  9. 1 0
      lang/fr.json
  10. 1 0
      nuxt.config.ts
  11. 5 3
      pages/subscription.vue
  12. BIN
      public/favicon.ico
  13. 1 1
      services/layout/menuBuilder/abstractMenuBuilder.ts
  14. 4 1
      services/layout/menuBuilder/websiteListMenuBuilder.ts
  15. 2 2
      tests/units/services/layout/menuBuilder/abstractMenuBuilder.test.ts
  16. 7 7
      tests/units/services/layout/menuBuilder/accessMenuBuilder.test.ts
  17. 15 15
      tests/units/services/layout/menuBuilder/accountMenuBuilder.test.ts
  18. 7 7
      tests/units/services/layout/menuBuilder/admin2iosMenuBuilder.test.ts
  19. 2 2
      tests/units/services/layout/menuBuilder/agendaMenuBuilder.test.ts
  20. 8 8
      tests/units/services/layout/menuBuilder/billingMenuBuilder.test.ts
  21. 3 3
      tests/units/services/layout/menuBuilder/communicationMenuBuilder.test.ts
  22. 9 9
      tests/units/services/layout/menuBuilder/configurationMenuBuilder.test.ts
  23. 17 17
      tests/units/services/layout/menuBuilder/cotisationsMenuBuilder.test.ts
  24. 1 1
      tests/units/services/layout/menuBuilder/donorsMenuBuilder.test.ts
  25. 6 6
      tests/units/services/layout/menuBuilder/educationalMenuBuilder.test.ts
  26. 1 1
      tests/units/services/layout/menuBuilder/equipmentMenuBuilder.test.ts
  27. 1 1
      tests/units/services/layout/menuBuilder/medalsMenuBuilder.test.ts
  28. 3 3
      tests/units/services/layout/menuBuilder/myAccessesMenuBuilder.test.ts
  29. 4 4
      tests/units/services/layout/menuBuilder/myFamilyMenuBuilder.test.ts
  30. 6 6
      tests/units/services/layout/menuBuilder/parametersMenuBuilder.test.ts
  31. 3 3
      tests/units/services/layout/menuBuilder/statsMenuBuilder.test.ts

+ 6 - 0
assets/css/global.scss

@@ -49,3 +49,9 @@ header .v-toolbar__content {
     }
   }
 }
+
+
+// A supprimer quand l'issue  https://github.com/vuetifyjs/vuetify-loader/issues/273 sera règlée
+.v-application {
+  font-size: 0.9rem;
+}

+ 3 - 0
assets/css/vuetify.scss

@@ -4,5 +4,8 @@
  * @see https://next.vuetifyjs.com/en/features/sass-variables/#basic-usage
  */
 
+// Non utilisé tant que l'issue https://github.com/vuetifyjs/vuetify-loader/issues/273 n'est pas règlée
 @use 'vuetify/settings' with (
+  $font-size-root: 0.9rem,
+  $input-font-size: 0.9rem
 );

+ 2 - 1
components/Layout/Header/HomeBtn.vue

@@ -14,9 +14,10 @@
 <script setup lang="ts">
   import {ref} from "@vue/reactivity";
   import {useDisplay} from "vuetify";
+  import UrlUtils from "~/services/utils/urlUtils";
 
   const runtimeConfig = useRuntimeConfig()
-  const homeUrl = runtimeConfig.baseUrlAdminLegacy
+  const homeUrl = UrlUtils.join(runtimeConfig.baseUrlAdminLegacy, '#', 'dashboard')
 
   const { mdAndUp } = useDisplay()
 

+ 11 - 13
components/Layout/Header/Menu.vue

@@ -54,18 +54,16 @@ header principal (configuration, paramètres du compte...)
                   :href="!isInternalLink(child) ? child.to : undefined"
                   :to="isInternalLink(child) ? child.to : undefined"
               >
-                <v-list-item-title class="d-flex align-center">
-                    <span v-if="child.icon" class="pr-2">
-                      <v-avatar v-if="menu.icon.avatarId || child.icon.avatarByDefault" size="30" >
-                        <UiImage :id="child.icon.avatarId" :defaultImage="child.icon.avatarByDefault" :width="30" />
-                      </v-avatar>
-                      <v-icon v-else class="on-primary" size="small">
-                        {{ child.icon.name }}
-                      </v-icon>
-                    </span>
-
-                  <span>{{ translateLabel ? $t(child.label) : child.label }}</span>
-                </v-list-item-title>
+                <span v-if="child.icon" class="pr-2 d-flex align-center">
+                  <v-avatar v-if="menu.icon.avatarId || child.icon.avatarByDefault" size="30" >
+                    <UiImage :id="child.icon.avatarId" :defaultImage="child.icon.avatarByDefault" :width="30" />
+                  </v-avatar>
+                  <v-icon v-else class="on-primary" size="small">
+                    {{ child.icon.name }}
+                  </v-icon>
+                </span>
+
+                <span>{{ translateLabel ? $t(child.label) : child.label }}</span>
               </v-list-item>
 
             </template>
@@ -120,7 +118,7 @@ const btn = ref(null)
 
 <style scoped lang="scss">
   :deep(.v-btn .v-icon) {
-    font-size: 16px !important;
+    font-size: 1rem !important;
   }
 
   .v-list {

+ 2 - 5
components/Layout/Header/Notification.vue

@@ -36,12 +36,9 @@
           <v-list-item
               v-for="(notification, index) in notifications"
               :key="index"
-              :class="`${notification.notificationUsers.length === 0 ? 'unread' : ''}`"
+              :class="'list_item py-3' + `${notification.notificationUsers.length === 0 ? ' unread' : ''}`"
           >
-            <v-list-item-title
-                class="list_item mt-2 mb-2"
-                v-text="getMessage(notification)"
-            />
+            <span class="">{{ getMessage(notification) }}</span>
 
             <template #append>
               <v-icon

+ 2 - 2
components/Layout/SubHeader/Breadcrumbs.vue

@@ -19,7 +19,7 @@ const items: ComputedRef<Array<AnyJson>> = computed(() => {
 
   crumbs.push({
     title: i18n.t('welcome'),
-    href: runtimeConfig.baseUrlAdminLegacy
+    href: UrlUtils.join(runtimeConfig.baseUrlAdminLegacy, '#', 'dashboard')
   })
 
   const pathPart: Array<string> = UrlUtils.split(router.currentRoute.value.path)
@@ -27,7 +27,7 @@ const items: ComputedRef<Array<AnyJson>> = computed(() => {
   let path: string = ''
 
   pathPart.forEach((part) => {
-    path = `${path}/${part}`
+    path = UrlUtils.join(path, part)
 
     const match = router.resolve(path)
 

+ 3 - 4
components/Layout/SubHeader/PersonnalizedList.vue

@@ -36,9 +36,7 @@
               :href="getListURL(item)"
               exact
             >
-              <v-list-item-title>
-                {{item.label}} - <strong>{{item.menuKey}}</strong>
-              </v-list-item-title>
+              <strong>{{item.menuKey}}</strong> - {{item.label}}
             </v-list-item>
           </v-list>
         </v-card-text>
@@ -54,6 +52,7 @@ import {useEntityFetch} from "~/composables/data/useEntityFetch";
 import {ComputedRef, Ref, ref} from "@vue/reactivity";
 import {AnyJson} from "~/types/data";
 import ApiResource from "~/models/ApiResource";
+import UrlUtils from "~/services/utils/urlUtils";
 
 const btn: Ref = ref(null)
 
@@ -88,7 +87,7 @@ const runtimeConfig = useRuntimeConfig()
 const homeUrl: string = runtimeConfig.baseUrlAdminLegacy
 
 const getListURL = (list: PersonalizedList) => {
-  return `${homeUrl}/${list.entity}/list/${list.id}`
+  return UrlUtils.join(homeUrl, '#', list.entity ?? '', 'list', list.id ?? '')
 }
 </script>
 

+ 36 - 9
components/Ui/Input/DateRangePicker.vue

@@ -81,19 +81,46 @@ const dateRangePickerAltPosition = (el: HTMLElement) => {
 }
 </script>
 
-<style scoped lang="scss">
-  :deep(div[role="textbox"]) {
-    height: 100% !important;
-    max-height: 100% !important;
-  }
+<style lang="scss">
 
-  :deep(.dp__input_wrap) {
-    height: 100% !important;
-    max-height: 100% !important;
+  // @see https://vue3datepicker.com/customization/theming/
+  // [!] Sass variables overriding does not work in scoped mode
+  .dp__theme_light, .dp__theme_dark {
+    --dp-background-color: #ffffff;
+    --dp-text-color: #212121;
+    --dp-hover-color: #f3f3f3;
+    --dp-hover-text-color: #212121;
+    --dp-hover-icon-color: #959595;
+    --dp-primary-color: rgb(var(--v-theme-primary)) !important;
+    --dp-primary-text-color: rgb(var(--v-theme-on-primary)) !important;
+    --dp-secondary-color: rgb(var(--v-theme-neutral-strong)) !important;
+    --dp-border-color: #ddd;
+    --dp-menu-border-color: #ddd;
+    --dp-border-color-hover: #aaaeb7;
+    --dp-disabled-color: #f6f6f6;
+    --dp-scroll-bar-background: #f3f3f3;
+    --dp-scroll-bar-color: #959595;
+    --dp-success-color: rgb(var(--v-theme-success)) !important;
+    --dp-success-color-disabled: rgb(var(--v-theme-neutral-strong)) !important;
+    --dp-icon-color: #959595;
+    --dp-danger-color: #ff6f60;
+    --dp-highlight-color: rgba(25, 118, 210, 0.1);
   }
 
-  :deep(.date-range-picker-input) {
+  .date-range-picker {
+    div[role="textbox"] {
+      height: 100% !important;
+      max-height: 100% !important;
+    }
+
+    .dp__input_wrap {
+      height: 100% !important;
+      max-height: 100% !important;
+    }
+
+    .date-range-picker-input {
       height: 100% !important;
       max-height: 100% !important;
+    }
   }
 </style>

+ 1 - 0
lang/fr.json

@@ -329,6 +329,7 @@
   "students_params": "Suivi des étudiants",
   "education_params": "Enseignements",
   "bills_params": "Facturation",
+  "intangibleListMenuKey": "Produits",
   "secure_params": "Sécurité",
   "back_to_dashboard": "Quittez les paramètres",
   "what_type_of_contact_do_you_want_to_create": "Quel type de contact souhaitez-vous créer ?",

+ 1 - 0
nuxt.config.ts

@@ -113,6 +113,7 @@ export default defineNuxtConfig({
             drop: process.env.DEBUG ? [] : ['console', 'debugger'],
         },
         ssr: {
+            // with ssr enabled, this config is required to load vuetify properly
             noExternal: ['vuetify']
         },
         server : {

+ 5 - 3
pages/subscription.vue

@@ -337,17 +337,19 @@ Page 'Mon abonnement'
       border: solid 1px rgb(var(--v-theme-on-primary));
 
       .v-row:nth-child(1) {
-        background: rgb(var(--v-theme-primary));
+        //background: rgb(var(--v-theme-neutral-soft));
         height: 64px;
-        color: rgb(var(--v-theme-on-primary));
-        font-size: 15px;
+        color: rgb(var(--v-theme-on-neutral-soft));
+        //font-size: 15px;
         font-weight: bold;
+        border-bottom: solid 1px rgb(var(--v-theme-neutral));
       }
 
       .v-row:nth-child(2) {
         height: 230px;
         display: flex;
         justify-content: center;
+        border-bottom: solid 1px rgb(var(--v-theme-neutral));
       }
 
       .v-row:nth-child(3) {

BIN
public/favicon.ico


+ 1 - 1
services/layout/menuBuilder/abstractMenuBuilder.ts

@@ -87,7 +87,7 @@ abstract class AbstractMenuBuilder implements MenuBuilder {
     switch(type) {
       case MENU_LINK_TYPE.V1:
         const v1BaseURL = this.runtimeConfig.baseUrlAdminLegacy || this.runtimeConfig.public.baseUrlAdminLegacy
-        url = UrlUtils.join(v1BaseURL, to)
+        url = UrlUtils.join(v1BaseURL, '#', to)
         break;
       case MENU_LINK_TYPE.EXTERNAL:
         url = UrlUtils.prependHttps(to)

+ 4 - 1
services/layout/menuBuilder/websiteListMenuBuilder.ts

@@ -15,12 +15,15 @@ export default class WebsiteListMenuBuilder extends AbstractMenuBuilder {
   build(): MenuGroup | null {
     const children: MenuItems = []
 
+    // Add organization website
     if (this.organizationProfile.website) {
       const url = this.organizationProfile.website + '/typo3'
       children.push(this.createItem(this.organizationProfile.name as string, undefined, url, MENU_LINK_TYPE.EXTERNAL))
     }
+
+    // Add parents websites
     _.each(this.organizationProfile.parents, (parent:any) => {
-      if(parent.id != this.runtimeConfig.OPENTALENT_MANAGER_ID){
+      if (parent.id && parent.name && parent.website && parent.id != this.runtimeConfig.OPENTALENT_MANAGER_ID) {
         children.push(this.createItem(parent.name, undefined, parent.website, MENU_LINK_TYPE.EXTERNAL))
       }
     })

+ 2 - 2
tests/units/services/layout/menuBuilder/abstractMenuBuilder.test.ts

@@ -111,7 +111,7 @@ describe('createItem', () => {
 
         const item = menuBuilder.createItem('my_menu', undefined, '/my_page', MENU_LINK_TYPE.V1)
 
-        expect(item.to).toEqual('https://admin.opentalent.fr/my_page')
+        expect(item.to).toEqual('https://admin.opentalent.fr/#/my_page')
     })
 
     test('complete V1 links (client side)', () => {
@@ -122,7 +122,7 @@ describe('createItem', () => {
 
         const item = menuBuilder.createItem('my_menu', undefined, '/my_page', MENU_LINK_TYPE.V1)
 
-        expect(item.to).toEqual('https://admin.opentalent.fr/my_page')
+        expect(item.to).toEqual('https://admin.opentalent.fr/#/my_page')
     })
 })
 

+ 7 - 7
tests/units/services/layout/menuBuilder/accessMenuBuilder.test.ts

@@ -55,14 +55,14 @@ describe('build', () => {
         organizationProfile.isSchool = true
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'person', icon: {name: 'fas fa-user'}, to: 'https://mydomain.com/students/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'person', icon: {name: 'fas fa-user'}, to: 'https://mydomain.com/#/students/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
 
         // @ts-ignore
         organizationProfile.isSchool = false
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'person', icon: {name: 'fas fa-user'}, to: 'https://mydomain.com/adherent/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'person', icon: {name: 'fas fa-user'}, to: 'https://mydomain.com/#/adherent/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -70,7 +70,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'student_registration_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'family_view', icon: {name: 'fas fa-users'}, to: 'https://mydomain.com/student_registration/new', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'family_view', icon: {name: 'fas fa-users'}, to: 'https://mydomain.com/#/student_registration/new', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -78,7 +78,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'education_student_next_year_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'education_student_next_year', icon: {name: 'fas fa-list-alt'}, to: 'https://mydomain.com/education_student_next_year/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'education_student_next_year', icon: {name: 'fas fa-list-alt'}, to: 'https://mydomain.com/#/education_student_next_year/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -86,7 +86,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'commissions_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'commissions', icon: {name: 'fas fa-street-view'}, to: 'https://mydomain.com/commissions/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'commissions', icon: {name: 'fas fa-street-view'}, to: 'https://mydomain.com/#/commissions/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -94,7 +94,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'network_children_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'network', icon: {name: 'fas fa-sitemap'}, to: 'https://mydomain.com/networks/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'network', icon: {name: 'fas fa-sitemap'}, to: 'https://mydomain.com/#/networks/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -102,7 +102,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'network_parents_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'my_network', icon: {name: 'fas fa-sitemap'}, to: 'https://mydomain.com/network_artist_schools/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'my_network', icon: {name: 'fas fa-sitemap'}, to: 'https://mydomain.com/#/network_artist_schools/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 })

+ 15 - 15
tests/units/services/layout/menuBuilder/accountMenuBuilder.test.ts

@@ -51,7 +51,7 @@ describe('build', () => {
         // Has the logout action
         // @ts-ignore
         expect(result.actions).toEqual([
-            {label: 'logout', icon: undefined, to: 'https://mydomain.com/logout', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'logout', icon: undefined, to: 'https://mydomain.com/#/logout', type: MENU_LINK_TYPE.V1, active: false}
         ])
     })
 
@@ -85,7 +85,7 @@ describe('build', () => {
         // Still has the logout action
         // @ts-ignore
         expect(group.actions).toEqual([
-            {label: 'logout', icon: undefined, to: 'https://mydomain.com/logout', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'logout', icon: undefined, to: 'https://mydomain.com/#/logout', type: MENU_LINK_TYPE.V1, active: false}
         ])
     })
 
@@ -94,7 +94,7 @@ describe('build', () => {
 
         // @ts-ignore
         expect(menuBuilder.build().children[0]).toEqual(
-            {label: 'my_schedule_page', icon: undefined, to: 'https://mydomain.com/my_calendar', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'my_schedule_page', icon: undefined, to: 'https://mydomain.com/#/my_calendar', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -103,7 +103,7 @@ describe('build', () => {
 
         // @ts-ignore
         expect(menuBuilder.build().children[0]).toEqual(
-            {label: 'attendance_bookings_menu', icon: undefined, to: 'https://mydomain.com/own_attendance', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'attendance_bookings_menu', icon: undefined, to: 'https://mydomain.com/#/own_attendance', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -112,7 +112,7 @@ describe('build', () => {
 
         // @ts-ignore
         expect(menuBuilder.build().children[0]).toEqual(
-            {label: 'my_attendance', icon: undefined, to: 'https://mydomain.com/my_attendances/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'my_attendance', icon: undefined, to: 'https://mydomain.com/#/my_attendances/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -121,7 +121,7 @@ describe('build', () => {
 
         // @ts-ignore
         expect(menuBuilder.build().children[0]).toEqual(
-            {label: 'my_invitation', icon: undefined, to: 'https://mydomain.com/my_invitations/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'my_invitation', icon: undefined, to: 'https://mydomain.com/#/my_invitations/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -130,7 +130,7 @@ describe('build', () => {
 
         // @ts-ignore
         expect(menuBuilder.build().children[0]).toEqual(
-            {label: 'my_students', icon: undefined, to: 'https://mydomain.com/my_students/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'my_students', icon: undefined, to: 'https://mydomain.com/#/my_students/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -139,7 +139,7 @@ describe('build', () => {
 
         // @ts-ignore
         expect(menuBuilder.build().children[0]).toEqual(
-            {label: 'my_students_education_students', icon: undefined, to: 'https://mydomain.com/my_students_education_students/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'my_students_education_students', icon: undefined, to: 'https://mydomain.com/#/my_students_education_students/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -148,7 +148,7 @@ describe('build', () => {
 
         // @ts-ignore
         expect(menuBuilder.build().children[0]).toEqual(
-            {label: 'my_education_students', icon: undefined, to: 'https://mydomain.com/main/my_profile/123/dashboard/my_education_students/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'my_education_students', icon: undefined, to: 'https://mydomain.com/#/main/my_profile/123/dashboard/my_education_students/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -157,7 +157,7 @@ describe('build', () => {
 
         // @ts-ignore
         expect(menuBuilder.build().children[0]).toEqual(
-            {label: 'send_an_email', icon: undefined, to: 'https://mydomain.com/list/create/emails', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'send_an_email', icon: undefined, to: 'https://mydomain.com/#/list/create/emails', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -166,7 +166,7 @@ describe('build', () => {
 
         // @ts-ignore
         expect(menuBuilder.build().children[0]).toEqual(
-            {label: 'my_documents', icon: undefined, to: 'https://mydomain.com/main/my_profile/123/dashboard/show/my_access_file', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'my_documents', icon: undefined, to: 'https://mydomain.com/#/main/my_profile/123/dashboard/show/my_access_file', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -175,7 +175,7 @@ describe('build', () => {
 
         // @ts-ignore
         expect(menuBuilder.build().children[0]).toEqual(
-            {label: 'my_profile', icon: undefined, to: 'https://mydomain.com/main/my_profile/123/dashboard', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'my_profile', icon: undefined, to: 'https://mydomain.com/#/main/my_profile/123/dashboard', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -184,7 +184,7 @@ describe('build', () => {
 
         // @ts-ignore
         expect(menuBuilder.build().children[0]).toEqual(
-            {label: 'adherent_list', icon: undefined, to: 'https://mydomain.com/adherent_contacts/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'adherent_list', icon: undefined, to: 'https://mydomain.com/#/adherent_contacts/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -193,7 +193,7 @@ describe('build', () => {
 
         // @ts-ignore
         expect(menuBuilder.build().children[0]).toEqual(
-            {label: 'my_bills', icon: undefined, to: 'https://mydomain.com/main/my_profile/123/dashboard/show/my_bills', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'my_bills', icon: undefined, to: 'https://mydomain.com/#/main/my_profile/123/dashboard/show/my_bills', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -202,7 +202,7 @@ describe('build', () => {
 
         // @ts-ignore
         expect(menuBuilder.build().children[0]).toEqual(
-            {label: 'print_my_licence', icon: undefined, to: 'https://mydomain.com/licence_cmf/user', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'print_my_licence', icon: undefined, to: 'https://mydomain.com/#/licence_cmf/user', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 })

+ 7 - 7
tests/units/services/layout/menuBuilder/admin2iosMenuBuilder.test.ts

@@ -52,7 +52,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'all_accesses_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'all_accesses', icon: {name: 'fas fa-users'}, to: 'https://mydomain.com/all_accesses/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'all_accesses', icon: {name: 'fas fa-users'}, to: 'https://mydomain.com/#/all_accesses/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -60,7 +60,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'all_organizations_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'all_organizations', icon: {name: 'fas fa-building'}, to: 'https://mydomain.com/organization_params/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'all_organizations', icon: {name: 'fas fa-building'}, to: 'https://mydomain.com/#/organization_params/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -68,7 +68,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'tips_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'tips', icon: {name: 'fas fa-info-circle'}, to: 'https://mydomain.com/tips/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'tips', icon: {name: 'fas fa-info-circle'}, to: 'https://mydomain.com/#/tips/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -76,7 +76,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'dgv_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'dgv', icon: {name: 'fas fa-house-damage'}, to: 'https://mydomain.com/admin2ios/dgv', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'dgv', icon: {name: 'fas fa-house-damage'}, to: 'https://mydomain.com/#/admin2ios/dgv', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -84,7 +84,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'cmf_cotisation_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'cmf_cotisation', icon: {name: 'fas fa-info-circle'}, to: 'https://mydomain.com/admin2ios/cotisationcmf', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'cmf_cotisation', icon: {name: 'fas fa-info-circle'}, to: 'https://mydomain.com/#/admin2ios/cotisationcmf', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -92,7 +92,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'right_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'right_menu', icon: {name: 'fas fa-balance-scale-right'}, to: 'https://mydomain.com/admin2ios/right', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'right_menu', icon: {name: 'fas fa-balance-scale-right'}, to: 'https://mydomain.com/#/admin2ios/right', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -100,7 +100,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'tree_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'tree_menu', icon: {name: 'fas fa-sitemap'}, to: 'https://mydomain.com/admin2ios/tree', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'tree_menu', icon: {name: 'fas fa-sitemap'}, to: 'https://mydomain.com/#/admin2ios/tree', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 })

+ 2 - 2
tests/units/services/layout/menuBuilder/agendaMenuBuilder.test.ts

@@ -53,7 +53,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'agenda_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'schedule', icon: {name: 'fas fa-calendar-alt'}, to: 'https://mydomain.com/calendar', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'schedule', icon: {name: 'fas fa-calendar-alt'}, to: 'https://mydomain.com/#/calendar', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -61,7 +61,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'attendance_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'attendances', icon: {name: 'fas fa-calendar-check'}, to: 'https://mydomain.com/attendances/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'attendances', icon: {name: 'fas fa-calendar-check'}, to: 'https://mydomain.com/#/attendances/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 })

+ 8 - 8
tests/units/services/layout/menuBuilder/billingMenuBuilder.test.ts

@@ -53,7 +53,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'billing_product_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'billing_product', icon: {name: 'fas fa-cube'}, to: 'https://mydomain.com/intangibles/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'billing_product', icon: {name: 'fas fa-cube'}, to: 'https://mydomain.com/#/intangibles/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -61,7 +61,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'billing_products_by_student_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'billing_products_by_student', icon: {name: 'fas fa-cubes'}, to: 'https://mydomain.com/access_intangibles/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'billing_products_by_student', icon: {name: 'fas fa-cubes'}, to: 'https://mydomain.com/#/access_intangibles/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -69,7 +69,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'billing_edition_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'billing_edition', icon: {name: 'fas fa-copy'}, to: 'https://mydomain.com/billing_edition', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'billing_edition', icon: {name: 'fas fa-copy'}, to: 'https://mydomain.com/#/billing_edition', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -77,7 +77,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'billing_accounting_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'billing_accounting', icon: {name: 'fas fa-file-alt'}, to: 'https://mydomain.com/bill_accountings/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'billing_accounting', icon: {name: 'fas fa-file-alt'}, to: 'https://mydomain.com/#/bill_accountings/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -85,7 +85,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'billing_payment_list_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'billing_payment_list', icon: {name: 'fas fa-credit-card'}, to: 'https://mydomain.com/bill_payments_list/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'billing_payment_list', icon: {name: 'fas fa-credit-card'}, to: 'https://mydomain.com/#/bill_payments_list/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -93,7 +93,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'pes_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'pes_export', icon: {name: 'fas fa-align-justify'}, to: 'https://mydomain.com/pes/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'pes_export', icon: {name: 'fas fa-align-justify'}, to: 'https://mydomain.com/#/pes/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -101,7 +101,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'berger_levrault_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'berger_levrault_export', icon: {name: 'fas fa-align-justify'}, to: 'https://mydomain.com/berger_levraults/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'berger_levrault_export', icon: {name: 'fas fa-align-justify'}, to: 'https://mydomain.com/#/berger_levraults/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -109,7 +109,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'jvs_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'jvs_export', icon: {name: 'fas fa-align-justify'}, to: 'https://mydomain.com/jvs/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'jvs_export', icon: {name: 'fas fa-align-justify'}, to: 'https://mydomain.com/#/jvs/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 })

+ 3 - 3
tests/units/services/layout/menuBuilder/communicationMenuBuilder.test.ts

@@ -54,7 +54,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'inbox_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'inbox', icon: {name: 'fas fa-inbox'}, to: 'https://mydomain.com/messages/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'inbox', icon: {name: 'fas fa-inbox'}, to: 'https://mydomain.com/#/messages/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -62,7 +62,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'message_send_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'message_send', icon: {name: 'fas fa-paper-plane'}, to: 'https://mydomain.com/messagessends/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'message_send', icon: {name: 'fas fa-paper-plane'}, to: 'https://mydomain.com/#/messagessends/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -70,7 +70,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'message_templates_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'message_templates', icon: {name: 'fas fa-edit'}, to: 'https://mydomain.com/templates/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'message_templates', icon: {name: 'fas fa-edit'}, to: 'https://mydomain.com/#/templates/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 })

+ 9 - 9
tests/units/services/layout/menuBuilder/configurationMenuBuilder.test.ts

@@ -54,7 +54,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'organization_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'organization_page', icon: undefined, to: 'https://mydomain.com/organization', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'organization_page', icon: undefined, to: 'https://mydomain.com/#/organization', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -62,7 +62,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'cmf_licence_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'cmf_licence_generate', icon: undefined, to: 'https://mydomain.com/cmf_licence/organization', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'cmf_licence_generate', icon: undefined, to: 'https://mydomain.com/#/cmf_licence/organization', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -70,7 +70,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'place_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'place', icon: undefined, to: 'https://mydomain.com/places/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'place', icon: undefined, to: 'https://mydomain.com/#/places/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -78,7 +78,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'education_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'education', icon: undefined, to: 'https://mydomain.com/educations/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'education', icon: undefined, to: 'https://mydomain.com/#/educations/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -86,7 +86,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'tag_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'tag', icon: undefined, to: 'https://mydomain.com/taggs/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'tag', icon: undefined, to: 'https://mydomain.com/#/taggs/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -94,7 +94,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'activities_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'activities', icon: undefined, to: 'https://mydomain.com/activities/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'activities', icon: undefined, to: 'https://mydomain.com/#/activities/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -102,7 +102,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'transition_next_year_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'transition_next_year', icon: undefined, to: 'https://mydomain.com/transition_next_year', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'transition_next_year', icon: undefined, to: 'https://mydomain.com/#/transition_next_year', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -110,7 +110,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'course_duplication_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'course_duplication', icon: undefined, to: 'https://mydomain.com/duplicate_courses', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'course_duplication', icon: undefined, to: 'https://mydomain.com/#/duplicate_courses', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -118,7 +118,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'import_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'import', icon: undefined, to: 'https://mydomain.com/import/all', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'import', icon: undefined, to: 'https://mydomain.com/#/import/all', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 })

+ 17 - 17
tests/units/services/layout/menuBuilder/cotisationsMenuBuilder.test.ts

@@ -54,7 +54,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'rate_cotisation_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'rate_cotisation', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/cotisation/rate', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'rate_cotisation', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/#/cotisation/rate', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -62,7 +62,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'parameters_cotisation_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'parameters_cotisation', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/cotisation/parameter', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'parameters_cotisation', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/#/cotisation/parameter', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -70,7 +70,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'send_cotisation_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'send_cotisation', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/cotisation/send', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'send_cotisation', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/#/cotisation/send', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -78,7 +78,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'state_cotisation_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'state_cotisation', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/cotisation/state', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'state_cotisation', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/#/cotisation/state', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -86,7 +86,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'pay_cotisation_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'pay_cotisation', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/cotisation/pay', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'pay_cotisation', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/#/cotisation/pay', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -94,7 +94,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'check_cotisation_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'check_cotisation', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/cotisation/check', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'check_cotisation', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/#/cotisation/check', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -102,7 +102,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'ledger_cotisation_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'ledger_cotisation', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/cotisation/ledger', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'ledger_cotisation', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/#/cotisation/ledger', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -110,7 +110,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'magazine_cotisation_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'magazine_cotisation', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/cotisation/magazine', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'magazine_cotisation', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/#/cotisation/magazine', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -118,7 +118,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'ventilated_cotisation_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'ventilated_cotisation', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/cotisation/ventilated', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'ventilated_cotisation', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/#/cotisation/ventilated', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -126,7 +126,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'pay_erase_cotisation_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'pay_erase_cotisation', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/cotisation/payerase', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'pay_erase_cotisation', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/#/cotisation/payerase', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -134,7 +134,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'resume_cotisation_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'resume_cotisation', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/cotisation/resume', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'resume_cotisation', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/#/cotisation/resume', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -142,7 +142,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'history_cotisation_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'history_cotisation', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/cotisation/history', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'history_cotisation', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/#/cotisation/history', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -150,7 +150,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'call_cotisation_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'call_cotisation', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/cotisation/call', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'call_cotisation', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/#/cotisation/call', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -158,7 +158,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'history_structure_cotisation_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'history_structure_cotisation', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/cotisation/historystructure', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'history_structure_cotisation', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/#/cotisation/historystructure', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -166,7 +166,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'insurance_cotisation_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'insurance_cotisation', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/cotisation/insurance', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'insurance_cotisation', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/#/cotisation/insurance', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -174,7 +174,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'resume_all_cotisation_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'resume_all_cotisation', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/cotisation/resumeall', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'resume_all_cotisation', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/#/cotisation/resumeall', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -182,7 +182,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'resume_pay_cotisation_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'resume_pay_cotisation', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/cotisation/resumepay', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'resume_pay_cotisation', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/#/cotisation/resumepay', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 })

+ 1 - 1
tests/units/services/layout/menuBuilder/donorsMenuBuilder.test.ts

@@ -37,7 +37,7 @@ describe('build', () => {
         const result = menuBuilder.build() as MenuItem
 
         expect(result).toEqual({
-            label: 'donors', icon: {name: 'fas fa-handshake'}, to: 'https://mydomain.com/donors/list/', type: MENU_LINK_TYPE.V1, active: false
+            label: 'donors', icon: {name: 'fas fa-handshake'}, to: 'https://mydomain.com/#/donors/list/', type: MENU_LINK_TYPE.V1, active: false
         })
     })
 

+ 6 - 6
tests/units/services/layout/menuBuilder/educationalMenuBuilder.test.ts

@@ -53,7 +53,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'criteria_notations_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'criteria_notations', icon: {name: 'fas fa-bars'}, to: 'https://mydomain.com/criteria_notations/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'criteria_notations', icon: {name: 'fas fa-bars'}, to: 'https://mydomain.com/#/criteria_notations/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -61,7 +61,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'seizure_period_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'seizure_period', icon: {name: 'fas fa-calendar-alt'}, to: 'https://mydomain.com/education_teachers/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'seizure_period', icon: {name: 'fas fa-calendar-alt'}, to: 'https://mydomain.com/#/education_teachers/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -69,7 +69,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'test_seizure_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'test_seizure', icon: {name: 'fas fa-pencil-alt'}, to: 'https://mydomain.com/education_input/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'test_seizure', icon: {name: 'fas fa-pencil-alt'}, to: 'https://mydomain.com/#/education_input/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -77,7 +77,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'test_validation_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'test_validation', icon: {name: 'fas fa-check'}, to: 'https://mydomain.com/education_notations/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'test_validation', icon: {name: 'fas fa-check'}, to: 'https://mydomain.com/#/education_notations/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -85,7 +85,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'examen_results_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'examen_results', icon: {name: 'fas fa-graduation-cap'}, to: 'https://mydomain.com/examen_convocations/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'examen_results', icon: {name: 'fas fa-graduation-cap'}, to: 'https://mydomain.com/#/examen_convocations/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -93,7 +93,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'education_by_student_validation_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'education_by_student_validation', icon: {name: 'fas fa-check-square'}, to: 'https://mydomain.com/education_by_student/list/', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'education_by_student_validation', icon: {name: 'fas fa-check-square'}, to: 'https://mydomain.com/#/education_by_student/list/', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 })

+ 1 - 1
tests/units/services/layout/menuBuilder/equipmentMenuBuilder.test.ts

@@ -39,7 +39,7 @@ describe('build', () => {
         const result = menuBuilder.build() as MenuItem
 
         expect(result).toEqual({
-            label: 'equipment', icon: {name: 'fas fa-cube'}, to: 'https://mydomain.com/equipment/list/', type: MENU_LINK_TYPE.V1, active: false
+            label: 'equipment', icon: {name: 'fas fa-cube'}, to: 'https://mydomain.com/#/equipment/list/', type: MENU_LINK_TYPE.V1, active: false
         })
     })
 

+ 1 - 1
tests/units/services/layout/menuBuilder/medalsMenuBuilder.test.ts

@@ -39,7 +39,7 @@ describe('build', () => {
         const result = menuBuilder.build() as MenuItem
 
         expect(result).toEqual({
-            label: 'medals', icon: {name: 'fas fa-trophy'}, to: 'https://mydomain.com/medals/list/', type: MENU_LINK_TYPE.V1, active: false
+            label: 'medals', icon: {name: 'fas fa-trophy'}, to: 'https://mydomain.com/#/medals/list/', type: MENU_LINK_TYPE.V1, active: false
         })
     })
 

+ 3 - 3
tests/units/services/layout/menuBuilder/myAccessesMenuBuilder.test.ts

@@ -50,9 +50,9 @@ describe('build', () => {
         expect(result.icon).toEqual({name: 'fas fa-building'})
 
         expect(result.children).toEqual([
-            { label: 'Bob', icon: undefined, to: 'https://mydomain.com/switch/1', type: MENU_LINK_TYPE.V1, active: false },
-            { label: 'Séraphin', icon: undefined, to: 'https://mydomain.com/switch/2', type: MENU_LINK_TYPE.V1, active: false },
-            { label: 'Lilou', icon: undefined, to: 'https://mydomain.com/switch/3', type: MENU_LINK_TYPE.V1, active: false }
+            { label: 'Bob', icon: undefined, to: 'https://mydomain.com/#/switch/1', type: MENU_LINK_TYPE.V1, active: false },
+            { label: 'Séraphin', icon: undefined, to: 'https://mydomain.com/#/switch/2', type: MENU_LINK_TYPE.V1, active: false },
+            { label: 'Lilou', icon: undefined, to: 'https://mydomain.com/#/switch/3', type: MENU_LINK_TYPE.V1, active: false }
         ])
     })
 })

+ 4 - 4
tests/units/services/layout/menuBuilder/myFamilyMenuBuilder.test.ts

@@ -62,10 +62,10 @@ describe('build', () => {
         const result = menuBuilder.build() as MenuGroup
 
         expect(result.children).toEqual([
-            { label: 'Dupont Bob', icon: { avatarId: 1, avatarByDefault: '/images/default/men-1.png'}, to: 'https://mydomain.com/switch_user/100/1/1', type: MENU_LINK_TYPE.V1, active: false },
-            { label: 'Dupuis Séraphin', icon: { avatarId: 2, avatarByDefault: '/images/default/men-1.png'}, to: 'https://mydomain.com/switch_user/100/1/2', type: MENU_LINK_TYPE.V1, active: false },
-            { label: 'Dubois Lilou', icon: { avatarId: 3, avatarByDefault: '/images/default/women-1.png'}, to: 'https://mydomain.com/switch_user/100/1/3', type: MENU_LINK_TYPE.V1, active: false },
-            { label: 'Soprano Tony', icon: undefined, to: 'https://mydomain.com/switch_user/100/4/exit', type: MENU_LINK_TYPE.V1, active: false }
+            { label: 'Dupont Bob', icon: { avatarId: 1, avatarByDefault: '/images/default/men-1.png'}, to: 'https://mydomain.com/#/switch_user/100/1/1', type: MENU_LINK_TYPE.V1, active: false },
+            { label: 'Dupuis Séraphin', icon: { avatarId: 2, avatarByDefault: '/images/default/men-1.png'}, to: 'https://mydomain.com/#/switch_user/100/1/2', type: MENU_LINK_TYPE.V1, active: false },
+            { label: 'Dubois Lilou', icon: { avatarId: 3, avatarByDefault: '/images/default/women-1.png'}, to: 'https://mydomain.com/#/switch_user/100/1/3', type: MENU_LINK_TYPE.V1, active: false },
+            { label: 'Soprano Tony', icon: undefined, to: 'https://mydomain.com/#/switch_user/100/4/exit', type: MENU_LINK_TYPE.V1, active: false }
         ])
     })
 })

+ 6 - 6
tests/units/services/layout/menuBuilder/parametersMenuBuilder.test.ts

@@ -53,7 +53,7 @@ describe('build', () => {
 
         // @ts-ignore
         expect(menuBuilder.build().children[0]).toEqual(
-            {label: 'general_params', icon: {name: 'fas fa-cogs'}, to: 'https://mydomain.com/parameters', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'general_params', icon: {name: 'fas fa-cogs'}, to: 'https://mydomain.com/#/parameters', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -62,7 +62,7 @@ describe('build', () => {
 
         // @ts-ignore
         expect(menuBuilder.build().children[0]).toEqual(
-            {label: 'communication_params', icon: {name: 'fas fa-comments'}, to: 'https://mydomain.com/parameters/communication', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'communication_params', icon: {name: 'fas fa-comments'}, to: 'https://mydomain.com/#/parameters/communication', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -71,7 +71,7 @@ describe('build', () => {
 
         // @ts-ignore
         expect(menuBuilder.build().children[0]).toEqual(
-            {label: 'students_params', icon: {name: 'fas fa-users'}, to: 'https://mydomain.com/parameters/student', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'students_params', icon: {name: 'fas fa-users'}, to: 'https://mydomain.com/#/parameters/student', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -80,7 +80,7 @@ describe('build', () => {
 
         // @ts-ignore
         expect(menuBuilder.build().children[0]).toEqual(
-            {label: 'education_params', icon: {name: 'fas fa-graduation-cap'}, to: 'https://mydomain.com/parameters/education', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'education_params', icon: {name: 'fas fa-graduation-cap'}, to: 'https://mydomain.com/#/parameters/education', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -89,7 +89,7 @@ describe('build', () => {
 
         // @ts-ignore
         expect(menuBuilder.build().children[0]).toEqual(
-            {label: 'bills_params', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/parameters/billing', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'bills_params', icon: {name: 'fas fa-euro-sign'}, to: 'https://mydomain.com/#/parameters/billing', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -98,7 +98,7 @@ describe('build', () => {
 
         // @ts-ignore
         expect(menuBuilder.build().children[0]).toEqual(
-            {label: 'secure_params', icon: {name: 'fas fa-lock'}, to: 'https://mydomain.com/parameters/secure', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'secure_params', icon: {name: 'fas fa-lock'}, to: 'https://mydomain.com/#/parameters/secure', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 })

+ 3 - 3
tests/units/services/layout/menuBuilder/statsMenuBuilder.test.ts

@@ -54,7 +54,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'report_activity_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'report_activity', icon: {name: 'fas fa-chart-bar'}, to: 'https://mydomain.com/report_activity', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'report_activity', icon: {name: 'fas fa-chart-bar'}, to: 'https://mydomain.com/#/report_activity', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -62,7 +62,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'fede_stats_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'fede_stats', icon: {name: 'fas fa-chart-bar'}, to: 'https://mydomain.com/statistic/membersfedeonly', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'fede_stats', icon: {name: 'fas fa-chart-bar'}, to: 'https://mydomain.com/#/statistic/membersfedeonly', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 
@@ -70,7 +70,7 @@ describe('build', () => {
         ability.can = vi.fn((action: string, subject: string) => action === 'display' && subject === 'structure_stats_page')
 
         expect(menuBuilder.build()).toEqual(
-            {label: 'structure_stats', icon: {name: 'fas fa-chart-bar'}, to: 'https://mydomain.com/statistic/membersfedeassos', type: MENU_LINK_TYPE.V1, active: false}
+            {label: 'structure_stats', icon: {name: 'fas fa-chart-bar'}, to: 'https://mydomain.com/#/statistic/membersfedeassos', type: MENU_LINK_TYPE.V1, active: false}
         )
     })
 })