@saooti/octopus-sdk 41.0.9-SNAPSHOT → 41.0.9

package/src/components/misc/player/elements/PlayerTitle.vue

@@ -89,7 +89,7 @@ onUnmounted(()=>{
 async function fetchCurrentlyPlaying(): Promise<void> {
   fetchRadioMetadata(
     playerStore.playerRadio?.canalId ?? 0,
-    playerStore.playerRadio?.metadata.title ?? "",
+    playerStore.playerRadio?.metadata?.title ?? "",
     updateMetadata,
     updateAdvertising,
   );
@@ -98,11 +98,11 @@ function updateAdvertising(nextAdvertising: NextAdvertising): void {
   playerStore.playerRadioUpdateNextAdvertising(nextAdvertising);
 }
 function updateMetadata(
-  metadata: MediaRadio,
+  metadata: MediaRadio|undefined,
   podcast: Podcast | undefined,
   history: Array<MediaRadio>,
 ): void {
-  playerStore.playerMetadata(metadata, history);
+  playerStore.playerMetadata(metadata, history); //TODO
   playerStore.playerRadioPodcast(podcast);
 }
 </script>

package/src/components/misc/player/radio/RadioHistory.vue

@@ -40,10 +40,10 @@ import ChevronLeftIcon from "vue-material-design-icons/ChevronLeft.vue";
 import ChevronRightIcon from "vue-material-design-icons/ChevronRight.vue";
 import { usePlayerStore } from "../../../../stores/PlayerStore";
 import dayjs from "dayjs";
-import radioHelper from "../../../../helper/radio/radioHelper";
 import { computed, nextTick, onMounted, onUnmounted, ref, useTemplateRef, watch } from "vue";
 import { MediaRadio } from "@/stores/class/general/player";
 import { useI18n } from "vue-i18n";
+import { useFetchRadio } from "../../../composable/radio/usefetchRadioData";
 
 
 //Data 
@@ -54,6 +54,7 @@ const historyListContainerRef = useTemplateRef('historyListContainer');
 //Composables
 const { t } = useI18n();
 const playerStore = usePlayerStore();
+const {displayTitle} = useFetchRadio();
 
 
 //Computed
@@ -119,7 +120,7 @@ function displayPreviousItem(item: MediaRadio): string {
   if (item.podcastId) {
     return item.title;
   }
-  return radioHelper.displayTitle(item);
+  return displayTitle(item);
 }
 </script>
 <style lang="scss">

package/src/components/misc/player/video/PlayerVideo.vue

@@ -39,10 +39,10 @@ const playerStore = usePlayerStore();
 //Computed
 const isSecured = computed(() => "SECURED" === playerStore.playerLive?.organisation?.privacy);
 const hlsVideoUrl = computed(() => {
-  if (!playerStore.playerLive) {
+  if (!playerStore.playerHlsIdentifier) {
     return "";
   }
-  return `${apiStore.hlsUrl}live/video_dev.${playerStore.playerLive.conferenceId}/index.m3u8`;
+  return `${apiStore.hlsUrl}live/video_${playerStore.playerHlsIdentifier}/index.m3u8`;
 });
 
 onMounted(()=>{

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/PageLogout.vue

@@ -1,6 +1,6 @@
 <template>
   <section
-    class="page-box page-box-absolute page-logout"
+    class="page-box page-box-absolute page-logout bg-gradient"
   >
     <div class="logout-section">
       <h1 class="mb-3">{{ t("Logout") }}</h1>
@@ -19,11 +19,6 @@ const { t } = useI18n();
 </script>
 <style lang="scss">
 .octopus-app .page-logout {
-  background: linear-gradient(
-    90deg,
-    var(--octopus-primary) 0%,
-    var(--octopus-tertiary) 100%
-  );
   display: flex;
   align-items: center;
   justify-content: center;

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>

package/src/components/pages/PodcastPage.vue

@@ -255,7 +255,6 @@ async function fetchConferenceStatus() {
       api: 9,
       path: "conference/info/" + podcast.value?.conferenceId,
     });
-
     fetchConference.value = {...fetchConference.value, ...data};
   } catch {
     //Do nothing

package/src/components/pages/VideoPage.vue

@@ -193,7 +193,7 @@ const hlsVideoUrl = computed(() => {
   if (!recordingLive.value || !podcastConference.value) {
     return "";
   }
-  return `${apiStore.hlsUrl}live/video_dev.${podcastConference.value.conferenceId}/index.m3u8`;
+  return `${apiStore.hlsUrl}live/video_${podcastConference.value.hlsIdentifier}/index.m3u8`;
 });
 const isSecured = computed(() => {
   return "SECURED" === podcast.value?.organisation?.privacy;
@@ -255,7 +255,10 @@ async function getPodcastDetails(): Promise<void> {
         playerStore.playerPlay(
           {
             ...podcast.value,
-            ...{ conferenceId: podcast.value.conferenceId },
+            ...{ 
+              conferenceId: podcast.value.conferenceId,
+              hlsIdentifier: podcastConference.value?.hlsIdentifier,
+            },
           },
           true,
         );

package/src/locale/de.ts

@@ -146,8 +146,8 @@ export default {
   "Sort score": "Nach Relevanz",
   "Sort name": "Nach Titel",
   "Sort last": "Nach Datum",
-  "Choose color": "Farbe wählen",
-  "Choose theme": "Design wählen",
+  "Choose color": "Akzentfarbe",
+  "Choose theme": "Thema (Spielerhintergrund)",
   "Podcast no visible": "Podcast nicht sichtbar",
   "Display episodes": "Folgen anzeigen",
   "Podcast published in future": "Podcast geplant",
@@ -167,7 +167,6 @@ export default {
   "open left Menu": "Menü öffnen/schließen",
   Participant: "Sprecher",
   "Number of player podcasts": "Anzahl der Podcasts im Player",
-  "Proceed reading": "Weiterhören",
   "Without topic": "Ohne Thema",
   "Without rubric": "Ohne Rubrik",
   "Consider podcasts no visible":
@@ -414,4 +413,5 @@ export default {
   "Code copied!":"Code kopiert!",
   "Copied!":"Kopiert!",
   "Color of the QR Code": "Farbe des QR-Codes",
+  "Silent stream":"Stiller Fluss",
 }

package/src/locale/en.ts

@@ -145,8 +145,8 @@ export default {
   "Sort score": "Sorted by relevancy score",
   "Sort name": "Sorted title",
   "Sort last": "Sorted last",
-  "Choose color": "Choose color",
-  "Choose theme": "Choose theme",
+  "Choose color": "Accent color",
+  "Choose theme": "Theme (player background)",
   "Podcast no visible": "Podcast not visible",
   "Display episodes": "Display episodes",
   "Podcast published in future": "Podcast published in the future",
@@ -166,7 +166,6 @@ export default {
   "open left Menu": "Open/Close Menu",
   Participant: "Speaker",
   "Number of player podcasts": "Number of podcasts in the player ",
-  "Proceed reading": "Continue Listening",
   "Without topic": "Without a topic",
   "Without rubric": "Without a rubric",
   "Consider podcasts no visible":
@@ -417,4 +416,5 @@ export default {
   "Code copied!":"Code copied!",
   "Copied!":"Copied!",
   "Color of the QR Code": "Color of the QR Code",
+  "Silent stream":"Silent stream",
 };

package/src/locale/es.ts

@@ -145,8 +145,8 @@ export default {
   "Sort score": "Clasificación por pertinencia",
   "Sort name": "Clasificación por título",
   "Sort last": "Clasificación por fecha más reciente",
-  "Choose color": "Elegir color",
-  "Choose theme": "Elegir tema",
+  "Choose color": "Color de acento",
+  "Choose theme": "Tema (fondo del jugador)",
   "Podcast no visible": "Este pódcast no puede visualizarse",
   "Display episodes": "Mostrar episodios",
   "Podcast published in future": "Pódcast pendiente de publicación",
@@ -167,7 +167,6 @@ export default {
   "open left Menu": "Abrir/Cerrar menú",
   Participant: "Participante",
   "Number of player podcasts": "Número de pódcast en el reproductor",
-  "Proceed reading": "Seguir escuchando",
   "Without topic": "Sin tema",
   "Without rubric": "Sin sección",
   "Consider podcasts no visible":
@@ -415,4 +414,5 @@ export default {
   "Code copied!":"¡Código copiado!",
   "Copied!":"¡Copiado!",
   "Color of the QR Code": "Color del código QR",
+  "Silent stream":"Flujo silencioso",
 }

package/src/locale/fr.ts

@@ -146,8 +146,8 @@ export default {
   "Sort score": "Pertinence",
   "Sort name": "Alphabétique",
   "Sort last": "Antéchronologique",
-  "Choose color": "Couleur",
-  "Choose theme": "Thème",
+  "Choose color": "Couleur d'accent",
+  "Choose theme": "Thème (fond du player)",
   "Podcast no visible": "Épisode non visible actuellement",
   "Display episodes": "Affichage des épisodes",
   "Podcast publish in future": "Épisode publié dans le futur",
@@ -168,7 +168,6 @@ export default {
   "open left Menu": "Ouvrir/Fermer le menu",
   Participant: "Intervenant",
   "Number of player podcasts": "Nombre d'épisodes dans le miniplayer",
-  "Proceed reading": "Poursuivre la lecture",
   "Without topic": "Sans rubriquage",
   "Without rubric": "Non rubriqué",
   "Consider podcasts no visible":
@@ -424,4 +423,5 @@ export default {
   "Code copied!":"Code copié !",
   "Copied!":"Copié !",
   "Color of the QR Code": "Couleur du Qr Code",
+  "Silent stream":"Flux silencieux",
 };

package/src/locale/it.ts

@@ -141,8 +141,8 @@ export default{
     'Sort score': 'Suddiviso per grado di rilevanza',
     'Sort name': 'Suddividi titolo',
     'Sort last': 'Suddividi ultimo',
-    'Choose color': 'Seleziona colore',
-    'Choose theme': 'Seleziona tema',
+    'Choose color': 'Colore accento',
+    'Choose theme': 'Tema (sfondo del giocatore)',
     'Podcast no visible': 'Podcast non visibile',
     'Display episodes': 'Mostra episodi',
     'Podcast published in future': 'Podcast pubblicato in futuro',
@@ -163,7 +163,6 @@ export default{
     'open left Menu': 'Apri/Chiudi Menu',
     Participant: 'Speaker',
     'Number of player podcasts': "Numero di podcast nel lettore",
-    'Proceed reading': 'Continua ad ascoltare',
     'Without topic': 'Senza un tema',
     'Without rubric': 'Senza una rubrica',
     'Consider podcasts no visible':
@@ -411,4 +410,5 @@ export default{
   "Code copied!":"Codice copiato!",
   "Copied!":"Copiato!",
   "Color of the QR Code": "Colore del codice QR",
+  "Silent stream":"Flusso silenzioso",
 };

package/src/locale/sl.ts

@@ -142,8 +142,8 @@ export default {
   "Sort score": "Razvrščeno po relevantnosti",
   "Sort name": "Naslov",
   "Sort last": "Zadnje",
-  "Choose color": "Izberi barvo",
-  "Choose theme": "Izberi temo",
+  "Choose color": "Poudarjena barva",
+  "Choose theme": "Tema (ozadje igralca)",
   "Podcast no visible": "Podkast je skrit",
   "Display episodes": "Prikaži epizode",
   "Podcast published in future": "Podkast bo objavljen v prihodnje",
@@ -163,7 +163,6 @@ export default {
   "open left Menu": "Meni odpri/zapri",
   Participant: "Sodelujoči",
   "Number of player podcasts": "Število podkastov v predvajalniku",
-  "Proceed reading": "Nadaljuj s poslušanjem",
   "Without topic": "Brez teme",
   "Without rubric": "Brez rubrike",
   "Consider podcasts no visible": "Občinstvu skriti podkasti",
@@ -406,4 +405,5 @@ export default {
   "Code copied!":"Koda kopirana!",
   "Copied!":"Kopirano!",
   "Color of the QR Code": "Barva kode QR",
+  "Silent stream":"Tihi tok",
 }

package/src/stores/FilterStore.ts

@@ -52,7 +52,7 @@ export const useFilterStore = defineStore("FilterStore", {
       this.filterRubrique = rubriqueFilter;
     },
     filterUpdateRubriqueDisplay(rubriques: Array<Rubrique>) {
-      this.filterRubriqueDisplay = rubriques;
+      this.filterRubriqueDisplay = rubriques.filter(rubrique=> rubrique);
     },
     filterUpdateMedia(filter: {
       type?: string;

package/src/stores/PlayerStore.ts

@@ -32,6 +32,7 @@ interface PlayerState {
   playerChaptering?: Chaptering;
   playerDelayStitching: number;
   playerHlsUrl?: string;
+  playerHlsIdentifier?:string;
 }
 export const usePlayerStore = defineStore("PlayerStore", {
   state: (): PlayerState => ({
@@ -49,6 +50,7 @@ export const usePlayerStore = defineStore("PlayerStore", {
     playerVideo: false,
     playerChaptering: undefined,
     playerDelayStitching: 0,
+    playerHlsIdentifier: undefined,
   }),
   getters: {
     playerChapteringPercent(): ChapteringPercent | undefined {
@@ -146,6 +148,7 @@ export const usePlayerStore = defineStore("PlayerStore", {
         this.playerPodcast = undefined;
         this.playerMedia = undefined;
         this.playerLive = undefined;
+        this.playerHlsIdentifier = undefined;
         this.playerRadio = undefined;
         this.playerElapsed = 0;
         this.playerVideo = false;
@@ -168,6 +171,7 @@ export const usePlayerStore = defineStore("PlayerStore", {
       this.playerPodcast = undefined;
       this.playerMedia = undefined;
       this.playerLive = undefined;
+      this.playerHlsIdentifier = undefined;
       this.playerRadio = undefined;
       this.playerVideo = isVideo;
       this.playerElapsed = 0;
@@ -177,6 +181,7 @@ export const usePlayerStore = defineStore("PlayerStore", {
         (!param.podcastId || param.processingStatus !== "READY")
       ) {
         this.playerLive = param;
+        this.playerHlsIdentifier = param.hlsIdentifier;
         this.playerCurrentChange = null;
         return;
       }
@@ -210,7 +215,7 @@ export const usePlayerStore = defineStore("PlayerStore", {
     playerUpdateSeekTime(seekTime: number) {
       this.playerSeekTime = seekTime;
     },
-    playerMetadata(metadata: MediaRadio, history: Array<MediaRadio>) {
+    playerMetadata(metadata: MediaRadio|undefined, history: Array<MediaRadio>) {
       if (!this.playerRadio) {
         return;
       }

package/src/stores/class/conference/conference.ts

@@ -8,6 +8,7 @@ export interface Conference {
   deletionAttempts?: number;
   directCode?: string;
   externalRtmpUrl?: ExternalRtmpUrl;
+  hlsIdentifier?: string;
   hostname?: string;
   jingleDuration?: number;
   jingleFilePath?: string;
@@ -57,6 +58,7 @@ export function getEmptyConference(): Conference {
 export interface ConferencePublicInfo {
   status: string;
   videoProfile: string;
+  hlsIdentifier: string;
 }
 
 export interface ExternalRtmpUrl {

package/src/stores/class/general/player.ts

@@ -4,7 +4,7 @@ import { Podcast } from "./podcast";
 export interface Radio {
   canalId: number;
   url: string;
-  metadata: MediaRadio;
+  metadata?: MediaRadio;
   history: Array<MediaRadio>;
   nextAdvertising: NextAdvertising;
   isInit: boolean;
@@ -30,7 +30,7 @@ export interface NextAdvertising {
 
 export interface MetadataRadio {
   channelId: number;
-  currently: MediaRadio;
+  currently: MediaRadio|null;
   previously: Array<MediaRadio>;
   nextAdvertising: NextAdvertising;
 }

package/src/style/_variables.scss

@@ -27,6 +27,9 @@
     --octopus-background-transparent: oklch(from var(--octopus-background) l c h / 40%);
     --octopus-tertiary-really-transparent: oklch(from var(--octopus-tertiary) l c h / 30%);
 
+    //Gradient
+    --octopus-gradient : linear-gradient(90deg,var(--octopus-primary) 0%, var(--octopus-tertiary) 100%);
+
     // Size
     --octopus-image-size: 12.5rem;
     --octopus-podcast-size: 13.5rem;

package/src/style/general.scss

@@ -114,6 +114,11 @@ main, #app{
 		background: var(--octopus-complementary-color) !important;
 	}
 
+  .bg-gradient{
+    background: var(--octopus-primary);
+    background:var(--octopus-gradient);
+  }
+
   .text-blue-octopus{
     color: var(--octopus-tertiary) !important
   }
@@ -170,6 +175,13 @@ main, #app{
 		}
 	}
 
+  .show-small-screen{
+    display: none !important;
+		@media (width <= 500px) {
+			display: flex !important;
+		}
+	}
+
   .show-phone{
     display: none;
 

package/src/helper/radio/radioHelper.ts

@@ -1,15 +0,0 @@
-import { MediaRadio } from "@/stores/class/general/player";
-
-export default {
-    displayTitle(metadata: MediaRadio): string {
-        let title = "";
-        if (metadata.title) {
-          title += metadata.title;
-        }
-        if (metadata.artist) {
-          title += " - " + metadata.artist;
-        }
-        return title;
-      }
-};
-