@saooti/octopus-sdk 30.0.79 → 30.0.82

package/README.md

@@ -575,4 +575,7 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
  * 30.0.76 Space
  * 30.0.77 V-Calendar bloque version
  * 30.0.78 a -> word-break
- * 30.0.79 DownloadId player
+ * 30.0.79 DownloadId player
+ * 30.0.80 DownloadId player
+ * 30.0.81 DownloadId player
+ * 30.0.82 Cherry pick Color Qr code

package/package.json

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

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

@@ -8,6 +8,13 @@
       class="myQrCode"
       :margin="2" 
     />
+    <ClassicCheckbox
+      v-if="'#000000'!==otherColor"
+      v-model:textInit="isNotBlack"
+      class="flex-shrink-0"
+      id-checkbox="is-black-qr-code"
+      :label="$t('Use organization color')"
+    />
     <button
       class="btn m-3"
       @click="download"
@@ -22,6 +29,7 @@
 </template>
 
 <script lang="ts">
+import ClassicCheckbox from '../../form/ClassicCheckbox.vue';
 import { state } from '../../../store/paramStore';
 import octopusApi from '@saooti/octopus-api';
 import Snackbar from '../../misc/Snackbar.vue';
@@ -33,7 +41,8 @@ export default defineComponent({
 
   components: {
     Snackbar,
-    QrcodeVue
+    QrcodeVue,
+    ClassicCheckbox
   },
   props: {
     url: { default: '', type: String},
@@ -42,7 +51,9 @@ export default defineComponent({
   data() {
     return {
       size: 200 as number,
-      color: "#40a372" as string
+      color: "#000000" as string,
+      otherColor:"#000000" as string,
+      isNotBlack: false as boolean,
     };
   },
   computed:{
@@ -50,6 +61,15 @@ export default defineComponent({
       return (state.generalParameters.authenticated as boolean);
     },
   },
+  watch:{
+    isNotBlack(){
+      if(this.isNotBlack){
+        this.color = this.otherColor;
+      }else{
+        this.color = "#000000";
+      }
+    }
+  },
   created(){
     this.initColor();
   },
@@ -66,7 +86,7 @@ export default defineComponent({
     },
     async initColor(): Promise<void> {
       if(state.generalParameters.podcastmaker && state.generalParameters.podcastmakerColor){
-        this.color = state.generalParameters.podcastmakerColor;
+        this.otherColor = state.generalParameters.podcastmakerColor;
         return;
       }
       if (!this.authenticated) return;
@@ -79,7 +99,7 @@ export default defineComponent({
         );
       }
       if (Object.prototype.hasOwnProperty.call(data,'COLOR')) {
-        this.color = data.COLOR;
+        this.otherColor = data.COLOR;
       }
     },
   }

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="module-box text-center-mobile">
+    <div class="module-box text-center-mobile overflow-visible">
       <h3>{{ $t('Embed') }}</h3>
       <template v-if="!exclusive && (authenticated || notExclusive)">
         <div class="d-flex flex-column align-items-center">

package/src/components/misc/Player.vue

@@ -151,7 +151,7 @@ export default defineComponent({
           'distributorId=' + this.$store.state.authentication.organisationId
         );
       }
-      return '?' + parameters.join('&');
+      return this.podcast.podcastId+'.mp3?' + parameters.join('&');
     },
     organisationId(): string|undefined {
       return state.generalParameters.organisationId;
@@ -208,8 +208,7 @@ export default defineComponent({
         this.audioUrlToPlay = this.audioUrl;
       }
       if(!this.podcast){return;}
-      const response = await octopusApi.fetchPodcastDownloadUrl("podcast/download/register/"+this.podcast.podcastId+".mp3"+ this.audioUrl);
-      this.setCookie("player_"+this.podcast.podcastId, response.downloadId.toString(), ';domain='+this.getDomain());
+      const response = await octopusApi.fetchPodcastDownloadUrl("podcast/download/register/"+ this.audioUrl);
       this.setDownloadId(response.downloadId.toString());
       this.audioUrlToPlay = response.location;
     }
@@ -268,9 +267,9 @@ export default defineComponent({
       this.downloadId = newValue;
     },
     onError(): void {
-      if (this.podcast && !this.listenError) {
+      if (this.podcast && ""!==this.audioUrlToPlay && !this.listenError) {
         this.listenError = true;
-      } else if (this.podcast || this.media) {
+      } else if ((this.podcast && ""!==this.audioUrlToPlay ) || this.media) {
         this.playerError = true;
       }
     },
@@ -278,7 +277,7 @@ export default defineComponent({
       const mediaTarget = (event.currentTarget as HTMLMediaElement);
       if (this.podcast || this.live) {
         if (!this.getDownloadId()) {
-          this.loadDownloadId();
+          return;
         }
         if (
           this.live &&
@@ -339,29 +338,17 @@ export default defineComponent({
         this.forceHide = false;
       }
     },
-    loadDownloadId(): void {
-      if (!this.podcast) return;
-      const matching_cookies = document.cookie
-        .split(';')
-        .map(item => {
-          const _return = item.trim().split('=');
-          return _return.map(item => item.trim());
-        })
-        .filter(item => {
-          if(!this.podcast){return '';}
-          return 'player_' + this.podcast.podcastId === item[0];
-        });
-      if (1 === matching_cookies.length) {
-        this.setDownloadId(matching_cookies[0][1]);
-      }
-    },
     async endListeningProgress(): Promise<void> {
       if (!this.getDownloadId()) return;
-      await octopusApi.updatePlayerTime(
-        this.getDownloadId(),
-        Math.round(this.listenTime)
-      );
-      this.setDownloadId(null);
+      try {
+        await octopusApi.updatePlayerTime(
+          this.getDownloadId(),
+          Math.round(this.listenTime)
+        );
+      } catch{
+        //Do nothing
+      }
+      this.downloadId = null;
       this.notListenTime = 0;
       this.lastSend = 0;
       this.listenTime = 0;

package/src/locale/de.ts

@@ -297,4 +297,7 @@ export default{
   'From RSS': "Aus RSS-Feed",
   "User menu":"Benutzermenü",
   'Podcast tags': "Podcast-Tags",
+  "Enlarge":"Vergrößern",
+  "Reduce":"Reduzieren",
+  "Use organization color":"Verwenden Sie die Organisationsfarbe",
 }

package/src/locale/en.ts

@@ -297,4 +297,8 @@ export default{
   'From RSS': "From an RSS feed",
   "User menu":"User menu",
   'Podcast tags': 'Podcast tags',
+  "You do not have the right to access this page":"You do not have the right to access this page",
+  "Enlarge":"Enlarge",
+  "Reduce":"Reduce",
+  "Use organization color":"Use organization color",
 };

package/src/locale/es.ts

@@ -297,4 +297,7 @@ export default{
   'From RSS': "Desde un canal RSS",
   "User menu":"Menú de usuario",
   'Podcast tags': 'Etiquetas de pódcast',
+  "Enlarge":"Agrandar",
+  "Reduce":"Reducir",
+  "Use organization color":"Usar el color de la organización",
 }

package/src/locale/fr.ts

@@ -297,4 +297,8 @@ export default{
   'From RSS': "Issu d'un flux RSS",
   "User menu":"Menu utilisateur",
   'Podcast tags': "Mot-clé de l'épisode",
+  "You do not have the right to access this page":"Vous n’avez pas le droit d’accéder à cette page",
+  "Enlarge":"Agrandir",
+  "Reduce":"Réduire",
+  "Use organization color":"Utiliser la couleur de l'organisation",
 };

package/src/locale/it.ts

@@ -295,4 +295,7 @@ export default{
     'Podcast tags': 'Tag podcast', 
     "Term of use":"Termini d'uso",
     'More episodes of this category : ': "Altri episodi su questo tema : {name}",
+    "Enlarge":"Ingrandire",
+    "Reduce":"Ridurre",
+    "Use organization color":"Usa il colore dell'organizzazione",
   };

package/src/locale/sl.ts

@@ -297,4 +297,7 @@ export default{
   'From RSS': "Z vira RSS",
   "User menu":"Uporabniški meni",
   'Podcast tags': 'Oznake podkastov',
+  "Enlarge":"Povečaj",
+  "Reduce":"Zmanjšaj",
+  "Use organization color":"Uporabite barvo organizacije",
 }