@saooti/octopus-sdk 41.0.2-SNAPSHOT → 41.0.2

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

@@ -3,9 +3,10 @@
     <h3 class="mb-2">
       {{ titleFilter }}
     </h3>
-    <div class="d-flex align-items-center flex-wrap mb-2">
+    <div class="d-flex align-items-stretch flex-wrap mb-2">
       <div id="podcast-filter-list-category-chooser" class="w-50-responsive pe-3">
         <CategoryChooser
+          height="100%"
           :defaultanswer="t('No category filter')"
           @selected="onCategorySelected"
         />
@@ -18,17 +19,19 @@
       />
     </div>
     <PodcastList
-      :first="first"
-      :size="size"
+      :first="dfirst"
+      :size="dsize"
       :iab-id="iabId"
       :query="query"
       :participant-id="participantId"
       :emission-id="emissionId"
       :organisation-id="productorId"
+      :sort-criteria="sort"
       :reload="reloadList"
       :include-hidden="editRight"
       :show-count="showCount"
       :display-sort-text="false"
+      :force-update-parameters="forceUpdateParameters"
       @fetch="fetch"
     />
   </section>
@@ -47,6 +50,9 @@ const CategoryChooser = defineAsyncComponent(
 
 //Props 
 const props = defineProps({
+  first: { default: 0, type: Number },
+  size: { default: 30, type: Number },
+  query: { default: undefined, type: String },
   participantId: { default: undefined, type: Number },
   name: { default: undefined, type: String },
   emissionId: { default: undefined, type: Number },
@@ -55,15 +61,16 @@ const props = defineProps({
   editRight: { default: false, type: Boolean },
   productorId: { default: () => [], type: Array as () => Array<string> },
   showCount: { default: false, type: Boolean },
+  forceUpdateParameters: { default: false, type: Boolean },
 })
 
 //Emits
-const emit = defineEmits(["fetch"]);
+const emit = defineEmits(["fetch", "update:query"]);
 
 //Data 
-const first = ref(0);
-const size = ref(30);
-const searchPattern = ref("");
+const dfirst = ref(props.first);
+const dsize = ref(props.size);
+const searchPattern = ref(props.query ?? "");
 const reloadList = ref(false);
 const iabId : Ref<number | undefined>= ref(undefined);
 
@@ -76,12 +83,16 @@ 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, () => {
   reloadList.value = !reloadList.value;
 });
+watch(searchPattern, () => {
+  emit('update:query', searchPattern.value);
+});
 
 //Methods
 function onCategorySelected(category: Category | undefined): void {

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

@@ -19,6 +19,7 @@
     "
     :just-size-chosen="justSizeChosen"
     :player-responsive="true"
+    :force-update-parameters="forceUpdateParameters"
   >
     <template #list>
       <div class="octopus-element-list">
@@ -85,6 +86,7 @@ const props = defineProps({
   justSizeChosen: { default: false, type: Boolean },
   withVideo: { default: undefined, type: Boolean },
   includeTag:{ default: () => [], type: Array as () => Array<string> },
+  forceUpdateParameters: { default: false, type: Boolean },
 })
 
 //Emits
@@ -148,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] ||
@@ -160,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,
@@ -213,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/PodcastModuleBox.vue

@@ -252,7 +252,7 @@ const isDebriefing = computed(() => {
   );
 });
 const isOctopusAndAnimator = computed(() => {
-  return !isPodcastmaker && editRight && authStore.isRoleLive;
+  return !isPodcastmaker.value && editRight.value && authStore.isRoleLive;
 });
 const podcastNotValid = computed(() => {
   return (

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

@@ -137,7 +137,7 @@ onMounted(()=>{
 function isNumeric(value: string): boolean {
   return /^-?\d+$/.test(value);
 }
-function selectChange($event: any) {
+function selectChange($event: Event) {
   const val = $event.target.value;
   if (!val) {
     return;

package/src/components/form/ClassicInputText.vue

@@ -216,7 +216,7 @@ watch(textValue, () => {
 });
 watch(()=>props.textInit, () => {
   if (props.textInit !== textValue.value) {
-    emit("update:textInit", textValue.value);
+    textValue.value = props.textInit;
   }
 });
 

package/src/components/form/ClassicMultiselect.vue

@@ -5,7 +5,7 @@
       'multiselect-no-deselect': noDeselect,
       'form-margin': displayLabel,
     }"
-    :style="{ width: width }"
+    :style="{ width: width, height: height }"
   >
     <label :class="displayLabel ? '' : 'd-none'" :for="id" class="form-label">{{
       label
@@ -28,6 +28,7 @@
       "
       :filter="fakeSearch"
       :selectable="() => !maxOptionsSelected"
+      :style="{height: height }"
       :class="{ 'border border-danger': textDanger?.length }"
       @open="onSearch"
       @search="onSearch"
@@ -93,6 +94,7 @@ const props = defineProps({
   multiple: { default: false, type: Boolean },
   isDisabled: { default: false, type: Boolean },
   width: { default: "100%", type: String },
+  height: { default: undefined, type: String },
   maxElement: { default: 50, type: Number },
   minSearchLength: { default: 3, type: Number },
   optionChosen: { default: undefined, type: Object as () => unknown },
@@ -209,6 +211,7 @@ defineExpose({
 
   .vs__dropdown-toggle {
     padding: 0;
+    height: 100%;
   }
 
   .vs__search:focus {

package/src/components/misc/ClassicPopover.vue

@@ -72,7 +72,7 @@ const router= useRouter();
 const popoverId = computed(() => "popover" + props.target);
 const positionInlineStyle = computed(() => `left: ${posX.value}px; top: ${posY.value}px;max-height:${maxHeight.value}`);
 const displayPopover = computed(() => show.value && !props.disable);
-const isTopLayerPopover = computed(() => (props.isTopLayer || "octopus-modal"===props.relativeClass) && HTMLElement.prototype.hasOwnProperty("popover"));
+const isTopLayerPopover = computed(() => (props.isTopLayer || "octopus-modal"===props.relativeClass) && Object.hasOwn(HTMLElement.prototype, "popover"));
 
 
 //Watch

package/src/components/misc/FooterSection.vue

@@ -19,10 +19,7 @@
           >
             <router-link
               class="link-hover special-select-align-magic-trick"
-              :to="{
-                  name: link.routeName,
-                  query: getQueriesRouter(link.routeName),
-                }"
+              :to="link.routeName"
             >
               {{ link.title }}
             </router-link>
@@ -77,7 +74,6 @@
 
 <script setup lang="ts">
 import cookiesHelper from "../../helper/cookiesHelper";
-import { useRubriquesFilterComputed } from "../composable/route/useRubriquesFilterComputed";
 import ClassicSelect from "../form/ClassicSelect.vue";
 import AcpmImage from "./AcpmImage.vue";
 import { state } from "../../stores/ParamSdkStore";
@@ -106,7 +102,6 @@ const reset = ref(false);
 const organisationId: Ref<string | undefined> = ref(undefined);
 
 //Composables
-const { rubriqueQueryParam } = useRubriquesFilterComputed();
 const generalStore = useGeneralStore();
 const filterStore = useFilterStore();
 const authStore = useAuthStore();
@@ -143,20 +138,6 @@ watch(()=>filterStore.filterOrgaId, () => {
 
 
 //Methods
-function getQueriesRouter(routeName: string) {
-  if (
-    "podcasts" !== routeName &&
-    "emissions" !== routeName &&
-    "home" !== routeName
-  ) {
-    return { productor: filterStore.filterOrgaId };
-  }
-  return {
-    productor: filterStore.filterOrgaId,
-    iabId: filterStore.filterIab?.id,
-    rubriquesId: rubriqueQueryParam.value,
-  };
-}
 function changeLanguage(): void {
   cookiesHelper.setCookie("octopus-language", language.value);
   loadLocaleMessages(
@@ -195,10 +176,6 @@ async function onOrganisationSelected( organisation: Organisation | undefined):
     });
   }
 }
-//Expose
-defineExpose({
-  updateComment
-});
 </script>
 
 <style lang="scss">

package/src/components/misc/TopBar.vue

@@ -93,7 +93,8 @@ watch(()=>generalStore.contentToDisplay, async () => {
     needToBlur.value = false;
     return;
   }
-  const proxyUrl = useProxyImageUrl(generalStore.contentToDisplay.imageUrl,"270", undefined, true);
+  const widthAsked = window.innerWidth > 960 ? "1600":"1000";
+  const proxyUrl = useProxyImageUrl(generalStore.contentToDisplay.imageUrl,widthAsked, undefined, true);
   try {
     const result = await axios.get(proxyUrl);
     headerBackgroundImage.value = `background-image: url('${result.data}');`;

package/src/components/misc/player/elements/PlayerTitle.vue

@@ -89,7 +89,7 @@ onUnmounted(()=>{
 async function fetchCurrentlyPlaying(): Promise<void> {
   fetchRadioMetadata(
     playerStore.playerRadio?.canalId ?? 0,
-    playerStore.playerRadio?.metadata.title ?? "",
+    playerStore.playerRadio?.metadata?.title ?? "",
     updateMetadata,
     updateAdvertising,
   );
@@ -98,11 +98,11 @@ function updateAdvertising(nextAdvertising: NextAdvertising): void {
   playerStore.playerRadioUpdateNextAdvertising(nextAdvertising);
 }
 function updateMetadata(
-  metadata: MediaRadio,
+  metadata: MediaRadio|undefined,
   podcast: Podcast | undefined,
   history: Array<MediaRadio>,
 ): void {
-  playerStore.playerMetadata(metadata, history);
+  playerStore.playerMetadata(metadata, history); //TODO
   playerStore.playerRadioPodcast(podcast);
 }
 </script>

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/pages/EmissionPage.vue

@@ -70,12 +70,17 @@
             :emission-id="emissionId"
           />
           <PodcastFilterList
+            v-if="isInit"
+            v-model:query="searchPattern"
             class="mx-2"
+            :first="paginateFirst"
+            :size="ps"
             :show-count="true"
             :emission-id="emissionId"
             :category-filter="false"
             :edit-right="editRight"
             :productor-id="[emission.orga.id]"
+            :force-update-parameters="true"
             @fetch="podcastsFetched"
           />
         </section>
@@ -110,6 +115,7 @@ import { useFilterStore } from "../../stores/FilterStore";
 import { Podcast } from "@/stores/class/general/podcast";
 import { useI18n } from "vue-i18n";
 import { useRoute } from "vue-router";
+import { useSimplePageParam } from "../composable/route/useSimplePageParam";
 const ShareAnonymous = defineAsyncComponent(() => import("../display/sharing/ShareAnonymous.vue"));
 const PodcastFilterList = defineAsyncComponent(
   () => import("../display/podcasts/PodcastFilterList.vue"),
@@ -143,6 +149,9 @@ const PodcastmakerHeader = defineAsyncComponent(
 //Props 
 const props = defineProps({
   emissionId: { default: undefined, type: Number },
+  pr: { default: 0, type: Number },
+  ps: { default: 30, type: Number },
+  routeQuery: { default: "", type: String },
 })
 
 
@@ -163,6 +172,11 @@ const authStore = useAuthStore();
 const filterStore = useFilterStore();
 const generalStore= useGeneralStore();
 const route= useRoute();
+const {
+  searchPattern,
+  paginateFirst,
+  isInit
+} = useSimplePageParam(props, true);
 
 
 //Computed

package/src/components/pages/ParticipantPage.vue

@@ -47,12 +47,17 @@
       </section>
       <!-- productorId define to avoid overwrite #12817 -->
       <PodcastFilterList
+        v-if="isInit"
+        v-model:query="searchPattern"
+        :first="paginateFirst"
+        :size="ps"
         :participant-id="participantId"
         :name="name"
         :category-filter="true"
         :productor-id="['']"
         :reload="reload"
         :show-count="true"
+        :force-update-parameters="true"
       />
     </template>
     <ClassicLoading
@@ -77,6 +82,7 @@ import { computed, defineAsyncComponent, ref, Ref, watch } from "vue";
 import { AxiosError } from "axios";
 import { useI18n } from "vue-i18n";
 import { useRoute } from "vue-router";
+import { useSimplePageParam } from "../composable/route/useSimplePageParam";
 const ShareSocialsButtons = defineAsyncComponent(
   () => import("../display/sharing/ShareSocialsButtons.vue"),
 );
@@ -92,6 +98,9 @@ const ShareAnonymous = defineAsyncComponent(() => import("../display/sharing/Sha
 //Props
 const props = defineProps({
   participantId: { default: undefined, type: Number },
+  pr: { default: 0, type: Number },
+  ps: { default: 30, type: Number },
+  routeQuery: { default: "", type: String },
 });
 
 
@@ -110,6 +119,11 @@ const {  isEditRights } = useOrgaComputed();
 const { updatePathParams } = useSeoTitleUrl();
 const {handle403} = useErrorHandler();
 const filterStore = useFilterStore();
+const {
+  searchPattern,
+  paginateFirst,
+  isInit
+} = useSimplePageParam(props, true);
 
 
 //Computed

package/src/components/pages/PlaylistPage.vue

@@ -18,8 +18,7 @@
               width="250"
               height="250"
               aria-hidden="true"
-        alt=""
-              
+              alt=""
               :title="t('Playlist name image', { name: name })"
               class="img-box float-start me-3 mb-3"
             />
@@ -42,7 +41,13 @@
           :organisation-id="playlist.organisation.id"
         />
         <section class="module-box">
-          <PodcastList :playlist="playlist" />
+          <PodcastList 
+            v-if="isInit"
+            v-model:query="searchPattern"
+            :first="paginateFirst"
+            :size="ps"
+            :playlist="playlist"
+          />
         </section>
       </div>
     </template>
@@ -71,6 +76,7 @@ import {defineAsyncComponent, ref, Ref, computed, watch, onBeforeUnmount } from
 import { AxiosError } from "axios";
 import { useI18n } from "vue-i18n";
 import { useRoute } from "vue-router";
+import { useSimplePageParam } from "../composable/route/useSimplePageParam";
 const ShareSocialsButtons = defineAsyncComponent(
   () => import("../display/sharing/ShareSocialsButtons.vue"),
 );
@@ -89,6 +95,9 @@ const ShareAnonymous = defineAsyncComponent(() => import("../display/sharing/Sha
 //Props
 const props = defineProps({
   playlistId: { default: undefined, type: Number },
+  pr: { default: 0, type: Number },
+  ps: { default: 30, type: Number },
+  routeQuery: { default: "", type: String },
 });
 
 
@@ -108,7 +117,11 @@ const {handle403} = useErrorHandler();
 const authStore = useAuthStore();
 const filterStore = useFilterStore();
 const generalStore = useGeneralStore();
-
+const {
+  searchPattern,
+  paginateFirst,
+  isInit
+} = useSimplePageParam(props, true);
 
 
 //Computed

package/src/components/pages/PodcastPage.vue

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

package/src/helper/loadScript.ts

@@ -1,4 +1,4 @@
-function loadScript(src: string, async:boolean, callback: any) {
+function loadScript(src: string, async:boolean, callback: (isLoaded:boolean) => void) {
   const firstElement = document.getElementsByTagName('head')[0] || document.documentElement,
   scriptElement = document.createElement('script');
   scriptElement.type = 'text/javascript';
@@ -6,13 +6,13 @@ function loadScript(src: string, async:boolean, callback: any) {
   scriptElement.async = async;
   scriptElement.addEventListener('load', function() {
     if(callback && typeof callback === 'function') {
-      callback(true, window);
+      callback(true);
     }
   }, false);
-  scriptElement.addEventListener('error', function(error) {
+  scriptElement.addEventListener('error', function() {
     firstElement.removeChild(scriptElement);
     if(callback && typeof callback === 'function') {
-      callback(false, error);
+      callback(false);
     }
   }, false);
   firstElement.insertBefore(scriptElement, firstElement.firstChild);

package/src/locale/de.ts

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -144,9 +144,13 @@ const routes: Array<RouteRecordRaw> = [
     component: EmissionPage,
     props: (route: RouteLocationNormalized) => ({
       emissionId: parseInt(route.params.emissionId.toString(), 10),
+      pr: route.query.pr ? parseInt(route.query.pr.toString(), 10) : undefined,
+      ps: route.query.ps ? parseInt(route.query.ps.toString(), 10) : undefined,
+      routeQuery: route.query.q ?? "",
     }),
     meta:{
-      title: ""
+      title: "",
+      noScroll:true
     }
   },
   {
@@ -177,9 +181,13 @@ const routes: Array<RouteRecordRaw> = [
     component: ParticipantPage,
     props: (route: RouteLocationNormalized) => ({
       participantId: parseInt(route.params.participantId.toString(), 10),
+      pr: route.query.pr ? parseInt(route.query.pr.toString(), 10) : undefined,
+      ps: route.query.ps ? parseInt(route.query.ps.toString(), 10) : undefined,
+      routeQuery: route.query.q ?? "",
     }),
     meta:{
-      title: ""
+      title: "",
+      noScroll:true
     }
   },
   {
@@ -266,9 +274,13 @@ const routes: Array<RouteRecordRaw> = [
     component: PlaylistPage,
     props: (route: RouteLocationNormalized) => ({
       playlistId: parseInt(route.params.playlistId.toString(), 10),
+      pr: route.query.pr ? parseInt(route.query.pr.toString(), 10) : undefined,
+      ps: route.query.ps ? parseInt(route.query.ps.toString(), 10) : undefined,
+      routeQuery: route.query.q ?? "",
     }),
     meta:{
-      title: ""
+      title: "",
+      noScroll:true
     }
   },
   //Fake route to avoid errors
@@ -321,7 +333,8 @@ const routes: Array<RouteRecordRaw> = [
 const router = createRouter({
   history: createWebHistory(),
   routes: routes,
-  scrollBehavior(): { left: number; top: number } {
+  scrollBehavior(to, from) {
+    if (to.name === from.name && to.meta.noScroll) return false;
     return { left: 0, top: 0 };
   },
 });