@saooti/octopus-sdk 40.2.10 → 40.2.12

package/package.json

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

package/src/components/composable/route/useRubriquesFilterParam.ts

@@ -16,17 +16,25 @@ export const useRubriquesFilterParam = ()=>{
       .map((value) => value.rubriquageId + ":" + value.rubriqueId)
       .join();
   }
-
-  function modifyRubriquesFilter(modifyFunction: (a: Array<RubriquageFilter>)=> Array<RubriquageFilter>){
+  function returnValToUpdate(modifyFunction: (a: Array<RubriquageFilter>)=> Array<RubriquageFilter>){
     const newFilter = modifyFunction( Array.from(filterStore.filterRubrique));
     const queryString = stringifyRubriquesFilter(newFilter);
-    const valToUpdate = "" !== queryString ? queryString : undefined;
+    return "" !== queryString ? queryString : undefined;
+  }
+  function modifyRubriquesFilter(modifyFunction: (a: Array<RubriquageFilter>)=> Array<RubriquageFilter>){
+    const valToUpdate = returnValToUpdate(modifyFunction);
     updateFiltersParam({ rubriquesId: valToUpdate }, {r: valToUpdate});
   }
 
+  function returnRubriquesFilter(modifyFunction: (a: Array<RubriquageFilter>)=> Array<RubriquageFilter>){
+    const valToUpdate = returnValToUpdate(modifyFunction);
+    return { rubriquesId: valToUpdate, r: valToUpdate };
+  }
+
 	return {
     stringifyRubriquesFilter,
     modifyRubriquesFilter,
-    updateRouteParamAdvanced
+    updateRouteParamAdvanced,
+    returnRubriquesFilter
 	}
 }

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

