@saooti/octopus-sdk 33.0.4 → 33.0.6

package/README.md

@@ -688,6 +688,10 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
  * 32.0.35 Enlever Dummy param
  * 32.0.36 Select -> font family
  * 32.0.40 Problème majeur !!! 
+ * 32.0.42 Parlement européen
 
  * 33.0.3 SpeechToText player octopus
  * 33.0.4 Image webp
+ * 33.0.5 Change recaptcha
+ * 33.0.6 Crédits
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saooti/octopus-sdk",
-  "version": "33.0.4",
+  "version": "33.0.6",
   "private": false,
   "description": "Javascript SDK for using octopus",
   "author": "Saooti",
@@ -37,7 +37,7 @@
     "vue": "^3.2.37",
     "vue-i18n": "^9.2.0-beta.40",
     "vue-multiselect": "^3.0.0-alpha.2",
-    "vue-recaptcha-v3": "^2.0.1",
+    "vue-recaptcha": "^2.0.3",
     "vue-router": "^4.1.2",
     "vue3-lazyload": "^0.2.5-beta",
     "vue3-swatches": "^1.0.10",

package/src/components/display/categories/CategoryChooser.vue

@@ -5,9 +5,8 @@
   >
     <label
       :for="id"
-      class="d-inline"
-      title="select category"
-    />
+      class="hid"
+    >{{$t('Type string to filter by categories')}}</label>
     <VueMultiselect
       :id="id"
       ref="multiselectRef"

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

@@ -45,11 +45,21 @@
           >
             {{ $t('Close') }}
           </button>
+          <vue-recaptcha 
+            v-if="!isVerify"
+            ref="invisibleRecaptcha"
+            :load-recaptcha-script="true"
+            @verify="handleSuccess"
+            @expired="handleError"
+            size="invisible"
+            sitekey="6LfyP_4ZAAAAAPODj8nov2LvosIwcX0GYeBSungh"
+          >
+          </vue-recaptcha>
           <button
             v-if="!sending"
             class="btn btn-primary m-1"
             :disabled="0 === countName || !validName"
-            @click="validateName"
+            @click="submit"
           >
             {{ $t('Validate') }}
           </button>
@@ -63,9 +73,13 @@
 import Constants from '../../../../public/config';
 import { state } from '../../../store/paramStore';
 import api from '@/api/initialize';
