@saooti/octopus-sdk 38.0.5 → 38.0.7

package/package.json

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

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

@@ -3,12 +3,12 @@
     <h2 class="big-h2 mb-3 height-40">
       {{ $t("Program") }}
     </h2>
-    <div class="border">
+    <div class="py-3">
       <div class="d-flex align-items-center w-100">
         <button
           v-for="day in arrayDays"
           :key="day.date"
-          class="d-flex flex-column align-items-center flex-grow-1"
+          class="d-flex flex-column align-items-center flex-grow-1 button-date"
           :class="day.date == daySelected ? 'bg-primary text-white' : ''"
           @click="changeDate(day.date)"
         >
@@ -29,58 +29,58 @@
             v-for="planningItem in planning[daySelected]"
             v-else
             :key="
-              planningItem.occurrence.occurrenceId +
+              planningItem.occurrenceId +
               '' +
-              planningItem.occurrence.liveId
+              planningItem.liveId
             "
             class="d-flex align-items-center mb-3"
           >
             <div class="program-item-date fw-bold flex-shrink-0">
-              {{ dateDisplay(planningItem.occurrence.startDate) }}
+              {{ dateDisplay(planningItem.startDate) }}
             </div>
-            <component
-              :is="
+            <!-- <component :is="
                 planningItem.podcast.availability.visibility
                   ? 'router-link'
                   : 'div'
-              "
+              " -->
+            <router-link
               class="d-flex align-items-center text-dark"
               :to="{
                 name: 'podcast',
-                params: { podcastId: planningItem.podcast.podcastId },
+                params: { podcastId: planningItem.podcastId },
                 query: { productor: filterOrgaId },
               }"
             >
               <img
-                v-lazy="proxyImageUrl(planningItem.podcast.imageUrl, '150')"
+                v-lazy="proxyImageUrl(planningItem.podcastData.imageUrl, '150')"
                 width="150"
                 height="150"
                 class="m-2"
                 :title="
-                  $t('Episode name image', { name: planningItem.podcast.title })
+                  $t('Episode name image', { name: planningItem.podcastData.title })
                 "
                 :alt="
-                  $t('Episode name image', { name: planningItem.podcast.title })
+                  $t('Episode name image', { name: planningItem.podcastData.title })
                 "
               />
               <div class="d-flex flex-column">
                 <div class="d-flex align-items-center mb-2">
                   <div
-                    v-if="planningItem.occurrence.liveId"
+                    v-if="planningItem.liveId"
                     class="bg-complementary text-white p-1 me-1"
                   >
                     {{ $t("Live") }}
                   </div>
-                  <div class="flex-grow-1 text-truncate">
-                    {{ planningItem.occurrence.podcastData.title }}
+                  <div class="flex-grow-1 text-truncate fw-bold">
+                    {{ planningItem.podcastData.title }}
                   </div>
                 </div>
 
-                <ParticipantDescription
+                <!-- <ParticipantDescription
                   :participants="planningItem.podcast.animators"
-                />
+                /> -->
               </div>
-            </component>
+            </router-link>
           </div>
         </template>
       </div>
@@ -96,19 +96,16 @@ import utc from "dayjs/plugin/utc";
 dayjs.extend(utc);
 import octopusApi from "@saooti/octopus-api";
 import imageProxy from "../../mixins/imageProxy";
-import ParticipantDescription from "../podcasts/ParticipantDescription.vue";
 import ClassicLoading from "../../form/ClassicLoading.vue";
 import { defineComponent } from "vue";
 import { Canal } from "@/stores/class/radio/canal";
 import { PlanningOccurrence } from "@/stores/class/radio/recurrence";
