@saooti/octopus-sdk 0.28.11 → 0.28.15

package/README.md

@@ -462,6 +462,10 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
  * 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
+ * 0.28.14 QrCode
+ * 0.28.15 Theme player beta
 
 
 

package/package.json

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

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

@@ -1,14 +1,32 @@
 <template>
   <div class="d-flex flex-column align-items-center">
-    <qrcode-vue :value="url" :size="size" level="H" foreground="#40a372" class="myQrCode"/>
-    <button class="btn m-3" @click="download">{{ $t('Download') }}</button>
-    <Snackbar ref="snackbar" position="bottom-left"></Snackbar>
+    <qrcode-vue
+      :value="url"
+      :size="size"
+      level="H"
+      :foreground="color"
+      class="myQrCode"
+      :margin="2" 
+    />
+    <button
+      class="btn m-3"
+      @click="download"
+    >
+      {{ $t('Download') }}
+    </button>
+    <Snackbar
+      ref="snackbar"
+      position="bottom-left"
+    />
   </div>
 </template>
 
+
 <style lang="scss">
 </style>
 <script lang="ts">
+import { state } from '../../../store/paramStore';
+import profileApi from '@/api/profile';
 import Snackbar from '../../misc/Snackbar.vue';
 import QrcodeVue from 'qrcode.vue'
 import Vue from 'vue';
@@ -26,8 +44,14 @@ export default Vue.extend({
   data() {
     return {
       size: 200 as number,
+      color: "#40a372" as string
     };
   },
+  computed:{
+    authenticated(): boolean {
+      return state.generalParameters.authenticated;
+    },
+  },
   methods:{
     download(): void{
       const link = document.createElement('a');
@@ -38,7 +62,22 @@ export default Vue.extend({
         link.click();
         (this.$refs.snackbar as any).open(this.$t('Download started'));
       }
-    }
+    },
+    async initColor(): Promise<void> {
+      if (!this.authenticated) return;
+      let data;
+      if(this.$store.state.organisation && this.$store.state.organisation.attributes && Object.keys(this.$store.state.organisation.attributes).length > 1){
+        data = this.$store.state.organisation.attributes;
+      }else{
+        data= await profileApi.fetchOrganisationAttibutes(
+          this.$store.state,
+          state.generalParameters.organisationId
+        );
+      }
+      if (Object.prototype.hasOwnProperty.call(data,'COLOR')) {
+        this.color = data.COLOR;
+      }
+    },
   }
 });
 </script>

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

@@ -94,12 +94,12 @@
                 ></swatches>
               </div>
               <swatches
-                v-model="theme"
+                v-model="themeBeta"
                 class="c-hand input-no-outline"
                 show-fallback
                 colors="text-advanced"
                 popover-to="right"
-                :data-color="theme"
+                :data-color="themeBeta"
                 v-else
               ></swatches>
             </div>
@@ -223,6 +223,7 @@ export default Vue.extend({
       isShareModal: false as boolean,
       color: '#40a372' as string,
       theme: '#000000' as string,
+      themeBeta: '#000000' as string,
       proceedReading: true as boolean,
       episodeNumbers: 'number' as string,
       iFrameNumber: '3' as string,
@@ -347,11 +348,12 @@ export default Vue.extend({
         }
       }
       url.push('?distributorId=' + this.organisationId);
+      const theme = this.isBeta ? this.themeBeta : this.theme;
       url.push(
         '&color=' +
           this.color.substring(1) +
           '&theme=' +
-          this.theme.substring(1)
+          theme.substring(1)
       );
       if (!this.proceedReading) {
         url.push('&proceed=false');
@@ -473,6 +475,9 @@ export default Vue.extend({
         this.theme = '#ffffff';
       }
       if (data.hasOwnProperty('playerBeta')) {
+        if (data.hasOwnProperty('THEMEBETA')) {
+          this.themeBeta = data.THEMEBETA;
+        }
         this.displayBetaChoice = data.playerBeta;
         let dataFetched = await octopusApi.fetchCustomPlayer('customPlayer/organisation/'+ this.organisationId!);
         this.customPlayers = dataFetched.content;

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