@saooti/octopus-sdk 0.28.9 → 0.28.13

package/README.md

@@ -460,6 +460,10 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
  * 0.28.7 Rubrique filtre
  * 0.28.8 Rubrique filtre
  * 0.28.9 QrCode
+ * 0.28.10 QrCode icone
+ * 0.28.11 Podcastmaker modif
+ * 0.28.12 Rubriquage
+ * 0.28.13 Enlever les mises à jour
 
 
 

package/package.json

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

package/public/css/fonts/saooti-ui.svg

@@ -489,7 +489,8 @@
 <glyph unicode="&#xeadf;" glyph-name="newsletter" d="M160.632 641.257l-110.84-72.535 110.84-72.943zM863.368 641.257v-145.478l110.636 72.739zM512.102 871.902l-110.229-72.332h220.254zM455.256 509.838c0-24.042 12.429-38.509 33.211-38.509 28.728 0 56.642 36.879 62.347 69.886l10.799 57.865c-7.743 2.241-16.096 3.26-24.654 3.26-44.418 0-81.704-42.38-81.704-92.503zM829.138 473.367v292.178h-634.478v-291.974l317.239-208.436 317.239 208.233zM340.137 516.562c0 53.79 18.338 103.709 51.956 140.792 35.045 38.713 84.352 60.107 139.162 60.107 89.854 0 152.405-62.347 152.405-151.386 0-81.908-47.066-124.899-93.725-124.899-11.41 0-21.598 4.075-28.525 11.41-7.743 8.15-11.613 19.968-11.002 34.23h-0.407c-18.338-30.766-42.583-45.844-73.962-45.844-28.525 0-57.254 22.82-57.254 66.626 0 31.785 12.632 63.57 34.841 86.594 23.431 24.45 55.217 37.897 89.65 37.897 20.579 0 40.953-4.075 56.031-11.002l0.815-0.407-0.204-0.815-17.726-94.133c-5.093-25.673-4.279-42.992 2.241-51.345 2.853-3.667 6.927-5.502 12.225-5.705 0.204 0 0.407 0 0.611 0 9.169 0 18.745 4.483 27.098 12.632 17.319 17.115 27.303 46.862 27.303 81.5 0 79.259-47.881 128.567-124.899 128.567-89.854 0-155.054-72.127-155.054-171.762 0-83.334 53.382-139.365 132.641-139.365 29.951 0 57.050 6.316 78.036 18.134l1.019 0.611 9.169-24.45-0.815-0.407c-27.507-14.466-56.235-20.987-93.114-20.987-91.688 0-158.518 68.664-158.518 163.408zM521.27 230.089c-2.853-1.834-6.113-2.853-9.372-2.853s-6.52 1.019-9.372 2.853l-466.588 306.644v-512.636h952.125v512.839l-466.792-306.848z" />
 <glyph unicode="&#xeae0;" glyph-name="exit2" horiz-adv-x="820" d="M354.864 864.323c88.979 0 88.979-135.212 0-135.212h-190.387v-562.221h190.387c88.979 0 88.979-135.212 0-135.212h-257.994c-37.293 0-67.607 30.314-67.607 67.607v697.433c0 37.293 30.314 67.607 67.607 67.607h257.994zM301.651 524.547h212.414v45.798c0 26.388 29.878 41.218 51.032 26.388 70.005-40.346 139.792-80.691 209.579-121.037 21.809-12.649 21.154-44.053-0.436-56.048-70.659-40.781-141.319-81.564-211.978-122.345-21.59-12.431-48.196 3.49-48.196 27.914v46.016h-212.414c-14.83 0-27.042 12.212-27.042 27.042v99.228c0 15.047 11.995 27.042 27.042 27.042v0z" />
 <glyph unicode="&#xeae1;" glyph-name="more" horiz-adv-x="820" d="M449.537 408.309h298.913c22.615 0 39.537 16.923 39.537 39.537s-16.923 39.537-39.537 39.537h-298.913v298.913c0 22.615-16.923 39.537-39.537 39.537s-39.537-16.923-39.537-39.537v-298.913h-298.913c-22.615 0-39.537-16.923-39.537-39.537 0-11.231 2.769-19.691 11.231-28.153s16.923-11.231 28.153-11.231h298.913v-298.913c0-11.231 2.769-19.691 11.231-28.153v0c8.461-8.461 16.923-11.231 28.153-11.231 22.615 0 39.537 16.923 39.537 39.537l0.308 298.605z" />
