@saooti/octopus-sdk 32.0.0 → 32.0.3

package/src/components/display/sharing/ShareDistribution.vue

@@ -17,103 +17,15 @@
       :emission="emission"
     />
     <div class="sharing-distribution-container">
-      <router-link
-        :to="'/main/priv/distribution/amazon/' + emissionId"
+      <router-link 
+        v-for="platform in platformShare" 
+        :key="platform.title"
+        :to="platform.url"
         class="text-dark"
       >
-        <span class="saooti-amazon">
-          <div class="path1" />
-          <div class="path2" />
-          <div class="path3" />
-        </span> Amazon Music | Podcasters
-      </router-link>
-      <router-link
-        :to="'/main/priv/distribution/apple/' + emissionId"
-        class="text-dark"
-      >
-        <span class="saooti-apple" />Apple Podcast / iTunes
-      </router-link>
-      <router-link
-        :to="'/main/priv/distribution/deezer/' + emissionId"
-        class="text-dark"
-      >
-        <span class="saooti-deezer" />Deezer
-      </router-link>
-      <router-link
-        :to="'/main/priv/distribution/googlePodcasts/' + emissionId"
-        class="text-dark"
-      >
-        <span class="saooti-google-podcasts">
-          <div class="path1" />
-          <div class="path2" />
-          <div class="path3" />
-          <div class="path4" />
-          <div class="path5" />
-          <div class="path6" />
-          <div class="path7" />
-        </span> Google Podcasts
-      </router-link>
-      <router-link
-        :to="'/main/priv/distribution/PlayerFM/' + emissionId"
-        class="text-dark"
-      >
-        <span class="saooti-playerfm" />PlayerFM
-      </router-link>
-      <router-link
-        :to="'/main/priv/distribution/PocketCasts/' + emissionId"
-        class="text-dark"
-      >
-        <span class="saooti-pocket-casts" />Pocket Casts
-      </router-link>
-      <router-link
-        :to="'/main/priv/distribution/PodcastAddict/' + emissionId"
-        class="text-dark"
-      >
-        <span class="saooti-podcast-addict" />Podcast Addict
-      </router-link>
-      <router-link
-        :to="'/main/priv/distribution/radioline/' + emissionId"
-        class="text-dark"
-      >
-        <span class="saooti-radioline" />Radioline
-      </router-link>
-      <router-link
-        :to="'/main/priv/distribution/spotify/' + emissionId"
-        class="text-dark"
-      >
-        <span class="saooti-spotify" />Spotify
-      </router-link>
-
-      <router-link
-        :to="'/main/priv/distribution/Stitcher/' + emissionId"
-        class="text-dark"
-      >
-        <span class="saooti-stitcher-logo">
-          <div class="path1" />
-          <div class="path2" />
-          <div class="path3" />
-          <div class="path4" />
-          <div class="path5" />
-          <div class="path6" />
-          <div class="path7" />
-          <div class="path8" />
-          <div class="path9" />
-          <div class="path10" />
-          <div class="path11" />
-          <div class="path12" />
-          <div class="path13" />
-          <div class="path14" />
-          <div class="path15" />
-          <div class="path16" />
-          <div class="path17" />
-          <div class="path18" /> </span>Stitcher
-      </router-link>
-
-      <router-link
-        :to="'/main/priv/distribution/tuneIn/' + emissionId"
-        class="text-dark"
-      >
-        <span class="saooti-tunin" />TuneIn
+        <span :class="platform.icon">
+          <div v-for="index in platform.path" :key="index" :class="'path'+index" />
+        </span>{{platform.title}}
       </router-link>
     </div>
     <Snackbar
@@ -149,6 +61,22 @@ export default defineComponent({
       rss: '' as string,
     };
   },
