@saooti/octopus-sdk 36.0.51 → 36.0.52

package/package.json

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

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

@@ -12,8 +12,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/sharing/QrCode.vue

@@ -31,11 +31,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',
@@ -68,6 +68,7 @@ export default defineComponent({
     this.initColor();
   },
   methods:{
+    ...mapActions(useSaveFetchStore, ['getOrgaAttributes']),
     download(): void{
       const link = document.createElement('a');
       link.download = 'qrcode.png';
@@ -84,14 +85,10 @@ 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 class="module-box" v-if="!isLoading && !noSharing">
     <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,25 @@ 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

@@ -191,17 +191,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}`);
     }else{
       this.displayRss = true;

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

@@ -90,7 +90,8 @@ 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'));
 const PlayerParameters = defineAsyncComponent(() => import('./PlayerParameters.vue'));
@@ -241,13 +242,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();
     if (this.isLiveReadyToRecord) {
       this.iFrameModel = 'large';
     }
   },
   methods: {
+    ...mapActions(useSaveFetchStore, ['getOrgaAttributes']),
     getIframeNumber(): string{
       return this.displayChoiceAllEpisodes && 'all' === this.episodeNumbers ? '/0' : '/' + this.iFrameNumber;
     },
@@ -291,13 +294,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;}
       this.color = Object.prototype.hasOwnProperty.call(this.orgaAttributes,'COLOR') ? (this.orgaAttributes.COLOR as string) : '#40a372';

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

@@ -37,9 +37,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(() => import('../../misc/modal/ShareModalPlayer.vue'));
@@ -76,17 +76,12 @@ 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;}
       this.color = Object.prototype.hasOwnProperty.call(this.orgaAttributes,'COLOR') ? (this.orgaAttributes.COLOR as string) : '#40a372';

package/src/components/misc/TopBar.vue

@@ -29,7 +29,7 @@
       :reset="reset"
       @selected="onOrganisationSelected"
     />
-    <div class="d-flex justify-content-end flex-grow-1">
+    <div class="d-flex justify-content-end align-items-center flex-grow-1">
       <template
         v-for="link in routerLinkArray"
         :key="link.routeName"

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

@@ -102,8 +102,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 { mapState, mapActions } from 'pinia';
 import octopusApi from '@saooti/octopus-api';
 import { Emission } from '@/stores/class/general/emission';
 import { Playlist } from '@/stores/class/general/playlist';
@@ -279,6 +280,7 @@ export default defineComponent({
     this.initData();
   },
   methods: {
+    ...mapActions(useSaveFetchStore, ['getOrgaAttributes']),
     closePopup(): void {
       this.$emit('close');
     },
@@ -296,12 +298,8 @@ export default defineComponent({
       (this.$refs.snackbar as InstanceType<typeof Snackbar>).open(this.$t('Data in clipboard'));
     },
     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 + window.location.pathname+window.location.search;
       }

package/src/components/pages/Emission.vue

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

package/src/components/pages/Playlist.vue

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

package/src/components/pages/Podcast.vue

@@ -33,6 +33,7 @@
         <ShareButtons
           v-if="pageParameters.isShareButtons"
           :podcast="podcast"
+          :organisation-id="podcast.organisation.id"
         />
         <SubscribeButtons
           v-if="pageParameters.isShareButtons && countLink >= 1"
@@ -225,10 +226,10 @@ export default defineComponent({
   
   methods: {
     async fetchConferencePublic(){
-      const data = await octopusApi.fetchData<string>(9, 'conference/realstatus/'+this.podcast.conferenceId);
+      const data = await octopusApi.fetchData<string>(9, 'conference/realstatus/'+this.podcast?.conferenceId);
       this.fetchConference = {
         status: data,
-        conferenceId: this.podcast.conferenceId,
+        conferenceId: this.podcast?.conferenceId,
         title:'',
       };
     },

package/src/components/pages/Radio.vue

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

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];
+    }
+  }
+})