-import { Podcast } from "@/stores/class/general/podcast";
 import { PlanningLive } from "@/stores/class/radio/live";
 export default defineComponent({
   name: "RadioPlanning",
 
   components: {
     ClassicLoading,
-    ParticipantDescription,
   },
 
   mixins: [imageProxy],
@@ -120,10 +117,7 @@ export default defineComponent({
   data() {
     return {
       planning: {} as {
-        [key: number]: Array<{
-          podcast: Podcast;
-          occurrence: PlanningOccurrence | PlanningLive;
-        }>;
+        [key: number]: Array<PlanningOccurrence | PlanningLive>;
       },
       daySelected: dayjs().valueOf(),
       arrayDays: [] as Array<{
@@ -195,6 +189,8 @@ export default defineComponent({
             return b.startDate > a.startDate ? -1 : 0;
           });
         }
+        this.planning[this.daySelected] = occurrences;
+        /* 
         this.planning[this.daySelected] = [];
         for (let oc of occurrences) {
           if (oc.podcastId) {
@@ -207,7 +203,7 @@ export default defineComponent({
               occurrence: oc,
             });
           }
-        }
+        } */
       } catch {
         this.error = true;
       }
@@ -227,6 +223,14 @@ export default defineComponent({
 .octopus-app {
   .program-item-date {
     width: 100px;
+    font-size: 1.1rem;
+  }
+  .button-date{
+    border: 1px solid #ddd;
+    padding: 0.5rem 0;
+    &:hover{
+      background: #ddd;
+    }
   }
 }
 </style>

package/src/stores/ParamSdkStore.ts

@@ -12,7 +12,7 @@ const state: ParamStore = {
     isPlaylist: true,
     isProduction: true,
     isContribution: true,
-    ApiUri: "https://api.dev2.saooti.org/",
+    ApiUri: "https://api.staging.saooti.org/",
     podcastmaker: false,
     buttonPlus: true,
     allCategories: [],
@@ -26,8 +26,8 @@ const state: ParamStore = {
     SharePlayer: true,
     ShareButtons: true,
     ShareDistribution: true,
-    MiniplayerUri: "https://playerbeta.dev2.saooti.org/",
-    hlsUri: "https://hls.live.dev2.saooti.org/",
+    MiniplayerUri: "https://playerbeta.staging.saooti.org/",
+    hlsUri: "https://hls.live.staging.saooti.org/",
     mainRubrique: 0,
     resourceUrl: undefined,
     podcastItemShowEmission: false,
@@ -79,13 +79,14 @@ const state: ParamStore = {
     userName: "",
   },
   octopusApi: {
-    url: "https://api.dev2.saooti.org/",
-    commentsUrl: "https://comments.dev2.saooti.org/",
-    imageUrl: "https://imageproxy.dev2.saooti.org/",
-    studioUrl: "https://studio.dev2.saooti.org/",
-    playerUrl: "https://playerbeta.dev2.saooti.org/",
-    speechToTextUrl: "https://speech2text.dev2.saooti.org/",
-    recoUrl: "https://reco.dev2.saooti.org/",
+    url: "https://api.staging.saooti.org/",
+    commentsUrl: "https://comments.staging.saooti.org/",
+    imageUrl: "https://imageproxy.staging.saooti.org/",
+    studioUrl: "https://studio.staging.saooti.org/",
+    playerUrl: "https://playerbeta.staging.saooti.org/",
+    speechToTextUrl: "https://speech2text.staging.saooti.org/",
+    radioUrl:"https://radio.staging.saooti.org/",
+    recoUrl: "https://reco.staging.saooti.org/",
     organisationId: undefined,
     rubriqueIdFilter: undefined,
   },

package/src/stores/class/radio/canal.ts

@@ -2,8 +2,8 @@ export interface Canal {
   id: number;
   organisationId: string;
   name: string;
-  defaultPlaylist: string;
-  url: string;
+  defaultPlaylist:string;
+  url:string;
   imageUrl: string;
-  description: string;
-}
+  description:string;
+}

package/src/stores/class/radio/live.ts

@@ -1,8 +1,10 @@
+import { Occurrence } from "./recurrence";
+
 export interface CrudPlanningLive {
   isLive: boolean;
   dateValid: boolean;
   canalId: number;
-  liveId: number;
+  occurrenceId: number;
 }
 
 export interface TimeRangeAvailable {
@@ -10,25 +12,14 @@ export interface TimeRangeAvailable {
   end: Date;
 }
 
-export interface PlanningLive {
-  canalId: number;
-  liveId: number;
-  startDate: Date;
-  endDate: Date;
-  podcastId: number;
-  podcastData: {
-    title: string;
-    artist: string;
-    duration: number;
-    conferenceId: number;
-  };
+export interface PlanningLive extends Occurrence {
 }
 
 export function emptyCrudPlanningLive(): CrudPlanningLive {
-  return {
-    isLive: false,
+	return {
+		isLive: false,
     dateValid: false,
     canalId: 0,
-    liveId: 0,
-  };
-}
+    occurrenceId:0,
+	};
+}

package/src/stores/class/radio/mix.ts

@@ -1,23 +1,23 @@
 export interface Mix {
-  mixId?: number;
-  color: string;
-  description: string;
-  name: string;
-  organisationId: string;
-  samplings: Array<MediaSampling>;
+	mixId?: number;
+	color: string;
+	description: string;
+	name: string;
+	organisationId:string;
+	samplings: Array<MediaSampling>
 }
 
 export interface MediaSampling {
-  mediaSamplingId?: number;
-  number: number;
-  armb?: string;
-  playlistId?: number;
-  criterions: Array<Criterion>;
+	mediaSamplingId?: number;
+    number: number;
+	armb?:string;
+    playlistId?:number;
+	criterions: Array<Criterion>;
 }
 
 export interface Criterion {
-  criterionId?: number;
-  criterionValue?: string;
-  criterionType?: string;
-  mediaField?: string;
-}
+	criterionId?: number;
+	criterionValue?: string;
+	criterionType?:string;
+    mediaField?:string;
+}

package/src/stores/class/radio/playlistMedia.ts

@@ -1,10 +1,10 @@
 import { Media } from "../general/media";
 
 export interface PlaylistMedia {
-  playlistId: number;
-  color: string;
-  description: string;
-  name: string;
-  organisationId: string;
-  medias: Array<Media>;
-}
+	playlistId: number;
+	color: string;
+	description: string;
+	name: string;
+	organisationId:string;
+	medias: Array<Media>
+}

package/src/stores/class/radio/recurrence.ts

@@ -1,76 +1,86 @@
-export interface TimeValue {
-  HH: string;
-  mm: string;
-  ss: string;
+export interface TimeValue{
+	hours: number;
+	minutes: number;
+	seconds: number;
 }
 export interface Cron {
-  cronId?: number;
-  cron: string;
-  label?: string;
-  timezone: string;
+	cronId?: number;
+	cron: string;
+	label?:string;
+	timezone: string;
 }
 export interface Tranche {
-  recId: number;
-  start: number;
-  duration: number;
-  playlistName?: string;
-  playlistId?: number;
-  mixId?: number;
+	recId: number;
+	start: string;
+	duration: number;
+	playlistName?: string;
+	playlistId?: number;
+	mixId?: number;
 }
-export interface PlanningOccurrence {
-  occurrenceId?: number;
-  canalId: number;
-  chained: boolean;
-  startDate: number;
-  endDate?: number;
-  podcastId?: number;
-  nextOccurrence?: number;
-  previousOccurrence?: number;
-  recurrenceId?: number;
-  podcastData: {
+
+
+export interface Occurrence {
+	occurrenceId: number;
+	canalId: number;
+	startDate: string;
+	recurrenceStartDate: string;
+	endDate:string;
+	podcastId: number;
+	recurrenceId:number;
+	podcastData:{
     title: string;
     artist: string;
     duration: number;
     pathAudio: number;
+		conferenceId: number;
+		description: string;
+		imageUrl: string;
   };
 }
+
+export interface PlanningOccurrence extends Occurrence{
+	chained: boolean,
+	nextOccurrence?: number,
+	previousOccurrence?: number,
+}
+
 export interface Recurrence {
-  recurrenceId: number;
-  name: string;
-  canalId: number;
-  validityStart: number;
-  validityEnd: number;
-  crons: Array<Cron>;
-  duration: number;
+	recurrenceId: number;
+	name: string;
+	canalId: number;
+	validityStart: string;
+	validityEnd: string;
+	crons: Array<Cron>;
+	duration:number;
 }
 export interface AmbianceRecurrence extends Recurrence {
-  armbPlaylistName?: string;
-  mediaPlaylistId?: number;
-  mixId?: number;
+	armbPlaylistName?: string;
+	mediaPlaylistId?: number;
+	mixId?: number;
 }
-export interface PlanningRecurrence extends Recurrence {
-  octopusPlaylistName: string;
-  octopusPlaylistId: number;
-  chained: boolean;
-  exclusions: Array<Exclusion>;
+export interface PlanningRecurrence extends Recurrence{
+	octopusPlaylistName: string;
+	octopusPlaylistId: number;
+	chained: boolean;
+	exclusions: Array<Exclusion>
 }
 export interface Exclusion {
-  exclusionId: number;
-  validityStart: string;
-  validityEnd: string;
+	exclusionId: number;
+	validityStart: string;
+	validityEnd: string;
 }
 
 export function emptyCron(): Cron {
-  return {
-    cron: "0 0 0 ? * MON,TUE,WED,THU,FRI,SAT,SUN *",
-    label: "",
-    timezone: "Europe/Paris",
-  };
+	return {
+		cron:"0 0 0 ? * MON,TUE,WED,THU,FRI,SAT,SUN *",
+		label:"",
+		timezone: "Europe/Paris",
+	};
 }
 export function emptyTimeValue(): TimeValue {
-  return {
-    HH: "00",
-    mm: "00",
-    ss: "00",
-  };
-}
+	return {
+		hours: 0,
+		minutes: 0,
+		seconds: 0,
+	};
+}