+  computed:{
+    platformShare(){
+      return [
+      {url:this.getUrl('amazon'), icon:'saooti-amazon', title:'Amazon Music | Podcasters', path:3},
+      {url:this.getUrl('apple'), icon:'saooti-apple', title:'Apple Podcast / iTunes', path:0},
+      {url:this.getUrl('deezer'), icon:'saooti-deezer', title:'Deezer', path:0},
+      {url:this.getUrl('googlePodcasts'), icon:'saooti-google-podcasts', title:'Google Podcasts', path:7},
+      {url:this.getUrl('PlayerFM'), icon:'saooti-playerfm', title:'PlayerFM', path:0},
+      {url:this.getUrl('PocketCasts'), icon:'saooti-pocket-casts', title:'Pocket Casts', path:0},
+      {url:this.getUrl('PodcastAddict'), icon:'saooti-podcast-addict', title:'Podcast Addict', path:0},
+      {url:this.getUrl('radioline'), icon:'saooti-radioline', title:'Radioline', path:0},
+      {url:this.getUrl('spotify'), icon:'saooti-spotify', title:'Spotify', path:0},
+      {url:this.getUrl('Stitcher'), icon:'saooti-stitcher-logo', title:'Stitcher', path:18},
+      {url:this.getUrl('tuneIn'), icon:'saooti-tunin', title:'TuneIn', path:0}];
+    }
+  },
 
   mounted() {
     this.getEmissionDetails();
@@ -156,6 +84,9 @@ export default defineComponent({
   },
 
   methods: {
+    getUrl(platform: string): string{
+      return `/main/priv/distribution/${platform}/${this.emissionId}`;
+    },
     async getEmissionDetails(): Promise<void> {
       this.emission = await octopusApi.fetchData<Emission>(0,'emission/'+this.emissionId);
     },

package/src/components/display/sharing/SharePlayer.vue

@@ -140,8 +140,7 @@ export default defineComponent({
       return 'largeSuggestion' === this.iFrameModel;
     },
     titleStillAvailable(): string {
-      if (this.isPodcastNotVisible) return this.$t('Podcast still available').toString();
-      return this.$t('Podcasts still available').toString();
+      return this.isPodcastNotVisible ?this.$t('Podcast still available') : this.$t('Podcasts still available');
     },
     isLiveReadyToRecord(): boolean {
       if (this.podcast)
@@ -153,17 +152,10 @@ export default defineComponent({
       return false;
     },
     noAd(): boolean {
-      if (
-        (this.podcast &&
-          this.podcast.organisation.id !== this.organisationId &&
-          'NO' === this.podcast.monetisable) ||
-        (this.podcast &&
-          'UNDEFINED' === this.podcast.monetisable &&
-          'NO' === this.podcast.emission.monetisable)
-      ) {
-        return true;
-      }
-      return false;
+      return (this.podcast?.organisation.id !== this.organisationId &&
+          'NO' === this.podcast?.monetisable) ||
+        ('UNDEFINED' === this.podcast?.monetisable &&
+          'NO' === this.podcast?.emission.monetisable);
     },
     iFrameSrc(): string {
       const url = [''];
@@ -268,7 +260,7 @@ export default defineComponent({
     async initColor(): Promise<void> {
       if (!this.authenticated) return;
       let data;
-      if(this.$store.state.organisation && this.$store.state.organisation.attributes && Object.keys(this.$store.state.organisation.attributes).length > 1){
+      if(this.$store.state.organisation?.attributes && Object.keys(this.$store.state.organisation.attributes).length > 1){
         data = this.$store.state.organisation.attributes;
       }else{
         data= await octopusApi.fetchData<{[key:string]:string}>(0, 'organisation/attributes/'+this.myOrganisationId);

package/src/components/display/sharing/SharePlayerTypes.vue

@@ -68,7 +68,7 @@ export default defineComponent({
     },
     customPlayersDisplay(): Array<CustomPlayer>{
       return this.customPlayers.filter((player: CustomPlayer)=>{
-        return (('EPISODE' === player.typePlayer ||'SUGGESTION' === player.typePlayer) && this.podcast && this.podcast.podcastId) ||
+        return (('EPISODE' === player.typePlayer ||'SUGGESTION' === player.typePlayer) &&this.podcast?.podcastId) ||
                           ('EMISSION' === player.typePlayer && this.emission  && !this.podcast)|| ('PLAYLIST' === player.typePlayer && this.playlist );
       });
     },

package/src/components/display/sharing/SubscribeButtons.vue

@@ -45,7 +45,7 @@ export default defineComponent({
         {name:'applePodcast', icon:'saooti-apple', url : this.getUrl('applePodcast')},
         {name:'deezer', icon:'saooti-deezer', url : this.getUrl('deezer')},
         {name:'googlePodcasts', icon:"saooti-google-podcasts", url : this.getUrl('googlePodcasts')},
-        {name:'playerFm', icon: 'saooti-saooti-playerfm', url : this.getUrl('playerFm')},
+        {name:'playerFm', icon: 'saooti-playerfm', url : this.getUrl('playerFm')},
         {name:'pocketCasts', icon:'saooti-pocket-casts', url : this.getUrl('pocketCasts')},
         {name:'podcastAddict', icon: 'saooti-podcast-addict', url : this.getUrl('podcastAddict')},
         {name:'radioline', icon:'saooti-radioline', url : this.getUrl('radioline')},
@@ -67,14 +67,12 @@ export default defineComponent({
       }
     },
     getUrl(sub: string): string | undefined{
-      return this.externaliseLinks(this.emission && this.emission.annotations? (this.emission.annotations[sub] as string): undefined);
+      return this.externaliseLinks(this.emission?.annotations?.[sub] as string|undefined);
     },
     externaliseLinks(link?: string): string|undefined {
       if (!link) return link;
       link = link.trim();
-      if (!link.startsWith('http') && !link.startsWith('//'))
-        return '//' + link;
-      return link;
+      return !link.startsWith('http') && !link.startsWith('//') ? '//' + link:link;
     },
   },
 })

package/src/components/form/ClassicSearch.vue

@@ -19,7 +19,7 @@
     />
     <div
       v-else
-      class="saooti-cross search-icon-container c-hand"
+      class="saooti-remove-bounty search-icon-container c-hand"
       @click="textValue = ''"
     />
   </div>
@@ -69,7 +69,7 @@ export default defineComponent({
       margin: 0 !important;
     }
     .saooti-search-bounty,
-    .saooti-cross {
+    .saooti-remove-bounty {
       font-size: 1rem;
     }
     .search-icon-container {

package/src/components/form/ClassicSelect.vue

@@ -50,7 +50,7 @@ export default defineComponent({
       handler() {
         if(this.textInit !== this.textValue){
           this.textValue =this.textInit;
-          }
+        }
       },
     },
   }

package/src/components/misc/Footer.vue

@@ -136,7 +136,7 @@ export default defineComponent({
       return state.footer.contactLink;
     },
     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;
@@ -153,7 +153,7 @@ export default defineComponent({
         return { productor: this.$store.state.filter.organisationId};
       }
       return { productor: this.$store.state.filter.organisationId,
-                   iabId: this.$store.state.filter.iab ? this.$store.state.filter.iab.id : undefined,
+                   iabId: this.$store.state.filter.iab?.id,
                    rubriquesId: this.rubriqueQueryParam}
     },
     showBlackBorder(hide: boolean): void {

package/src/components/misc/LeftMenu.vue

@@ -97,7 +97,7 @@ export default defineComponent({
       return this.$store.state.filter.live;
     },
     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;
@@ -122,14 +122,14 @@ export default defineComponent({
         return { productor: this.$store.state.filter.organisationId};
       }
       return { productor: this.$store.state.filter.organisationId,
-                   iabId: this.$store.state.filter.iab ? this.$store.state.filter.iab.id : undefined,
+                   iabId: this.$store.state.filter.iab?.id,
                    rubriquesId: this.rubriqueQueryParam}
     },
     onMenuClick() {
       this.$emit('update:displayMenu', false);
     },
     async onOrganisationSelected(organisation: Organisation|undefined) {
-      if (organisation && organisation.id) {
+      if (organisation?.id) {
         await this.selectOrganisation(organisation.id);
         return;
       }

package/src/components/misc/TopBar.vue

@@ -8,7 +8,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},
       }"
       @click="onDisplayMenu(true)"
@@ -111,14 +111,13 @@ export default defineComponent({
         {title : this.$t('Productors'), routeName: 'productors', condition : !this.isPodcastmaker && (!this.filterOrga || this.isEducation)}]
     },
     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;
     },
     logoUrl(): string {
-      if (this.isEducation) return '/img/logo_education.png';
-      return '/img/logo_octopus_final.svg';
+      return this.isEducation ?'/img/logo_education.png': '/img/logo_octopus_final.svg';
     },
     isPodcastmaker(): boolean {
       return (state.generalParameters.podcastmaker as boolean);
@@ -130,11 +129,8 @@ export default defineComponent({
       return this.$store.state.filter.live;
     },
     imgUrl(): string {
-      if (
-        this.$store.state.filter.imgUrl &&
-        !this.$store.state.filter.imgUrl.includes('emptypodcast')
-      )
-        return this.$store.state.filter.imgUrl + '?dummy=' + this.dummyParam;
+      if (!this.$store.state.filter.imgUrl?.includes('emptypodcast'))
+        return `${this.$store.state.filter.imgUrl}?dummy=${this.dummyParam}`;
       return '';
     },
   },
@@ -162,7 +158,7 @@ export default defineComponent({
         return { productor: this.$store.state.filter.organisationId};
       }
       return { productor: this.$store.state.filter.organisationId,
-                   iabId: this.$store.state.filter.iab ? this.$store.state.filter.iab.id : undefined,
+                   iabId: this.$store.state.filter.iab?.id,
                    rubriquesId: this.rubriqueQueryParam}
     },
     handleScroll(): void {
@@ -193,7 +189,7 @@ export default defineComponent({
       this.$emit('update:displayMenu',param?false:!this.displayMenu);
     },
     async onOrganisationSelected(organisation: Organisation | undefined): Promise<void> {
-      if (organisation && organisation.id) {
+      if (organisation?.id) {
         await this.selectOrganisation(organisation.id);
         return;
       }

package/src/components/misc/modal/ClipboardModal.vue

@@ -8,6 +8,7 @@
             {{ $t('RSS Link') }}
           </div>
           <button
+            ref="focusElement"
             type="button"
             class="btn-close btn-close-white"
             title="Close"
@@ -53,6 +54,9 @@ export default defineComponent({
     emission: { default: undefined, type: Object as ()=> Emission},
   },
   emits: ['close', 'copy'],
+  mounted(){
+    (this.$refs.focusElement as HTMLElement)?.focus();
+  },
 
   methods: {
     closePopup(): void {

package/src/components/misc/modal/MessageModal.vue

@@ -12,6 +12,7 @@
           </h5>
           <button
             v-if="closable"
+            :ref="closable?'focusElement':''"
             type="button"
             class="btn-close btn-close-white"
             title="Close"
@@ -32,6 +33,7 @@
         >
           <button
             v-if="canceltext"
+            :ref="!closable && canceltext?'focusElement':''"
             class="btn m-1"
             @click="onCancel"
           >
@@ -46,6 +48,7 @@
           </button>
           <button
             class="btn btn-primary m-1"
+            :ref="!closable && !canceltext?'focusElement':''"
             @click="onValid"
           >
             {{ validatetext }}
@@ -70,6 +73,9 @@ export default defineComponent({
     thirdText: { default: undefined, type: String},
   },
   emits: ['close', 'validate', 'cancel', 'thirdEvent'],
+  mounted(){
+    (this.$refs.focusElement as HTMLElement)?.focus();
+  },
   methods: {
     closePopup(): void {
       this.$emit('close');