@saooti/octopus-sdk 31.0.26 → 31.0.27

package/src/components/pages/Podcasts.vue

@@ -3,19 +3,14 @@
     <div
       class="d-flex"
       :class="
-        isEmissionChooser ? 'justify-content-between' : 'justify-content-center'
+        pageParameters.isEmissionChooser ? 'justify-content-between' : 'justify-content-center'
       "
     >
       <h1 class="flex-shrink-0">
-        <template v-if="undefined === titlePage">
-          {{ $t('All podcasts') }}
-        </template>
-        <template v-else>
-          {{ titlePage }}
-        </template>
+        {{ titleDisplay }}
       </h1>
       <EmissionChooser
-        v-if="isEmissionChooser"
+        v-if="pageParameters.isEmissionChooser"
         :defaultanswer="$t('No emission filter')"
         width="auto"
         class="ms-3"
@@ -23,7 +18,7 @@
       />
     </div>
     <ProductorSearch
-      v-if="isProductorSearch"
+      v-if="pageParameters.isProductorSearch"
       :organisation-id="organisationId"
       :search-pattern="searchPattern"
       @updateOrganisationId="updateOrganisationId"
@@ -33,18 +28,18 @@
       :is-education="isEducation"
       :is-emission="false"
       :reset-rubriquage="resetRubriquage"
-      :is-search-bar="isProductorSearch"
+      :is-search-bar="pageParameters.isProductorSearch"
       :sort-criteria="sortCriteria"
-      :includeHidden="includeHidden"
+      :include-hidden="includeHidden"
       :organisation-id="organisationId"
-      @updateCategory="updateCategory"
+      @updateCategory="iabId=$event"
       @updateRubriquageFilter="updateRubriquageFilter"
-      @updateMonetization="updateMonetization"
-      @updateFromDate="updateFromDate"
-      @updateToDate="updateToDate"
-      @updateSortCriteria="updateSortCriteria"
-      @includeHidden="updateHidden"
-      @notValid="updateNotValid"
+      @updateMonetization="monetization = $event"
+      @updateFromDate="fromDate = $event"
+      @updateToDate="toDate = $event"
+      @updateSortCriteria="sortCriteria=$event"
+      @includeHidden="includeHidden = $event"
+      @notValid="notValid = $event"
     />
     <PodcastList
       :show-count="true"
@@ -68,32 +63,30 @@
 </template>
 
 <script lang="ts">
+import { orgaComputed } from '../mixins/orgaComputed';
 import PodcastList from '../display/podcasts/PodcastList.vue';
 import { state } from '../../store/paramStore';
 import ProductorSearch from '../display/filter/ProductorSearch.vue';
 import AdvancedSearch from '../display/filter/AdvancedSearch.vue';
 import { Emission } from '@/store/class/general/emission';
