@saooti/octopus-sdk 41.0.9-SNAPSHOT → 41.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saooti/octopus-sdk",
-  "version": "41.0.9-SNAPSHOT",
+  "version": "41.0.9",
   "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/plateform.conf

@@ -1 +1 @@
-dev2.saooti.org
+preprod.saooti.org

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/api/classicApi.ts

@@ -78,7 +78,7 @@ export default {
         params.catchFunction();
       }else{
         const axiosError= error as AxiosError;
-        return Promise.reject(new Error(axiosError.message));
+        return Promise.reject(axiosError);
       }
     });
     return response?.data;

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

@@ -51,8 +51,8 @@ export const usePlayerLive = (hlsReady: Ref<boolean>)=>{
   }
 
   function playLive() {
-    if (!playerStore.playerLive) return;
-    playerStore.playerUpdatePlayerHlsUrl(`${apiStore.hlsUrl}live/dev.${playerStore.playerLive.conferenceId}/index.m3u8`);
+    if (!playerStore.playerHlsIdentifier) return;
+    playerStore.playerUpdatePlayerHlsUrl(`${apiStore.hlsUrl}live/${playerStore.playerHlsIdentifier}/index.m3u8`);
     playHls();
   }
 

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/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: {readonly [key:string]: string|number}, force=false)=>{
+export const useSimplePageParam = (props: {readonly [key:string]: string|number}, force=false, advancedSearch=false)=>{
 
   const { updateRouteParam } = useRouteUpdateParams();
 
@@ -12,7 +12,7 @@ export const useSimplePageParam = (props: {readonly [key:string]: string|number}
   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;
@@ -21,9 +21,12 @@ export const useSimplePageParam = (props: {readonly [key:string]: string|number}
   });
 
   watch(searchPattern, () => {
-    updateRouteParam({
-      q: searchMinSize.value.length ? searchMinSize.value : undefined,
-    }, force);
+    if(!advancedSearch){
+      const query = getMinSize(searchPattern.value);
+      updateRouteParam({
+        q: query.length ? query : undefined,
+      }, force);
+    }
   });
 
   onMounted(() => {
@@ -32,6 +35,9 @@ export const useSimplePageParam = (props: {readonly [key:string]: string|number}
     isInit.value = true;
   })
 
+  function getMinSize(param:string){
+    return param.length>3 ?param : ""
+  }
   function initSearchPattern(){
     searchPattern.value = (props.routeQuery as string) ?? "";
   }

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

@@ -17,6 +17,8 @@
     :is-disabled="isDisabled"
     :no-deselect="noDeselect"
     :display-required="displayRequired"
+    :popover="popover"
+    :popover-relative-class="popoverRelativeClass"
     @on-search="onSearchCategory"
     @selected="onCategorySelected"
   />
@@ -52,6 +54,8 @@ const props = defineProps({
   displayLabel: { default: false, type: Boolean },
   textDanger :{ default: undefined, type: String },
   displayRequired: { default: false, type: Boolean },
+  popover: { default: undefined, type: String },
+  popoverRelativeClass: { default: undefined, type: String },
 })
 
 //Emits

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

@@ -116,8 +116,8 @@ const { t } = useI18n();
 const {handle403} = useErrorHandler();
 
 //Computed
-const changed = computed(() => `${props.size}|${props.reload}|${dsize.value}|${props.stateFilter}|${props.podcast?.podcastId}|${props.organisationId}`);
 const isNotAnAnswerList = computed(() =>  undefined === props.answerToComment);
+const changed = computed(() => `${props.size}|${props.reload}|${dsize.value}|${props.stateFilter}|${props.podcast?.podcastId}|${props.organisationId}`);
 const sortChoice = computed(() =>{
   return [
     { title: t("The most recent"), value: "DATE_DESC" },

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";
 
@@ -78,8 +78,6 @@ const props = defineProps({
 //Emits
 const emit = defineEmits(["update:first", "update:rowsPerPage", "update:isMobile"]);
 
-//Data 
-const internSizeChange = ref(false);
   
 //Composables
 const { t } = useI18n();
@@ -101,10 +99,6 @@ 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()}, props.forceUpdateParameters);
 });
 
@@ -118,9 +112,6 @@ function changeFirst(firstValue: number) {
 }
 function changeSize(sizeValue: number) {
   scrollToTop();
-  if (0 !== props.first) {
-    internSizeChange.value = true;
-  }
   emit("update:rowsPerPage", sizeValue);
   updatePaginateSize(sizeValue, props.forceUpdateParameters);
 }

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

@@ -29,7 +29,7 @@
           : undefined
       "
       :player-responsive="true"
-      :forceUpdateParameters="true"
+      :force-update-parameters="true"
     >
       <template #list>
         <div class="octopus-element-list">

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

@@ -26,11 +26,12 @@
       :participant-id="participantId"
       :emission-id="emissionId"
       :organisation-id="productorId"
+      :sort-criteria="sort"
       :reload="reloadList"
       :include-hidden="editRight"
       :show-count="showCount"
       :display-sort-text="false"
-      :forceUpdateParameters="forceUpdateParameters"
+      :force-update-parameters="forceUpdateParameters"
       @fetch="fetch"
     />
   </section>
@@ -82,7 +83,8 @@ const titleFilter = computed(() => {
     ? t("All podcast button", { name: props.name })
     : t("All podcast emission button");
 });
-const query = computed(() => searchPattern.value.length >= 3 ? searchPattern.value : "");
+const query = computed(() => searchPattern.value.length > 3 ? searchPattern.value : "");
+const sort = computed(() =>  !query.value.length ? "DATE" : "SCORE");
 
 //Watch
 watch(()=>props.reload, () => {

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

@@ -19,7 +19,7 @@
     "
     :just-size-chosen="justSizeChosen"
     :player-responsive="true"
-    :forceUpdateParameters="forceUpdateParameters"
+    :force-update-parameters="forceUpdateParameters"
   >
     <template #list>
       <div class="octopus-element-list">
@@ -150,9 +150,9 @@ watch(changePaginate, () => {
   dfirst.value = props.first;
   dsize.value = props.size;
 });
-watch(changed, () => reloadList());
-watch(()=>props.reload, () => reloadList());
-watch(dsize, () => reloadList());
+watch(changed, () => fetchContent(true));
+watch(()=>props.reload, () => fetchContent(true));
+watch(dsize, () => fetchContent(true));
 watch(dfirst, () => {
   if (
     !podcasts.value[dfirst.value] ||
@@ -162,17 +162,13 @@ 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;
   const param: FetchParam = {
-    first: dfirst.value,
+    first: reset ? 0 : dfirst.value,
     size: dsize.value,
     organisationId: organisation.value,
     emissionId: props.emissionId,
@@ -215,6 +211,7 @@ function afterFetching(
   data: { count: number; result: Array<Podcast>; sort: string },
 ): void {
   if (reset) {
+    dfirst.value = 0;
     podcasts.value.length = 0;
   }
   if (dfirst.value > podcasts.value.length) {

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

@@ -211,7 +211,10 @@ function play(isVideo: boolean): void {
     playerStore.playerPlay(
       {
         ...props.podcast,
-        ...{ conferenceId: props.fetchConference?.conferenceId },
+        ...{ 
+          conferenceId: props.fetchConference?.conferenceId,
+          hlsIdentifier: props.fetchConference?.hlsIdentifier,
+        },
       },
       isVideo,
     );

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

@@ -36,12 +36,6 @@
         </div>
       </div>
       <ChooseEpisodesNumber v-else :episodes-number="episodesNumber" @update-number="emit('update:episodesNumber', $event)"/>
-      <ClassicCheckbox
-        :text-init="proceedReading"
-        id-checkbox="proceed-reading-checkbox"
-        :label="t('Proceed reading')"
-        @update:text-init="emit('update:proceedReading', $event)"
-      />
     </template>
     <ClassicCheckbox
       v-if="displayIsVisible"
@@ -104,7 +98,6 @@ const props = defineProps({
   displayArticleParam: { default: false, type: Boolean },
   displayIsVisible: { default: false, type: Boolean },
   displayInsertCode: { default: false, type: Boolean },
-  proceedReading: { default: true, type: Boolean },
   displayArticle: { default: true, type: Boolean },
   displayTranscript: { default: true, type: Boolean },
   displayWave: { default: true, type: Boolean },
@@ -118,7 +111,6 @@ const props = defineProps({
 //Emits
 const emit = defineEmits([
   "episodeChoiceDisplay",
-  "update:proceedReading",
   "update:isVisible",
   "update:episodesNumber",
   "update:displayArticle",

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

@@ -44,7 +44,6 @@
             v-model:display-article="displayArticle"
             v-model:display-transcript="displayTranscript"
             v-model:display-wave="displayWave"
-            v-model:proceed-reading="proceedReading"
             v-model:is-visible="isVisible"
             v-model:player-auto-play="playerAutoPlay"
             v-model:episodes-number="episodesNumber"
@@ -125,7 +124,6 @@ const iFrameModel = ref("default");
 const isShareModal = ref(false);
 const color = ref("#40a372");
 const theme = ref("#000000");
-const proceedReading = ref(true);
 const episodeChoiceDisplay = ref("number");
 const episodesNumber = ref(3);
 const isVisible = ref(false);
@@ -341,9 +339,6 @@ function addUrlParameters(url: Array<string>) {
   url.push(
     `&color=${color.value.substring(1)}&theme=${theme.value.substring(1)}`,
   );
-  if (!proceedReading.value) {
-    url.push("&proceed=false");
-  }
   if (!displayArticle.value && displayArticleParam.value) {
     url.push("&article=false");
   }

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

@@ -78,7 +78,7 @@ import RssIcon from "vue-material-design-icons/Rss.vue";
 import { useApiStore } from "../../../stores/ApiStore";
 import ClassicPopover from "../../misc/ClassicPopover.vue";
 import { Emission } from "@/stores/class/general/emission";
-import { computed, Ref, ref, useTemplateRef, watch } from "vue";
+import { computed, onMounted, Ref, ref, useTemplateRef, watch } from "vue";
 import { useI18n } from "vue-i18n";
 type Link = {
   name: string;
@@ -204,7 +204,9 @@ const rssUrl = computed(() => {
 
 
 //Watch
-watch(()=>props.windowWidth, () =>resizeWindow(), {immediate: true});
+watch(()=>props.windowWidth, () =>resizeWindow());
+
+onMounted(()=>resizeWindow());
 
 
 //Methods

package/src/components/form/ClassicInputText.vue

@@ -12,6 +12,7 @@
         >{{ label }}
         <AsteriskIcon v-if="displayRequired" :size="10" class="ms-1 mb-2" :title="t('Mandatory input')"/>
       </component>
+      <slot name="afterTitle"/>
       <template v-if="popover">
         <button
           :id="'popover' + inputId"
@@ -31,7 +32,9 @@
           <!-- eslint-enable -->
         </ClassicPopover>
       </template>
+      <slot name="afterHelp"/>
     </div>
+    <slot name="betweenTitleInput"/>
     <input
       v-if="!isWysiwyg && !isTextarea"
       v-show="showField"