@saooti/octopus-sdk 39.3.15 → 39.3.16

package/index.ts

@@ -16,6 +16,7 @@ export const getError403Page = () => import("./src/components/pages/Error403Page
 export const getRadio = () => import("./src/components/pages/RadioPage.vue");
 export const getVideo = () => import("./src/components/pages/VideoPage.vue");
 export const getMapPage= () => import("./src/components/pages/MapPage.vue");
+export const getPageNotFound= () => import("./src/components/pages/PageNotFound.vue");
 
 //Misc
 export const getAccordion = () => import("./src/components/misc/ClassicAccordion.vue");

package/package.json

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

package/src/App.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="d-flex flex-column h-100 octopus-app">
     <template v-if="pageFullyLoad">
-      <TopBar :is-education="false" />
+      <TopBar/>
       <main>
         <CategoryFilter v-if="firstDisplayCategoryFilter" />
         <div v-else class="category-filter-no-filter" />

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

@@ -25,14 +25,13 @@
     <ClassicPopover
       target="categories-dropdown"
       :only-click="true"
-      :is-fixed="true"
       :left-pos="true"
-      class="popover-z-index"
     >
       <button
         v-for="category in hidenCategories"
         :key="category.id"
         class="me-3 octopus-dropdown-item"
+        @keydown.enter="checkIfFilter(category)"
         @mousedown="checkIfFilter(category)"
       >
         {{ category.name }}

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

@@ -10,6 +10,7 @@
     />
     <div v-if="isTextareaActive" class="d-flex justify-content-between mt-1">
       <ClassicEmojiPicker
+        :id="uniqueId"
         popover-relative-class="page-element"
         @emoji-selected="addEmojiSelected"
       />
@@ -123,6 +124,9 @@ export default defineComponent({
         ? this.$t("Answer a comment")
         : this.$t("Write a comment");
     },
+    uniqueId(){
+      return "-comment"+(this.inAnswerComment?.commentId??"-parent");
+    }
   },
   watch: {
     focus(): void {

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

@@ -21,6 +21,7 @@
           class="me-3 octopus-dropdown-item"
           :disabled="sortOption.value === sortType"
           @mousedown="changeSort(sortOption.value)"
+          @keydown.enter="changeSort(sortOption.value)"
         >
           {{ sortOption.title }}
         </button>

package/src/components/display/comments/item/CommentMoreActions.vue

@@ -35,7 +35,6 @@
     </button>
     <ClassicPopover
       :target="'comment-dropdown' + comment.commentId"
-      popover-class="popover-z-index"
       :only-click="true"
       :left-pos="true"
     >
@@ -44,6 +43,7 @@
           v-if="action.condition"
           class="octopus-dropdown-item c-hand"
           @mousedown="action.actionClick"
+          @keydown.enter="action.actionClick"
         >
           {{ action.title }}
         </button>

package/src/components/display/comments/modal/EditCommentModal.vue

@@ -10,13 +10,6 @@
         :error-text="errorUpdate ? $t(`An error occurred`) : undefined"
       />
       <template v-if="!inProcessing && !errorUpdate">
-        <ClassicInputText
-          v-model:text-init="name"
-          v-model:error-variable="errorName"
-          input-id="username-input"
-          :label="$t('Your name')"
-          :max-length="MAX_NAME"
-        />
         <ClassicInputText
           v-model:text-init="commentText"
           v-model:error-variable="errorCommentText"
@@ -26,7 +19,7 @@
           :error-text="$t('Please provide a comment')"
           :is-textarea="true"
           :is-emoji-picker="true"
-          emoji-relative-class="octopus-modal"
+          popover-relative-class="octopus-modal"
           :focus="true"
         />
         <ClassicSelect
@@ -49,7 +42,7 @@
       </button>
       <button
         class="btn btn-primary m-1"
-        :disabled="errorName || errorCommentText"
+        :disabled="errorCommentText"
         @click="onEditComment"
       >
         {{ $t("Yes") }}
@@ -97,10 +90,7 @@ export default defineComponent({
   data() {
     return {
       MAX_DESCRIPTION: Constants.MAX_COMMENT as number,
-      MAX_NAME: Constants.MAX_COMMENT_NAME as number,
-      name: undefined as string | undefined,
       commentText: undefined as string | undefined,
-      errorName: true as boolean,
       errorCommentText: true as boolean,
       commentState: "PENDING" as string,
       errorUpdate: false as boolean,
@@ -115,7 +105,6 @@ export default defineComponent({
       if (!this.comment) {
         return;
       }
-      this.name = this.comment.poster.userName;
       this.commentText = this.comment.content;
       this.commentState = this.comment.state;
     },
@@ -131,7 +120,6 @@ export default defineComponent({
           dataToSend: {
             commentId: this.comment.commentId,
             content: this.commentText,
-            name: this.name,
             state: this.commentState,
           },
           isNotAuth: !this.editRight,

package/src/components/display/filter/AdvancedSearch.vue

@@ -17,7 +17,7 @@
           {{ $t("Filter") }}
         </div>
         <MonetizableFilter
-          v-if="!isPodcastmaker && !isEducation"
+          v-if="!isPodcastmaker && !platformEducation"
           :is-emission="isEmission"
           :monetisable="monetisable"
           @update:monetisable="updateMonetisable"
@@ -82,6 +82,7 @@ import { rubriquesFilterParam } from "../../mixins/routeParam/rubriquesFilterPar
 import { RubriquageFilter } from "@/stores/class/rubrique/rubriquageFilter";
 import { defineComponent, defineAsyncComponent } from "vue";
 import { mapState } from "pinia";
+import { useGeneralStore } from "../../../stores/GeneralStore";
 const MonetizableFilter = defineAsyncComponent(
   () => import("./MonetizableFilter.vue"),
 );
@@ -110,7 +111,6 @@ export default defineComponent({
   props: {
     organisationId: { default: undefined, type: String },
     isEmission: { default: false, type: Boolean },
-    isEducation: { default: false, type: Boolean },
     includeHidden: { default: false, type: Boolean },
     sort: { default: "DATE", type: String },
     onlyVideo: { default: false, type: Boolean },
@@ -145,6 +145,7 @@ export default defineComponent({
   },
 
   computed: {
+    ...mapState(useGeneralStore, ["platformEducation"]),
     ...mapState(useFilterStore, ["filterIab", "filterRubrique"]),
     ...mapState(useAuthStore, [
       "isRoleProduction",

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

@@ -32,6 +32,7 @@
         <h2 class="mb-3">
           {{ podcast.title }}
         </h2>
+        <PodcastPlannedSpinner v-if="isPlannedInProcessor"/>
         <Countdown v-if="isCounter" :time-remaining="timeRemaining" />
         <!-- eslint-disable vue/no-v-html -->
         <div
@@ -175,6 +176,9 @@ const LikeSection = defineAsyncComponent(
 const DownloadPodcastButton = defineAsyncComponent(
   () => import("./DownloadPodcastButton.vue"),
 );
+const PodcastPlannedSpinner = defineAsyncComponent(
+  () => import("./PodcastPlannedSpinner.vue"),
+);
 const Countdown = defineAsyncComponent(() => import("../live/CountDown.vue"));
 const TagList = defineAsyncComponent(() => import("./TagList.vue"));
 import resizePhone from "../../mixins/resizePhone";
@@ -195,6 +199,7 @@ export default defineComponent({
     PodcastRawTranscript,
     DownloadPodcastButton,
     NewspaperVariantOutlineIcon,
+    PodcastPlannedSpinner
   },
 
   mixins: [displayMethods, orgaComputed, resizePhone, podcastView],

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

@@ -0,0 +1,93 @@
+<template>
+  <div class="processing-planned-spinner d-flex align-items-center my-2 bg-secondary  p-3">
+    <div class="cube">
+      <div class="side"></div>
+      <div class="side"></div>
+      <div class="side"></div>
+      <div class="side"></div>
+      <div class="side"></div>
+      <div class="side"></div>
+    </div>
+    <div class="fw-bold">{{$t('The episode is being processed')}}</div>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from "vue";
+export default defineComponent({
+  name: "PodcastPlannedSpinner",
+});
+</script>
+<style lang="scss">
+@use "@scss/variables" as octopusVariables;
+.octopus-app .processing-planned-spinner{
+  .cube {
+    margin-right:1rem;
+    font-size: 24px;
+    height: 1em;
+    width: 1em;
+    position: relative;
+    transform: rotatex(30deg) rotatey(45deg);
+    transform-style: preserve-3d;
+    animation: cube-spin 2.5s infinite ease-in-out alternate;
+  }
+  .side {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    transform-style: preserve-3d;
+  }
+  .side::before {
+    content: "";
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    background-color: octopusVariables.$octopus-primary-color;
+    transform: translatez(0.5em);
+    animation: cube-explode 1.5s infinite ease-in-out;
+    opacity: 0.5;
+  }
+  .side:nth-child(1) {
+    transform: rotatey(90deg);
+  }
+  .side:nth-child(2) {
+    transform: rotatey(180deg);
+  }
+  .side:nth-child(3) {
+    transform: rotatey(270deg);
+  }
+  .side:nth-child(4) {
+    transform: rotatey(360deg);
+  }
+  .side:nth-child(5) {
+    transform: rotatex(90deg);
+  }
+  .side:nth-child(6) {
+    transform: rotatex(270deg);
+  }
+  @keyframes cube-spin {
+    0% {
+      transform: rotatex(30deg) rotatey(45deg);
+    }
+    100% {
+      transform: rotatex(30deg) rotatey(405deg);
+    }
+  }
+  @keyframes cube-explode {
+    0% {
+      transform: translatez(0.5em);
+    }
+    50% {
+      transform: translatez(0.75em);
+    }
+    100% {
+      transform: translatez(0.5em);
+    }
+  }
+
+}
+</style>

package/src/components/display/rubriques/RubriqueList.vue

@@ -36,9 +36,7 @@
     <ClassicPopover
       ref="popoverRubrique"
       target="rubriques-dropdown"
-      class="popover-z-index"
       :only-click="true"
-      :is-fixed="true"
       :left-pos="true"
     >
       <RubriqueChooser

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

@@ -5,7 +5,7 @@
         {{ $t("Embed") }}
       </h3>
       <div
-        v-if="noAd && !isEducation"
+        v-if="noAd && !platformEducation"
         class="sticker"
         :title="$t('You cannot insert advertising')"
       >
@@ -95,6 +95,7 @@ import { useApiStore } from "../../../stores/ApiStore";
 import { useSaveFetchStore } from "../../../stores/SaveFetchStore";
 import { mapState, mapActions } from "pinia";
 import { defineComponent, defineAsyncComponent } from "vue";
+import { useGeneralStore } from "../../../stores/GeneralStore";
 const ShareModalPlayer = defineAsyncComponent(
   () => import("../../misc/modal/ShareModalPlayer.vue"),
 );
@@ -123,7 +124,6 @@ export default defineComponent({
     emission: { default: undefined, type: Object as () => Emission },
     playlist: { default: undefined, type: Object as () => Playlist },
     organisationId: { default: undefined, type: String },
-    isEducation: { default: false, type: Boolean },
     exclusive: { default: false, type: Boolean },
     notExclusive: { default: true, type: Boolean },
   },
@@ -151,6 +151,7 @@ export default defineComponent({
   },
 
   computed: {
+    ...mapState(useGeneralStore, ["platformEducation"]),
     ...mapState(useAuthStore, ["authOrgaId"]),
     ...mapState(useApiStore, ["miniplayerUrl"]),
     authenticated(): boolean {

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

@@ -42,7 +42,6 @@
       target="subscribe-buttons-dropdown"
       popover-class="popover-z-index"
       :only-click="true"
-      :is-fixed="true"
       :left-pos="true"
     >
       <a

package/src/components/form/ClassicEmojiPicker.vue

@@ -1,7 +1,7 @@
 <template>
-  <div class="classic-emoji-picker">
+  <div v-if="!isPhone" class="classic-emoji-picker">
     <button
-      id="emoji-picker-dropdown"
+      :id="'emoji-picker-dropdown'+id"
       ref="emojiButton"
       class="btn btn-transparent d-flex align-items-center justify-content-center"
       :title="$t('Pick your emoji')"
@@ -9,12 +9,13 @@
       <EmoticonExcitedOutlineIcon :size="34" />
     </button>
     <ClassicPopover
-      target="emoji-picker-dropdown"
+      :target="'emoji-picker-dropdown'+id"
       :only-click="true"
       :is-fixed="true"
-      :top-pos="isReallyTopPosition"
+      :is-top-layer="isTopPosition"
+      :top-pos="isTopPosition"
       :relative-class="popoverRelativeClass"
-      popover-class="popover-z-index"
+      :popover-class="isTopPosition?'popover-z-index':''"
     >
       <Picker
         :data="emojiIndex"
@@ -27,6 +28,7 @@
 </template>
 
 <script lang="ts">
+import resizePhone from "../mixins/resizePhone";
 import EmoticonExcitedOutlineIcon from "vue-material-design-icons/EmoticonExcitedOutline.vue";
 import ClassicPopover from "../misc/ClassicPopover.vue";
 import data from "emoji-mart-vue-fast/data/all.json";
@@ -41,31 +43,41 @@ export default defineComponent({
     ClassicPopover,
     EmoticonExcitedOutlineIcon,
   },
+  mixins:[resizePhone],
   props: {
     popoverRelativeClass: { default: undefined, type: String },
     isTopPosition: { default: false, type: Boolean },
+    id: { default: "", type: String },
   },
   emits: ["emojiSelected"],
 
   data() {
     return {
       emojiIndex: emojiIndex,
-      hasPlaceAboveButton: true as boolean,
+      /* hasPlaceAboveButton: false as boolean, */
+      isPhone: false as boolean,
     };
   },
-  computed: {
+  /* computed: {
     isReallyTopPosition(): boolean {
       return this.isTopPosition && this.hasPlaceAboveButton;
     },
-  },
-  mounted() {
-    if (this.$refs.emojiButton) {
-      this.hasPlaceAboveButton =
-        (this.$refs.emojiButton as HTMLButtonElement).getBoundingClientRect()
-          .top +
-          window.scrollY >
-        450;
-    }
-  },
+  }, */
+  /* watch:{
+    isPhone: {
+      immediate: true,
+      async handler() {
+        debugger;
+        if (!this.isPhone && this.isTopPosition && this.$refs.emojiButton) {
+          this.hasPlaceAboveButton =
+            (this.$refs.emojiButton as HTMLButtonElement).getBoundingClientRect()
+              .top +
+              window.scrollY >
+            450;
+        }
+      },
+    },
+  }, */
 });
 </script>
+

package/src/components/misc/ClassicPopover.vue

@@ -1,12 +1,16 @@
 <template>
   <div
-    v-show="show && !disable"
+    v-show="displayPopover"
     :id="'popover' + target"
     ref="popover"
+    popover
     tabindex="0"
-    role="dialog"
     class="octopus-popover"
-    :class="[onlyClick ? 'octopus-dropdown' : '', popoverClass]"
+    :class="[
+      displayPopover ? 'd-block': '',
+      onlyClick ? 'octopus-dropdown' : '',
+      isFixed && isTopLayerPopover ? 'position-fixed':'position-absolute',
+      popoverClass]"
     :style="positionInlineStyle"
     @focusout="clearDataBlur"
     @mouseenter="overPopover = true"
@@ -40,6 +44,7 @@ export default defineComponent({
     leftPos: { type: Boolean, default: false },
     topPos: { type: Boolean, default: false },
     popoverClass: { type: String, default: undefined },
+    isTopLayer: { type: Boolean, default: false },
   },
   emits: ["updateVisibility"],
   data() {
@@ -51,7 +56,8 @@ export default defineComponent({
       targetElement: null as HTMLElement | null,
       overPopover: false as boolean,
       isTabAction: false as boolean,
-      maxHeight: '80vh' as string
+      maxHeight: '80vh' as string,
+      clearTimeout: undefined as ReturnType<typeof setTimeout> | undefined,
     };
   },
   computed: {
@@ -61,8 +67,24 @@ export default defineComponent({
     positionInlineStyle(): string {
       return `left: ${this.posX}px; top: ${this.posY}px;max-height:${this.maxHeight}`;
     },
+    displayPopover(): boolean{
+      return this.show && !this.disable;
+    },
+    isTopLayerPopover(){
+      return (this.isTopLayer || "octopus-modal"===this.relativeClass) && HTMLElement.prototype.hasOwnProperty("popover");
+    },
   },
   watch: {
+    displayPopover(){
+      if(!this.isTopLayerPopover){
+        return;
+      }
+      if(this.displayPopover){
+        (this.$refs.popover as HTMLElement).showPopover();
+      }else{
+        (this.$refs.popover as HTMLElement).hidePopover();
+      }
+    },
     show() {
       this.$emit("updateVisibility", this.show);
       if (this.show) {
@@ -132,6 +154,7 @@ export default defineComponent({
       }
     },
     setPopoverData(e: MouseEvent | PointerEvent) {
+      clearInterval(this.clearTimeout as unknown as number);
       if (this.disable || !e || !e.target) {
         return;
       }
@@ -141,6 +164,11 @@ export default defineComponent({
           this.clearData();
           return;
         }
+        if (this.show && this.isTopLayerPopover) {
+          (this.$refs.popover as HTMLElement).showPopover();
+          this.isClick = true;
+          return;
+        }
         this.isClick = true;
       }
       this.show = true;
@@ -149,7 +177,7 @@ export default defineComponent({
       let parentTop = 0;
       let parentScrollTop = 0;
       let parentBottom = 0;
-      if (this.relativeClass) {
+      if (!this.isTopLayerPopover && this.relativeClass) {
         const modalBody = document.getElementsByClassName(
           this.relativeClass,
         )[0];
@@ -181,13 +209,21 @@ export default defineComponent({
       const yGap = this.topPos
         ? -5 - (this.$refs.popover as HTMLElement).clientHeight
         : 5;
+      
       this.posY =
         yPosParent +
         parentScrollTop -
         parentTop +
         (this.isFixed ? 0 : window.scrollY) +
         yGap;
-      this.maxHeight = this.relativeClass ? (parentBottom- this.posY -parentTop) + "px":'80vh';
+      if(this.isTopLayerPopover){
+        this.posY = Math.max(0, this.posY);
+        this.maxHeight = (window.innerHeight - this.posY) + "px";
+      }else if(this.relativeClass){
+        this.maxHeight = (parentBottom- this.posY -parentTop) + "px";
+      }else{
+        this.maxHeight = '80vh';
+      }
     },
     clearDataBlur(e: FocusEvent) {
       if (this.isTabAction) {
@@ -233,10 +269,11 @@ export default defineComponent({
       this.clearData();
     },
     clearDataTimeout() {
-      setTimeout(() => {
+      this.clearTimeout = setTimeout(() => {
         if (!this.overPopover) {
           this.clearData();
         }
+        this.clearTimeout=undefined;
       }, 500);
     },
     clearData() {
@@ -256,8 +293,9 @@ export default defineComponent({
   background: white;
   border: 1px solid #ccc;
   border-radius: octopusVariables.$octopus-borderradius;
-  position: absolute;
   overflow: auto;
+  margin: 0 !important;
+  z-index: 10;
   &.popover-z-index {
     z-index: 9999;
   }

package/src/components/misc/HomeDropdown.vue

@@ -30,6 +30,7 @@
       :only-click="true"
       :is-fixed="true"
       :left-pos="true"
+      :is-top-layer="true"
     >
       <nav :aria-label="$t('User menu')">
         <ul class="p-0 m-0">

package/src/components/misc/MobileMenu.vue

@@ -16,6 +16,7 @@
       :only-click="true"
       :is-fixed="true"
       :left-pos="true"
+      :is-top-layer="true"
     >
       <template v-for="link in routerLinkArray" :key="link.routeName">
         <router-link

package/src/components/misc/ProgressBar.vue

@@ -67,6 +67,7 @@
             right: 100 - chapter.endPercent + '%',
           }"
         />
+        <!-- If top layer widely available no need to teleport -->
         <Teleport to="#octopus-player-component">
           <ClassicPopover
             :target="'chapter-' + chapter.startPercent"
@@ -75,6 +76,7 @@
             :only-mouse="true"
             popover-class="octopus-small-popover popover-z-index"
             :content="chapter.title"
+            :is-top-layer="true"
           />
         </Teleport>
       </template>

package/src/components/misc/TopBar.vue

@@ -5,7 +5,6 @@
   >
     <TopBarMainContent
       class="top-bar-z-index"
-      :is-education="isEducation"
       :is-phone="isPhone"
       :scrolled="scrolled"
       :title-display="titleToDisplay"
@@ -50,10 +49,6 @@ export default defineComponent({
   },
 
   mixins: [imageProxy, resizePhone],
-
-  props: {
-    isEducation: { default: false, type: Boolean },
-  },
   data() {
     return {
       scrolled: false as boolean,

package/src/components/misc/TopBarMainContent.vue

@@ -18,7 +18,7 @@
         alt=""
         width="140"
         height="50"
-        :class="isEducation ? 'educationLogo' : 'octopusLogo'"
+        :class="platformEducation ? 'educationLogo' : 'octopusLogo'"
       />
       <img
         v-else
@@ -26,7 +26,7 @@
         role="presentation"
         alt=""
         class="client-logo"
-        :class="isEducation ? 'educationLogo' : ''"
+        :class="platformEducation ? 'educationLogo' : ''"
       />
     </router-link>
     <h1 v-if="titleIsDisplayed" class="text-truncate m-0 align-self-center">
@@ -49,7 +49,7 @@
           width="100"
           height="29"
           class="ms-2"
-          :class="isEducation ? 'educationLogo' : 'octopusLogo'"
+          :class="platformEducation ? 'educationLogo' : 'octopusLogo'"
         />
         <a
           v-else
@@ -65,7 +65,7 @@
             width="100"
             height="29"
             class="ms-2"
-            :class="isEducation ? 'educationLogo' : 'octopusLogo'"
+            :class="platformEducation ? 'educationLogo' : 'octopusLogo'"
           />
         </a>
       </template>
@@ -103,6 +103,7 @@
           :only-click="true"
           :is-fixed="true"
           :left-pos="true"
+          :is-top-layer="true"
         >
           <nav class="d-flex flex-column" :aria-label="$t('Site menu')">
             <ul class="p-0 m-0">
@@ -126,13 +127,13 @@
           </nav>
         </ClassicPopover>
         <MobileMenu
-          :is-education="isEducation"
+          :is-education="platformEducation"
           :show="mobileMenuDisplay"
           :not-podcast-and-emission="inContentDisplayPage && !scrolled"
           :scrolled="scrolled"
         />
         <HomeDropdown
-          :is-education="isEducation"
+          :is-education="platformEducation"
           :mobile-menu-display="mobileMenuDisplay"
           :scrolled="scrolled"
         />
@@ -163,6 +164,7 @@ import { useAuthStore } from "../../stores/AuthStore";
 import { mapState } from "pinia";
 import ClassicPopover from "../misc/ClassicPopover.vue";
 import { defineComponent, defineAsyncComponent } from "vue";
+import { useGeneralStore } from "../../stores/GeneralStore";
 const MobileMenu = defineAsyncComponent(() => import("./MobileMenu.vue"));
 export default defineComponent({
   name: "TopBarMainContent",
@@ -175,7 +177,6 @@ export default defineComponent({
   },
   mixins: [imageProxy, rubriquesFilterComputed],
   props: {
-    isEducation: { default: false, type: Boolean },
     isPhone: { default: false, type: Boolean },
     titleDisplay: { default: "", type: String },
     scrolled: { default: false, type: Boolean },
@@ -184,6 +185,7 @@ export default defineComponent({
     return {};
   },
   computed: {
+    ...mapState(useGeneralStore, ["platformEducation"]),
     ...mapState(useFilterStore, [
       "filterLive",
       "filterOrgaId",
@@ -243,12 +245,12 @@ export default defineComponent({
           title: this.$t("Productors"),
           routeName: "productors",
           condition:
-            !this.isPodcastmaker && (!this.filterOrgaId || this.isEducation),
+            !this.isPodcastmaker && (!this.filterOrgaId || this.platformEducation),
         },
       ];
     },
     logoUrl(): string {
-      if (this.isEducation) {
+      if (this.platformEducation) {
         return "/img/logo_education_white.svg";
       }
       return this.isPhone

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

@@ -12,7 +12,7 @@
     class="player-speed-dropdown"
     :top-pos="true"
     :only-click="true"
-     :is-fixed="true"
+    :is-fixed="true"
   >
     <button
       v-for="(speed, index) in speedArray"

package/src/components/mixins/podcast/podcastView.ts

@@ -17,6 +17,9 @@ export default defineComponent({
         ? 0
         : dayjs(this.podcast.pubDate).diff(dayjs(), "seconds");
     },
+    isPlannedInProcessor(): boolean {
+      return "PLANNED" === this.podcast?.processingStatus;
+    },
     isLiveReadyToRecord(): boolean {
       return (
         undefined !== this.podcast &&

package/src/components/pages/EmissionPage.vue

@@ -1,6 +1,6 @@
 <template>
   <section class="page-box">
-    <template v-if="loaded && !error">
+    <template v-if="loaded && !error && emission">
       <PodcastmakerHeader
         v-if="isPodcastmaker"
         :page-title="$t('Emission')"
@@ -50,8 +50,6 @@
           <EditBox
             v-if="editRight && !isPodcastmaker"
             :emission="emission"
-            :rss-emission="rssEmission"
-            :ftp-emission="ftpEmission"
             @is-updated="getEmissionDetails"
           />
         </section>
@@ -61,7 +59,6 @@
           :exclusive="exclusive"
           :not-exclusive="notExclusive"
           :organisation-id="authOrgaId"
-          :is-education="isEducation"
         />
         <section class="module-box">
           <LiveHorizontalList
@@ -157,7 +154,6 @@ export default defineComponent({
   mixins: [displayMethods, handle403, orgaComputed, imageProxy, seoTitleUrl],
   props: {
     emissionId: { default: undefined, type: Number },
-    isEducation: { default: false, type: Boolean },
   },
 
   data() {
@@ -166,8 +162,6 @@ export default defineComponent({
       title: "" as string,
       emission: undefined as Emission | undefined,
       error: false as boolean,
-      rssEmission: false as boolean,
-      ftpEmission: false as boolean,
       exclusive: false as boolean,
       notExclusive: false as boolean,
       fetchLive: true as boolean,
@@ -223,8 +217,6 @@ export default defineComponent({
     },
     handleAnnotations() {
       if (!this.emission?.annotations) return;
-      this.rssEmission = "RSS" === this.emission.annotations.SOURCE_KIND;
-      this.ftpEmission = "FTP" === this.emission.annotations.SOURCE_KIND;
       if (this.emission.annotations.exclusive) {
         this.exclusive = "true" === this.emission.annotations.exclusive;
         this.exclusive =

package/src/components/pages/EmissionsPage.vue

@@ -15,7 +15,6 @@
       v-model:to-date="toDate"
       v-model:rubrique-filter="rubriqueFilter"
       :search-pattern="searchPattern"
-      :is-education="isEducation"
       :is-emission="true"
       :organisation-id="organisationId"
     />
@@ -54,7 +53,6 @@ export default defineComponent({
   },
   mixins: [advancedParamInit],
   props: {
-    isEducation: { default: false, type: Boolean },
     pr: { default: 0, type: Number },
     ps: { default: 30, type: Number },
     routeQuery: { default: "", type: String },
@@ -67,11 +65,5 @@ export default defineComponent({
     routeOrga: { default: undefined, type: String },
     routeRubriques: { default: "", type: String },
   },
-
-  data() {
-    return {
-      isEmission: true as boolean,
-    };
-  },
 });
 </script>

package/src/components/pages/MapPage.vue

@@ -46,7 +46,6 @@ interface LinkMapSite {
 }
 export default defineComponent({
   props: {
-    isEducation: { default: false, type: Boolean },
     externLinks: { default: () => [], type: Array as () => Array<LinkMapSite> },
     titleTag: { default: "h1", type: String },
   },
@@ -145,7 +144,7 @@ export default defineComponent({
           id: "link-page-productors",
           href: "/main/pub/productors",
           condition:
-            !this.isPodcastmaker && (!this.filterOrgaId || this.isEducation),
+            !this.isPodcastmaker && (!this.filterOrgaId || this.platformEducation),
         },
       ];
     },

package/src/components/pages/PlaylistPage.vue

@@ -32,7 +32,6 @@
           v-if="!isPodcastmaker && undefined !== authOrgaId"
           :playlist="playlist"
           :organisation-id="authOrgaId"
-          :is-education="isEducation"
         />
         <ShareButtons
           v-if="pageParameters.isShareButtons"
@@ -92,7 +91,6 @@ export default defineComponent({
 
   props: {
     playlistId: { default: undefined, type: Number },
-    isEducation: { default: false, type: Boolean },
   },
   data() {
     return {

package/src/components/pages/PodcastPage.vue

@@ -23,7 +23,6 @@
           :exclusive="exclusive"
           :not-exclusive="notExclusive"
           :organisation-id="authOrgaId"
-          :is-education="isEducation"
         />
 
         <CommentSection v-if="!isPodcastmaker" :podcast="podcast" />
@@ -128,11 +127,8 @@ export default defineComponent({
     updateStatus: { default: undefined, type: String },
     playingPodcast: { default: undefined, type: Object as () => Podcast },
     podcastId: { default: 0, type: Number },
-    isEducation: { default: false, type: Boolean },
   },
 
-  emits: ["initConferenceId"],
-
   data() {
     return {
       loaded: false as boolean,
@@ -141,6 +137,7 @@ export default defineComponent({
       exclusive: false as boolean,
       notExclusive: false as boolean,
       fetchConference: undefined as Conference | undefined,
+      infoReload: undefined as ReturnType<typeof setTimeout> | undefined,
     };
   },
 
@@ -221,46 +218,32 @@ export default defineComponent({
         if (!this.podcast || this.error) {
           return;
         }
-        this.getCommentsConfig(this.podcast);
         this.initCommentUser();
-        this.initConference();
       },
     },
   },
   beforeUnmount() {
     this.contentToDisplayUpdate(null);
+    clearTimeout(this.infoReload);
   },
 
   methods: {
     ...mapActions(useGeneralStore, ["contentToDisplayUpdate"]),
     ...mapActions(useCommentStore, ["getCommentsConfig", "initCommentUser"]),
-    async fetchConferencePublic() {
-      const data = await classicApi.fetchData<ConferencePublicInfo>({
-        api: 9,
-        path: "conference/info/" + this.podcast?.conferenceId,
-      });
-      this.fetchConference = {
-        ...data,
-        ...{
-          conferenceId: this.podcast?.conferenceId ?? 0,
-          title: "",
-        },
-      };
-    },
     async initConference() {
-      if (!this.podcast || undefined == this.podcast.conferenceId) return;
+      if (!this.podcast || undefined == this.podcast.conferenceId || "READY_TO_RECORD" !== this.podcast.processingStatus) return;
+      this.fetchConference = { conferenceId: this.podcast.conferenceId, title: "" };
       if (this.isOctopusAndAnimator) {
         try {
-          const data = await classicApi.fetchData<Conference>({
+          this.fetchConference = await classicApi.fetchData<Conference>({
             api: 9,
             path: "conference/" + this.podcast.conferenceId,
           });
-          this.fetchConference = data ?? { conferenceId: -1, title: "" };
         } catch {
-          await this.fetchConferencePublic();
+          await this.fetchConferenceStatus();
         }
       } else {
-        await this.fetchConferencePublic();
+        await this.fetchConferenceStatus();
       }
       if (
         this.fetchConference &&
@@ -268,7 +251,27 @@ export default defineComponent({
         "PUBLISHING" !== this.fetchConference.status &&
         "DEBRIEFING" !== this.fetchConference.status
       ) {
-        this.$emit("initConferenceId", this.podcast.conferenceId);
+        this.fetchConferenceStatusLoop();
+      }
+    },
+    async fetchConferenceStatusLoop() {
+      if("PUBLISHING" ===this.fetchConference?.status){
+        return;
+      }
+      this.infoReload = setTimeout(async () => {
+        await this.fetchConferenceStatus();
+        this.fetchConferenceStatusLoop();
+      }, 3000);
+    },
+    async fetchConferenceStatus() {
+      try {
+        const data = await classicApi.fetchData<ConferencePublicInfo>({
+          api: 9,
+          path: "conference/info/" + this.podcast?.conferenceId,
+        });
+        this.fetchConference.status = data.status;
+      } catch {
+        //Do nothing
       }
     },
     updatePodcast(podcastUpdated: Podcast): void {
@@ -320,15 +323,32 @@ export default defineComponent({
           !this.editRight
         ) {
           this.error = true;
-        } else {
-          this.updatePathParams(this.podcast.title);
+          this.loaded = true;
+          return;
         }
+       this.podcastInProcessing();
+        this.updatePathParams(this.podcast.title);
+        await this.getCommentsConfig(this.podcast);
         this.loaded = true;
       } catch (error) {
         this.handle403(error as AxiosError);
         this.initError();
       }
     },
+
+    podcastInProcessing(){
+      if("PLANNED" !== this.podcast?.processingStatus){
+        this.initConference();
+        return;
+      }
+      this.infoReload = setTimeout(async () => {
+        this.podcast = await classicApi.fetchData<Podcast>({
+          api: 0,
+          path: "podcast/" + this.podcastId,
+        });
+        this.podcastInProcessing();
+      }, 2000);
+    }
   },
 });
 </script>

package/src/components/pages/PodcastsPage.vue

@@ -15,7 +15,6 @@
       v-model:not-valid="notValid"
       v-model:rubrique-filter="rubriqueFilter"
       :search-pattern="searchPattern"
-      :is-education="isEducation"
       :is-emission="false"
       :organisation-id="organisationId"
     />
@@ -55,7 +54,6 @@ export default defineComponent({
   },
   mixins: [advancedParamInit],
   props: {
-    isEducation: { default: false, type: Boolean },
     pr: { default: 0, type: Number },
     ps: { default: 30, type: Number },
     routeQuery: { default: "", type: String },

package/src/locale/de.ts

@@ -403,4 +403,5 @@ export default {
   "Show more days":"Weitere Tage anzeigen",
   "Show fewer days":"Weniger Tage anzeigen",
   "Site menu":"Site-Menü",
+  "The episode is being processed":"Die Episode wird bearbeitet",
 }

package/src/locale/en.ts

@@ -404,4 +404,5 @@ export default {
   "Show more days":"Show more days",
   "Show fewer days":"Show fewer days",
   "Site menu":"Site menu",
+  "The episode is being processed":"The episode is being processed",
 };

package/src/locale/es.ts

@@ -404,4 +404,5 @@ export default {
   "Show more days":"Mostrar más días",
   "Show fewer days":"Mostrar menos días",
   "Site menu":"Menú del sitio",
+  "The episode is being processed":"El episodio está siendo procesado",
 }

package/src/locale/fr.ts

@@ -411,4 +411,5 @@ export default {
   "Show more days":"Afficher plus de jours",
   "Show fewer days":"Afficher moins de jours",
   "Site menu":"Menu du site",
+  "The episode is being processed":"L'épisode est en cours de traitement",
 };

package/src/locale/it.ts

@@ -398,4 +398,5 @@ export default{
   "Show more days":"Mostra più giorni",
   "Show fewer days":"Mostra meno giorni",
   "Site menu":"Menù del sito",
+  "The episode is being processed":"L'episodio è in fase di elaborazione",
 };

package/src/locale/sl.ts

@@ -394,4 +394,5 @@ export default {
   "Show more days":"Prikaži več dni",
   "Show fewer days":"Prikaži manj dni",
   "Site menu":"Meni spletnega mesta",
+  "The episode is being processed":"Epizoda je v obdelavi",
 }

package/proxy.ts

@@ -1,133 +0,0 @@
-'use strict';
-
-const fs = require('fs');
-const BRANCH = fs.readFileSync('plateform.conf', 'utf8').trim();
-console.log("Content of BRANCH is " + BRANCH);
-
-const KEYCLOAK_TOKEN_URL = "https://keycloak." + BRANCH + "/realms/catalogue/protocol/openid-connect/token";
-const KEYCLOAK_USER = "admin";
-const KEYCLOAK_PASSWORD = "saooti-admin";
-const CLIENT_ID = "catalogue-web";
-
-const express = require('express');
-const axios = require('axios');
-const qs = require('querystring');
-const exec = require('child_process').exec;
-
-const app = express();
-
-
-const myArgs = process.argv.slice(2);
-
-let authenticated = true;
-if(myArgs.length){
-    authenticated = !(myArgs[0] === "false");
-} 
-app.get('/api/init', async function (req, res) {
-    console.log("Requesting initialization of user ...");
-    console.log("Content of KEYCLOAK_TOKEN_URL : "+KEYCLOAK_TOKEN_URL);
-    console.log("Content of KEYCLOAK_USER : "+KEYCLOAK_USER);
-    console.log("Content of KEYCLOAK_PASSWORD : "+KEYCLOAK_PASSWORD);
-    console.log("Content of CLIENT_ID : "+CLIENT_ID);
-    try {
-        let result = await axios.post(KEYCLOAK_TOKEN_URL, qs.stringify({
-            "username": KEYCLOAK_USER,
-            "password": KEYCLOAK_PASSWORD,
-            "grant_type": "password",
-            "client_id": CLIENT_ID,
-            "scope":"openid"
-        }),{headers: {
-                'Content-Type': 'application/x-www-form-urlencoded'
-            }});
-        console.log("Content of result "+result);
-        res.send({
-            "authenticated": authenticated,
-            "accessToken": result.data.access_token,
-            "accessKeycloakUri":"https://keycloak." + BRANCH +"/realms/catalogue/protocol/openid-connect/",
-            "refreshToken": result.data.refresh_token,
-            "clientId": "catalogue-web",
-            "expiration": new Date( Date.now() + result.data.expires_in * 1000 ),
-            "name": "Fake Authentication",
-            "apiUri": "https://api." + BRANCH +"/",
-            "mediaUri": "https://media." + BRANCH +"/",
-            "studioUri": "https://studio." + BRANCH +"/",
-            "importerUri": "https://importer." + BRANCH +"/" ,
-            "storageUri": "https://storage." + BRANCH +"/" ,
-            "playerUri": "https://playerbeta." + BRANCH +"/" ,
-            "processorUri": "https://processor." + BRANCH +"/" ,
-            "keycloakApiUri": "https://keycloakApi." + BRANCH +"/" ,
-            "frontendUri": "https://" + BRANCH +"" ,
-            "hlsUri": "https://hls.live." + BRANCH +"/" ,
-            "videomakerUri": "https://videomaker." + BRANCH +"/" ,
-            "recoUri": "https://reco." + BRANCH +"/" ,
-            "rtmpUri": "rtmp://rtmp.live." + BRANCH +"/",
-            "commentsUri": "https://comments." + BRANCH +"/" ,
-            "imageUri":"https://imageproxy." + BRANCH +"/",
-            "speechToTextUri":"https://speech2text." + BRANCH +"/",
-            "textToSpeechUri":"https://text2speech." + BRANCH +"/",
-            "radioUri":"https://radio." + BRANCH +"/",
-            "billingUri":"https://facturation." + BRANCH +"/",
-            "openAiUri": "https://openai." + BRANCH +"/" ,
-            "chapteringUri":"https://chaptering." + BRANCH +"/",
-            "statRadioUri":"https://stats.radio." + BRANCH +"/",
-            "isEducation": false,
-            "captchaDevelopmentProfil": true,
-            "goodNewsOrgaId": "bd1596f3-9653-4378-a9e6-6dd3bef5c873",
-            "role": [
-                "ADMIN",
-                "ORGANISATION",
-                "ANIMATION",
-                "USERS", 
-                "PODCAST_VALIDATION",
-                "PRODUCTION",
-                "PLAYLISTS",
-                "COMMENTS_MODERATION",
-                "EDITOR",
-                "ANALYTICS",
-                "ADVERTISING",
-                "LIVE",
-                "EDITION",
-                "PODCAST_CRUD",
-                "RADIO",
-                "BILLING_ADMIN",
-                "BILLING_VIEWER",
-                "RESTRICTED_PRODUCTION"
-            ]
-        });
-    } catch (error) {
-        res.send({
-            "authenticated": true,
-            "accessToken": null,
-            "refreshToken": null,
-            "expiration": null,
-            "name": null,
-            "clientId": null,
-            "apiUri": "https://api." + BRANCH + "/",
-            "importerUri": "https://importer." + BRANCH +"/" ,
-            "mediaUri": "https://media." + BRANCH + "/",
-            "studioUri": "https://studio." + BRANCH + "/",
-            "storageUri": "https://storage." + BRANCH + "/",
-            "playerUri": "https://playerbeta." + BRANCH + "/",
-            "processorUri": "https://processor." + BRANCH + "/",
-            "keycloakApiUri": "https://keycloakApi." + BRANCH + "/" ,
-            "hlsUri": "https://hls.live." + BRANCH +"/" ,
-            "videomakerUri": "https://videomaker." + BRANCH +"/" ,
-            "recoUri": "https://reco." + BRANCH +"/" ,
-            "frontendUri": "https://" + BRANCH +"/" ,
-            "commentsUri": "https://comments." + BRANCH +"/" ,
-            "imageUri":"https://imageproxy." + BRANCH +"/",
-            "speechToTextUri":"https://speech2text." + BRANCH +"/",
-            "textToSpeechUri":"https://text2speech." + BRANCH +"/",
-            "billingUri":"https://facturation." + BRANCH +"/",
-            "radioUri":"https://radio." + BRANCH +"/",
-            "openAiUri": "https://openai." + BRANCH +"/" ,
-            "chapteringUri":"https://chaptering." + BRANCH +"/",
-            "statRadioUri":"https://stats.radio." + BRANCH +"/",
-            "isEducation": false,
-            "captchaDevelopmentProfil": true,
-            "goodNewsOrgaId": null,
-        });
-    }
-});
-
-app.listen(3000, function () { });