@saooti/octopus-sdk 32.0.1 → 32.0.4

package/README.md

@@ -637,7 +637,12 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
  * 31.0.44 Début CRUD API
  * 31.0.45 Live 
  * 31.0.46 Pb css
-
+ * 31.0.47 Pétouilles Css multiselect
+ * 31.0.48 Icones change
 
  * 32.0.0 Passage en 32
  * 32.0.1 Navigation clavier
+ * 32.0.2 Newsletter pour emission & playlist
+ * 32.0.3 Améliorations multiples
+ * 32.0.4 Correction erreur
+ 

package/package.json

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

package/src/App.vue

@@ -59,7 +59,6 @@ export default defineComponent({
   },
   async created(){
     await this.initApp();
-    this.isInit =true;
   },
   methods:{
     async initApp(){
@@ -67,6 +66,7 @@ export default defineComponent({
       await this.handleOrganisationFilter();
       this.handleIabIdFilter();
       this.handleRubriquesFilter();
+      this.isInit =true;
     },
     async handleOrganisationFilter(){
       let orgaId = '';

package/src/assets/bootstrap-diff.scss

@@ -187,6 +187,7 @@
     .breadcrumb{
         padding: 1rem;
         align-items: center;
+        background: #FAFAFA;
     }
     .bg-secondary{
         background: #eee !important;

package/src/assets/multiselect.scss

@@ -10,9 +10,20 @@
         .multiselect__tags, .multiselect__input, .multiselect__single{
             background: transparent !important;
         }
+        .multiselect__tags-wrap{
+            display: flex;
+            align-items: center;
+        }
         .multiselect__tags{
             border: 0;
             padding-left: 0;
+            padding-top: 0;
+            display: flex;
+            align-items: center;
+        }
+        .multiselect__tag{
+            margin-bottom: 0;
+            border: 1px gray solid;
         }
     }
 

package/src/components/display/comments/AddCommentModal.vue

@@ -81,9 +81,7 @@ export default defineComponent({
   },
   computed: {
     errorText():string {
-      if(this.isCaptchaTest) return this.$t('Recaptcha not active');
-      if(this.sendError) return this.$t('Recaptcha error');
-      return '';
+      return this.isCaptchaTest ? this.$t('Recaptcha not active') : this.sendError? this.$t('Recaptcha error') : '';
     },
     validName(): boolean{
       return this.countName <= this.maxName;

package/src/components/display/comments/CommentInput.vue

@@ -146,37 +146,21 @@ export default defineComponent({
     },
     isPresent(): boolean {
       if (!this.podcast) return true;
-      let podcastComment = 'INHERIT';
-      if (this.podcast.annotations && this.podcast.annotations.COMMENTS) {
-        podcastComment = (this.podcast.annotations.COMMENTS as string);
-      }
-      let organisationComment = 'LIVE_ONLY';
-      if (this.podcast.organisation.comments) {
-        organisationComment = this.podcast.organisation.comments;
-      }
-      if (
-        ('LIVE_ONLY' === podcastComment &&
+      let podcastComment = this.podcast.annotations?.COMMENTS ?? 'INHERIT';
+      let organisationComment = this.podcast.organisation.comments??'LIVE_ONLY';
+      return !(('LIVE_ONLY' === podcastComment &&
           'READY_TO_RECORD' !== this.podcast.processingStatus) ||
         ('INHERIT' === podcastComment &&
           'LIVE_ONLY' === organisationComment &&
-          'READY_TO_RECORD' !== this.podcast.processingStatus)
-      ) {
-        return false;
-      }
-      return true;
+          'READY_TO_RECORD' !== this.podcast.processingStatus));
     },
     placeholder(): string {
-      return this.comment && this.comment.comId? this.$t('Answer a comment') : this.$t('Write a comment');
+      return this.comment?.comId? this.$t('Answer a comment') : this.$t('Write a comment');
     },
     isCertified(): boolean {
-      if (
-        (state.generalParameters.isCommments &&
+      return (true === state.generalParameters.isCommments &&
         state.generalParameters.organisationId === this.podcastOrga) ||
-        state.generalParameters.isAdmin
-      ){
-        return true;
-      } 
-      return false;
+        true === state.generalParameters.isAdmin;
     },
     userId(): string|undefined {
       return state.generalParameters.authenticated ? this.$store.state.profile.userId : undefined;
@@ -200,8 +184,8 @@ export default defineComponent({
       return 'Live';
     },
     podcastOrga(): string|undefined{
-      const commentOrga = this.comment ? this.comment.organisationId : '';
-      return this.podcast ? this.podcast.organisation.id : commentOrga;
+      const commentOrga = this.comment?.organisationId ??'';
+      return this.podcast?.organisation.id ?? commentOrga;
     }
   },
   watch: {
@@ -273,15 +257,15 @@ export default defineComponent({
         this.setCookie('comment-octopus-name', name);
         this.$emit('update:knownIdentity', name);
       }
-      const sendName = name ? name: this.knownIdentity;
-      const commentPodcastId = this.comment ? this.comment.podcastId : 0;
+      const sendName = name??this.knownIdentity;
+      const commentPodcastId = this.comment?.podcastId ?? 0;
       const comment: CommentPodcast = {
         content: this.newComment,
-        name: sendName ? sendName : '',
-        podcastId: this.podcast ? this.podcast.podcastId : commentPodcastId,
+        name: sendName ??'',
+        podcastId: this.podcast?.podcastId ?? commentPodcastId,
         timeline: this.defineTimelineValue(),
         organisationId: this.podcastOrga,
-        commentIdReferer: this.comment ? this.comment.comId : undefined,
+        commentIdReferer:this.comment?.comId,
         certified: this.isCertified,
         userId: this.userId,
         phase: this.phase,

package/src/components/display/comments/CommentItem.vue

@@ -192,16 +192,10 @@ export default defineComponent({
       return state.generalParameters.organisationId;
     },
     editRight(): boolean {
-      if (
-        (state.generalParameters.isCommments &&
-          ((this.podcast &&
-            this.myOrganisationId === this.podcast.organisation.id) ||
-            this.myOrganisationId === this.organisation)) ||
-        state.generalParameters.isAdmin
-      ){
-        return true;
-      }
-      return false;
+      return (true === state.generalParameters.isCommments &&
+        ((this.myOrganisationId === this.podcast?.organisation.id) ||
+        this.myOrganisationId === this.organisation)) ||
+        true === state.generalParameters.isAdmin;
     },
     knownIdentity: {
       get(): string|null {
@@ -213,8 +207,7 @@ export default defineComponent({
     },
     recordingInLive(): boolean {
       return (
-        undefined!==this.podcast &&
-        undefined!==this.podcast.conferenceId &&
+        undefined!==this.podcast?.conferenceId &&
         0 !== this.podcast.conferenceId &&
         'READY' === this.podcast.processingStatus
       );

package/src/components/display/comments/CommentList.vue

@@ -85,22 +85,16 @@ export default defineComponent({
       return state.generalParameters.organisationId;
     },
     podcastId(): number|undefined {
-      if (this.podcast) return this.podcast.podcastId;
-      return undefined;
+      return this.podcast?.podcastId;
     },
     editRight(): boolean {
-      if (
-        (state.generalParameters.isCommments &&
-          ((this.podcast &&
-            this.myOrganisationId === this.podcast.organisation.id) ||
+      return (true === state.generalParameters.isCommments &&
+          ((this.myOrganisationId === this.podcast?.organisation.id) ||
             this.myOrganisationId  === this.organisation)) ||
-        state.generalParameters.isAdmin
-      )
-        return true;
-      return false;
+        true === state.generalParameters.isAdmin;
     },
     watchVariable():string{
-      return `${this.reload}|${this.status}`
+      return `${this.reload}|${this.status}`;
     }
   },
   watch: {
@@ -129,14 +123,13 @@ export default defineComponent({
         if (this.comId) {
           data = await octopusApi.postDataPublic<InterfacePageable<CommentPodcast>>(2, this.comId.toString(), {first: this.first,size: this.size});
         }else{
-          const param: FetchParam = {
+          data = await octopusApi.postDataPublic<InterfacePageable<CommentPodcast>>(2, this.isFlat ?'':'getRootCom',{
             first: this.first,
             size: this.size,
             podcastId: this.podcastId,
             status:this.editRight && this.status?[this.status]: this.editRight? ['Valid','Pending', 'Invalid']:['Valid'],
             organisationId: undefined === this.podcastId? this.organisation: undefined,
-          };
-          data = await octopusApi.postDataPublic<InterfacePageable<CommentPodcast>>(2, this.isFlat ?'':'getRootCom',param);
+          });
         }
         if(reset){
           this.comments.length = 0;

package/src/components/display/comments/CommentPlayer.vue

@@ -54,10 +54,7 @@ export default defineComponent({
   methods: {
     percentPosition(time: number): number {
       let realDuration = this.totalTime;
-      if (
-        this.$store.state.player.podcast &&
-        this.$store.state.player.podcast.duration
-      ) {
+      if (this.$store.state.player.podcast?.duration) {
         realDuration = Math.round(
           this.$store.state.player.podcast.duration / 1000
         );

package/src/components/display/edit/EditCommentBox.vue

@@ -28,7 +28,7 @@
       @click="commentModal('Invalid')"
     >
       <span
-        class="saooti-cross"
+        class="saooti-remove-bounty"
         :data-selenium="'Invalidate-Comment-' + seleniumFormat(comment.name)"
       />
     </button>

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

@@ -159,27 +159,13 @@ export default defineComponent({
     },
     async onSearchEmission(query?: string): Promise<void> {
       this.isLoading = true;
-      let standardParam: FetchParam = {
+      const response = await octopusApi.fetchDataWithParams<{count: number;result:Array<Emission>;sort: string;}>(0, 'emission/search',{
         query: query,
         first: 0,
         size: ELEMENTS_COUNT,
-      };
-      if (undefined !== this.distributedBy) {
-        standardParam = { ...standardParam, distributedBy: this.distributedBy };
-      } else if (undefined !== this.organisationDistributedBy) {
-        standardParam = {
-          ...standardParam,
-          distributedBy: this.organisationDistributedBy,
-          organisationId: this.organisationId,
-        };
-      } else {
-        standardParam = {
-          ...standardParam,
-          organisationId: this.organisationId,
-        };
-      }
-
-      const response = await octopusApi.fetchDataWithParams<{count: number;result:Array<Emission>;sort: string;}>(0, 'emission/search',standardParam, true);
+        distributedBy: this.distributedBy??this.organisationDistributedBy,
+        organisationId:this.distributedBy? undefined: this.organisationId
+      }, true);
       if (this.defaultanswer) {
         const emissionDefault = getDefaultEmission(this.defaultanswer);
         if(emissionDefault){

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

@@ -247,12 +247,7 @@ export default defineComponent({
       }
     },
     mainRubriquage(emission: Emission): string {
-      if (
-        emission.rubriqueIds &&state.emissionsPage.mainRubrique &&
-        emission.rubriqueIds.includes(state.emissionsPage.mainRubrique)
-      )
-        return 'partenaireRubrique';
-      return '';
+      return state.emissionsPage.mainRubrique && emission.rubriqueIds?.includes(state.emissionsPage.mainRubrique) ? 'partenaireRubrique' : '';
     },
   },
 })

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

@@ -84,18 +84,11 @@ export default defineComponent({
       return (state.generalParameters.podcastmaker as boolean);
     },
     organisation(): string {
-      if(this.emission && this.emission.publisher && this.emission.publisher.organisation){
-        return this.emission.publisher.organisation.name;
-      }
-      return '';
+      return this.emission?.publisher?.organisation?.name ?? '';
     },
     editRight(): boolean {
-      if (
-        (this.authenticated && this.myOrganisationId === this.emission.orga.id) ||
-        state.generalParameters.isAdmin
-      )
-        return true;
-      return false;
+      return (true === this.authenticated && this.myOrganisationId === this.emission.orga.id) ||
+        true === state.generalParameters.isAdmin
     },
   },
 

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

@@ -126,19 +126,17 @@ export default defineComponent({
     sortText(): string {
       switch (this.sort) {
         case 'SCORE':
-          return " "+this.$t('sort by score').toString();
+          return " "+this.$t('sort by score');
         case 'LAST_PODCAST_DESC':
-          return " "+this.$t('sort by date').toString();
+          return " "+this.$t('sort by date');
         case 'NAME':
-          return " "+this.$t('sort by alphabetical').toString();
+          return " "+this.$t('sort by alphabetical');
         default:
-          return " "+this.$t('sort by date').toString();
+          return " "+this.$t('sort by date');
       }
     },
     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: {
@@ -215,12 +213,7 @@ export default defineComponent({
       this.rubriques = data.rubriques;
     },
     mainRubriquage(emission: Emission): string {
-      if (
-        emission.rubriqueIds &&
-        emission.rubriqueIds[0] === state.emissionsPage.mainRubrique
-      )
-        return 'partenaireRubrique';
-      return '';
+      return emission.rubriqueIds?.[0] === state.emissionsPage.mainRubrique? 'partenaireRubrique': '';
     },
     rubriquesId(emission: Emission): string|undefined {
       if (

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

@@ -182,12 +182,8 @@ export default defineComponent({
       return state.generalParameters.organisationId;
     },
     editRight(): boolean {
-      if (
-        (this.authenticated && this.organisationId === this.emission.orga.id) ||
-        state.generalParameters.isAdmin
-      )
-        return true;
-      return false;
+      return (true===this.authenticated && this.organisationId === this.emission.orga.id) ||
+        true === state.generalParameters.isAdmin
     },
   },
 
@@ -229,11 +225,7 @@ export default defineComponent({
       });
     },
     play(podcast: Podcast): void {
-      if (podcast === this.$store.state.player.podcast) {
-        this.$store.commit('playerPause', false);
-      } else {
-        this.$store.commit('playerPlayPodcast', podcast);
-      }
+      this.$store.commit('playerPause', podcast === this.$store.state.player.podcast? false: podcast);
     },
     pause(): void {
       this.$store.commit('playerPause', true);

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

@@ -192,21 +192,14 @@ export default defineComponent({
       }
     },
     organisationRight(): boolean {
-      if (
-        (this.authenticated && this.myOrganisationId === this.organisationId) ||
-        state.generalParameters.isAdmin
-      )
-        return true;
-      return false;
+      return (true===this.authenticated && this.myOrganisationId === this.organisationId) ||
+        true === state.generalParameters.isAdmin;
     },
     organisation(): string|undefined {
-      if (this.organisationId) return this.organisationId;
-      if (this.filterOrga) return this.filterOrga;
-      return undefined;
+      return this.organisationId??this.filterOrga;
     },
     textNotVisible(): string {
-      if (this.isEmission) return this.$t('Consider podcasts no visible');
-      return this.$t('See podcasts no visible');
+      return this.isEmission? this.$t('Consider podcasts no visible') : this.$t('See podcasts no visible');
     },
     isCheckboxNotValidate(): boolean {
       return (
@@ -219,8 +212,7 @@ export default defineComponent({
       );
     },
     textNotValidate(): string {
-      if (this.sdkParameters.isProduction) return this.$t('Display all podcasts to validate').toString();
-      return this.$t('Display my podcasts to validate').toString();
+      return this.sdkParameters.isProduction? this.$t('Display all podcasts to validate') : this.$t('Display my podcasts to validate');
     },
   },
   watch: {

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

@@ -72,9 +72,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;
     },
     rubriqueFilter(): Array<RubriquageFilter>{
       return this.$store.state.filter.rubriqueFilter;

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

@@ -83,12 +83,7 @@ export default defineComponent({
       return 960 >= this.windowWidth;
     },
     rangeSize(){
-      if(this.windowWidth > 1600){
-        return 3;
-      }else if(this.windowWidth > 1530){
-        return 2;
-      }
-      return 1;
+      return this.windowWidth > 1600 ? 3 : this.windowWidth > 1530 ? 2 : 1;
     },
   },
   watch:{

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

@@ -164,31 +164,22 @@ export default defineComponent({
       return (state.generalParameters.podcastmaker as boolean);
     },
     hours(): string {
-      if(!this.live){ return ''; }
-      return moment(this.live.pubDate).format('À HH[H]mm');
+      return !this.live?'': moment(this.live.pubDate).format('HH[H]mm');
     },
     date(): string {
-      if(!this.live){ return ''; }
-      return moment(this.live.pubDate).format('D/MM/YYYY');
+      return !this.live? '': moment(this.live.pubDate).format('D/MM/YYYY');
     },
     displayDate(): string {
-      if(!this.live){ return ''; }
-      return moment(this.live.pubDate).format('X');
+      return !this.live? '':moment(this.live.pubDate).format('X');
     },
     description(): string {
-      if (this.live && this.live.description) return this.live.description;
-      return '';
+      return this.live?.description??'';
     },
     myOrganisationId(): string|undefined {
       return state.generalParameters.organisationId;
     },
     organisationRight(): boolean {
-      if (
-        this.isRoleLive && this.live && 
-        this.myOrganisationId === this.live.organisation.id
-      )
-        return true;
-      return false;
+      return true===this.isRoleLive && this.myOrganisationId === this.live?.organisation.id;
     },
     isRoleLive(): boolean {
       return (state.generalParameters.isRoleLive as boolean);
@@ -226,9 +217,7 @@ export default defineComponent({
       this.live = podcastUpdated;
     },
     getName(person: Participant): string {
-      const first = person.firstName || '';
-      const last = person.lastName || '';
-      return (first + ' ' + last).trim();
+      return (`${person.firstName??''} ${person.lastName??''}`).trim();
     },
     async fetchPodcastData(): Promise<void> {
       if (!this.fetchConference || !this.fetchConference.podcastId) return;

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

@@ -62,25 +62,25 @@ export default defineComponent({
     return {
       loading: true as boolean,
       loaded: true as boolean,
-      livesArray: [
+    };
+  },
+  
+  computed: {
+    livesArray(): Array<{status:string, title:string, lives:Array<Conference>}>{
+      return [
         {status: "RECORDING", title:this.$t('In live'), lives:[]},
         {status: "PENDING", title:this.$t('This live is not started yet'), lives:[]},
         {status: "PLANNED", title:this.$t('Live to be'), lives:[]},
         {status: "DEBRIEFING", title:this.$t('Live terminated'), lives:[]},
         {status: "PUBLISHING", title:this.$t('Publishing'), lives:[]},
         {status: "ERROR", title:this.$t('In error'), lives:[]}
-      ] as Array<{status:string, title:string, lives:Array<Conference>}>
-    };
-  },
-  
-  computed: {
+      ];
+    },
     isNoLive(): boolean{
       return this.loaded && !this.livesArray[0].lives.length && !this.livesArray[2].lives.length && !this.livesArray[3].lives.length;
     },
     filterOrgaUsed(): string|undefined {
-      if (this.filterOrga) return this.filterOrga;
-      if (this.organisationId) return this.organisationId;
-      return undefined;
+      return this.filterOrga??this.organisationId;
     },
     filterOrga(): string {
       return this.$store.state.filter.organisationId;
@@ -88,20 +88,16 @@ export default defineComponent({
     displayNextLiveMessage(): string {
       if (0 !== this.livesArray[0].lives.length) return '';
       if (this.livesArray[1].lives.length > 0)
-        return this.$t('A live can start any moment').toString();
+        return this.$t('A live can start any moment');
       if (this.livesArray[2].lives.length > 0)
-        return this.$t('Next live date', {
-          date: moment(this.livesArray[2].lives[0].date).format('LLLL'),
-        }).toString();
+        return this.$t('Next live date', {date: moment(this.livesArray[2].lives[0].date).format('LLLL'),});
       return '';
     },
     myOrganisationId(): string|undefined {
       return state.generalParameters.organisationId;
     },
     organisationRight(): boolean {
-      if (this.isRoleLive && this.myOrganisationId === this.filterOrgaUsed)
-        return true;
-      return false;
+      return this.isRoleLive && this.myOrganisationId === this.filterOrgaUsed;
     },
     isRoleLive(): boolean {
       return (state.generalParameters.isRoleLive as boolean);

package/src/components/display/organisation/OrganisationChooser.vue

@@ -161,13 +161,9 @@ export default defineComponent({
     myOrganisation(): Organisation|undefined {
       if (!this.authenticated) return undefined;
       return {
-        id: this.myOrganisationId ? this.myOrganisationId : "",
+        id: this.myOrganisationId??"",
         imageUrl: this.myImage,
-        name:
-          this.$t('Edit my organisation') +
-          ' (' +
-          state.organisation.name +
-          ')',
+        name: `${this.$t('Edit my organisation')} (${state.organisation.name})`
       };
     },
   },

package/src/components/display/organisation/OrganisationChooserLight.vue

@@ -65,11 +65,7 @@ export default defineComponent({
 
   methods: {
     onOrganisationSelected(): void{
-      if (-1 === this.actual) {
-        this.$emit('selected', undefined);
-      } else {
-        this.$emit('selected', this.organisation);
-      }
+      this.$emit('selected', -1 === this.actual? undefined:this.organisation);
     },
     async fetchOrganisation(): Promise<void> {
       if(!this.value){return;}

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

@@ -75,20 +75,15 @@ export default defineComponent({
       return (state.generalParameters.podcastmaker as boolean);
     },
     name(): string {
-      return (`${this.participant.firstName||''} ${this.participant.lastName||''}`).trim();
+      return (`${this.participant.firstName??''} ${this.participant.lastName??''}`).trim();
     },
     editRight(): boolean {
       if(!this.participant || !this.participant.orga){
         return false;
       }
-      if (
-        (this.authenticated &&
-          this.myOrganisationId === this.participant.orga.id) ||
-        state.generalParameters.isAdmin
-      ){
-        return true;
-      }
-      return false;
+      return (true == this.authenticated &&
+        this.myOrganisationId === this.participant.orga.id) ||
+        true === state.generalParameters.isAdmin
     },
   },
 

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

@@ -75,9 +75,7 @@ export default defineComponent({
       return this.participants.slice(this.dfirst, Math.min(this.dfirst + this.dsize,this.totalCount));
 		},
     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: {