@saooti/octopus-sdk 33.0.9 → 33.1.1

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

@@ -4,8 +4,9 @@ import { CommentPodcast } from '@/store/class/general/comment';
 import { cookies } from '../functions';
 import { playerLive } from './playerLive';
 import { playerComment } from './playerComment';
-import { StoreState } from '@/store/typeAppStore';
 import { defineComponent } from 'vue';
+import { Player } from '@/store/class/general/player';
+import { StoreState } from '@/store/classStore/typeAppStore';
 export const playerLogic = defineComponent({
   mixins:[cookies,playerLive,playerComment],
   data() {
@@ -27,18 +28,20 @@ export const playerLogic = defineComponent({
     };
   },
   computed: {
-    ...mapState({
-      podcast (state: StoreState){ return state.player.podcast},
-      media: (state: StoreState) => state.player.media,
-      live: (state: StoreState) => state.player.live,
-      volume: (state: StoreState) => state.player.volume,
-      commentsLoaded: (state: StoreState) => state.comments.loadedComments,
-      percentProgress: (state: StoreState) => {
-        if(!state.player.elapsed){return 0;}
-        return state.player.elapsed * 100;
+    ...mapState('player',{
+      podcast (state: Player){ return state.podcast},
+      media: (state: Player) => state.media,
+      live: (state: Player) => state.live,
+      volume: (state: Player) => state.volume,
+      percentProgress: (state: Player) => {
+        if(!state.elapsed){return 0;}
+        return state.elapsed * 100;
       },
-      playerSeekTime: (state: StoreState) => state.player.seekTime,
+      playerSeekTime: (state: Player) => state.seekTime,
     }),
+    commentsLoaded(){
+      return this.$store.state.comments.loadedComments;
+    },
     audioUrl(): string {
       return this.getAudioUrl();
     },
@@ -98,13 +101,13 @@ export const playerLogic = defineComponent({
   methods: {
     async getTranscription(): Promise<void>{
       if(!this.podcast){
-        this.$store.commit('playerTranscript',undefined);
+        this.$store.commit('player/transcript',undefined);
         return;
       }
       const result = await octopusApi.fetchDataPublic<string>(11 , `response/${this.podcast.podcastId}`);
       const arrayTranscript = this.parseSrt(result);
       const actualText = arrayTranscript?.[0]?.startTime === 0 ? arrayTranscript[0].text : "";
-      this.$store.commit('playerTranscript',{actual: 0,actualText:actualText, value : arrayTranscript});
+      this.$store.commit('player/transcript',{actual: 0,actualText:actualText, value : arrayTranscript});
     },
     parseSrt(transcript: string){
       var pattern = /(\d+)\n([\d:,]+)\s+-{2}\>\s+([\d:,]+)\n([\s\S]*?(?=\n{2}|$))/gm;
@@ -144,15 +147,15 @@ export const playerLogic = defineComponent({
       parameters.push('origin=octopus');
       parameters.push('listenerId='+this.getListenerId());
       if (
-        this.$store.state.authentication &&
-        this.$store.state.authentication.organisationId
+        this.$store.state.auth &&
+        this.$store.state.auth.organisationId
       ) {
         parameters.push(
-          'distributorId=' + this.$store.state.authentication.organisationId
+          'distributorId=' + this.$store.state.auth.organisationId
         );
       }
-      if("SECURED" === this.podcast.organisation.privacy && this.$store.state.authentication.isAuthenticated && this.$store.state.oAuthParam.accessToken){
-        parameters.push('access_token='+this.$store.state.oAuthParam.accessToken);
+      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);
       }
       return this.podcast.podcastId + '.mp3?' + parameters.join('&');
     },
@@ -170,7 +173,7 @@ export const playerLogic = defineComponent({
       this.initComments();
     },
     stopPlayer(): void {
-      this.$store.commit('playerPlayPodcast');
+      this.$store.commit('player/playPodcast');
     },
     getListenerId(): string{
       let listenerId = this.getCookie("octopus_listenerId");
@@ -228,8 +231,8 @@ export const playerLogic = defineComponent({
     onTimeUpdatePodcast(streamDuration:number, currentTime:number){
       this.displayAlertBar = false;
       this.percentLiveProgress = 100;
-      this.$store.commit('playerTotalTime', streamDuration);
-      this.$store.commit('playerElapsed', currentTime / streamDuration);
+      this.$store.commit('player/totalTime', streamDuration);
+      this.$store.commit('player/elapsed', currentTime / streamDuration);
       this.onTimeUpdateTranscript(currentTime);
     },
     onTimeUpdateLive(streamDuration: number, currentTime:number){
@@ -238,7 +241,7 @@ export const playerLogic = defineComponent({
       if (scheduledDuration > streamDuration) {
         this.displayAlertBar = false;
         this.percentLiveProgress = (streamDuration / scheduledDuration) * 100;
-        this.$store.commit('playerTotalTime', scheduledDuration);
+        this.$store.commit('player/totalTime', scheduledDuration);
         this.$store.commit(
           'playerElapsed',
           currentTime / scheduledDuration
@@ -247,8 +250,8 @@ export const playerLogic = defineComponent({
         this.percentLiveProgress = 100;
         this.displayAlertBar = true;
         this.durationLivePosition = (scheduledDuration / streamDuration) * 100;
-        this.$store.commit('playerTotalTime', streamDuration);
-        this.$store.commit('playerElapsed', currentTime / streamDuration);
+        this.$store.commit('player/totalTime', streamDuration);
+        this.$store.commit('player/elapsed', currentTime / streamDuration);
       }
     },
     onTimeUpdate(event: Event): void {

package/src/components/pages/Lives.vue

@@ -72,7 +72,7 @@ export default defineComponent({
     } else if (this.$store.state.filter.organisationId) {
       this.$emit('update:organisationId',this.$store.state.filter.organisationId);
     }
-    if (!this.$store.state.organisation?.attributes?.['live.active']) {
+    if (!this.$store.state.auth?.organisation?.attributes?.['live.active']) {
       this.live = false;
     }
   },

package/src/store/AppStore.ts

@@ -1,89 +1,18 @@
 import { createStore } from 'vuex'
-import { AppStoreData } from './typeAppStore';
-
+import { AppStoreData } from './classStore/typeAppStore';
+import PlayerStore from '@/store/PlayerStore';
 export default createStore({
   state: AppStoreData(),
-
-  getters: {},
+  modules: {
+    player: PlayerStore
+  },
   mutations: {
-    playerPlayPodcast(state, podcast) {
-      if (!podcast) {
-        state.player = {
-          status: 'STOPPED', //STOPPED, LOADING, PLAYING, PAUSED
-          podcast: undefined,
-          media: undefined,
-          live: undefined,
-          elapsed: 0,
-        };
-        return;
-      }
-      if (
-        (state.player.podcast &&
-          state.player.podcast.podcastId === podcast.podcastId) ||
-        (state.player.media &&
-          state.player.media.mediaId === podcast.mediaId) ||
-        (state.player.live &&
-          state.player.live.conferenceId === podcast.conferenceId)
-      ) {
-        //Do nothing
-        return;
-      }
-      if (
-        podcast.conferenceId &&
-        (!podcast.podcastId || 'READY' !== podcast.processingStatus)
-      ) {
-        state.player = {
-          status: 'LOADING', //STOPPED, LOADING, PLAYING, PAUSED
-          podcast: undefined,
-          media: undefined,
-          live: podcast,
-          elapsed: 0,
-        };
-      } else if (podcast.podcastId) {
-        state.player = {
-          status: 'LOADING', //STOPPED, LOADING, PLAYING, PAUSED
-          podcast: podcast,
-          media: undefined,
-          live: undefined,
-          elapsed: 0,
-        };
-      } else if (podcast.mediaId) {
-        state.player = {
-          status: 'LOADING', //STOPPED, LOADING, PLAYING, PAUSED
-          podcast: undefined,
-          media: podcast,
-          live: undefined,
-          elapsed: 0,
-        };
-      }
-    },
-
-    playerPause(state, pause) {
-      if (pause) {
-        state.player.status = 'PAUSED';
-      } else {
-        state.player.status = 'PLAYING';
-      }
-    },
-
-    playerElapsed(state, elapsed) {
-      state.player.elapsed = elapsed;
-    },
-
-    playerTotalTime(state, total) {
-      state.player.total = total;
-    },
-
-    playerVolume(state, volume) {
-      state.player.volume = volume;
-    },
-    playerSeekTime(state, seekTime) {
-      state.player.seekTime = seekTime;
+    categoriesSet(state, categories) {
+      state.categories = categories;
     },
-    playerTranscript(state, transcript) {
-      state.player.transcript = transcript;
+    categoriesOrgaSet(state, categories) {
+      state.categoriesOrga = categories;
     },
-
     filterOrga(state, filter) {
       state.filter.organisationId = filter.orgaId;
       if (filter.imgUrl || !filter.orgaId) {
@@ -95,7 +24,7 @@ export default createStore({
       if(filter.rubriquageArray){
         state.filter.rubriquageArray = filter.rubriquageArray;
       }
-      state.filter.live= filter.isLive;
+      state.filter.live = filter.isLive;
       state.filter.iab = undefined;
     },
     filterIab(state, iab) {
@@ -107,13 +36,25 @@ export default createStore({
     filterRubriqueDisplay(state, rubriques) {
       state.filter.rubriqueDisplay = rubriques;
     },
-
-    categoriesSet(state, categories) {
-      state.categories = categories;
+    filterMedia(state, filter) {
+      if (filter.type) {
+        state.filter.typeMedia = filter.type;
+      }
+      if (filter.order) {
+        state.filter.sortOrder = filter.order;
+      }
+      if (filter.field) {
+        state.filter.sortField = filter.field;
+      }
     },
-
-    categoriesOrgaSet(state, categories) {
-      state.categoriesOrga = categories;
+    initFilter(state, data) {
+      state.filter = {
+        ...state.filter,
+        ...data,
+      };
+    },
+    liveUpdate(state, isBeforeLive) {
+      state.liveUpdate.isBeforeLive = isBeforeLive;
     },
     setCommentIdentity(state, identity) {
       state.comments.knownIdentity = identity;
@@ -121,7 +62,11 @@ export default createStore({
     setCommentLoaded(state, data) {
       state.comments.actualPodcastId = data.podcastId;
       state.comments.loadedComments = data.comments;
-      state.comments.totalCount = data.count;
+    },
+    isEducation(state, isEducation) {
+      state.general.education = isEducation;
+      state.general.logoUrl = '/img/logo_education.webp';
+      state.general.metaTitle = 'RadioEducation.org';
     },
   },
 });

package/src/store/PlayerStore.ts

@@ -0,0 +1,77 @@
+import { getDefaultPlayerState } from './classStore/typePlayerStore';
+import { Module, MutationTree } from 'vuex';
+import { StoreState } from './classStore/typeAppStore';
+import { Player } from './class/general/player';
+
+const mutations = <MutationTree<Player>>{
+  playPodcast(state, podcast) {
+    if (!podcast) {
+      state.status = 'STOPPED';
+      state.podcast = undefined;
+      state.media = undefined;
+      state.live = undefined;
+      state.elapsed = 0;
+      return;
+    }
+    if (
+      (state.podcast &&
+        state.podcast.podcastId === podcast.podcastId) ||
+      (state.media && state.media.mediaId === podcast.mediaId) ||
+      (state.live &&
+        state.live.conferenceId === podcast.conferenceId)
+    ) {
+      //Do nothing
+      return;
+    }
+    state.status = 'LOADING';
+    state.podcast = undefined;
+    state.media = undefined;
+    state.live = undefined;
+    state.elapsed = 0;
+    if (
+      podcast.conferenceId &&
+      (!podcast.podcastId || podcast.processingStatus !== 'READY')
+    ) {
+      state.live = podcast;
+    } else if (podcast.podcastId) {
+      state.podcast = podcast;
+    } else if (podcast.mediaId) {
+      state.media = podcast;
+    }
+  },
+
+  pause(state, pause) {
+    if (pause) {
+      state.status = 'PAUSED';
+    } else {
+      state.status = 'PLAYING';
+    }
+  },
+
+  elapsed(state, elapsed) {
+    state.elapsed = elapsed;
+  },
+
+  totalTime(state, total) {
+    state.total = total;
+  },
+
+  volume(state, volume) {
+    state.volume = volume;
+  },
+
+  seekTime(state, seekTime) {
+    state.seekTime = seekTime;
+  },
+  transcript(state, transcript) {
+    state.transcript = transcript;
+  },
+};
+
+const PlayerModule: Module<Player, StoreState> = {
+  namespaced: true,
+  state: getDefaultPlayerState(),
+  mutations: mutations,
+};
+
+export default PlayerModule;

package/src/store/class/general/emission.ts

@@ -20,4 +20,21 @@ export interface Emission {
   optItunesCategories?: Array<string>;
   adConfigs?: {[key:string]: AdserverConfig};
   urlFeed?: string;
+}
+
+export function emptyEmissionData(): Emission{
+  return {
+      emissionId: 0,
+      name: '' ,
+      description: '' ,
+      imageUrl: '' ,
+      iabIds: undefined ,
+      orga: {
+        id: '',
+        name: '',
+        imageUrl: ''
+      },
+      rubriqueIds: [] ,
+      monetisable: 'UNDEFINED',
+  }
 }

package/src/store/class/general/participant.ts

@@ -10,3 +10,10 @@ export interface Participant {
   score?: number;
   uid?: string;
 }
+export function emptyParticipantData(): Participant{
+  return {
+    firstName: '',
+    lastName: '',
+    participantId:0
+  }
+}

package/src/store/class/general/playlist.ts

@@ -16,6 +16,19 @@ export interface Playlist {
   publisher?: Person;
 }
 
+export function emptyPlaylistData(): Playlist{
+  return {
+    description: '',
+    playlistId: 0,
+    podcasts: undefined,
+    score: 0,
+    title: '',
+    type:'DYNAMIC',
+    samplingViews:[]
+  }
+}
+
+
 export interface PlaylistRule {
   maxSize: number,
   podcastId?: number,

package/src/store/class/general/podcast.ts

@@ -1,4 +1,4 @@
-import { Emission } from './emission';
+import { Emission, emptyEmissionData } from './emission';
 import { Organisation } from './organisation';
 import { Participant } from './participant';
 import { Person } from '../user/person';
@@ -41,3 +41,32 @@ export interface Podcast {
   order?: number;
   livePodcastId?: number
 }
+export function emptyPodcastData(): Podcast {
+  return {
+    podcastId:0,
+    audioUrl: '',
+    audioStorageUrl: '',
+    article:'',
+    imageUrl: '',
+    animators: [],
+    guests: [],
+    emission: emptyEmissionData(),
+    title: '',
+    description: undefined,
+    tags: [],
+    availability: {
+      visibility: true,
+      date: undefined,
+    },
+    monetisable: 'UNDEFINED',
+    comments: 'inherit',
+    organisation: {
+      id: '',
+      name: '',
+      imageUrl: '',
+    },
+    pubDate: undefined,
+    conferenceId: 0,
+    duration: 0,
+  };
+}

package/src/store/classStore/typeAppStore.ts

@@ -0,0 +1,79 @@
+import { Category } from '../class/general/category';
+import { CommentPodcast } from '../class/general/comment';
+import { Player } from '../class/general/player';
+import { Rubriquage } from '../class/rubrique/rubriquage';
+import { RubriquageFilter } from '../class/rubrique/rubriquageFilter';
+import { Rubrique } from '../class/rubrique/rubrique';
+import { AuthState } from './typeAuthStore';
+import { getDefaultPlayerState } from './typePlayerStore';
+
+export interface Filter{
+  organisationId: string | undefined;
+  imgUrl: string | undefined;
+  name: string | undefined;
+  rubriquageArray: Array<Rubriquage>;
+  rubriqueFilter: Array<RubriquageFilter>;
+  rubriqueDisplay: Array<Rubrique>;
+  typeMedia: string | undefined;
+  sortOrder: string | undefined;
+  sortField: string | undefined;
+  live: boolean|undefined;
+  iab: Category |undefined;
+}
+
+export interface StoreState {
+  general: {
+    metaTitle: string;
+    education: boolean;
+    logoUrl: string;
+  };
+  categories: Array<Category>;
+  categoriesOrga: Array<Category>;
+  filter: Filter;
+  liveUpdate: {
+    isBeforeLive: boolean;
+  };
+  comments: {
+    knownIdentity: string | null;
+    actualPodcastId: number;
+    loadedComments: Array<CommentPodcast>;
+    totalCount: number;
+  };
+  player: Player;
+  auth?: AuthState;
+}
+
+export function AppStoreData(): StoreState {
+  return {
+    general: {
+      metaTitle: 'Octopus by Saooti',
+      education: false,
+      logoUrl: '/img/logo_octopus_final.svg',
+    },
+    categories: [],
+    categoriesOrga: [],
+    filter: {
+      organisationId: undefined,
+      imgUrl: undefined,
+      name:undefined,
+      rubriquageArray: [],
+      rubriqueFilter: [],
+      rubriqueDisplay: [],
+      typeMedia: undefined,
+      sortOrder: undefined,
+      sortField: undefined,
+      live: false,
+      iab: undefined,
+    },
+    liveUpdate: {
+      isBeforeLive: true,
+    },
+    comments: {
+      knownIdentity: null,
+      actualPodcastId: 0,
+      loadedComments: [],
+      totalCount: 0,
+    },
+    player: getDefaultPlayerState(),
+  };
+}

package/src/store/classStore/typeAuthStore.ts

@@ -0,0 +1,44 @@
+import { Organisation } from "../class/general/organisation";
+import { Profile } from "../class/user/profile";
+
+export interface AuthState {
+  name: string;
+  organisationId: string | undefined;
+  organisationName: string | undefined;
+  role: Array<string>;
+  oAuthParam: {
+    accessToken: string | undefined;
+    refreshToken: string | undefined;
+    expiration: Date | undefined;
+  };
+  profile: Profile;
+  organisation: Organisation;
+}
+export function getDefaultAuthState(): AuthState {
+  return {
+    name: '',
+    organisationId: undefined,
+    organisationName: undefined,
+    role: [''],
+    oAuthParam: {
+      accessToken: undefined,
+      refreshToken: undefined,
+      expiration: undefined,
+    },
+    profile: {
+      userId: '',
+    },
+    organisation: {
+      id: '',
+      name: '',
+      imageUrl: '',
+      description: undefined,
+      monetisable: undefined,
+      location: undefined,
+      comments: undefined,
+      attributes: {
+        RSS_CONTACT: undefined,
+      },
+    },
+  };
+}

package/src/store/classStore/typePlayerStore.ts

@@ -0,0 +1,14 @@
+import { Player } from '../class/general/player';
+
+export function getDefaultPlayerState(): Player {
+  return {
+    status: 'STOPPED', //STOPPED, LOADING, PLAYING, PAUSED
+    podcast: undefined,
+    volume: 1, //From 0 to 1
+    elapsed: 0, //From 0 to 1
+    total: 0,
+    media: undefined,
+    live: undefined,
+    seekTime:0,
+  };
+}