@saooti/octopus-sdk 29.0.24 → 30.0.1

package/README.md

@@ -491,4 +491,7 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
  * 29.0.22 Eslint
  * 29.0.23 Eslint
  * 29.0.24 Version stable vue3
+ * 29.0.25 Specific category does not display in correct order
+ * 29.0.26 Snackbar position
 
+ * 30.0.1 Nouveau sprint

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saooti/octopus-sdk",
-  "version": "29.0.24",
+  "version": "30.0.1",
   "private": false,
   "description": "Javascript SDK for using octopus",
   "author": "Saooti",
@@ -15,7 +15,7 @@
   "main": "./dist/octopus.common.js",
   "dependencies": {
     "@popperjs/core": "^2.10.2",
-    "@saooti/octopus-api": "^0.29.7",
+    "@saooti/octopus-api": "^0.30.2",
     "@vue/cli": "^5.0.0-rc.0",
     "@vue/compat": "^3.2.21",
     "axios": "^0.24.0",

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

@@ -156,9 +156,9 @@ export default defineComponent({
       }
     },
     async fetchCategories(organisationId: string): Promise<void> {
-      const data = await octopusApi.fetchCategoriesOrga(organisationId, {
+      const data = await octopusApi.fetchCategories({
         lang: this.$i18n.locale,
-      });
+      }, organisationId);
       this.$store.commit('categoriesOrgaSet', data);
     },
   },

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

@@ -88,7 +88,7 @@ import octopusApi from '@saooti/octopus-api';
 const ELEMENTS_COUNT = 50;
 const DEFAULT_EMISSION_ID = 0;
 
