@saooti/octopus-sdk 34.0.5 → 34.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saooti/octopus-sdk",
-  "version": "34.0.5",
+  "version": "34.0.7",
   "private": false,
   "description": "Javascript SDK for using octopus",
   "author": "Saooti",
@@ -16,7 +16,7 @@
     "test": "jest --coverage"
   },
   "dependencies": {
-    "@saooti/octopus-api": "^0.34.0",
+    "@saooti/octopus-api": "^0.34.1",
     "@vue/cli": "^5.0.8",
     "@vue/compat": "^3.2.45",
     "autoprefixer": "^10.4.13",

package/src/components/display/emission/EmissionItem.vue

@@ -112,6 +112,7 @@ export default defineComponent({
         emissionId: this.emission.emissionId,
         first: 0,
         size: 0,
+        includeStatus:["READY","PROCESSING"]
       }, true);
       if (0 === data.count) {
         this.activeEmission = false;

package/src/components/display/emission/EmissionPlayerItem.vue

@@ -209,6 +209,7 @@ export default defineComponent({
       const data =  await octopusApi.fetchDataWithParams<{count: number;result:Array<Podcast>;sort: string;}>(0, 'podcast/search',{
         emissionId: this.emission.emissionId,
         size: nb,
+        includeStatus:["READY","PROCESSING"]
       }, true);
       if (0 === data.count) {
         this.activeEmission = false;

package/src/components/display/list/Paginate.vue

@@ -9,7 +9,7 @@
         id="rows-per-page-select"
         :value="rowsPerPage"
         class="c-hand p-1 mx-2"
-        @change="$emit('update:rowsPerPage',$event.target.value)"
+        @change="$emit('update:rowsPerPage',parseInt($event.target.value,10))"
       >
         <option
           v-for="option in optionsRowsPerPage"
@@ -104,7 +104,7 @@ export default defineComponent({
 
   data() {
     return {
-			optionsRowsPerPage: [5, 10, 15, 20, 25 , 30, 50] as Array<number>,
+			optionsRowsPerPage: [10, 20, 30, 40, 50, 60] as Array<number>,
 		};
   },
   

package/src/components/display/live/LiveHorizontalList.vue

@@ -1,7 +1,7 @@
 <template>
   <div
     v-if="notEmpty"
-    class="p-3"
+    class="py-3"
   >
     <h2 class="mb-0 mt-3">
       {{ $t('All live emission button') }}

package/src/components/display/participant/ParticipantItem.vue

@@ -111,6 +111,7 @@ export default defineComponent({
         participantId: this.participant.participantId,
         first: 0,
         size: 0,
+        includeStatus:["READY","PROCESSING"]
       }, true);
       if (0 === data.count) {
         this.activeParticipant = false;

package/src/components/display/playlist/PlaylistList.vue

@@ -4,7 +4,7 @@
     v-model:first="dfirst"
     v-model:rowsPerPage="dsize"
     v-model:isMobile="isMobile"
-    :text-count="displayCount > 1 ? `${$t('Number playlists', { nb: displayCount })} ${$t('sort by score')}`: undefined"
+    :text-count="displayCount > 1 ? `${$t('Number playlists', { nb: displayCount })}`: undefined"
     :total-count="totalCount"
     :loading="loading"
     :loading-text="loading?$t('Loading content ...'):undefined"

package/src/components/display/podcasts/PodcastFilterList.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="p-3">
+  <div class="py-3">
     <h2>{{ titleFilter }}</h2>
     <div class="d-flex align-items-center flex-wrap mb-2">
       <div
@@ -27,6 +27,8 @@
       :organisation-id="productorId"
       :reload="reloadList"
       :include-hidden="editRight"
+      :showCount="showCount"
+      :displaySortText="false"
       @fetch="fetch"
     />
   </div>
@@ -53,6 +55,7 @@ export default defineComponent({
     reload: { default: false, type:  Boolean},
     editRight: { default: false, type:  Boolean},
     productorId: { default: undefined, type: String},
+    showCount: { default: false, type: Boolean },
   },
   emits: ['fetch'],
 

package/src/components/display/podcasts/PodcastImage.vue

@@ -126,6 +126,9 @@ export default defineComponent({
         );
       },
     }),
+    authenticated(): boolean {
+      return (state.generalParameters.authenticated as boolean);
+    },
     mainRubrique(): boolean{
       return undefined!==state.podcastPage.mainRubrique && 0!==state.podcastPage.mainRubrique && (this.podcast?.rubriqueIds?.includes(state.podcastPage.mainRubrique) as boolean);
     },
@@ -154,7 +157,8 @@ export default defineComponent({
         undefined!==this.podcast &&
         false !== this.podcast.valid &&
           ('READY_TO_RECORD' === this.podcast.processingStatus ||
-            'READY' === this.podcast.processingStatus) &&
+            'READY' === this.podcast.processingStatus || 
+            ('PROCESSING' === this.podcast.processingStatus && !this.authenticated)) &&
         !this.isLiveToBeRecorded && undefined!==this.podcast.availability.visibility 
         && this.podcast.availability.visibility
       );
@@ -295,6 +299,7 @@ export default defineComponent({
     color: white;
     text-transform: uppercase;
     position: absolute;
+    top:0;
   }
 
   .background-icon{

package/src/components/display/podcasts/PodcastInlineListClassic.vue

@@ -186,6 +186,7 @@ export default defineComponent({
         noRubriquageId: this.noRubriquageId.length ? this.noRubriquageId : undefined,
         sort: this.popularSort ? 'POPULARITY' : 'DATE',
         query: this.query,
+        includeStatus:["READY","PROCESSING"]
       }, true);
       this.loading = false;
       this.totalCount = data.count;

package/src/components/display/podcasts/PodcastList.vue

@@ -64,6 +64,7 @@ export default defineComponent({
     after: { default: undefined, type: String},
     includeHidden: { default: false, type: Boolean},
     showCount: { default: false, type: Boolean },
+    displaySortText: { default: true, type: Boolean },
     sortCriteria: { default: undefined, type: String},
     notValid: { default: undefined , type: Boolean},
     rubriqueId: { default: () => [], type: Array as ()=>Array<number> },
@@ -103,6 +104,9 @@ export default defineComponent({
       return this.popularSort? "POPULARITY" : this.sortCriteria??'DATE';
     },
     sortText(): string {
+      if(!this.displaySortText){
+        return "";
+      }
       switch (this.sortCriteria) {
         case 'SCORE':return " "+this.$t('sort by score');
         case 'DATE':return " "+this.$t('sort by date');
@@ -154,7 +158,8 @@ export default defineComponent({
         rubriquageId: this.rubriquageId.length ? this.rubriquageId : undefined,
         includeHidden: this.includeHidden,
         validity: undefined !== this.notValid?!this.notValid: undefined,
-        publisherId:this.notValid && !(state.generalParameters.isProduction as boolean)?this.$store.state.auth?.profile.userId:undefined
+        publisherId:this.notValid && !(state.generalParameters.isProduction as boolean)?this.$store.state.auth?.profile.userId:undefined,
+        includeStatus:["READY","PROCESSING"]
       };
       try {
         const data =await octopusApi.fetchDataWithParams<{count: number;result:Array<Podcast>;sort: string;}>(0, 'podcast/search',param, true);

package/src/components/display/podcasts/PodcastSwiperList.vue

@@ -149,6 +149,7 @@ export default defineComponent({
         noRubriquageId: this.noRubriquageId.length ? this.noRubriquageId : undefined,
         sort: this.popularSort ? 'POPULARITY' : 'DATE',
         query: this.query,
+        includeStatus:["READY","PROCESSING"]
       }, true);
       this.allPodcasts = this.allPodcasts.concat(
         data.result.filter((pod: Podcast|null) => null !== pod)

package/src/components/misc/player/PlayerCompact.vue

@@ -65,9 +65,9 @@
       />
     </div>
     <button
-      v-if="!radio"
-      :title="$t('Enlarge')"
-      class="btn play-button-box btn-transparent text-light saooti-up"
+      :title="''!=transcriptText ? $t('View transcript'): $t('Enlarge')"
+      class="btn play-button-box btn-transparent text-light"
+      :class="''!=transcriptText ? 'saooti-text-to-speech':'saooti-up'"
       @click="changePlayerLargeVersion"
     />
     <button

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

@@ -158,7 +158,7 @@ export const playerLogic = defineComponent({
     getAudioUrl(): string{
       if (this.media) return this.media.audioUrl? this.media.audioUrl:"";
       if (!this.podcast) return '';
-      if (!this.podcast.availability.visibility)
+      if (!this.podcast.availability.visibility || "PROCESSING"===this.podcast.processingStatus)
         return this.podcast.audioStorageUrl;
       if (this.listenError) return this.podcast.audioStorageUrl;
       return this.getAudioUrlParameters();

package/src/components/pages/Emission.vue

@@ -66,6 +66,7 @@
           :emission-id="emissionId"
         />
         <PodcastFilterList
+          :showCount="true"
           :emission-id="emissionId"
           :category-filter="false"
           :edit-right="editRight"

package/src/components/pages/Home.vue

@@ -1,7 +1,5 @@
 <template>
   <div class="page-box">
-    <button @click="playRadio">Radio</button>
-    <button @click="playRadioBis">RadioBis</button>
     <template v-if="0 === rubriquageFilter.length">
       <PodcastInlineList
         v-for="c in categories"
@@ -90,22 +88,6 @@ export default defineComponent({
       }
       this.rubriqueId = rubriqueId;
     },
-    playRadio(){
-      this.$store.commit('player/playPodcast', {
-        canalId: 3,
-        url: "https://c6884219-e191-45ec-a931-6f34683c6ac7.stream.dev2.saooti.org/live.m3u8",
-        metadata : ""
-      });
-
-    },
-    playRadioBis(){
-      this.$store.commit('player/playPodcast', {
-        canalId: 1,
-        url: "https://79a52b6b-8475-42f9-9c48-7f7460202649.stream.dev2.saooti.org/live.m3u8",
-        metadata : ""
-      });
-
-    }
   }
 })
 </script>

package/src/components/pages/Participant.vue

@@ -46,6 +46,7 @@
         :name="name"
         :category-filter="true"
         :reload="reload"
+        :showCount="true"
       />
       <PodcastList
         v-else

package/src/locale/de.ts

@@ -309,4 +309,5 @@ export default{
   "If the transcript is available, show it":"Wenn die Abschrift vorhanden ist, zeigen Sie sie",
   "Photo credits":"Bildnachweis",
   "Audio credits":"Audio-Credits",
+  "View transcript":"Transkript ansehen",
 }

package/src/locale/en.ts

@@ -316,4 +316,5 @@ export default{
   "If the transcript is available, show it":"If the transcript is available, show it",
   "Photo credits":"Photo credits",
   "Audio credits":"Audio credits",
+  "View transcript":"View transcript",
 };

package/src/locale/es.ts

@@ -309,4 +309,5 @@ export default{
   "If the transcript is available, show it":"Si la transcripción está disponible, muéstrela",
   "Photo credits":"Créditos fotográficos",
   "Audio credits":"Créditos de audio",
+  "View transcript":"Ver transcripción",
 }

package/src/locale/fr.ts

@@ -316,4 +316,5 @@ export default{
   "If the transcript is available, show it":"Si la transcription est disponible, l'afficher",
   "Photo credits":"Crédits photo",
   "Audio credits":"Crédits audio",
+  "View transcript":"Afficher la transcription",
 };

package/src/locale/it.ts

@@ -306,4 +306,5 @@ export default{
     "If the transcript is available, show it":"Se la trascrizione è disponibile, mostrala",
     "Photo credits":"Crediti fotografici",
     "Audio credits":"Crediti audio",
+    "View transcript":"Visualizza trascrizione",
   };

package/src/locale/sl.ts

@@ -309,4 +309,5 @@ export default{
   "If the transcript is available, show it":"Če je prepis na voljo, ga pokažite",
   "Photo credits":"Avtorji fotografij",
   "Audio credits":"Avdio krediti",
+  "View transcript":"Ogled prepisa",
 }

package/src/store/ApiStore.ts

@@ -0,0 +1,33 @@
+import { ApiState, getDefaultApiState } from './classStore/typeApiStore';
+import { Module, MutationTree } from 'vuex';
+import { StoreState } from './classStore/typeAppStore';
+const mutations = <MutationTree<ApiState>>{
+  init(state, apiUrls: ApiState) {
+    state.apiUrl= apiUrls.apiUrl;
+    state.commentUrl= apiUrls.commentUrl;
+    state.frontendUrl= apiUrls.frontendUrl;
+    state.ftpUrl= apiUrls.ftpUrl;
+    state.hlsUrl= apiUrls.hlsUrl;
+    state.imageUrl= apiUrls.imageUrl;
+    state.keycloakUrl= apiUrls.keycloakUrl;
+    state.mediaUrl= apiUrls.mediaUrl;
+    state.miniplayerUrl= apiUrls.miniplayerUrl;
+    state.processorUrl= apiUrls.processorUrl;
+    state.recoUrl= apiUrls.recoUrl;
+    state.radioUrl= apiUrls.radioUrl;
+    state.rssUrl= apiUrls.rssUrl;
+    state.rtmpUrl= apiUrls.rtmpUrl;
+    state.speechToTextUrl= apiUrls.speechToTextUrl;
+    state.studioUrl= apiUrls.studioUrl;
+    state.videoMakerUrl= apiUrls.videoMakerUrl;
+    state.storageUrl= apiUrls.storageUrl;
+  },
+};
+
+const ApiModule: Module<ApiState, StoreState> = {
+  namespaced: true,
+  state: getDefaultApiState(),
+  mutations: mutations,
+};
+
+export default ApiModule;

package/src/store/AppStore.ts

@@ -1,72 +1,76 @@
-import { createStore } from 'vuex'
-import { AppStoreData } from './classStore/typeAppStore';
+import { createStore, MutationTree } from 'vuex';
+import ApiStore from '@/store/ApiStore';
 import PlayerStore from '@/store/PlayerStore';
+import { AppStoreData, StoreState } from './classStore/typeAppStore';
+
+const mutations = <MutationTree<StoreState>>{
+  categoriesSet(state, categories) {
+    state.categories = categories;
+  },
+  categoriesOrgaSet(state, categories) {
+    state.categoriesOrga = categories;
+  },
+  filterOrga(state, filter) {
+    state.filter.organisationId = filter.orgaId;
+    if (filter.imgUrl || !filter.orgaId) {
+      state.filter.imgUrl = filter.imgUrl;
+    }
+    if (filter.name || !filter.orgaId) {
+      state.filter.name = filter.name;
+    }
+    if(filter.rubriquageArray){
+      state.filter.rubriquageArray = filter.rubriquageArray;
+    }
+    state.filter.live = filter.isLive;
+    state.filter.iab = undefined;
+  },
+  filterIab(state, iab) {
+    state.filter.iab = iab;
+  },
+  filterRubrique(state, rubriqueFilter) {
+    state.filter.rubriqueFilter = rubriqueFilter;
+  },
+  filterRubriqueDisplay(state, rubriques) {
+    state.filter.rubriqueDisplay = rubriques;
+  },
+  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;
+    }
+  },
+  initFilter(state, data) {
+    state.filter = {
+      ...state.filter,
+      ...data,
+    };
+  },
+  liveUpdate(state, isBeforeLive) {
+    state.liveUpdate.isBeforeLive = isBeforeLive;
+  },
+  setCommentIdentity(state, identity) {
+    state.comments.knownIdentity = identity;
+  },
+  setCommentLoaded(state, data) {
+    state.comments.actualPodcastId = data.podcastId;
+    state.comments.loadedComments = data.comments;
+  },
+  isEducation(state, isEducation) {
+    state.general.education = isEducation;
+    state.general.logoUrl = '/img/logo_education.webp';
+    state.general.metaTitle = 'RadioEducation.org';
+  },
+};
 export default createStore({
   state: AppStoreData(),
   modules: {
+    api : ApiStore,
     player: PlayerStore
   },
-  mutations: {
-    categoriesSet(state, categories) {
-      state.categories = categories;
-    },
-    categoriesOrgaSet(state, categories) {
-      state.categoriesOrga = categories;
-    },
-    filterOrga(state, filter) {
-      state.filter.organisationId = filter.orgaId;
-      if (filter.imgUrl || !filter.orgaId) {
-        state.filter.imgUrl = filter.imgUrl;
-      }
-      if (filter.name || !filter.orgaId) {
-        state.filter.name = filter.name;
-      }
-      if(filter.rubriquageArray){
-        state.filter.rubriquageArray = filter.rubriquageArray;
-      }
-      state.filter.live = filter.isLive;
-      state.filter.iab = undefined;
-    },
-    filterIab(state, iab) {
-      state.filter.iab = iab;
-    },
-    filterRubrique(state, rubriqueFilter) {
-      state.filter.rubriqueFilter = rubriqueFilter;
-    },
-    filterRubriqueDisplay(state, rubriques) {
-      state.filter.rubriqueDisplay = rubriques;
-    },
-    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;
-      }
-    },
-    initFilter(state, data) {
-      state.filter = {
-        ...state.filter,
-        ...data,
-      };
-    },
-    liveUpdate(state, isBeforeLive) {
-      state.liveUpdate.isBeforeLive = isBeforeLive;
-    },
-    setCommentIdentity(state, identity) {
-      state.comments.knownIdentity = identity;
-    },
-    setCommentLoaded(state, data) {
-      state.comments.actualPodcastId = data.podcastId;
-      state.comments.loadedComments = data.comments;
-    },
-    isEducation(state, isEducation) {
-      state.general.education = isEducation;
-      state.general.logoUrl = '/img/logo_education.webp';
-      state.general.metaTitle = 'RadioEducation.org';
-    },
-  },
+  mutations: mutations,
 });

package/src/store/classStore/typeApiStore.ts

@@ -0,0 +1,43 @@
+
+export interface ApiState {
+    apiUrl: undefined,
+    commentUrl: undefined,
+    frontendUrl: undefined,
+    ftpUrl: undefined,
+    hlsUrl: undefined,
+    imageUrl: undefined,
+    keycloakUrl: undefined,
+    mediaUrl: undefined,
+    miniplayerUrl:undefined,
+    processorUrl: undefined,
+    radioUrl: undefined,
+    recoUrl:undefined,
+    rssUrl: undefined,
+    rtmpUrl: undefined,
+    speechToTextUrl: undefined,
+    studioUrl: undefined,
+    videoMakerUrl: undefined,
+    storageUrl: undefined,
+}
+export function getDefaultApiState(): ApiState {
+  return {
+    apiUrl: undefined,
+    commentUrl:undefined,
+    frontendUrl: undefined,
+    ftpUrl: undefined,
+    hlsUrl: undefined,
+    imageUrl: undefined,
+    keycloakUrl: undefined,
+    mediaUrl: undefined,
+    miniplayerUrl:undefined,
+    processorUrl: undefined,
+    radioUrl: undefined,
+    recoUrl:undefined,
+    rssUrl: undefined,
+    rtmpUrl: undefined,
+    speechToTextUrl: undefined,
+    studioUrl: undefined,
+    videoMakerUrl: undefined,
+    storageUrl: undefined,
+  };
+}

package/src/store/classStore/typeAppStore.ts

@@ -1,11 +1,12 @@
 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 { ApiState } from './typeApiStore';
 import { AuthState } from './typeAuthStore';
 import { getDefaultPlayerState } from './typePlayerStore';
+import { Player } from '../class/general/player';
 
 export interface Filter{
   organisationId: string | undefined;
@@ -41,6 +42,7 @@ export interface StoreState {
   };
   player: Player;
   auth?: AuthState;
+  api?: ApiState;
 }
 
 export function AppStoreData(): StoreState {

package/src/store/paramStore.ts

@@ -4,14 +4,14 @@ import { Category } from './class/general/category';
 const state:ParamStore = {
   generalParameters: {
     organisationId:'ecbd98d9-79bd-4312-ad5e-fc7c1c4a191c',
-    authenticated: true,
-    isAdmin: true,
-    isRoleLive: true,
-    isCommments: true,
-    isOrganisation: true,
-    isPlaylist: true,
-    isProduction: true,
-    isContribution: true,
+    authenticated: false,
+    isAdmin: false,
+    isRoleLive: false,
+    isCommments: false,
+    isOrganisation: false,
+    isPlaylist: false,
+    isProduction: false,
+    isContribution: false,
     ApiUri: 'https://api.dev2.saooti.org/',
     podcastmaker: false,
     buttonPlus: true,