Merge tag '2.4.4' into develop

Release 2.4.4

.eslintrc.cjs

@@ -18,7 +18,7 @@ module.exports = {
     'plugin:@typescript-eslint/recommended',
     'plugin:vue/vue3-recommended',
     'plugin:prettier/recommended',
-    'plugin:you-dont-need-lodash-underscore/compatible'
+    'plugin:you-dont-need-lodash-underscore/compatible',
   ],
   ignorePatterns: [
     '.nuxt',

components/Layout/Dialog/Trial/AlreadyDid.vue

@@ -15,7 +15,7 @@
         </p>
         <p>
           Si toutefois vous souhaitez une réactivation exceptionnelle de
-          l’essai, n’hésitez pas à contacter notre équipe Opentalent. 
Nous
+          l’essai, n’hésitez pas à contacter notre équipe Opentalent. Nous
           serons ravis d’évaluer votre demande et de vous accompagner dans vos
           projets.
         </p>
@@ -25,7 +25,10 @@
       <v-btn class="mr-4 submitBtn theme-neutral-strong" @click="closeDialog">
         {{ $t('cancel') }}
       </v-btn>
-      <v-btn class="mr-4 submitBtn theme-warning" @click="contactOpentalent">
+      <v-btn class="mr-4 submitBtn theme-warning" @click="goSubscribe">
+        {{ $t('i_subscribe') }}
+      </v-btn>
+      <v-btn class="mr-4 submitBtn theme-neutral-strong" @click="contactOpentalent">
         {{ $t('opentalent_contact') }}
       </v-btn>
     </template>
@@ -33,6 +36,10 @@
 </template>
 
 <script setup lang="ts">
+import UrlUtils from "~/services/utils/urlUtils";
+
+const runtimeConfig = useRuntimeConfig()
+
 const props = defineProps({
   show: {
     type: Boolean,
@@ -46,6 +53,15 @@ const closeDialog = () => {
   emit('closeDialog')
 }
 
+const goSubscribe = async () => {
+  const v1BaseURL =
+    runtimeConfig.baseUrlAdminLegacy || runtimeConfig.public.baseUrlAdminLegacy
+
+  await navigateTo(UrlUtils.join(v1BaseURL, '#', 'subscribe'), {
+    external: true,
+  })
+}
+
 const contactOpentalent = async () => {
   emit('closeDialog')
 

components/Layout/Parameters/EntityTable.vue

@@ -31,8 +31,8 @@ import type ApiResource from '~/models/ApiResource'
 import { useEntityFetch } from '~/composables/data/useEntityFetch'
 import type { AssociativeArray } from '~/types/data'
 import type { ColumnDefinition } from '~/types/interfaces'
-import {useDeleteItem} from '~/composables/form/useDeleteItem'
-import {useEntityManager} from '~/composables/data/useEntityManager';
+import { useDeleteItem } from '~/composables/form/useDeleteItem'
+import { useEntityManager } from '~/composables/data/useEntityManager'
 
 const props = defineProps({
   /**

components/Layout/Parameters/Table.vue

@@ -13,14 +13,8 @@ A data table for the parameters page
         </tr>
       </thead>
       <tbody v-if="items">
-        <tr
-          v-for="(item, i) in items"
-          :key="i"
-        >
-          <td
-            v-for="col in columnsDefinitions"
-            class="cycle-editable-cell"
-          >
+        <tr v-for="(item, i) in items" :key="i">
+          <td v-for="col in columnsDefinitions" class="cycle-editable-cell">
             {{ item[col.property] }}
           </td>
 
@@ -66,9 +60,9 @@ A data table for the parameters page
 </template>
 
 <script setup lang="ts">
-import {TABLE_ACTION} from '~/types/enum/enums';
-import UrlUtils from '~/services/utils/urlUtils';
-import type {ColumnDefinition} from '~/types/interfaces';
+import { TABLE_ACTION } from '~/types/enum/enums'
+import UrlUtils from '~/services/utils/urlUtils'
+import type { ColumnDefinition } from '~/types/interfaces'
 
 const props = defineProps({
   /**
@@ -90,7 +84,7 @@ const props = defineProps({
   columnsDefinitions: {
     type: Array as PropType<Array<ColumnDefinition> | null>,
     required: false,
-    default: null
+    default: null,
   },
   /**
    * The property used as identifier (required by 'edition' link)
@@ -98,7 +92,7 @@ const props = defineProps({
   identifier: {
     type: String,
     required: false,
-    default: 'id'
+    default: 'id',
   },
   /**
    * List of the actions available for each record
@@ -106,7 +100,7 @@ const props = defineProps({
   actions: {
     type: Array as PropType<Array<TABLE_ACTION>>,
     required: false,
-    default: [TABLE_ACTION.EDIT, TABLE_ACTION.DELETE, TABLE_ACTION.ADD]
+    default: [TABLE_ACTION.EDIT, TABLE_ACTION.DELETE, TABLE_ACTION.ADD],
   },
   /**
    * The URL for the edit / create pages
@@ -118,8 +112,8 @@ const props = defineProps({
   actionsRoute: {
     type: String,
     required: false,
-    default: '/parameters'
-  }
+    default: '/parameters',
+  },
 })
 
 const i18n = useI18n()
@@ -131,14 +125,13 @@ const getId = (item: object) => {
 }
 
 const columns: ComputedRef<Array<ColumnDefinition>> = computed(() => {
-  return props.columnsDefinitions.map(col => {
+  return props.columnsDefinitions.map((col) => {
     return {
       property: col.property,
-      label: col.label ?? i18n.t(col.property)
+      label: col.label ?? i18n.t(col.property),
     }
   })
 })
-
 </script>
 
 <style scoped lang="scss">
@@ -154,7 +147,8 @@ const columns: ComputedRef<Array<ColumnDefinition>> = computed(() => {
     font-weight: 600;
 
     td {
-      border-bottom: thin solid rgba(var(--v-border-color), var(--v-border-opacity));
+      border-bottom: thin solid
+        rgba(var(--v-border-color), var(--v-border-opacity));
     }
 
     td:last-of-type {
@@ -162,7 +156,8 @@ const columns: ComputedRef<Array<ColumnDefinition>> = computed(() => {
     }
   }
 
-  th, td {
+  th,
+  td {
     padding: 10px;
     text-align: left;
   }

components/Layout/UpgradePremiumButton.vue

@@ -86,7 +86,7 @@ const trialAction = async () => {
   padding: 5px 10px;
   cursor: pointer;
   white-space: pre-line;
-  font-size: 13px;
+  font-size: 12px;
 
   .v-icon {
     font-size: 16px;

components/Ui/Button/Delete.vue

@@ -18,7 +18,7 @@ Bouton Delete avec modale de confirmation de la suppression
 <script setup lang="ts">
 import type { Ref, PropType } from 'vue'
 import ApiResource from '~/models/ApiResource'
-import {useDeleteItem} from '~/composables/form/useDeleteItem'
+import { useDeleteItem } from '~/composables/form/useDeleteItem'
 
 const props = defineProps({
   entity: {

components/Ui/Form.vue

@@ -204,7 +204,6 @@ const closeConfirmationDialog = () => {
 
 const emit = defineEmits(['update:model-value'])
 
-
 // ### Actions du formulaire
 /**
  * Soumet le formulaire

components/Ui/Form/DeletionConfirmationDialog.vue

@@ -15,7 +15,10 @@
     </template>
 
     <template #dialogBtn>
-      <v-btn class="mr-4 submitBtn theme-neutral-strong" @click="onCancelClicked">
+      <v-btn
+        class="mr-4 submitBtn theme-neutral-strong"
+        @click="onCancelClicked"
+      >
         {{ $t('cancel') }}
       </v-btn>
       <v-btn class="mr-4 submitBtn theme-danger" @click="onDeleteClicked">
@@ -28,11 +31,15 @@
 <script setup lang="ts">
 const props = defineProps({
   modelValue: {
-    type: Boolean
-  }
+    type: Boolean,
+  },
 })
 
-const emit = defineEmits(['cancelClicked', 'deleteClicked', 'update:modelValue'])
+const emit = defineEmits([
+  'cancelClicked',
+  'deleteClicked',
+  'update:modelValue',
+])
 
 const onCancelClicked = () => {
   emit('cancelClicked')
@@ -45,6 +52,4 @@ const onDeleteClicked = () => {
 }
 </script>
 
-<style scoped lang="scss">
-
-</style>
+<style scoped lang="scss"></style>

components/Ui/Form/Edition.vue

@@ -1,11 +1,7 @@
 <template>
   <LayoutContainer>
     <UiLoadingPanel v-if="pending" />
-    <UiForm
-      v-else
-      v-model="entity"
-      :submitActions="submitActions"
-    >
+    <UiForm v-else v-model="entity" :submitActions="submitActions">
       <template #form.button>
         <v-btn v-if="goBackRoute" class="theme-neutral mr-3" @click="quit">
           {{ $t('cancel') }}

components/Ui/Input/Autocomplete/Accesses.vue

@@ -36,11 +36,11 @@ import Access from '~/models/Access/Access'
 import * as _ from 'lodash-es'
 import Query from '~/services/data/Query'
 import OrderBy from '~/services/data/Filters/OrderBy'
-import {ORDER_BY_DIRECTION, SEARCH_STRATEGY} from '~/types/enum/data'
-import PageFilter from '~/services/data/Filters/PageFilter';
-import InArrayFilter from '~/services/data/Filters/InArrayFilter';
-import SearchFilter from '~/services/data/Filters/SearchFilter';
-import UserSearchItem from '~/models/Custom/Search/UserSearchItem';
+import { ORDER_BY_DIRECTION, SEARCH_STRATEGY } from '~/types/enum/data'
+import PageFilter from '~/services/data/Filters/PageFilter'
+import InArrayFilter from '~/services/data/Filters/InArrayFilter'
+import SearchFilter from '~/services/data/Filters/SearchFilter'
+import UserSearchItem from '~/models/Custom/Search/UserSearchItem'
 
 const props = defineProps({
   /**
@@ -147,7 +147,9 @@ const i18n = useI18n()
 const accessToItem = (userSearchItem: UserSearchItem): UserListItem => {
   return {
     id: userSearchItem.id,
-    title: userSearchItem.fullName ? userSearchItem.fullName : `(${i18n.t('missing_name')})`,
+    title: userSearchItem.fullName
+      ? userSearchItem.fullName
+      : `(${i18n.t('missing_name')})`,
   }
 }
 
@@ -169,14 +171,14 @@ const activeIds = computed(() => {
 const queryActive = new Query(
   new OrderBy('fullName', ORDER_BY_DIRECTION.ASC),
   new PageFilter(ref(1), ref(20)),
-  new InArrayFilter('id', activeIds)
+  new InArrayFilter('id', activeIds),
 )
 
-const {
-  data: collectionActive,
-  pending: pendingActive,
-} = fetchCollection(UserSearchItem, null, queryActive)
-
+const { data: collectionActive, pending: pendingActive } = fetchCollection(
+  UserSearchItem,
+  null,
+  queryActive,
+)
 
 /**
  * Query transmise à l'API lors des changements de filtre de recherche
@@ -184,7 +186,7 @@ const {
 const querySearch = new Query(
   new OrderBy('fullName', ORDER_BY_DIRECTION.ASC),
   new PageFilter(ref(1), ref(20)),
-  new SearchFilter('fullName', nameFilter, SEARCH_STRATEGY.IPARTIAL)
+  new SearchFilter('fullName', nameFilter, SEARCH_STRATEGY.IPARTIAL),
 )
 
 /**
@@ -198,7 +200,6 @@ const {
 
 const pending = computed(() => pendingSearch.value || pendingActive.value)
 
-
 /**
  * Contenu de la liste autocomplete
  */
@@ -207,10 +208,14 @@ const items: ComputedRef<Array<UserListItem>> = computed(() => {
     return []
   }
 
-  const activeItems: UserListItem[] = collectionActive.value.items.map(accessToItem)
+  const activeItems: UserListItem[] =
+    collectionActive.value.items.map(accessToItem)
   const searchedItems: UserListItem[] = collectionSearch.value.items
     .map(accessToItem)
-    .filter(item => !collectionActive.value!.items.find(other => other.id === item.id))
+    .filter(
+      (item) =>
+        !collectionActive.value!.items.find((other) => other.id === item.id),
+    )
 
   return activeItems.concat(searchedItems)
 })

components/Ui/Input/Email.vue

@@ -18,7 +18,7 @@ Champs de saisie de type Text dédié à la saisie d'emails
 import { useNuxtApp } from '#app'
 import { useFieldViolation } from '~/composables/form/useFieldViolation'
 import { useValidationUtils } from '~/composables/utils/useValidationUtils'
-import type {PropType} from '@vue/runtime-core';
+import type { PropType } from '@vue/runtime-core'
 
 const props = defineProps({
   label: {

composables/form/useDeleteItem.ts

@@ -1,13 +1,11 @@
-import type ApiResource from '~/models/ApiResource';
-import {usePageStore} from '~/stores/page';
-import {TYPE_ALERT} from '~/types/enum/enums';
-import {useEntityManager} from '~/composables/data/useEntityManager';
-
+import type ApiResource from '~/models/ApiResource'
+import { usePageStore } from '~/stores/page'
+import { TYPE_ALERT } from '~/types/enum/enums'
+import { useEntityManager } from '~/composables/data/useEntityManager'
 
 export function useDeleteItem() {
-
   async function deleteItem(item: ApiResource) {
-    const {em} = useEntityManager()
+    const { em } = useEntityManager()
 
     try {
       await em.delete(item)
@@ -20,6 +18,6 @@ export function useDeleteItem() {
   }
 
   return {
-    deleteItem
+    deleteItem,
   }
 }

eslint.config.mjs

@@ -1,73 +1,86 @@
-import vue from "eslint-plugin-vue";
-import typescriptEslint from "@typescript-eslint/eslint-plugin";
-import globals from "globals";
-import parser from "vue-eslint-parser";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-import js from "@eslint/js";
-import { FlatCompat } from "@eslint/eslintrc";
+import vue from 'eslint-plugin-vue'
+import typescriptEslint from '@typescript-eslint/eslint-plugin'
+import globals from 'globals'
+import parser from 'vue-eslint-parser'
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+import js from '@eslint/js'
+import { FlatCompat } from '@eslint/eslintrc'
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
 const compat = new FlatCompat({
-    baseDirectory: __dirname,
-    recommendedConfig: js.configs.recommended,
-    allConfig: js.configs.all
-});
+  baseDirectory: __dirname,
+  recommendedConfig: js.configs.recommended,
+  allConfig: js.configs.all,
+})
 
-export default [{
-    ignores: ["**/.nuxt", "coverage/*", "vendor/*", "dist/*", "models/models.ts"],
-}, ...compat.extends(
-    "@nuxtjs/eslint-config-typescript",
-    "plugin:nuxt/recommended",
-    "eslint:recommended",
-    "plugin:@typescript-eslint/recommended",
-    "plugin:vue/vue3-recommended",
-    "plugin:prettier/recommended",
-    "plugin:you-dont-need-lodash-underscore/compatible",
-), {
+export default [
+  {
+    ignores: [
+      '**/.nuxt',
+      'coverage/*',
+      'vendor/*',
+      'dist/*',
+      'models/models.ts',
+    ],
+  },
+  ...compat.extends(
+    '@nuxtjs/eslint-config-typescript',
+    'plugin:nuxt/recommended',
+    'eslint:recommended',
+    'plugin:@typescript-eslint/recommended',
+    'plugin:vue/vue3-recommended',
+    'plugin:prettier/recommended',
+    'plugin:you-dont-need-lodash-underscore/compatible',
+  ),
+  {
     plugins: {
-        vue,
-        "@typescript-eslint": typescriptEslint,
+      vue,
+      '@typescript-eslint': typescriptEslint,
     },
 
     languageOptions: {
-        globals: {
-            ...globals.browser,
-            ...globals.node,
-            useRuntimeConfig: "readonly",
-            useAsyncData: "readonly",
-            navigateTo: "readonly",
-            computed: "readonly",
-            ref: "readonly",
-            definePageMeta: "readonly",
-            useRouter: "readonly",
-            useRoute: "readonly",
-            useI18n: "readonly",
-            onMounted: "readonly",
-            onUnmounted: "readonly",
-            watch: "readonly",
-            useRepo: "readonly",
-        },
+      globals: {
+        ...globals.browser,
+        ...globals.node,
+        useRuntimeConfig: 'readonly',
+        useAsyncData: 'readonly',
+        navigateTo: 'readonly',
+        computed: 'readonly',
+        ref: 'readonly',
+        definePageMeta: 'readonly',
+        useRouter: 'readonly',
+        useRoute: 'readonly',
+        useI18n: 'readonly',
+        onMounted: 'readonly',
+        onUnmounted: 'readonly',
+        watch: 'readonly',
+        useRepo: 'readonly',
+      },
 
-        parser: parser,
-        ecmaVersion: 2020,
-        sourceType: "module",
+      parser: parser,
+      ecmaVersion: 2020,
+      sourceType: 'module',
 
-        parserOptions: {
-            parser: "@typescript-eslint/parser",
-            tsconfigRootDir: "/home/workspace",
-        },
+      parserOptions: {
+        parser: '@typescript-eslint/parser',
+        tsconfigRootDir: '/home/workspace',
+      },
     },
 
     rules: {
-        "no-console": 0,
+      'no-console': 0,
 
-        "vue/valid-v-slot": ["error", {
-            allowModifiers: true,
-        }],
+      'vue/valid-v-slot': [
+        'error',
+        {
+          allowModifiers: true,
+        },
+      ],
 
-        "vue/multi-word-component-names": 0,
-        "@typescript-eslint/no-inferrable-types": 0,
+      'vue/multi-word-component-names': 0,
+      '@typescript-eslint/no-inferrable-types': 0,
     },
-}];
+  },
+]

i18n/lang/fr.json

@@ -1,4 +1,5 @@
 {
+  "i_subscribe": "Je m'abonne",
   "price_include_cmf": "Inclus avec votre adhésion CMF",
   "artist": "Artist Standard",
   "trial_started": "Sur votre période d'essai.\nSouscrire à l'offre Premium.",

nuxt.config.ts

@@ -38,30 +38,30 @@ export default defineNuxtConfig({
     renderJsonPayloads: false,
   },
 
- runtimeConfig: {
-   // Private config that is only available on the server
-   env: '',
-   baseUrl: '',
-   baseUrlLegacy: '',
-   baseUrlAdminLegacy: '',
-   baseUrlTypo3: '',
-   baseUrlMercure: '',
-   fileStorageBaseUrl: '',
-   supportUrl: '',
-   basicomptaUrl: '',
-   // Config within public will be also exposed to the client
-   public: {
-     env: '',
-     baseUrl: '',
-     baseUrlLegacy: '',
-     baseUrlAdminLegacy: '',
-     baseUrlTypo3: '',
-     baseUrlMercure: '',
-     fileStorageBaseUrl: '',
-     supportUrl: '',
-     basicomptaUrl: '',
-   },
- },
+  runtimeConfig: {
+    // Private config that is only available on the server
+    env: '',
+    baseUrl: '',
+    baseUrlLegacy: '',
+    baseUrlAdminLegacy: '',
+    baseUrlTypo3: '',
+    baseUrlMercure: '',
+    fileStorageBaseUrl: '',
+    supportUrl: '',
+    basicomptaUrl: '',
+    // Config within public will be also exposed to the client
+    public: {
+      env: '',
+      baseUrl: '',
+      baseUrlLegacy: '',
+      baseUrlAdminLegacy: '',
+      baseUrlTypo3: '',
+      baseUrlMercure: '',
+      fileStorageBaseUrl: '',
+      supportUrl: '',
+      basicomptaUrl: '',
+    },
+  },
 
   hooks: {
     'builder:watch': console.log,
@@ -241,5 +241,5 @@ export default defineNuxtConfig({
     scripts: ['prepare/buildIndex.ts'],
   },
 
- compatibilityDate: '2025-03-10'
+  compatibilityDate: '2025-03-10',
 })

pages/my-settings.vue

@@ -9,11 +9,7 @@ Page 'Mes préférences'
           <v-container fluid class="container">
             <v-row>
               <UiLoadingPanel v-if="pending" />
-              <UiForm
-                v-else
-                v-model="preferences"
-                action-position="bottom"
-              >
+              <UiForm v-else v-model="preferences" action-position="bottom">
                 <v-row>
                   <v-col cols="12">
                     <UiInputCheckbox

pages/parameters/attendances.vue

@@ -2,10 +2,7 @@
   <LayoutContainer>
     <div v-if="organizationProfile.isSchool">
       <UiLoadingPanel v-if="pending" />
-      <UiForm
-        v-else-if="parameters !== null"
-        v-model="parameters"
-      >
+      <UiForm v-else-if="parameters !== null" v-model="parameters">
         <v-row>
           <v-col cols="12">
             <UiInputCheckbox

pages/parameters/bulletin.vue

@@ -1,10 +1,7 @@
 <template>
   <LayoutContainer>
     <UiLoadingPanel v-if="pending" />
-    <UiForm
-      v-else
-      v-model="parameters"
-    >
+    <UiForm v-else v-model="parameters">
       <v-row>
         <v-col cols="12">
           <UiInputCheckbox

pages/parameters/education_notation.vue

@@ -1,10 +1,7 @@
 <template>
   <LayoutContainer>
     <UiLoadingPanel v-if="pending" />
-    <UiForm
-      v-else
-      v-model="parameters"
-    >
+    <UiForm v-else v-model="parameters">
       <v-row>
         <v-col cols="12">
           <UiInputCheckbox

pages/parameters/education_timings/index.vue

@@ -22,5 +22,4 @@ if (organizationProfile.parametersId === null) {
 }
 </script>
 
-<style scoped lang="scss">
-</style>
+<style scoped lang="scss"></style>

pages/parameters/general_parameters.vue

@@ -1,10 +1,7 @@
 <template>
   <LayoutContainer>
     <UiLoadingPanel v-if="pending" />
-    <UiForm
-      v-else-if="parameters !== null"
-      v-model="parameters"
-    >
+    <UiForm v-else-if="parameters !== null" v-model="parameters">
       <v-row>
         <v-col cols="12">
           <UiInputDatePicker

pages/parameters/intranet.vue

@@ -1,13 +1,10 @@
 <template>
   <LayoutContainer>
     <UiLoadingPanel v-if="pending" />
-    <UiForm
-      v-else
-      v-model="parameters"
-    >
+    <UiForm v-else v-model="parameters">
       <v-row>
         <v-col cols="12">
-          <h3>{{ $t('teachers')}}</h3>
+          <h3>{{ $t('teachers') }}</h3>
           <UiInputCheckbox
             v-model="parameters.createCourse"
             field="createCourse"
@@ -32,7 +29,7 @@
             label="allow_teachers_to_generate_attendance_reports"
           />
 
-          <h3>{{ $t('pupils-members')}}</h3>
+          <h3>{{ $t('pupils-members') }}</h3>
           <UiInputCheckbox
             v-model="parameters.administrationCc"
             field="administrationCc"

pages/parameters/residence_areas/index.vue

@@ -15,5 +15,4 @@ definePageMeta({
 })
 </script>
 
-<style scoped lang="scss">
-</style>
+<style scoped lang="scss"></style>

pages/parameters/sms.vue

@@ -1,9 +1,6 @@
 <template>
   <div>
-    <UiForm
-      v-if="parameters"
-      v-model="parameters"
-    >
+    <UiForm v-if="parameters" v-model="parameters">
       <v-row>
         <v-col cols="12">
           <UiInputText

pages/parameters/subdomains/new.vue

@@ -69,10 +69,7 @@ const organizationProfileStore = useOrganizationProfileStore()
 
 // @ts-expect-error TODO à résoudre quand l'EM pourra gérer les types génériques
 const subdomain: Ref<Subdomain> = ref(
-  em.newInstance(
-    Subdomain,
-    { organization: organizationProfileStore.id }
-  )
+  em.newInstance(Subdomain, { organization: organizationProfileStore.id }),
 )
 
 const submitActions = computed(() => {

pages/parameters/super_admin.vue

@@ -20,7 +20,9 @@
         <tbody>
           <tr>
             <td>{{ $t('username') }} :</td>
-            <td><b>{{ adminAccess.username }}</b></td>
+            <td>
+              <b>{{ adminAccess.username }}</b>
+            </td>
           </tr>
         </tbody>
       </v-table>

pages/parameters/teaching.vue

@@ -1,13 +1,13 @@
 <template>
   <LayoutContainer>
     <UiLoadingPanel v-if="pending" />
-    <UiForm
-      v-else-if="parameters !== null"
-      v-model="parameters"
-    >
+    <UiForm v-else-if="parameters !== null" v-model="parameters">
       <LayoutParametersTable
         :items="tableItems"
-        :columns-definitions="[{ property: 'originalLabel' }, { property: 'effectiveLabel' }]"
+        :columns-definitions="[
+          { property: 'originalLabel' },
+          { property: 'effectiveLabel' },
+        ]"
         identifier="value"
         :actions="[TABLE_ACTION.EDIT]"
         @editClicked="goToCycleEditPage"
@@ -32,7 +32,7 @@ import { useOrganizationProfileStore } from '~/stores/organizationProfile'
 import type { AnyJson } from '~/types/data'
 import { useEnumFetch } from '~/composables/data/useEnumFetch'
 import ApiResource from '~/models/ApiResource'
-import {TABLE_ACTION} from '~/types/enum/enums';
+import { TABLE_ACTION } from '~/types/enum/enums'
 
 definePageMeta({
   name: 'parameters_teaching_page',
@@ -84,13 +84,15 @@ const orderedCycles: ComputedRef<AnyJson> = computed(() => {
 })
 
 const tableItems = computed(() => {
-  return cycleEnum.value?.map((item) => {
-    return {
-      value: item.value,
-      originalLabel: item.label,
-      effectiveLabel: (orderedCycles.value[item.value] ?? item).label,
-    }
-  }) || []
+  return (
+    cycleEnum.value?.map((item) => {
+      return {
+        value: item.value,
+        originalLabel: item.label,
+        effectiveLabel: (orderedCycles.value[item.value] ?? item).label,
+      }
+    }) || []
+  )
 })
 
 const goToCycleEditPage = (item: object) => {
@@ -99,5 +101,4 @@ const goToCycleEditPage = (item: object) => {
 }
 </script>
 
-<style scoped lang="scss">
-</style>
+<style scoped lang="scss"></style>

pages/subscription.vue

@@ -291,12 +291,20 @@ Page 'Mon abonnement'
                         *Convient aux petites écoles sans besoins spécifiques de
                         gestion pédagogique, de facturation, etc. Pour une
                         solution complète optez pour Opentalent School
-                        <br />
-                        **Tarif
-                        <span v-if="organizationProfile.isCmf"
-                          >adhérent CMF</span
-                        ><span v-else>public</span> 2025. Abonnement payable
-                        annuellement.
+                        <span
+                          v-if="
+                            !organizationProfile.isArtistPremiumProduct ||
+                            organizationProfile.isTrialActive
+                          "
+                        >
+                          <br />
+                            **Tarif
+                            <span v-if="organizationProfile.isCmf"
+                            >adhérent CMF</span
+                            ><span v-else>public</span> 2025. Abonnement payable
+                            annuellement.
+                        </span>
+
                       </span>
                     </v-col>
                   </v-row>
@@ -677,6 +685,10 @@ const downloadDolibarrBill = (ref: string): void => {
   border: 1px solid rgb(var(--v-theme-artist));
 }
 
+.btn{
+  font-size: 12px;
+}
+
 .optionsCard {
   :deep(.margin-sup) {
     margin-top: 0;

plugins/init.server.ts

@@ -8,7 +8,8 @@ export default defineNuxtPlugin(async () => {
 
   const bearer: CookieRef<string | null> = useCookie('BEARER') ?? null
   const accessCookieId: CookieRef<string | null> = useCookie('AccessId') ?? null
-  const switchCookieId: CookieRef<string | null> = useCookie('SwitchAccessId') ?? null
+  const switchCookieId: CookieRef<string | null> =
+    useCookie('SwitchAccessId') ?? null
 
   if (accessCookieId.value === null || Number.isNaN(accessCookieId.value)) {
     redirectToLogout()
@@ -29,11 +30,7 @@ export default defineNuxtPlugin(async () => {
   const { initiateProfile } = useRefreshProfile()
 
   try {
-    await initiateProfile(
-      accessId,
-      bearer.value ?? '',
-      switchId,
-    )
+    await initiateProfile(accessId, bearer.value ?? '', switchId)
   } catch (error) {
     if (error instanceof UnauthorizedError) {
       redirectToLogout()

services/data/Filters/InArrayFilter.ts

@@ -7,7 +7,10 @@ import RefUtils from '~/services/utils/refUtils'
 
 export default class InArrayFilter extends AbstractFilter implements ApiFilter {
   field: string
-  filterValue: Array<string | number | null> | Ref<Array<string | number | null>> | null
+  filterValue:
+    | Array<string | number | null>
+    | Ref<Array<string | number | null>>
+    | null
 
   /**
    * @param field
@@ -16,7 +19,10 @@ export default class InArrayFilter extends AbstractFilter implements ApiFilter {
    */
   constructor(
     field: string,
-    value: Array<string | number | null> | Ref<Array<string | number | null>> | null,
+    value:
+      | Array<string | number | null>
+      | Ref<Array<string | number | null>>
+      | null,
     reactiveFilter: boolean = false,
   ) {
     super(reactiveFilter)

services/data/entityManager.ts

@@ -77,10 +77,7 @@ class EntityManager {
    * @param instance
    */
   // noinspection JSMethodCanBeStatic
-  public cast(
-    model: typeof ApiResource,
-    instance: ApiResource,
-  ): ApiResource {
+  public cast(model: typeof ApiResource, instance: ApiResource): ApiResource {
     // eslint-disable-next-line new-cap
     return new model(instance)
   }

services/rights/abilityBuilder.ts

@@ -5,7 +5,7 @@ import RoleUtils from '~/services/rights/roleUtils'
 import type { AbilitiesType, AccessProfile } from '~/types/interfaces'
 import { ABILITIES } from '~/types/enum/enums'
 import type OrganizationProfile from '~/models/Organization/OrganizationProfile'
-import type { MongoAbility } from '@casl/ability/dist/types/Ability';
+import type { MongoAbility } from '@casl/ability/dist/types/Ability'
 
 interface ConditionParameters {
   action: string

tests/units/services/data/entityManager.test.ts

@@ -732,7 +732,7 @@ describe('reset', () => {
 
     const initialEntity = new DummyApiModel()
     initialEntity.id = 1
-    initialEntity.name = 'serges'
+    initialEntity.name = 'serge'
 
     // @ts-ignore
     entityManager.getInitialStateOf = vi.fn(
@@ -750,7 +750,7 @@ describe('reset', () => {
     // @ts-ignore
     repo.save = vi.fn((data: any) => null)
 
-    const result = entityManager.reset(DummyApiModel, entity)
+    const result = entityManager.reset(initialEntity)
 
     // @ts-ignore
     expect(entityManager.getInitialStateOf).toHaveBeenCalledWith(
@@ -769,8 +769,12 @@ describe('reset', () => {
     entityManager.getInitialStateOf = vi.fn(
       (model: typeof ApiResource, id: string | number) => null,
     )
+    // @ts-ignore
+    entityManager.getModel = vi.fn(
+      (instance: ApiResource) => DummyApiModel,
+    )
 
-    expect(() => entityManager.reset(DummyApiModel, entity)).toThrowError(
+    expect(() => entityManager.reset(entity)).toThrowError(
       'no initial state recorded for this object - abort [dummyModel/1]',
     )
   })

tests/units/services/rights/abilityBuilder.test.ts

@@ -40,11 +40,10 @@ const doc = {
 
 vi.mock('yaml-import', () => {
   return {
-    read: vi.fn((data: string) => doc)
+    read: vi.fn((data: string) => doc),
   }
 })
 
-
 beforeEach(() => {
   ability = vi.fn() as any as MongoAbility
   accessProfile = vi.fn() as any as AccessProfile

types/interfaces.d.ts

@@ -205,7 +205,7 @@ interface ColumnDefinition {
   /**
    * The entity's property to display in this column
    */
-  property: string,
+  property: string
   /**
    * Label of the column.
    * If not provided, a translation of the property's name will be looked for.