@saooti/octopus-sdk 32.0.1 → 32.0.4

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

@@ -81,13 +81,10 @@ export default defineComponent({
       return (state.generalParameters.podcastmaker as boolean);
     },
     organisation(): string {
-      if(this.playlist && this.playlist.publisher && this.playlist.publisher.organisation){
-        return '' + this.playlist.publisher.organisation.name;
-      }
-      return '';
+      return this.playlist?.publisher?.organisation?.name ??'';
     },
     description(): string {
-      return this.playlist.description || '';
+      return this.playlist.description ?? '';
     },
     name(): string {
       return this.playlist.title;
@@ -96,13 +93,9 @@ export default defineComponent({
       return state.generalParameters.organisationId;
     },
     editRight(): boolean {
-      if (
-        (state.generalParameters.isPlaylist &&
-          this.organisationId === this.playlist.organisation?.id) ||
-        state.generalParameters.isAdmin
-      )
-        return true;
-      return false;
+      return (true===state.generalParameters.isPlaylist &&
+        this.organisationId === this.playlist.organisation?.id) ||
+        true == state.generalParameters.isAdmin;
     },
     activePlaylist(): boolean {
       return 0 !== Object.keys(this.playlist.podcasts).length;
@@ -111,10 +104,7 @@ export default defineComponent({
   mounted() {
     const playlistDesc = (this.$refs.descriptionPlaylist as HTMLElement);
     const playlistDescContainer = (this.$refs.descriptionPlaylistContainer as HTMLElement);
-    if (
-      null !== playlistDesc && null !== playlistDescContainer &&
-      playlistDesc.clientHeight > playlistDescContainer.clientHeight
-    ) {
+    if (playlistDesc?.clientHeight > playlistDescContainer?.clientHeight) {
       playlistDescContainer.classList.add('after-emission-description');
     }
   },

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

@@ -77,13 +77,10 @@ export default defineComponent({
       return `${this.first}|${this.size}|${this.organisationId}|${this.query}`;
     },
     sort(): string {
-      if (!this.query) return 'NAME';
-      return 'SCORE';
+      return !this.query ?'NAME': 'SCORE';
     },
     organisation(): string|undefined {
-      if (this.organisationId) return this.organisationId;
-      if (this.$store.state.filter.organisationId) return this.$store.state.filter.organisationId;
-      return undefined;
+      return this.organisationId ?? this.$store.state.filter.organisationId;
     },
   },
   watch: {

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

@@ -94,13 +94,9 @@ export default defineComponent({
       return this.podcastsQuery.slice(this.first, Math.min(this.first + this.size,this.podcasts.length));
 		},
     editRight(): boolean {
-      if (
-        (this.authenticated &&
-          this.myOrganisationId === this.playlist.organisation?.id) ||
-        state.generalParameters.isAdmin
-      )
-        return true;
-      return false;
+      return (true===this.authenticated &&
+        this.myOrganisationId === this.playlist.organisation?.id) ||
+        true ===state.generalParameters.isAdmin
     },
   },
   watch: {

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

@@ -98,10 +98,7 @@ export default defineComponent({
   },
   computed: {
     title(): string{
-      if(this.playlist){
-        return this.playlist.title;
-      }
-      return "";
+      return this.playlist?.title??"";
     },
     podcasts(): Array<Podcast> {
       return this.allPodcasts.slice(this.index, this.index + this.size);
@@ -159,11 +156,7 @@ export default defineComponent({
           );
         });
       }
-      if (this.allPodcasts.length <= 3) {
-        this.alignLeft = true;
-      } else {
-        this.alignLeft = false;
-      }
+      this.alignLeft = this.allPodcasts.length <= 3;
       this.loading = false;
     },
     displayPrevious(): void {

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

@@ -29,7 +29,7 @@ export default defineComponent({
   },
   computed:{
     animatorName(): string{
-      return (`${this.animator?.firstName||''} ${this.animator?.lastName||''}`).trim();
+      return (`${this.animator?.firstName??''} ${this.animator?.lastName??''}`).trim();
     }
   }
 })

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

@@ -75,7 +75,7 @@ export default defineComponent({
   },
   methods: {
     getName(person: Participant): string {
-      return (`${person.firstName||''} ${person.lastName||''}`).trim();
+      return (`${person.firstName??''} ${person.lastName??''}`).trim();
     },
   },
 })

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

@@ -81,7 +81,7 @@ export default defineComponent({
   },
   methods: {
     onCategorySelected(category: Category|undefined): void {
-      this.iabId = category && category.id ? category.id : undefined;
+      this.iabId = category?.id ? category.id : undefined;
     },
     fetch(podcasts: Array<Podcast>): void {
       this.$emit('fetch', podcasts);

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

@@ -123,11 +123,7 @@ export default defineComponent({
       },
     }),
     mainRubrique(): boolean{
-      if(this.podcast && this.podcast.rubriqueIds &&state.podcastPage.mainRubrique && this.podcast.rubriqueIds.includes(state.podcastPage.mainRubrique)){
-        return true;
-      }else{
-        return false;
-      }
+      return undefined!==state.podcastPage.mainRubrique && 0!==state.podcastPage.mainRubrique && true==this.podcast?.rubriqueIds?.includes(state.podcastPage.mainRubrique);
     },
     isPodcastmaker(): boolean {
       return (state.generalParameters.podcastmaker as boolean);
@@ -181,24 +177,24 @@ export default defineComponent({
     },
     textVisible(): string {
       if (this.isLiveToBeRecorded)
-        return this.$t('Podcast linked to waiting live').toString();
+        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').toString();
+        if (false == this.podcast.valid) return this.$t('Podcast to validate');
         if (
           !this.podcast.availability.visibility &&
           this.podcast.availability.date
         )
-          return this.$t('Podcast publish in future').toString();
-        return this.$t('Podcast no visible').toString();
+          return this.$t('Podcast publish in future');
+        return this.$t('Podcast no visible');
       }
       if (
         'PLANNED' === this.podcast.processingStatus ||
         'PROCESSING' === this.podcast.processingStatus
       )
-        return this.$t('Podcast in process').toString();
+        return this.$t('Podcast in process');
       if ('CANCELED' === this.podcast.processingStatus)
-        return this.$t('Podcast in cancelled status').toString();
-      return this.$t('Podcast in error').toString();
+        return this.$t('Podcast in cancelled status');
+      return this.$t('Podcast in error');
     },
     statusText(): string {
       if (!this.fetchConference) return '';
@@ -253,11 +249,7 @@ export default defineComponent({
         return;
       }
       if(this.playingPodcast){
-        if("PLAYING"===this.$store.state.player.status){
-          this.$store.commit('playerPause', true);
-        }else{
-          this.$store.commit('playerPause', false);
-        }
+        this.$store.commit('playerPause', "PLAYING"===this.$store.state.player.status);
         return;
       }
       if (!this.recordingLive) {
@@ -267,7 +259,7 @@ export default defineComponent({
           title: this.podcast.title,
           audioUrl: this.podcast.audioUrl,
           duration: this.podcast.duration,
-          conferenceId: this.fetchConference ? this.fetchConference.conferenceId : undefined,
+          conferenceId: this.fetchConference?.conferenceId,
           livePodcastId: this.podcast.podcastId,
           organisation: this.podcast.organisation,
         });

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

@@ -111,9 +111,7 @@ export default defineComponent({
       return this.$store.state.filter.organisationId;
     },
     organisation(): string|undefined {
-      if (this.organisationId) return this.organisationId;
-      if (this.filterOrga) return this.filterOrga;
-      return undefined;
+      return this.organisationId ?? this.filterOrga;
     },
     previousAvailable(): boolean {
       return this.index > 0;
@@ -179,11 +177,7 @@ export default defineComponent({
       this.allPodcasts = this.allPodcasts.concat(
         data.result.filter((pod: Podcast|null) => null !== pod)
       );
-      if (this.allPodcasts.length <= 3) {
-        this.alignLeft = true;
-      } else {
-        this.alignLeft = false;
-      }
+      this.alignLeft = this.allPodcasts.length <= 3;
       this.first += this.size;
     },
     displayPrevious(): void {

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

@@ -102,7 +102,7 @@ export default defineComponent({
 
   computed: {
     rubriqueQueryParam(): string|undefined{
-      if(this.$store.state.filter && this.$store.state.filter.rubriqueFilter && this.$store.state.filter.rubriqueFilter.length){
+      if(this.$store.state.filter?.rubriqueFilter?.length){
         return this.$store.state.filter.rubriqueFilter.map((value: RubriquageFilter) =>  value.rubriquageId+':'+value.rubriqueId).join();
       }
       return undefined;
@@ -119,7 +119,7 @@ export default defineComponent({
       return {
           name: 'podcasts',
           query: { productor: this.$store.state.filter.organisationId, 
-                  iabId: this.$store.state.filter.iab ? this.$store.state.filter.iab.id : undefined,
+                  iabId:this.$store.state.filter.iab?.id,
                   rubriquesId: this.rubriqueQueryParam },
         };
     },

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

@@ -88,7 +88,7 @@ export default defineComponent({
       return moment(this.podcast.pubDate).format('X');
     },
     description(): string {
-      return this.podcast.description ? this.podcast.description : '';
+      return this.podcast.description ?? '';
     },
   },
 
@@ -96,10 +96,7 @@ export default defineComponent({
     if(!this.podcastItemDescription){return}
     const podcastDesc = (this.$refs.descriptionPodcast as HTMLElement);
     const podcastDescContainer = (this.$refs.descriptionPodcastContainer as HTMLElement);
-    if (
-      null !== podcastDesc && null !== podcastDescContainer &&
-      podcastDesc.clientHeight > podcastDescContainer.clientHeight
-    ) {
+    if (podcastDesc?.clientHeight > podcastDescContainer?.clientHeight) {
       this.isDescriptionBig = true;
     }
   },

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

@@ -91,13 +91,8 @@ export default defineComponent({
       return moment(this.pubDate).format('D MMMM YYYY, HH[h]mm');
     },
     editRight(): boolean {
-      if (
-        (this.authenticated &&
-          this.myOrganisationId === this.podcastOrganisationId) ||
-        state.generalParameters.isAdmin
-      )
-        return true;
-      return false;
+      return (true===this.authenticated && this.myOrganisationId === this.podcastOrganisationId) ||
+        true===state.generalParameters.isAdmin
     },
     durationString(): string {
       if (this.duration <= 1) return '';

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

@@ -96,14 +96,10 @@ export default defineComponent({
       ${this.rubriqueId}|${this.rubriquageId}|${this.before}|${this.after}|${this.includeHidden}|${this.noRubriquageId}|${this.notValid}`;
     },
     organisation(): string|undefined {
-      if (this.organisationId) return this.organisationId;
-      if (this.$store.state.filter.organisationId) return this.$store.state.filter.organisationId;
-      return undefined;
+      return this.organisationId ?? this.$store.state.filter.organisationId;
     },
     sort(): string {
-      if (this.popularSort) return "POPULARITY";
-      if (this.sortCriteria) return this.sortCriteria;
-      return 'DATE';
+      return this.popularSort? "POPULARITY" : this.sortCriteria??'DATE';
     },
     sortText(): string {
       switch (this.sortCriteria) {
@@ -155,14 +151,10 @@ export default defineComponent({
         noRubriquageId: this.noRubriquageId.length ? this.noRubriquageId : undefined,
         rubriqueId: this.rubriqueId.length ? this.rubriqueId : undefined,
         rubriquageId: this.rubriquageId.length ? this.rubriquageId : undefined,
-        includeHidden: this.includeHidden
+        includeHidden: this.includeHidden,
+        validity: undefined !== this.notValid?!this.notValid: undefined,
+        publisherId:this.notValid && !(state.generalParameters.isProduction as boolean)?this.$store.state.profile.userId:undefined
       };
-      if (undefined !== this.notValid) {
-        param.validity = !this.notValid;
-      }
-      if (this.notValid && !(state.generalParameters.isProduction as boolean)) {
-        param.publisherId = this.$store.state.profile.userId;
-      }
       try {
         const data =await octopusApi.fetchDataWithParams<{count: number;result:Array<Podcast>;sort: string;}>(0, 'podcast/search',param, true);
         this.afterFetching(reset, data);

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

@@ -167,10 +167,7 @@ export default defineComponent({
       if('ERROR' === this.podcast?.processingStatus){
         return this.$t('Podcast in ERROR, please contact Saooti');
       }
-      if(this.podcastNotValid){
-        return this.$t('Podcast not validated');
-      }
-      return '';
+      return this.podcastNotValid ? this.$t('Podcast not validated') : '';
     },
     isPodcastmaker(): boolean {
       return (state.generalParameters.podcastmaker as boolean);
@@ -197,23 +194,17 @@ export default defineComponent({
       });
     },
     editRight(): boolean {
-      if ( this.podcast &&
-        (this.authenticated &&
-          this.myOrganisationId === this.podcast.organisation.id) ||
-        state.generalParameters.isAdmin
-      )
-        return true;
-      return false;
+      return (true===this.authenticated &&
+        this.myOrganisationId === this.podcast?.organisation.id) ||true===state.generalParameters.isAdmin
     },
     isLiveReadyToRecord(): boolean {
       return (undefined!==this.podcast && undefined!==this.podcast.conferenceId && 0 !== this.podcast.conferenceId && 'READY_TO_RECORD' === this.podcast.processingStatus);
     },
     isLiveReady(): boolean {
       return (
-        undefined!==this.podcast &&
-        undefined!==this.podcast.conferenceId &&
-        0 !== this.podcast.conferenceId &&
-        'READY' === this.podcast.processingStatus
+        undefined!==this.podcast?.conferenceId &&
+        0 !== this.podcast?.conferenceId &&
+        'READY' === this.podcast?.processingStatus
       );
     },
     isNotRecorded(): boolean {
@@ -231,13 +222,7 @@ export default defineComponent({
       );
     },
     podcastNotValid(): boolean {
-      if (
-        this.podcast &&
-        this.podcast.availability &&
-        false === this.podcast.valid
-      )
-        return true;
-      return false;
+      return undefined!==this.podcast?.availability && false === this.podcast?.valid;
     },
   },
   methods: {

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

@@ -48,14 +48,13 @@ export default defineComponent({
       return (state.emissionsPage.progressBar as boolean);
     },
     percentProgress(): number{
-      if(!this.$store.state.player.podcast || this.podcastId !== this.$store.state.player.podcast.podcastId){
+      if(this.podcastId !== this.$store.state.player.podcast?.podcastId){
         return 0;
       }
-      if(!this.$store.state.player.elapsed){return 0;}
-      return this.$store.state.player.elapsed * 100;
+      return !this.$store.state.player.elapsed ? 0 : this.$store.state.player.elapsed * 100;
     },
     playedTime(): string{
-      if(this.$store.state.player.podcast && this.podcastId === this.$store.state.player.podcast.podcastId){
+      if(this.podcastId === this.$store.state.player.podcast?.podcastId){
         if (this.$store.state.player.elapsed && this.$store.state.player.elapsed > 0 && this.$store.state.player.total && this.$store.state.player.total > 0) {
           return DurationHelper.formatDuration(
             Math.round(this.$store.state.player.elapsed * this.$store.state.player.total)

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

@@ -95,9 +95,7 @@ export default defineComponent({
       return this.$store.state.filter.organisationId;
     },
     organisation(): string|undefined {
-      if (this.organisationId) return this.organisationId;
-      if (this.filterOrga) return this.filterOrga;
-      return undefined;
+      return this.organisationId ?? this.filterOrga;
     },
     watchVariable():string{
       return `${this.emissionId}|${this.organisationId}|${this.filterOrga}|${this.iabId}|${this.rubriqueId}|${this.rubriquageId}|${this.query}`;

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

@@ -110,15 +110,11 @@ export default defineComponent({
   },
   computed: {
     id(): string {
-      if (this.rubriquageId) return 'rubriqueChooser' + this.rubriquageId;
-      return 'rubriqueChooser';
+      return this.rubriquageId? 'rubriqueChooser' + this.rubriquageId : 'rubriqueChooser';
     },
     model: {
       get(): Rubrique| Array<Rubrique>|undefined{
-        if(false===this.multiple){
-          return this.rubrique;
-        }
-        return this.rubriqueForArray;
+        return false===this.multiple ? this.rubrique:this.rubriqueForArray;
       },
       set(value: Rubrique| Array<Rubrique>|undefined): void{
         if(false===this.multiple){
@@ -181,11 +177,8 @@ export default defineComponent({
           rubriqueDefault,
           this.withoutItem,
         ].concat(this.allRubriques);
-      } else {
-        return [rubriqueDefault].concat(
-          this.allRubriques
-        );
       }
+      return [rubriqueDefault].concat(this.allRubriques);
     },
     onOpen(): void {
       (this.$refs.multiselectRef as VueMultiselect).$refs.search.setAttribute(
@@ -200,11 +193,7 @@ export default defineComponent({
         this.initRubriqueSelected(this.rubriqueSelected);
         return;
       }
-      if ('' !== this.defaultanswer) {
-        this.rubrique = getDefaultRubrique(this.defaultanswer);
-      } else {
-        this.rubrique = undefined;
-      }
+      this.rubrique ='' !== this.defaultanswer? getDefaultRubrique(this.defaultanswer): undefined;
       this.onRubriqueSelected(this.rubrique);
     },
     onSearchRubrique(query: string): void {

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

@@ -121,8 +121,8 @@ export default defineComponent({
     addFilter(rubrique: Rubrique): void{
       if(!this.rubriquage){ return ;}
       const filterToAdd = {
-        rubriquageId: this.rubriquage.rubriquageId?this.rubriquage.rubriquageId: 0, 
-        rubriqueId: rubrique.rubriqueId? rubrique.rubriqueId:0, 
+        rubriquageId: this.rubriquage.rubriquageId??0, 
+        rubriqueId: rubrique.rubriqueId??0, 
         nameRubriquage: this.rubriquage.title,
         nameRubrique: rubrique.name
       };

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

@@ -82,7 +82,7 @@ export default defineComponent({
       }
       if (!state.generalParameters.authenticated) return;
       let data;
-      if(this.$store.state.organisation && this.$store.state.organisation.attributes && Object.keys(this.$store.state.organisation.attributes).length > 1){
+      if(this.$store.state.organisation?.attributes && Object.keys(this.$store.state.organisation.attributes).length > 1){
         data = this.$store.state.organisation.attributes;
       }else{
         data= await octopusApi.fetchData<{[key:string]:string}>(0, 'organisation/attributes/'+state.generalParameters.organisationId);

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

@@ -27,6 +27,7 @@
         <ShareButtonsIntern
           :podcast="podcast"
           :emission="emission"
+          :playlist="playlist"
           :participant-id="participantId"
           :organisation-id="organisationId"
           :not-exclusive="notExclusive"
@@ -40,6 +41,7 @@
       <ShareButtonsIntern
         :podcast="podcast"
         :emission="emission"
+        :playlist="playlist"
         :participant-id="participantId"
         :organisation-id="organisationId"
         :not-exclusive="notExclusive"
@@ -56,6 +58,7 @@ import { displayMethods } from '../../mixins/functions';
 import Popover from '../../misc/Popover.vue';
 import ShareButtonsIntern from './ShareButtonsIntern.vue';
 import { defineComponent } from 'vue';
+import { Playlist } from '@/store/class/general/playlist';
 export default defineComponent({
   components: {
     ShareButtonsIntern,
@@ -65,6 +68,7 @@ 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},
     participantId: { default: undefined, type: Number},
     organisationId: { default: undefined, type: String},
     notExclusive: { default: true, type: Boolean},

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

@@ -50,7 +50,7 @@
     <div class="saooti-link" />
   </button>
   <button
-    v-if="podcast"
+    v-if="podcast || emission ||playlist"
     :class="getClass()"
     :title="$t('Share newsletter')"
     @click="newsletter = true"
@@ -75,6 +75,8 @@
     v-if="newsletter"
     :closable="true"
     :podcast="podcast"
+    :emission="emission"
+    :playlist="playlist"
     @close="newsletter = false"
   />
   <QrCodeModal
@@ -98,6 +100,7 @@ import Snackbar from '../../misc/Snackbar.vue';
 import { displayMethods } from '../../mixins/functions';
 import { defineComponent, defineAsyncComponent } from 'vue';
 import SnackbarVue from '../../misc/Snackbar.vue';
+import { Playlist } from '@/store/class/general/playlist';
 const ClipboardModal = defineAsyncComponent(() => import('../../misc/modal/ClipboardModal.vue'));
 const NewsletterModal = defineAsyncComponent(() => import('../../misc/modal/NewsletterModal.vue'));
 const QrCodeModal = defineAsyncComponent(() => import('../../misc/modal/QrCodeModal.vue'));
@@ -114,6 +117,7 @@ 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},
     participantId: { default: undefined, type: Number},
     organisationId: { default: undefined, type: String},
     notExclusive: { default: true, type: Boolean},