@saooti/octopus-sdk 41.0.14-SNAPSHOT → 41.0.15

package/src/components/misc/player/radio/RadioHistory.vue

@@ -40,10 +40,10 @@ import ChevronLeftIcon from "vue-material-design-icons/ChevronLeft.vue";
 import ChevronRightIcon from "vue-material-design-icons/ChevronRight.vue";
 import { usePlayerStore } from "../../../../stores/PlayerStore";
 import dayjs from "dayjs";
-import radioHelper from "../../../../helper/radio/radioHelper";
 import { computed, nextTick, onMounted, onUnmounted, ref, useTemplateRef, watch } from "vue";
 import { MediaRadio } from "@/stores/class/general/player";
 import { useI18n } from "vue-i18n";
+import { useFetchRadio } from "../../../composable/radio/usefetchRadioData";
 
 
 //Data 
@@ -54,6 +54,7 @@ const historyListContainerRef = useTemplateRef('historyListContainer');
 //Composables
 const { t } = useI18n();
 const playerStore = usePlayerStore();
+const {displayTitle} = useFetchRadio();
 
 
 //Computed
@@ -119,7 +120,7 @@ function displayPreviousItem(item: MediaRadio): string {
   if (item.podcastId) {
     return item.title;
   }
-  return radioHelper.displayTitle(item);
+  return displayTitle(item);
 }
 </script>
 <style lang="scss">

package/src/components/misc/player/video/PlayerVideo.vue