-import { Category } from '@/store/class/general/category';
 import { RubriquageFilter } from '@/store/class/rubrique/rubriquageFilter';
 
 import { defineComponent, defineAsyncComponent } from 'vue';
 const EmissionChooser = defineAsyncComponent(() => import('../display/emission/EmissionChooser.vue'));
 export default defineComponent({
   name:"Podcasts",
-
   components: {
     PodcastList,
     ProductorSearch,
     EmissionChooser,
     AdvancedSearch,
   },
-
+  mixins:[orgaComputed],
   props: {
     productor: { default: undefined, type: String},
     isEducation: { default: false, type: Boolean},
     searchInit: { default: "", type: String}
   },
-
   data() {
     return {
       first: 0 as number,
@@ -116,17 +109,11 @@ export default defineComponent({
   },
 
   computed: {
-    rubriqueFilter(): Array<RubriquageFilter>{
-      return this.$store.state.filter.rubriqueFilter;
-    },
-    categoryFilter(): Category|undefined{
-      return this.$store.state.filter.iab;
-    },
-    authenticated(): boolean {
-      return (state.generalParameters.authenticated as boolean);
-    },
-    myOrganisationId(): string|undefined {
-      return state.generalParameters.organisationId;
+    titleDisplay(): string{
+      if(undefined === state.podcastsPage.titlePage){
+        return this.$t('All podcasts');
+      }
+      return state.podcastsPage.titlePage;
     },
     organisationRight(): boolean {
       if (
@@ -136,62 +123,30 @@ export default defineComponent({
         return true;
       return false;
     },
-    filterOrga(): string|undefined {
-      return this.$store.state.filter.organisationId;
-    },
     organisation(): string|undefined {
       if (this.organisationId) return this.organisationId;
       if (this.filterOrga) return this.filterOrga;
       return undefined;
     },
-    isProductorSearch(): boolean {
-      return (state.podcastsPage.ProductorSearch as boolean);
-    },
-    titlePage(): string|undefined {
-      return state.podcastsPage.titlePage;
-    },
-    isEmissionChooser(): boolean {
-      return (state.podcastsPage.emissionChooser as boolean);
-    },
+    pageParameters(){
+      return {
+        isProductorSearch: state.podcastsPage.ProductorSearch,
+        isEmissionChooser: state.podcastsPage.emissionChooser
+      }
+    }
   },
 
   created() {
-    if(this.searchInit){
-      this.searchPattern = this.searchInit;
-    }
-    if (this.productor) {
-      this.organisationId = this.productor;
-    } else if (this.$store.state.filter.organisationId) {
-      this.organisationId = this.$store.state.filter.organisationId;
-    }
-    if (this.organisation && this.organisationRight) {
-      this.includeHidden = true;
-    }
-    if(this.categoryFilter){
-      this.iabId = this.categoryFilter.id;
-    }
-    if(this.rubriqueFilter.length){
-      this.updateRubriquageFilter(this.rubriqueFilter);
+    this.searchPattern = this.searchInit ? this.searchInit : '';
+    this.organisationId = this.productor ? this.productor : this.filterOrga;
+    this.includeHidden = this.organisation && this.organisationRight ? true : false;
+    this.iabId = this.$store.state.filter.iab ? this.$store.state.filter.iab.id : undefined;
+    if(this.$store.state.filter.rubriqueFilter.length){
+      this.updateRubriquageFilter(this.$store.state.filter.rubriqueFilter);
     }
   },
   
-  
   methods: {
-    updateCategory(value: number|undefined){
-      this.iabId = value;
-    },
-    updateSortCriteria(value: string): void {
-      this.sortCriteria = value;
-    },
-    updateHidden(value: boolean): void {
-      this.includeHidden = value;
-    },
-    updateToDate(value: string): void {
-      this.toDate = value;
-    },
-    updateFromDate(value: string): void {
-      this.fromDate = value;
-    },
     updateRubriquageFilter(value: Array<RubriquageFilter>){
       const length = value.length;
       const allRubriquageId: Array<number>= [];
@@ -218,25 +173,11 @@ export default defineComponent({
       this.organisationId = value;
     },
     updateSearchPattern(value: string): void {
-      if ('' !== value) {
-        this.sortCriteria = 'SCORE';
-      } else {
-        this.sortCriteria = 'DATE';
-      }
+      this.sortCriteria = '' !== value ? 'SCORE' : 'DATE';
       this.searchPattern = value;
     },
-    updateMonetization(value: string): void {
-      this.monetization = value;
-    },
-    updateNotValid(value: boolean): void {
-      this.notValid = value;
-    },
     emissionSelected(emission: Emission): void {
-      if (emission && emission.emissionId) {
-        this.emissionId = emission.emissionId;
-      } else {
-        this.emissionId = undefined;
-      }
+      this.emissionId = emission && emission.emissionId ? emission.emissionId : undefined;
     },
   },
 })

package/src/components/pages/Rubrique.vue

@@ -15,37 +15,26 @@ import PodcastList from '../display/podcasts/PodcastList.vue';
 import { defineComponent } from 'vue'
 export default defineComponent({
   name:"Rubrique",
-
   components: {
     PodcastList,
   },
-
   props: {
     firstRoute: { default: 0, type: Number},
     sizeRoute: { default: 12, type: Number},
     rubriqueId: { default: undefined, type:  [ Number ]},
   },
-
   data() {
     return {
       title: '' as string,
     };
   },
-
   watch: {
-    rubriqueId(): void {
-      this.extractTitle();
-    },
-  },
-
-  mounted() {
-    this.extractTitle();
-  },
-
-  methods: {
-    async extractTitle(): Promise<void> {
-      const data = await octopusApi.fetchRubric(this.rubriqueId);
-      this.title = data.name;
+    rubriqueId: {
+      immediate: true,
+      async handler() {
+        const data = await octopusApi.fetchRubric(this.rubriqueId);
+        this.title = data.name;
+      },
     },
   },
 })

package/src/components/pages/Search.vue

@@ -1,16 +1,6 @@
 <template>
   <div class="page-box">
-    <h1>
-      <template v-if="!hideBar">
-        {{ $t('Podcast search') }}
-      </template>
-      <template v-else-if="!noResult">
-        {{ $t('Search results', { query: rawQuery }) }}
-      </template>
-      <template v-else>
-        {{ $t('Search - no results', { query: rawQuery }) }}
-      </template>
-    </h1>
+    <h1>{{ titlePage }}</h1>
     <ClassicSearch
       v-if="!hideBar"
       v-model:textInit="rawQuery"
@@ -23,7 +13,7 @@
       :query="query"
       :first="0"
       :size="20"
-      @emptyList="onListEmpty"
+      @emptyList="noResult = true"
     />
   </div>
 </template>
@@ -35,24 +25,29 @@ import PodcastList from '../display/podcasts/PodcastList.vue';
 import { defineComponent } from 'vue';
 export default defineComponent({
   name: "Search",
-
   components: {
     PodcastList,
     ClassicSearch
   },
-
   props: {
     queryRoute: { default: '', type: String },
   },
-  
   data() {
     return {
       rawQuery: '' as string,
       noResult: false as boolean,
     };
   },
-
   computed: {
+    titlePage():string{
+      if(!this.hideBar){
+        return this.$t('Podcast search');
+      }
+      if(!this.noResult){
+        return this.$t('Search results', { query: this.rawQuery })
+      }
+      return this.$t('Search - no results', { query: this.rawQuery });
+    },
     query(): string {
       if (this.rawQuery && this.rawQuery.length >= 3) return this.rawQuery;
       return '';
@@ -61,32 +56,17 @@ export default defineComponent({
       return (state.searchPage.hideBar as boolean);
     },
   },
-
   watch: {
     rawQuery(): void{
       if (this.hideBar) {
         this.noResult = false;
       }
     },
-    query(): void{
-      this.rawQuery = this.query;
-    },
-    queryRoute(): void{
-      this.rawQuery = this.queryRoute;
-    }
-  },
-
-  mounted() {
-    if (this.queryRoute) {
-      this.rawQuery = this.queryRoute;
-    }
-  },
-  
-  methods: {
-    onListEmpty(): void {
-      if (this.hideBar) {
-        this.noResult = true;
-      }
+    queryRoute: {
+      immediate: true,
+      handler() {
+       this.rawQuery = this.queryRoute;
+      },
     },
   },
 })

package/src/store/paramStore.ts

@@ -12,7 +12,7 @@ const state:paramStore = {
     isPlaylist: false,
     isProduction: true,
     isContribution: true,
-    ApiUri: 'https://api.dev2.saooti.org/',
+    ApiUri: 'https://api.preprod.saooti.org/',
     podcastmaker: false,
     buttonPlus: true,
     allCategories: [],
@@ -27,11 +27,13 @@ const state:paramStore = {
     ShareButtons: true,
     ShareDistribution: true,
     MiniplayerUri: 'https://playerbeta.dev2.saooti.org/',
-    ouestFranceStyle: false,
     downloadButton: false,
-    hlsUri: 'https://hls.dev2.saooti.org/',
+    hlsUri: 'https://hls.preprod.saooti.org/',
     mainRubrique: 0,
-    resourceUrl: undefined
+    resourceUrl: undefined,
+    podcastItemShowEmission: false,
+    clickPlayGoPage:false,
+    listTypeClassic: true,
   },
   podcastsPage: {
     ProductorSearch: true,
@@ -54,7 +56,6 @@ const state:paramStore = {
     progressBar:false
   },
   emissionPage: {
-    ouestFranceStyle: false,
     rssButton: false,
     isDisplayPodcasts:true,
     overflowScroll:false
@@ -83,10 +84,10 @@ const state:paramStore = {
     userName: '',
   },
   octopusApi: {
-    url: 'http://api.dev2.saooti.org/',
-    commentsUrl: 'http://comments.dev2.saooti.org/',
-    studioUrl: 'http://studio.dev2.saooti.org/',
-    playerUrl: 'https://playerbeta.dev2.saooti.org/',
+    url: 'http://api.preprod.saooti.org/',
+    commentsUrl: 'http://comments.preprod.saooti.org/',
+    studioUrl: 'http://studio.preprod.saooti.org/',
+    playerUrl: 'https://playerbeta.preprod.saooti.org/',
     organisationId: undefined,
     rubriqueIdFilter: undefined,
   },
@@ -117,11 +118,13 @@ export interface PodcastPage{
   ShareButtons?: boolean,
   ShareDistribution?: boolean,
   MiniplayerUri?: string,
-  ouestFranceStyle?: boolean,
   downloadButton?: boolean,
   hlsUri?: string,
   mainRubrique?: number,
   resourceUrl?: string |undefined,
+  podcastItemShowEmission?: boolean,
+  clickPlayGoPage?:boolean,
+  listTypeClassic?:boolean
 }
 export interface PodcastsPage{
   ProductorSearch?: boolean,
@@ -144,7 +147,6 @@ export interface EmissionsPage{
   progressBar?:boolean
 }
 export interface EmissionPage{
-  ouestFranceStyle?: boolean,
   rssButton?: boolean,
   isDisplayPodcasts?:boolean,
   overflowScroll?: boolean,