Przeglądaj źródła

fix parameters menu link, and minor fixes

Olivier Massot 8 miesięcy temu
rodzic
commit
23027988a8

+ 3 - 1
components/Layout/Parameters/Menu.vue

@@ -57,7 +57,9 @@ const displayMenu = computed(() => {
   return menu !== null && hasMenu('Parameters')
 })
 
-const isOpened = computed(() => mdAndUp || isMenuOpened('Parameters'))
+const isOpened: ComputedRef<boolean> = computed(
+  () => mdAndUp.value || isMenuOpened('Parameters')
+)
 
 const closeMenu = () => {
   setMenuState('Parameters', false)

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

@@ -85,7 +85,7 @@ abstract class AbstractMenuBuilder implements MenuBuilder {
    * @param {string} label Titre qui sera traduit
    * @param to
    * @param type
-   * @param noWarning
+   * @param newTab
    * @return {MenuItem}
    */
   protected createItem(
@@ -98,7 +98,7 @@ abstract class AbstractMenuBuilder implements MenuBuilder {
     let url: string
     if (type === MENU_LINK_TYPE.INTERNAL) {
       console.warn(
-        "'createItem()' should not be used for internal links, use 'addChildItemIfAllowed()'",
+        "'createItem()' should not be used for internal links, use 'makeChildren()'",
       )
     }
     switch (type) {

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

@@ -6,7 +6,7 @@ import { MENU_LINK_TYPE } from '~/types/enum/layout'
  * Menu Répertoire
  */
 export default class AccessMenuBuilder extends AbstractMenuBuilder {
-  static readonly menuName = 'Access'
+  static override readonly menuName = 'Access'
 
   /**
    * Construit le menu Répertoire, ou null si aucune page accessible

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

@@ -6,7 +6,7 @@ import AbstractMenuBuilder from '~/services/layout/menuBuilder/abstractMenuBuild
  * Menu Mon compte
  */
 export default class AccountMenuBuilder extends AbstractMenuBuilder {
-  static readonly menuName = 'Account'
+  static override readonly menuName = 'Account'
 
   /**
    * Construit le menu Header Configuration ou null si aucune page accessible

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

@@ -6,7 +6,7 @@ import { MENU_LINK_TYPE } from '~/types/enum/layout'
  * Menu Admin 2IOS
  */
 export default class Admin2iosMenuBuilder extends AbstractMenuBuilder {
-  static readonly menuName = 'Admin2ios'
+  static override readonly menuName = 'Admin2ios'
 
   /**
    * Construit le menu Administration 2ios ou null si aucune page accessible

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

@@ -6,7 +6,7 @@ import { MENU_LINK_TYPE } from '~/types/enum/layout'
  * Menu agenda
  */
 export default class AgendaMenuBuilder extends AbstractMenuBuilder {
-  static readonly menuName = 'Agenda'
+  static override readonly menuName = 'Agenda'
 
   /**
    * Construit le menu Agenda ou null si aucune page accessible

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

@@ -6,7 +6,7 @@ import AbstractMenuBuilder from '~/services/layout/menuBuilder/abstractMenuBuild
  * Menu Basicompta
  */
 export default class BasicomptaMenuBuilder extends AbstractMenuBuilder {
-  static readonly menuName = 'Basicompta'
+  static override readonly menuName = 'Basicompta'
 
   build(): MenuItem | null {
     // cf droit : https://ressources-opentalent.atlassian.net/wiki/spaces/SPEC/pages/32637034/Acc+s+basi+compta+pour+les+structures+de+la+CMF#Acces-a-Basicompta-pour-les-administrateurs

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

@@ -6,7 +6,7 @@ import { MENU_LINK_TYPE } from '~/types/enum/layout'
  * Menu Facturation
  */
 export default class BillingMenuBuilder extends AbstractMenuBuilder {
-  static readonly menuName = 'Billing'
+  static override readonly menuName = 'Billing'
 
   /**
    * Construit le menu Facturation ou null si aucune page accessible

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

@@ -6,7 +6,7 @@ import { MENU_LINK_TYPE } from '~/types/enum/layout'
  * Menu Communication
  */
 export default class CommunicationMenuBuilder extends AbstractMenuBuilder {
-  static readonly menuName = 'Communication'
+  static override readonly menuName = 'Communication'
 
   /**
    * Construit le menu Communication ou null si aucune page accessible

+ 2 - 11
services/layout/menuBuilder/configurationMenuBuilder.ts

@@ -7,7 +7,7 @@ import UrlUtils from '~/services/utils/urlUtils'
  * Classe pour la construction du Menu Paramètres
  */
 export default class ConfigurationMenuBuilder extends AbstractMenuBuilder {
-  static readonly menuName = 'Configuration'
+  static override readonly menuName = 'Configuration'
 
   /**
    * Construit le menu Header Configuration ou null si aucune page accessible
@@ -63,16 +63,7 @@ export default class ConfigurationMenuBuilder extends AbstractMenuBuilder {
     //   )
     // }
 
-    if (this.ability.can('display', 'parameters_page')) {
-      children.push(
-        this.createItem(
-          'parameters',
-          undefined,
-          `/main/edit/parameters/${this.organizationProfile.id}`,
-          MENU_LINK_TYPE.V1,
-        ),
-      )
-    }
+    children.push(...this.makeChildren([{ pageName: 'parameters_page' }]))
 
     if (this.ability.can('display', 'place_page')) {
       children.push(

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

@@ -6,7 +6,7 @@ import { MENU_LINK_TYPE } from '~/types/enum/layout'
  * Menu Cotisation (CMF)
  */
 export default class CotisationsMenuBuilder extends AbstractMenuBuilder {
-  static readonly menuName = 'Cotisation'
+  static override readonly menuName = 'Cotisation'
 
   /**
    * Construit le menu Cotisations ou null si aucune page accessible

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

@@ -6,7 +6,7 @@ import { MENU_LINK_TYPE } from '~/types/enum/layout'
  * Menu Donneurs
  */
 export default class DonorsMenuBuilder extends AbstractMenuBuilder {
-  static readonly menuName = 'Donors'
+  static override readonly menuName = 'Donors'
 
   /**
    * Construit le menu Partenariat et Dons, ou null si aucune page accessible

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

@@ -6,7 +6,7 @@ import { MENU_LINK_TYPE } from '~/types/enum/layout'
  * Menu Suivi pédagogique
  */
 export default class EducationalMenuBuilder extends AbstractMenuBuilder {
-  static readonly menuName = 'Educational'
+  static override readonly menuName = 'Educational'
 
   /**
    * Construit le menu Suivi pédagogique ou null si aucune page accessible

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

@@ -6,7 +6,7 @@ import AbstractMenuBuilder from '~/services/layout/menuBuilder/abstractMenuBuild
  * Menu Matériel
  */
 export default class EquipmentMenuBuilder extends AbstractMenuBuilder {
-  static readonly menuName = 'Equipment'
+  static override readonly menuName = 'Equipment'
 
   /**
    * Construit le menu Equipement ou null si aucune page accessible

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

@@ -18,7 +18,7 @@ import BasicomptaMenuBuilder from '~/services/layout/menuBuilder/basicomptaMenuB
  * Menu principal (ou menu lateral)
  */
 export default class MainMenuBuilder extends AbstractMenuBuilder {
-  static readonly menuName = 'Main'
+  static override readonly menuName = 'Main'
 
   /**
    * Construit le menu principal, ou null si aucune page accessible

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

@@ -7,7 +7,7 @@ import { MENU_LINK_TYPE } from '~/types/enum/layout'
  * Menu Mon Profil
  */
 export default class MyAccessesMenuBuilder extends AbstractMenuBuilder {
-  static readonly menuName = 'MyAccesses'
+  static override readonly menuName = 'MyAccesses'
 
   /**
    * Construit le menu Header Multi compte, ou null si aucune page accessible

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

@@ -7,7 +7,7 @@ import { MENU_LINK_TYPE } from '~/types/enum/layout'
  * Menu Famille
  */
 export default class MyFamilyMenuBuilder extends AbstractMenuBuilder {
-  static readonly menuName = 'MyFamily'
+  static override readonly menuName = 'MyFamily'
 
   /**
    * Construit le menu Header Changement d'utilisateur ou null si aucune page accessible

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

@@ -5,7 +5,7 @@ import type { MenuGroup, MenuItems } from '~/types/layout'
  * Menu Paramètres
  */
 export default class ParametersMenuBuilder extends AbstractMenuBuilder {
-  static readonly menuName = 'Parameters'
+  static override readonly menuName = 'Parameters'
 
   /**
    * Construit le menu Header Configuration, ou null si aucune page accessible

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

@@ -6,7 +6,7 @@ import { MENU_LINK_TYPE } from '~/types/enum/layout'
  * Menu Distinctions
  */
 export default class RewardsMenuBuilder extends AbstractMenuBuilder {
-  static readonly menuName = 'AccessRewards'
+  static override readonly menuName = 'AccessRewards'
 
   /**
    * Construit le menu distinctions, ou null si aucune page accessible

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

@@ -6,7 +6,7 @@ import { MENU_LINK_TYPE } from '~/types/enum/layout'
  * Menu Statistiques
  */
 export default class StatsMenuBuilder extends AbstractMenuBuilder {
-  static readonly menuName = 'Stats'
+  static override readonly menuName = 'Stats'
 
   /**
    * Construit le menu Statistique et Dons ou null si aucune page accessible

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

@@ -6,7 +6,7 @@ import { MENU_LINK_TYPE } from '~/types/enum/layout'
  * Menu Site internet
  */
 export default class WebsiteAdminMenuBuilder extends AbstractMenuBuilder {
-  static readonly menuName = 'WebsiteAdmin'
+  static override readonly menuName = 'WebsiteAdmin'
 
   /**
    * Construit le menu Site internet, ou null si aucune page accessible

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

@@ -8,7 +8,7 @@ import type { BaseOrganizationProfile } from '~/types/interfaces'
  * Menu : Liste des sites internet de la structure et de ses structures parentes
  */
 export default class WebsiteListMenuBuilder extends AbstractMenuBuilder {
-  static readonly menuName = 'WebsiteList'
+  static override readonly menuName = 'WebsiteList'
 
   /**
    * Construit le menu Site internet, ou null si aucune page accessible