@saooti/octopus-sdk 41.0.3-SNAPSHOT → 41.0.3

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

@@ -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"
@@ -216,7 +219,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,13 +5,33 @@
       '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
-    }}
-    <AsteriskIcon v-if="displayRequired" :size="10" class="ms-1 mb-2" :title="t('Mandatory input')"/>
-  </label>
+    <div class="d-flex align-items-center">
+      <label :class="displayLabel ? '' : 'd-none'" :for="id" class="form-label">{{
+        label
+      }}
+      <AsteriskIcon v-if="displayRequired" :size="10" class="ms-1 mb-2" :title="t('Mandatory input')"/>
+      </label>
+      <template v-if="popover">
+        <button
+          :id="'popover' + id"
+          :title="t('Help')"
+          class="btn-transparent"
+        >
+          <HelpCircleIcon :size="30" />
+        </button>
+        <ClassicPopover
+          :target="'popover' + id"
+          popover-class="popover-z-index"
+          :relative-class="popoverRelativeClass"
+        >
+          <!-- eslint-disable vue/no-v-html -->
+          <div v-html="popover" />
+          <!-- eslint-enable -->
+        </ClassicPopover>
+      </template>
+    </div>
     <vSelect
       v-model="optionSelected"
       :input-id="id"
@@ -28,6 +48,7 @@
       "
       :filter="fakeSearch"
       :selectable="() => !maxOptionsSelected"
+      :style="{height: height }"
       :class="{ 'border border-danger': textDanger?.length }"
       @open="onSearch"
       @search="onSearch"
@@ -76,12 +97,15 @@
 </template>
 
 <script setup lang="ts">
-import { computed, ref, Ref, watch } from "vue";
+import { computed, defineAsyncComponent, ref, Ref, watch } from "vue";
 import { useI18n } from "vue-i18n";
 import AsteriskIcon from "vue-material-design-icons/Asterisk.vue";
 import ChevronDownIcon from "vue-material-design-icons/ChevronDown.vue";
 import vSelect from "vue-select";
