@saooti/octopus-sdk 32.0.17 → 32.0.20

package/README.md

@@ -660,4 +660,7 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
  * 32.0.14 Mise en place Vite au lieu de Webpack
  * 32.0.15 Pb lié refactor
  * 32.0.16 Pb lié refactor
- * 32.0.17 AdvancedSearch components
+ * 32.0.17 AdvancedSearch components
+ * 32.0.18 AdvancedSearch components
+ * 32.0.19 Playlist publique
+ * 32.0.20 Playlist publique

package/index.ts

@@ -42,7 +42,6 @@ import PodcastPlaylistInlineList from "./src/components/display/playlist/Podcast
 
 //AdvancedSearch
 import AdvancedSearch from "./src/components/display/filter/AdvancedSearch.vue";
-import CategorySearchFilter from "./src/components/display/filter/CategorySearchFilter.vue";
 import RubriqueFilter from "./src/components/display/filter/RubriqueFilter.vue";
 import DateFilter from "./src/components/display/filter/DateFilter.vue";
 import SearchOrder from "./src/components/display/filter/SearchOrder.vue";
@@ -118,7 +117,6 @@ const components = {
     Error403Page,
     Paginate,
     ListPaginate,
-    CategorySearchFilter,
     RubriqueFilter,
     DateFilter,
     SearchOrder
@@ -179,7 +177,6 @@ export {
     Error403Page,
     Paginate,
     ListPaginate,
-    CategorySearchFilter,
     RubriqueFilter,
     DateFilter,
     SearchOrder

package/package.json

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

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

@@ -70,6 +70,8 @@ export default defineComponent({
   },
   props: {
     isEmission: { default: false, type:  Boolean},
+    initToDate: { default: undefined, type:  String},
+    initFromDate: { default: undefined, type:  String},
   },
 
   emits: ['updateToDate', 'updateFromDate'],
@@ -91,6 +93,17 @@ export default defineComponent({
       this.$emit('updateToDate', this.isTo ? moment(this.toDate).toISOString(true) : undefined);
     },
   },
+
+  created(){
+    if(this.initToDate){
+      this.toDate = this.initToDate;
+      this.isTo = true;
+    }
+    if(this.initFromDate){
+      this.fromDate = this.initFromDate;
+      this.isFrom = true;
+    }
+  },
   methods: {
     updateFromDate(): void {
       if (

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

@@ -25,7 +25,7 @@
         class="ms-2"
         :multiple="false"
         :rubriquage-id="rubriquageId"
-        :rubrique-selected="0 < rubriqueIdSelected? rubriqueIdSelected : undefined"
+        :rubrique-selected="0 !== rubriqueIdSelected? rubriqueIdSelected : undefined"
         :all-rubriques="getRubriques(rubriquageId)"
         :defaultanswer="$t('No rubric filter')"
         :reset="reset"
@@ -67,12 +67,23 @@ export default defineComponent({
       reset: false as boolean,
     };
   },
+  watch:{
+    rubriquageIdSelected(){
+      this.initRubriquage();
+    },
+    rubriqueIdSelected(){
+      this.initRubriquage();
+    }
+  },
 
   created(){
-    this.rubriquageId = this.rubriquageIdSelected;
+    this.initRubriquage();
   },
 
   methods: {
+    initRubriquage(){
+      this.rubriquageId = this.rubriquageIdSelected;
+    },
     deleteRubriquage(){
       this.$emit('deleteRubriqueChoice');
     },

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

@@ -51,6 +51,8 @@ export default defineComponent({
   props: {
     organisationId: { default: undefined, type: String},
     resetRubriquage: { default: false, type:  Boolean},
+    modifyFilter:{ default: true, type:  Boolean},
+    initRubriqueFilter:{ default: undefined, type: Array as ()=> Array<RubriquageFilter>},
   },
   emits: ['updateRubriquageFilter'],
 
@@ -111,7 +113,9 @@ export default defineComponent({
       }else{
         this.$emit('updateRubriquageFilter', []);
       }
-      this.resetRubriqueFilter();
+      if(this.modifyFilter){
+        this.resetRubriqueFilter();
+      }
       this.$nextTick(() => {
         this.isInternChanged = false;
       });
@@ -123,7 +127,9 @@ export default defineComponent({
           return;
         }
         this.isInternChanged = true;
-        this.resetRubriqueFilter();
+        if(this.modifyFilter){
+          this.resetRubriqueFilter();
+        }
         if(this.isRubriquage){
           this.$emit('updateRubriquageFilter', this.arrayFilter);
         }
@@ -135,7 +141,7 @@ export default defineComponent({
     rubriqueFilter:{
       deep: true,
       async handler(){
-        if(this.isInternChanged){
+        if(this.isInternChanged || !this.modifyFilter){
           return;
         }
         this.isInternChanged = true;
@@ -161,7 +167,12 @@ export default defineComponent({
   },
 
   created() {
-    if(this.rubriqueFilter.length){
+    if(!this.modifyFilter){
+      if(this.initRubriqueFilter && this.initRubriqueFilter.length > 0){
+        this.arrayFilter = Array.from(this.initRubriqueFilter);
+        this.isRubriquage = true;
+      }
+    }else if(this.rubriqueFilter.length){
       this.arrayFilter = Array.from(this.rubriqueFilter);
       this.isRubriquage = true;
     }
@@ -218,7 +229,7 @@ export default defineComponent({
       }
     },
     resetRubriqueFilter(): void{
-      if(0===this.rubriqueFilter.length || this.isInit){
+      if(0===this.rubriqueFilter.length || this.isInit || !this.modifyFilter){
         return;
       }
       const queries = this.$route.query;

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

@@ -100,7 +100,7 @@ export default defineComponent({
         true == state.generalParameters.isAdmin;
     },
     activePlaylist(): boolean {
-      return 0 !== Object.keys(this.playlist.podcasts).length;
+      return 0 !== Object.keys(this.playlist.samplingViews??[]).length;
     },
   },
   mounted() {

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

@@ -85,7 +85,7 @@ export default defineComponent({
       return this.notEmptyPlaylist ? this.$t('Podcasts in the playlist') : this.$t('No podcasts in the playlist');
     },
     notEmptyPlaylist(): boolean {
-      return 0 !== Object.keys(this.playlist.podcasts).length;
+      return 0 !== Object.keys(this.playlist.samplingViews??[]).length;
     },
     podcastsDisplay(): Array<Podcast>{
       if(this.isMobile){
@@ -122,11 +122,7 @@ export default defineComponent({
         this.podcasts.length = 0;
         this.loading = true;
         try {
-          const content = await octopusApi.fetchData<Array<Podcast>>(0, 'playlist/'+this.playlist.playlistId+'/content');
-          for (let index = 0, len = content.length; index < len; index++) {
-            content[index].order = this.playlist.podcasts[content[index].podcastId];
-          }
-          this.podcasts = content;
+          this.podcasts = await octopusApi.fetchData<Array<Podcast>>(0, 'playlist/'+this.playlist.playlistId+'/content');
           if (!this.editRight) {
             this.podcasts = this.podcasts.filter((p: Podcast|null) => {
               return (

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

@@ -38,7 +38,6 @@
       :pub-date="podcast.pubDate"
       :podcast-organisation-id="podcast.organisation.id"
       :podcast-organisation-name="podcast.organisation.name"
-      :podcast-order="podcast.order"
       :duration="podcast.duration"
       :animators="podcast.animators"
       @mouseenter="showDescription"

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

@@ -45,10 +45,6 @@
       >
         <div>{{ '© ' + podcastOrganisationName }}</div>
       </router-link>
-      <span
-        v-if="editRight && podcastOrder && podcastOrder > 1"
-        class="saooti-pin text-danger pe-2"
-      />
     </div>
   </div>
 </template>
@@ -79,7 +75,6 @@ export default defineComponent({
     pubDate: { default: "", type: String},
     podcastOrganisationId: { default: "", type: String},
     podcastOrganisationName: { default: "", type: String},
-    podcastOrder: { default: undefined, type: Number},
     duration: { default: 0, type: Number},
     animators: { default: undefined, type: Object as ()=> Array<Participant>},
   },

package/src/store/class/general/playlist.ts

@@ -1,13 +1,33 @@
 import { Organisation } from '../general/organisation';
 import { Person } from '../user/person';
+import { FetchParam } from './fetchParam';
+
 
 export interface Playlist {
   imageUrl?: string;
   description: string;
   organisation?: Organisation;
   playlistId: number;
-  podcasts: Array<number | undefined>;
+  podcasts?: Array<number | undefined>;
   score: number;
   title: string;
+  type: string;
+  samplingViews?: Array<PlaylistRule>;
   publisher?: Person;
 }
+
+export interface PlaylistRule {
+  maxSize: number,
+  podcastId?: number,
+  query?: FetchParam,
+  type?:string,
+  title?: string,
+}
+
+export function emptyPlaylistRule(): PlaylistRule{
+  return {
+    maxSize: 1,
+    query: {},
+    title: undefined,
+  }
+}