@saooti/octopus-sdk 31.0.0 → 31.0.3

package/src/components/display/emission/EmissionPlayerItem.vue

@@ -50,11 +50,23 @@
     <div
       v-for="p in podcasts"
       :key="p.podcastId"
-      class="border-top emission-item-border-color p-2 secondary-bg d-flex"
+      class="border-top emission-item-border-color p-2 secondary-bg d-flex flex-column"
     >
+      <router-link
+        v-if="isProgressBar"
+        :to="{
+          name: 'podcast',
+          params: { podcastId: p.podcastId },
+          query: { productor: $store.state.filter.organisationId },
+        }"
+        class="text-dark fw-bold two-line-clamp"
+      >
+        {{ p.title }}
+      </router-link>
       <div class="d-flex justify-content-between flex-grow-1">
         <div class="d-flex flex-column">
           <router-link
+            v-if="!isProgressBar"
             :to="{
               name: 'podcast',
               params: { podcastId: p.podcastId },
@@ -153,6 +165,9 @@ export default defineComponent({
   },
   
   computed: {
+    isProgressBar(): boolean{
+      return (state.emissionsPage.progressBar as boolean);
+    },
     buttonMore(): boolean {
       return (state.emissionsPage.buttonMore as boolean);
     },

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

@@ -330,6 +330,7 @@ export default defineComponent({
 </script>
 
 <style lang="scss">
+.octopus-app{
 .advanced-search-container {
   background: #fff;
   border-radius: 0.8rem;
@@ -360,4 +361,5 @@ export default defineComponent({
     padding-right: 40px;
   }
 }
+}
 </style>

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

@@ -86,6 +86,7 @@ export default defineComponent({
   },
   watch: {
     queryIntern(): void {
+      if(this.queryIntern !== this.searchPattern)
       this.$emit('updateSearchPattern', this.queryIntern);
     },
     filterOrga(): void {
@@ -98,6 +99,9 @@ export default defineComponent({
     },
   },
   async created() {
+    if(this.searchPattern){
+      this.queryIntern=this.searchPattern;
+    }
     if (!this.organisationId) return;
     if(this.$store.state.filter.organisationId === this.organisationId){
       this.keepOrganisation = true;
@@ -143,7 +147,7 @@ export default defineComponent({
 
 <style lang="scss">
 @import '../../../sass/_variables.scss';
-
+.octopus-app{
 .filter-speech-bubble {
   position: absolute;
   background: $octopus-primary-dark;
@@ -208,4 +212,5 @@ export default defineComponent({
     margin-right: 0;
   }
 }
+}
 </style>

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

@@ -26,7 +26,7 @@
       </template>
       <div
         :class="buttonPlus?'ms-1':''"
-        class="saooti-plus"
+        class="saooti-more"
       />
     </button>
   </div>

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

@@ -273,6 +273,7 @@ export default defineComponent({
 </script>
 
 <style lang="scss">
+.octopus-app{
 .live-date-box {
   width: 200px;
   display: flex;
@@ -304,5 +305,5 @@ export default defineComponent({
   width: 0;
   flex-grow: 1;
 }
-
+}
 </style>

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

@@ -37,11 +37,13 @@
 <script lang="ts">
 import ClassicLoading from '../../form/ClassicLoading.vue';
 import LiveItem from './LiveItem.vue';
+import { handle403 } from '../../mixins/handle403';
 import octopusApi from '@saooti/octopus-api';
 import moment from 'moment';
 import { state } from '../../../store/paramStore';
 import { Conference } from '@/store/class/conference/conference';
 import { defineComponent } from 'vue'
+import { AxiosError } from 'axios';
 export default defineComponent({
   name: 'LiveList',
   components: {
@@ -49,6 +51,8 @@ export default defineComponent({
     ClassicLoading
   },
 
+  mixins: [handle403],
+
   props: {
     conferenceWatched: { default: () => [], type: Array as ()=>Array<Conference>},
     organisationId: { default: undefined, type: String},
@@ -153,51 +157,55 @@ export default defineComponent({
       }
     },
     async fetchContent(): Promise<void> {
-      this.initArrays();
-      if (!this.filterOrgaUsed) {
-        this.loading = false;
-        this.loaded = true;
-        return;
-      }
-      this.loading = true;
-      this.loaded = false;
-      let indexPast = 0;
-      let dataLivesToBe: Array<Conference> = [];
-      for (let i = 0, len = this.livesArray.length; i < len; i++) {
-        if (!this.organisationRight && 
-        ("DEBRIEFING"===this.livesArray[i].status ||"ERROR"===this.livesArray[i].status ||"PUBLISHING"===this.livesArray[i].status)) {
-          continue;
+      try {
+        this.initArrays();
+        if (!this.filterOrgaUsed) {
+          this.loading = false;
+          this.loaded = true;
+          return;
         }
-        const dataLives = await octopusApi.listConferences(
-          this.filterOrgaUsed,
-          true,
-          this.livesArray[i].status
-        );
-        if("PLANNED"!==this.livesArray[i].status && "PENDING"!==this.livesArray[i].status){
-          this.livesArray[i].lives = dataLives.filter((p: Conference | null) => {
-            return null !== p;
-          });
-        }else if("PENDING"===this.livesArray[i].status){
-          dataLivesToBe = dataLives;
-          for (let index = 0, len = dataLives.length; index < len; index++) {
-            if (moment(dataLives[index].date).isBefore(moment())) {
-              this.livesArray[i].lives.push(dataLives[index]);
-              indexPast = index + 1;
-            } else {break;}
+        this.loading = true;
+        this.loaded = false;
+        let indexPast = 0;
+        let dataLivesToBe: Array<Conference> = [];
+        for (let i = 0, len = this.livesArray.length; i < len; i++) {
+          if (!this.organisationRight && 
+          ("DEBRIEFING"===this.livesArray[i].status ||"ERROR"===this.livesArray[i].status ||"PUBLISHING"===this.livesArray[i].status)) {
+            continue;
+          }
+          const dataLives = await octopusApi.listConferences(
+            this.filterOrgaUsed,
+            true,
+            this.livesArray[i].status
+          );
+          if("PLANNED"!==this.livesArray[i].status && "PENDING"!==this.livesArray[i].status){
+            this.livesArray[i].lives = dataLives.filter((p: Conference | null) => {
+              return null !== p;
+            });
+          }else if("PENDING"===this.livesArray[i].status){
+            dataLivesToBe = dataLives;
+            for (let index = 0, len = dataLives.length; index < len; index++) {
+              if (moment(dataLives[index].date).isBefore(moment())) {
+                this.livesArray[i].lives.push(dataLives[index]);
+                indexPast = index + 1;
+              } else {break;}
+            }
+          }else{
+            this.livesArray[i].lives = dataLivesToBe
+            .slice(indexPast)
+            .concat(dataLives)
+            .filter((p: Conference | null) => {
+              return null !== p;
+            });
           }
-        }else{
-          this.livesArray[i].lives = dataLivesToBe
-          .slice(indexPast)
-          .concat(dataLives)
-          .filter((p: Conference | null) => {
-            return null !== p;
-          });
         }
+        const listIds = this.livesArray[0].lives
+          .concat(this.livesArray[1].lives)
+          .concat(this.livesArray[2].lives);
+        this.$emit('initConferenceIds', listIds);
+      } catch (error) {
+        this.handle403((error as AxiosError));
       }
-      const listIds = this.livesArray[0].lives
-        .concat(this.livesArray[1].lives)
-        .concat(this.livesArray[2].lives);
-      this.$emit('initConferenceIds', listIds);
       this.loading = false;
       this.loaded = true;
     },
@@ -238,9 +246,11 @@ export default defineComponent({
 </script>
 
 <style lang="scss">
+.octopus-app{
 .live-list-category {
   align-self: flex-start;
   text-transform: uppercase;
   font-weight: bold;
 }
+}
 </style>

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

@@ -14,7 +14,7 @@
       ref="multiselectRef"
       v-model="organisation"
       label="name"
-      track-by="organisationId"
+      track-by="id"
       :placeholder="$t('Type string to filter by organisation')"
       :options="organisations"
       :multiple="false"
@@ -31,7 +31,6 @@
       :class="{ 'multiselect-transparent': light }"
       @search-change="onSearchOrganisation"
       @open="onOpen"
-      @close="onClose"
       @select="onOrganisationSelected"
     >
       <template #clear="{ props }">
@@ -207,16 +206,8 @@ export default defineComponent({
         'autocomplete',
         'off'
       );
-      this.clearAll();
       this.onSearchOrganisation();
     },
-    onClose(): void {
-      if (this.organisation) return;
-      this.organisation = this.defaultanswer
-        ? getDefaultOrganistion(this.defaultanswer)
-        : undefined;
-      this.$emit('selected', this.organisation);
-    },
     onOrganisationSelected(organisation: Organisation|undefined): void {
       this.$emit('selected', organisation);
     },

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

@@ -4,30 +4,35 @@
     class="default-multiselect-width organisation-chooser-light"
     :style="{ width: width }"
   >
-    <select
-      :id="'organisation_chooser_light' + page"
-      v-model="actual"
-      class="mb-0 c-hand border-0"
-      @change="onOrganisationSelected"
-    >
-      <option :value="organisation.id">
-        {{ organisation.name }}
-      </option>
-      <option :value="-1">
-        {{ $t('No organisation filter') }}
-      </option>
-    </select>
-    <label
-      :for="'organisation_chooser_light' + page"
-      class="d-inline"
-      :title="$t('select productor')"
-    />
+    <template v-if="!privateOrganisation">
+      <select
+        :id="'organisation_chooser_light' + page"
+        v-model="actual"
+        class="mb-0 c-hand border-0"
+        @change="onOrganisationSelected"
+      >
+        <option :value="organisation.id">
+          {{ organisation.name }}
+        </option>
+        <option :value="-1">
+          {{ $t('No organisation filter') }}
+        </option>
+      </select>
+      <label
+        :for="'organisation_chooser_light' + page"
+        class="d-inline"
+        :title="$t('select productor')"
+      />
+    </template>
+    <template v-else>
+      {{ organisation.name }}
+    </template>
   </div>
 </template>
 
 <script lang="ts">
-import octopusApi from '@saooti/octopus-api';
 import { Organisation } from '@/store/class/general/organisation';
+import octopusApi from '@saooti/octopus-api';
 import { defineComponent } from 'vue'
 export default defineComponent({
   props: {
@@ -43,6 +48,7 @@ export default defineComponent({
       actual: -1 as number|string,
       organisation: undefined as Organisation|undefined,
       init: false as boolean,
+      privateOrganisation: false as boolean
     };
   },
 
@@ -76,6 +82,7 @@ export default defineComponent({
       const data = await octopusApi.fetchOrganisation(this.value);
       this.organisation = data;
       this.actual = data.id;
+      this.privateOrganisation = data.private??false;
       this.init = true;
     },
   },
@@ -83,9 +90,11 @@ export default defineComponent({
 </script>
 
 <style lang="scss">
+.octopus-app{
 .organisation-chooser-light select {
   -webkit-appearance: none;
   -moz-appearance: none;
   appearance: none;
 }
+}
 </style>

package/src/components/display/participant/ParticipantItem.vue

@@ -134,6 +134,7 @@ export default defineComponent({
 })
 </script>
 <style lang="scss">
+.octopus-app{
 .participant-item-container {
   list-style: none;
   border-radius: 2rem;
@@ -184,4 +185,5 @@ export default defineComponent({
     margin: 1rem 0 0;
   }
 }
+}
 </style>

package/src/components/display/participant/ParticipantList.vue

@@ -23,7 +23,7 @@
       </ul>
       <button
         v-show="!allFetched"
-        class="btn btn-more saooti-plus"
+        class="btn btn-more saooti-more"
         :title="$t('See more')"
         :disabled="loading"
         @click="fetchContent(false)"
@@ -33,11 +33,13 @@
 </template>
 
 <script lang="ts">
+import { handle403 } from '../../mixins/handle403';
 import octopusApi from '@saooti/octopus-api';
 import ParticipantItem from './ParticipantItem.vue';
 import ClassicLoading from '../../form/ClassicLoading.vue';
 import { Participant } from '@/store/class/general/participant';
 import { defineComponent } from 'vue'
+import { AxiosError } from 'axios';
 export default defineComponent({
   name: 'ParticipantList',
 
@@ -45,6 +47,9 @@ export default defineComponent({
     ParticipantItem,
     ClassicLoading
   },
+
+  mixins: [handle403],
+
   props: {
     first: { default: 0, type: Number },
     size: { default: 12, type: Number },
@@ -99,25 +104,29 @@ export default defineComponent({
       if (reset) {
         this.dfirst = 0;
       }
-      const data = await octopusApi.fetchParticipants({
-        first: this.dfirst,
-        size: this.dsize,
-        query: this.query,
-        organisationId: this.organisation,
-      });
-      if (reset) {
-        this.participants.length = 0;
-        this.dfirst = 0;
-      }
-      this.displayCount = data.count;
-      this.participants = this.participants.concat(data.result).filter((p: Participant | null) => {
-        if (null === p) {
-          this.displayCount--;
+      try {
+        const data = await octopusApi.fetchParticipants({
+          first: this.dfirst,
+          size: this.dsize,
+          query: this.query,
+          organisationId: this.organisation,
+        });
+        if (reset) {
+          this.participants.length = 0;
+          this.dfirst = 0;
         }
-        return null !== p;
-      });
-      this.dfirst += this.dsize;
-      this.totalCount = data.count;
+        this.displayCount = data.count;
+        this.participants = this.participants.concat(data.result).filter((p: Participant | null) => {
+          if (null === p) {
+            this.displayCount--;
+          }
+          return null !== p;
+        });
+        this.dfirst += this.dsize;
+        this.totalCount = data.count;
+      } catch (error) {
+        this.handle403((error as AxiosError));
+      }
       this.loading = false;
     },
   },
@@ -125,6 +134,7 @@ export default defineComponent({
 </script>
 
 <style lang="scss">
+.octopus-app{
 .participant-list {
   align-self: stretch;
   flex-grow: 1;
@@ -147,4 +157,5 @@ export default defineComponent({
     grid-gap: 0;
   }
 }
+}
 </style>

package/src/components/display/playlist/PlaylistList.vue

@@ -29,19 +29,21 @@
       </template>
       <div
         :class="buttonPlus?'ms-1':''"
-        class="saooti-plus"
+        class="saooti-more"
       />
     </button>
   </div>
 </template>
 
 <script lang="ts">
+import { handle403 } from '../../mixins/handle403';
 import octopusApi from '@saooti/octopus-api';
 import PlaylistItem from './PlaylistItem.vue';
 import { state } from '../../../store/paramStore';
 import ClassicLoading from '../../form/ClassicLoading.vue';
 import { Playlist } from '@/store/class/general/playlist';
 import { defineComponent } from 'vue'
+import { AxiosError } from 'axios';
 export default defineComponent({
   name: 'PlaylistList',
 
@@ -49,6 +51,9 @@ export default defineComponent({
     PlaylistItem,
     ClassicLoading
   },
+
+  mixins: [handle403],
+
   props: {
     first: { default: 0, type: Number },
     size: { default: 12, type: Number },
@@ -117,8 +122,12 @@ export default defineComponent({
         organisationId: this.organisation,
         sort: this.sort,
       };
-      const data = await octopusApi.fetchPlaylists(param);
-      this.afterFetching(reset, data);
+      try {
+        const data = await octopusApi.fetchPlaylists(param);
+        this.afterFetching(reset, data);
+      } catch (error) {
+        this.handle403((error as AxiosError));
+      }
     },
     afterFetching(reset: boolean, data: {count: number, result: Array<Playlist>, sort: string}): void {
       if (reset) {

package/src/components/display/playlist/PodcastList.vue

@@ -49,13 +49,14 @@
       </template>
       <div
         :class="buttonPlus?'ms-1':''"
-        class="saooti-plus"
+        class="saooti-more"
       />
     </button>
   </div>
 </template>
 
 <script lang="ts">
+import { handle403 } from '../../mixins/handle403';
 import octopusApi from '@saooti/octopus-api';
 import PodcastItem from '../podcasts/PodcastItem.vue';
 import { state } from '../../../store/paramStore';
@@ -64,6 +65,7 @@ import ClassicLoading from '../../form/ClassicLoading.vue';
 import { Podcast } from '@/store/class/general/podcast';
 import { Playlist } from '@/store/class/general/playlist';
 import { defineComponent } from 'vue'
+import { AxiosError } from 'axios';
 export default defineComponent({
   name: 'PodcastList',
 
@@ -73,6 +75,8 @@ export default defineComponent({
     ClassicLoading
   },
 
+  mixins: [handle403],
+
   props: {
     playlist: { default: ()=>({}), type: Object as ()=>Playlist},
   },
@@ -144,22 +148,26 @@ export default defineComponent({
       this.podcasts.length = 0;
       this.loading = true;
       this.loaded = false;
-      const content = await octopusApi.fetchPlaylistContent(
-        this.playlist.playlistId.toString()
-      );
-      for (let index = 0, len = content.length; index < len; index++) {
-        content[index].order = this.playlist.podcasts[content[index].podcastId];
-      }
-      this.podcasts = content;
-      if (!this.editRight) {
-        this.podcasts = this.podcasts.filter((p: Podcast|null) => {
-          return (
-            null !== p &&
-            (!p.availability || true === p.availability.visibility)
-          );
-        });
+      try {
+        const content = await octopusApi.fetchPlaylistContent(
+          this.playlist.playlistId.toString()
+        );
+        for (let index = 0, len = content.length; index < len; index++) {
+          content[index].order = this.playlist.podcasts[content[index].podcastId];
+        }
+        this.podcasts = content;
+        if (!this.editRight) {
+          this.podcasts = this.podcasts.filter((p: Podcast|null) => {
+            return (
+              null !== p &&
+              (!p.availability || true === p.availability.visibility)
+            );
+          });
+        }
+        this.podcastsQuery = this.podcasts;
+      } catch (error) {
+        this.handle403((error as AxiosError));
       }
-      this.podcastsQuery = this.podcasts;
       this.loading = false;
       this.loaded = true;
     },
@@ -173,10 +181,12 @@ export default defineComponent({
 
 
 <style lang="scss">
+.octopus-app{
 .width-600 {
   width: 600px;
   @media (max-width: 600px) {
     width: 100%;
   }
 }
+}
 </style>