@@ -39,10 +39,10 @@ const playerStore = usePlayerStore();
 //Computed
 const isSecured = computed(() => "SECURED" === playerStore.playerLive?.organisation?.privacy);
 const hlsVideoUrl = computed(() => {
-  if (!playerStore.playerLive) {
+  if (!playerStore.playerHlsIdentifier) {
     return "";
   }
-  return `${apiStore.hlsUrl}live/video_dev.${playerStore.playerLive.conferenceId}/index.m3u8`;
+  return `${apiStore.hlsUrl}live/video_${playerStore.playerHlsIdentifier}/index.m3u8`;
 });
 
 onMounted(()=>{

package/src/components/pages/HomePage.vue

@@ -14,7 +14,7 @@
           :button-text="t('All podcast button', { name: c.name })"
         />
         <template #preview>
-          <div style="min-height: 650px"></div>
+          <div style="min-height: 650px" />
         </template>
       </ClassicLazy>
     </template>
@@ -33,7 +33,7 @@
           :button-text="t('All podcast button', { name: r.name })"
         />
         <template #preview>
-          <div style="min-height: 650px"></div>
+          <div style="min-height: 650px" />
         </template>
       </ClassicLazy>
       <template v-if="rubriqueDisplay && rubriqueDisplay.length > 0">
@@ -43,7 +43,7 @@
             name: 'podcasts',
             query: {
               iabId: filterStore.filterIab?.id,
-              rubriquesId: rubriqueQueryParam.value,
+              rubriquesId: rubriqueQueryParam,
               productor: filterStore.filterOrgaId
             },
           }"
@@ -129,8 +129,9 @@ const categories = computed(() => {
     });
   } else {
     arrayCategories = generalStore.storedCategories.filter((c: Category) => {
-      if (state.generalParameters.podcastmaker)
+      if (state.generalParameters.podcastmaker) {
         return c.podcastOrganisationCount;
+      }
       return c.podcastCount;
     });
   }

package/src/components/pages/PageLogout.vue

@@ -1,6 +1,6 @@
 <template>
   <section
-    class="page-box page-box-absolute page-logout"
+    class="page-box page-box-absolute page-logout bg-gradient"
   >
     <div class="logout-section">
       <h1 class="mb-3">{{ t("Logout") }}</h1>
@@ -19,11 +19,6 @@ const { t } = useI18n();
 </script>
 <style lang="scss">
 .octopus-app .page-logout {
-  background: linear-gradient(
-    90deg,
-    var(--octopus-primary) 0%,
-    var(--octopus-tertiary) 100%
-  );
   display: flex;
   align-items: center;
   justify-content: center;

package/src/components/pages/PodcastPage.vue

@@ -255,7 +255,6 @@ async function fetchConferenceStatus() {
       api: 9,
       path: "conference/info/" + podcast.value?.conferenceId,
     });
-
     fetchConference.value = {...fetchConference.value, ...data};
   } catch {
     //Do nothing

package/src/components/pages/PodcastsPage.vue

@@ -38,6 +38,7 @@
     />
   </section>
 </template>
+
 <script setup lang="ts">
 import PodcastList from "../display/podcasts/PodcastList.vue";
 import ProductorSearch from "../display/filter/ProductorSearch.vue";
@@ -85,7 +86,6 @@ const {
   isInit
 } = useAdvancedParamInit(props, false);
 
-
 //Computed
 const orgaArray = computed(() => organisationId.value ? [organisationId.value] : []);
 const withVideo = computed(() => false === onlyVideo.value ? undefined : true);

package/src/components/pages/VideoPage.vue

@@ -193,7 +193,7 @@ const hlsVideoUrl = computed(() => {
   if (!recordingLive.value || !podcastConference.value) {
     return "";
   }
-  return `${apiStore.hlsUrl}live/video_dev.${podcastConference.value.conferenceId}/index.m3u8`;
+  return `${apiStore.hlsUrl}live/video_${podcastConference.value.hlsIdentifier}/index.m3u8`;
 });
 const isSecured = computed(() => {
   return "SECURED" === podcast.value?.organisation?.privacy;
@@ -255,7 +255,10 @@ async function getPodcastDetails(): Promise<void> {
         playerStore.playerPlay(
           {
             ...podcast.value,
-            ...{ conferenceId: podcast.value.conferenceId },
+            ...{ 
+              conferenceId: podcast.value.conferenceId,
+              hlsIdentifier: podcastConference.value?.hlsIdentifier,
+            },
           },
           true,
         );

package/src/helper/equals.ts

@@ -0,0 +1,26 @@
+export function deepEqual(obj1: any, obj2: any) {
+
+    if(obj1 === obj2) // it's just the same object. No need to compare.
+        {return true;}
+
+    if(isPrimitive(obj1) && isPrimitive(obj2)) // compare primitives
+        {return obj1 === obj2;}
+
+    if(Object.keys(obj1).length !== Object.keys(obj2).length) {
+        return false;
+    }
+
+    // compare objects with same number of keys
+    for(const key in obj1)
+    {
+        if(!(key in obj2)) {return false;} //other object doesn't have this prop
+        if(!deepEqual(obj1[key], obj2[key])) {return false;}
+    }
+
+    return true;
+}
+
+//check if value is primitive
+function isPrimitive(obj: unknown) {
+    return (obj !== Object(obj));
+}

package/src/locale/de.ts

@@ -57,6 +57,9 @@ export default {
   "Type string to filter by organisation": "Nach Organisation filtern",
   "Type string to filter by emission": "Nach Reihe filtern",
   "Type string to filter by podcast": "Nach Podcast filtern",
+  "Type string to filter by categories": "Nach Kategorien filtern",
+  "Type string to filter by rubrics": "Nach Rubriken filtern",
+  "Enter name of topic": "Geben Sie den Titel ein \"{topic}\"",
   "No organisation filter": "Keine Organisation",
   "No emission filter": "Keine Reihe",
   "No podcast filter": "Kein Podcast",
@@ -74,7 +77,6 @@ export default {
   Duration: "Dauer: {duration}",
   Animator: "Autor",
   "No category filter": "Keine Kategorie",
-  "Type string to filter by categories": "Nach Kategorien filtern",
   Search: "Suche",
   Close: "Schließen",
   Embed: "Player",
@@ -131,7 +133,6 @@ export default {
   Advertising: "Werbung",
   "By topic": "Nach Thema",
   "By rubric": "Nach Rubrik",
-  "Type string to filter by rubrics": "Nach Rubriken filtern",
   "No rubric filter": "Keine Rubrik",
   "From the :": "Vom:",
   "To the :": "Bis zum:",
@@ -146,8 +147,8 @@ export default {
   "Sort score": "Nach Relevanz",
   "Sort name": "Nach Titel",
   "Sort last": "Nach Datum",
-  "Choose color": "Farbe wählen",
-  "Choose theme": "Design wählen",
+  "Choose color": "Akzentfarbe",
+  "Choose theme": "Thema (Spielerhintergrund)",
   "Podcast no visible": "Podcast nicht sichtbar",
   "Display episodes": "Folgen anzeigen",
   "Podcast published in future": "Podcast geplant",
@@ -167,7 +168,6 @@ export default {
   "open left Menu": "Menü öffnen/schließen",
   Participant: "Sprecher",
   "Number of player podcasts": "Anzahl der Podcasts im Player",
-  "Proceed reading": "Weiterhören",
   "Without topic": "Ohne Thema",
   "Without rubric": "Ohne Rubrik",
   "Consider podcasts no visible":
@@ -414,4 +414,5 @@ export default {
   "Code copied!":"Code kopiert!",
   "Copied!":"Kopiert!",
   "Color of the QR Code": "Farbe des QR-Codes",
+  "Silent stream":"Stiller Fluss",
 }

package/src/locale/en.ts

@@ -58,6 +58,9 @@ export default {
   "Type string to filter by organisation": "Filter by organization",
   "Type string to filter by emission": "Filter by series",
   "Type string to filter by podcast": "Filter by podcast",
+  "Type string to filter by categories": "Filter categories by title",
+  "Type string to filter by rubrics": "Filter by rubrics",
+  "Enter name of topic": "Enter name of \"{topic}\"",
   "No organisation filter": "No organization filter",
   "No emission filter": "No series filter",
   "No podcast filter": "No podcast filter",
@@ -75,7 +78,6 @@ export default {
   Duration: "Duration : {duration}",
   Animator: "Host",
   "No category filter": "No category filter",
-  "Type string to filter by categories": "Filter categories by title",
   Search: "Search",
   Close: "Close",
   Embed: "Player",
@@ -131,7 +133,6 @@ export default {
   Advertising: "Advertising",
   "By topic": "By topic",
   "By rubric": "By rubric",
-  "Type string to filter by rubrics": "Filter by rubrics",
   "No rubric filter": "No rubric filter",
   "From the :": "From the :",
   "To the :": "To the :",
@@ -145,8 +146,8 @@ export default {
   "Sort score": "Sorted by relevancy score",
   "Sort name": "Sorted title",
   "Sort last": "Sorted last",
-  "Choose color": "Choose color",
-  "Choose theme": "Choose theme",
+  "Choose color": "Accent color",
+  "Choose theme": "Theme (player background)",
   "Podcast no visible": "Podcast not visible",
   "Display episodes": "Display episodes",
   "Podcast published in future": "Podcast published in the future",
@@ -166,7 +167,6 @@ export default {
   "open left Menu": "Open/Close Menu",
   Participant: "Speaker",
   "Number of player podcasts": "Number of podcasts in the player ",
-  "Proceed reading": "Continue Listening",
   "Without topic": "Without a topic",
   "Without rubric": "Without a rubric",
   "Consider podcasts no visible":
@@ -417,4 +417,5 @@ export default {
   "Code copied!":"Code copied!",
   "Copied!":"Copied!",
   "Color of the QR Code": "Color of the QR Code",
+  "Silent stream":"Silent stream",
 };

package/src/locale/es.ts

@@ -57,6 +57,9 @@ export default {
   "Type string to filter by organisation": "Filtrar por organización",
   "Type string to filter by emission": "Filtrar por programa",
   "Type string to filter by podcast": "Filtrar por pódcast",
+  "Type string to filter by categories": "Filtrar las categorías por título",
+  "Type string to filter by rubrics": "Filtrar por sección",
+  "Enter name of topic": "Introduzca el título de",
   "No organisation filter": "Sin filtro de organización",
   "No emission filter": "Sin filtro de programa",
   "No podcast filter": "Sin filtro de pódcast",
@@ -74,7 +77,6 @@ export default {
   Duration: "Duración: {duration}",
   Animator: "Presentador/a",
   "No category filter": "Sin filtro de categoría",
-  "Type string to filter by categories": "Filtrar las categorías por título",
   Search: "Buscar",
   Close: "Cerrar",
   Embed: "Reproductor",
@@ -130,7 +132,6 @@ export default {
   Advertising: "Publicidad",
   "By topic": "Por tema",
   "By rubric": "Por sección",
-  "Type string to filter by rubrics": "Filtrar por sección",
   "No rubric filter": "Sin filtro de sección",
   "From the :": "De:",
   "To the :": "A:",
@@ -145,8 +146,8 @@ export default {
   "Sort score": "Clasificación por pertinencia",
   "Sort name": "Clasificación por título",
   "Sort last": "Clasificación por fecha más reciente",
-  "Choose color": "Elegir color",
-  "Choose theme": "Elegir tema",
+  "Choose color": "Color de acento",
+  "Choose theme": "Tema (fondo del jugador)",
   "Podcast no visible": "Este pódcast no puede visualizarse",
   "Display episodes": "Mostrar episodios",
   "Podcast published in future": "Pódcast pendiente de publicación",
@@ -167,7 +168,6 @@ export default {
   "open left Menu": "Abrir/Cerrar menú",
   Participant: "Participante",
   "Number of player podcasts": "Número de pódcast en el reproductor",
-  "Proceed reading": "Seguir escuchando",
   "Without topic": "Sin tema",
   "Without rubric": "Sin sección",
   "Consider podcasts no visible":
@@ -415,4 +415,5 @@ export default {
   "Code copied!":"¡Código copiado!",
   "Copied!":"¡Copiado!",
   "Color of the QR Code": "Color del código QR",
+  "Silent stream":"Flujo silencioso",
 }

package/src/locale/fr.ts

@@ -58,6 +58,9 @@ export default {
   "Type string to filter by organisation": "Filtrer les producteurs par nom",
   "Type string to filter by emission": "Filtrer les émissions par titre",
   "Type string to filter by podcast": "Filtrer les épisodes par titre",
+  "Type string to filter by rubrics": "Filtrer les rubriques",
+  "Type string to filter by categories": "Filtrer les thématiques par intitulé",
+  "Enter name of topic": "Saisir l'intitulé de \"{topic}\"",
   "No organisation filter": "Tous les producteurs",
   "No emission filter": "Toutes les émissions",
   "No podcast filter": "Tous les épisodes",
@@ -74,7 +77,6 @@ export default {
   Duration: "Durée : {duration}",
   Animator: "Intervenant",
   "No category filter": "Toutes les thématiques",
-  "Type string to filter by categories": "Filtrer les thématiques par intitulé",
   Search: "Rechercher",
   Close: "Fermer",
   Embed: "Player",
@@ -131,7 +133,6 @@ export default {
   Advertising: "Publicité",
   "By topic": "Selon rubriquage",
   "By rubric": "Par rubrique",
-  "Type string to filter by rubrics": "Filtrer les rubriques",
   "No rubric filter": "Toutes les rubriques",
   "From the :": "Depuis le :",
   "To the :": "Jusqu'au :",
@@ -146,8 +147,8 @@ export default {
   "Sort score": "Pertinence",
   "Sort name": "Alphabétique",
   "Sort last": "Antéchronologique",
-  "Choose color": "Couleur",
-  "Choose theme": "Thème",
+  "Choose color": "Couleur d'accent",
+  "Choose theme": "Thème (fond du player)",
   "Podcast no visible": "Épisode non visible actuellement",
   "Display episodes": "Affichage des épisodes",
   "Podcast publish in future": "Épisode publié dans le futur",
@@ -168,7 +169,6 @@ export default {
   "open left Menu": "Ouvrir/Fermer le menu",
   Participant: "Intervenant",
   "Number of player podcasts": "Nombre d'épisodes dans le miniplayer",
-  "Proceed reading": "Poursuivre la lecture",
   "Without topic": "Sans rubriquage",
   "Without rubric": "Non rubriqué",
   "Consider podcasts no visible":
@@ -424,4 +424,5 @@ export default {
   "Code copied!":"Code copié !",
   "Copied!":"Copié !",
   "Color of the QR Code": "Couleur du Qr Code",
+  "Silent stream":"Flux silencieux",
 };

package/src/locale/it.ts

@@ -56,6 +56,9 @@ export default{
     'Type string to filter by organisation': 'Filtra per organizzazione', 
     'Type string to filter by emission': 'Filtra per serie', 
     'Type string to filter by podcast': 'Filtra per podcast', 
+    'Type string to filter by categories': 'Filtra la categoria tramite il titolo', 
+    'Type string to filter by rubrics': 'Filtra per rubriche',
+    'Enter name of topic': 'Inserisci il titolo di {topic}',
     'No organisation filter': 'Nessun filtro per organizzazione', 
     'No emission filter': 'Nessun filtro per serie', 
     'No podcast filter': 'Nessun filtro per podcast', 
@@ -71,7 +74,6 @@ export default{
     Duration: 'Durata: {duration}', 
     Animator: 'Host',
     'No category filter': 'Nessun filtro per la categoria', 
-    'Type string to filter by categories': 'Filtra la categoria tramite il titolo', 
     Search: 'Ricerca', 
     Close: 'Chiudi', 
     Embed: 'Player',
@@ -127,7 +129,6 @@ export default{
     Advertising: 'Pubblicità',
     'By topic': 'Per tema',
     'By rubric': 'Per rubrica',
-    'Type string to filter by rubrics': 'Filtra per rubriche',
     'No rubric filter': 'No filtri rubrica',
     'From the :': 'Dal :',
     'To the :': "Al :",
@@ -141,8 +142,8 @@ export default{
     'Sort score': 'Suddiviso per grado di rilevanza',
     'Sort name': 'Suddividi titolo',
     'Sort last': 'Suddividi ultimo',
-    'Choose color': 'Seleziona colore',
-    'Choose theme': 'Seleziona tema',
+    'Choose color': 'Colore accento',
+    'Choose theme': 'Tema (sfondo del giocatore)',
     'Podcast no visible': 'Podcast non visibile',
     'Display episodes': 'Mostra episodi',
     'Podcast published in future': 'Podcast pubblicato in futuro',
@@ -163,7 +164,6 @@ export default{
     'open left Menu': 'Apri/Chiudi Menu',
     Participant: 'Speaker',
     'Number of player podcasts': "Numero di podcast nel lettore",
-    'Proceed reading': 'Continua ad ascoltare',
     'Without topic': 'Senza un tema',
     'Without rubric': 'Senza una rubrica',
     'Consider podcasts no visible':
@@ -411,4 +411,5 @@ export default{
   "Code copied!":"Codice copiato!",
   "Copied!":"Copiato!",
   "Color of the QR Code": "Colore del codice QR",
+  "Silent stream":"Flusso silenzioso",
 };

package/src/locale/sl.ts

@@ -56,6 +56,9 @@ export default {
   "Type string to filter by organisation": "Išči po organizaciji",
   "Type string to filter by emission": "Išči po oddaji",
   "Type string to filter by podcast": "Išči po podkastu",
+  "Type string to filter by categories": "Razvrsti po kategorijah",
+  "Type string to filter by rubrics": "Razvrsti po rubrikah",
+  "Enter name of topic": "Vnesite naslov {topic}",
   "No organisation filter": "Brez filtra za organizacije",
   "No emission filter": "Brez filtra za oddaje",
   "No podcast filter": "Brez filtra za podkaste",
@@ -72,7 +75,6 @@ export default {
   Duration: "Trajanje: {duration}",
   Animator: "Napovedovalec",
   "No category filter": "Brez filtra za kategorijo",
-  "Type string to filter by categories": "Razvrsti po kategorijah",
   Search: "Išči",
   Close: "Zapri",
   Embed: "Predvajalnik",
@@ -128,7 +130,6 @@ export default {
   Advertising: "Oglaševanje",
   "By topic": "Po temi",
   "By rubric": "Po rubriki",
-  "Type string to filter by rubrics": "Razvrsti po rubrikah",
   "No rubric filter": "Brez filtra po rubriki",
   "From the :": "Od:",
   "To the :": "Do:",
@@ -142,8 +143,8 @@ export default {
   "Sort score": "Razvrščeno po relevantnosti",
   "Sort name": "Naslov",
   "Sort last": "Zadnje",
-  "Choose color": "Izberi barvo",
-  "Choose theme": "Izberi temo",
+  "Choose color": "Poudarjena barva",
+  "Choose theme": "Tema (ozadje igralca)",
   "Podcast no visible": "Podkast je skrit",
   "Display episodes": "Prikaži epizode",
   "Podcast published in future": "Podkast bo objavljen v prihodnje",
@@ -163,7 +164,6 @@ export default {
   "open left Menu": "Meni odpri/zapri",
   Participant: "Sodelujoči",
   "Number of player podcasts": "Število podkastov v predvajalniku",
-  "Proceed reading": "Nadaljuj s poslušanjem",
   "Without topic": "Brez teme",
   "Without rubric": "Brez rubrike",
   "Consider podcasts no visible": "Občinstvu skriti podkasti",
@@ -406,4 +406,5 @@ export default {
   "Code copied!":"Koda kopirana!",
   "Copied!":"Kopirano!",
   "Color of the QR Code": "Barva kode QR",
+  "Silent stream":"Tihi tok",
 }

package/src/router/router.ts

@@ -4,12 +4,10 @@ import {
   RouteLocationNormalized,
   RouteRecordRaw,
 } from "vue-router";
-import { useFilterStore } from "../stores/FilterStore";
-import { useSaveFetchStore } from "@/stores/SaveFetchStore";
-import { Rubriquage } from "@/stores/class/rubrique/rubriquage";
 import classicApi from "@/api/classicApi";
-import { useAuthStore } from "../stores/AuthStore";
+import { AuthStore } from "../stores/AuthStore";
 import fetchHelper from "@/helper/fetchHelper";
+import { setupRouter } from "./utils";
 
 /*--------------------------------------------------------------------------
 Composants publics
@@ -334,13 +332,16 @@ const router = createRouter({
   history: createWebHistory(),
   routes: routes,
   scrollBehavior(to, from) {
-    if (to.name === from.name && to.meta.noScroll) return false;
-    return { left: 0, top: 0 };
+    if (to.name === from.name && to.meta.noScroll) {
+      return false;
+    } else {
+      return { left: 0, top: 0 };
+    }
   },
 });
 
 //Do in frontoffice but not podcastmakers
-async function getMyOrgaActive(authStore: any): Promise<string>{
+async function getMyOrgaActive(authStore: AuthStore): Promise<string>{
   const orgaActive = await classicApi.fetchData<string>({
     api: 3,
     path: "user/active"
@@ -352,72 +353,7 @@ async function getMyOrgaActive(authStore: any): Promise<string>{
   }
   return orgaActive;
 }
-async function changeOrgaFilter(orgaFilter: string, filterStore: any){
-  const saveStore = useSaveFetchStore();
-  const response = await saveStore.getOrgaData(orgaFilter);
-  const data = await classicApi.fetchData<Array<Rubriquage>>({
-    api: 0,
-    path: "rubriquage/find/" + orgaFilter,
-    parameters: {
-      sort: "HOMEPAGEORDER",
-      homePageOrder: true,
-    },
-    specialTreatement: true,
-  });
-  const isLive = await saveStore.getOrgaLiveEnabled(orgaFilter);
-  filterStore.filterUpdateOrga({
-    orgaId: orgaFilter,
-    imgUrl: response.imageUrl,
-    name: response.name,
-    rubriquageArray: data.filter((element: Rubriquage) => {
-      return element.rubriques.length;
-    }),
-    isLive: isLive,
-  });
-}
-let fetchMyOrgaActive = false;
-router.beforeResolve(async () =>{
-  fetchMyOrgaActive = false;
-});
-router.beforeEach(async (to, from) => {
-  if ("/logout" === to.path && "/logout" !== from.path) {
-    setTimeout(() => {
-      window.location.reload(true);
-    }, 500);
-  }
-  const authStore = useAuthStore();
-  const filterStore = useFilterStore();
-  
-  const isSamePath = to.matched[0]?.path === from.matched[0]?.path && to.path.includes(from.path);
-  let orgaToFocus = isSamePath ? (to.query.productor?.toString() ?? undefined) : undefined;
 
-  if(authStore.authProfile){
-    if(!isSamePath && !fetchMyOrgaActive){
-      await getMyOrgaActive(authStore);
-      fetchMyOrgaActive = true;
-    }
-    if(undefined!==orgaToFocus){
-      orgaToFocus = authStore.authOrgaId;
-    }
-  }
-  if (isSamePath && orgaToFocus !== from.query.productor) {
-    if (undefined === orgaToFocus) {
-      filterStore.filterUpdateOrga({ orgaId: undefined });
-    } else if (filterStore.filterOrgaId !== orgaToFocus) {
-      await changeOrgaFilter(orgaToFocus, filterStore);
-    }
-  }
-  if (
-    "/logout" !== to.path &&
-    filterStore.filterOrgaId !== to.query.productor &&
-    undefined !== filterStore.filterOrgaId
-  ) {
-    return {
-      path: to.path,
-      query: { ...to.query, ...{ productor: filterStore.filterOrgaId } },
-      params: to.params,
-      name: to.name,
-    };
-  }
-});
+setupRouter(router, getMyOrgaActive);
+
 export default router;