@saooti/octopus-sdk 41.0.2-SNAPSHOT → 41.0.2

package/index.ts

@@ -108,7 +108,7 @@ import {useMetaTitleWatch} from "./src/components/composable/useMetaTitleWatch.t
 import {useOrganisationFilter} from "./src/components/composable/useOrganisationFilter.ts";
 import {useInit} from "./src/components/composable/useInit.ts";
 import {useErrorHandler} from "./src/components/composable/useErrorHandler.ts";
-
+import { useSimplePageParam } from "./src/components/composable/route/useSimplePageParam";
 
 
 //helper
@@ -157,6 +157,7 @@ export {
     useOrganisationFilter,
     useInit,
     useErrorHandler,
+    useSimplePageParam,
     debounce,
     useVastStore,
     useSaveFetchStore,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saooti/octopus-sdk",
-  "version": "41.0.2-SNAPSHOT",
+  "version": "41.0.2",
   "private": false,
   "description": "Javascript SDK for using octopus",
   "author": "Saooti",
@@ -8,6 +8,7 @@
     "serve": "vite preview",
     "build": "vite build",
     "dev": "vite",
+    "bundle":"vite-bundle-visualizer",
     "proxy_authentifié": "node proxy.ts",
     "proxy_non_authentifié": "node proxy.ts false",
     "lint": "eslint --fix src",
@@ -53,6 +54,7 @@
     "video.js": "^8.23.3",
     "videojs-quality-selector-hls": "^1.1.1",
     "vite": "^6.3.5",
+    "vite-bundle-visualizer": "^1.2.1",
     "vue": "^3.5.16",
     "vue-i18n": "^11.1.5",
     "vue-material-design-icons": "^5.3.1",

package/src/App.vue

@@ -8,16 +8,14 @@
         <router-view />
         <PlayerComponent />
       </main>
-      <ClassicLazy :min-height="123">
-        <FooterOctopus />
-      </ClassicLazy>
+      <FooterOctopus />
     </template>
   </div>
 </template>
 <script setup lang="ts">
 import TopBar from "@/components/misc/TopBar.vue";
+import FooterOctopus from "@/components/misc/FooterSection.vue";
 import PlayerComponent from "@/components/misc/player/PlayerComponent.vue";
-import ClassicLazy from "@/components/misc/ClassicLazy.vue";
 import {useInit} from "./components/composable/useInit";
 import {useMetaTitle} from "./components/composable/useMetaTitle";
 import {useOrganisationFilter} from "./components/composable/useOrganisationFilter";
@@ -25,9 +23,7 @@ import { useAuthStore } from "./stores/AuthStore";
 import { defineAsyncComponent, getCurrentInstance, onBeforeMount, ref, watch } from "vue";
 import { useRoute } from "vue-router";
 import { useI18n } from "vue-i18n";
-const FooterOctopus = defineAsyncComponent(
-  () => import("@/components/misc/FooterSection.vue"),
-);
+
 const CategoryFilter = defineAsyncComponent(
   () => import("@/components/display/categories/CategoryFilter.vue"),
 );

package/src/components/composable/player/usePlayerLive.ts

@@ -16,7 +16,7 @@ export const usePlayerLive = (hlsReady: Ref<boolean>)=>{
   const audioElement: Ref<HTMLAudioElement | null>= ref(null);
   const hls: Ref<any>= ref(null);
   const hlsRetryTimeout: Ref<ReturnType<typeof setTimeout> | undefined>= ref(undefined);
-  const playPromise: Ref<any>= ref(undefined);
+  const playPromise: Ref<Promise<void>|undefined>= ref(undefined);
   const errorHls= ref(false);
 
 

package/src/components/composable/player/usePlayerVast.ts

@@ -3,10 +3,10 @@ import { useVastStore } from "../../../stores/VastStore";
 import { loadScript } from "../../../helper/loadScript";
 import {nextTick, Ref, ref, watch} from 'vue';
 import dayjs from "dayjs";
-let adsLoader: any;
-let adsManager:any;
-let adDisplayContainer:any;
-let adsRequest: any;
+let adsLoader: google.ima.AdsLoader;
+let adsManager:google.ima.AdsManager;
+let adDisplayContainer:google.ima.AdDisplayContainer;
+let adsRequest: google.ima.AdsRequest;
 export const usePlayerVast = ()=>{
   const imaLoaded = ref(false);
   const isContentFinished = ref(false);
@@ -83,7 +83,7 @@ export const usePlayerVast = ()=>{
     adsRequest.adTagUrl = vastUrl;
   }
 
-  function onAdsManagerLoaded(adsManagerLoadedEvent: any) {
+  function onAdsManagerLoaded(adsManagerLoadedEvent: google.ima.AdsManagerLoadedEvent) {
     const adsRenderingSettings = new google.ima.AdsRenderingSettings();
     adsRenderingSettings.restoreCustomPlaybackStateOnAdBreakComplete = true;
     adsManager = adsManagerLoadedEvent.getAdsManager(audioContainer.value, adsRenderingSettings);
@@ -117,7 +117,7 @@ export const usePlayerVast = ()=>{
     }
   }
 
-  function onAdError(adErrorEvent: any) {
+  function onAdError(adErrorEvent: google.ima.AdErrorEvent) {
     console.log(adErrorEvent.getError());
     destroyAdManager();
   }
@@ -132,7 +132,7 @@ export const usePlayerVast = ()=>{
     isAdRequested.value = false;
   }
 
-  function onAdEvent(adEvent: any) {
+  function onAdEvent(adEvent: google.ima.AdEvent) {
     const ad = adEvent.getAd();
     if(ad){
       vastStore.updateCurrentAd(ad);

package/src/components/composable/radio/usefetchRadioData.ts

@@ -2,17 +2,19 @@ import classicApi from "../../../api/classicApi";
 import { MediaRadio, MetadataRadio, NextAdvertising } from '@/stores/class/general/player';
 import { Podcast } from '@/stores/class/general/podcast';
 import dayjs from 'dayjs';
-import radioHelper from "../../../helper/radio/radioHelper";
 import {onBeforeUnmount, Ref, ref} from 'vue';
+import { useI18n } from "vue-i18n";
 export const useFetchRadio = ()=>{
 
   const radioInterval : Ref<ReturnType<typeof setTimeout> | undefined> = ref(undefined);
+
+  const {t} = useI18n();
   
   async function fetchRadioMetadata(
     canalId: number,
     previousTitle: string,
     callbackMetadata: (
-      metadata: MediaRadio,
+      metadata: MediaRadio|undefined,
       podcast: Podcast | undefined,
       history: Array<MediaRadio>
     ) => void,
@@ -33,15 +35,19 @@ export const useFetchRadio = ()=>{
       callbackAdvertising(metadata.nextAdvertising);
     }
     const arrayMetadata = metadata.previously;
-    arrayMetadata.unshift(metadata.currently);
-    for (let index = 0, len = arrayMetadata.length; index < len; index++) {
-      if (
-        dayjs().valueOf() - 18000 >
-        dayjs(arrayMetadata[index].startDate).valueOf()
-      ) {
-        await useCallbackIfNewMetadata(previousTitle, arrayMetadata, index, len,callbackMetadata);
-        return;
+    if(null!==metadata.currently){
+      arrayMetadata.unshift(metadata.currently);
+      for (let index = 0, len = arrayMetadata.length; index < len; index++) {
+        if (
+          dayjs().valueOf() - 18000 >
+          dayjs(arrayMetadata[index].startDate).valueOf()
+        ) {
+          await useCallbackIfNewMetadata(previousTitle, arrayMetadata, index, len,callbackMetadata);
+          return;
+        }
       }
+    }else{
+      callbackMetadata(undefined, undefined, arrayMetadata);
     }
   }
   async function useCallbackIfNewMetadata(previousTitle: string, arrayMetadata: Array<MediaRadio>, index:number, len: number, callbackMetadata: (
@@ -63,11 +69,22 @@ export const useFetchRadio = ()=>{
       }
     }
   }
-  function displayTitle(metadata: MediaRadio): string {
-    return radioHelper.displayTitle(metadata);
+  function displayTitle(metadata: MediaRadio|undefined): string {
+    if(!metadata){
+      return t("Silent stream");
+    }
+    let title = "";
+    if (metadata?.title) {
+      title += metadata.title;
+    }
+    if (metadata?.artist) {
+      title += " - " + metadata.artist;
+    }
+    return title;
   }
 
 
+
   onBeforeUnmount(() => {
     clearInterval(radioInterval.value as unknown as number);
   })

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

@@ -9,7 +9,7 @@ import dayjs from "dayjs";
 
 export const useAdvancedParamInit = (props: any, isEmission: boolean)=>{
 
-  const { searchPattern,organisationId, searchMinSize, paginateFirst, initSearchPattern, initOrga} = useSimplePageParam(props);
+  const { searchPattern,organisationId, searchMinSize, paginateFirst, initSearchPattern, initOrga} = useSimplePageParam(props, false, true);
   const { isEditRights, isPodcastmaker } = useOrgaComputed();
   const { stringifyRubriquesFilter } = useRubriquesFilterParam();
 

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

@@ -12,14 +12,14 @@ export const useRouteUpdateParams = ()=>{
     return ['podcasts', 'emissions'].includes(route.name?.toString()??"");
   }
 
-  function updatePaginateSize(ps:number){
-    if(checkPage()){
+  function updatePaginateSize(ps:number, force= false){
+    if(force ||checkPage()){
       router.push({query: {...route.query, ...{ps:ps, pr:1}}});
     }
   }
 
-  function updateRouteParam(update: {[key:string]: string|undefined}){
-    if(checkPage()){
+  function updateRouteParam(update: {[key:string]: string|undefined}, force= false){
+    if(force || checkPage()){
       router.push({query: {...route.query, ...update}});
     }
   }

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

@@ -2,7 +2,7 @@ import { useFilterStore } from '../../../stores/FilterStore';
 import { useRouteUpdateParams } from './useRouteUpdateParams';
 import { computed, onMounted, Ref, ref, watch } from "vue";
 
-export const useSimplePageParam = (props: any)=>{
+export const useSimplePageParam = (props: {readonly [key:string]: string|number}, force=false, advancedSearch=false)=>{
 
   const { updateRouteParam } = useRouteUpdateParams();
 
@@ -12,18 +12,21 @@ export const useSimplePageParam = (props: any)=>{
   const searchPattern = ref("");
   const organisationId: Ref<string|undefined> = ref(undefined);
 
-  const searchMinSize = computed(() => searchPattern.value.length>3 ? searchPattern.value : "");
+  const searchMinSize = computed(() => getMinSize((props.routeQuery as string)));
   const paginateFirst = computed(() => {
     if(!props.pr){
       return 0;
     }
-    return  Math.max((props.pr - 1 ) * props.ps, 0);
+    return  Math.max(((props.pr as number) - 1 ) * (props.ps as number), 0);
   });
 
   watch(searchPattern, () => {
-    updateRouteParam({
-      q: searchMinSize.value.length ? searchMinSize.value : undefined,
-    });
+    if(!advancedSearch){
+      const query = getMinSize(searchPattern.value);
+      updateRouteParam({
+        q: query.length ? query : undefined,
+      }, force);
+    }
   });
 
   onMounted(() => {
@@ -32,11 +35,14 @@ export const useSimplePageParam = (props: any)=>{
     isInit.value = true;
   })
 
+  function getMinSize(param:string){
+    return param.length>3 ?param : ""
+  }
   function initSearchPattern(){
-    searchPattern.value = props.routeQuery ?? "";
+    searchPattern.value = (props.routeQuery as string) ?? "";
   }
   function initOrga(){
-    organisationId.value = filterStore.filterOrgaId ?? props.routeOrga;
+    organisationId.value = filterStore.filterOrgaId ?? (props.routeOrga as string);
   }
 
 
@@ -47,6 +53,7 @@ export const useSimplePageParam = (props: any)=>{
     paginateFirst,
     initSearchPattern,
     initOrga,
+    updateRouteParam,
     isInit
 	}
 }

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

@@ -13,6 +13,7 @@
     :multiple="multiple"
     :min-search-length="1"
     :width="width"
+    :height="height"
     :is-disabled="isDisabled"
     :no-deselect="noDeselect"
     :display-required="displayRequired"
@@ -32,6 +33,7 @@ import { useI18n } from "vue-i18n";
 const props = defineProps({
   defaultanswer: { default: "", type: String },
   width: { default: "100%", type: String },
+  height: { default: undefined, type: String },
   multiple: { default: false, type: Boolean },
   isDisabled: { default: false, type: Boolean },
   initCategories: {

package/src/components/display/emission/EmissionList.vue

@@ -152,8 +152,8 @@ watch(changePaginate, () => {
   dfirst.value = props.first;
   dsize.value = props.size;
 });
-watch(changed, () =>reloadList());
-watch(dsize, () =>reloadList());
+watch(changed, () =>fetchContent(true));
+watch(dsize, () =>fetchContent(true));
 watch(dfirst, () =>{
   if (
     !emissions.value[dfirst.value] ||
@@ -165,21 +165,17 @@ watch(dfirst, () =>{
 
 
 onMounted(()=>{
-  fetchContent(true);
+  fetchContent(false);
   if (displayRubriquage.value) {
     fetchRubriques();
   }
 })
 
 //Methods
-function reloadList() {
-  dfirst.value = 0;
-  fetchContent(true);
-}
 async function fetchContent(reset: boolean): Promise<void> {
   loading.value = true;
   const param: FetchParam = {
-    first: dfirst.value,
+    first: reset? 0: dfirst.value,
     size: dsize.value,
     query: props.query,
     organisationId: organisation.value,
@@ -212,6 +208,7 @@ function afterFetching(
   data: { count: number; result: Array<Emission>; sort: string },
 ): void {
   if (reset) {
+    dfirst.value = 0;
     emissions.value.length = 0;
   }
   if (dfirst.value > emissions.value.length) {

package/src/components/display/filter/AdvancedSearch.vue

@@ -184,9 +184,6 @@ watch(()=>props.searchPattern, (value: string) => {
   if(search.length <= 3){
     valSort = props.isEmission? "LAST_PODCAST_DESC" : "DATE";
   }
-  if (valSort !== props.sort) {
-    emit("update:sort", valSort);
-  }
   updateRouteParamAdvanced({
     q: search.length ? search : undefined,
     s: valSort,

package/src/components/display/list/ListPaginate.vue

@@ -54,7 +54,7 @@ import PaginateParams from "./PaginateParams.vue";
 import PaginateSection from "./PaginateSection.vue";
 import {useResizePhone} from "../../composable/useResizePhone";
 import { useRouteUpdateParams } from "../../composable/route/useRouteUpdateParams";
-import { computed, ref, watch } from "vue";
+import { computed, watch } from "vue";
 import { usePlayerStore } from "../../../stores/PlayerStore";
 import { useI18n } from "vue-i18n";
 
@@ -72,13 +72,12 @@ const props = defineProps({
   isMobile: { default: false, type: Boolean },
   justSizeChosen: { default: false, type: Boolean },
   playerResponsive: { default: false, type: Boolean },
+  forceUpdateParameters: { default: false, type: Boolean },
 })
 
 //Emits
 const emit = defineEmits(["update:first", "update:rowsPerPage", "update:isMobile"]);
 
-//Data 
-const internSizeChange = ref(false);
   
 //Composables
 const { t } = useI18n();
@@ -100,11 +99,7 @@ const rangeSize = computed(() => {
 //Watch
 watch(isPhone, () => {emit("update:isMobile", isPhone.value);}, {immediate: true});
 watch(()=>props.first,  () => {
-  if (internSizeChange.value) {
-    internSizeChange.value = false;
-    return;
-  }
-  updateRouteParam({pr:(Math.floor(props.first / props.rowsPerPage) + 1).toString()});
+  updateRouteParam({pr:(Math.floor(props.first / props.rowsPerPage) + 1).toString()}, props.forceUpdateParameters);
 });
 
 //Methods
@@ -117,11 +112,8 @@ function changeFirst(firstValue: number) {
 }
 function changeSize(sizeValue: number) {
   scrollToTop();
-  if (0 !== props.first) {
-    internSizeChange.value = true;
-  }
   emit("update:rowsPerPage", sizeValue);
-  updatePaginateSize(sizeValue);
+  updatePaginateSize(sizeValue, props.forceUpdateParameters);
 }
 function scrollToTop() {
   const element = document.getElementById(props.id);

package/src/components/display/live/LiveItem.vue

@@ -75,11 +75,10 @@ async function fetchStatus(): Promise<void> {
     api: 9,
     path: "conference/info/" + props.fetchConference.conferenceId,
   });
-  const newStatus = confInfo.status;
-  if (newStatus !== props.fetchConference.status) {
+  if (confInfo.status !== props.fetchConference.status) {
     emit("updateItem", {
       ...props.fetchConference,
-      ...{ status: newStatus },
+      ...confInfo,
     });
   }
 }

package/src/components/display/live/RadioCurrently.vue

@@ -72,10 +72,7 @@ const currentlyPlayingString = computed(() => {
   if (playingRadio.value && playerStore.playerRadio) {
     return displayTitle(playerStore.playerRadio.metadata);
   }
-  if (currentMetadata.value) {
-    return displayTitle(currentMetadata.value);
-  }
-  return "";
+  return displayTitle(currentMetadata.value);
 });
 
 onMounted(()=>{
@@ -102,7 +99,7 @@ async function fetchCurrentlyPlaying(): Promise<void> {
     updateMetadata,
   );
 }
-function updateMetadata(metadata: MediaRadio, podcast?: Podcast): void {
+function updateMetadata(metadata: MediaRadio|undefined, podcast?: Podcast): void {
   currentMetadata.value = metadata;
   currentPodcast.value = podcast;
 }

package/src/components/display/participant/ParticipantList.vue

@@ -103,9 +103,9 @@ watch(changePaginate, () => {
   dfirst.value = props.first;
   dsize.value = props.size;
 });
-watch(()=>props.query, () => reloadList());
-watch(organisation, () => reloadList());
-watch(dsize, () => reloadList());
+watch(()=>props.query, () =>  fetchContent(true));
+watch(organisation, () => fetchContent(true));
+watch(dsize, () => fetchContent(true));
 watch(dfirst, () => {
   if (
     !participants.value[dfirst.value] ||
@@ -115,14 +115,10 @@ watch(dfirst, () => {
   }
 });
 
-onBeforeMount(()=>fetchContent(true))
+onBeforeMount(()=>fetchContent(false))
 
 
 //Methods
-function reloadList() {
-  dfirst.value = 0;
-  fetchContent(true);
-}
 async function fetchContent(reset: boolean): Promise<void> {
   loading.value = true;
   try {
@@ -131,7 +127,7 @@ async function fetchContent(reset: boolean): Promise<void> {
         api: 0,
         path: "participant/search",
         parameters: {
-          first: dfirst.value,
+          first: reset? 0: dfirst.value,
           size: dsize.value,
           query: props.query,
           organisationId: organisation.value,
@@ -141,6 +137,7 @@ async function fetchContent(reset: boolean): Promise<void> {
       },
     );
     if (reset) {
+      dfirst.value = 0;
       participants.value.length = 0;
     }
     displayCount.value = data.count;

package/src/components/display/playlist/PlaylistList.vue

@@ -98,8 +98,8 @@ watch(changePaginate, () => {
   dfirst.value = props.first;
   dsize.value = props.size;
 });
-watch(changed, () => reloadList());
-watch(dsize, () => reloadList());
+watch(changed, () => fetchContent(true));
+watch(dsize, () =>fetchContent(true));
 watch(dfirst, () => {
   if (
     !playlists.value[dfirst.value] ||
@@ -109,18 +109,14 @@ watch(dfirst, () => {
   }
 });
 
-onMounted(()=>fetchContent(true))
+onMounted(()=>fetchContent(false))
 
 
 //Methods
-function reloadList() {
-  dfirst.value = 0;
-  fetchContent(true);
-}
 async function fetchContent(reset: boolean): Promise<void> {
   loading.value = true;
   const param = {
-    first: dfirst.value,
+    first: reset ? 0 : dfirst.value,
     size: dsize.value,
     query: props.query,
     organisationId: organisation.value,
@@ -144,6 +140,7 @@ function afterFetching(
   data: { count: number; result: Array<Playlist>; sort: string },
 ): void {
   if (reset) {
+    dfirst.value = 0;
     playlists.value.length = 0;
   }
   if (dfirst.value > playlists.value.length) {

package/src/components/display/playlist/PodcastList.vue

@@ -12,8 +12,8 @@
     />
     <ListPaginate
       id="podcastPlaylistListPaginate"
-      v-model:first="first"
-      v-model:rows-per-page="size"
+      v-model:first="dfirst"
+      v-model:rows-per-page="dsize"
       v-model:is-mobile="isMobile"
       :text-count="
         podcasts.length > 1
@@ -29,6 +29,7 @@
           : undefined
       "
       :player-responsive="true"
+      :force-update-parameters="true"
     >
       <template #list>
         <div class="octopus-element-list">
@@ -73,14 +74,20 @@ import { useI18n } from "vue-i18n";
 //Props 
 const props = defineProps({
   playlist: { default: () => ({}), type: Object as () => Playlist },
+  first: { default: 0, type: Number },
+  size: { default: 30, type: Number },
+  query: { default: undefined, type: String },
 })
 
+//Emits
+const emit = defineEmits(["update:query"]);
+
 //Data 
 const loading = ref(true);
 const podcasts: Ref<Array<Podcast>> = ref([]);
 const podcastsQuery: Ref<Array<Podcast>> = ref([]);
-const size = ref(30);
-const first = ref(0);
+const dfirst = ref(props.first);
+const dsize = ref(props.size);
 const searchPattern = ref("");
 const isMobile = ref(false);
 
@@ -96,18 +103,19 @@ const podcastsDisplay = computed(() => {
   if (isMobile.value) {
     return podcastsQuery.value.slice(
       0,
-      Math.min(first.value + size.value, podcasts.value.length),
+      Math.min(dfirst.value + dsize.value, podcasts.value.length),
     );
   }
   return podcastsQuery.value.slice(
-    first.value,
-    Math.min(first.value + size.value, podcasts.value.length),
+    dfirst.value,
+    Math.min(dfirst.value + dsize.value, podcasts.value.length),
   );
 });
 const editRight = computed(() =>isEditRights(props.playlist.organisation?.id));
 
 //Watch
 watch(searchPattern,() => {
+  emit('update:query', searchPattern.value);
   if ("" !== searchPattern.value) {
     podcastsQuery.value = podcasts.value.filter((el: Podcast) => {
       return el.title
@@ -141,6 +149,7 @@ async function fetchContent(): Promise<void> {
         });
       }
       podcastsQuery.value = podcasts.value;
+      searchPattern.value = props.query ?? "";
     } catch (error) {
       handle403(error as AxiosError);
     }