@@ -91,16 +91,16 @@ export default defineComponent({
   },
   emits: ["sortChrono", "sortPopular", "displayPrevious", "displayNext"],
   setup(){
-    const { modifyRubriquesFilter } = useRubriquesFilterParam();
+    const { returnRubriquesFilter } = useRubriquesFilterParam();
     const { rubriqueQueryParam } = useRubriquesFilterComputed();
-    return { modifyRubriquesFilter, rubriqueQueryParam }
+    return { returnRubriquesFilter, rubriqueQueryParam }
   },
   data() {
     return {};
   },
 
   computed: {
-    ...mapState(useFilterStore, ["filterIab", "filterRubriquage"]),
+    ...mapState(useFilterStore, ["filterIab", "filterRubriquage", "filterOrgaId"]),
     refTo(): string | RouteLocationRaw {
       if (this.href) return this.href;
       if (this.iabId) {
@@ -114,6 +114,7 @@ export default defineComponent({
         query: {
           iabId: this.filterIab?.id,
           rubriquesId: this.rubriqueQueryParam,
+          productor: this.filterOrgaId
         },
       };
     },
@@ -142,12 +143,7 @@ export default defineComponent({
       }
       event.preventDefault();
       const rubriqueChosenId = this.rubriqueId.at(-1);
-      let filterToAdd: RubriquageFilter = {
-        rubriquageId: 0,
-        rubriqueId: rubriqueChosenId,
-        nameRubriquage: "",
-        nameRubrique: "",
-      };
+      let filterToAdd: RubriquageFilter|undefined;
       if (this.filterRubriquage.length) {
         for (let i = 0, len = this.filterRubriquage.length; i < len; i++) {
           const rubriqueChosen = this.filterRubriquage[i].rubriques.find(
@@ -164,9 +160,19 @@ export default defineComponent({
           }
         }
       }
-      this.modifyRubriquesFilter((a) => {
-        a.push(filterToAdd);
+      if(!filterToAdd){return;}
+      const queries = this.returnRubriquesFilter((a) => {
+        let indexRubriquage = a.findIndex(filter => filter.rubriquageId === filterToAdd.rubriquageId);
+        if (indexRubriquage === -1) {
+          a.push(filterToAdd);
+        } else {
+          a[indexRubriquage] = filterToAdd;
+        }
         return a;
+      })
+      this.$router.push({
+        name: "podcasts",
+        query: {...this.$route.query, ...queries}
       });
     },
   },

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

@@ -133,10 +133,7 @@ export default defineComponent({
   methods: {
     ...mapActions(useFilterStore, ["filterUpdateRubriqueDisplay"]),
     initRubriques(): void {
-      if (!this.rubriquage) {
-        return;
-      }
-      this.filterUpdateRubriqueDisplay(this.rubriquage.rubriques);
+      this.filterUpdateRubriqueDisplay(this.rubriquage?.rubriques ?? []);
       window.addEventListener("resize", this.resizeWindow);
       this.$nextTick(() => {
         this.resizeWindow();

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

@@ -51,7 +51,7 @@
             v-model:insert-code="insertCode"
             :display-is-visible="displayIsVisible"
             :is-podcast-not-visible="isPodcastNotVisible"
-            :chose-number-episode="choseNumberEpisodes"
+            :chose-number-episode="displayChoiceAllEpisodes"
             :display-choice-all-episodes="displayChoiceAllEpisodes"
             :display-transcript-param="displayTranscriptParam"
             :display-article-param="displayArticleParam"
@@ -155,18 +155,14 @@ export default defineComponent({
     displayWaveParam(): boolean {
       return "default" === this.iFrameModel || "emission" === this.iFrameModel;
     },
-    choseNumberEpisodes(): boolean {
-      return this.displayChoiceAllEpisodes || this.isTypeSuggestion;
-    },
     displayIsVisible(): boolean {
-      return this.choseNumberEpisodes || this.isPodcastNotVisible;
+      return this.displayChoiceAllEpisodes || this.isPodcastNotVisible;
     },
     isPodcastNotVisible(): boolean {
       return (
         undefined !== this.podcast &&
         !this.podcast.availability.visibility &&
-        !this.isTypeEmission &&
-        !this.isTypeSuggestion
+        !this.isTypeEmission
       );
     },
     displayArticleParam(): boolean {
@@ -218,12 +214,6 @@ export default defineComponent({
     isLargeEmission(): boolean {
       return "emissionLarge" === this.iFrameModel;
     },
-    isTypeSuggestion(): boolean {
-      return (
-        "largeSuggestion" === this.iFrameModel ||
-        "SUGGESTION" === this.typeCustomPlayer
-      );
-    },
     isTypeEmission(): boolean {
       return (
         this.isEmission ||
@@ -272,8 +262,6 @@ export default defineComponent({
           url.push(
             `${this.emission.emissionId}${iFrameNumber}/${this.podcast.podcastId}`,
           );
-        } else if (this.isTypeSuggestion) {
-          url.push(`${this.podcast.podcastId}${iFrameNumber}`);
         } else {
           url.push(`${this.podcast.podcastId}`);
         }
@@ -290,10 +278,9 @@ export default defineComponent({
         case "largeMore":
           return "210px";
         case "emissionLarge":
-        case "largeSuggestion":
           return "350px";
         case "emission":
-          return "520px";
+          return "540px";
         case "videoLive":
           return "450px";
         default:

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

@@ -85,10 +85,10 @@ export default defineComponent({
           condition: this.isVideoPodcast,
         },
         { name: this.$t("Default version"), value: "default", condition: true },
-        { name: this.$t("Large version"), value: "large", condition: true },
+        { name: this.$t("Large version"), value: "largeMore", condition: this.podcast?.podcastId, },
         {
-          name: this.$t("Full Large version"),
-          value: "largeMore",
+          name: this.$t("Minimalist length version"),
+          value: "large",
           condition: this.podcast?.podcastId,
         },
         {
@@ -101,18 +101,12 @@ export default defineComponent({
           value: "emissionLarge",
           condition: this.podcast?.podcastId,
         },
-        {
-          name: this.$t("Large suggestion version"),
-          value: "largeSuggestion",
-          condition: this.podcast?.podcastId,
-        },
       ];
     },
     customPlayersDisplay(): Array<CustomPlayer> {
       return this.customPlayers.filter((player: CustomPlayer) => {
         return (
-          (("EPISODE" === player.typePlayer ||
-            "SUGGESTION" === player.typePlayer) &&
+          (("EPISODE" === player.typePlayer) &&
             this.podcast?.podcastId) ||
           ("EMISSION" === player.typePlayer &&
             this.emission &&
@@ -214,14 +208,10 @@ export default defineComponent({
         this.fetchCustomPlayers("EMISSION");
       } else {
         const episodeSelected = await this.fetchCustomPlayers("EPISODE");
-        const emissionSelected = await this.fetchCustomPlayers(
+        await this.fetchCustomPlayers(
           "EMISSION",
           !episodeSelected,
         );
-        await this.fetchCustomPlayers(
-          "SUGGESTION",
-          !episodeSelected && !emissionSelected,
-        );
       }
     },
   },

package/src/components/misc/HomeDropdown.vue

@@ -36,7 +36,7 @@
         <ul class="p-0 m-0">
           <template v-if="!isAuthenticated">
             <li class="li-style-none">
-              <a class="octopus-dropdown-item" href="/sso/login" realLink="true">
+              <a class="octopus-dropdown-item" :href="pathLogin" realLink="true">
                 {{ $t("Login") }}
               </a>
             </li>
@@ -109,6 +109,7 @@ import { useAuthStore } from "../../stores/AuthStore";
 import { mapState } from "pinia";
 import { defineComponent } from "vue";
 import { Organisation } from "@/stores/class/general/organisation";
+import { useApiStore } from "../../stores/ApiStore";
 export default defineComponent({
   name: "HomeDropdown",
   components: {
@@ -131,6 +132,10 @@ export default defineComponent({
       "isRoleContribution",
       "isRoleOrganisation",
     ]),
+    ...mapState(useApiStore, ["frontendUrl"]),
+    pathLogin(){
+      return "/sso/login?redirect_url="+encodeURI(this.frontendUrl + this.$route.fullPath);
+    },
     organisationsAvailable(): Array<Organisation> {
       return this.authProfile.organisations ?? [];
     },

package/src/components/misc/MobileMenu.vue

@@ -37,7 +37,7 @@
       <a
         v-if="!isAuthenticatedWithOrga"
         class="octopus-dropdown-item"
-        href="/sso/login"
+        :href="pathLogin"
         realLink="true"
       >
         {{ $t("Login") }}
@@ -64,6 +64,7 @@ import { defineComponent, defineAsyncComponent } from "vue";
 import { useFilterStore } from "../../stores/FilterStore";
 import { useAuthStore } from "../../stores/AuthStore";
 import { mapState } from "pinia";
+import { useApiStore } from "../../stores/ApiStore";
 const ClassicPopover = defineAsyncComponent(
   () => import("../misc/ClassicPopover.vue"),
 );
@@ -91,9 +92,13 @@ export default defineComponent({
   computed: {
     ...mapState(useAuthStore, ["authOrgaId", "isGarRole"]),
     ...mapState(useFilterStore, ["filterLive", "filterOrgaId", "filterIab"]),
+    ...mapState(useApiStore, ["frontendUrl"]),
     isAuthenticatedWithOrga(): boolean {
       return undefined !== this.authOrgaId;
     },
+    pathLogin(){
+      return "/sso/login?redirect_url="+encodeURI(this.frontendUrl + this.$route.fullPath);
+    },
     routerLinkArray() {
       return [
         {

package/src/components/misc/TopBarMainContent.vue

@@ -4,10 +4,7 @@
       class="top-bar-logo d-flex align-items-center"
       :to="{
         name: 'home',
-        query: {
-          iabId: filterIab?.id,
-          rubriquesId: rubriqueQueryParam,
-        },
+        query: getQueriesRouter('home'),
       }"
       :title="$t('Home')"
     >
@@ -274,7 +271,7 @@ export default defineComponent({
   },
   methods: {
     getQueriesRouter(routeName: string) {
-      if ("podcasts" !== routeName && "emissions" !== routeName) {
+      if ("podcasts" !== routeName && "emissions" !== routeName  && "home" !== routeName) {
         return { productor: this.filterOrgaId };
       }
       return {

package/src/components/pages/Error403Page.vue

@@ -25,11 +25,12 @@
     <a v-if="authOrgaId" class="btn btn-primary" href="/logout">
       {{ authText }}
     </a>
-    <a v-else class="btn btn-primary" href="/sso/login">{{ authText }}</a>
+    <a v-else class="btn btn-primary" :href="pathLogin">{{ authText }}</a>
   </section>
 </template>
 
 <script lang="ts">
+import { useApiStore } from "../../stores/ApiStore";
 import { useAuthStore } from "../../stores/AuthStore";
 import { mapState } from "pinia";
 import { defineComponent } from "vue";
@@ -37,9 +38,13 @@ export default defineComponent({
   name: "Error403Page",
   computed: {
     ...mapState(useAuthStore, ["authOrgaId"]),
+    ...mapState(useApiStore, ["frontendUrl"]),
     authText(): string {
       return this.authOrgaId ? this.$t("Logout") : this.$t("Login");
     },
+    pathLogin(){
+      return "/sso/login?redirect_url="+encodeURI(this.frontendUrl + this.$route.fullPath);
+    },
   },
 });
 </script>

package/src/components/pages/HomePage.vue

@@ -44,6 +44,7 @@
             query: {
               iabId: filterIab?.id,
               rubriquesId: rubriqueQueryParam,
+              productor: filterOrgaId
             },
           }"
           class="btn btn-primary align-self-center w-fit-content mt-5 m-auto"

package/src/components/pages/PageNotFound.vue

@@ -13,6 +13,7 @@
           query: {
             iabId: filterStore.filterIab?.id,
             rubriquesId: rubriqueQueryParam,
+            productor: filterStore.filterOrgaId
           },
         }"
       >

package/src/locale/de.ts

@@ -124,7 +124,6 @@ export default {
   "Large version": "Großer Player",
   "Emission version": "Player für Reihe",
   "Large emission version": "Großer Player für Reihe",
-  "Large suggestion version": "Großer Player mit Hörvorschlägen",
   "Embed link": "Miniplayer einbetten",
   "Embedly link": "Link zum Player",
   "Direct link": "Link zum Audio",
@@ -330,7 +329,7 @@ export default {
   "List":"Aufführen",
   "Display HTML":"HTML anzeigen",
   "Video is unavailable":"Video ist nicht verfügbar",
-  'Full Large version': 'Vollständige große Version',
+  'Minimalist length version': 'Version mit minimalistischer Länge',
   "Show only episodes with video":"Nur Episoden mit Video anzeigen",
   "Video":"Video",
   "Video Version":"Videoversion",

package/src/locale/en.ts

@@ -124,7 +124,6 @@ export default {
   "Large version": "Large version",
   "Emission version": "Series version",
   "Large emission version": "Large series version",
-  "Large suggestion version": "Large suggestion version",
   "Embed link": "Embed miniplayer",
   "Embedly link": "Player link",
   "Direct link": "Audio link",
@@ -333,7 +332,7 @@ export default {
   "List":"List",
   "Display HTML":"Display HTML",
   "Video is unavailable":"Video is unavailable",
-  'Full Large version': 'Full large version',
+  'Minimalist length version': 'Versión de longitud minimalista',
   "Show only episodes with video":"Show only episodes with video",
   "Video":"Video",
   "Video Version":"Video version",

package/src/locale/es.ts

@@ -123,7 +123,6 @@ export default {
   "Large version": "Versión ampliada",
   "Emission version": "Versión de programa",
   "Large emission version": "Versión de programa ampliada",
-  "Large suggestion version": "Versión con sugerencias ampliada",
   "Embed link": "Integrar minirreproductor",
   "Embedly link": "Enlace al reproductor",
   "Direct link": "Enlace de audio",
@@ -331,7 +330,7 @@ export default {
   "List":"Lista",
   "Display HTML":"Mostrar HTML",
   "Video is unavailable":"El vídeo no está disponible",
-  'Full Large version': 'Versión grande completa',
+  'Minimalist length version': 'Versión grande completa',
   "Show only episodes with video":"Mostrar solo episodios con video",
   "Video":"Video",
   "Video Version":"Versión de vídeo",

package/src/locale/fr.ts

@@ -124,7 +124,6 @@ export default {
   "Large version": "Version en longueur",
   "Emission version": "Version émission",
   "Large emission version": "Version large émission",
-  "Large suggestion version": "Version large suggestion",
   "Embed link": "Player intégré",
   "Embedly link": "Lien player",
   "Direct link": "Lien audio",
@@ -340,7 +339,7 @@ export default {
   "List":"Liste",
   "Display HTML":"Afficher HTML",
   "Video is unavailable":"La vidéo est indisponible",
-  'Full Large version': 'Version en longueur complète',
+  'Minimalist length version': 'Version en longueur minimaliste',
   "Show only episodes with video":"Afficher uniquement les épisodes avec une vidéo",
   "Video":"Vidéo",
   "Video Version":"Version vidéo",

package/src/locale/it.ts

@@ -120,7 +120,6 @@ export default{
     'Large version': 'Versione estesa', 
     'Emission version': 'Versione della serie', 
     'Large emission version': 'Versione estesa della serie',
-    'Large suggestion version': 'Versione estesa consigliata',
     'Embed link': 'Inserisci lettore',
     'Embedly link': 'Player link',
     'Direct link': 'Audio link',
@@ -327,7 +326,7 @@ export default{
   "List":"Elenco",
   "Display HTML":"Visualizza HTML",
   "Video is unavailable":"Il video non è disponibile",
-  'Full Large version': 'Versione completa di grandi dimensioni',
+  'Minimalist length version': 'Versione di lunghezza minimalista',
   "Show only episodes with video":"Mostra solo episodi con video",
   "Video":"Video",
   "Video Version":"Versione video",

package/src/locale/sl.ts

@@ -121,7 +121,6 @@ export default {
   "Large version": "Velika različica",
   "Emission version": "Različica oddaje",
   "Large emission version": "Velika različica oddaje",
-  "Large suggestion version": "Velika različica predlogov prevajanja",
   "Embed link": "Vgradi mini predvajalnik",
   "Embedly link": "Povezava do predvajalnika",
   "Direct link": "Povezava do zvočnega posnetka",
@@ -322,7 +321,7 @@ export default {
   "List":"Seznam",
   "Display HTML":"Prikaži HTML",
   "Video is unavailable":"Videoposnetek ni na voljo",
-  'Full Large version': 'Popolna velika različica',
+  'Minimalist length version': 'Minimalistična različica dolžine',
   "Show only episodes with video":"Prikaži samo epizode z videom",
   "Video":"Video",
   "Video Version":"Video različica",

package/src/router/router.ts

@@ -97,7 +97,7 @@ const routes: Array<RouteRecordRaw> = [
       routeValidity:route.query.vl ?? "",
       routeOnlyVideo:route.query.v ?? "",
       routeOrga:route.query.o,
-      routeRubriques :route.query.r,
+      routeRubriques :route.query.r ?? route.query.rubriquesId,
     }),
     meta:{
       title: "Podcasts",
@@ -118,7 +118,7 @@ const routes: Array<RouteRecordRaw> = [
       routeFrom: route.query.from,
       routeTo: route.query.to,
       routeOrga:route.query.o,
-      routeRubriques :route.query.r,
+      routeRubriques :route.query.r ?? route.query.rubriquesId,
     }),
     meta:{
       title: "Emissions",