@saooti/octopus-sdk 31.0.4 → 31.0.7

package/README.md

@@ -563,12 +563,23 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
  * 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
+ * 30.0.71 Parlement européen
+ * 30.0.72 Ajout des traductions
+
 
  * 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
+ * 31.0.7 Sécurisation
+
 
 
  

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saooti/octopus-sdk",
-  "version": "31.0.4",
+  "version": "31.0.7",
   "private": false,
   "description": "Javascript SDK for using octopus",
   "author": "Saooti",
@@ -15,7 +15,7 @@
   "main": "./dist/octopus.common.js",
   "dependencies": {
     "@popperjs/core": "^2.11.0",
-    "@saooti/octopus-api": "^0.31.0",
+    "@saooti/octopus-api": "^0.31.1",
     "@vue/cli": "^5.0.0-rc.1",
     "@vue/compat": "^3.2.26",
     "axios": "^0.24.0",

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

@@ -119,7 +119,7 @@ export default defineComponent({
       this.keepOrganisation = false;
       if (organisation && organisation.id) {
         this.$emit('updateOrganisationId', organisation.id);
-        if(organisation.private){
+        if(organisation.privacy){
           this.$nextTick(() => {
             this.onKeepOrganisation();
           });

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

@@ -82,7 +82,7 @@ export default defineComponent({
       const data = await octopusApi.fetchOrganisation(this.value);
       this.organisation = data;
       this.actual = data.id;
-      this.privateOrganisation = data.private??false;
+      this.privateOrganisation = "PUBLIC"!==data.privacy;
       this.init = true;
     },
   },

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

@@ -8,17 +8,17 @@
       <div class="d-flex">
         <button
           class="btn btn-underline"
-          :class="{ active: popularSort }"
-          @click="sortPopular()"
+          :class="{ active: !popularSort }"
+          @click="sortChrono()"
         >
-          {{ $t('Most popular') }}
+          {{ $t('Last added') }}
         </button>
         <button
           class="btn btn-underline"
-          :class="{ active: !popularSort }"
-          @click="sortChrono()"
+          :class="{ active: popularSort }"
+          @click="sortPopular()"
         >
-          {{ $t('Last added') }}
+          {{ $t('Most popular') }}
         </button>
       </div>
       <div
@@ -68,6 +68,7 @@
     <router-link
       class="btn btn-link align-self-center width-fit-content m-4"
       :to="refTo"
+      @click="handleSeeMoreButton"
     >
       {{ buttonText }}
       <div
@@ -91,6 +92,7 @@ import { RubriquageFilter } from '@/store/class/rubrique/rubriquageFilter';
 import { defineComponent } from 'vue'
 import { RouteLocationRaw } from 'vue-router';
 import { AxiosError } from 'axios';
+import { Rubrique } from '@/store/class/rubrique/rubrique';
 export default defineComponent({
   name: 'PodcastInlineList',
   
@@ -126,7 +128,7 @@ export default defineComponent({
       first: 0 as number,
       size: 5 as number,
       totalCount: 0 as number,
-      popularSort: true as boolean,
+      popularSort: false as boolean,
       allPodcasts: [] as Array<Podcast>,
       direction: 1 as number,
       alignLeft: false as boolean,
@@ -214,6 +216,26 @@ export default defineComponent({
     this.fetchNext();
   },
   methods: {
+    handleSeeMoreButton(event: { preventDefault: () => void; }){
+      if(!this.rubriqueId || this.noRubriquageId.length){
+        return;
+      }
+      event.preventDefault();
+      const rubriqueChosenId = this.rubriqueId[this.rubriqueId.length - 1];
+      const rubriqueChosen =  this.$store.state.filter.rubriquageArray[this.rubriqueId.length - 1].rubriques.find((element: Rubrique) => element.rubriqueId === rubriqueChosenId);
+      const filterToAdd = {
+        rubriquageId: this.$store.state.filter.rubriquageArray[this.rubriqueId.length - 1].rubriquageId, 
+        rubriqueId: rubriqueChosenId, 
+        nameRubriquage:  this.$store.state.filter.rubriquageArray[this.rubriqueId.length - 1].title,
+        nameRubrique: rubriqueChosen.name
+      };
+      const newFilter: Array<RubriquageFilter> = Array.from(this.$store.state.filter.rubriqueFilter);
+      newFilter.push(filterToAdd);
+      this.$store.commit('filterRubrique', newFilter);
+      const queries = this.$route.query;
+      const queryString = newFilter.map(value =>  value.rubriquageId+':'+value.rubriqueId).join();
+      this.$router.push({ name: 'podcasts',query: { ...queries, ...{ rubriquesId: queryString }} });
+    },
     async fetchNext(): Promise<void> {
       try {
         const data = await octopusApi.fetchPodcasts({

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

@@ -139,12 +139,6 @@
               :message="$t('Podcast not validated')"
             />
           </div>
-          <ShareButtons
-            v-if="isDownloadButton"
-            :podcast="podcast"
-            :big-round="true"
-            :audio-url="podcast.audioUrl"
-          />
         </div>
       </div>
     </div>
@@ -168,14 +162,12 @@ import { Podcast } from '@/store/class/general/podcast';
 import { Conference } from '@/store/class/conference/conference';
 
 import { defineComponent, defineAsyncComponent } from 'vue';
-const ShareButtons = defineAsyncComponent(() => import('../sharing/ShareButtons.vue'));
 const ErrorMessage = defineAsyncComponent(() => import('../../misc/ErrorMessage.vue'));
 export default defineComponent({
   name: "PodcastModuleBox",
   components: {
     PodcastImage,
     ParticipantDescription,
-    ShareButtons,
     TagList,
     ErrorMessage,
     PodcastPlayBar
@@ -209,15 +201,9 @@ export default defineComponent({
     isOuestFrance(): boolean {
       return (state.podcastPage.ouestFranceStyle as boolean);
     },
-    isDownloadButton(): boolean {
-      return (state.podcastPage.downloadButton as boolean);
-    },
     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/sharing/ShareButtons.vue

@@ -32,17 +32,18 @@
         verticalDisplay ? 'd-flex-row' : '',
       ]"
     >
-      <a
-        v-if="audioUrl"
-        class="btn btn-big-round"
+      <button
+        v-if="isDownloadButton"
+        class="text-dark"
+        :class="[
+          bigRound ? 'btn btn-big-round' : 'btn share-btn mb-2',
+          verticalDisplay ? '' : 'mx-2',
+        ]"
         :title="$t('Downloading')"
-        :href="audioUrl"
-        rel="noopener"
-        target="_blank"
-        download
+        @click="onDownload(podcast.audioUrl, podcast.title)"
       >
         <div class="saooti-download-bounty" />
-      </a>
+      </button>
       <a
         rel="noopener"
         target="_blank"
@@ -283,6 +284,12 @@ export default defineComponent({
   },
 
   computed: {
+    isDownloadButton(): boolean{
+      return this.isDownloadButtonParam && undefined!==this.podcast && (!this.podcast.tags || !this.podcast.tags.includes('copyright'));
+    },
+    isDownloadButtonParam(): boolean {
+      return (state.podcastPage.downloadButton as boolean);
+    },
     urlPage(): string{
       return window.location.href;
     },
@@ -334,7 +341,24 @@ export default defineComponent({
       let check = false;
       (function(a){if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino|android|ipad|playbook|silk/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw-(n|u)|c55\/|capi|ccwa|cdm-|cell|chtm|cldc|cmd-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc-s|devi|dica|dmob|do(c|p)o|ds(12|-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(-|_)|g1 u|g560|gene|gf-5|g-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd-(m|p|t)|hei-|hi(pt|ta)|hp( i|ip)|hs-c|ht(c(-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i-(20|go|ma)|i230|iac( |-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|-[a-w])|libw|lynx|m1-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|-([1-8]|c))|phil|pire|pl(ay|uc)|pn-2|po(ck|rt|se)|prox|psio|pt-g|qa-a|qc(07|12|21|32|60|-[2-7]|i-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h-|oo|p-)|sdk\/|se(c(-|0|1)|47|mc|nd|ri)|sgh-|shar|sie(-|m)|sk-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h-|v-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl-|tdg-|tel(i|m)|tim-|t-mo|to(pl|sh)|ts(70|m-|m3|m5)|tx-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas-|your|zeto|zte-/i.test(a.substr(0,4))) check = true;})(navigator.userAgent);
       return check;
-    }
+    },
+    onDownload(urlToDownload: string, nameOfDownload: string): void{
+      const xhr = new XMLHttpRequest();
+      xhr.open('GET', urlToDownload, true);
+      xhr.responseType = 'blob';
+      xhr.onload = function() {
+        const urlCreator = window.URL || window.webkitURL;
+        const imageUrl = urlCreator.createObjectURL(this.response);
+        const tag = document.createElement('a');
+        tag.href = imageUrl;
+        tag.target = '_blank';
+        tag.download = nameOfDownload.replace(/ /g, '_');
+        document.body.appendChild(tag);
+        tag.click();
+        document.body.removeChild(tag);
+      };
+      xhr.send();
+    },
   },
 })
 </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/components/pages/Emission.vue

@@ -246,7 +246,7 @@ export default defineComponent({
       try {
         const data: Emission = await octopusApi.fetchEmission(this.emissionId);
         this.emission = data;
-        if(this.emission.orga.private && this.filterOrga!==this.emission.orga.id){
+        if("PUBLIC"!==this.emission.orga.privacy && this.filterOrga!==this.emission.orga.id){
           this.initError();
           return;
         }

package/src/components/pages/Participant.vue

@@ -186,7 +186,7 @@ export default defineComponent({
       this.loaded = false;
       try {
         const data = await octopusApi.fetchParticipant(this.participantId ? this.participantId.toString(): "");
-        if(data && data.orga && data.orga.private && this.filterOrga!==data.orga.id){
+        if(data && data.orga && "PUBLIC"!==data.orga.privacy && this.filterOrga!==data.orga.id){
           this.initError();
           return;
         }

package/src/components/pages/Playlist.vue

@@ -143,7 +143,7 @@ export default defineComponent({
         this.error = false;
         const data: Playlist = await octopusApi.fetchPlaylist(this.playlistId ? this.playlistId.toString(): "");
         this.playlist = data;
-        if(this.playlist.organisation.private && this.filterOrga!==this.playlist.organisation.id){
+        if("PUBLIC"!==this.playlist.organisation.privacy && this.filterOrga!==this.playlist.organisation.id){
           this.initError();
           return;
         }

package/src/components/pages/Podcast.vue

@@ -327,7 +327,7 @@ export default defineComponent({
     async getPodcastDetails(podcastId: number): Promise<void> {
       try {
         const data : Podcast = await octopusApi.fetchPodcast(podcastId.toString());
-        if(data.organisation.private && this.filterOrga!==data.organisation.id){
+        if("PUBLIC"!==data.organisation.privacy && this.filterOrga!==data.organisation.id){
           this.initError();
           return;
         }