@saooti/octopus-sdk 32.0.41 → 33.0.1

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

@@ -127,7 +127,7 @@ export default defineComponent({
 
   data() {
     return{
-      emission: getDefaultEmission(this.defaultanswer) as Emission | undefined,
+      emission: getDefaultEmission(this.defaultanswer),
       emissions: [] as Array<Emission>,
       remainingElements: 0 as number,
       isLoading: false as boolean,

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

@@ -1,5 +1,5 @@
 <template>
-  <li
+  <div
     class="mt-3 emission-item-container shadow-element"
   >
     <router-link
@@ -55,7 +55,7 @@
         </router-link>
       </div>
     </router-link>
-  </li>
+  </div>
 </template>
 
 <script lang="ts">

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

@@ -10,7 +10,7 @@
     :loading-text="loading?$t('Loading emissions ...'):undefined"
   >
     <template #list>
-      <ul
+      <div
         v-if="!itemPlayer"
         class="emission-list"
         :class="smallItems ? 'three-emissions' : 'two-emissions'"
@@ -24,7 +24,7 @@
             :emission="e"
           />
         </template>
-      </ul>
+      </div>
       <div
         v-else
         v-show="(displayRubriquage && rubriques)||!displayRubriquage"
@@ -92,8 +92,8 @@ export default defineComponent({
   data() {
     return {
       loading: true as boolean,
-      dfirst: this.first as number,
-      dsize: this.size as number,
+      dfirst: this.first,
+      dsize: this.size,
       totalCount: 0 as number,
       displayCount: 0 as number,
       emissions: [] as Array<Emission>,

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

@@ -114,7 +114,7 @@ export default defineComponent({
           'updateRubriquageFilter'],
   data() {
     return {
-      isNotVisible: this.includeHidden as boolean,
+      isNotVisible: this.includeHidden,
       isNotValidate: false as boolean,
       showFilters: false as boolean,
     };

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

@@ -79,8 +79,8 @@ export default defineComponent({
     return {
       isFrom: false as boolean,
       isTo: false as boolean,
-      fromDate: moment().subtract(10, 'days').toISOString() as string,
-      toDate: moment().toISOString() as string,
+      fromDate: moment().subtract(10, 'days').toISOString(),
+      toDate: moment().toISOString(),
     };
   },
 

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

@@ -26,7 +26,7 @@ export default defineComponent({
   emits: ['updateSortCriteria'],
   data() {
     return {
-      sort: this.sortCriteria as string,
+      sort: this.sortCriteria,
     };
   },
   watch: {

package/src/components/display/list/ListPaginate.vue

@@ -76,7 +76,7 @@ export default defineComponent({
   emits: ['update:first', 'update:rowsPerPage', 'update:isMobile'],
   data() {
     return {
-      windowWidth: window.innerWidth as number,
+      windowWidth: window.innerWidth,
 		};
   },
   computed:{
@@ -87,7 +87,10 @@ export default defineComponent({
       return 960 >= this.windowWidth;
     },
     rangeSize(){
-      return this.windowWidth > 1600 ? 3 : this.windowWidth > 1530 ? 2 : 1;
+      if(this.windowWidth > 1600){
+        return 3;
+      }
+      return this.windowWidth > 1530 ? 2 : 1;
     },
   },
   watch:{
@@ -124,7 +127,7 @@ export default defineComponent({
     scrollToTop(){
       const element = document.getElementById(this.id);
       if(!element || element.getBoundingClientRect().top > 0){return;}
-      const y = element.getBoundingClientRect().top + window.pageYOffset - domHelper.convertRemToPixels(3.5);
+      const y = element.getBoundingClientRect().top + window.scrollY - domHelper.convertRemToPixels(3.5);
       window.scrollTo({top: y, behavior: 'smooth'});
     }
 	}

package/src/components/display/list/Paginate.vue

@@ -126,40 +126,17 @@ export default defineComponent({
     },
     pagination(): (number | null)[] {
       if(-1===this.rangeSize){return[];}
-      const res = [];
       const minPaginationElems = 5 + this.rangeSize * 2;
       let rangeStart = this.totalPage <= minPaginationElems ? 1 : (this.page + 1) - this.rangeSize;
       let rangeEnd =this.totalPage <= minPaginationElems ? this.totalPage : (this.page + 1)+ this.rangeSize;
       rangeEnd = rangeEnd > this.totalPage ? this.totalPage : rangeEnd;
       rangeStart = rangeStart < 1 ? 1 : rangeStart;
       if (this.totalPage > minPaginationElems) {
-        const isStartBoundaryReached = rangeStart - 1 < 3;
-        const isEndBoundaryReached = this.totalPage - rangeEnd < 3;
-        if (isStartBoundaryReached) {
-          rangeEnd = minPaginationElems - 2;
-          for (let i = 1; i < rangeStart; i++) {
-            res.push(i);
-          }
-        } else {
-          res.push(1);
-          res.push(null);
-        }
-        if (isEndBoundaryReached) {
-          rangeStart = this.totalPage - (minPaginationElems - 3);
-          for (let i = rangeStart; i <= this.totalPage; i++) {
-            res.push(i);
-          }
-        } else {
-          for (let i = rangeStart; i <= rangeEnd; i++) {
-            res.push(i);
-          }
-          res.push(null);
-          res.push(this.totalPage);
-        }
-      } else {
-        for (let i = rangeStart; i <= rangeEnd; i++) {
-          res.push(i);
-        }
+        return this.getPaginationArrayWithEllipsis(rangeStart, rangeEnd, minPaginationElems);
+      }
+      const res = [];
+      for (let i = rangeStart; i <= rangeEnd; i++) {
+        res.push(i);
       }
       return res;
     },
@@ -184,6 +161,33 @@ export default defineComponent({
 	},
  
 	methods:{
+    getPaginationArrayWithEllipsis(rangeStart: number, rangeEnd:number, minPaginationElems:number){
+      const res = [];
+      const isStartBoundaryReached = rangeStart - 1 < 3;
+      const isEndBoundaryReached = this.totalPage - rangeEnd < 3;
+      if (isStartBoundaryReached) {
+        rangeEnd = minPaginationElems - 2;
+        for (let i = 1; i < rangeStart; i++) {
+          res.push(i);
+        }
+      } else {
+        res.push(1);
+        res.push(null);
+      }
+      if (isEndBoundaryReached) {
+        rangeStart = this.totalPage - (minPaginationElems - 3);
+        for (let i = rangeStart; i <= this.totalPage; i++) {
+          res.push(i);
+        }
+      } else {
+        for (let i = rangeStart; i <= rangeEnd; i++) {
+          res.push(i);
+        }
+        res.push(null);
+        res.push(this.totalPage);
+      }
+      return res;
+    },
     initRowsPerPage(){
       if(!this.optionsRowsPerPage.includes(this.rowsPerPage)){
         this.optionsRowsPerPage.push(this.rowsPerPage);

package/src/components/display/live/LiveHorizontalList.vue

@@ -15,7 +15,7 @@
       :loading="false"
     >
       <template #list>
-        <ul
+        <div
           class="podcast-list"
         >
           <template
@@ -27,7 +27,7 @@
               :podcast="p"
             />
           </template>
-        </ul>
+        </div>
       </template>
     </ListPaginate>
   </div>
@@ -56,8 +56,8 @@ export default defineComponent({
 
   data() {
     return {
-      dfirst: this.first as number,
-      dsize: this.size as number,
+      dfirst: this.first,
+      dsize: this.size,
       totalCount: 0 as number,
       lives: [] as Array<Podcast>,
       notEmpty: false as boolean,

package/src/components/display/live/LiveList.vue

@@ -62,6 +62,7 @@ export default defineComponent({
     return {
       loading: true as boolean,
       loaded: true as boolean,
+      dataLivesToBe: [] as Array<Conference>
     };
   },
   
@@ -148,6 +149,45 @@ export default defineComponent({
         this.livesArray[i].lives.length = 0;
       }
     },
+    liveTreatement(i: number, dataLives: Array<Conference>, indexPast: number){
+      if("PLANNED"!==this.livesArray[i].status && "PENDING"!==this.livesArray[i].status){
+        this.livesArray[i].lives = dataLives.filter((p: Conference | null) => {
+          return null !== p;
+        });
+      }else if("PENDING"===this.livesArray[i].status){
+        this.dataLivesToBe = dataLives;
+        for (let index = 0, len = dataLives.length; index < len; index++) {
+          if (moment(dataLives[index].date).isBefore(moment())) {
+            this.livesArray[i].lives.push(dataLives[index]);
+            indexPast = index + 1;
+          } else {break;}
+        }
+      }else{
+        this.livesArray[i].lives = this.dataLivesToBe
+        .slice(indexPast)
+        .concat(dataLives)
+        .filter((p: Conference | null) => {
+          return null !== p;
+        });
+      }
+      return indexPast;
+    },
+    async fetchLives(): Promise<void>{
+      let indexPast = 0;
+      this.dataLivesToBe = [];
+      for (let i = 0, len = this.livesArray.length; i < len; i++) {
+        if (!this.organisationRight && 
+        ("DEBRIEFING"===this.livesArray[i].status ||"ERROR"===this.livesArray[i].status ||"PUBLISHING"===this.livesArray[i].status)) {
+          continue;
+        }
+        const dataLives = await octopusApi.fetchDataWithParams<Array<Conference>>(9, 'conference/list',{
+          organisationId: this.filterOrgaUsed,
+          withPodcastId: true,
+          status: this.livesArray[i].status,
+        });
+        indexPast = this.liveTreatement(i, dataLives, indexPast);
+      }
+    },
     async fetchContent(): Promise<void> {
       try {
         this.initArrays();
@@ -158,39 +198,7 @@ export default defineComponent({
         }
         this.loading = true;
         this.loaded = false;
-        let indexPast = 0;
-        let dataLivesToBe: Array<Conference> = [];
-        for (let i = 0, len = this.livesArray.length; i < len; i++) {
-          if (!this.organisationRight && 
-          ("DEBRIEFING"===this.livesArray[i].status ||"ERROR"===this.livesArray[i].status ||"PUBLISHING"===this.livesArray[i].status)) {
-            continue;
-          }
-          const dataLives = await octopusApi.fetchDataWithParams<Array<Conference>>(9, 'conference/list',{
-            organisationId: this.filterOrgaUsed,
-            withPodcastId: true,
-            status: this.livesArray[i].status,
-          });
-          if("PLANNED"!==this.livesArray[i].status && "PENDING"!==this.livesArray[i].status){
-            this.livesArray[i].lives = dataLives.filter((p: Conference | null) => {
-              return null !== p;
-            });
-          }else if("PENDING"===this.livesArray[i].status){
-            dataLivesToBe = dataLives;
-            for (let index = 0, len = dataLives.length; index < len; index++) {
-              if (moment(dataLives[index].date).isBefore(moment())) {
-                this.livesArray[i].lives.push(dataLives[index]);
-                indexPast = index + 1;
-              } else {break;}
-            }
-          }else{
-            this.livesArray[i].lives = dataLivesToBe
-            .slice(indexPast)
-            .concat(dataLives)
-            .filter((p: Conference | null) => {
-              return null !== p;
-            });
-          }
-        }
+        await this.fetchLives();
         const listIds = this.livesArray[0].lives
           .concat(this.livesArray[1].lives)
           .concat(this.livesArray[2].lives);

package/src/components/display/participant/ParticipantItem.vue

@@ -1,5 +1,5 @@
 <template>
-  <li
+  <div
     v-if="participant"
     class="participant-item-container"
   >
@@ -50,7 +50,7 @@
     >
       © {{ participant.orga.name }}
     </router-link>
-  </li>
+  </div>
 </template>
 
 <script lang="ts">
@@ -83,7 +83,7 @@ export default defineComponent({
       if(!this.participant || !this.participant.orga){
         return false;
       }
-      return (true == this.authenticated &&
+      return (this.authenticated &&
         this.myOrganisationId === this.participant.orga.id) ||
         true === state.generalParameters.isAdmin
     },

package/src/components/display/participant/ParticipantList.vue

@@ -10,7 +10,7 @@
     :loading-text="loading?$t('Loading participants ...'):undefined"
   >
     <template #list>
-      <ul
+      <div
         class="participant-list"
       >
         <template
@@ -22,7 +22,7 @@
             :participant="p"
           />
         </template>
-      </ul>
+      </div>
     </template>
   </ListPaginate>
 </template>
@@ -57,8 +57,8 @@ export default defineComponent({
   data() {
     return {
       loading: true as boolean,
-      dfirst: this.first as number,
-      dsize: this.size as number,
+      dfirst: this.first,
+      dsize: this.size,
       totalCount: 0 as number,
       displayCount: 0 as number,
       participants: [] as Array<Participant>,
@@ -145,11 +145,6 @@ export default defineComponent({
   flex-grow: 1;
   margin: 0;
   padding: 0;
-  /*For ie11 */
-  display: flex;
-  flex-wrap: wrap;
-  /* end */
-
   display: grid; /* 1 */
   grid-template-columns: repeat(auto-fill, 14rem); /* 2 */
   grid-gap: 2rem; /* 3 */

package/src/components/display/playlist/PlaylistItem.vue

@@ -1,5 +1,5 @@
 <template>
-  <li
+  <div
     v-if="editRight || activePlaylist"
     class="emission-item-container shadow-element"
   >
@@ -55,7 +55,7 @@
         </router-link>
       </div>
     </router-link>
-  </li>
+  </div>
 </template>
 
 <script lang="ts">
@@ -91,7 +91,7 @@ export default defineComponent({
     editRight(): boolean {
       return (true===state.generalParameters.isPlaylist &&
         this.organisationId === this.playlist.organisation?.id) ||
-        true == state.generalParameters.isAdmin;
+        (state.generalParameters.isAdmin as boolean);
     },
     activePlaylist(): boolean {
       return 0 !== Object.keys(this.playlist.samplingViews??[]).length;

package/src/components/display/playlist/PlaylistList.vue

@@ -10,7 +10,7 @@
     :loading-text="loading?$t('Loading content ...'):undefined"
   >
     <template #list>
-      <ul
+      <div
         class="emission-list two-emissions"
       >
         <template
@@ -22,7 +22,7 @@
             :playlist="p"
           />
         </template>
-      </ul>
+      </div>
     </template>
   </ListPaginate>
 </template>
@@ -56,8 +56,8 @@ export default defineComponent({
   data() {
     return {
       loading: true as boolean,
-      dfirst: this.first as number,
-      dsize: this.size as number,
+      dfirst: this.first,
+      dsize: this.size,
       totalCount: 0 as number,
       displayCount: 0 as number,
       playlists: [] as Array<Playlist>,

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

@@ -22,7 +22,7 @@
       :error-text="!loading && !podcasts.length && notEmptyPlaylist?$t(`No podcast match your query`):undefined"
     >
       <template #list>
-        <ul
+        <div
           class="podcast-list"
         >
           <template
@@ -34,7 +34,7 @@
               :podcast="p"
             />
           </template>
-        </ul>
+        </div>
       </template>
     </ListPaginate>
   </div>

package/src/components/display/playlist/PodcastPlaylistInlineList.vue

@@ -100,7 +100,7 @@ export default defineComponent({
       return this.allPodcasts.slice(this.index, this.index + this.size);
     },
     sizeItem(): number {
-      return state.generalParameters.podcastItem ? (state.generalParameters.podcastItem as number): 13;
+      return state.generalParameters.podcastItem ? state.generalParameters.podcastItem: 13;
     },
     overflowScroll(): boolean {
       return (state.emissionPage.overflowScroll as boolean);

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

@@ -20,7 +20,7 @@
         :key="'desc-'+participant.participantId"
         class="d-flex flex-column align-items-center"
       >
-        <b><i>{{ getName(participant) }}</i></b>
+        <strong><em>{{ getName(participant) }}</em></strong>
         <!-- eslint-disable vue/no-v-html -->
         <div
           v-if="participant.description"

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

@@ -125,7 +125,7 @@ export default defineComponent({
       },
     }),
     mainRubrique(): boolean{
-      return undefined!==state.podcastPage.mainRubrique && 0!==state.podcastPage.mainRubrique && true==this.podcast?.rubriqueIds?.includes(state.podcastPage.mainRubrique);
+      return undefined!==state.podcastPage.mainRubrique && 0!==state.podcastPage.mainRubrique && (this.podcast?.rubriqueIds?.includes(state.podcastPage.mainRubrique) as boolean);
     },
     isPodcastmaker(): boolean {
       return (state.generalParameters.podcastmaker as boolean);
@@ -160,7 +160,7 @@ export default defineComponent({
     iconName(): string {
       if (this.isLiveToBeRecorded) return 'saooti-clock';
       if ('READY' === this.podcast.processingStatus || this.fetchConference) {
-        if (false == this.podcast.valid) return 'saooti-checkmark';
+        if (!this.podcast.valid) return 'saooti-checkmark';
         if (
           !this.podcast.availability.visibility &&
           this.podcast.availability.date
@@ -181,7 +181,7 @@ export default defineComponent({
       if (this.isLiveToBeRecorded)
         return this.$t('Podcast linked to waiting live');
       if ('READY' === this.podcast.processingStatus || this.fetchConference) {
-        if (false == this.podcast.valid) return this.$t('Podcast to validate');
+        if (!this.podcast.valid) return this.$t('Podcast to validate');
         if (
           !this.podcast.availability.visibility &&
           this.podcast.availability.date

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

@@ -14,6 +14,7 @@
     :rubriquage-id="rubriquageId"
     :no-rubriquage-id="noRubriquageId"
     :query="query"
+    :podcastId="podcastId"
     @update:isArrow="$emit('update:isArrow',$event)"
   />
   <PodcastSwiperList
@@ -61,6 +62,7 @@ export default defineComponent({
     rubriquageId:{ default: () => [], type: Array as ()=> Array<number> },
     noRubriquageId: { default: () => [], type: Array as ()=> Array<number> },
     query: { default: undefined, type: String},
+    podcastId: { default: undefined, type: Number},
   },
   emits: ['update:isArrow'],
   computed:{

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

@@ -12,6 +12,7 @@
     :previous-available="previousAvailable"
     :next-available="nextAvailable"
     :no-rubriquage-id="noRubriquageId"
+    :podcastId="podcastId"
     @sortChrono="sortChrono"
     @sortPopular="sortPopular"
     @displayPrevious="displayPrevious"
@@ -79,6 +80,7 @@ export default defineComponent({
     rubriquageId:{ default: () => [], type: Array as ()=> Array<number> },
     noRubriquageId: { default: () => [], type: Array as ()=> Array<number> },
     query: { default: undefined, type: String},
+    podcastId: { default: undefined, type: Number},
   },
   emits: ['update:isArrow'],
 
@@ -100,7 +102,7 @@ export default defineComponent({
       return this.allPodcasts.slice(this.index, this.index + this.size);
     },
     sizeItem(): number {
-      return state.generalParameters.podcastItem ? (state.generalParameters.podcastItem as number): 13;
+      return state.generalParameters.podcastItem ? state.generalParameters.podcastItem: 13;
     },
     overflowScroll(): boolean {
       return (state.emissionPage.overflowScroll as boolean);
@@ -153,7 +155,26 @@ export default defineComponent({
     this.fetchNext();
   },
   methods: {
+    async fetchRecommendations(): Promise<void>{
+      const podcastIdsArray = await octopusApi.fetchDataPublicWithParams<Array<number>>(13, 'get_predicts',{
+        reco: this.podcastId,
+        n_neightbors: 5,
+      }); 
+      for (let podcastIdReco of podcastIdsArray) {
+        try {
+          const entirePodcast = await octopusApi.fetchData<Podcast>(0, 'podcast/'+podcastIdReco); 
+          this.allPodcasts.push(entirePodcast);
+        } catch {
+          //If doesn't exist, do nothing
+        }
+      }
+      this.totalCount = podcastIdsArray.length;
+      this.loading = false;
+    },
     async fetchNext(): Promise<void> {
+      if(this.podcastId){
+        return this.fetchRecommendations();
+      }
       const data =  await octopusApi.fetchDataWithParams<{count: number;result:Array<Podcast>;sort: string;}>(0, 'podcast/search',{
          first: this.first,
         size: this.size + 1,

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

@@ -2,7 +2,9 @@
   <div
     class="d-flex flex-column p-3"
   >
-    <div class="d-flex align-items-center mb-2">
+    <div 
+      class="d-flex align-items-center"
+      :class="podcastId?'mb-4':'mb-2'">
       <h2 class="mb-0">
         {{ title }}
       </h2>
@@ -14,7 +16,7 @@
         @click="handleSeeMoreButton"
       />
     </div>
-    <div class="d-flex justify-content-between">
+    <div class="d-flex justify-content-between" v-if="!podcastId">
       <div class="d-flex">
         <button
           class="btn btn-underline"
@@ -51,7 +53,7 @@
     </div>
     <slot name="list-inline" />
     <router-link
-      v-if="!isButtonNextTitle"
+      v-if="!isButtonNextTitle && buttonText"
       class="btn btn-primary align-self-center width-fit-content m-4"
       :to="refTo"
       @click="handleSeeMoreButton"
@@ -88,7 +90,8 @@ export default defineComponent({
     iabId: { default: undefined, type: Number},
     rubriqueId: { default: () => [], type: Array as ()=> Array<number> },
     noRubriquageId: { default: () => [], type: Array as ()=> Array<number> },
-    isButtonNextTitle: {default: false, type:Boolean}
+    isButtonNextTitle: {default: false, type:Boolean},
+    podcastId: { default: undefined, type: Number},
   },
   emits:['sortChrono','sortPopular', 'displayPrevious', 'displayNext'],
   data() {

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

@@ -1,5 +1,5 @@
 <template>
-  <li
+  <div
     class="podcast-item-container"
     :class="[
       podcastShadow ? 'shadow-element' : '',
@@ -43,7 +43,7 @@
       @mouseenter="showDescription"
       @mouseleave="hideDescription"
     />
-  </li>
+  </div>
 </template>
 
 <script lang="ts">

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

@@ -12,7 +12,7 @@
     :just-size-chosen="justSizeChosen"
   >
     <template #list>
-      <ul
+      <div
         class="podcast-list"
       >
         <template
@@ -24,7 +24,7 @@
             :podcast="p"
           />
         </template>
-      </ul>
+      </div>
     </template>
   </ListPaginate>
 </template>
@@ -77,8 +77,8 @@ export default defineComponent({
   data() {
     return {
       loading: true as boolean,
-      dfirst: this.first as number,
-      dsize: this.size as number,
+      dfirst: this.first,
+      dsize: this.size,
       totalCount: 0 as number,
       podcasts: [] as Array<Podcast>,
       isMobile: false as boolean,

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

@@ -102,7 +102,7 @@ export default defineComponent({
       return `${this.emissionId}|${this.organisationId}|${this.filterOrga}|${this.iabId}|${this.rubriqueId}|${this.rubriquageId}|${this.query}`;
     },
     sizeItem(): number {
-      return state.generalParameters.podcastItem ? (state.generalParameters.podcastItem as number): 13;
+      return state.generalParameters.podcastItem ? state.generalParameters.podcastItem: 13;
     },
   },
   watch: {