@saooti/octopus-sdk 38.3.13 → 38.3.15

package/package.json

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

package/src/assets/form.scss

@@ -12,7 +12,7 @@
 		padding: 0.5rem 0 0;
 		color: black;
 		font-weight: bold;
-		margin-bottom: 0.5rem;
+		margin-bottom: 0.2rem;
 	}
 	.counter-align-right{
 		flex-grow: 1;

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

@@ -52,11 +52,12 @@ import { orgaComputed } from "../../mixins/orgaComputed";
 import octopusApi from "@saooti/octopus-api";
 import { useFilterStore } from "@/stores/FilterStore";
 import { useAuthStore } from "@/stores/AuthStore";
-import { mapState } from "pinia";
+import { mapActions, mapState } from "pinia";
 import { state } from "../../../stores/ParamSdkStore";
 import { Conference } from "@/stores/class/conference/conference";
 import { defineComponent } from "vue";
 import { AxiosError } from "axios";
+import { useSaveFetchStore } from "@/stores/SaveFetchStore";
 export default defineComponent({
   name: "LiveList",
   components: {
@@ -163,13 +164,13 @@ export default defineComponent({
     },
   },
   methods: {
+    ...mapActions(useSaveFetchStore, ["getOrgaLiveEnabled"]),
     async checkIfLiveAuthorized(): Promise<void> {
       if (!this.filterOrgaUsed) {
         return;
       }
-      this.isLiveAuthorized = await octopusApi.fetchData<boolean>(
-        0,
-        "organisation/liveEnabled/" + this.filterOrgaUsed,
+      this.isLiveAuthorized = await this.getOrgaLiveEnabled(
+        this.filterOrgaUsed,
       );
     },
     endLoading(): void {

package/src/components/display/organisation/OrganisationChooser.vue

@@ -37,7 +37,7 @@
 
 <script lang="ts">
 import { useAuthStore } from "@/stores/AuthStore";
-import { mapState } from "pinia";
+import { mapActions, mapState } from "pinia";
 import imageProxy from "../../mixins/imageProxy";
 import selenium from "../../mixins/selenium";
 import { orgaComputed } from "../../mixins/orgaComputed";
@@ -48,6 +48,7 @@ import {
   emptyOrgaData,
   Organisation,
 } from "@/stores/class/general/organisation";
+import { useSaveFetchStore } from "@/stores/SaveFetchStore";
 export default defineComponent({
   components: {
     ClassicMultiselect,
@@ -109,6 +110,7 @@ export default defineComponent({
     this.organisationChosen = this.getDefaultOrganisation;
   },
   methods: {
+    ...mapActions(useSaveFetchStore, ["getOrgaData"]),
     async onSearchOrganisation(query?: string): Promise<void> {
       const response = await octopusApi.fetchDataWithParams<{
         count: number;
@@ -145,9 +147,8 @@ export default defineComponent({
       ).afterSearch(notNullOrga, response.count);
     },
     async fetchOrganisation(): Promise<void> {
-      this.organisationChosen = await octopusApi.fetchData<Organisation>(
-        0,
-        `organisation/${this.orgaIdSelected}`,
+      this.organisationChosen = await this.getOrgaData(
+        this.orgaIdSelected ?? "",
       );
       this.initLoaded = true;
     },

package/src/components/display/organisation/OrganisationChooserLight.vue

@@ -27,7 +27,8 @@
 
 <script lang="ts">
 import { Organisation } from "@/stores/class/general/organisation";
-import octopusApi from "@saooti/octopus-api";
+import { useSaveFetchStore } from "@/stores/SaveFetchStore";
+import { mapActions } from "pinia";
 import { defineComponent } from "vue";
 export default defineComponent({
   props: {
@@ -64,6 +65,7 @@ export default defineComponent({
   },
 
   methods: {
+    ...mapActions(useSaveFetchStore, ["getOrgaData"]),
     onOrganisationSelected(): void {
       this.$emit(
         "selected",
@@ -74,12 +76,8 @@ export default defineComponent({
       if (!this.value) {
         return;
       }
-      const data = await octopusApi.fetchData<Organisation>(
-        0,
-        `organisation/${this.value}`,
-      );
-      this.organisation = data;
-      this.actual = data.id;
+      this.organisation = await this.getOrgaData(this.value);
+      this.actual = this.organisation.id;
       this.init = true;
     },
   },

package/src/components/mixins/organisationFilter.ts

@@ -5,17 +5,15 @@ import { useFilterStore } from "@/stores/FilterStore";
 import { mapActions } from "pinia";
 import { defineComponent } from "vue";
 import { AxiosError } from "axios";
-import { Organisation } from "@/stores/class/general/organisation";
+import { useSaveFetchStore } from "@/stores/SaveFetchStore";
 export default defineComponent({
   mixins: [handle403],
   methods: {
+    ...mapActions(useSaveFetchStore, ["getOrgaLiveEnabled", "getOrgaData"]),
     ...mapActions(useFilterStore, ["filterUpdateOrga"]),
     async selectOrganisation(organisationId: string): Promise<void> {
       try {
-        const response = await octopusApi.fetchData<Organisation>(
-          0,
-          `organisation/${organisationId}`,
-        );
+        const response = await this.getOrgaData(organisationId);
         const data = await octopusApi.fetchDataWithParams<Array<Rubriquage>>(
           0,
           "rubriquage/find/" + organisationId,
@@ -25,10 +23,7 @@ export default defineComponent({
           },
           true,
         );
-        const isLive = await octopusApi.fetchData<boolean>(
-          0,
-          "organisation/liveEnabled/" + organisationId,
-        );
+        const isLive = await this.getOrgaLiveEnabled(organisationId);
         this.filterUpdateOrga({
           orgaId: organisationId,
           imgUrl: response.imageUrl,

package/src/components/pages/EmissionPage.vue

@@ -258,7 +258,10 @@ export default defineComponent({
     },
     podcastsFetched(podcasts: Array<Podcast>) {
       for (const podcast of podcasts) {
-        if ("READY" === podcast.processingStatus && podcast.availability.visibility) {
+        if (
+          "READY" === podcast.processingStatus &&
+          podcast.availability.visibility
+        ) {
           this.lastPodcast = podcast;
           return;
         }

package/src/stores/SaveFetchStore.ts

@@ -2,13 +2,18 @@
 import { defineStore } from 'pinia';
 import octopusApi from '@saooti/octopus-api';
 import { useAuthStore } from '@/stores/AuthStore';
+import {Organisation} from "@/stores/class/general/organisation";
 
 interface SaveFetchState{
   orgaPublicAttributes: {[key:string]: {[key: string]:string|number|boolean|undefined}},
+  orgaLiveEnabled: {[key:string]: boolean},
+  orgaData: {[key:string]: Organisation},
 }
 export const useSaveFetchStore = defineStore('SaveFetchStore', {
   state: (): SaveFetchState => ({
-    orgaPublicAttributes:{}
+    orgaPublicAttributes:{},
+    orgaLiveEnabled:{},
+    orgaData:{},
   }),
   actions:{
     async getOrgaAttributes(orgaId: string): Promise<{ [key: string]: string | number | boolean | undefined; }>{
@@ -25,6 +30,28 @@ export const useSaveFetchStore = defineStore('SaveFetchStore', {
         this.orgaPublicAttributes[orgaId] = await octopusApi.fetchData<{[key:string]:string}>(0, 'organisation/attributes/'+orgaId);
       }
       return this.orgaPublicAttributes[orgaId];
+    },
+    async getOrgaData(orgaId: string): Promise<Organisation>{
+      if(this.orgaData[orgaId]){
+        return this.orgaData[orgaId];
+      }
+      const authStore = useAuthStore();
+      if(orgaId === authStore.authOrganisation.id){
+        this.orgaData[orgaId] = authStore.authOrganisation;
+      }else{
+        this.orgaData[orgaId] = await octopusApi.fetchData<Organisation>(0, 'organisation/'+orgaId);
+      }
+      return this.orgaData[orgaId];
+    },
+    async getOrgaLiveEnabled(orgaId: string): Promise<boolean>{
+      if(!orgaId.length){
+        return false;
+      }
+      if(this.orgaLiveEnabled[orgaId]){
+        return this.orgaLiveEnabled[orgaId];
+      }
+      this.orgaLiveEnabled[orgaId] = await octopusApi.fetchData<boolean>(0, "organisation/liveEnabled/"+orgaId);
+      return this.orgaLiveEnabled[orgaId];
     }
   }
 })