@saooti/octopus-sdk 30.0.3 → 30.0.7

package/src/components/display/rubriques/RubriqueChooser.vue

@@ -70,7 +70,7 @@
 import { selenium } from '../../mixins/functions';
 //@ts-ignore
 import VueMultiselect from 'vue-multiselect';
-import { Rubrique } from '@/store/class/rubrique';
+import { Rubrique } from '@/store/class/rubrique/rubrique';
 const getDefaultRubrique = (defaultName: string) => {
   if ('' === defaultName){
     return undefined;

package/src/components/display/rubriques/RubriqueList.vue

@@ -6,7 +6,7 @@
     >
       <select
         v-model="rubriquage"
-        class="basic-select border c-hand mb-0"
+        class="c-hand mb-0"
         @change="onRubriquageSelected"
       >
         <option
@@ -54,9 +54,9 @@
 </template>
 
 <script lang="ts">
-import { Rubrique } from '@/store/class/rubrique';
-import { Rubriquage } from '@/store/class/rubriquage';
-import { RubriquageFilter } from '@/store/class/rubriquageFilter';
+import { Rubrique } from '@/store/class/rubrique/rubrique';
+import { Rubriquage } from '@/store/class/rubrique/rubriquage';
+import { RubriquageFilter } from '@/store/class/rubrique/rubriquageFilter';
 import { defineComponent } from 'vue'
 export default defineComponent({
   name: 'RubriqueList',

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

@@ -1,6 +1,5 @@
 <template>
   <div
-    v-if="!playlist"
     id="accordionParameters"
     class="accordion player-parameters mt-3"
   >
@@ -28,13 +27,11 @@
       >
         <div class="accordion-body">
           <div
-            v-if="
-              !podcast || isEmission || isLargeEmission || isLargeSuggestion
-            "
+            v-if="choseNumberEpisode"
             class="d-flex flex-column flex-grow"
           >
             <div
-              v-if="!podcast || isEmission || isLargeEmission"
+              v-if="displayChoiceAllEpisodes"
               class="d-flex align-items-center w-100 flex-wrap mt-1"
             >
               <input
@@ -48,10 +45,10 @@
             </div>
             <div
               class="d-flex align-items-center flex-wrap"
-              :class="!podcast || isEmission || isLargeEmission ? '' : 'mt-3'"
+              :class="displayChoiceAllEpisodes ? '' : 'mt-3'"
             >
               <input
-                v-if="!podcast || isEmission || isLargeEmission"
+                v-if="displayChoiceAllEpisodes"
                 v-model="episodeNumbers"
                 class="form-check-input"
                 type="radio"
@@ -120,28 +117,6 @@
               }}</label>
             </div>
           </div>
-          <!-- <div class="d-flex align-items-center flex-wrap" v-if="podcast && iFrameModel !== 'emission'">
-              <div>  
-                <input type="checkbox" class="form-check-input" id="startTime" v-model="startTime">  
-                <label class="form-check-label me-2" for="startTime">{{$t('Start at')}}</label>  
-              </div>
-                <input 
-                ref="minutesRef"
-                type="number"
-                :value="minutes" 
-                min="0"
-                class="input-share-player input-no-outline" 
-                @change="onDurationChange"/>
-                <div class="me-1 ms-1">:</div>
-              <input 
-                ref="secondesRef"
-                type="number"
-                :value="secondes" 
-                min="0"
-                max="59"
-                class="input-share-player input-no-outline" 
-                @change="onDurationChange"/>
-            </div> -->
         </div>
       </div>
     </div>
@@ -149,26 +124,20 @@
 </template>
 
 <script lang="ts">
-import { Playlist } from '@/store/class/playlist';
-import { Podcast } from '@/store/class/podcast';
 import { defineComponent } from 'vue'
 export default defineComponent({
   props: {
-    podcast: { default: undefined, type: Object as ()=> Podcast},
-    playlist: { default: undefined, type: Object as ()=> Playlist},
-    iFrameModel: { default: undefined, type: String},
     isVisible: { default: false, type: Boolean},
+    choseNumberEpisode: {default: false, type: Boolean},
+    displayChoiceAllEpisodes: {default: false, type: Boolean}
   },
-  emits: ['startTime', 'episodeNumbers', 'proceedReading', 'isVisible', 'iFrameNumber', 'displayArticle'],
+  emits: ['episodeNumbers', 'proceedReading', 'isVisible', 'iFrameNumber', 'displayArticle'],
 
   data() {
     return {
       proceedReading: true as boolean,
       episodeNumbers: 'number' as string,
       iFrameNumberPriv: '3' as string,
-      minutes: 0 as number,
-      secondes: 0 as number,
-      startTime: true as boolean,
       isVisibleTemp: this.isVisible as boolean,
       displayArticle: true as boolean,
     };
@@ -185,15 +154,6 @@ export default defineComponent({
         }
       },
     },
-    isEmission(): boolean {
-      return 'emission' === this.iFrameModel;
-    },
-    isLargeEmission(): boolean {
-      return 'largeEmission' === this.iFrameModel;
-    },
-    isLargeSuggestion(): boolean {
-      return 'largeSuggestion' === this.iFrameModel;
-    },
   },
   watch: {
     episodeNumbers(): void {
@@ -215,17 +175,6 @@ export default defineComponent({
       this.$emit('displayArticle', this.displayArticle);
     }
   },
-  methods: {
-    /* onDurationChange(): void {
-      if (this.startTime) {
-        const minutes = parseInt((this.$refs.minutesRef as any).value, 10);
-        const secondes = parseInt((this.$refs.secondesRef as any).value, 10);
-        this.$emit('startTime', minutes * 60 + secondes);
-      } else {
-        this.$emit('startTime', 0);
-      }
-    }, */
-  },
 })
 </script>
 

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

@@ -13,13 +13,14 @@
       <span
         v-if="authenticated"
         id="popover-share-help"
+        role="button"
+        tabindex="-1"
         class="saooti-help ml-2"
         :aria-label="$t('Help')"
       />
       <Popover
         v-if="authenticated"
         target="popover-share-help"
-        triggers="hover"
         placement="right"
       >
         {{ $t('Share this page without edit and share blocks') }}
@@ -246,8 +247,8 @@
 </template>
 
 <script lang="ts">
-import { Emission } from '@/store/class/emission';
-import { Podcast } from '@/store/class/podcast';
+import { Emission } from '@/store/class/general/emission';
+import { Podcast } from '@/store/class/general/podcast';
 import { state } from '../../../store/paramStore';
 import Snackbar from '../../misc/Snackbar.vue';
 import { displayMethods } from '../../mixins/functions';

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

@@ -113,7 +113,7 @@
 import octopusApi from '@saooti/octopus-api';
 import Snackbar from '../../misc/Snackbar.vue';
 import { displayMethods } from '../../mixins/functions';
-import { Emission } from '@/store/class/emission';
+import { Emission } from '@/store/class/general/emission';
 
 import { defineComponent, defineAsyncComponent } from 'vue';
 import SnackbarVue from '../../misc/Snackbar.vue';

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"
@@ -75,16 +60,14 @@
         </div>
         <PlayerParameters
           v-if="isPlayerParameter"
-          :podcast="podcast"
-          :playlist="playlist"
-          :i-frame-model="iFrameModel"
           :is-visible="isVisible"
+          :chose-number-episode="displayChoiceAllEpisodes|| isLargeSuggestion"
+          :display-choice-all-episodes="displayChoiceAllEpisodes"
           @displayArticle="updateDisplayArticle"
           @episodeNumbers="updateEpisodeNumber"
           @proceedReading="updateProceedReading"
           @isVisible="updateIsVisible"
           @iFrameNumber="updateIframeNumber"
-          @startTime="updateStartTime"
         />
       </template>
       <div v-else-if="exclusive && authenticated">
@@ -107,10 +90,10 @@
 <script lang="ts">
 import { state } from '../../../store/paramStore';
 import octopusApi from '@saooti/octopus-api';
-import { Podcast } from '@/store/class/podcast';
-import { Emission } from '@/store/class/emission';
-import { Playlist } from '@/store/class/playlist';
-import { CustomPlayer } from '@/store/class/customPlayer';
+import { Podcast } from '@/store/class/general/podcast';
+import { Emission } from '@/store/class/general/emission';
+import { Playlist } from '@/store/class/general/playlist';
+import { CustomPlayer } from '@/store/class/general/customPlayer';
 import { defineComponent, defineAsyncComponent } from 'vue';
 const ShareModalPlayer = defineAsyncComponent(() => import('../../misc/modal/ShareModalPlayer.vue'));
 const PlayerParameters = defineAsyncComponent(() => import('./PlayerParameters.vue'));
@@ -140,32 +123,28 @@ 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: {
+    displayChoiceAllEpisodes():boolean{
+      return !this.podcast || this.isEmission || this.isLargeEmission;
+    },
     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;
     },
     isLargeEmission(): boolean {
-      return 'largeEmission' === this.iFrameModel;
+      return 'emissionLarge' === this.iFrameModel;
     },
     isLargeSuggestion(): boolean {
       return 'largeSuggestion' === this.iFrameModel;
@@ -202,10 +181,7 @@ export default defineComponent({
     iFrameSrc(): string {
       const url = [''];
       let iFrameNumber = '/' + this.iFrameNumber;
-      if (
-        (!this.podcast || this.isEmission || this.isLargeEmission) &&
-        'all' === this.episodeNumbers
-      ) {
+      if (this.displayChoiceAllEpisodes && 'all' === this.episodeNumbers) {
         iFrameNumber = '/0';
       }
       if (!this.podcast && !this.playlist && this.emission) {
@@ -253,7 +229,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) +
@@ -266,7 +242,6 @@ export default defineComponent({
       if(!this.displayArticle){
         url.push('&article=false');
       }
-      url.push('&time=' + this.startTime);
       if (this.isVisible) {
         url.push('&key=' + window.btoa(this.dataTitle.toString()));
       }
@@ -280,38 +255,38 @@ export default defineComponent({
         case 'large':
           if (this.podcast) return '180px';
           if ('number' === this.episodeNumbers) {
-            switch (this.iFrameNumber) {
+            switch (this.iFrameNumber.toString()) {
               case '1':
-                return '185px';
+                return '270px';
               case '2':
-                return '240px';
+                return '320px';
               case '3':
-                return '290px';
+                return '360px';
               case '4':
-                return '345px';
+                return '420px';
               case '5':
-                return '390px';
+                return '420px';
               default:
-                return '435px';
+                return '420px';
             }
           }
           return '435px';
-        case 'largeEmission':
+        case 'emissionLarge':
         case 'largeSuggestion':
           if ('number' !== this.episodeNumbers) return '510px';
-          switch (this.iFrameNumber) {
+          switch (this.iFrameNumber.toString()) {
             case '1':
-              return '260px';
-            case '2':
               return '315px';
-            case '3':
+            case '2':
               return '365px';
-            case '4':
+            case '3':
               return '420px';
+            case '4':
+              return '470px';
             case '5':
-              return '465px';
+              return '470px';
             default:
-              return '510px';
+              return '470px';
           }
         case 'emission':
           return '530px';
@@ -337,7 +312,7 @@ export default defineComponent({
       return 0;
     },
     isPlayerParameter(): boolean{
-      return !this.podcast || (this.podcast.article && 0 !== this.podcast.article.length) || this.isEmission || this.isLargeEmission || this.isLargeSuggestion;
+      return (!this.podcast || (this.podcast.article && 0 !== this.podcast.article.length) || this.isEmission || this.isLargeEmission || this.isLargeSuggestion) && !this.playlist;
     }
   },
   async created() {
@@ -367,22 +342,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;
@@ -393,9 +361,6 @@ export default defineComponent({
     updateIframeNumber(value: string): void {
       this.iFrameNumber = value;
     },
-    updateStartTime(value: number): void {
-      this.startTime = value;
-    },
     updateIsVisible(value: boolean): void {
       this.isVisible = 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"
@@ -36,7 +34,7 @@
       </option>
       <option
         v-if="podcast && podcast.podcastId"
-        value="largeEmission"
+        value="emissionLarge"
       >
         {{ $t('Large emission version') }}
       </option>
@@ -51,18 +49,17 @@
 </template>
 
 <script lang="ts">
-import { Podcast } from '@/store/class/podcast';
-import { CustomPlayer } from '@/store/class/customPlayer';
+import { Podcast } from '@/store/class/general/podcast';
+import { CustomPlayer } from '@/store/class/general/customPlayer';
 import { defineComponent } from 'vue';
-import { Emission } from '@/store/class/emission';
-import { Playlist } from '@/store/class/playlist';
+import { Emission } from '@/store/class/general/emission';
+import { Playlist } from '@/store/class/general/playlist';
 export default defineComponent({
   props: {
     podcast: { default: undefined, type: Object as ()=> Podcast},
     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/display/sharing/SubscribeButtons.vue

@@ -123,7 +123,7 @@
 </template>
 
 <script lang="ts">
-import { Emission } from '@/store/class/emission';
+import { Emission } from '@/store/class/general/emission';
 import { defineComponent } from 'vue'
 export default defineComponent({
   props: {

package/src/components/misc/Footer.vue

@@ -140,8 +140,8 @@ import Player from './Player.vue';
 import { state } from '../../store/paramStore';
 import octopusApi from '@saooti/octopus-api';
 import moment from 'moment';
-import { Category } from '@/store/class/category';
-import { RubriquageFilter } from '@/store/class/rubriquageFilter';
+import { Category } from '@/store/class/general/category';
+import { RubriquageFilter } from '@/store/class/rubrique/rubriquageFilter';
 import { defineComponent } from 'vue'
 export default defineComponent({
   name: 'Footer',

package/src/components/misc/LeftMenu.vue

@@ -117,10 +117,10 @@
 <script lang="ts">
 import { state } from '../../store/paramStore';
 import { orgaFilter } from '../mixins/organisationFilter';
-import { Category } from '@/store/class/category';
-import { RubriquageFilter } from '@/store/class/rubriquageFilter';
+import { Category } from '@/store/class/general/category';
+import { RubriquageFilter } from '@/store/class/rubrique/rubriquageFilter';
 import { defineComponent, defineAsyncComponent } from 'vue';
-import { Organisation } from '@/store/class/organisation';
+import { Organisation } from '@/store/class/general/organisation';
 const OrganisationChooserLight = defineAsyncComponent(() => import('../display/organisation/OrganisationChooserLight.vue'));
 export default defineComponent({
   name: 'LeftMenu',

package/src/components/misc/Player.vue

@@ -77,14 +77,14 @@ import octopusApi from '@saooti/octopus-api';
 /* eslint-disable */
 let Hls:any = null;
 /* eslint-enable */
-import { CommentPodcast } from '@/store/class/comment';
+import { CommentPodcast } from '@/store/class/general/comment';
 import { cookies } from '../mixins/functions';
 import { StoreState } from '@/store/typeAppStore';
 import PlayerProgressBar from './PlayerProgressBar.vue';
 import PlayerButtons from './PlayerButtons.vue';
 import PlayerClockAndTimeline from './PlayerClockAndTimeline.vue';
 import { defineComponent } from 'vue';
-import { FetchParam } from '@/store/class/fetchParam';
+import { FetchParam } from '@/store/class/general/fetchParam';
 export default defineComponent({
   name: 'Player',
 

package/src/components/misc/PlayerButtons.vue

@@ -44,8 +44,8 @@
 <script lang="ts">
 import { state } from '../../store/paramStore';
 import { defineComponent } from 'vue';
-import { Media } from '@/store/class/media';
-import { Podcast } from '@/store/class/podcast';
+import { Media } from '@/store/class/general/media';
+import { Podcast } from '@/store/class/general/podcast';
 import { RouteLocationRaw } from 'vue-router';
 export default defineComponent({
   name: 'PlayerButtons',

package/src/components/misc/PlayerClockAndTimeline.vue

@@ -23,7 +23,7 @@
 import moment from 'moment';
 import { state } from '../../store/paramStore';
 import { defineComponent } from 'vue';
-import { CommentPodcast } from '@/store/class/comment';
+import { CommentPodcast } from '@/store/class/general/comment';
 export default defineComponent({
   name: 'PlayerClockAndTimeline',
 

package/src/components/misc/PlayerProgressBar.vue

@@ -58,7 +58,7 @@
 <script lang="ts">
 import { state } from '../../store/paramStore';
 import DurationHelper from '../../helper/duration';
-import { CommentPodcast } from '@/store/class/comment';
+import { CommentPodcast } from '@/store/class/general/comment';
 import { defineComponent, defineAsyncComponent } from 'vue';
 const CommentPlayer = defineAsyncComponent(() => import('../display/comments/CommentPlayer.vue'));
 export default defineComponent({