@saooti/octopus-sdk 30.0.63 → 30.0.66

package/README.md

@@ -559,4 +559,8 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
  * 30.0.60 PlaylistPodcastInlineList
  * 30.0.61 Page podcast -> init recherche
  * 30.0.62 Italian translation
- * 30.0.63 Italian translation
+ * 30.0.63 Italian translation
+ * 30.0.64 Modif Le soir
+ * 30.0.65 OAuthType
+ * 30.0.66 ScrollBehavior
+ 

package/package.json

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

package/src/assets/general.scss

@@ -238,6 +238,13 @@ body{
   .c-hand-auto {
     cursor: auto;
   }
+  .two-line-clamp{
+    overflow: hidden;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    word-break: break-word;
+  }
 
   .html-wysiwyg-content{
     h3,h4{

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/EmissionPlayerItem.vue

@@ -50,11 +50,23 @@
     <div
       v-for="p in podcasts"
       :key="p.podcastId"
-      class="border-top emission-item-border-color p-2 secondary-bg d-flex"
+      class="border-top emission-item-border-color p-2 secondary-bg d-flex flex-column"
     >
+      <router-link
+        v-if="isProgressBar"
+        :to="{
+          name: 'podcast',
+          params: { podcastId: p.podcastId },
+          query: { productor: $store.state.filter.organisationId },
+        }"
+        class="text-dark fw-bold two-line-clamp"
+      >
+        {{ p.title }}
+      </router-link>
       <div class="d-flex justify-content-between flex-grow-1">
         <div class="d-flex flex-column">
           <router-link
+            v-if="!isProgressBar"
             :to="{
               name: 'podcast',
               params: { podcastId: p.podcastId },
@@ -153,6 +165,9 @@ export default defineComponent({
   },
   
   computed: {
+    isProgressBar(): boolean{
+      return (state.emissionsPage.progressBar as boolean);
+    },
     buttonMore(): boolean {
       return (state.emissionsPage.buttonMore as boolean);
     },

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/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/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/pages/Podcast.vue

@@ -1,14 +1,16 @@
 <template>
   <div class="page-box">
     <template v-if="loaded && !error">
-      <h1 v-if="!isOuestFrance">
-        {{ titlePage }}
-      </h1>
-      <Countdown
-        v-if="isCounter"
-        :time-remaining="timeRemaining"
-      />
-      <div class="d-flex">
+      <div class="page-podcast-title">
+        <h1 v-if="!isOuestFrance">
+          {{ titlePage }}
+        </h1>
+        <Countdown
+          v-if="isCounter"
+          :time-remaining="timeRemaining"
+        />
+      </div>
+      <div class="d-flex page-podcast">
         <div class="d-flex flex-column flex-super-grow">
           <RecordingItemButton
             v-if="

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/paramStore.ts

@@ -185,9 +185,7 @@ export interface OctopusApi{
   oAuthParam?: {
     accessToken: string,
     refreshToken: string,
-    accessTokenUri: string,
     expiration: string,
-    clientId: string,
   },
   rubriqueIdFilter?: Array<number>,
 }

package/src/store/typeAppStore.ts

@@ -138,8 +138,6 @@ export function emptyPodcastData(): Podcast{
     oAuthParam: {
         accessToken: string | undefined;
         refreshToken: string | undefined;
-        accessTokenUri: string | undefined;
-        clientId: string | undefined;
         expiration: number | undefined;
     };
     media: Media;
@@ -250,8 +248,6 @@ export function emptyPodcastData(): Podcast{
           oAuthParam: {
             accessToken: undefined ,
             refreshToken: undefined ,
-            accessTokenUri: undefined ,
-            clientId: undefined ,
             expiration:undefined
           },
           media: {