@saooti/octopus-sdk 30.0.3 → 30.0.4

package/README.md

@@ -495,7 +495,9 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
  * 29.0.26 Snackbar position
  * 29.0.27 Petit cursor:pointer des familles
  * 29.0.28 Petite couleur des familles
+ * 29.0.29 Amélioration Popover
 
  * 30.0.1 Nouveau sprint
  * 30.0.2 Correction css
  * 30.0.3 Ajout tag page podcast
+ * 30.0.4 Remplacer la version "classique" des miniplayers par la version beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saooti/octopus-sdk",
-  "version": "30.0.3",
+  "version": "30.0.4",
   "private": false,
   "description": "Javascript SDK for using octopus",
   "author": "Saooti",

package/src/components/display/comments/CommentItem.vue

@@ -24,7 +24,6 @@
           }}</b>
           <Popover
             :target="'popover-comment' + comment.comId"
-            triggers="hover"
             custom-class="wizard-help"
           >
             {{ $t('Comment waiting') }}

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

@@ -12,7 +12,6 @@
     <span class="mx-1">:</span>
     <Popover
       :target="idPopover"
-      triggers="hover"
       custom-class="participant-help"
     >
       <div class="text-center font-weight-bold">

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

@@ -39,11 +39,10 @@ export default defineComponent({
   components: {
     Popover
   },
+  mixins:[tagOfMixins],
   props: {
     tagList: { default: () => [], type: Array as ()=>Array<string>},
   },
-  mixins:[tagOfMixins],
-
   methods: {
   },
 })

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

@@ -13,6 +13,7 @@
       <span
         v-if="authenticated"
         id="popover-share-help"
+        role="button"
         class="saooti-help ml-2"
         :aria-label="$t('Help')"
       />

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

@@ -34,27 +34,12 @@
               :emission="emission"
               :playlist="playlist"
               :custom-players="customPlayers"
-              :is-beta="isBeta"
             />
           </div>
           <SharePlayerColors
             v-model:color="color"
             v-model:theme="theme"
-            v-model:themeBeta="themeBeta"
-            :is-beta="isBeta"
           />
-          <div v-if="displayBetaChoice">
-            <input
-              id="isBetaCheckbox"
-              v-model="isBeta"
-              type="checkbox"
-              class="form-check-input"
-            >
-            <label
-              class="form-check-label me-2"
-              for="isBetaCheckbox"
-            >{{ $t('Use beta version') }}</label>
-          </div>
           <div
             v-if="isPodcastNotVisible || playlist"
             class="d-flex align-items-center flex-wrap"
