@saooti/octopus-sdk 30.0.0 → 30.0.4

package/README.md

@@ -493,4 +493,11 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
  * 29.0.24 Version stable vue3
  * 29.0.25 Specific category does not display in correct order
  * 29.0.26 Snackbar position
+ * 29.0.27 Petit cursor:pointer des familles
+ * 29.0.28 Petite couleur des familles
+ * 29.0.29 Amélioration Popover
 
+ * 30.0.1 Nouveau sprint
+ * 30.0.2 Correction css
+ * 30.0.3 Ajout tag page podcast
+ * 30.0.4 Remplacer la version "classique" des miniplayers par la version beta

package/index.ts

@@ -55,6 +55,7 @@ import {cookies} from "./src/components/mixins/functions";
 import {displayMethods} from "./src/components/mixins/functions";
 import {orgaFilter} from "./src/components/mixins/organisationFilter";
 import {initSDK} from "./src/components/mixins/init";
+import {tagOfMixins} from "./src/components/mixins/tagOfMixins";
 
 const components = {
     Lives,
@@ -97,7 +98,8 @@ const components = {
     CategoryFilter,
     orgaFilter,
     initSDK,
-    Popover
+    Popover,
+    tagOfMixins
 }
 
 export default components;
@@ -143,5 +145,6 @@ export {
     CategoryFilter,
     orgaFilter,
     initSDK,
-    Popover
+    Popover,
+    tagOfMixins
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saooti/octopus-sdk",
-  "version": "30.0.0",
+  "version": "30.0.4",
   "private": false,
   "description": "Javascript SDK for using octopus",
   "author": "Saooti",
@@ -15,7 +15,7 @@
   "main": "./dist/octopus.common.js",
   "dependencies": {
     "@popperjs/core": "^2.10.2",
-    "@saooti/octopus-api": "^0.29.7",
+    "@saooti/octopus-api": "^0.30.2",
     "@vue/cli": "^5.0.0-rc.0",
     "@vue/compat": "^3.2.21",
     "axios": "^0.24.0",

package/public/img/ouest_france_logo.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 41.1 41.2" style="enable-background:new 0 0 41.1 41.2;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#E2001A;}
+</style>
+<g>
+	<path class="st0" d="M28.1,1.5v13.3H12.7v-2h13.4v-12C15.1-2.3,3.8,4.1,0.7,15.1c-2.8,10,2.3,20.6,12,24.6V26.5h15.4v2H14.7v11.9
+		c10.9,3.2,22.4-3,25.6-13.9C43.3,16.3,38,5.4,28.1,1.5z"/>
+</g>
+</svg>

package/src/assets/form.scss

@@ -31,7 +31,8 @@
 	}
 
 	.form-check-input{
-	margin-right: 5px;
+		margin-right: 5px;
+		cursor: pointer;
 	}
 
 	.basic-select{
@@ -90,6 +91,7 @@
 	.nav{
 		border-bottom: 0.05rem solid #ddd;
 		.nav-item{
+			cursor: pointer;
 			flex-grow: 1;
 			text-align: center;
 			a {

package/src/assets/modal.scss

@@ -24,6 +24,7 @@
 		width: 100%;
 		background: white;
 		display: flex;
+		color: #353535 !important;
 		@media (max-width: 500px){
 			width: 95%;
 			margin: 2.5% !important;

package/src/components/display/categories/CategoryList.vue

@@ -156,9 +156,9 @@ export default defineComponent({
       }
     },
     async fetchCategories(organisationId: string): Promise<void> {
-      const data = await octopusApi.fetchCategoriesOrga(organisationId, {
+      const data = await octopusApi.fetchCategories({
         lang: this.$i18n.locale,
-      });
+      }, organisationId);
       this.$store.commit('categoriesOrgaSet', data);
     },
   },

package/src/components/display/comments/CommentItem.vue

@@ -24,7 +24,6 @@
           }}</b>
           <Popover
             :target="'popover-comment' + comment.comId"
-            triggers="hover"
             custom-class="wizard-help"
           >
             {{ $t('Comment waiting') }}

package/src/components/display/emission/EmissionChooser.vue

@@ -88,7 +88,7 @@ import octopusApi from '@saooti/octopus-api';
 const ELEMENTS_COUNT = 50;
 const DEFAULT_EMISSION_ID = 0;
 
-const getDefaultEmission = (defaultName: string) => {
+const getDefaultEmission = (defaultName: string): Emission|undefined => {
   if(''=== defaultName){
     return undefined;
   }

package/src/components/display/emission/EmissionInlineList.vue

@@ -152,8 +152,8 @@ export default defineComponent({
         first: this.first,
         size: this.size + 1,
         organisationId: this.organisationId,
-        rubriqueId: this.rubriqueId,
-        rubriquageId: this.rubriquageId,
+        rubriqueId: this.rubriqueId ?  [this.rubriqueId] : [],
+        rubriquageId: this.rubriquageId ? [this.rubriquageId] : [],
         sort: 'LAST_PODCAST_DESC',
       });
       this.loading = false;
@@ -169,8 +169,8 @@ export default defineComponent({
         });
       } */
       if (this.allEmissions.length + data.result.length < this.totalCount) {
-        const nexEl = data.result.pop();
-        this.preloadImage(nexEl.imageUrl);
+        const nexEl = data.result.pop() as Emission;
+        this.preloadImage(nexEl.imageUrl ? nexEl.imageUrl : "");
       }
       this.allEmissions = this.allEmissions.concat(data.result);
       if (this.allEmissions.length <= 3) {

package/src/components/display/emission/EmissionList.vue

@@ -61,7 +61,6 @@
 
 <script lang="ts">
 import octopusApi from '@saooti/octopus-api';
-import emissionApi from '@/api/emissions';
 import { state } from '../../../store/paramStore';
 
 import { Emission } from '@/store/class/emission';
@@ -186,15 +185,10 @@ export default defineComponent({
         noRubriquageId: this.noRubriquageId.length ? this.noRubriquageId : undefined,
         rubriqueId: this.rubriqueId.length ? this.rubriqueId : undefined,
         rubriquageId: this.rubriquageId.length ? this.rubriquageId : undefined,
+        includeHidden:this.includeHidden,
       };
-      if (this.includeHidden) {
-        param.includeHidden = this.includeHidden;
-        const data = await emissionApi.fetchEmissionsAdmin(this.$store.state, param);
-        this.afterFetching(reset, data);
-      } else {
-        const data = await octopusApi.fetchEmissions(param);
-        this.afterFetching(reset, data);
-      }
+      const data = await octopusApi.fetchEmissions(param);
+      this.afterFetching(reset, data);
     },
     afterFetching(reset: boolean, data: {count: number, result: Array<Emission>, sort: string}): void {
       if (reset) {

package/src/components/display/live/LiveItem.vue

@@ -234,7 +234,7 @@ export default defineComponent({
       if (!this.fetchConference || !this.fetchConference.podcastId) return;
       try {
         this.live = await octopusApi.fetchPodcast(
-          this.fetchConference.podcastId
+          this.fetchConference.podcastId.toString()
         );
       } catch {
         this.$emit('deleteItem', this.index);

package/src/components/display/organisation/OrganisationChooserLight.vue

@@ -41,7 +41,7 @@ export default defineComponent({
 
   data() {
     return  {
-      actual: -1 as number,
+      actual: -1 as number|string,
       organisation: undefined as Organisation|undefined,
       init: false as boolean,
     };

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

@@ -161,7 +161,7 @@ export default defineComponent({
       this.loading = true;
       this.loaded = false;
       const content = await octopusApi.fetchPlaylistContent(
-        this.playlist.playlistId
+        this.playlist.playlistId.toString()
       );
       for (let index = 0, len = content.length; index < len; index++) {
         content[index].order = this.playlist.podcasts[content[index].podcastId];

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

@@ -12,7 +12,6 @@
     <span class="mx-1">:</span>
     <Popover
       :target="idPopover"
-      triggers="hover"
       custom-class="participant-help"
     >
       <div class="text-center font-weight-bold">

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

@@ -235,8 +235,8 @@ export default defineComponent({
       this.loaded = true;
       this.totalCount = data.count;
       if (this.allPodcasts.length + data.result.length < this.totalCount) {
-        const nexEl = data.result.pop();
-        this.preloadImage(nexEl.imageUrl);
+        const nexEl = data.result.pop() as Podcast;
+        this.preloadImage(nexEl.imageUrl?nexEl.imageUrl:'');
       }
       this.allPodcasts = this.allPodcasts.concat(
         data.result.filter((pod: Podcast|null) => null !== pod)

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

@@ -46,7 +46,6 @@
 
 <script lang="ts">
 import octopusApi from '@saooti/octopus-api';
-import podcastApi from '@/api/podcasts';
 import PodcastItem from './PodcastItem.vue';
 import { state } from '../../../store/paramStore';
 
@@ -172,6 +171,7 @@ export default defineComponent({
         noRubriquageId: this.noRubriquageId.length ? this.noRubriquageId : undefined,
         rubriqueId: this.rubriqueId.length ? this.rubriqueId : undefined,
         rubriquageId: this.rubriquageId.length ? this.rubriquageId : undefined,
+        includeHidden: this.includeHidden
       };
       if (undefined !== this.notValid) {
         param.validity = !this.notValid;
@@ -179,14 +179,8 @@ export default defineComponent({
       if (this.notValid && !this.isProduction) {
         param.publisherId = this.$store.state.profile.userId;
       }
-      if (this.includeHidden) {
-        param.includeHidden = this.includeHidden;
-        const data = await podcastApi.fetchPodcastsAdmin(this.$store.state, param);
-        this.afterFetching(reset, data);
-      } else {
-        const data = await octopusApi.fetchPodcasts(param);
-        this.afterFetching(reset, data);
-      }
+      const data = await octopusApi.fetchPodcasts(param);
+      this.afterFetching(reset, data);
     },
     afterFetching(reset: boolean, data:  {count: number, result: Array<Podcast>, sort: string}): void {
       if (reset) {

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

@@ -146,7 +146,6 @@
       </div>
     </div>
     <TagList
-      v-if="isTagList"
       :tag-list="podcast.tags"
     />
   </div>
@@ -155,6 +154,7 @@
 <script lang="ts">
 import PodcastImage from './PodcastImage.vue';
 import ParticipantDescription from './ParticipantDescription.vue';
+import TagList from './TagList.vue';
 import { state } from '../../../store/paramStore';
 import moment from 'moment';
 // @ts-ignore
@@ -165,7 +165,6 @@ import { Conference } from '@/store/class/conference';
 
 import { defineComponent, defineAsyncComponent } from 'vue';
 const ShareButtons = defineAsyncComponent(() => import('../sharing/ShareButtons.vue'));
-const TagList = defineAsyncComponent(() => import('./TagList.vue'));
 const ErrorMessage = defineAsyncComponent(() => import('../../misc/ErrorMessage.vue'));
 export default defineComponent({
   name: "PodcastModuleBox",
@@ -205,9 +204,6 @@ export default defineComponent({
     isOuestFrance(): boolean {
       return (state.podcastPage.ouestFranceStyle as boolean);
     },
-    isTagList(): boolean {
-      return (state.podcastPage.tagList as boolean);
-    },
     isDownloadButton(): boolean {
       return (state.podcastPage.downloadButton as boolean);
     },

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

@@ -1,55 +1,66 @@
 <template>
-  <div v-if="undefined !== tagList">
-    <ul class="d-flex flex-wrap">
-      <li
-        v-for="tag in tagList"
-        :key="tag"
-        class="tagListElement"
+  <div
+    v-if="undefined !== tagList"
+    class="tag-list-component d-flex flex-wrap"
+  >
+    <div
+      v-for="(tag, index) in tagList"
+      :key="tag"
+      class="tagListElement"
+    >
+      <div
+        :id="'tag-list-from-podcast-page'+index"
+        class="tagListLink"
       >
-        <router-link
-          :to="{
-            name: 'search',
-            query: {
-              query: tag,
-              productor: $store.state.filter.organisationId,
-            },
-          }"
-          class="tagListLink"
+        <img
+          v-if="isOuestFranceTag(tag)"
+          class="ouest-france-logo"
+          src="/img/ouest_france_logo.svg"
         >
-          {{ tag }}
-        </router-link>
-      </li>
-    </ul>
+        {{ formateOfTag(tag) }}
+      </div>
+      <Popover
+        v-if="isOuestFranceTag(tag)"
+        :target="'tag-list-from-podcast-page'+index"
+        triggers="hover"
+        :content="tag.substring(4,tag.length)"
+        placement="bottom"
+      />
+    </div>
   </div>
 </template>
 
 <script lang="ts">
+import Popover from '../../misc/Popover.vue';
+import { tagOfMixins } from '../../mixins/tagOfMixins';
 import { defineComponent } from 'vue'
 export default defineComponent({
   name: 'TagList',
-  components: {},
+  components: {
+    Popover
+  },
+  mixins:[tagOfMixins],
   props: {
     tagList: { default: () => [], type: Array as ()=>Array<string>},
   },
-
-  methods: {},
+  methods: {
+  },
 })
 </script>
 
 <style lang="scss">
-.tagListElement {
-  display: flex;
-  margin: 0.4rem;
-  padding: 0.8rem;
-  border: 1px solid #999;
-  cursor: pointer;
-}
-.tagListLink {
-  font-weight: 700;
-  font-size: 1.2rem;
-  color: #666;
-  &:hover {
-    color: #666;
+.tag-list-component{
+  .ouest-france-logo{
+    width: 20px;
+    height: 20px;
+    margin-right: 5px;
+  }
+  .tagListElement {
+    display: flex;
+    margin: 0.4rem;
+    padding: 0.2rem;
+    border: 1px solid #999;
+    border-radius: 0.5rem;
   }
 }
 </style>

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

@@ -23,7 +23,7 @@
 
 <script lang="ts">
 import { state } from '../../../store/paramStore';
-import profileApi from '@/api/profile';
+import octopusApi from '@saooti/octopus-api';
 import Snackbar from '../../misc/Snackbar.vue';
 import QrcodeVue from 'qrcode.vue'
 import { defineComponent } from 'vue'
@@ -67,8 +67,7 @@ export default defineComponent({
       if(this.$store.state.organisation && this.$store.state.organisation.attributes && Object.keys(this.$store.state.organisation.attributes).length > 1){
         data = this.$store.state.organisation.attributes;
       }else{
-        data= await profileApi.fetchOrganisationAttibutes(
-          this.$store.state,
+        data= await octopusApi.fetchOrganisationAttributes(
           state.generalParameters.organisationId ? state.generalParameters.organisationId : ""
         );
       }

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

@@ -13,6 +13,7 @@
       <span
         v-if="authenticated"
         id="popover-share-help"
+        role="button"
         class="saooti-help ml-2"
         :aria-label="$t('Help')"
       />

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

@@ -34,27 +34,12 @@
               :emission="emission"
               :playlist="playlist"
               :custom-players="customPlayers"
-              :is-beta="isBeta"
             />
           </div>
           <SharePlayerColors
             v-model:color="color"
             v-model:theme="theme"
-            v-model:themeBeta="themeBeta"
-            :is-beta="isBeta"
           />
-          <div v-if="displayBetaChoice">
-            <input
-              id="isBetaCheckbox"
-              v-model="isBeta"
-              type="checkbox"
-              class="form-check-input"
-            >
-            <label
-              class="form-check-label me-2"
-              for="isBetaCheckbox"
-            >{{ $t('Use beta version') }}</label>
-          </div>
           <div
             v-if="isPodcastNotVisible || playlist"
             class="d-flex align-items-center flex-wrap"
@@ -106,7 +91,6 @@
 
 <script lang="ts">
 import { state } from '../../../store/paramStore';
-import profileApi from '@/api/profile';
 import octopusApi from '@saooti/octopus-api';
 import { Podcast } from '@/store/class/podcast';
 import { Emission } from '@/store/class/emission';
@@ -141,26 +125,20 @@ export default defineComponent({
       isShareModal: false as boolean,
       color: '#40a372' as string,
       theme: '#000000' as string,
-      themeBeta: '#000000' as string,
       proceedReading: true as boolean,
       episodeNumbers: 'number' as string,
       iFrameNumber: '3' as string,
       startTime: 0 as number,
       isVisible: false as boolean,
       displayArticle: true as boolean,
-      displayBetaChoice: false as boolean,
       customPlayers: [] as Array<CustomPlayer>,
-      isBeta: false as boolean,
       colors: ['#000000', '#ffffff'],
     };
   },
   
   computed: {
     miniplayerBaseUrl(): string{
-      if(this.isBeta){
-        return (state.podcastPage.MiniplayerBetaUri as string);  
-      }
-      return (state.podcastPage.MiniplayerUri as string);
+      return (state.podcastPage.MiniplayerUri as string); 
     },
     isEmission(): boolean {
       return 'emission' === this.iFrameModel;
@@ -254,7 +232,7 @@ export default defineComponent({
         }
       }
       url.push('?distributorId=' + this.organisationId);
-      const theme = this.isBeta ? this.themeBeta : this.theme;
+      const theme = this.theme;
       url.push(
         '&color=' +
           this.color.substring(1) +
@@ -354,8 +332,7 @@ export default defineComponent({
       if(this.$store.state.organisation && this.$store.state.organisation.attributes && Object.keys(this.$store.state.organisation.attributes).length > 1){
         data = this.$store.state.organisation.attributes;
       }else{
-        data= await profileApi.fetchOrganisationAttibutes(
-          this.$store.state,
+        data= await octopusApi.fetchOrganisationAttributes(
           state.generalParameters.organisationId ? state.generalParameters.organisationId : ""
         );
       }
@@ -369,22 +346,15 @@ export default defineComponent({
       } else {
         this.theme = '#000000';
       }
-      if (Object.prototype.hasOwnProperty.call(data,'playerBeta')) {
-        if (Object.prototype.hasOwnProperty.call(data,'THEMEBETA')) {
-          this.themeBeta = data.THEMEBETA;
-        }
-        this.displayBetaChoice = data.playerBeta;
-        let dataFetched = await octopusApi.fetchCustomPlayer('customPlayer/organisation/'+ this.organisationId);
-        this.customPlayers = dataFetched.content;
-        const totalCount = dataFetched.totalElements;
-        let index = 1;
-        while (totalCount > this.customPlayers.length) {
-          dataFetched =  await octopusApi.fetchCustomPlayer('customPlayer/organisation/'+ this.organisationId+'?start='+index);
-          this.customPlayers = this.customPlayers.concat(dataFetched.content);
-          ++index;
-        }
+      let dataFetched = await octopusApi.fetchCustomPlayer('customPlayer/organisation/'+ this.organisationId);
+      this.customPlayers = dataFetched.content;
+      const totalCount = dataFetched.totalElements;
+      let index = 1;
+      while (totalCount > this.customPlayers.length) {
+        dataFetched =  await octopusApi.fetchCustomPlayer('customPlayer/organisation/'+ this.organisationId+'?start='+index);
+        this.customPlayers = this.customPlayers.concat(dataFetched.content);
+        ++index;
       }
-      return;
     },
     updateEpisodeNumber(value: string): void {
       this.episodeNumbers = value;

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

@@ -17,34 +17,7 @@
       <div class="fw-600">
         {{ $t('Choose theme') }}
       </div>
-      <div
-        v-if="!isBeta"
-        class="d-flex"
-      >
-        <VSwatches
-          v-for="myColor in colors"
-          :key="myColor"
-          v-model="internTheme"
-          :data-theme="internTheme"
-          class="c-hand input-no-outline me-1"
-          :swatch-style="{
-            padding: '0px 0px',
-            marginRight: '0px',
-            marginBottom: '0px',
-            border: '1px gray solid',
-          }"
-          :wrapper-style="{
-            paddingTop: '0px',
-            paddingLeft: '0px',
-            paddingRight: '0px',
-            paddingBottom: '0px',
-          }"
-          :swatches="[myColor]"
-          inline
-        />
-      </div>
       <VSwatches
-        v-else
         v-model="internTheme"
         class="c-hand input-no-outline"
         show-fallback
@@ -65,28 +38,18 @@ export default defineComponent({
   },
 
   props: {
-    isBeta: { default: false, type: Boolean},
     color: { default: '#40a372', type: String},
     theme: { default: '#000000', type: String},
-    themeBeta: { default: '#000000', type: String},
   },
-  emits:['update:color', 'update:theme', 'update:themeBeta'],
+  emits:['update:color', 'update:theme'],
 
   data() {
     return {
       internColor:'#40a372' as string,
       internTheme:'#000000' as string,
-      colors: ['#000000', '#ffffff'],
     };
   },
   watch:{
-    isBeta(){
-      if(this.isBeta){
-        this.internTheme = this.themeBeta;
-      }else{
-        this.internTheme = this.theme;
-      }
-    },
     color(){
       if(this.color !== this.internColor){
         this.internColor = this.color;
@@ -98,27 +61,19 @@ export default defineComponent({
       }
     },
     theme(){
-      if(this.theme !== this.internTheme && !this.isBeta){
+      if(this.theme !== this.internTheme){
         this.internTheme = this.theme;
       }
     },
-    themeBeta(){
-      if(this.themeBeta !== this.internTheme && this.isBeta){
-        this.internTheme = this.themeBeta;
-      }
-    },
     internTheme(){
-      if(this.theme !== this.internTheme && !this.isBeta){
+      if(this.theme !== this.internTheme ){
         this.$emit('update:theme', this.internTheme);
-      }else if(this.themeBeta !== this.internTheme && this.isBeta){
-        this.$emit('update:themeBeta', this.internTheme);
       }
     }
   },
   mounted(){
     this.internColor= this.color;
-    this.internTheme= this.isBeta? this.themeBeta : this.theme;
+    this.internTheme= this.theme;
   }
-
 })
 </script>

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

@@ -17,15 +17,13 @@
       <option value="large">
         {{ $t('Large version') }}
       </option>
-      <template v-if="isBeta">
-        <option
-          v-for="player in customPlayersDisplay"
-          :key="player.customId"
-          :value="player.customId"
-        >
-          {{ $t('Custom version') + " «" +player.name+"»" }}
-        </option>
-      </template>
+      <option
+        v-for="player in customPlayersDisplay"
+        :key="player.customId"
+        :value="player.customId"
+      >
+        {{ $t('Custom version') + " «" +player.name+"»" }}
+      </option>
       <option
         v-if="podcast && podcast.podcastId"
         value="emission"
@@ -62,7 +60,6 @@ export default defineComponent({
     emission: { default: undefined, type: Object as ()=> Emission},
     playlist: { default: undefined, type: Object as ()=> Playlist},
     customPlayers: { default: ()=>[], type: Array as ()=> Array<CustomPlayer>},
-    isBeta: { default: false, type: Boolean},
     iFrameModel: { default: 'default', type: String},
   },
   emits:['update:iFrameModel'],

package/src/components/misc/Popover.vue

@@ -32,7 +32,6 @@ export default defineComponent({
     placement: {type: String as PropType<Popover.Options['placement']>, default: 'right'},
     target: {type: String, required: true},
     title: {type: String, default: ''},
-    triggers: {type: String as PropType<Popover.Options['trigger']>, default: 'click'},
     show: {type: Boolean, default: false},
     disable: {type: Boolean, default: false},
   },
@@ -46,7 +45,7 @@ export default defineComponent({
     function initPopover(){
       instance.value = new Popover(`#${props.target}`, {
         container: 'body',
-        trigger: props.triggers,
+        trigger: "click hover",
         placement: props.placement,
         title: titleRef.value?.innerHTML || '',
         content: contentRef.value?.innerHTML || '',

package/src/components/mixins/tagOfMixins.ts

@@ -0,0 +1,19 @@
+import {defineComponent } from 'vue';
+export const tagOfMixins =  defineComponent({
+  name: 'TagOfMixins',
+	methods:{
+    isOuestFranceTag(tag: string): boolean{
+      return "[of]"===tag.substring(0,4);
+    },
+    formateOfTag(tag: string): string{
+      if(!this.isOuestFranceTag(tag)){
+        return tag;
+      }
+      const lastSlash = tag.lastIndexOf('/');
+      if(-1!==lastSlash){
+        return tag.substring(lastSlash + 1, tag.length);
+      }
+      return tag.substring(4, tag.length);
+    },
+	}
+});

package/src/components/pages/Participant.vue

@@ -185,7 +185,7 @@ export default defineComponent({
     async getParticipantDetails(): Promise<void> {
       this.loaded = false;
       try {
-        const data = await octopusApi.fetchParticipant(this.participantId);
+        const data = await octopusApi.fetchParticipant(this.participantId ? this.participantId.toString(): "");
         this.participant = data;
         this.$emit('participantTitle', this.name);
         this.loaded = true;

package/src/components/pages/Playlist.vue

@@ -142,7 +142,7 @@ export default defineComponent({
   methods: {
     async getPlaylistDetails(): Promise<void> {
       try {
-        const data: Playlist = await octopusApi.fetchPlaylist(this.playlistId);
+        const data: Playlist = await octopusApi.fetchPlaylist(this.playlistId ? this.playlistId.toString(): "");
         this.playlist = data;
         this.$emit('playlistTitle', this.playlist.title);
         this.loaded = true;

package/src/components/pages/Podcast.vue

@@ -325,7 +325,7 @@ export default defineComponent({
     },
     async getPodcastDetails(podcastId: number): Promise<void> {
       try {
-        const data : Podcast = await octopusApi.fetchPodcast(podcastId);
+        const data : Podcast = await octopusApi.fetchPodcast(podcastId.toString());
         this.podcast = data;
         this.$emit('podcastTitle', this.podcast.title);
         if (

package/src/locale/en.ts

@@ -287,7 +287,6 @@ export default{
   'See associated article':"Read the article",
   "Display associated article":"Display associated article",
   "Copy this page URL":"Copy this page URL",
-  "Use beta version":"Use beta version player",
   "Custom version":"Custom version",
   "All":"All",
   'By category': 'By IAB category',

package/src/locale/fr.ts

@@ -287,7 +287,6 @@ export default{
   'See associated article':"Lire l'article",
   "Display associated article":"Afficher l'article associé",
   "Copy this page URL":"Copier l'adresse de cette page",
-  "Use beta version":"Utiliser la version beta du player",
   "Custom version":"Version customisée",
   "All":"Tous",
   'By category': 'Selon la catégorie IAB',

package/src/store/class/emission.ts

@@ -1,20 +1,23 @@
-import { Organisation } from "./organisation";
-import { Person } from "./person";
+import { AdserverConfig } from './adserverConfig';
+import { Organisation } from './organisation';
+import { Person } from './person';
 
-
-export interface Emission{
-    imageUrl: string;
-    annotations?:{[key: string]:string|number|boolean|undefined}|undefined;
-    description: string;
-    emissionId: number;
-    iabIds?: Array<number>;
-    lastPodcastDate?: string;
-    monetisable: string;
-    name: string;
-    orga: Organisation;
-    rubriqueIds: Array<number>;
-    score?: number;
-    soundcastTag?: string;
-    publisher?: Person;
-}
-  
+export interface Emission {
+  imageUrl?: string;
+  annotations?: {[key: string]:string|number|boolean|undefined}|undefined;
+  description: string;
+  emissionId: number;
+  iabIds?: Array<number>;
+  lastPodcastDate?: string;
+  monetisable: string;
+  name: string;
+  orga: Organisation;
+  rubriqueIds: Array<number>;
+  score?: number;
+  soundcastTag?: string;
+  publisher?: Person;
+  copyright?: string;
+  optItunesCategories?: Array<string>;
+  adConfigs?: {[key:string]: AdserverConfig};
+  urlFeed?: string;
+}

package/src/store/class/fetchParam.ts

@@ -29,4 +29,5 @@ export interface FetchParam{
   type?: string,
   listening?: string,
   top?: number,
+  homePageOrder?:boolean,
 }

package/src/store/class/participant.ts

@@ -1,12 +1,12 @@
-import { Organisation } from "./organisation";
+import { Organisation } from './organisation';
 
-export interface Participant{
-  imageUrl: string;
-  description: string;
+export interface Participant {
+  imageUrl?: string;
+  description?: string;
   firstName: string;
   lastName: string;
-  orga: Organisation;
-  participantId: number;
+  orga?: Organisation;
+  participantId: number | undefined;
   score?: number;
-  uid: string;
-}
+  uid?: string;
+}

package/src/store/class/person.ts

@@ -1,13 +1,15 @@
-import { Organisation } from "./organisation";
+import { Organisation } from './organisation';
 
-export interface Person{
-    attributes?:{[key: string]:string|number|boolean|undefined}|undefined;
-    email: string;
-    emailVerified: boolean;
-    enabled: true;
-    first: string;
-    last: string;
-    notSeenOnKeycloak: number;
-    userId: string;
-    organisation?: Organisation;
+export interface Person {
+  attributes?: {[key:string]:  string|number|boolean|undefined|Array<string>};
+  email: string;
+  emailVerified: boolean;
+  enabled: true;
+  first: string;
+  last: string;
+  notSeenOnKeycloak: number;
+  userId: string;
+  organisation?: Organisation;
+  activeOrganisation?: Organisation;
+  organisations?: Array<Organisation>;
 }

package/src/store/class/playlist.ts

@@ -1,15 +1,13 @@
-import { Organisation } from "./organisation";
-import { Person } from "./person";
-import { Podcast } from "./podcast";
+import { Organisation } from './organisation';
+import { Person } from './person';
 
-
-export interface Playlist{
+export interface Playlist {
   imageUrl?: string;
   description: string;
   organisation: Organisation;
   playlistId: number;
-  podcasts: Array<Podcast>;
+  podcasts: Array<number | undefined>;
   score: number;
   title: string;
   publisher?: Person;
-}
+}

package/src/store/class/podcast.ts

@@ -1,38 +1,42 @@
-import { Emission } from "./emission";
-import { Organisation } from "./organisation";
-import { Participant } from "./participant";
-import { Person } from "./person";
-export interface Podcast{
-    imageUrl: string;
-    animators?: Array<Participant>;
-    annotations?: {[key: string]:string|number|boolean|undefined}|undefined;
-    audioStorageUrl: string;
-    audioUrl: string;
-    availability: {
-      date?: string;
-      visibility?: boolean;
-    };
-    article?: string;
-    comments?: string;
-    conferenceId?: number;
-    createdAt?: string;
-    valid?: boolean;
-    description?: string;
-    downloadCount?: number;
-    duration: number;
-    emission: Emission;
-    guests?: Array<Participant>;
-    monetisable?: string;
-    organisation: Organisation;
-    podcastId: number;
-    processingStatus?: string;
-    pubDate?: string;
-    publisher?: Person;
-    rubriqueIds?: Array<number>;
-    score?: number;
-    size?: number;
-    tags?: Array<string>;
-    title: string;
-    weekDownloadCount?: number;
-    livePodcastId?:number;
-}
+import { Emission } from './emission';
+import { Organisation } from './organisation';
+import { Participant } from './participant';
+import { Person } from './person';
+export interface Podcast {
+  imageUrl?: string;
+  animators?: Array<Participant>;
+  annotations?:{[key: string]:string|number|boolean|undefined}|undefined;
+  audioStorageUrl: string;
+  audioUrl: string;
+  article?: string;
+  availability: {
+    date?: number|null;
+    visibility?: boolean;
+    immediate?: boolean;
+  };
+  comments?: string;
+  conferenceId?: number;
+  createdAt?: string;
+  valid?: boolean;
+  description?: string;
+  downloadCount?: number;
+  duration: number;
+  email?: string;
+  emission: Emission;
+  guests?: Array<Participant>;
+  monetisable?: string;
+  organisation: Organisation;
+  podcastId: number;
+  processingStatus?: string;
+  processorId?: string;
+  pubDate?: string;
+  publisher?: Person;
+  rubriqueIds?: Array<number>;
+  score?: number;
+  size?: number;
+  tags?: Array<string>;
+  title: string;
+  weekDownloadCount?: number;
+  order?: number;
+  livePodcastId?: number
+}

package/src/store/class/rubriquage.ts

@@ -1,9 +1,9 @@
-import { Rubrique } from "./rubrique";
+import { Rubrique } from './rubrique';
 
-export interface Rubriquage{
-    organisationId?: string;
-    rubriquageId?: number;
-    rubriques: Array<Rubrique>;
-    title: string;
-    homePageOrder?: number;
-}
+export interface Rubriquage {
+  organisationId?: string;
+  rubriquageId?: number;
+  rubriques: Array<Rubrique>;
+  title: string;
+  homePageOrder?: number | null;
+}

package/src/store/class/rubrique.ts

@@ -1,8 +1,9 @@
-export interface Rubrique{
+export interface Rubrique {
     emissionCount?: number;
     name: string;
     podcastCount?: number;
     rubriquageId?: number;
     rubriqueId?: number;
     score?: number;
-}
+  }
+  

package/src/store/paramStore.ts

@@ -12,7 +12,7 @@ const state:paramStore = {
     isPlaylist: false,
     isProduction: true,
     isContribution: true,
-    ApiUri: 'https://api.staging.saooti.org/',
+    ApiUri: 'https://api.dev2.saooti.org/',
     podcastmaker: false,
     buttonPlus: true,
     allCategories: [],
@@ -24,12 +24,10 @@ const state:paramStore = {
     SharePlayer: true,
     ShareButtons: true,
     ShareDistribution: true,
-    MiniplayerUri: 'https://player.staging.saooti.org/',
-    MiniplayerBetaUri: 'https://playerbeta.staging.saooti.org/',
+    MiniplayerUri: 'https://playerbeta.dev2.saooti.org/',
     ouestFranceStyle: false,
-    tagList: false,
     downloadButton: false,
-    hlsUri: 'https://hls.staging.saooti.org/',
+    hlsUri: 'https://hls.dev2.saooti.org/',
     mainRubrique: 0,
     resourceUrl: undefined
   },
@@ -82,10 +80,10 @@ const state:paramStore = {
     userName: '',
   },
   octopusApi: {
-    url: 'http://api.staging.saooti.org/',
-    commentsUrl: 'http://comments.staging.saooti.org/',
-    studioUrl: 'http://studio.staging.saooti.org/',
-    playerUrl: 'https://playerbeta.staging.saooti.org/',
+    url: 'http://api.dev2.saooti.org/',
+    commentsUrl: 'http://comments.dev2.saooti.org/',
+    studioUrl: 'http://studio.dev2.saooti.org/',
+    playerUrl: 'https://playerbeta.dev2.saooti.org/',
     organisationId: undefined,
   },
 };
@@ -112,9 +110,7 @@ export interface PodcastPage{
   ShareButtons?: boolean,
   ShareDistribution?: boolean,
   MiniplayerUri?: string,
-  MiniplayerBetaUri?: string,
   ouestFranceStyle?: boolean,
-  tagList?: boolean,
   downloadButton?: boolean,
   hlsUri?: string,
   mainRubrique?: number,
@@ -174,6 +170,13 @@ export interface OctopusApi{
   studioUrl?: string,
   playerUrl?: string,
   organisationId?: string | undefined,
+  oAuthParam?: {
+    accessToken: string,
+    refreshToken: string,
+    accessTokenUri: string,
+    expiration: string,
+    clientId: string,
+  }
 }
 export interface paramStore{
   generalParameters:GeneralParameters,

package/src/api/emissions.ts

@@ -1,13 +0,0 @@
-import { Emission } from "@/store/class/emission";
-import { FetchParam } from "@/store/class/fetchParam";
-import { StoreState } from "@/store/typeAppStore";
-
-import octopusApi from '@saooti/octopus-api';
-/* eslint-disable */
-export default{
-  async fetchEmissionsAdmin(store: StoreState, parameters: FetchParam): Promise<{ count: number; result: Array<Emission>; sort: string; }> {
-    console.log(store);
-    return await octopusApi.fetchEmissions(parameters);
-  },
-};
-/* eslint-enable */

package/src/api/podcasts.ts

@@ -1,12 +0,0 @@
-import { FetchParam } from "@/store/class/fetchParam";
-import { StoreState } from "@/store/typeAppStore";
-
-import octopusApi from '@saooti/octopus-api';
-/* eslint-disable */
-export default {
-  async fetchPodcastsAdmin(store: StoreState, parameters: FetchParam): Promise<any> {
-    console.log(store);
-    return await octopusApi.fetchPodcasts(parameters);
-  },
-};
-/* eslint-enable */

package/src/api/profile.ts

@@ -1,11 +0,0 @@
-import { StoreState } from "@/store/typeAppStore";
-/* eslint-disable */
-export default{
-  fetchOrganisationAttibutes(store: StoreState, organisationId: string): Promise<any> {
-    return new Promise(resolve => {
-      console.log(store, organisationId);
-      resolve({});
-    });
-  },
-};
-/* eslint-enable */