-import { defineComponent } from 'vue'
+import { VueRecaptcha } from 'vue-recaptcha';
+import { defineComponent } from 'vue';
 export default defineComponent({
   name: 'AddCommentModal',
+  components:{
+    VueRecaptcha
+  },
 
   props: {},
   emits: ['close','validate'],
@@ -74,8 +88,8 @@ export default defineComponent({
     return {
       name: '' as string,
       sending: false as boolean,
-      needVerify: true as boolean,
       sendError: false as boolean,
+      isVerify: false as boolean,
       maxName : Constants.MAX_COMMENT_NAME as number
     };
   },
@@ -97,34 +111,26 @@ export default defineComponent({
     },
   },
 
-  mounted() {
-    this.displayCaptcha('block');
+  created() {
     this.initAuthenticatedName();
   },
-  unmounted() {
-    this.displayCaptcha('none');
-  },
   methods: {
     initAuthenticatedName():void{
       if (!state.generalParameters.authenticated) { return; }
       this.name = (`${this.$store.state.profile.firstname||''} ${this.$store.state.profile.lastname||''}`).trim();
-      this.needVerify = false;
+      this.isVerify = true;
+    },
+    async handleSuccess(token: string) {
+      this.isVerify = await api.checkToken(token);
+      this.sendComment();
     },
-    displayCaptcha(displayStyle: string): void{
-      const captcha = document.getElementsByClassName('grecaptcha-badge')[0];
-      if (!captcha) {return;}
-      (captcha as HTMLElement).style.display = displayStyle;
+    handleError() {
+      this.isVerify = false;
+      this.sendError = true;
     },
-    async validateName(): Promise<void> {
-      if (this.needVerify && this.isCaptchaTest) {
-        try {
-          await this.$recaptchaLoaded()
-          const token = await this.$recaptcha('login');
-          this.sendError = !await api.checkToken(token);
-        } catch {
-          this.sendError = true;
-        }
-        if(this.sendError){return;}
+    async submit(): Promise<void> {
+      if (!this.isVerify && !this.isCaptchaTest) {
+        return (this.$refs.invisibleRecaptcha as InstanceType<typeof VueRecaptcha>).execute();
       }
       this.sendComment();
     },

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

@@ -85,6 +85,12 @@
               {{ podcast.organisation.name }}
             </router-link>
           </div>
+          <div v-if="''!==photoCredit">
+            {{ $t('Photo credits') + " : "+ photoCredit }}
+          </div>
+          <div v-if="''!==audioCredit">
+            {{ $t('Audio credits') + " : "+ audioCredit }}
+          </div>
           <a
             v-if="podcast.article"
             class="btn d-flex align-items-center my-2 width-fit-content"
@@ -224,6 +230,12 @@ export default defineComponent({
     podcastNotValid(): boolean {
       return undefined!==this.podcast?.availability && false === this.podcast?.valid;
     },
+    photoCredit():string{
+      return (this.podcast?.annotations?.photoCredit as string) ?? '';
+    },
+    audioCredit():string{
+      return (this.podcast?.annotations?.audioCredit as string) ?? '';
+    }
   },
   methods: {
     playPodcast(podcast: Podcast): void {

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

@@ -4,7 +4,12 @@
       ref="rubriqueListContainer"
       class="rubrique-list-container"
     >
+      <label
+        for="rubrique-list-select"
+        class="hid"
+      >{{$t('By topic')}}</label>
       <select
+        id="rubrique-list-select"
         v-model="rubriquage"
         class="c-hand"
         @change="onRubriquageSelected"

package/src/components/pages/Category.vue

@@ -23,12 +23,6 @@ export default defineComponent({
     iabId: { default: undefined, type: Number},
   },
 
-  data() {
-    return {
-      title: '' as string,
-    };
-  },
-
   computed: {
     categories(): Array<Category> {
       return this.$store.state.categories;
@@ -36,22 +30,11 @@ export default defineComponent({
     filterOrga(): string {
       return this.$store.state.filter.organisationId;
     },
-  },
-  watch: {
-    iabId(): void {
-      this.extractTitle();
-    },
-  },
-
-  mounted() {
-    this.extractTitle();
-  },
-  methods: {
-    extractTitle(): void {
+    title():string{
       const matchCategories = this.categories.filter((c: Category) => c.id === this.iabId);
-      if (1 !== matchCategories.length) return;
-      this.title = matchCategories[0]['name'];
-    },
+      if (1 !== matchCategories.length) return "";
+      return matchCategories[0]['name'];
+    }
   },
 })
 </script>

package/src/locale/de.ts

@@ -307,4 +307,6 @@ export default{
   "Warning":"Warnung",
   "Visual":"Bild von {name}",
   "If the transcript is available, show it":"Wenn die Abschrift vorhanden ist, zeigen Sie sie",
+  "Photo credits":"Bildnachweis",
+  "Audio credits":"Audio-Credits",
 }

package/src/locale/en.ts

@@ -314,4 +314,6 @@ export default{
   "Warning":"Warning",
   "Visual":"Visual of {name}",
   "If the transcript is available, show it":"If the transcript is available, show it",
+  "Photo credits":"Photo credits",
+  "Audio credits":"Audio credits",
 };

package/src/locale/es.ts

@@ -307,4 +307,6 @@ export default{
   "Warning":"Advertencia",
   "Visual":"Imagen de {name}",
   "If the transcript is available, show it":"Si la transcripción está disponible, muéstrela",
+  "Photo credits":"Créditos fotográficos",
+  "Audio credits":"Créditos de audio",
 }

package/src/locale/fr.ts

@@ -314,4 +314,6 @@ export default{
   "Warning":"Avertissement",
   "Visual":"Visuel de {name}",
   "If the transcript is available, show it":"Si la transcription est disponible, l'afficher",
+  "Photo credits":"Crédits photo",
+  "Audio credits":"Crédits audio",
 };

package/src/locale/it.ts

@@ -304,4 +304,6 @@ export default{
     "Warning":"Avvertimento",
     "Visual":"Visiva di {name}",
     "If the transcript is available, show it":"Se la trascrizione è disponibile, mostrala",
+    "Photo credits":"Crediti fotografici",
+    "Audio credits":"Crediti audio",
   };

package/src/locale/sl.ts

@@ -307,4 +307,6 @@ export default{
   "Warning":"Opozorilo",
   "Visual":"Slika od {name}",
   "If the transcript is available, show it":"Če je prepis na voljo, ga pokažite",
+  "Photo credits":"Avtorji fotografij",
+  "Audio credits":"Avdio krediti",
 }

package/src/main.ts

@@ -1,5 +1,4 @@
 import { createApp } from 'vue';
-import { VueReCaptcha } from 'vue-recaptcha-v3';
 import VueLazyLoad from 'vue3-lazyload';
 import App from './App.vue';
 import {setupI18n} from './i18n';
@@ -57,5 +56,4 @@ createApp(App)
 .use(store)
 .use(router)
 .use(VueLazyLoad)
-.use(VueReCaptcha, { siteKey: '6LfyP_4ZAAAAAPODj8nov2LvosIwcX0GYeBSungh' })
 .mount('#app');

package/src/shims-vue-recaptcha-v3.d.ts

@@ -1,9 +0,0 @@
-import { ReCaptchaInstance } from 'recaptcha-v3'
-
-declare module '@vue/runtime-core' {
-  interface ComponentCustomProperties {
-    $recaptcha: (action: string) => Promise<string>
-    $recaptchaLoaded: () => Promise<boolean>
-    $recaptchaInstance: ReCaptchaInstance
-  }
-}