@saooti/octopus-sdk 41.0.9-SNAPSHOT → 41.0.11-SNAPSHOT

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saooti/octopus-sdk",
-  "version": "41.0.9-SNAPSHOT",
+  "version": "41.0.11-SNAPSHOT",
   "private": false,
   "description": "Javascript SDK for using octopus",
   "author": "Saooti",

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/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] ||
@@ -172,14 +172,10 @@ onMounted(()=>{
 })
 
 //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/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] ||
@@ -119,10 +119,6 @@ onBeforeMount(()=>fetchContent(true))
 
 
 //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] ||
@@ -113,14 +113,10 @@ onMounted(()=>fetchContent(true))
 
 
 //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] ||
@@ -165,14 +165,10 @@ watch(dfirst, () => {
 onBeforeMount(()=>fetchContent(true))
 
 //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/pages/EmissionPage.vue

@@ -71,16 +71,16 @@
           />
           <PodcastFilterList
             v-if="isInit"
+            v-model:query="searchPattern"
             class="mx-2"
             :first="paginateFirst"
             :size="ps"
-            v-model:query="searchPattern"
             :show-count="true"
             :emission-id="emissionId"
             :category-filter="false"
             :edit-right="editRight"
             :productor-id="[emission.orga.id]"
-            :forceUpdateParameters="true"
+            :force-update-parameters="true"
             @fetch="podcastsFetched"
           />
         </section>

package/src/components/pages/ParticipantPage.vue

@@ -48,16 +48,16 @@
       <!-- productorId define to avoid overwrite #12817 -->
       <PodcastFilterList
         v-if="isInit"
+        v-model:query="searchPattern"
         :first="paginateFirst"
         :size="ps"
-        v-model:query="searchPattern"
         :participant-id="participantId"
         :name="name"
         :category-filter="true"
         :productor-id="['']"
         :reload="reload"
         :show-count="true"
-        :forceUpdateParameters="true"
+        :force-update-parameters="true"
       />
     </template>
     <ClassicLoading

package/src/components/pages/PlaylistPage.vue

@@ -43,9 +43,9 @@
         <section class="module-box">
           <PodcastList 
             v-if="isInit"
+            v-model:query="searchPattern"
             :first="paginateFirst"
             :size="ps"
-            v-model:query="searchPattern"
             :playlist="playlist"
           />
         </section>