@saooti/octopus-sdk 39.0.43 → 39.0.45

package/package.json

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

package/src/assets/bootstrap.scss

@@ -83,7 +83,7 @@ input:not([class^="vs__"]), button:not([class^="vs__"]), select:not([class^="vs_
 		text-decoration: none !important;
 		white-space: nowrap;
 		border-width: 0;
-		min-width: 24px;
+		//min-width: 24px; Problème avec flex-shrink
 		@media (max-width: 960px) {
 				white-space: normal;
 		}
@@ -138,6 +138,9 @@ input:not([class^="vs__"]), button:not([class^="vs__"]), select:not([class^="vs_
 						left: 0; 
 				}
 		}
+		&.btn-min-width{
+			min-width: 24px;
+		}
 	
 			&.btn-primary {
 					display: flex;

package/src/components/display/list/PaginateSection.vue

@@ -23,10 +23,10 @@
         </svg>
       </button>
       <div v-for="pageNumber in pagination" :key="pageNumber">
-        <span v-if="null === pageNumber" class="btn"> ... </span>
+        <span v-if="null === pageNumber" class="btn btn-min-width"> ... </span>
         <button
           v-else
-          class="btn"
+          class="btn btn-min-width"
           :class="{ active: page === pageNumber - 1 }"
           @click="changeFirst((pageNumber - 1) * rowsPerPage)"
         >
@@ -36,7 +36,7 @@
       <button
         v-for="paginateButton in buttonsRight"
         :key="paginateButton.title"
-        class="btn"
+        class="btn btn-min-width"
         :title="paginateButton.title"
         :disabled="paginateButton.disabled"
         @click="paginateButton.action"

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

@@ -28,6 +28,7 @@
         <div class="d-flex flex-column flex-grow-1">
           <SharePlayerTypes
             v-model:iFrameModel="iFrameModel"
+            v-model:typeCustomPlayer="typeCustomPlayer"
             :podcast="podcast"
             :emission="emission"
             :playlist="playlist"
@@ -53,9 +54,7 @@
             v-model:is-visible="isVisible"
             v-model:player-auto-play="playerAutoPlay"
             :is-visible="isVisible"
-            :chose-number-episode="
-              displayChoiceAllEpisodes || isLargeSuggestion
-            "
+            :chose-number-episode="choseNumberEpisodes"
             :display-choice-all-episodes="displayChoiceAllEpisodes"
             :display-transcript-param="displayTranscriptParam"
             :display-article-param="displayArticleParam"
@@ -142,6 +141,7 @@ export default defineComponent({
 
   data() {
     return {
+      typeCustomPlayer: "",
       iFrameModel: "default" as string,
       isShareModal: false as boolean,
       color: "#40a372" as string,
@@ -166,6 +166,9 @@ export default defineComponent({
     displayWaveParam(): boolean {
       return "default" === this.iFrameModel || "emission" === this.iFrameModel;
     },
+    choseNumberEpisodes():boolean{
+      return this.displayChoiceAllEpisodes || this.isTypeSuggestion;
+    },
     displayArticleParam(): boolean {
       return (
         undefined !== this.podcast &&
@@ -204,7 +207,7 @@ export default defineComponent({
         : false;
     },
     displayChoiceAllEpisodes(): boolean {
-      return !this.podcast || this.isEmission || this.isLargeEmission;
+      return !this.podcast || this.isTypeEmission;
     },
     baseUrl(): string {
       return state.podcastPage.MiniplayerUri as string;
@@ -218,8 +221,11 @@ export default defineComponent({
     isLargeEmission(): boolean {
       return "emissionLarge" === this.iFrameModel;
     },
-    isLargeSuggestion(): boolean {
-      return "largeSuggestion" === this.iFrameModel;
+    isTypeSuggestion(): boolean {
+      return "largeSuggestion" === this.iFrameModel || "SUGGESTION"===this.typeCustomPlayer;
+    },
+    isTypeEmission():boolean{
+      return this.isEmission || this.isLargeEmission || "EMISSION"===this.typeCustomPlayer;
     },
     titleStillAvailable(): string {
       return this.isPodcastNotVisible
@@ -263,11 +269,11 @@ export default defineComponent({
         url = this.constructPlaylistUrl(url);
       } else if (this.emission && this.podcast) {
         url.push(`${this.iFrameModel}/`);
-        if (this.isEmission || this.isLargeEmission) {
+        if (this.isTypeEmission) {
           url.push(
             `${this.emission.emissionId}${iFrameNumber}/${this.podcast.podcastId}`,
           );
-        } else if (this.isLargeSuggestion) {
+        } else if (this.isTypeSuggestion) {
           url.push(`${this.podcast.podcastId}${iFrameNumber}`);
         } else {
           url.push(`${this.podcast.podcastId}`);

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

@@ -3,8 +3,7 @@
   <select
     id="iframe-select"
     :value="iFrameModel"
-    class=""
-    @change="$emit('update:iFrameModel', $event.target.value)"
+    @change="selectChange($event)"
   >
     <template v-for="option in optionsSelect" :key="option.value">
       <option v-if="option.condition" :value="option.value">
@@ -36,10 +35,11 @@ export default defineComponent({
     emission: { default: undefined, type: Object as () => Emission },
     playlist: { default: undefined, type: Object as () => Playlist },
     iFrameModel: { default: "default", type: String },
+    typeCustomPlayer: { default: "", type: String },
     organisationId: { default: undefined, type: String },
     isLive: { default: false, type: Boolean },
   },
-  emits: ["update:iFrameModel"],
+  emits: ["update:iFrameModel", "update:typeCustomPlayer"],
 
   data() {
     return {
@@ -120,10 +120,24 @@ export default defineComponent({
     this.initCustomPlayers();
   },
   methods: {
-    async fetchCustomPlayers(
-      type: string,
-      trySelect: boolean,
-    ): Promise<boolean> {
+    isNumeric(value: string):boolean {
+      return /^-?\d+$/.test(value);
+    },
+    selectChange($event: any){
+      const val = $event.target.value;
+      if(!val){
+        return;
+      }
+      if(this.isNumeric(val)){
+        var customPlayer = this.customPlayersDisplay.find((p) => {return p.customId.toString() === val});
+        if(customPlayer){
+          this.selectCustomPlayer(customPlayer);
+        }
+      }else{
+        this.$emit('update:iFrameModel',val)
+      }
+    },
+    async fetchPlayerPaginate(type: string): Promise<CustomPlayer[]>{
       let players = await octopusApi.fetchDataPublic<
         InterfacePageable<CustomPlayer>
       >(6, "customPlayer/type/" + this.organisationId + "/" + type);
@@ -145,38 +159,35 @@ export default defineComponent({
         playersContent = playersContent.concat(players.content);
         ++index;
       }
-      this.customPlayers = this.customPlayers.concat(playersContent);
+      return playersContent;
+    },
+    selectCustomPlayer(customPlayer: CustomPlayer){
+      this.$emit("update:typeCustomPlayer", customPlayer.typePlayer);
+      this.$emit("update:iFrameModel",customPlayer.customId.toString());
+    },
+    async fetchCustomPlayers(type: string, selectIfPossible = true): Promise<boolean> {
+      let customPlayersForType = await this.fetchPlayerPaginate(type);
+      this.customPlayers = this.customPlayers.concat(customPlayersForType);
       if (
         "video" !== this.iFrameModel &&
-        trySelect &&
-        this.customPlayers[0] &&
-        this.customPlayers[0].selected
+        selectIfPossible &&
+        customPlayersForType?.[0]?.selected
       ) {
-        this.$emit(
-          "update:iFrameModel",
-          this.customPlayers[0].customId.toString(),
-        );
-        return false;
+        this.selectCustomPlayer(this.customPlayers[0]);
+        return true;
       }
-      return true;
+      return false;
     },
     async initCustomPlayers(): Promise<void> {
       if (!state.generalParameters.authenticated) return;
       if (this.playlist) {
-        this.fetchCustomPlayers("PLAYLIST", true);
+        this.fetchCustomPlayers("PLAYLIST");
       } else if (this.emission && !this.podcast) {
-        this.fetchCustomPlayers("EMISSION", true);
+        this.fetchCustomPlayers("EMISSION");
       } else {
-        let playerTrySelect = true;
-        playerTrySelect = await this.fetchCustomPlayers(
-          "EPISODE",
-          playerTrySelect,
-        );
-        playerTrySelect = await this.fetchCustomPlayers(
-          "EMISSION",
-          playerTrySelect,
-        );
-        await this.fetchCustomPlayers("SUGGESTION", playerTrySelect);
+        const episodeSelected = await this.fetchCustomPlayers("EPISODE");
+        const emissionSelected = await this.fetchCustomPlayers("EMISSION", !episodeSelected);
+        await this.fetchCustomPlayers("SUGGESTION", !episodeSelected && !emissionSelected);
       }
     },
   },

package/src/components/form/ClassicWysiwyg.vue

@@ -41,8 +41,8 @@
         </svg>
       </button>
       <button
-        :title="$t('Delete link')"
-        data-selenium="unlink"
+        :title="$t('Link')"
+        data-selenium="link"
         :class="{ 'is-active': editor.isActive('link') }"
         @click="setLink"
       >
@@ -58,8 +58,8 @@
         </svg>
       </button>
       <button
-        :title="$t('Unlink')"
-        data-selenium="Heading3"
+        :title="$t('Delete link')"
+        data-selenium="unlink"
         :disabled="!editor.isActive('link')"
         @click="editor.chain().focus().unsetLink().run()"
       >

package/src/stores/ParamSdkStore.ts

@@ -5,14 +5,14 @@ const state: ParamStore = {
   generalParameters: {
     organisationId: "ecbd98d9-79bd-4312-ad5e-fc7c1c4a191c",
     authenticated: false,
-    isAdmin: false,
-    isRoleLive: false,
-    isCommments: false,
-    isOrganisation:false,
-    isPlaylist: false,
-    isProduction: false,
-    isContribution: false,
-    isRadio: false,
+    isAdmin: true,
+    isRoleLive: true,
+    isCommments: true,
+    isOrganisation:true,
+    isPlaylist: true,
+    isProduction: true,
+    isContribution: true,
+    isRadio: true,
     ApiUri: "https://api.dev2.saooti.org/",
     podcastmaker: false,
     buttonPlus: true,