-const getDefaultEmission = (defaultName: string) => {
+const getDefaultEmission = (defaultName: string): Emission|undefined => {
   if(''=== defaultName){
     return undefined;
   }

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

@@ -152,8 +152,8 @@ export default defineComponent({
         first: this.first,
         size: this.size + 1,
         organisationId: this.organisationId,
-        rubriqueId: this.rubriqueId,
-        rubriquageId: this.rubriquageId,
+        rubriqueId: this.rubriqueId ?  [this.rubriqueId] : [],
+        rubriquageId: this.rubriquageId ? [this.rubriquageId] : [],
         sort: 'LAST_PODCAST_DESC',
       });
       this.loading = false;
@@ -169,8 +169,8 @@ export default defineComponent({
         });
       } */
       if (this.allEmissions.length + data.result.length < this.totalCount) {
-        const nexEl = data.result.pop();
-        this.preloadImage(nexEl.imageUrl);
+        const nexEl = data.result.pop() as Emission;
+        this.preloadImage(nexEl.imageUrl ? nexEl.imageUrl : "");
       }
       this.allEmissions = this.allEmissions.concat(data.result);
       if (this.allEmissions.length <= 3) {

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

@@ -61,7 +61,6 @@
 
 <script lang="ts">
 import octopusApi from '@saooti/octopus-api';
-import emissionApi from '@/api/emissions';
 import { state } from '../../../store/paramStore';
 
 import { Emission } from '@/store/class/emission';
@@ -186,15 +185,10 @@ export default defineComponent({
         noRubriquageId: this.noRubriquageId.length ? this.noRubriquageId : undefined,
         rubriqueId: this.rubriqueId.length ? this.rubriqueId : undefined,
         rubriquageId: this.rubriquageId.length ? this.rubriquageId : undefined,
+        includeHidden:this.includeHidden,
       };
-      if (this.includeHidden) {
-        param.includeHidden = this.includeHidden;
-        const data = await emissionApi.fetchEmissionsAdmin(this.$store.state, param);
-        this.afterFetching(reset, data);
-      } else {
-        const data = await octopusApi.fetchEmissions(param);
-        this.afterFetching(reset, data);
-      }
+      const data = await octopusApi.fetchEmissions(param);
+      this.afterFetching(reset, data);
     },
     afterFetching(reset: boolean, data: {count: number, result: Array<Emission>, sort: string}): void {
       if (reset) {

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

@@ -234,7 +234,7 @@ export default defineComponent({
       if (!this.fetchConference || !this.fetchConference.podcastId) return;
       try {
         this.live = await octopusApi.fetchPodcast(
-          this.fetchConference.podcastId
+          this.fetchConference.podcastId.toString()
         );
       } catch {
         this.$emit('deleteItem', this.index);

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

@@ -41,7 +41,7 @@ export default defineComponent({
 
   data() {
     return  {
-      actual: -1 as number,
+      actual: -1 as number|string,
       organisation: undefined as Organisation|undefined,
       init: false as boolean,
     };

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

@@ -161,7 +161,7 @@ export default defineComponent({
       this.loading = true;
       this.loaded = false;
       const content = await octopusApi.fetchPlaylistContent(
-        this.playlist.playlistId
+        this.playlist.playlistId.toString()
       );
       for (let index = 0, len = content.length; index < len; index++) {
         content[index].order = this.playlist.podcasts[content[index].podcastId];

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

@@ -235,8 +235,8 @@ export default defineComponent({
       this.loaded = true;
       this.totalCount = data.count;
       if (this.allPodcasts.length + data.result.length < this.totalCount) {
-        const nexEl = data.result.pop();
-        this.preloadImage(nexEl.imageUrl);
+        const nexEl = data.result.pop() as Podcast;
+        this.preloadImage(nexEl.imageUrl?nexEl.imageUrl:'');
       }
       this.allPodcasts = this.allPodcasts.concat(
         data.result.filter((pod: Podcast|null) => null !== pod)

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

@@ -46,7 +46,6 @@
 
 <script lang="ts">
 import octopusApi from '@saooti/octopus-api';
-import podcastApi from '@/api/podcasts';
 import PodcastItem from './PodcastItem.vue';
 import { state } from '../../../store/paramStore';
 
@@ -116,8 +115,9 @@ export default defineComponent({
       return undefined;
     },
     sort(): string {
-      if (!this.popularSort && this.sortCriteria) return this.sortCriteria;
-      return 'POPULARITY';
+      if (this.popularSort) return "POPULARITY";
+      if (this.sortCriteria) return this.sortCriteria;
+      return 'DATE';
     },
     sortText(): string {
       switch (this.sortCriteria) {
@@ -171,6 +171,7 @@ export default defineComponent({
         noRubriquageId: this.noRubriquageId.length ? this.noRubriquageId : undefined,
         rubriqueId: this.rubriqueId.length ? this.rubriqueId : undefined,
         rubriquageId: this.rubriquageId.length ? this.rubriquageId : undefined,
+        includeHidden: this.includeHidden
       };
       if (undefined !== this.notValid) {
         param.validity = !this.notValid;
@@ -178,14 +179,8 @@ export default defineComponent({
       if (this.notValid && !this.isProduction) {
         param.publisherId = this.$store.state.profile.userId;
       }
-      if (this.includeHidden) {
-        param.includeHidden = this.includeHidden;
-        const data = await podcastApi.fetchPodcastsAdmin(this.$store.state, param);
-        this.afterFetching(reset, data);
-      } else {
-        const data = await octopusApi.fetchPodcasts(param);
-        this.afterFetching(reset, data);
-      }
+      const data = await octopusApi.fetchPodcasts(param);
+      this.afterFetching(reset, data);
     },
     afterFetching(reset: boolean, data:  {count: number, result: Array<Podcast>, sort: string}): void {
       if (reset) {

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

@@ -23,7 +23,7 @@
 
 <script lang="ts">
 import { state } from '../../../store/paramStore';
-import profileApi from '@/api/profile';
+import octopusApi from '@saooti/octopus-api';
 import Snackbar from '../../misc/Snackbar.vue';
 import QrcodeVue from 'qrcode.vue'
 import { defineComponent } from 'vue'
@@ -67,8 +67,7 @@ export default defineComponent({
       if(this.$store.state.organisation && this.$store.state.organisation.attributes && Object.keys(this.$store.state.organisation.attributes).length > 1){
         data = this.$store.state.organisation.attributes;
       }else{
-        data= await profileApi.fetchOrganisationAttibutes(
-          this.$store.state,
+        data= await octopusApi.fetchOrganisationAttributes(
           state.generalParameters.organisationId ? state.generalParameters.organisationId : ""
         );
       }

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

@@ -106,7 +106,6 @@
 
 <script lang="ts">
 import { state } from '../../../store/paramStore';
-import profileApi from '@/api/profile';
 import octopusApi from '@saooti/octopus-api';
 import { Podcast } from '@/store/class/podcast';
 import { Emission } from '@/store/class/emission';
@@ -354,8 +353,7 @@ export default defineComponent({
       if(this.$store.state.organisation && this.$store.state.organisation.attributes && Object.keys(this.$store.state.organisation.attributes).length > 1){
         data = this.$store.state.organisation.attributes;
       }else{
-        data= await profileApi.fetchOrganisationAttibutes(
-          this.$store.state,
+        data= await octopusApi.fetchOrganisationAttributes(
           state.generalParameters.organisationId ? state.generalParameters.organisationId : ""
         );
       }

package/src/components/misc/Player.vue

@@ -229,7 +229,7 @@ export default defineComponent({
           }
           if ('PAUSED' === newValue) {
             audioPlayer.pause();
-          } else {
+          }else if ('PLAYING' === newValue){
             audioPlayer.play();
           }
         }

package/src/components/misc/PlayerButtons.vue

@@ -97,8 +97,28 @@ export default defineComponent({
       return '';
     },
   },
+  created(){
+    window.addEventListener('keydown', this.addKeyboardControl);
+  },
+  beforeUnmount() {
+    window.removeEventListener('keydown', this.addKeyboardControl);
+  },
 
   methods: {
+    addKeyboardControl(event: KeyboardEvent): void{
+      if (' ' === event.key || 'Spacebar' === event.key) {
+        event.preventDefault();
+        this.switchPausePlay();
+			}else if ('ArrowRight' === event.key && event.ctrlKey) {
+        const audioPlayer: HTMLAudioElement|null = document.querySelector('#audio-player');
+        if(!audioPlayer){return;}
+        audioPlayer.currentTime += 15;
+			}else if ('ArrowLeft' === event.key && event.ctrlKey) {
+        const audioPlayer: HTMLAudioElement|null = document.querySelector('#audio-player');
+        if(!audioPlayer){return;}
+        audioPlayer.currentTime -=15;
+			}
+    },
     switchPausePlay(): void {
       const audioPlayer: HTMLAudioElement|null = document.querySelector('#audio-player');
       if(!audioPlayer){return;}

package/src/components/misc/Snackbar.vue

@@ -159,3 +159,8 @@ export default defineComponent({
   },
 })
 </script>
+<style lang="scss">
+.snack-bar-wrap{
+  bottom: 0px;
+}
+</style>

package/src/components/pages/Participant.vue

@@ -185,7 +185,7 @@ export default defineComponent({
     async getParticipantDetails(): Promise<void> {
       this.loaded = false;
       try {
-        const data = await octopusApi.fetchParticipant(this.participantId);
+        const data = await octopusApi.fetchParticipant(this.participantId ? this.participantId.toString(): "");
         this.participant = data;
         this.$emit('participantTitle', this.name);
         this.loaded = true;

package/src/components/pages/Playlist.vue

@@ -142,7 +142,7 @@ export default defineComponent({
   methods: {
     async getPlaylistDetails(): Promise<void> {
       try {
-        const data: Playlist = await octopusApi.fetchPlaylist(this.playlistId);
+        const data: Playlist = await octopusApi.fetchPlaylist(this.playlistId ? this.playlistId.toString(): "");
         this.playlist = data;
         this.$emit('playlistTitle', this.playlist.title);
         this.loaded = true;

package/src/components/pages/Podcast.vue

@@ -325,7 +325,7 @@ export default defineComponent({
     },
     async getPodcastDetails(podcastId: number): Promise<void> {
       try {
-        const data : Podcast = await octopusApi.fetchPodcast(podcastId);
+        const data : Podcast = await octopusApi.fetchPodcast(podcastId.toString());
         this.podcast = data;
         this.$emit('podcastTitle', this.podcast.title);
         if (

package/src/store/class/emission.ts

@@ -1,20 +1,23 @@
-import { Organisation } from "./organisation";
-import { Person } from "./person";
+import { AdserverConfig } from './adserverConfig';
+import { Organisation } from './organisation';
+import { Person } from './person';
 
-
-export interface Emission{
-    imageUrl: string;
-    annotations?:{[key: string]:string|number|boolean|undefined}|undefined;
-    description: string;
-    emissionId: number;
-    iabIds?: Array<number>;
-    lastPodcastDate?: string;
-    monetisable: string;
-    name: string;
-    orga: Organisation;
-    rubriqueIds: Array<number>;
-    score?: number;
-    soundcastTag?: string;
-    publisher?: Person;
-}
-  
+export interface Emission {
+  imageUrl?: string;
+  annotations?: {[key: string]:string|number|boolean|undefined}|undefined;
+  description: string;
+  emissionId: number;
+  iabIds?: Array<number>;
+  lastPodcastDate?: string;
+  monetisable: string;
+  name: string;
+  orga: Organisation;
+  rubriqueIds: Array<number>;
+  score?: number;
+  soundcastTag?: string;
+  publisher?: Person;
+  copyright?: string;
+  optItunesCategories?: Array<string>;
+  adConfigs?: {[key:string]: AdserverConfig};
+  urlFeed?: string;
+}

package/src/store/class/fetchParam.ts

@@ -29,4 +29,5 @@ export interface FetchParam{
   type?: string,
   listening?: string,
   top?: number,
+  homePageOrder?:boolean,
 }

package/src/store/class/participant.ts

@@ -1,12 +1,12 @@
-import { Organisation } from "./organisation";
+import { Organisation } from './organisation';
 
-export interface Participant{
-  imageUrl: string;
-  description: string;
+export interface Participant {
+  imageUrl?: string;
+  description?: string;
   firstName: string;
   lastName: string;
-  orga: Organisation;
-  participantId: number;
+  orga?: Organisation;
+  participantId: number | undefined;
   score?: number;
-  uid: string;
-}
+  uid?: string;
+}

package/src/store/class/person.ts

@@ -1,13 +1,15 @@
-import { Organisation } from "./organisation";
+import { Organisation } from './organisation';
 
-export interface Person{
-    attributes?:{[key: string]:string|number|boolean|undefined}|undefined;
-    email: string;
-    emailVerified: boolean;
-    enabled: true;
-    first: string;
-    last: string;
-    notSeenOnKeycloak: number;
-    userId: string;
-    organisation?: Organisation;
+export interface Person {
+  attributes?: {[key:string]:  string|number|boolean|undefined|Array<string>};
+  email: string;
+  emailVerified: boolean;
+  enabled: true;
+  first: string;
+  last: string;
+  notSeenOnKeycloak: number;
+  userId: string;
+  organisation?: Organisation;
+  activeOrganisation?: Organisation;
+  organisations?: Array<Organisation>;
 }

package/src/store/class/playlist.ts

@@ -1,15 +1,13 @@
-import { Organisation } from "./organisation";
-import { Person } from "./person";
-import { Podcast } from "./podcast";
+import { Organisation } from './organisation';
+import { Person } from './person';
 
-
-export interface Playlist{
+export interface Playlist {
   imageUrl?: string;
   description: string;
   organisation: Organisation;
   playlistId: number;
-  podcasts: Array<Podcast>;
+  podcasts: Array<number | undefined>;
   score: number;
   title: string;
   publisher?: Person;
-}
+}

package/src/store/class/podcast.ts

@@ -1,38 +1,42 @@
-import { Emission } from "./emission";
-import { Organisation } from "./organisation";
-import { Participant } from "./participant";
-import { Person } from "./person";
-export interface Podcast{
-    imageUrl: string;
-    animators?: Array<Participant>;
-    annotations?: {[key: string]:string|number|boolean|undefined}|undefined;
-    audioStorageUrl: string;
-    audioUrl: string;
-    availability: {
-      date?: string;
-      visibility?: boolean;
-    };
-    article?: string;
-    comments?: string;
-    conferenceId?: number;
-    createdAt?: string;
-    valid?: boolean;
-    description?: string;
-    downloadCount?: number;
-    duration: number;
-    emission: Emission;
-    guests?: Array<Participant>;
-    monetisable?: string;
-    organisation: Organisation;
-    podcastId: number;
-    processingStatus?: string;
-    pubDate?: string;
-    publisher?: Person;
-    rubriqueIds?: Array<number>;
-    score?: number;
-    size?: number;
-    tags?: Array<string>;
-    title: string;
-    weekDownloadCount?: number;
-    livePodcastId?:number;
-}
+import { Emission } from './emission';
+import { Organisation } from './organisation';
+import { Participant } from './participant';
+import { Person } from './person';
+export interface Podcast {
+  imageUrl?: string;
+  animators?: Array<Participant>;
+  annotations?:{[key: string]:string|number|boolean|undefined}|undefined;
+  audioStorageUrl: string;
+  audioUrl: string;
+  article?: string;
+  availability: {
+    date?: number|null;
+    visibility?: boolean;
+    immediate?: boolean;
+  };
+  comments?: string;
+  conferenceId?: number;
+  createdAt?: string;
+  valid?: boolean;
+  description?: string;
+  downloadCount?: number;
+  duration: number;
+  email?: string;
+  emission: Emission;
+  guests?: Array<Participant>;
+  monetisable?: string;
+  organisation: Organisation;
+  podcastId: number;
+  processingStatus?: string;
+  processorId?: string;
+  pubDate?: string;
+  publisher?: Person;
+  rubriqueIds?: Array<number>;
+  score?: number;
+  size?: number;
+  tags?: Array<string>;
+  title: string;
+  weekDownloadCount?: number;
+  order?: number;
+  livePodcastId?: number
+}

package/src/store/class/rubriquage.ts

@@ -1,9 +1,9 @@
-import { Rubrique } from "./rubrique";
+import { Rubrique } from './rubrique';
 
-export interface Rubriquage{
-    organisationId?: string;
-    rubriquageId?: number;
-    rubriques: Array<Rubrique>;
-    title: string;
-    homePageOrder?: number;
-}
+export interface Rubriquage {
+  organisationId?: string;
+  rubriquageId?: number;
+  rubriques: Array<Rubrique>;
+  title: string;
+  homePageOrder?: number | null;
+}

package/src/store/class/rubrique.ts

@@ -1,8 +1,9 @@
-export interface Rubrique{
+export interface Rubrique {
     emissionCount?: number;
     name: string;
     podcastCount?: number;
     rubriquageId?: number;
     rubriqueId?: number;
     score?: number;
-}
+  }
+  

package/src/store/paramStore.ts

@@ -174,6 +174,13 @@ export interface OctopusApi{
   studioUrl?: string,
   playerUrl?: string,
   organisationId?: string | undefined,
+  oAuthParam?: {
+    accessToken: string,
+    refreshToken: string,
+    accessTokenUri: string,
+    expiration: string,
+    clientId: string,
+  }
 }
 export interface paramStore{
   generalParameters:GeneralParameters,

package/src/api/emissions.ts

@@ -1,13 +0,0 @@
-import { Emission } from "@/store/class/emission";
-import { FetchParam } from "@/store/class/fetchParam";
-import { StoreState } from "@/store/typeAppStore";
-
-import octopusApi from '@saooti/octopus-api';
-/* eslint-disable */
-export default{
-  async fetchEmissionsAdmin(store: StoreState, parameters: FetchParam): Promise<{ count: number; result: Array<Emission>; sort: string; }> {
-    console.log(store);
-    return await octopusApi.fetchEmissions(parameters);
-  },
-};
-/* eslint-enable */

package/src/api/podcasts.ts

@@ -1,12 +0,0 @@
-import { FetchParam } from "@/store/class/fetchParam";
-import { StoreState } from "@/store/typeAppStore";
-
-import octopusApi from '@saooti/octopus-api';
-/* eslint-disable */
-export default {
-  async fetchPodcastsAdmin(store: StoreState, parameters: FetchParam): Promise<any> {
-    console.log(store);
-    return await octopusApi.fetchPodcasts(parameters);
-  },
-};
-/* eslint-enable */

package/src/api/profile.ts

@@ -1,11 +0,0 @@
-import { StoreState } from "@/store/typeAppStore";
-/* eslint-disable */
-export default{
-  fetchOrganisationAttibutes(store: StoreState, organisationId: string): Promise<any> {
-    return new Promise(resolve => {
-      console.log(store, organisationId);
-      resolve({});
-    });
-  },
-};
-/* eslint-enable */