@saooti/octopus-sdk 37.0.23 → 37.0.25

package/package.json

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

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

@@ -2,14 +2,7 @@
   <ClassicRadio
     v-model:textInit="sort"
     id-radio="sort-radio"
-    :options="[
-      { title: $t('Sort score'), value: 'SCORE' },
-      {
-        title: $t('Sort last'),
-        value: isEmission ? 'LAST_PODCAST_DESC' : 'DATE',
-      },
-      { title: $t('Sort name'), value: 'NAME' },
-    ]"
+    :options="optionsArray"
   />
 </template>
 
@@ -31,6 +24,25 @@ export default defineComponent({
       sort: this.sortCriteria,
     };
   },
+  computed: {
+    optionsArray() {
+      let options = [
+        { title: this.$t("Sort score"), value: "SCORE" },
+        {
+          title: this.$t("Sort last"),
+          value: this.isEmission ? "LAST_PODCAST_DESC" : "DATE",
+        },
+        { title: this.$t("Sort name"), value: "NAME" },
+      ];
+      if (!this.isEmission) {
+        options.splice(2, 0, {
+          title: this.$t("Chronological"),
+          value: "DATE_ASC",
+        });
+      }
+      return options;
+    },
+  },
   watch: {
     sort(): void {
       this.$emit("updateSortCriteria", this.sort);

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

@@ -6,10 +6,8 @@
         v-if="!justSizeChosen"
         class="d-flex justify-content-between align-items-center flex-grow-1 w-100"
       >
-        <div class="text-secondary">
-          <template
-            v-if="textCount && (windowWidth > 1300 || windowWidth <= 960)"
-          >
+        <div class="text-secondary me-3">
+          <template v-if="textCount">
             {{ textCount }}
           </template>
         </div>

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

@@ -188,10 +188,13 @@ export default defineComponent({
       return state.generalParameters.podcastmaker as boolean;
     },
     date(): string {
-      if (this.podcast && 1970 !== dayjs(this.podcast.pubDate).year()) {
-        return dayjs(this.podcast.pubDate).format("D MMMM YYYY");
+      if (!this.podcast || 1970 === dayjs(this.podcast.pubDate).year()) {
+        return "";
       }
-      return "";
+      if (this.isLiveReadyToRecord) {
+        return dayjs(this.podcast.pubDate).format("D MMMM YYYY - HH:mm");
+      }
+      return dayjs(this.podcast.pubDate).format("D MMMM YYYY");
     },
     duration(): string {
       if (!this.podcast || this.podcast.duration <= 1) return "";
@@ -261,7 +264,9 @@ export default defineComponent({
   },
   methods: {
     removeDeleted(): void {
-      if (window.history.length > 1) {
+      if (this.isLiveReadyToRecord) {
+        this.$router.push("/main/pub/lives");
+      } else if (window.history.length > 1) {
         this.$router.go(-1);
       } else {
         this.$router.push("/");

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

@@ -25,11 +25,11 @@
 <script lang="ts">
 import ClassicCheckbox from "../../form/ClassicCheckbox.vue";
 import { state } from "../../../stores/ParamSdkStore";
-import octopusApi from "@saooti/octopus-api";
 import SnackBar from "../../misc/SnackBar.vue";
 import QrcodeVue from "qrcode.vue";
+import { useSaveFetchStore } from "@/stores/SaveFetchStore";
 import { useAuthStore } from "@/stores/AuthStore";
-import { mapState } from "pinia";
+import { mapState, mapActions } from "pinia";
 import { defineComponent } from "vue";
 export default defineComponent({
   name: "QrCode",
@@ -62,6 +62,7 @@ export default defineComponent({
     this.initColor();
   },
   methods: {
+    ...mapActions(useSaveFetchStore, ["getOrgaAttributes"]),
     download(): void {
       const link = document.createElement("a");
       link.download = "qrcode.png";
@@ -83,21 +84,13 @@ export default defineComponent({
         return;
       }
       if (!state.generalParameters.authenticated) return;
-      let data;
-      if (
-        "" !== this.authOrganisation.id &&
-        this.authOrganisation.attributes &&
-        Object.keys(this.authOrganisation.attributes).length > 1
-      ) {
-        data = this.authOrganisation.attributes;
-      } else {
-        data = await octopusApi.fetchData<{ [key: string]: string }>(
-          0,
-          "organisation/attributes/" + state.generalParameters.organisationId,
-        );
-      }
-      if (Object.prototype.hasOwnProperty.call(data, "COLOR")) {
-        this.otherColor = data.COLOR as string;
+      const orgaId =
+        "" !== this.authOrganisation.id
+          ? this.authOrganisation.id
+          : state.generalParameters.organisationId;
+      const attributes = await this.getOrgaAttributes(orgaId ?? "");
+      if (Object.prototype.hasOwnProperty.call(attributes, "COLOR")) {
+        this.otherColor = attributes.COLOR as string;
       }
     },
   },

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="module-box">
+  <div v-if="!isLoading && !noSharing" class="module-box">
     <div class="d-flex align-items-center mb-3">
       <h2 class="big-h2 mb-0">
         {{ $t("Share") }}
@@ -31,6 +31,8 @@
 </template>
 
 <script lang="ts">
+import { useSaveFetchStore } from "@/stores/SaveFetchStore";
+import { mapActions } from "pinia";
 import { Emission } from "@/stores/class/general/emission";
 import { Podcast } from "@/stores/class/general/podcast";
 import { state } from "../../../stores/ParamSdkStore";
@@ -52,10 +54,27 @@ export default defineComponent({
     participantId: { default: undefined, type: Number },
     organisationId: { default: undefined, type: String },
   },
+  data() {
+    return {
+      noSharing: true as boolean,
+      isLoading: true as boolean,
+    };
+  },
   computed: {
     authenticated(): boolean {
       return state.generalParameters.authenticated as boolean;
     },
   },
+  async created() {
+    if (!this.organisationId) {
+      return;
+    }
+    const attributes = await this.getOrgaAttributes(this.organisationId);
+    this.noSharing = "true" === attributes.noSharing;
+    this.isLoading = false;
+  },
+  methods: {
+    ...mapActions(useSaveFetchStore, ["getOrgaAttributes"]),
+  },
 });
 </script>

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

@@ -208,17 +208,17 @@ export default defineComponent({
       if (this.participantId) {
         return api + "participant/" + this.participantId + ".rss";
       }
-      if (this.organisationId) {
-        return api + "productor/" + this.organisationId + ".rss";
-      }
       if (this.playlist) {
         return api + "playlist/" + this.playlist.playlistId + ".rss";
       }
+      if (this.organisationId) {
+        return api + "productor/" + this.organisationId + ".rss";
+      }
       return "";
     },
   },
   async created() {
-    if (this.organisationId || this.participantId) {
+    if (undefined !== this.participantId) {
       this.displayRss = await octopusApi.fetchDataPublic<boolean>(
         0,
         `rss/participants/allowed/${this.organisationId}`,

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

@@ -90,12 +90,12 @@
 <script lang="ts">
 import { orgaComputed } from "../../mixins/orgaComputed";
 import { state } from "../../../stores/ParamSdkStore";
-import octopusApi from "@saooti/octopus-api";
 import { Podcast } from "@/stores/class/general/podcast";
 import { Emission } from "@/stores/class/general/emission";
 import { Playlist } from "@/stores/class/general/playlist";
 import { useAuthStore } from "@/stores/AuthStore";
-import { mapState } from "pinia";
+import { useSaveFetchStore } from "@/stores/SaveFetchStore";
+import { mapState, mapActions } from "pinia";
 import { defineComponent, defineAsyncComponent } from "vue";
 const ShareModalPlayer = defineAsyncComponent(
   () => import("../../misc/modal/ShareModalPlayer.vue"),
@@ -217,8 +217,11 @@ export default defineComponent({
       );
     },
     iFrameSrc(): string {
-      if("video" === this.iFrameModel){
-        return "//www.ultimedia.com/deliver/generic/iframe/mdtk/01009833/zone/1/showtitle/1/src/" + this.podcast?.video?.videoId
+      if ("video" === this.iFrameModel) {
+        return (
+          "//www.ultimedia.com/deliver/generic/iframe/mdtk/01009833/zone/1/showtitle/1/src/" +
+          this.podcast?.video?.videoId
+        );
       }
       let url = [""];
       let iFrameNumber =
@@ -246,22 +249,26 @@ export default defineComponent({
     },
     iFrameHeight(): string {
       switch (this.iFrameModel) {
-        case 'video': return 'auto';
-        case 'large':
-          if (this.podcast) return '140px';
-          return '350px';
-        case 'largeMore':
-          return '210px';
-        case 'emissionLarge':
-        case 'largeSuggestion':
-          return '350px';
-        case 'emission':return '520px';
+        case "video":
+          return "auto";
+        case "large":
+          if (this.podcast) return "140px";
+          return "350px";
+        case "largeMore":
+          return "210px";
+        case "emissionLarge":
+        case "largeSuggestion":
+          return "350px";
+        case "emission":
+          return "520px";
         default:
           return "530px";
       }
     },
     iFrame(): string {
-      const specialDigiteka = this.podcast?.video?.videoId ? 'allowfullscreen="true" allow="autoplay" referrerpolicy="no-referrer-when-downgrade"' : '';
+      const specialDigiteka = this.podcast?.video?.videoId
+        ? 'allowfullscreen="true" allow="autoplay" referrerpolicy="no-referrer-when-downgrade"'
+        : "";
       return `<iframe src="${this.iFrameSrc}" width="100%" height="${this.iFrameHeight}" scrolling="no" frameborder="0" ${specialDigiteka}></iframe>`;
     },
     isPodcastNotVisible(): boolean {
@@ -290,13 +297,18 @@ export default defineComponent({
     },
   },
   async created() {
-    await this.fetchOrgaAttributes();
+    const orgaId =
+      "" !== this.authOrganisation.id
+        ? this.authOrganisation.id
+        : state.generalParameters.organisationId;
+    this.orgaAttributes = await this.getOrgaAttributes(orgaId ?? "");
     this.initColor();
     if (this.isLiveReadyToRecord) {
       this.iFrameModel = "large";
     }
   },
   methods: {
+    ...mapActions(useSaveFetchStore, ["getOrgaAttributes"]),
     getIframeNumber(): string {
       return this.displayChoiceAllEpisodes && "all" === this.episodeNumbers
         ? "/0"
@@ -360,19 +372,6 @@ export default defineComponent({
       }
       return url;
     },
-    async fetchOrgaAttributes(): Promise<void> {
-      if (
-        "" !== this.authOrganisation.id &&
-        this.authOrganisation.attributes &&
-        Object.keys(this.authOrganisation.attributes).length > 1
-      ) {
-        this.orgaAttributes = this.authOrganisation.attributes;
-      } else {
-        this.orgaAttributes = await octopusApi.fetchData<{
-          [key: string]: string;
-        }>(0, "organisation/attributes/" + this.myOrganisationId);
-      }
-    },
     initColor(): void {
       if (!this.orgaAttributes) {
         return;

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

@@ -34,9 +34,9 @@
 <script lang="ts">
 import { orgaComputed } from "../../mixins/orgaComputed";
 import { state } from "../../../stores/ParamSdkStore";
-import octopusApi from "@saooti/octopus-api";
+import { useSaveFetchStore } from "@/stores/SaveFetchStore";
 import { useAuthStore } from "@/stores/AuthStore";
-import { mapState } from "pinia";
+import { mapState, mapActions } from "pinia";
 import { defineComponent, defineAsyncComponent } from "vue";
 import { Canal } from "@/stores/class/radio/canal";
 const ShareModalPlayer = defineAsyncComponent(
@@ -81,23 +81,15 @@ export default defineComponent({
     },
   },
   async created() {
-    await this.fetchOrgaAttributes();
+    const orgaId =
+      "" !== this.authOrganisation.id
+        ? this.authOrganisation.id
+        : state.generalParameters.organisationId;
+    this.orgaAttributes = await this.getOrgaAttributes(orgaId ?? "");
     this.initColor();
   },
   methods: {
-    async fetchOrgaAttributes(): Promise<void> {
-      if (
-        "" !== this.authOrganisation.id &&
-        this.authOrganisation.attributes &&
-        Object.keys(this.authOrganisation.attributes).length > 1
-      ) {
-        this.orgaAttributes = this.authOrganisation.attributes;
-      } else {
-        this.orgaAttributes = await octopusApi.fetchData<{
-          [key: string]: string;
-        }>(0, "organisation/attributes/" + this.myOrganisationId);
-      }
-    },
+    ...mapActions(useSaveFetchStore, ["getOrgaAttributes"]),
     initColor(): void {
       if (!this.orgaAttributes) {
         return;

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

@@ -46,19 +46,41 @@ export default defineComponent({
     };
   },
   computed: {
-    isVideoPodcast(): boolean{
-      return undefined!==this.podcast && undefined!==this.podcast.video?.videoId;
+    isVideoPodcast(): boolean {
+      return (
+        undefined !== this.podcast && undefined !== this.podcast.video?.videoId
+      );
     },
     optionsSelect() {
       return [
-        {name: this.$t('Video Version'), value: 'video', condition:  this.isVideoPodcast},
-        {name: this.$t('Default version'), value: 'default', condition: true},
-        {name: this.$t('Large version'), value: 'large', condition: true},
-        {name: this.$t('Full Large version'), value: 'largeMore', condition: this.podcast && this.podcast.podcastId},
-        {name: this.$t('Emission version'), value: 'emission', condition: this.podcast && this.podcast.podcastId},
-        {name: this.$t('Large emission version'), value: 'emissionLarge', condition: this.podcast && this.podcast.podcastId},
-        {name: this.$t('Large suggestion version'), value: 'largeSuggestion', condition: this.podcast && this.podcast.podcastId}
-      ]
+        {
+          name: this.$t("Video Version"),
+          value: "video",
+          condition: this.isVideoPodcast,
+        },
+        { name: this.$t("Default version"), value: "default", condition: true },
+        { name: this.$t("Large version"), value: "large", condition: true },
+        {
+          name: this.$t("Full Large version"),
+          value: "largeMore",
+          condition: this.podcast && this.podcast.podcastId,
+        },
+        {
+          name: this.$t("Emission version"),
+          value: "emission",
+          condition: this.podcast && this.podcast.podcastId,
+        },
+        {
+          name: this.$t("Large emission version"),
+          value: "emissionLarge",
+          condition: this.podcast && this.podcast.podcastId,
+        },
+        {
+          name: this.$t("Large suggestion version"),
+          value: "largeSuggestion",
+          condition: this.podcast && this.podcast.podcastId,
+        },
+      ];
     },
     customPlayersDisplay(): Array<CustomPlayer> {
       return this.customPlayers.filter((player: CustomPlayer) => {
@@ -75,8 +97,8 @@ export default defineComponent({
     },
   },
   async created() {
-    if(this.isVideoPodcast){
-      this.$emit("update:iFrameModel","video");
+    if (this.isVideoPodcast) {
+      this.$emit("update:iFrameModel", "video");
     }
     await this.initCustomPlayers();
   },
@@ -108,7 +130,7 @@ export default defineComponent({
       }
       this.customPlayers = this.customPlayers.concat(playersContent);
       if (
-        'video'!==this.iFrameModel && 
+        "video" !== this.iFrameModel &&
         trySelect &&
         this.customPlayers[0] &&
         this.customPlayers[0].selected

package/src/components/form/ClassicDatePicker.vue

@@ -82,7 +82,7 @@ export default defineComponent({
       return this.range ? dayString + " - " + dayString : dayString;
     },
     now(): Date {
-      if(this.dateLimit){
+      if (this.dateLimit) {
         return this.dateLimit;
       }
       return dayjs().toDate();

package/src/components/misc/modal/NewsletterModal.vue

@@ -93,9 +93,9 @@ import { Participant } from "@/stores/class/general/participant";
 import { Podcast } from "@/stores/class/general/podcast";
 import { state } from "../../../stores/ParamSdkStore";
 import { defineComponent } from "vue";
+import { useSaveFetchStore } from "@/stores/SaveFetchStore";
 import { useAuthStore } from "@/stores/AuthStore";
-import { mapState } from "pinia";
-import octopusApi from "@saooti/octopus-api";
+import { mapState, mapActions } from "pinia";
 import { Emission } from "@/stores/class/general/emission";
 import { Playlist } from "@/stores/class/general/playlist";
 export default defineComponent({
@@ -290,6 +290,7 @@ export default defineComponent({
     this.initData();
   },
   methods: {
+    ...mapActions(useSaveFetchStore, ["getOrgaAttributes"]),
     closePopup(): void {
       this.$emit("close");
     },
@@ -309,19 +310,11 @@ export default defineComponent({
       );
     },
     async initData(): Promise<void> {
-      let attributes;
-      if (
-        "" !== this.authOrganisation.id &&
-        this.authOrganisation.attributes &&
-        Object.keys(this.authOrganisation.attributes).length > 1
-      ) {
-        attributes = this.authOrganisation.attributes;
-      } else {
-        attributes = await octopusApi.fetchData<{ [key: string]: string }>(
-          0,
-          "organisation/attributes/" + state.generalParameters.organisationId,
-        );
-      }
+      const orgaId =
+        "" !== this.authOrganisation.id
+          ? this.authOrganisation.id
+          : state.generalParameters.organisationId;
+      const attributes = await this.getOrgaAttributes(orgaId ?? "");
       if (Object.prototype.hasOwnProperty.call(attributes, "podcastmakerUrl")) {
         this.shareUrl =
           attributes.podcastmakerUrl +

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

@@ -83,7 +83,7 @@ export default defineComponent({
     this.handleResize(0);
   },
   methods: {
-    displayEverythingAfterIndex(indexAsked: number){
+    displayEverythingAfterIndex(indexAsked: number) {
       for (let index = 0; index < this.playerRadioHistory.length; index++) {
         const el = (this.$refs["history" + index] as Array<HTMLElement>)[0];
         if (!el) continue;

package/src/components/pages/EmissionPage.vue

@@ -41,6 +41,7 @@
         <ShareButtons
           v-if="pageParameters.isShareButtons"
           :emission="emission"
+          :organisation-id="emission.orga.id"
         />
         <SubscribeButtons
           v-if="pageParameters.isShareButtons && countLink >= 1"

package/src/components/pages/PlaylistPage.vue

@@ -36,6 +36,7 @@
         <ShareButtons
           v-if="pageParameters.isShareButtons"
           :playlist="playlist"
+          :organisation-id="playlist.organisation.id"
         />
         <PodcastList :playlist="playlist" />
       </div>

package/src/components/pages/PodcastPage.vue

@@ -24,7 +24,11 @@
           :organisation-id="myOrganisationId"
           :is-education="isEducation"
         />
-        <ShareButtons v-if="pageParameters.isShareButtons" :podcast="podcast" />
+        <ShareButtons
+          v-if="pageParameters.isShareButtons"
+          :podcast="podcast"
+          :organisation-id="podcast.organisation.id"
+        />
         <SubscribeButtons
           v-if="pageParameters.isShareButtons && countLink >= 1"
           :emission="podcast.emission"

package/src/components/pages/RadioPage.vue

@@ -25,7 +25,7 @@
           :canal="radio"
           :organisation-id="myOrganisationId"
         />
-        <ShareButtons />
+        <ShareButtons :organisation-id="radio.organisationId" />
       </div>
     </template>
     <ClassicLoading

package/src/locale/de.ts

@@ -346,4 +346,5 @@ export default {
   "Show only episodes with video":"Nur Episoden mit Video anzeigen",
   "Video":"Video",
   "Video Version":"Videoversion",
+  "Chronological":"Chronologisch",
 }

package/src/locale/en.ts

@@ -346,4 +346,5 @@ export default {
   "Show only episodes with video":"Show only episodes with video",
   "Video":"Video",
   "Video Version":"Video version",
+  "Chronological":"Chronological",
 };

package/src/locale/es.ts

@@ -347,4 +347,5 @@ export default {
   "Show only episodes with video":"Mostrar solo episodios con video",
   "Video":"Video",
   "Video Version":"Versión de vídeo",
+  "Chronological":"Cronológico",
 }

package/src/locale/fr.ts

@@ -350,9 +350,8 @@ export default {
   "Display HTML":"Afficher HTML",
   "Video is unavailable":"La vidéo est indisponible",
   'Full Large version': 'Version en longueur complète',
-
-
   "Show only episodes with video":"Afficher uniquement les épisodes avec une vidéo",
   "Video":"Vidéo",
   "Video Version":"Version vidéo",
+  "Chronological":"Chronologique",
 };

package/src/locale/it.ts

@@ -339,4 +339,5 @@ export default{
   "Show only episodes with video":"Mostra solo episodi con video",
   "Video":"Video",
   "Video Version":"Versione video",
+  "Chronological":"Cronologico",
   };

package/src/locale/sl.ts

@@ -336,4 +336,5 @@ export default {
   "Show only episodes with video":"Prikaži samo epizode z videom",
   "Video":"Video",
   "Video Version":"Video različica",
+  "Chronological":"Kronološko",
 }

package/src/stores/SaveFetchStore.ts

@@ -0,0 +1,27 @@
+
+import { defineStore } from 'pinia';
+import octopusApi from '@saooti/octopus-api';
+import { useAuthStore } from '@/stores/AuthStore';
+
+interface SaveFetchState{
+  orgaPublicAttributes: {[key:string]: {[key: string]:string|number|boolean|undefined}},
+}
+export const useSaveFetchStore = defineStore('SaveFetchStore', {
+  state: (): SaveFetchState => ({
+    orgaPublicAttributes:{}
+  }),
+  actions:{
+    async getOrgaAttributes(orgaId: string): Promise<{ [key: string]: string | number | boolean | undefined; }>{
+      if(this.orgaPublicAttributes[orgaId]){
+        return this.orgaPublicAttributes[orgaId];
+      }
+      const authStore = useAuthStore();
+      if(orgaId === authStore.authOrganisation.id && authStore.authOrganisation.attributes && Object.keys(authStore.authOrganisation.attributes).length > 1){
+        this.orgaPublicAttributes[orgaId] = authStore.authOrganisation.attributes;
+      }else{
+        this.orgaPublicAttributes[orgaId] = await octopusApi.fetchData<{[key:string]:string}>(0, 'organisation/attributes/'+orgaId);
+      }
+      return this.orgaPublicAttributes[orgaId];
+    }
+  }
+})