@saooti/octopus-sdk 32.0.2 → 32.0.5

package/src/components/pages/Emission.vue

@@ -142,42 +142,27 @@ export default defineComponent({
       return (state.generalParameters.podcastmaker as boolean);
     },
     rssUrl(): string {
-      return state.generalParameters.ApiUri + 'rss/emission/' + this.emissionId;
+      return `${state.generalParameters.ApiUri}rss/emission/${this.emissionId}`;
     },
     name(): string {
-      return this.emission ? this.emission.name : '';
+      return this.emission?.name??'';
     },
     imageUrl(): string {
-      return this.emission
-        ? this.emission.imageUrl + '?dummy=' + this.dummyParam
-        : '';
+      return this.emission? `${this.emission.imageUrl}?dummy=${this.dummyParam}`:'';
     },
     description(): string {
-      return this.emission ? this.emission.description : '';
+      return this.emission?.description??'';
     },
     editRight(): boolean {
-      if (
-        (this.authenticated && this.emission && this.myOrganisationId === this.emission.orga.id) ||
-        state.generalParameters.isAdmin
-      ){
-        return true;
-      }
-      return false;
+      return (true===this.authenticated && this.myOrganisationId === this.emission?.orga.id) ||
+        true===state.generalParameters.isAdmin
     },
     countLink(): number {
+      const platformShare = ['amazon','googlePodcasts','applePodcast', 'deezer', 'spotify', 'tunein',
+       'radioline', 'podcastAddict', 'playerFm', 'stitcher', 'pocketCasts'];
       let count = 0;
-      if (this.emission && this.emission.annotations) {
-        if (undefined !== this.emission.annotations.amazon) count++;
-        if (undefined !== this.emission.annotations.applePodcast) count++;
-        if (undefined !== this.emission.annotations.deezer) count++;
-        if (undefined !== this.emission.annotations.googlePodcasts) count++;
-        if (undefined !== this.emission.annotations.spotify) count++;
-        if (undefined !== this.emission.annotations.tunein) count++;
-        if (undefined !== this.emission.annotations.radioline) count++;
-        if (undefined !== this.emission.annotations.podcastAddict) count++;
-        if (undefined !== this.emission.annotations.playerFm) count++;
-        if (undefined !== this.emission.annotations.stitcher) count++;
-        if (undefined !== this.emission.annotations.pocketCasts) count++;
+      for (let i = 0, len = platformShare.length; i < len; i++) {
+        if (undefined !== this.emission?.annotations?.[platformShare[i]]) count++;
       }
       return count;
     },
@@ -200,22 +185,18 @@ export default defineComponent({
       this.rssEmission = this.emission.annotations.RSS? true: false;
       this.ftpEmission = this.emission.annotations.FTP? true: false;
       if (this.emission.annotations.exclusive) {
-        this.exclusive =
-          'true' === this.emission.annotations.exclusive ? true : false;
-        this.exclusive =
-          this.exclusive && this.myOrganisationId !== this.emission.orga.id;
+        this.exclusive ='true' === this.emission.annotations.exclusive;
+        this.exclusive =this.exclusive && this.myOrganisationId !== this.emission.orga.id;
       }
       if (this.emission.annotations.notExclusive) {
-        this.notExclusive =
-          'true' === this.emission.annotations.notExclusive ? true : false;
+        this.notExclusive ='true' === this.emission.annotations.notExclusive;
       }
     },
     async getEmissionDetails(): Promise<void> {
       this.loaded = false;
       this.error = false;
       try {
-        const data: Emission = await octopusApi.fetchData<Emission>(0,'emission/'+this.emissionId);
-        this.emission = data;
+        this.emission = await octopusApi.fetchData<Emission>(0,'emission/'+this.emissionId);
         if("PUBLIC"!==this.emission.orga.privacy && this.filterOrga!==this.emission.orga.id){
           this.initError();
           return;

package/src/components/pages/Emissions.vue

@@ -86,26 +86,17 @@ export default defineComponent({
   
   computed: {
     titleDisplay(): string{
-      if(undefined === state.emissionsPage.titlePage){
-        return this.$t('All emissions');
-      }
-      return state.emissionsPage.titlePage;
+      return state.emissionsPage.titlePage??this.$t('All emissions');
     },
     isProductorSearch(): boolean{
       return (state.podcastsPage.ProductorSearch as boolean);
     },
     organisationRight(): boolean {
-      if (
-        (this.authenticated && this.myOrganisationId === this.organisationId) ||
-        state.generalParameters.isAdmin
-      )
-        return true;
-      return false;
+      return (true===this.authenticated && this.myOrganisationId === this.organisationId) ||
+        true===state.generalParameters.isAdmin
     },
     organisation(): string|undefined {
-      if (this.organisationId) return this.organisationId;
-      if (this.filterOrga) return this.filterOrga;
-      return undefined;
+      return this.organisationId??this.filterOrga;
     },
   },
 
@@ -114,8 +105,8 @@ export default defineComponent({
   },
   methods: {
     initComponent(): void{
-      this.iabId = this.$store.state.filter.iab? this.$store.state.filter.iab.id : undefined;
-      this.organisationId = this.productor ? this.productor : this.filterOrga;
+      this.iabId =this.$store.state.filter.iab?.id;
+      this.organisationId = this.productor?? this.filterOrga;
       if (this.organisation && this.organisationRight) {
         this.includeHidden = true;
       }

package/src/components/pages/Home.vue

@@ -51,10 +51,7 @@ export default defineComponent({
       return this.$store.state.filter.rubriqueDisplay.filter((rubrique: Rubrique) => 0 !== rubrique.podcastCount );
     },
     rubriquageFilter(): Array<Rubriquage>{
-      if(this.$store.state.filter.organisationId){
-        return this.$store.state.filter.rubriquageArray;
-      }
-      return [];
+      return this.$store.state.filter.organisationId ? this.$store.state.filter.rubriquageArray :[];
     },
     rubriqueFilter(): Array<RubriquageFilter>{
       return this.$store.state.filter.rubriqueFilter;

package/src/components/pages/Lives.vue

@@ -57,11 +57,7 @@ export default defineComponent({
   
   computed: {
     liveRight(): boolean {
-      if (this.isRoleLive && this.live) return true;
-      return false;
-    },
-    isRoleLive(): boolean {
-      return (state.generalParameters.isRoleLive as boolean);
+      return (state.generalParameters.isRoleLive as boolean)&& this.live;
     },
     filterOrga(): string {
       return this.$store.state.filter.organisationId;
@@ -76,11 +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 &&
-      this.$store.state.organisation.attributes &&
-      !this.$store.state.organisation.attributes['live.active']
-    ) {
+    if (!this.$store.state.organisation?.attributes?.['live.active']) {
       this.live = false;
     }
   },
@@ -89,7 +81,7 @@ export default defineComponent({
       this.$emit('initConferenceIds', listIds);
     },
     onOrganisationSelected(organisation: Organisation|undefined): void {
-      this.$emit('update:organisationId', organisation ? organisation.id : undefined);
+      this.$emit('update:organisationId', organisation?.id);
     },
   },
 })

package/src/components/pages/PageNotFound.vue

@@ -11,7 +11,7 @@
         :to="{
           name: 'home',
           query: { productor: $store.state.filter.organisationId,
-                   iabId: $store.state.filter.iab ? $store.state.filter.iab.id : undefined,
+                   iabId:$store.state.filter.iab?.id,
                    rubriquesId: rubriqueQueryParam},
         }"
       >
@@ -28,7 +28,7 @@ export default defineComponent({
   name: 'PageNotFound',
   computed:{
     rubriqueQueryParam(): string|undefined{
-      if(this.$store.state.filter && this.$store.state.filter.rubriqueFilter && this.$store.state.filter.rubriqueFilter.length){
+      if(this.$store.state.filter?.rubriqueFilter?.length){
         return this.$store.state.filter.rubriqueFilter.map((value: RubriquageFilter) =>  value.rubriquageId+':'+value.rubriqueId).join();
       }
       return undefined;

package/src/components/pages/Participant.vue

@@ -96,10 +96,7 @@ export default defineComponent({
   },
   computed: {
     titleDisplay(): string{
-      if(undefined === state.intervenantPage.titlePage){
-        return this.$t('Animator');
-      }
-      return state.intervenantPage.titlePage;
+      return state.intervenantPage.titlePage??this.$t('Animator');
     },
     pageParameters(){
       return {
@@ -109,30 +106,18 @@ export default defineComponent({
       };
     },
     rssUrl(): string {
-      return state.generalParameters.ApiUri + 'rss/participant/' + this.participantId;
+      return `${state.generalParameters.ApiUri}rss/participant/${this.participantId}`;
     },
     description(): string {
-      if(!this.participant){return '';}
-      return this.participant.description || '';
+      return this.participant?.description ?? '';
     },
     name(): string {
-      if(!this.participant){return '';}
-      return (
-        (this.participant.firstName || '') +
-        ' ' +
-        (this.participant.lastName || '')
-      ).trim();
+      return (`${this.participant?.firstName??''} ${this.participant?.lastName??''}`).trim();
     },
     editRight(): boolean {
-      if(!this.participant || !this.participant.orga ){return false;}
-      if (
-        (this.authenticated &&
-          this.myOrganisationId === this.participant.orga.id) ||
-        state.generalParameters.isAdmin
-      ){
-        return true;
-      }
-      return false;
+      return (true===this.authenticated &&
+          this.myOrganisationId === this.participant?.orga?.id) ||
+        true===state.generalParameters.isAdmin
     },
   },
   watch: {
@@ -158,7 +143,7 @@ export default defineComponent({
       this.loaded = false;
       try {
         const data = await octopusApi.fetchData<Participant>(0, 'participant/'+this.participantId);
-        if(data && data.orga && "PUBLIC"!==data.orga.privacy && this.filterOrga!==data.orga.id){
+        if("PUBLIC"!==data?.orga?.privacy && this.filterOrga!==data?.orga?.id){
           this.initError();
           return;
         }

package/src/components/pages/Participants.vue

@@ -37,20 +37,17 @@ export default defineComponent({
     return {
       first: 0 as number,
       size: 30 as number,
-      searchPattern: '',
+      searchPattern: '' as string,
       organisationId: undefined as string | undefined,
     };
   },
   computed: {
     titleDisplay(): string{
-      if(undefined === state.intervenantsPage.titlePage){
-        return this.$t('All participants');
-      }
-      return state.intervenantsPage.titlePage;
+      return state.intervenantsPage.titlePage ?? this.$t('All participants');
     },
   },
   created() {
-    this.organisationId = this.productor? this.productor : this.filterOrga;
+    this.organisationId = this.productor??this.filterOrga;
   },
 })
 </script>

package/src/components/pages/Playlist.vue

@@ -34,7 +34,10 @@
             :organisation-id="myOrganisationId"
             :is-education="isEducation"
           />
-          <ShareButtons v-if="pageParameters.isShareButtons" :playlist="playlist" />
+          <ShareButtons
+            v-if="pageParameters.isShareButtons"
+            :playlist="playlist"
+          />
         </div>
       </div>
       <PodcastList :playlist="playlist" />
@@ -92,24 +95,19 @@ export default defineComponent({
       };
     },
     name(): string {
-      return this.playlist ? this.playlist.title : '';
+      return this.playlist?.title ??'';
     },
     imageUrl(): string {
       const dummy = new Date().getTime().toString();
       return this.playlist ? this.playlist.imageUrl + '?dummy=' + dummy : '';
     },
     description(): string {
-      return this.playlist ? this.playlist.description : '';
+      return this.playlist?.description ??'';
     },
     editRight(): boolean {
-      if (
-        (state.generalParameters.isPlaylist && this.playlist &&
-          this.myOrganisationId === this.playlist.organisation?.id) ||
-        state.generalParameters.isAdmin
-      ){
-        return true;
-      }
-      return false;
+      return (true===state.generalParameters.isPlaylist &&
+        this.myOrganisationId === this.playlist?.organisation?.id) ||
+        true ===state.generalParameters.isAdmin
     },
   },
   watch: {
@@ -130,8 +128,7 @@ export default defineComponent({
       try {
         this.loaded = false;
         this.error = false;
-        const data: Playlist = await octopusApi.fetchData<Playlist>(0, 'playlist/'+this.playlistId);
-        this.playlist = data;
+        this.playlist = await octopusApi.fetchData<Playlist>(0, 'playlist/'+this.playlistId);
         if("PUBLIC"!==this.playlist.organisation?.privacy && this.filterOrga!==this.playlist.organisation?.id){
           this.initError();
           return;

package/src/components/pages/Playlists.vue

@@ -61,13 +61,12 @@ export default defineComponent({
       return (state.generalParameters.podcastmaker as boolean);
     },
     editRight(): boolean {
-      if (state.generalParameters.isPlaylist) return true;
-      return false;
+      return state.generalParameters.isPlaylist ? true : false;
     },
   },
 
   created() {
-    this.organisationId = this.productor ? this.productor : this.filterOrga;
+    this.organisationId = this.productor ??this.filterOrga;
   },
 })
 </script>

package/src/components/pages/Podcast.vue

@@ -161,15 +161,9 @@ export default defineComponent({
     },
     emissionMainCategory(): number {
       if(!this.podcast){return 0;}
-      if (
-        this.podcast.emission.annotations &&
-        this.podcast.emission.annotations.mainIabId
-      ) {
+      if (this.podcast.emission.annotations?.mainIabId) {
         return parseInt((this.podcast.emission.annotations.mainIabId as string), 10);
-      } else if (
-        this.podcast.emission.iabIds &&
-        this.podcast.emission.iabIds.length
-      ) {
+      } else if (this.podcast.emission.iabIds?.length) {
         return this.podcast.emission.iabIds[0];
       }
       return 0;
@@ -178,8 +172,7 @@ export default defineComponent({
       if ('undefined' === typeof this.podcast) return [];
       return this.$store.state.categories
         .filter((item: Category) => {
-          return ( this.podcast &&
-            this.podcast.emission.iabIds &&
+          return ( this.podcast?.emission.iabIds &&
             -1 !== this.podcast.emission.iabIds.indexOf(item.id)
           );
         })
@@ -190,34 +183,19 @@ export default defineComponent({
         });
     },
     editRight(): boolean {
-      if ( this.podcast &&
-        (this.authenticated &&
-          this.myOrganisationId === this.podcast.organisation.id) ||
-        state.generalParameters.isAdmin
-      ){
-        return true;
-      }
-      return false;
+      return (true ===this.authenticated &&this.myOrganisationId === this.podcast?.organisation.id) ||true===state.generalParameters.isAdmin;
     },
     countLink(): number {
+      const platformShare = ['amazon','googlePodcasts','applePodcast', 'deezer', 'spotify', 'tunein',
+       'radioline', 'podcastAddict', 'playerFm', 'stitcher', 'pocketCasts'];
       let count = 0;
-      if (this.podcast && this.podcast.emission && this.podcast.emission.annotations) {
-        if (undefined !== this.podcast.emission.annotations.amazon) count++;
-        if (undefined !== this.podcast.emission.annotations.googlePodcasts) count++;
-        if (undefined !== this.podcast.emission.annotations.applePodcast)count++;
-        if (undefined !== this.podcast.emission.annotations.deezer) count++;
-        if (undefined !== this.podcast.emission.annotations.spotify) count++;
-        if (undefined !== this.podcast.emission.annotations.tunein) count++;
-        if (undefined !== this.podcast.emission.annotations.radioline) count++;
-        if (undefined !== this.podcast.emission.annotations.podcastAddict) count++;
-        if (undefined !== this.podcast.emission.annotations.playerFm) count++;
-        if (undefined !== this.podcast.emission.annotations.stitcher) count++;
-        if (undefined !== this.podcast.emission.annotations.pocketCasts) count++;
+      for (let i = 0, len = platformShare.length; i < len; i++) {
+        if (undefined !== this.podcast?.emission?.annotations?.[platformShare[i]]) count++;
       }
       return count;
     },
     isLiveReadyToRecord(): boolean {
-      return (undefined!==this.podcast && undefined!==this.podcast.conferenceId && 0 !== this.podcast.conferenceId && 'READY_TO_RECORD' === this.podcast.processingStatus);
+      return (undefined!==this.podcast?.conferenceId && 0 !== this.podcast?.conferenceId && 'READY_TO_RECORD' === this.podcast?.processingStatus);
     },
     isCounter(): boolean {
       return (
@@ -242,12 +220,10 @@ export default defineComponent({
       );
     },
     titlePage(): string {
-      if (this.isLiveReadyToRecord) return this.$t('Live episode').toString();
-      return this.$t('Episode').toString();
+      return this.isLiveReadyToRecord ?this.$t('Live episode'): this.$t('Episode');
     },
     timeRemaining(): string {
-      if(!this.podcast){return "";}
-      return moment(this.podcast.pubDate).diff(moment(), 'seconds').toString();
+      return !this.podcast ? "":moment(this.podcast.pubDate).diff(moment(), 'seconds').toString();
     },
   },
   watch: {
@@ -297,26 +273,14 @@ export default defineComponent({
     },
     handleAnnotations(){
       if(!this.podcast){return;}
-      if (
-        this.podcast.emission.annotations &&
-        this.podcast.emission.annotations.exclusive
-      ) {
-        this.exclusive =
-          'true' === this.podcast.emission.annotations.exclusive
-            ? true
-            : false;
+      if (this.podcast.emission.annotations?.exclusive) {
+        this.exclusive ='true' === this.podcast.emission.annotations.exclusive;
         this.exclusive =
           this.exclusive &&
           this.myOrganisationId !== this.podcast.organisation.id;
       }
-      if (
-        this.podcast.emission.annotations &&
-        this.podcast.emission.annotations.notExclusive
-      ) {
-        this.notExclusive =
-          'true' === this.podcast.emission.annotations.notExclusive
-            ? true
-            : false;
+      if (this.podcast.emission.annotations?.notExclusive) {
+        this.notExclusive ='true' === this.podcast.emission.annotations.notExclusive;
       }
     },
     async getPodcastDetails(): Promise<void> {

package/src/components/pages/Podcasts.vue

@@ -110,23 +110,14 @@ export default defineComponent({
 
   computed: {
     titleDisplay(): string{
-      if(undefined === state.podcastsPage.titlePage){
-        return this.$t('All podcasts');
-      }
-      return state.podcastsPage.titlePage;
+      return state.podcastsPage.titlePage ?? this.$t('All podcasts');
     },
     organisationRight(): boolean {
-      if (
-        (this.authenticated && this.myOrganisationId === this.organisationId) ||
-        state.generalParameters.isAdmin
-      )
-        return true;
-      return false;
+      return (true===this.authenticated && this.myOrganisationId === this.organisationId) ||
+        true===state.generalParameters.isAdmin;
     },
     organisation(): string|undefined {
-      if (this.organisationId) return this.organisationId;
-      if (this.filterOrga) return this.filterOrga;
-      return undefined;
+      return this.organisationId ?? this.filterOrga;
     },
     pageParameters(){
       return {
@@ -142,10 +133,10 @@ export default defineComponent({
   
   methods: {
     initPodcastsPage(){
-      this.searchPattern = this.searchInit ? this.searchInit : '';
-      this.organisationId = this.productor ? this.productor : this.filterOrga;
+      this.searchPattern = this.searchInit ?? '';
+      this.organisationId = this.productor ?? this.filterOrga;
       this.includeHidden = this.organisation && this.organisationRight ? true : false;
-      this.iabId = this.$store.state.filter.iab ? this.$store.state.filter.iab.id : undefined;
+      this.iabId =this.$store.state.filter.iab?.id;
       if(this.$store.state.filter.rubriqueFilter.length){
         this.updateRubriquageFilter(this.$store.state.filter.rubriqueFilter);
       }

package/src/components/pages/Search.vue

@@ -43,14 +43,11 @@ export default defineComponent({
       if(!this.hideBar){
         return this.$t('Podcast search');
       }
-      if(!this.noResult){
-        return this.$t('Search results', { query: this.rawQuery })
-      }
-      return this.$t('Search - no results', { query: this.rawQuery });
+      const locale = !this.noResult ? 'Search results' : 'Search - no results';
+      return this.$t(locale, { query: this.rawQuery });
     },
     query(): string {
-      if (this.rawQuery && this.rawQuery.length >= 3) return this.rawQuery;
-      return '';
+      return this.rawQuery && this.rawQuery.length >= 3 ? this.rawQuery : '';
     },
     hideBar(): boolean {
       return (state.searchPage.hideBar as boolean);