-<glyph unicode="" glyph-name="more" horiz-adv-x="820" d="M449.537 408.309h298.913c22.615 0 39.537 16.923 39.537 39.537s-16.923 39.537-39.537 39.537h-298.913v298.913c0 22.615-16.923 39.537-39.537 39.537s-39.537-16.923-39.537-39.537v-298.913h-298.913c-22.615 0-39.537-16.923-39.537-39.537 0-11.231 2.769-19.691 11.231-28.153s16.923-11.231 28.153-11.231h298.913v-298.913c0-11.231 2.769-19.691 11.231-28.153v0c8.461-8.461 16.923-11.231 28.153-11.231 22.615 0 39.537 16.923 39.537 39.537l0.308 298.605z" />
+<glyph unicode="&#xeae2;" glyph-name="qrcode" d="M56 639.505c13.361 0 24 10.639 24 24v216.495h216.495c13.361 0 24 10.639 24 24s-10.639 24-24 24h-240.495c-13.361 0-24-10.639-24-24v-240.495c0-13.361 10.639-24 24-24zM968 256.495c-13.361 0-24-10.639-24-24v-216.495h-216.495c-13.361 0-24-10.639-24-24s10.639-24 24-24h240.495c13.361 0 24 10.639 24 24v240.495c0 13.361-10.639 24-24 24zM968 928h-240.495c-13.361 0-24-10.639-24-24s10.639-24 24-24h216.495v-216.495c0-13.361 10.639-24 24-24s24 10.639 24 24v240.495c0 13.361-10.639 24-24 24zM296.495 16h-216.495v216.495c0 13.361-10.639 24-24 24s-24-10.639-24-24v-240.495c0-13.361 10.639-24 24-24h240.495c13.361 0 24 10.639 24 24s-10.639 24-24 24zM779.712 204.536c0 13.361-10.639 24-24 24h-219.712v219.712c0 13.361-10.639 24-24 24h-243.712c-13.361 0-24-10.639-24-24s10.639-24 24-24h219.712v-219.712c0-13.361 10.639-24 24-24h243.712c13.114 0 24 10.639 24 24zM627.299 308.948c13.361 0 24 10.639 24 24v91.052h80.412v-91.299c0-13.361 10.639-24 24-24s24 10.639 24 24v115.299c0 13.361-10.639 24-24 24h-128.412c-13.361 0-24-10.639-24-24v-115.299c0-13.114 10.639-23.752 24-23.752zM244.288 691.712v-128.412c0-13.361 10.639-24 24-24h128.412c13.361 0 24 10.639 24 24v128.412c0 13.361-10.639 24-24 24h-128.412c-13.114 0-24-10.886-24-24zM627.299 539.299h128.412c13.361 0 24 10.639 24 24v128.412c0 13.361-10.639 24-24 24h-128.412c-13.361 0-24-10.639-24-24v-128.412c0-13.361 10.639-24 24-24zM396.701 356.948h-128.412c-13.361 0-24-10.639-24-24v-128.412c0-13.361 10.639-24 24-24h128.412c13.361 0 24 10.639 24 24v128.412c0 13.114-10.639 24-24 24zM512 539.299c13.361 0 24 10.639 24 24v128.412c0 13.361-10.639 24-24 24s-24-10.639-24-24v-128.412c0-13.361 10.639-24 24-24z" />
+<glyph unicode="" glyph-name="qrcode" d="M56 639.505c13.361 0 24 10.639 24 24v216.495h216.495c13.361 0 24 10.639 24 24s-10.639 24-24 24h-240.495c-13.361 0-24-10.639-24-24v-240.495c0-13.361 10.639-24 24-24zM968 256.495c-13.361 0-24-10.639-24-24v-216.495h-216.495c-13.361 0-24-10.639-24-24s10.639-24 24-24h240.495c13.361 0 24 10.639 24 24v240.495c0 13.361-10.639 24-24 24zM968 928h-240.495c-13.361 0-24-10.639-24-24s10.639-24 24-24h216.495v-216.495c0-13.361 10.639-24 24-24s24 10.639 24 24v240.495c0 13.361-10.639 24-24 24zM296.495 16h-216.495v216.495c0 13.361-10.639 24-24 24s-24-10.639-24-24v-240.495c0-13.361 10.639-24 24-24h240.495c13.361 0 24 10.639 24 24s-10.639 24-24 24zM779.712 204.536c0 13.361-10.639 24-24 24h-219.712v219.712c0 13.361-10.639 24-24 24h-243.712c-13.361 0-24-10.639-24-24s10.639-24 24-24h219.712v-219.712c0-13.361 10.639-24 24-24h243.712c13.114 0 24 10.639 24 24zM627.299 308.948c13.361 0 24 10.639 24 24v91.052h80.412v-91.299c0-13.361 10.639-24 24-24s24 10.639 24 24v115.299c0 13.361-10.639 24-24 24h-128.412c-13.361 0-24-10.639-24-24v-115.299c0-13.114 10.639-23.752 24-23.752zM244.288 691.712v-128.412c0-13.361 10.639-24 24-24h128.412c13.361 0 24 10.639 24 24v128.412c0 13.361-10.639 24-24 24h-128.412c-13.114 0-24-10.886-24-24zM627.299 539.299h128.412c13.361 0 24 10.639 24 24v128.412c0 13.361-10.639 24-24 24h-128.412c-13.361 0-24-10.639-24-24v-128.412c0-13.361 10.639-24 24-24zM396.701 356.948h-128.412c-13.361 0-24-10.639-24-24v-128.412c0-13.361 10.639-24 24-24h128.412c13.361 0 24 10.639 24 24v128.412c0 13.114-10.639 24-24 24zM512 539.299c13.361 0 24 10.639 24 24v128.412c0 13.361-10.639 24-24 24s-24-10.639-24-24v-128.412c0-13.361 10.639-24 24-24z" />
 <glyph unicode="wysiwyg18" glyph-name="table" d="M0 768v-704h1024v704h-1024zM384 320v128h256v-128h-256zM640 256v-128h-256v128h256zM640 640v-128h-256v128h256zM320 640v-128h-256v128h256zM64 448h256v-128h-256v128zM704 448h256v-128h-256v128zM704 512v128h256v-128h-256zM64 256h256v-128h-256v128zM704 128v128h256v-128h-256z" />
 <glyph unicode="write2" glyph-name="pencil2" d="M384 320l128 64 448 448-64 64-448-448-64-128zM289.3 92.902c-31.632 66.728-65.666 100.762-132.396 132.394l99.096 272.792 128 77.912 384 384h-192l-384-384-192-640 640 192 384 384v192l-384-384-77.912-128z" />
 <glyph unicode="wondering2" glyph-name="wondering2" d="M512 960c-282.77 0-512-229.23-512-512s229.23-512 512-512 512 229.23 512 512-229.23 512-512 512zM704 704c35.346 0 64-28.654 64-64s-28.654-64-64-64-64 28.654-64 64 28.654 64 64 64zM256 640c0 35.346 28.654 64 64 64s64-28.654 64-64-28.654-64-64-64-64 28.654-64 64zM331.244 153.614l-22.488 76.774 437 128 22.488-76.774-437-128z" />

