@saooti/octopus-sdk 40.2.10 → 40.2.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saooti/octopus-sdk",
-  "version": "40.2.10",
+  "version": "40.2.11",
   "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/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/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/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",