@saooti/octopus-sdk 31.0.3 → 31.0.6

package/README.md

@@ -562,9 +562,20 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
  * 30.0.63 Italian translation
  * 30.0.64 Modif Le soir
  * 30.0.65 OAuthType
+ * 30.0.66 ScrollBehavior
+ * 30.0.67 Parlement européen
+ * 30.0.68 Parlement européen
+ * 30.0.69 Parlement européen
+ * 30.0.70 Améliorations 30
 
  * 31.0.0 Passage en 31
  * 31.0.1 Ajout pocket casts
  * 31.0.2 Gestion des 403
  * 31.0.3 Merge 30
+ * 31.0.4 Selection des customPlayers
+ * 31.0.5 Merge 30
+ * 31.0.6 Erreur de Merge 30
 
+
+
+ 

package/package.json

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

package/src/assets/bootstrap-diff.scss

@@ -89,6 +89,12 @@
                 background: transparent;
                 color: $octopus-primary-dark;
             }
+            &:disabled{
+                background-color: #cccccc;
+                border: black;
+                cursor: default;
+                color: gray;
+            }
             @media (max-width: 500px){
             margin: 0.3rem;
             }

package/src/components/display/categories/CategoryFilter.vue

@@ -122,7 +122,7 @@ export default defineComponent({
         this.$store.commit('filterRubrique', filter);
         const queries = this.$route.query;
         const queryString = filter.map(value =>  value.rubriquageId+':'+value.rubriqueId).join();
-        this.$router.push({ query: { ...queries, ...{ rubriquesId: queryString }} });
+        this.$router.replace({ query: { ...queries, ...{ rubriquesId: queryString }} });
       }
     },
     getRubriques(rubriquageId: number): Array<Rubrique>{
@@ -138,7 +138,7 @@ export default defineComponent({
       const queries = this.$route.query;
       if(this.categoryFilter){
         if (queries.iabId) {
-          this.$router.push({ query: {...queries, ...{iabId: undefined} } });
+          this.$router.replace({ query: {...queries, ...{iabId: undefined} } });
         }
         this.$store.commit('filterIab', undefined);
       }else{
@@ -147,9 +147,9 @@ export default defineComponent({
         if (queries.rubriquesId) {
           const queryString = newFilter.map(value => value.rubriquageId+':'+value.rubriqueId).join();
           if("" !== queryString){
-            this.$router.push({ query: { ...queries, ...{ rubriquesId: queryString }} });
+            this.$router.replace({ query: { ...queries, ...{ rubriquesId: queryString }} });
           }else{
-            this.$router.push({ query: { ...queries, ...{ rubriquesId: undefined }} });
+            this.$router.replace({ query: { ...queries, ...{ rubriquesId: undefined }} });
           }
         }
         this.$store.commit('filterRubrique', newFilter);

package/src/components/display/categories/CategoryList.vue

@@ -139,7 +139,7 @@ export default defineComponent({
       }
       const queries = this.$route.query;
       if(!queries.iabId || ('string'===typeof queries.iabId &&  parseInt(queries.iabId ,10) !== category.id)) {
-        this.$router.push({ query: { ...queries, ...{ iabId: category.id.toString() }} });
+        this.$router.replace({ query: { ...queries, ...{ iabId: category.id.toString() }} });
       }
       this.$store.commit('filterIab',category);
     },

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

@@ -136,13 +136,13 @@ export default defineComponent({
     sortText(): string {
       switch (this.sort) {
         case 'SCORE':
-          return this.$t('sort by score').toString();
+          return " "+this.$t('sort by score').toString();
         case 'LAST_PODCAST_DESC':
-          return this.$t('sort by date').toString();
+          return " "+this.$t('sort by date').toString();
         case 'NAME':
-          return this.$t('sort by alphabetical').toString();
+          return " "+this.$t('sort by alphabetical').toString();
         default:
-          return this.$t('sort by date').toString();
+          return " "+this.$t('sort by date').toString();
       }
     },
     filterOrga(): string {

package/src/components/display/filter/CategoryFilter.vue

@@ -105,7 +105,7 @@ export default defineComponent({
       }
       const queries = this.$route.query;
       if (queries.iabId) {
-        this.$router.push({ query: {...queries, ...{iabId: undefined} } });
+        this.$router.replace({ query: {...queries, ...{iabId: undefined} } });
       }
       this.$store.commit('filterIab', undefined);
     }

package/src/components/display/filter/ProductorSearch.vue

@@ -118,11 +118,17 @@ export default defineComponent({
       });
       this.keepOrganisation = false;
       if (organisation && organisation.id) {
-        this.showBubble = true;
-        setTimeout(() => {
-          this.showBubble = false;
-        }, 6000);
         this.$emit('updateOrganisationId', organisation.id);
+        if(organisation.private){
+          this.$nextTick(() => {
+            this.onKeepOrganisation();
+          });
+        } else{
+          this.showBubble = true;
+          setTimeout(() => {
+            this.showBubble = false;
+          }, 6000);
+        }
       } else {
         this.$emit('updateOrganisationId', undefined);
       }

package/src/components/display/filter/RubriqueFilter.vue

@@ -229,7 +229,7 @@ export default defineComponent({
       }
       const queries = this.$route.query;
       if (queries.rubriquesId) {
-        this.$router.push({ query: {...queries, ...{rubriquesId: undefined} } });
+        this.$router.replace({ query: {...queries, ...{rubriquesId: undefined} } });
       }
       this.$store.commit('filterRubrique', []);
     }

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

@@ -128,10 +128,7 @@ export default defineComponent({
       return (state.podcastsPage.podcastBorderBottom as boolean);
     },
     date(): string {
-      if('fr' === this.$i18n.locale){
-        return moment(this.podcast.pubDate).format('D MMMM YYYY [à] HH[h]mm');
-      }
-      return moment(this.podcast.pubDate).format('D MMMM YYYY [at] HH[h]mm');
+      return moment(this.podcast.pubDate).format('D MMMM YYYY, HH[h]mm');
     },
     displayDate(): string {
       return moment(this.podcast.pubDate).format('X');

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

@@ -122,13 +122,13 @@ export default defineComponent({
     sortText(): string {
       switch (this.sortCriteria) {
         case 'SCORE':
-          return this.$t('sort by score').toString();
+          return " "+this.$t('sort by score').toString();
         case 'DATE':
-          return this.$t('sort by date').toString();
+          return " "+this.$t('sort by date').toString();
         case 'NAME':
-          return this.$t('sort by alphabetical').toString();
+          return " "+this.$t('sort by alphabetical').toString();
         default:
-          return this.$t('sort by date').toString();
+          return " "+this.$t('sort by date').toString();
       }
     },
     isProduction(): boolean {

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

@@ -214,10 +214,7 @@ export default defineComponent({
     },
     date(): string {
       if (this.podcast && 1970 !== moment(this.podcast.pubDate).year()){
-        if('fr' === this.$i18n.locale){
-          return moment(this.podcast.pubDate).format('D MMMM YYYY [à] HH[h]mm');
-        }
-        return moment(this.podcast.pubDate).format('D MMMM YYYY [at] HH[h]mm');
+        return moment(this.podcast.pubDate).format('D MMMM YYYY, HH[h]mm');
       }
       return '';
     },

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

@@ -130,7 +130,7 @@ export default defineComponent({
       this.$store.commit('filterRubrique', newFilter);
       const queries = this.$route.query;
       const queryString = newFilter.map(value =>  value.rubriquageId+':'+value.rubriqueId).join();
-      this.$router.push({ query: { ...queries, ...{ rubriquesId: queryString }} });
+      this.$router.replace({ query: { ...queries, ...{ rubriquesId: queryString }} });
       this.selectNewRubriquage();
     },
     selectNewRubriquage(){

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

@@ -33,7 +33,7 @@
               :podcast="podcast"
               :emission="emission"
               :playlist="playlist"
-              :custom-players="customPlayers"
+              :organisation-id="organisationId"
             />
           </div>
           <SharePlayerColors
@@ -82,7 +82,6 @@ import octopusApi from '@saooti/octopus-api';
 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'));
@@ -119,7 +118,6 @@ export default defineComponent({
       iFrameNumber: '3' as string,
       isVisible: false as boolean,
       displayArticle: true as boolean,
-      customPlayers: [] as Array<CustomPlayer>,
       colors: ['#000000', '#ffffff'],
     };
   },
@@ -333,15 +331,6 @@ export default defineComponent({
       } else {
         this.theme = '#000000';
       }
-      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;
-      }
     },
     updateEpisodeNumber(value: string): void {
       this.episodeNumbers = value;

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

@@ -48,6 +48,8 @@
 </template>
 
 <script lang="ts">
+import { state } from '../../../store/paramStore';
+import octopusApi from '@saooti/octopus-api';
 import { Podcast } from '@/store/class/general/podcast';
 import { CustomPlayer } from '@/store/class/general/customPlayer';
 import { defineComponent } from 'vue';
@@ -58,12 +60,21 @@ export default defineComponent({
     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>},
     iFrameModel: { default: 'default', type: String},
+    organisationId: { default: undefined, type: String},
   },
   emits:['update:iFrameModel'],
 
+  data() {
+    return {
+      customPlayers: [] as Array<CustomPlayer>,
+    };
+  },
+
   computed: {
+    authenticated(): boolean {
+      return (state.generalParameters.authenticated as boolean);
+    },
     customPlayersDisplay(): Array<CustomPlayer>{
       return this.customPlayers.filter((player: CustomPlayer)=>{
         return (('EPISODE' === player.typePlayer ||'SUGGESTION' === player.typePlayer) && this.podcast && this.podcast.podcastId) ||
@@ -71,5 +82,41 @@ export default defineComponent({
       });
     },
   },
+   async created() {
+    await this.initCustomPlayers();
+  },
+
+  methods: {
+    async fetchCustomPlayers(type:string, trySelect: boolean): Promise<boolean>{
+      let players = await octopusApi.fetchCustomPlayer('customPlayer/type/'+ this.organisationId+'/'+type);
+      let playersContent = players.content;
+      const totalCount = players.totalElements;
+      let index = 1;
+      while (totalCount > playersContent.length) {
+        players =  await octopusApi.fetchCustomPlayer('customPlayer/type/'+ this.organisationId+'/'+type+'?start='+index);
+        playersContent = playersContent.concat(players.content);
+        ++index;
+      }
+      this.customPlayers = this.customPlayers.concat(playersContent);
+      if(trySelect && this.customPlayers[0] && this.customPlayers[0].selected){
+        this.$emit('update:iFrameModel',this.customPlayers[0].customId);
+        return false;
+      }
+      return true;
+    },
+    async initCustomPlayers(): Promise<void> {
+      if (!this.authenticated) return;
+      if(this.playlist){
+        this.fetchCustomPlayers('PLAYLIST', true);
+      }else if(this.emission  && !this.podcast){
+        this.fetchCustomPlayers('EMISSION', true);
+      }else{
+        let playerTrySelect = true;
+        playerTrySelect = await this.fetchCustomPlayers('EPISODE', playerTrySelect);
+        playerTrySelect = await this.fetchCustomPlayers('EMISSION', playerTrySelect);
+        playerTrySelect = await this.fetchCustomPlayers('SUGGESTION', playerTrySelect);
+      }
+    },
+  }
 })
 </script>

package/src/components/misc/HomeDropdown.vue

@@ -81,14 +81,14 @@
             >
               {{ $t('TutoMag') }}
             </a>
-            <hr class="dropdown-divider">
-            <a
-              class="dropdown-item"
-              href="/sso/logout"
-            >
-              {{ $t('Logout') }}
-            </a>
           </template>
+          <hr class="dropdown-divider">
+          <a
+            class="dropdown-item"
+            href="/sso/logout"
+          >
+            {{ $t('Logout') }}
+          </a>
         </template>
       </div>
     </div>

package/src/components/misc/Player.vue

@@ -25,7 +25,7 @@
       </div>
       <div
         v-if="display"
-        class="d-flex align-items-center flex-grow-1 px-5"
+        class="d-flex align-items-center flex-grow-1 ps-2"
       >
         <audio
           id="audio-player"

package/src/components/misc/PlayerProgressBar.vue

@@ -147,24 +147,30 @@ export default defineComponent({
 
 <style lang="scss">
 .octopus-app{
-.player-grow-content {
-  display: flex;
-  flex-direction: column;
-  flex-grow: 1;
-  flex-shrink: 1;
-  overflow: hidden;
-  font-size: 0.8rem;
-  .progress {
-    height: 4px;
-    position: relative;
-  }
-  .progress-bar-duration {
-    width: 10px;
-  }
-  .progress-bar {
-    height: 4px;
-    position: absolute;
+  .player-grow-content {
+    display: flex;
+    flex-direction: column;
+    flex-grow: 1;
+    flex-shrink: 1;
+    overflow: hidden;
+    font-size: 0.8rem;
+    .progress {
+      height: 4px;
+      position: relative;
+      @media (max-width: 960px) {
+        height: 8px;
+      }
+    }
+    .progress-bar-duration {
+      width: 10px;
+    }
+    .progress-bar {
+      height: 4px;
+      position: absolute;
+      @media (max-width: 960px) {
+        height: 8px;
+      }
+    }
   }
 }
-}
 </style>

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

@@ -258,10 +258,7 @@ export default defineComponent({
     
     date(): string {
       if (1970 !== moment(this.podcast.pubDate).year()){
-        if('fr' === this.$i18n.locale){
-          return moment(this.podcast.pubDate).format('D MMMM YYYY [à] HH[h]mm');
-        }
-        return moment(this.podcast.pubDate).format('D MMMM YYYY [at] HH[h]mm');
+        return moment(this.podcast.pubDate).format('D MMMM YYYY, HH[h]mm');
       }
       return '';
     },

package/src/locale/en.ts

@@ -154,10 +154,10 @@ export default{
   'Podcast in error': 'Podcast in error',
   'See podcasts no visible':
     'See podcasts not visible to the audience',
-  'Number podcasts': '{nb} of podcasts',
-  'Number emissions': '{nb} of series',
-  'Number participants': '{nb} of speakers',
-  'Number productors': '{nb} of Producers',
+  'Number podcasts': '{nb} podcasts',
+  'Number emissions': '{nb} series',
+  'Number participants': '{nb} speakers',
+  'Number productors': '{nb} Producers',
   'Display next': 'Display the following episodes',
   'Display previous': 'Display previous episodes',
   Play: 'Play',
@@ -240,9 +240,9 @@ export default{
   'All live emission button': "All lives in the serie",
   'player parameters': 'Setting of player',
   'Start at': 'Start at',
-  'sort by score': ' by relevancy score',
-  'sort by alphabetical': ' sorted alphabetically',
-  'sort by date': ' sorted by date',
+  'sort by score': 'by relevancy score',
+  'sort by alphabetical': 'sorted alphabetically',
+  'sort by date': 'sorted by date',
   'Be the first to react': 'Be the first to react',
   "Podcast's comments": "Podcast's comments",
   '()': '({nb})',

package/src/locale/fr.ts

@@ -240,9 +240,9 @@ export default{
   'All live emission button': "Tous les lives de l'émission",
   'player parameters': 'Paramètres du player',
   'Start at': 'Démarrer à',
-  'sort by score': ' triés par pertinence',
-  'sort by alphabetical': ' triés par ordre alphabétique',
-  'sort by date': ' triés par ordre antéchronologique',
+  'sort by score': 'triés par pertinence',
+  'sort by alphabetical': 'triés par ordre alphabétique',
+  'sort by date': 'triés par ordre antéchronologique',
   'Be the first to react': 'Soyez le premier à réagir à ce podcast',
   "Podcast's comments": "Commentaires de l'épisode",
   '()': '({nb})',

package/src/locale/it.ts

@@ -107,7 +107,7 @@ export default{
     'Authorized advertising': 'Pubblicità autorizzata', 
     Distribute: 'Distribuzione', 
     'Rss feed:': 'RSS Feed:', 
-    'See more': 'Vedi altro', 
+    'See more': 'Ascolta altri', 
     'Search results': 'Cerca risultati per "{query}"',
     'Search - no results': 'Ricerca - nessun risultato per "{query}"',
     Downloading: 'In download', 
@@ -124,7 +124,7 @@ export default{
     'Embed link': 'Inserisci lettore',
     'Embedly link': 'Player link',
     'Direct link': 'Audio link',
-    'Advanced filters': 'Impostazioni avanzate',
+    'Advanced filters': 'Ricerca avanzata',
     Advertising: 'Pubblicità',
     'By topic': 'Per tema',
     'By rubric': 'Per rubrica',
@@ -151,10 +151,10 @@ export default{
     'Podcast in error': 'Podcast in errore',
     'See podcasts no visible':
       'Vedi podcast non visibili al pubblico',
-    'Number podcasts': '{nb} di podcast',
-    'Number emissions': '{nb} di serie',
-    'Number participants': '{nb} di speaker',
-    'Number productors': '{nb} di producer',
+    'Number podcasts': '{nb} podcast',
+    'Number emissions': '{nb} serie',
+    'Number participants': '{nb} speaker',
+    'Number productors': '{nb} producer',
     'Display next': 'Mostra episodi seguenti',
     'Display previous': 'Mostra episodi precedenti',
     Play: 'Play',
@@ -285,7 +285,7 @@ export default{
     "Copy this page URL":"Copia la URL di questa pagina", 
     "Custom version":"Versione customizzata",
     "All":"Tutto", 
-    'By category': 'Per categoria IAB',
+    'By category': 'Per categoria',
     "Add a sort criterion by topic":"Aggiungi un criterio di suddivisione per tema",
     'Share QR Code': "Condividi il QR Code", 
     "Download":"Download",

package/src/main.ts

@@ -16,7 +16,7 @@ import 'bootstrap/dist/js/bootstrap.bundle.min.js';
 
 //TODO
 const navigatorLang = navigator.language /* || navigator.userLanguage */;
-let language = 'it';
+let language = 'fr';
 if(navigatorLang.includes('en')){
   language = 'en';
 }

package/src/store/class/general/customPlayer.ts

@@ -4,5 +4,6 @@ export interface CustomPlayer{
   template: string,
   css: string,
   typePlayer: string,
-  name: string
+  name: string,
+  selected: boolean,
 }

package/src/store/paramStore.ts

@@ -12,7 +12,7 @@ const state:paramStore = {
     isPlaylist: false,
     isProduction: true,
     isContribution: true,
-    ApiUri: 'https://api.staging.saooti.org/',
+    ApiUri: 'https://api.dev2.saooti.org/',
     podcastmaker: false,
     buttonPlus: true,
     allCategories: [],
@@ -26,10 +26,10 @@ const state:paramStore = {
     SharePlayer: true,
     ShareButtons: true,
     ShareDistribution: true,
-    MiniplayerUri: 'https://playerbeta.staging.saooti.org/',
+    MiniplayerUri: 'https://playerbeta.dev2.saooti.org/',
     ouestFranceStyle: false,
     downloadButton: false,
-    hlsUri: 'https://hls.staging.saooti.org/',
+    hlsUri: 'https://hls.dev2.saooti.org/',
     mainRubrique: 0,
     resourceUrl: undefined
   },
@@ -85,10 +85,10 @@ const state:paramStore = {
     userName: '',
   },
   octopusApi: {
-    url: 'http://api.staging.saooti.org/',
-    commentsUrl: 'http://comments.staging.saooti.org/',
-    studioUrl: 'http://studio.staging.saooti.org/',
-    playerUrl: 'https://playerbeta.staging.saooti.org/',
+    url: 'http://api.dev2.saooti.org/',
+    commentsUrl: 'http://comments.dev2.saooti.org/',
+    studioUrl: 'http://studio.dev2.saooti.org/',
+    playerUrl: 'https://playerbeta.dev2.saooti.org/',
     organisationId: undefined,
     rubriqueIdFilter: undefined,
   },