package/public/css/fonts/style.css

@@ -1,10 +1,10 @@
 @font-face {
   font-family: 'saooti-ui';
-  src:  url('/css/fonts/saooti-ui.eot?sdprm6');
-  src:  url('/css/fonts/saooti-ui.eot?sdprm6#iefix') format('embedded-opentype'),
-    url('/css/fonts/saooti-ui.ttf?sdprm6') format('truetype'),
-    url('/css/fonts/saooti-ui.woff?sdprm6') format('woff'),
-    url('/css/fonts/saooti-ui.svg?sdprm6#saooti-ui') format('svg');
+  src:  url('/css/fonts/saooti-ui.eot?i2gub6');
+  src:  url('/css/fonts/saooti-ui.eot?i2gub6#iefix') format('embedded-opentype'),
+    url('/css/fonts/saooti-ui.ttf?i2gub6') format('truetype'),
+    url('/css/fonts/saooti-ui.woff?i2gub6') format('woff'),
+    url('/css/fonts/saooti-ui.svg?i2gub6#saooti-ui') format('svg');
   font-weight: normal;
   font-style: normal;
   font-display: block;
@@ -38,6 +38,9 @@
 .saooti-language:before {
   content: "\eadb";
 }
+.saooti-qrcode:before {
+  content: "\eae2";
+}
 .saooti-newsletter:before {
   content: "\eadf";
 }

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

@@ -245,14 +245,14 @@ export default Vue.extend({
       )
         return undefined;
       const rubrique = this.rubriques.find(
-        (element: Rubrique) => element.rubriqueId === emission.rubriqueIds[0]
+        (element: Rubrique) => emission.rubriqueIds.includes(element.rubriqueId!) && element.rubriquageId === parseInt(this.displayRubriquage)
       );
       return rubrique!.name;
     },
     mainRubriquage(emission: Emission): string {
       if (
         emission.rubriqueIds &&
-        emission.rubriqueIds[0] === state.emissionsPage.mainRubrique
+        emission.rubriqueIds.includes(state.emissionsPage.mainRubrique)
       )
         return 'partenaireRubrique';
       return '';

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

@@ -161,6 +161,9 @@ export default Vue.extend({
         return;
       }
       this.isInternChanged = true;
+      if(0===this.arrayFilter.length){
+        this.arrayFilter.push({rubriquageId: this.availableRubriquage[0].rubriquageId!, rubriqueId: 0, name:""});
+      }
       if(this.isRubriquage){
         if(this.saveOrganisation !== this.organisation){
           this.fetchTopics(true);

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

@@ -95,6 +95,7 @@ export default Vue.extend({
     buttonPlus: { default:false as boolean},
     rubriqueId: { default: () => ([]) as Array<number> },
     rubriquageId:{ default: () => ([]) as Array<number> },
+    noRubriquageId: { default: () => ([]) as Array<number> },
   },
 
   components: {
@@ -185,8 +186,9 @@ export default Vue.extend({
         organisationId: this.organisation,
         emissionId: this.emissionId,
         iabId: this.iabId,
-        rubriqueId: this.rubriqueId,
-        rubriquageId: this.rubriquageId,
+        rubriqueId: this.rubriqueId.length ?this.rubriqueId:undefined,
+        rubriquageId: this.rubriquageId.length ?this.rubriquageId : undefined,
+        noRubriquageId: this.noRubriquageId.length ? this.noRubriquageId : undefined,
         sort: this.popularSort ? 'POPULARITY' : 'DATE',
       });
       this.loading = false;

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

@@ -127,7 +127,7 @@ export default Vue.extend({
       return this.$store.state.filter.rubriqueFilter;
     },
     rubriqueDisplay(): Array<Rubrique>{
-      return this.$store.state.filter.rubriqueDisplay;
+      return this.$store.state.filter.rubriqueDisplay.filter((rubrique: Rubrique) => 0 !== rubrique.podcastCount );
     },
     rubriquageDisplay(): Array<Rubriquage>{
       const elementToNotShow = Array.from(this.rubriqueFilter);
@@ -150,7 +150,7 @@ export default Vue.extend({
     },
     addFilter(rubrique: Rubrique): void{
       if(!this.rubriquage){ return ;}
-      const filterToAdd = {rubriquageId: this.rubriquage.rubriquageId!, rubriqueId: rubrique.rubriqueId!, name: this.rubriquage.title +": "+rubrique.name};
+      const filterToAdd = {rubriquageId: this.rubriquage.rubriquageId!, rubriqueId: rubrique.rubriqueId!, name: this.rubriquage.title +" : "+rubrique.name};
       const newFilter: Array<RubriquageFilter> = Array.from(this.$store.state.filter.rubriqueFilter);
       newFilter.push(filterToAdd);
       this.$store.commit('filterRubrique', newFilter);

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

@@ -144,8 +144,8 @@
         @click="qrCode = true"
         :title="$t('Share QR Code')"
       >
-        <span class="saooti-newsletter" v-if="!bigRound"></span>
-        <div class="saooti-newsletter" v-else></div>
+        <span class="saooti-qrcode" v-if="!bigRound"></span>
+        <div class="saooti-qrcode" v-else></div>
       </a>
       <a
         rel="noopener"

package/src/components/misc/Player.vue

@@ -450,7 +450,10 @@ export default cookies.extend({
       let listenerId = this.getCookie("octopus_listenerId");
       if(!listenerId){
         listenerId = new Date().valueOf().toString() + Math.random();
-        const domain = /\.(.+)/.exec(window.location.host)![1];
+        let domain: any = /\.(.+)/.exec(window.location.host);
+        if(/\.(.+)/.exec(window.location.host)){
+          domain = domain[1];
+        }
         this.setCookie("octopus_listenerId", listenerId, ';domain='+domain);
       }
       return listenerId;

package/src/components/pages/Home.vue

@@ -17,6 +17,13 @@
         :title="r.name"
         :buttonText="$t('All podcast button', { name: r.name })"
       />
+      <PodcastInlineList
+        v-if="rubriqueDisplay && rubriqueDisplay.length"
+        :noRubriquageId="[rubriqueDisplay[0].rubriquageId]"
+        :rubriqueId="rubriqueId"
+        :title="$t('Without rubric')"
+        :buttonText="$t('All podcast button', { name: $t('Without rubric') })"
+      />
     </template>
   </div>
 </template>
@@ -48,7 +55,7 @@ export default Vue.extend({
   },
   computed: {
     rubriqueDisplay(): Array<Rubrique>{
-      return this.$store.state.filter.rubriqueDisplay;
+      return this.$store.state.filter.rubriqueDisplay.filter((rubrique: Rubrique) => 0 !== rubrique.podcastCount );
     },
     rubriquageFilter(): Array<Rubriquage>{
       if(this.$store.state.filter.organisationId){

package/src/main.ts

@@ -17,8 +17,25 @@ import router from '@/router/router';
 const moment = require('moment');
 import store from '@/store/AppStore';
 const paramStore = require('./store/paramStore');
+import VueRouter from 'vue-router';
+import { ErrorHandler, RawLocation } from 'vue-router/types/router';
+
+
+const originalPush: any = router.push;
+router.push = function push(location: RawLocation, onResolve?: Function | undefined, onReject?: ErrorHandler | undefined){
+    if (onResolve || onReject) {
+        return originalPush.call(this, location, onResolve, onReject)
+    }
+ 
+    return originalPush.call(this, location).catch((err: any) => {
+        if (VueRouter.isNavigationFailure(err)) {
+            return err
+        }
+   
+        return Promise.reject(err)
+    })
+}
 
-moment.locale('fr');
 Vue.use(ModalPlugin); 
 Vue.use(FormRadioPlugin); 
 Vue.use(CardPlugin); 
@@ -50,6 +67,7 @@ const i18n = new VueI18n({
   locale: language,
   messages: messages,
 });
+moment.locale(language);
 
 // Initialisation store
 paramStore