useContext à la place de useStore

useContext() à la place de useStore()

useContext() à la place de useStore()

useContext à la place de useStore

components/Layout/AlertBar/SuperAdmin.vue

@@ -15,15 +15,12 @@ Super Admin bar : Barre qui s'affiche lorsque l'utilisateur est un super admin e
 </template>
 
 <script lang="ts">
-import { defineComponent, useStore, useContext } from '@nuxtjs/composition-api'
-import { State } from '@vuex-orm/core'
-import { AnyStore } from '~/types/interfaces'
+import { defineComponent, useContext } from '@nuxtjs/composition-api'
 
 export default defineComponent({
   setup () {
-    const { $config } = useContext()
+    const { $config, store } = useContext()
     const baseLegacyUrl:string = $config.baseURL_adminLegacy
-    const store:AnyStore = useStore<State>()
     const originalAccess = store.state.profile.access.originalAccess
     let show = false
     let url = ''

components/Layout/AlertBar/SwitchUser.vue

@@ -14,13 +14,12 @@ Switch year bar : Barre qui s'affiche lorsque l'utilisateur possède un compte m
 </template>
 
 <script lang="ts">
-import { defineComponent, useStore} from '@nuxtjs/composition-api'
-import {accessState, AnyStore} from "~/types/interfaces";
-import {State} from "@vuex-orm/core";
+import { defineComponent, useContext} from '@nuxtjs/composition-api'
+import {accessState} from "~/types/interfaces";
 
 export default defineComponent({
   setup () {
-    const store:AnyStore = useStore<State>()
+    const {store} = useContext()
     const profileAccess:accessState = store.state.profile.access
 
     return {

components/Layout/Header/Menu.vue

@@ -69,9 +69,8 @@ header principal (configuration, paramètres du compte...)
 </template>
 
 <script lang="ts">
-import {defineComponent, useStore} from '@nuxtjs/composition-api'
+import {defineComponent, useContext} from '@nuxtjs/composition-api'
 import {accessState} from "~/types/interfaces";
-import {Store} from "vuex";
 
 export default defineComponent({
   props: {
@@ -85,7 +84,7 @@ export default defineComponent({
     }
   },
   setup () {
-    const store:Store<any> = useStore()
+    const {store} = useContext()
     const accessStore: accessState = store.state.profile.access
     return {
       avatarId: accessStore.avatarId,

components/Layout/Header/Notification.vue

@@ -73,20 +73,18 @@
 </template>
 
 <script lang="ts">
-import {computed, ComputedRef, defineComponent, onUnmounted, Ref, ref, useContext, useFetch, useStore, watch} from '@nuxtjs/composition-api'
+import {computed, ComputedRef, defineComponent, onUnmounted, Ref, ref, useContext, useFetch, watch} from '@nuxtjs/composition-api'
 import {NOTIFICATION_TYPE, QUERY_TYPE} from "~/types/enums";
 import {Notification} from "~/models/Core/Notification";
 import {repositoryHelper} from "~/services/store/repository";
-import {AnyStore, ApiResponse, HydraMetadata} from "~/types/interfaces";
+import {ApiResponse, HydraMetadata} from "~/types/interfaces";
 import {queryHelper} from "~/services/store/query";
 import {NotificationUsers} from "~/models/Core/NotificationUsers";
-import {State} from "@vuex-orm/core";
 import {$accessProfile} from "~/services/profile/accessProfile";
 
 export default defineComponent({
   setup: function () {
-    const {$dataProvider, $dataPersister, $config, app: { i18n }} = useContext()
-    const store:AnyStore = useStore<State>()
+    const {$dataProvider, $dataPersister, $config, store, app: { i18n }} = useContext()
     const profileAccess = store.state.profile.access
     const currentAccessId = $accessProfile(store).getCurrentAccessId()
 

pages/organization/contact_points/new.vue

@@ -10,15 +10,14 @@
 </template>
 
 <script lang="ts">
-import {defineComponent, useStore} from '@nuxtjs/composition-api'
+import {defineComponent, useContext} from '@nuxtjs/composition-api'
 import {ContactPoint} from "~/models/Core/ContactPoint";
 import {UseDataUtils} from "~/use/data/useDataUtils";
-import {Store} from "vuex";
 
 export default defineComponent({
   name: 'NewContactPoint',
   setup (){
-    const store:Store<any> = useStore()
+    const {store} = useContext()
     const {createItem} = new UseDataUtils().invoke()
     const {create, loading, item} = createItem()
 

use/data/useDataUtils.ts

@@ -1,6 +1,6 @@
 import { AnyJson } from '~/types/interfaces'
 import {FORM_STATUS, QUERY_TYPE} from "~/types/enums";
-import {ref, Ref, useContext, useFetch, useStore} from '@nuxtjs/composition-api'
+import {ref, Ref, useContext, useFetch} from '@nuxtjs/composition-api'
 import DataProvider from "~/services/data/dataProvider";
 import {Model} from "@vuex-orm/core";
 import {repositoryHelper} from "~/services/store/repository";
@@ -17,9 +17,9 @@ export class UseDataUtils {
   private store: Store<any>
 
   constructor() {
-    const { route, $dataProvider } = useContext()
-    this.store = useStore()
+    const { route, $dataProvider, store } = useContext()
     this.$dataProvider = $dataProvider
+    this.store = store
     this.route = route
   }
 

use/form/useError.ts

@@ -1,5 +1,5 @@
 import { AnyJson, AnyStore } from '~/types/interfaces'
-import {computed, ComputedRef, useStore} from "@nuxtjs/composition-api";
+import {computed, ComputedRef, useContext} from "@nuxtjs/composition-api";
 
 /**
  * @category Use/form
@@ -10,7 +10,8 @@ export class UseError {
   private store: AnyStore
 
   constructor () {
-    this.store = useStore()
+    const {store} = useContext()
+    this.store = store
   }
 
   /**

use/form/useForm.ts

@@ -1,5 +1,5 @@
 import { AnyJson, AnyStore } from '~/types/interfaces'
-import {computed, ComputedRef, useStore} from "@nuxtjs/composition-api";
+import {computed, ComputedRef, useContext} from "@nuxtjs/composition-api";
 
 /**
  * @category Use/form
@@ -11,7 +11,8 @@ export class UseForm {
   private readonly handler: any
 
   constructor () {
-    this.store = useStore()
+    const {store} = useContext()
+    this.store = store
     this.handler = getEventHandler()
   }
 

use/updater/useMyProfileUpdater.ts

@@ -1,4 +1,4 @@
-import {computed, ComputedRef, useStore} from '@nuxtjs/composition-api'
+import {computed, ComputedRef} from '@nuxtjs/composition-api'
 import { Item, Model } from '@vuex-orm/core'
 import { repositoryHelper } from '~/services/store/repository'
 import { QUERY_TYPE } from '~/types/enums'
@@ -19,8 +19,8 @@ export class UseMyProfileUpdater {
   private myProfile!:MyProfile
 
   constructor () {
-    this.store = useStore()
-    const {$dataPersister} = useContext()
+    const {$dataPersister, store} = useContext()
+    this.store = store
     this.$dataPersister = $dataPersister
   }