@@ -140,26 +125,20 @@ export default defineComponent({
       isShareModal: false as boolean,
       color: '#40a372' as string,
       theme: '#000000' as string,
-      themeBeta: '#000000' as string,
       proceedReading: true as boolean,
       episodeNumbers: 'number' as string,
       iFrameNumber: '3' as string,
       startTime: 0 as number,
       isVisible: false as boolean,
       displayArticle: true as boolean,
-      displayBetaChoice: false as boolean,
       customPlayers: [] as Array<CustomPlayer>,
-      isBeta: false as boolean,
       colors: ['#000000', '#ffffff'],
     };
   },
   
   computed: {
     miniplayerBaseUrl(): string{
-      if(this.isBeta){
-        return (state.podcastPage.MiniplayerBetaUri as string);  
-      }
-      return (state.podcastPage.MiniplayerUri as string);
+      return (state.podcastPage.MiniplayerUri as string); 
     },
     isEmission(): boolean {
       return 'emission' === this.iFrameModel;
@@ -253,7 +232,7 @@ export default defineComponent({
         }
       }
       url.push('?distributorId=' + this.organisationId);
-      const theme = this.isBeta ? this.themeBeta : this.theme;
+      const theme = this.theme;
       url.push(
         '&color=' +
           this.color.substring(1) +
@@ -367,22 +346,15 @@ export default defineComponent({
       } else {
         this.theme = '#000000';
       }
-      if (Object.prototype.hasOwnProperty.call(data,'playerBeta')) {
-        if (Object.prototype.hasOwnProperty.call(data,'THEMEBETA')) {
-          this.themeBeta = data.THEMEBETA;
-        }
-        this.displayBetaChoice = data.playerBeta;
-        let dataFetched = await octopusApi.fetchCustomPlayer('customPlayer/organisation/'+ this.organisationId);
-        this.customPlayers = dataFetched.content;
-        const totalCount = dataFetched.totalElements;
-        let index = 1;
-        while (totalCount > this.customPlayers.length) {
-          dataFetched =  await octopusApi.fetchCustomPlayer('customPlayer/organisation/'+ this.organisationId+'?start='+index);
-          this.customPlayers = this.customPlayers.concat(dataFetched.content);
-          ++index;
-        }
+      let dataFetched = await octopusApi.fetchCustomPlayer('customPlayer/organisation/'+ this.organisationId);
+      this.customPlayers = dataFetched.content;
+      const totalCount = dataFetched.totalElements;
+      let index = 1;
+      while (totalCount > this.customPlayers.length) {
+        dataFetched =  await octopusApi.fetchCustomPlayer('customPlayer/organisation/'+ this.organisationId+'?start='+index);
+        this.customPlayers = this.customPlayers.concat(dataFetched.content);
+        ++index;
       }
-      return;
     },
     updateEpisodeNumber(value: string): void {
       this.episodeNumbers = value;

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

@@ -17,34 +17,7 @@
       <div class="fw-600">
         {{ $t('Choose theme') }}
       </div>
-      <div
-        v-if="!isBeta"
-        class="d-flex"
-      >
-        <VSwatches
-          v-for="myColor in colors"
-          :key="myColor"
-          v-model="internTheme"
-          :data-theme="internTheme"
-          class="c-hand input-no-outline me-1"
-          :swatch-style="{
-            padding: '0px 0px',
-            marginRight: '0px',
-            marginBottom: '0px',
-            border: '1px gray solid',
-          }"
-          :wrapper-style="{
-            paddingTop: '0px',
-            paddingLeft: '0px',
-            paddingRight: '0px',
-            paddingBottom: '0px',
-          }"
-          :swatches="[myColor]"
-          inline
-        />
-      </div>
       <VSwatches
-        v-else
         v-model="internTheme"
         class="c-hand input-no-outline"
         show-fallback
@@ -65,28 +38,18 @@ export default defineComponent({
   },
 
   props: {
-    isBeta: { default: false, type: Boolean},
     color: { default: '#40a372', type: String},
     theme: { default: '#000000', type: String},
-    themeBeta: { default: '#000000', type: String},
   },
-  emits:['update:color', 'update:theme', 'update:themeBeta'],
+  emits:['update:color', 'update:theme'],
 
   data() {
     return {
       internColor:'#40a372' as string,
       internTheme:'#000000' as string,
-      colors: ['#000000', '#ffffff'],
     };
   },
   watch:{
-    isBeta(){
-      if(this.isBeta){
-        this.internTheme = this.themeBeta;
-      }else{
-        this.internTheme = this.theme;
-      }
-    },
     color(){
       if(this.color !== this.internColor){
         this.internColor = this.color;
@@ -98,27 +61,19 @@ export default defineComponent({
       }
     },
     theme(){
-      if(this.theme !== this.internTheme && !this.isBeta){
+      if(this.theme !== this.internTheme){
         this.internTheme = this.theme;
       }
     },
-    themeBeta(){
-      if(this.themeBeta !== this.internTheme && this.isBeta){
-        this.internTheme = this.themeBeta;
-      }
-    },
     internTheme(){
-      if(this.theme !== this.internTheme && !this.isBeta){
+      if(this.theme !== this.internTheme ){
         this.$emit('update:theme', this.internTheme);
-      }else if(this.themeBeta !== this.internTheme && this.isBeta){
-        this.$emit('update:themeBeta', this.internTheme);
       }
     }
   },
   mounted(){
     this.internColor= this.color;
-    this.internTheme= this.isBeta? this.themeBeta : this.theme;
+    this.internTheme= this.theme;
   }
-
 })
 </script>

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

@@ -17,15 +17,13 @@
       <option value="large">
         {{ $t('Large version') }}
       </option>
-      <template v-if="isBeta">
-        <option
-          v-for="player in customPlayersDisplay"
-          :key="player.customId"
-          :value="player.customId"
-        >
-          {{ $t('Custom version') + " «" +player.name+"»" }}
-        </option>
-      </template>
+      <option
+        v-for="player in customPlayersDisplay"
+        :key="player.customId"
+        :value="player.customId"
+      >
+        {{ $t('Custom version') + " «" +player.name+"»" }}
+      </option>
       <option
         v-if="podcast && podcast.podcastId"
         value="emission"
@@ -62,7 +60,6 @@ export default defineComponent({
     emission: { default: undefined, type: Object as ()=> Emission},
     playlist: { default: undefined, type: Object as ()=> Playlist},
     customPlayers: { default: ()=>[], type: Array as ()=> Array<CustomPlayer>},
-    isBeta: { default: false, type: Boolean},
     iFrameModel: { default: 'default', type: String},
   },
   emits:['update:iFrameModel'],

package/src/components/misc/Popover.vue

@@ -32,7 +32,6 @@ export default defineComponent({
     placement: {type: String as PropType<Popover.Options['placement']>, default: 'right'},
     target: {type: String, required: true},
     title: {type: String, default: ''},
-    triggers: {type: String as PropType<Popover.Options['trigger']>, default: 'click'},
     show: {type: Boolean, default: false},
     disable: {type: Boolean, default: false},
   },
@@ -46,7 +45,7 @@ export default defineComponent({
     function initPopover(){
       instance.value = new Popover(`#${props.target}`, {
         container: 'body',
-        trigger: props.triggers,
+        trigger: "click hover",
         placement: props.placement,
         title: titleRef.value?.innerHTML || '',
         content: contentRef.value?.innerHTML || '',

package/src/locale/en.ts

@@ -287,7 +287,6 @@ export default{
   'See associated article':"Read the article",
   "Display associated article":"Display associated article",
   "Copy this page URL":"Copy this page URL",
-  "Use beta version":"Use beta version player",
   "Custom version":"Custom version",
   "All":"All",
   'By category': 'By IAB category',

package/src/locale/fr.ts

@@ -287,7 +287,6 @@ export default{
   'See associated article':"Lire l'article",
   "Display associated article":"Afficher l'article associé",
   "Copy this page URL":"Copier l'adresse de cette page",
-  "Use beta version":"Utiliser la version beta du player",
   "Custom version":"Version customisée",
   "All":"Tous",
   'By category': 'Selon la catégorie IAB',

package/src/store/paramStore.ts

@@ -24,8 +24,7 @@ const state:paramStore = {
     SharePlayer: true,
     ShareButtons: true,
     ShareDistribution: true,
-    MiniplayerUri: 'https://player.dev2.saooti.org/',
-    MiniplayerBetaUri: 'https://playerbeta.dev2.saooti.org/',
+    MiniplayerUri: 'https://playerbeta.dev2.saooti.org/',
     ouestFranceStyle: false,
     downloadButton: false,
     hlsUri: 'https://hls.dev2.saooti.org/',
@@ -111,7 +110,6 @@ export interface PodcastPage{
   ShareButtons?: boolean,
   ShareDistribution?: boolean,
   MiniplayerUri?: string,
-  MiniplayerBetaUri?: string,
   ouestFranceStyle?: boolean,
   downloadButton?: boolean,
   hlsUri?: string,