@saooti/octopus-sdk 35.1.7 → 35.2.1

package/src/components/mixins/player/playerDisplay.ts

@@ -1,9 +1,10 @@
-import { Podcast } from '@/store/class/general/podcast';
-import DurationHelper from '../../../helper/duration';
-import { state } from '../../../store/paramStore';
+import { state } from '../../../stores/ParamSdkStore';
 import { defineComponent } from 'vue';
 import { RouteLocationRaw } from 'vue-router';
-import { MetadataRadio, Radio } from '@/store/class/general/player';
+import { MetadataRadio } from '@/stores/class/general/player';
+import { usePlayerStore } from '@/stores/PlayerStore';
+import { useFilterStore } from '@/stores/FilterStore';
+import { mapState, mapActions } from 'pinia';
 import octopusApi from '@saooti/octopus-api';
 export const playerDisplay = defineComponent({
 	props: {
@@ -15,41 +16,30 @@ export const playerDisplay = defineComponent({
     };
   },
 	computed:{
-		playedTime(): string{
-      if (this.$store.state.player.elapsed && this.$store.state.player.elapsed > 0 && this.$store.state.player.total && this.$store.state.player.total > 0) {
-        return DurationHelper.formatDuration(
-          Math.round(this.$store.state.player.elapsed * this.$store.state.player.total)
-        );
-      }
-      return '--:--';
-    },
-		totalTime(): string {
-      if (this.$store.state.player.elapsed && this.$store.state.player.elapsed > 0 && this.$store.state.player.total && this.$store.state.player.total > 0)
-        return DurationHelper.formatDuration(Math.round(this.$store.state.player.total));
-      return '--:--';
-    },
-		isPlaying(): boolean {
-			return 'PLAYING' === this.$store.state.player.status;
-		},
-		isPaused(): boolean {
-			return 'PAUSED' === this.$store.state.player.status;
-		},
-		podcast(): undefined|Podcast{
-			return this.$store.state.player.podcast;
-		},
+    ...mapState(usePlayerStore, [
+      'playerPodcast',
+      'playerRadio',
+      'playerLive',
+      'playerMedia',
+      'playedTime',
+      'totalTime',
+      'isPlaying',
+      'isPaused',
+      'podcastImage',
+      'emissionName',
+      'transcriptText',
+      'radioUrl'
+    ]),
+    ...mapState(useFilterStore, ['filterOrgaId']),
 		isImage(): boolean {
 			return (state.player.image as boolean);
 		},
-		podcastImage(): string{
-			if (this.$store.state.player.podcast) return this.$store.state.player.podcast.imageUrl;
-			return '';
-		},
 		podcastShareUrl(): RouteLocationRaw|string {
-			if (this.podcast) {
+			if (this.playerPodcast) {
 				return {
 					name: 'podcast',
-					params: { podcastId: this.podcast.podcastId.toString() },
-					query: { productor: this.$store.state.filter.organisationId },
+					params: { podcastId: this.playerPodcast.podcastId.toString() },
+					query: { productor: this.filterOrgaId },
 				};
 			}
 			return '';
@@ -58,40 +48,30 @@ export const playerDisplay = defineComponent({
       return (state.player.emissionName as boolean);
     },
 		podcastTitle(): string {
-      if(this.$store.state.player.radio){
-        return this.$store.state.player.radio.metadata.title + " " + this.$store.state.player.radio.metadata.artist;
+      if(this.playerRadio){
+        return this.playerRadio.metadata.title + " " + this.playerRadio.metadata.artist;
       }
-      if (this.$store.state.player.podcast) {
+      if (this.playerPodcast) {
         if (this.isEmissionName)
-          return this.emissionName + ' - ' + this.$store.state.player.podcast.title;
-        return this.$store.state.player.podcast.title;
+          return this.emissionName + ' - ' + this.playerPodcast.title;
+        return this.playerPodcast.title;
       }
-      if (this.$store.state.player.media) return this.$store.state.player.media.title;
-      if (this.$store.state.player.live) {
+      if (this.playerMedia) return this.playerMedia.title;
+      if (this.playerLive) {
         if (!this.hlsReady)
-          return this.$store.state.player.live.title + ' (' + this.$t('Start in a while') + ')';
-        return this.$store.state.player.live.title;
+          return this.playerLive.title + ' (' + this.$t('Start in a while') + ')';
+        return this.playerLive.title;
       }
       return '';
     },
-    emissionName(): string {
-      if (this.$store.state.player.podcast) return this.$store.state.player.podcast.emission.name;
-      return '';
-    },
-    transcriptText():string{
-      return this.$store.state.player.transcript?.actualText ?? "";
-    },
-    radio(): Radio{
-      return this.$store.state.player.radio?.url;
-    }
 	},
   watch:{
-    radio: {
+    playerRadio: {
       deep: true,
       immediate:true,
       handler(){
         clearInterval((this.radioInterval as unknown as number));
-        if(this.radio){
+        if(this.playerRadio){
           this.fetchRadioMetadata();
           this.radioInterval = setInterval(() => {
             this.fetchRadioMetadata();
@@ -108,9 +88,10 @@ export const playerDisplay = defineComponent({
     clearInterval((this.radioInterval as unknown as number));
   },
   methods: {
+    ...mapActions(usePlayerStore, ['playerMetadata', 'playerChangeStatus']),
     async fetchRadioMetadata(): Promise<void>{
-      const metadata = await octopusApi.fetchData<MetadataRadio>(14, 'player/playing/'+this.$store.state.player.radio.canalId);
-      this.$store.commit('player/radioMetadata', metadata.currently);
+      const metadata = await octopusApi.fetchData<MetadataRadio>(14, 'player/playing/'+this.playerRadio?.canalId);
+      this.playerMetadata(metadata.currently);
     },
     addKeyboardControl(event: KeyboardEvent): void{
       if(!event || null ===event){return;}
@@ -132,17 +113,7 @@ export const playerDisplay = defineComponent({
 		switchPausePlay(): void {
       const audioPlayer: HTMLAudioElement|null = document.querySelector('#audio-player');
       if(!audioPlayer){return;}
-      if (audioPlayer.paused) {
-        this.onPlay();
-      } else {
-        this.onPause();
-      }
-    },
-    onPlay(): void {
-      this.$store.commit('player/pause', false);
-    },
-    onPause(): void {
-      this.$store.commit('player/pause', true);
+      this.playerChangeStatus(!audioPlayer.paused);
     },
 	}
 });

package/src/components/mixins/player/playerLive.ts

@@ -1,11 +1,12 @@
-import { mapState } from 'vuex';
-import { state } from '../../../store/paramStore';
+import { state } from '../../../stores/ParamSdkStore';
 import octopusApi from '@saooti/octopus-api';
+import { usePlayerStore } from '@/stores/PlayerStore';
+import { useAuthStore } from '@/stores/AuthStore';
+import { mapState, mapActions } from 'pinia';
 /* eslint-disable */
 let Hls:any = null;
 /* eslint-enable */
 import { defineComponent } from 'vue';
-import { Player } from '@/store/class/general/player';
 export const playerLive = defineComponent({
   data() {
     return {
@@ -19,21 +20,21 @@ export const playerLive = defineComponent({
     };
   },
   computed: {
-    ...mapState('player',{
-      live(state: Player) { return state.live}
-    }),
+    ...mapState(usePlayerStore, ['playerLive', 'playerRadio']),
+    ...mapState(useAuthStore, ['authOrgaId'])
   },
   methods: {
+    ...mapActions(usePlayerStore, ['playerChangeStatus']),
     onPlay(): void {
-      this.$store.commit('player/pause', false);
+      this.playerChangeStatus(false);
     },
     playRadio(){
-      if (!this.radio) return;
-      this.playHls(this.radio.url);
+      if (!this.playerRadio) return;
+      this.playHls(this.playerRadio.url);
     },
     playLive() {
-      if (!this.live) return;
-      const hlsStreamUrl = `${state.podcastPage.hlsUri}stream/dev.${this.live.conferenceId}/index.m3u8`;
+      if (!this.playerLive) return;
+      const hlsStreamUrl = `${state.podcastPage.hlsUri}stream/dev.${this.playerLive.conferenceId}/index.m3u8`;
       this.playHls(hlsStreamUrl);
     },
     async playHls(hlsStreamUrl: string): Promise<void>{
@@ -60,14 +61,14 @@ export const playerLive = defineComponent({
       }
     },
     async initLiveDownloadId(){
-      if(!this.live){ return;}
+      if(!this.playerLive){ return;}
       let downloadId = null;
       try {
-        downloadId = await octopusApi.putDataPublic<string | null>(0, 'podcast/prepare/live/'+this.live.livePodcastId, undefined);
-        await octopusApi.fetchDataPublicWithParams<string | null>(0,'podcast/download/live/' + this.live.livePodcastId+".m3u8",{
+        downloadId = await octopusApi.putDataPublic<string | null>(0, 'podcast/prepare/live/'+this.playerLive.livePodcastId, undefined);
+        await octopusApi.fetchDataPublicWithParams<string | null>(0,'podcast/download/live/' + this.playerLive.livePodcastId+".m3u8",{
           'downloadId': null!==downloadId ? downloadId : undefined,
           'origin':'octopus',
-          'distributorId':this.$store.state.auth?.organisationId
+          'distributorId':this.authOrgaId
         });
         this.setDownloadId(downloadId);
       } catch (error) {

package/src/components/mixins/player/playerLogic.ts

@@ -1,12 +1,13 @@
-import { mapState } from 'vuex';
 import octopusApi from '@saooti/octopus-api';
-import { CommentPodcast } from '@/store/class/general/comment';
+import { CommentPodcast } from '@/stores/class/general/comment';
 import cookies from '../cookies';
 import { playerLive } from './playerLive';
 import { playerComment } from './playerComment';
 import { playerTranscript } from './playerTranscript';
 import { defineComponent } from 'vue';
-import { Player } from '@/store/class/general/player';
+import { useAuthStore } from '@/stores/AuthStore';
+import { usePlayerStore } from '@/stores/PlayerStore';
+import { mapState, mapActions } from 'pinia';
 export const playerLogic = defineComponent({
   mixins:[cookies,playerLive,playerComment, playerTranscript],
   data() {
@@ -28,19 +29,16 @@ export const playerLogic = defineComponent({
     };
   },
   computed: {
-    ...mapState('player',{
-      podcast (state: Player){ return state.podcast},
-      media: (state: Player) => state.media,
-      live: (state: Player) => state.live,
-      radio: (state: Player) => state.radio,
-      volume: (state: Player) => state.volume,
-      status : (state: Player) => state.status,
-      percentProgress: (state: Player) => {
-        if(!state.elapsed){return 0;}
-        return state.elapsed * 100;
-      },
-      playerSeekTime: (state: Player) => state.seekTime,
-    }),
+    ...mapState(useAuthStore, ['authOrgaId', 'authParam']),
+    ...mapState(usePlayerStore, [
+      'playerPodcast',
+      'playerMedia', 
+      'playerLive', 
+      'playerRadio', 
+      'playerVolume', 
+      'playerStatus', 
+      'playerSeekTime']),
+      
     audioUrl(): string {
       return this.getAudioUrl();
     },
@@ -49,22 +47,22 @@ export const playerLogic = defineComponent({
   watch: {
     async audioUrl(): Promise<void>{
       this.playerError = false;
-      if(this.media || !this.podcast || !this.podcast.availability.visibility ||this.listenError){
+      if(this.playerMedia || !this.playerPodcast || !this.playerPodcast.availability.visibility ||this.listenError){
         this.audioUrlToPlay = this.audioUrl;
       }
-      if(!this.podcast || !this.podcast.availability.visibility ||this.listenError){return;}
+      if(!this.playerPodcast || !this.playerPodcast.availability.visibility ||this.listenError){return;}
       const response = await octopusApi.fetchDataPublic<{location:string, downloadId: number}>(0,"podcast/download/register/"+ this.getAudioUrlParameters());
       this.setDownloadId(response.downloadId.toString());
       this.audioUrlToPlay = response.location;
     },
-    podcast: {
+    playerPodcast: {
       deep: true,
       handler(){
         this.reInitPlayer();
         this.getTranscription();
       }
     },
-    live: {
+    playerLive: {
       deep: true,
       handler(){
         this.$nextTick(async () => {
@@ -74,7 +72,7 @@ export const playerLogic = defineComponent({
         });
       }
     },
-    radio(){
+    playerRadio(){
       this.$nextTick(async () => {
         this.hlsReady = false;
         this.reInitPlayer();
@@ -82,7 +80,7 @@ export const playerLogic = defineComponent({
       });
     },
     async listenTime(newVal): Promise<void> {
-      if (this.radio && (!this.podcast && !this.live)||(!this.downloadId)||(newVal - this.lastSend < 10)) {
+      if (this.playerRadio && (!this.playerPodcast && !this.playerLive)||(!this.downloadId)||(newVal - this.lastSend < 10)) {
         return;
       }
       this.lastSend = newVal;
@@ -90,35 +88,35 @@ export const playerLogic = defineComponent({
     },
     playerSeekTime(){
       if(!this.playerSeekTime){return;}
-      if (this.$store.state.player.podcast || this.$store.state.player.live) {
+      if (this.playerPodcast || this.playerLive) {
         this.notListenTime = this.playerSeekTime - this.listenTime;
       }
       const audioPlayer: HTMLAudioElement | null = document.querySelector('#audio-player');
       if (!audioPlayer) return;
       audioPlayer.currentTime = this.playerSeekTime;
     },
-    status() {
+    playerStatus() {
       const audioPlayer: HTMLAudioElement | null = document.querySelector('#audio-player');
       if (!audioPlayer) return;
-      if (this.live && !this.hlsReady) {
+      if (this.playerLive && !this.hlsReady) {
         audioPlayer.pause();
         this.percentLiveProgress = 0;
         this.durationLivePosition = 0;
         return;
       }
-      if ('PAUSED' === this.status && this.radio) {
+      if ('PAUSED' === this.playerStatus && this.playerRadio) {
         this.hlsReady = false;
         this.reInitPlayer();
         this.endingLive();
-      }else if('PAUSED' === this.status){
+      }else if('PAUSED' === this.playerStatus){
         audioPlayer.pause();
-      }else if ('PLAYING' === this.status && this.radio){
-        if(this.radio.isInit){
+      }else if ('PLAYING' === this.playerStatus && this.playerRadio){
+        if(this.playerRadio.isInit){
           this.playRadio();
         }else{
-          this.radio.isInit = true;
+          this.playerRadio.isInit = true;
         }
-      }else if('PLAYING' === this.status){
+      }else if('PLAYING' === this.playerStatus){
         audioPlayer.play();
       }
     },
@@ -129,6 +127,7 @@ export const playerLogic = defineComponent({
   },
   
   methods: {
+    ...mapActions(usePlayerStore, ['playerPlay', 'playerUpdateElapsed']),
     getDomain(): string{
       let domain = "";
       const domainArray: RegExpExecArray | null = /\.(.+)/.exec(window.location.host);
@@ -138,41 +137,38 @@ export const playerLogic = defineComponent({
       return domain;
     },
     getAudioUrlParameters(): string{
-      if (!this.podcast) return '';
+      if (!this.playerPodcast) return '';
       const parameters = [];
       parameters.push('origin=octopus');
       parameters.push('listenerId='+this.getListenerId());
-      if (
-        this.$store.state.auth &&
-        this.$store.state.auth.organisationId
-      ) {
+      if (this.authOrgaId) {
         parameters.push(
-          'distributorId=' + this.$store.state.auth.organisationId
+          'distributorId=' + this.authOrgaId
         );
       }
-      if("SECURED" === this.podcast.organisation.privacy && this.$store.state.auth && this.$store.state.auth.oAuthParam.accessToken){
-        parameters.push('access_token='+this.$store.state.auth?.oAuthParam.accessToken);
+      if("SECURED" === this.playerPodcast.organisation.privacy && this.authParam.accessToken){
+        parameters.push('access_token='+this.authParam.accessToken);
       }
-      return this.podcast.podcastId + '.mp3?' + parameters.join('&');
+      return this.playerPodcast.podcastId + '.mp3?' + parameters.join('&');
     },
     getAudioUrl(): string{
-      if (this.media) return this.media.audioUrl? this.media.audioUrl:"";
-      if (!this.podcast) return '';
-      if (!this.podcast.availability.visibility || "PROCESSING"===this.podcast.processingStatus)
-        return this.podcast.audioStorageUrl;
-      if (this.listenError) return this.podcast.audioStorageUrl;
+      if (this.playerMedia) return this.playerMedia.audioUrl? this.playerMedia.audioUrl:"";
+      if (!this.playerPodcast) return '';
+      if (!this.playerPodcast.availability.visibility || "PROCESSING"===this.playerPodcast.processingStatus)
+        return this.playerPodcast.audioStorageUrl;
+      if (this.listenError) return this.playerPodcast.audioStorageUrl;
       return this.getAudioUrlParameters();
     },
     reInitPlayer():void{
       this.setDownloadId(null);
       this.listenError = false;
       this.initComments();
-      if (this.live || this.radio) {
+      if (this.playerLive || this.playerRadio) {
         this.endingLive();
       }
     },
     stopPlayer(): void {
-      this.$store.commit('player/playPodcast');
+      this.playerPlay();
     },
     getListenerId(): string{
       let listenerId = this.getCookie("octopus_listenerId");
@@ -183,9 +179,9 @@ export const playerLogic = defineComponent({
       return listenerId;
     },
     onError(): void {
-      if (this.podcast && ""!==this.audioUrlToPlay &&  !this.listenError) {
+      if (this.playerPodcast && ""!==this.audioUrlToPlay &&  !this.listenError) {
         this.listenError = true;
-      } else if ((this.podcast && ""!==this.audioUrlToPlay ) || this.media) {
+      } else if ((this.playerPodcast && ""!==this.audioUrlToPlay ) || this.playerMedia) {
         this.playerError = true;
       }
     },
@@ -205,37 +201,31 @@ export const playerLogic = defineComponent({
     onTimeUpdatePodcast(streamDuration:number, currentTime:number){
       this.displayAlertBar = false;
       this.percentLiveProgress = 100;
-      this.$store.commit('player/totalTime', streamDuration);
-      this.$store.commit('player/elapsed', currentTime / streamDuration);
+      this.playerUpdateElapsed(currentTime / streamDuration, streamDuration);
       this.onTimeUpdateTranscript(currentTime);
     },
     onTimeUpdateLive(streamDuration: number, currentTime:number){
-      if(!this.live){return;}
-      const scheduledDuration = this.live.duration / 1000;
+      if(!this.playerLive){return;}
+      const scheduledDuration = this.playerLive.duration / 1000;
       if (scheduledDuration > streamDuration) {
         this.displayAlertBar = false;
         this.percentLiveProgress = (streamDuration / scheduledDuration) * 100;
-        this.$store.commit('player/totalTime', scheduledDuration);
-        this.$store.commit(
-          'player/elapsed',
-          currentTime / scheduledDuration
-        );
+        this.playerUpdateElapsed(currentTime / scheduledDuration, scheduledDuration);
       } else {
         this.percentLiveProgress = 100;
         this.displayAlertBar = true;
         this.durationLivePosition = (scheduledDuration / streamDuration) * 100;
-        this.$store.commit('player/totalTime', streamDuration);
-        this.$store.commit('player/elapsed', currentTime / streamDuration);
+        this.playerUpdateElapsed(currentTime / streamDuration, streamDuration);
       }
     },
     onTimeUpdate(event: Event): void {
       const mediaTarget = (event.currentTarget as HTMLMediaElement);
-      if (this.podcast || this.live) {
+      if (this.playerPodcast || this.playerLive) {
         if (!this.downloadId) {
           return;
         }
         if (
-          this.live &&
+          this.playerLive &&
           0 === this.listenTime &&
           0 !== mediaTarget.currentTime
         ) {
@@ -249,7 +239,7 @@ export const playerLogic = defineComponent({
       let streamDuration = this.streamDurationForSafari(mediaTarget);
       if (!streamDuration) return;
       if (!mediaTarget.currentTime) return;
-      if (!this.live) {
+      if (!this.playerLive) {
         this.onTimeUpdatePodcast(streamDuration,mediaTarget.currentTime);
         return;
       }
@@ -262,7 +252,7 @@ export const playerLogic = defineComponent({
     },
     onFinished(): void {
       this.setDownloadId(null);
-      if (this.live) {
+      if (this.playerLive) {
         this.endingLive();
       }
       this.forceHide = true;

package/src/components/mixins/player/playerTranscript.ts

@@ -1,16 +1,22 @@
 import octopusApi from '@saooti/octopus-api';
 import { defineComponent } from 'vue';
+import { usePlayerStore } from '@/stores/PlayerStore';
+import { mapState, mapActions } from 'pinia';
 export const playerTranscript = defineComponent({
+  computed: {
+    ...mapState(usePlayerStore, ['playerTranscript', 'playerPodcast']),
+  },
   methods: {
+    ...mapActions(usePlayerStore, ['playerUpdateTranscript']),
     async getTranscription(): Promise<void>{
-      if(!this.podcast){
-        this.$store.commit('player/transcript',undefined);
+      if(!this.playerPodcast){
+        this.playerUpdateTranscript(undefined);
         return;
       }
-      const result = await octopusApi.fetchDataPublic<string>(11 , `response/${this.podcast.podcastId}`);
+      const result = await octopusApi.fetchDataPublic<string>(11 , `response/${this.playerPodcast.podcastId}`);
       const arrayTranscript = this.parseSrt(result);
       const actualText = arrayTranscript?.[0]?.startTime === 0 ? arrayTranscript[0].text : "";
-      this.$store.commit('player/transcript',{actual: 0,actualText:actualText, value : arrayTranscript});
+      this.playerUpdateTranscript({actual: 0,actualText:actualText, value : arrayTranscript});
     },
     parseSrt(transcript: string){
       const pattern = /(\d+)\n([\d:,]+)\s+-{2}\>\s+([\d:,]+)\n([\s\S]*?(?=\n{2}|$))/gm;
@@ -37,18 +43,18 @@ export const playerTranscript = defineComponent({
       return (+a[0]) * 60 * 60 + (+a[1]) * 60 + (+parseFloat(a[2])); 
     },
     onTimeUpdateTranscript(currentTime:number){
-      if((this.$store.state.player.transcript?.value[this.$store.state.player.transcript?.actual]?.endTime ?? Infinity) < currentTime){
-        this.$store.state.player.transcript.actual +=1;
-        this.$store.state.player.transcript.actualText = this.$store.state.player.transcript?.value[this.$store.state.player.transcript?.actual].text ?? "";
+      if(this.playerTranscript && (this.playerTranscript?.value[this.playerTranscript?.actual]?.endTime ?? Infinity) < currentTime){
+        this.playerTranscript.actual +=1;
+        this.playerTranscript.actualText = this.playerTranscript?.value[this.playerTranscript?.actual].text ?? "";
       }
     },
     onSeekedTranscript(currentTime: number){
-      if(this.$store.state.player.transcript){
+      if(this.playerTranscript){
         let newActual = 0;
-        while (currentTime > (this.$store.state.player.transcript.value[newActual]?.endTime ?? Infinity)){
+        while (currentTime > (this.playerTranscript.value[newActual]?.endTime ?? Infinity)){
           newActual +=1;
         }
-        this.$store.state.player.transcript.actual = newActual;
+        this.playerTranscript.actual = newActual;
       }
     }
   },

package/src/components/pages/Category.vue

@@ -5,16 +5,18 @@
       :first="0"
       :size="30"
       :iab-id="iabId"
-      :organisation-id="filterOrga"
+      :organisation-id="filterOrgaId"
     />
   </div>
 </template>
 
 <script lang="ts">
 import PodcastList from '../display/podcasts/PodcastList.vue';
-
+import { useFilterStore } from '@/stores/FilterStore';
+import { useGeneralStore } from '@/stores/GeneralStore';
+import { mapState } from 'pinia';
 import { defineComponent } from 'vue'
-import { Category } from '@/store/class/general/category';
+import { Category } from '@/stores/class/general/category';
 export default defineComponent({
   components: {
     PodcastList,
@@ -24,14 +26,10 @@ export default defineComponent({
   },
 
   computed: {
-    categories(): Array<Category> {
-      return this.$store.state.categories;
-    },
-    filterOrga(): string {
-      return this.$store.state.filter.organisationId;
-    },
+    ...mapState(useGeneralStore, ['storedCategories']),
+    ...mapState(useFilterStore, ['filterOrgaId']),
     title():string{
-      const matchCategories = this.categories.filter((c: Category) => c.id === this.iabId);
+      const matchCategories = this.storedCategories.filter((c: Category) => c.id === this.iabId);
       if (1 !== matchCategories.length) return "";
       return matchCategories[0]['name'];
     }

package/src/components/pages/Emission.vue

@@ -83,12 +83,12 @@
 
 <script lang="ts">
 import octopusApi from '@saooti/octopus-api';
-import { state } from '../../store/paramStore';
+import { state } from '../../stores/ParamSdkStore';
 import displayMethods from '../mixins/displayMethods';
 import imageProxy from '../mixins/imageProxy';
 import { orgaComputed } from '../mixins/orgaComputed';
 import { handle403 } from '../mixins/handle403';
-import { Emission } from '@/store/class/general/emission';
+import { Emission } from '@/stores/class/general/emission';
 import ClassicLoading from '../form/ClassicLoading.vue';
 import { defineComponent, defineAsyncComponent } from 'vue';
 import { AxiosError } from 'axios';
@@ -200,7 +200,7 @@ export default defineComponent({
       this.error = false;
       try {
         this.emission = await octopusApi.fetchData<Emission>(0,'emission/'+this.emissionId);
-        if("PUBLIC"!==this.emission.orga.privacy && this.filterOrga!==this.emission.orga.id){
+        if("PUBLIC"!==this.emission.orga.privacy && this.filterOrgaId!==this.emission.orga.id){
           this.initError();
           return;
         }

package/src/components/pages/Emissions.vue

@@ -46,8 +46,10 @@
 import { orgaComputed } from '../mixins/orgaComputed';
 import EmissionList from '../display/emission/EmissionList.vue';
 import AdvancedSearch from '../display/filter/AdvancedSearch.vue';
-import { state } from '../../store/paramStore';
-import { RubriquageFilter } from '@/store/class/rubrique/rubriquageFilter';
+import { state } from '../../stores/ParamSdkStore';
+import { useFilterStore } from '@/stores/FilterStore';
+import { mapState } from 'pinia';
+import { RubriquageFilter } from '@/stores/class/rubrique/rubriquageFilter';
 import { defineComponent, defineAsyncComponent } from 'vue';
 const ProductorSearch = defineAsyncComponent(() => import('../display/filter/ProductorSearch.vue'));
 export default defineComponent({
@@ -82,6 +84,7 @@ export default defineComponent({
   },
   
   computed: {
+    ...mapState(useFilterStore, ['filterIab', 'filterRubrique']),
     titleDisplay(): string{
       return state.emissionsPage.titlePage??this.$t('All emissions');
     },
@@ -93,7 +96,7 @@ export default defineComponent({
         true===state.generalParameters.isAdmin
     },
     organisation(): string|undefined {
-      return this.organisationId?this.organisationId:this.filterOrga;
+      return this.organisationId?this.organisationId:this.filterOrgaId;
     },
   },
   watch:{
@@ -114,13 +117,13 @@ export default defineComponent({
   },
   methods: {
     initComponent(): void{
-      this.iabId =this.$store.state.filter.iab?.id;
-      this.organisationId = this.productor ?this.productor: this.filterOrga;
+      this.iabId =this.filterIab?.id;
+      this.organisationId = this.productor ?this.productor: this.filterOrgaId;
       if (this.organisation && this.organisationRight) {
         this.includeHidden = true;
       }
-      if(this.$store.state.filter.rubriqueFilter.length){
-        this.updateRubriquageFilter(this.$store.state.filter.rubriqueFilter);
+      if(this.filterRubrique.length){
+        this.updateRubriquageFilter(this.filterRubrique);
       }
       this.$nextTick(() => {
         this.isInit = true;