-
+import HelpCircleIcon from "vue-material-design-icons/HelpCircle.vue";
+const ClassicPopover = defineAsyncComponent(
+  () => import("../misc/ClassicPopover.vue"),
+);
 
 //Props 
 const props = defineProps({
@@ -93,6 +117,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 },
@@ -104,6 +129,8 @@ const props = defineProps({
   allowEmpty: { default: true, type: Boolean },
   textDanger :{ default: undefined, type: String },
   displayRequired: { default: false, type: Boolean },
+  popover: { default: undefined, type: String },
+  popoverRelativeClass: { default: undefined, type: String },
 })
 
 //Emits
@@ -209,6 +236,7 @@ defineExpose({
 
   .vs__dropdown-toggle {
     padding: 0;
+    height: 100%;
   }
 
   .vs__search:focus {

package/src/components/misc/ClassicAccordion.vue

@@ -20,11 +20,11 @@
           class="img-accordion"
           :src="imageUrl"
           aria-hidden="true"
-        alt=""
-          
+          alt=""
         />
-        <span class="flex-grow-1">{{ title }}</span>
-        <ChevronDownIcon :class="{ 'arrow-transform': isOpen }" />
+        <span>{{ title }}</span>
+        <slot name="afterTitle"/>
+        <ChevronDownIcon class="ms-auto" :class="{ 'arrow-transform': isOpen }" />
       </button>
       <div v-show="isOpen" class="body p-2">
         <slot />

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/ClassicSpinner.vue

@@ -16,7 +16,7 @@ defineProps({
   --size-spinner: 3rem;
   --size-spinner-section: calc(var(--size-spinner) / 20);
   --half-size-spinner: calc(var(--size-spinner) / 2);
-
+  
   color: #000000;
   display: inline-block;
   position: relative;

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(

package/src/components/misc/TopBar.vue

@@ -3,7 +3,7 @@
     role="banner"
     class="header-saooti-play"
     :style="headerBackgroundImage"
-    :class="[generalStore.contentToDisplay ? 'header-img-bg':'header-color-bg', scrolled? 'scrolled':'', needToBlur ? 'header-force-blur':'']"
+    :class="[generalStore.contentToDisplay ? 'header-img-bg':'bg-gradient', scrolled? 'scrolled':'', needToBlur ? 'header-force-blur':'']"
   >
     <TopBarMainContent
       :is-phone="isPhone"
@@ -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}');`;
@@ -159,15 +160,7 @@ function handleScroll(): void {
       background-repeat: no-repeat;
       background-size: cover;
     }
-    &.header-color-bg{
-      background: var(--octopus-primary);
-      background: linear-gradient(
-        90deg,
-        var(--octopus-primary) 0%,
-        var(--octopus-tertiary) 100%
-      );
-    }
-    &.header-color-bg, &.scrolled{
+    &.bg-gradient, &.scrolled{
       box-shadow: 0 2px 15px 5px var(--octopus-shadow) !important; 
     }
   }

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/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/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/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 };
   },
 });

package/src/stores/AuthStore.ts

@@ -5,19 +5,19 @@ import { defineStore } from "pinia";
 import { KeycloakInfo } from "@/stores/class/user/person";
 import { VideoConfig } from "@/stores/class/config/videoConfig";
 import classicApi from "../api/classicApi";
-
+interface AuthParam{
+  accessToken?: string;
+  refreshToken?: string;
+  expiration?: Date|string;
+  clientId?: string;
+}
 interface AuthState {
   authReload: number;
   authName: string;
   authOrgaId?: string;
   authOrgaName?: string;
   authRole: Array<string>;
-  authParam: {
-    accessToken?: string;
-    refreshToken?: string;
-    expiration?: Date;
-    clientId?: string;
-  };
+  authParam:AuthParam;
   authProfile?: Profile;
   authOrganisation: Organisation;
   authVideoConfig: VideoConfig;
@@ -115,25 +115,25 @@ export const useAuthStore = defineStore("AuthStore", {
     },
   },
   actions: {
-    authUpdate(authentication: any) {
+    authUpdate(authentication: {name?:string, organisationId?:string,organisationName?:string, role?:Array<string>}) {
       this.authName = authentication.name ?? this.authName;
       this.authOrgaId = authentication.organisationId ?? this.authOrgaId;
       this.authOrgaName = authentication.organisationName ?? this.authOrgaName;
       this.authRole = authentication.role ?? this.authRole;
     },
-    authUpdateParam(oAuthParam: any) {
+    authUpdateParam(oAuthParam: AuthParam) {
       this.authParam = oAuthParam;
     },
-    authUpdateProfile(profile: any) {
+    authUpdateProfile(profile: Profile) {
       this.authProfile = profile;
       this.authName = profile.firstname + " " + profile.lastname;
     },
-    authUpdateOrganisation(organisation: any) {
+    authUpdateOrganisation(organisation: Organisation) {
       this.authOrganisation = organisation;
       const saveFetchStore = useSaveFetchStore();
       saveFetchStore.forceUpdateAttributes(
         organisation.id,
-        organisation.attributes,
+        organisation.attributes??{}
       );
       saveFetchStore.forceUpdateData(organisation.id, organisation);
     },

package/src/stores/FilterStore.ts

@@ -52,7 +52,7 @@ export const useFilterStore = defineStore("FilterStore", {
       this.filterRubrique = rubriqueFilter;
     },
     filterUpdateRubriqueDisplay(rubriques: Array<Rubrique>) {
-      this.filterRubriqueDisplay = rubriques;
+      this.filterRubriqueDisplay = rubriques.filter(rubrique=> rubrique);
     },
     filterUpdateMedia(filter: {
       type?: string;

package/src/stores/VastStore.ts

@@ -2,7 +2,7 @@ import { defineStore } from "pinia";
 import { AdPosition } from "./class/adserver/adPosition";
 
 interface VastState {
-  currentAd: any;
+  currentAd: google.ima.Ad|undefined;
   isAdPlaying: boolean;
   isAdPaused: boolean;
   isAdSkippable: boolean;
@@ -79,7 +79,7 @@ export const useVastStore = defineStore("VastStore", {
     ) {
       this.adPositionsPodcasts[podcastId] = adPositions;
     },
-    updateCurrentAd(currentAd: any) {
+    updateCurrentAd(currentAd: google.ima.Ad) {
       this.currentAd = currentAd;
       this.isAdSkipped = false;
     },

package/src/style/_variables.scss

@@ -27,6 +27,9 @@
     --octopus-background-transparent: oklch(from var(--octopus-background) l c h / 40%);
     --octopus-tertiary-really-transparent: oklch(from var(--octopus-tertiary) l c h / 30%);
 
+    //Gradient
+    --octopus-gradient : linear-gradient(90deg,var(--octopus-primary) 0%, var(--octopus-tertiary) 100%);
+
     // Size
     --octopus-image-size: 12.5rem;
     --octopus-podcast-size: 13.5rem;

package/src/style/general.scss

@@ -114,6 +114,11 @@ main, #app{
 		background: var(--octopus-complementary-color) !important;
 	}
 
+  .bg-gradient{
+    background: var(--octopus-primary);
+    background:var(--octopus-gradient);
+  }
+
   .text-blue-octopus{
     color: var(--octopus-tertiary) !important
   }