@saooti/octopus-sdk 41.1.15 → 41.2.1

package/src/router/router.ts

@@ -1,291 +1,17 @@
 import {
   createRouter,
   createWebHistory,
-  RouteLocationNormalized,
-  RouteRecordRaw,
 } from "vue-router";
-import classicApi from "@/api/classicApi";
+import classicApi from "../api/classicApi";
 import { AuthStore } from "../stores/AuthStore";
-import fetchHelper from "@/helper/fetchHelper";
-import { setupRouter } from "./utils";
+import fetchHelper from "../helper/fetchHelper";
+import { setupRouter  } from "./utils";
+import { routes } from "./routes";
 
-import { ROUTE_PARAMS } from "../components/composable/route/useRouteUpdateParams";
+const Home = () => import("../components/pages/HomePage.vue");
 
-/*--------------------------------------------------------------------------
-Composants publics
---------------------------------------------------------------------------*/
-
-const Home = () => import("@/components/pages/HomePage.vue");
-const MapPage = () => import("@/components/pages/MapPage.vue");
-const PodcastsPage = () => import("@/components/pages/PodcastsPage.vue");
-const EmissionPage = () => import("@/components/pages/EmissionPage.vue");
-const EmissionsPage = () => import("@/components/pages/EmissionsPage.vue");
-const ParticpantsPage = () => import("@/components/pages/ParticipantsPage.vue");
-const PodcastPage = () => import("@/components/pages/PodcastPage.vue");
-const ParticipantPage = () => import("@/components/pages/ParticipantPage.vue");
-const SearchPage = () => import("@/components/pages/SearchPage.vue");
-const CategoryPage = () => import("@/components/pages/CategoryPage.vue");
-const RubriquePage = () => import("@/components/pages/RubriquePage.vue");
-const TagPage = () => import("@/components/pages/TagPage.vue");
-const LivesPage = () => import("@/components/pages/LivesPage.vue");
-const PlaylistPage = () => import("@/components/pages/PlaylistPage.vue");
-const PlaylistsPage = () => import("@/components/pages/PlaylistsPage.vue");
-const error403Page = () => import("@/components/pages/Error403Page.vue");
-const PageNotFound = () => import("@/components/pages/PageNotFound.vue");
-const RadioPage = () => import("@/components/pages/RadioPage.vue");
-const VideoPage = () => import("@/components/pages/VideoPage.vue");
-const PageLogout = () => import("@/components/pages/PageLogout.vue");
-
-const routes: Array<RouteRecordRaw> = [
-  /*--------------------------------------------------------------------------
-  Liens publics
-  --------------------------------------------------------------------------*/
-  {
-    path: "/",
-    name: "",
-    component: Home,
-    meta:{
-      title: "Home"
-    }
-  },
-  {
-    path: "/main/pub/error",
-    name: "error",
-    component: error403Page,
-  },
-  {
-    path: "/main/pub/home",
-    name: "home",
-    component: Home,
-    meta:{
-      title: "Home",
-    }
-  },
-  {
-    path: "/main/pub/map",
-    name: "map",
-    component: MapPage,
-    meta:{
-      title: "Site map",
-    }
-  },
-  {
-    path: "/main/pub/search/:query?",
-    name: "search",
-    component: SearchPage,
-    props: (route: RouteLocationNormalized) => ({
-      queryRoute: route.params.query,
-    }),
-    meta:{
-      title: "Search",
-    }
-  },
-  {
-    path: "/main/pub/podcasts/",
-    name: "podcasts",
-    component: PodcastsPage,
-    props: (route: RouteLocationNormalized) => ({
-      pr: route.query.pr ? parseInt(route.query.pr.toString(), 10) : undefined,
-      ps: route.query.ps ? parseInt(route.query.ps.toString(), 10) : undefined,
-      routeQuery: route.query.q ?? "",
-      routeMonetisable: route.query.m ?? "",
-      routeIab: route.query.i ? parseInt(route.query.i.toString(), 10) : undefined,
-      routeSort: route.query.s ?? "",
-      routeIncludeHidden: route.query.h ?? "",
-      routeFrom: route.query.from,
-      routeTo: route.query.to,
-      routeValidity:route.query.vl ?? "",
-      routeOnlyVideo:route.query.v ?? "",
-      routeOrga:route.query.o,
-      routeRubriques :route.query.r ?? route.query.rubriquesId,
-      routeBeneficiaries: route.query[ROUTE_PARAMS.Beneficiaries],
-    }),
-    meta:{
-      title: "Podcasts",
-    }
-  },
-  {
-    path: "/main/pub/emissions/",
-    name: "emissions",
-    component: EmissionsPage,
-    props: (route: RouteLocationNormalized) => ({
-      pr: route.query.pr ? parseInt(route.query.pr.toString(), 10) : undefined,
-      ps: route.query.ps ? parseInt(route.query.ps.toString(), 10) : undefined,
-      routeQuery: route.query.q ?? "",
-      routeMonetisable: route.query.m ?? "",
-      routeIab: route.query.i ? parseInt(route.query.i.toString(), 10) : undefined,
-      routeSort: route.query.s ?? "",
-      routeIncludeHidden: route.query.h ?? "",
-      routeFrom: route.query.from,
-      routeTo: route.query.to,
-      routeOrga:route.query.o,
-      routeRubriques :route.query.r ?? route.query.rubriquesId,
-      routeBeneficiaries: route.query[ROUTE_PARAMS.Beneficiaries],
-    }),
-    meta:{
-      title: "Emissions",
-    }
-  },
-  {
-    path: "/main/pub/participants",
-    name: "participants",
-    component: ParticpantsPage,
-    props: (route: RouteLocationNormalized) => ({
-      pr: route.query.pr ? parseInt(route.query.pr.toString(), 10) : undefined,
-      ps: route.query.ps ? parseInt(route.query.ps.toString(), 10) : undefined,
-      routeOrga:route.query.o,
-      routeQuery: route.query.q ?? "",
-    }),
-    meta:{
-      title: "Speakers",
-    }
-  },
-  {
-    path: "/main/pub/emission/:emissionId(\\d+):title([^?]*)?:productor?",
-    name: "emission",
-    component: EmissionPage,
-    props: (route: RouteLocationNormalized) => ({
-      emissionId: parseInt(route.params.emissionId.toString(), 10),
-      pr: route.query.pr ? parseInt(route.query.pr.toString(), 10) : undefined,
-      ps: route.query.ps ? parseInt(route.query.ps.toString(), 10) : undefined,
-      routeQuery: route.query.q ?? "",
-    }),
-    meta:{
-      title: "",
-      noScroll:true
-    }
-  },
-  {
-    path: "/main/pub/podcast/:podcastId(\\d+):title([^?]*)?:productor?",
-    name: "podcast",
-    component: PodcastPage,
-    props: (route: RouteLocationNormalized) => ({
-      podcastId: parseInt(route.params.podcastId.toString(), 10)
-    }),
-    meta:{
-      title: ""
-    }
-  },
-  {
-    path: "/main/pub/video/:podcastId(\\d+):title([^?]*)?:productor?",
-    name: "video",
-    component: VideoPage,
-    props: (route: RouteLocationNormalized) => ({
-      podcastId: parseInt(route.params.podcastId.toString(), 10),
-    }),
-    meta:{
-      title: ""
-    }
-  },
-  {
-    path: "/main/pub/participant/:participantId(\\d+):title([^?]*)?:productor?",
-    name: "participant",
-    component: ParticipantPage,
-    props: (route: RouteLocationNormalized) => ({
-      participantId: parseInt(route.params.participantId.toString(), 10),
-      pr: route.query.pr ? parseInt(route.query.pr.toString(), 10) : undefined,
-      ps: route.query.ps ? parseInt(route.query.ps.toString(), 10) : undefined,
-      routeQuery: route.query.q ?? "",
-    }),
-    meta:{
-      title: "",
-      noScroll:true
-    }
-  },
-  {
-    path: "/main/pub/category/:iabId/:productor?",
-    name: "category",
-    component: CategoryPage,
-    props: (route: RouteLocationNormalized) => ({
-      iabId: parseInt(route.params.iabId.toString(), 10),
-      productor: route.params.productor,
-    }),
-    meta:{
-      title: "",
-    }
-  },
-  {
-    path: "/main/pub/rubrique/:rubriqueId(\\d+):title([^?]*)?:productor?",
-    name: "rubrique",
-    component: RubriquePage,
-    props: (route: RouteLocationNormalized) => ({
-      pr: route.query.pr ? parseInt(route.query.pr.toString(), 10) : undefined,
-      ps: route.query.ps ? parseInt(route.query.ps.toString(), 10) : undefined,
-      rubriqueId: parseInt(route.params.rubriqueId.toString(), 10),
-      routeOrga:route.query.o,
-      routeQuery: route.query.q ?? "",
-    }),
-    meta:{
-      title: "",
-    }
-  },
-  {
-    path: "/main/pub/tag/:tag([^?]*)?:productor?",
-    name: "tag",
-    component: TagPage,
-    props: (route: RouteLocationNormalized) => ({
-      pr: route.query.pr ? parseInt(route.query.pr.toString(), 10) : undefined,
-      ps: route.query.ps ? parseInt(route.query.ps.toString(), 10) : undefined,
-      tag: route.params.tag,
-      routeOrga:route.query.o,
-      routeQuery: route.query.q ?? "",
-    }),
-    meta:{
-      title: "",
-    }
-  },
-  {
-    path: "/main/pub/lives/:productor?",
-    name: "lives",
-    component: LivesPage,
-    props: (route: RouteLocationNormalized) => ({
-      productor: route.params.productor,
-    }),
-    meta:{
-      title: "Radio & Live",
-    }
-  },
-  {
-    path: "/main/pub/radio/:canalId(\\d+):title([^?]*)?:productor?",
-    name: "radio",
-    component: RadioPage,
-    props: (route: RouteLocationNormalized) => ({
-      canalId: parseInt(route.params.canalId.toString(), 10),
-    }),
-    meta:{
-      title: ""
-    }
-  },
-  {
-    path: "/main/pub/playlists/",
-    name: "playlists",
-    component: PlaylistsPage,
-    props: (route: RouteLocationNormalized) => ({
-      pr: route.query.pr ? parseInt(route.query.pr.toString(), 10) : undefined,
-      ps: route.query.ps ? parseInt(route.query.ps.toString(), 10) : undefined,
-      routeOrga:route.query.o,
-      routeQuery: route.query.q ?? "",
-    }),
-    meta:{
-      title: "Playlists"
-    }
-  },
-  {
-    path: "/main/pub/playlist/:playlistId(\\d+):title([^?]*)?:productor?",
-    name: "playlist",
-    component: PlaylistPage,
-    props: (route: RouteLocationNormalized) => ({
-      playlistId: parseInt(route.params.playlistId.toString(), 10),
-      pr: route.query.pr ? parseInt(route.query.pr.toString(), 10) : undefined,
-      ps: route.query.ps ? parseInt(route.query.ps.toString(), 10) : undefined,
-      routeQuery: route.query.q ?? "",
-    }),
-    meta:{
-      title: "",
-      noScroll:true
-    }
-  },
-  //Fake route to avoid errors
+//Fake route to avoid errors
+const fakeRoutes = [
   {
     path: "/",
     name: "backoffice",
@@ -328,13 +54,14 @@ const routes: Array<RouteRecordRaw> = [
     path: "/main/priv/distribution/:distrib/:id",
     component: Home,
   },
-  { path: "/logout", component: PageLogout },
-  { path: "/sso/logout", component: PageLogout },
-  { path: "/:pathMatch(.*)*", component: PageNotFound },
 ];
+
 const router = createRouter({
   history: createWebHistory(),
-  routes: routes,
+  routes: {
+    ...routes,
+    ...fakeRoutes
+  },
   scrollBehavior(to, from) {
     if (to.name === from.name && to.meta.noScroll) {
       return false;
@@ -345,7 +72,7 @@ const router = createRouter({
 });
 
 //Do in frontoffice but not podcastmakers
-async function getMyOrgaActive(authStore: AuthStore): Promise<string>{
+async function getMyOrgaActive(authStore: AuthStore): Promise<void>{
   const orgaActive = await classicApi.fetchData<string>({
     api: 3,
     path: "user/active"
@@ -355,9 +82,8 @@ async function getMyOrgaActive(authStore: AuthStore): Promise<string>{
     await authStore.fetchProfile();
     fetchHelper.createAuthenticatedFetchHeader(true);
   }
-  return orgaActive;
 }
 
 setupRouter(router, getMyOrgaActive);
 
-export default router;
+export default router;

package/src/router/routes.ts

@@ -0,0 +1,236 @@
+import { RouteRecordRaw, RouteLocationNormalized } from "vue-router";
+
+import { getRouteProps, getSimpleRouteProps } from "./utils";
+
+const Home = () => import("../components/pages/HomePage.vue");
+const MapPage = () => import("../components/pages/MapPage.vue");
+const PodcastsPage = () => import("../components/pages/PodcastsPage.vue");
+const EmissionPage = () => import("../components/pages/EmissionPage.vue");
+const EmissionsPage = () => import("../components/pages/EmissionsPage.vue");
+const ParticpantsPage = () => import("../components/pages/ParticipantsPage.vue");
+const PodcastPage = () => import("../components/pages/PodcastPage.vue");
+const ParticipantPage = () => import("../components/pages/ParticipantPage.vue");
+const SearchPage = () => import("../components/pages/SearchPage.vue");
+const CategoryPage = () => import("../components/pages/CategoryPage.vue");
+const RubriquePage = () => import("../components/pages/RubriquePage.vue");
+const TagPage = () => import("../components/pages/TagPage.vue");
+const LivesPage = () => import("../components/pages/LivesPage.vue");
+const PlaylistPage = () => import("../components/pages/PlaylistPage.vue");
+const PlaylistsPage = () => import("../components/pages/PlaylistsPage.vue");
+const error403Page = () => import("../components/pages/Error403Page.vue");
+const PageNotFound = () => import("../components/pages/PageNotFound.vue");
+const RadioPage = () => import("../components/pages/RadioPage.vue");
+const VideoPage = () => import("../components/pages/VideoPage.vue");
+const PageLogout = () => import("../components/pages/PageLogout.vue");
+
+export const routes: Array<RouteRecordRaw> = [
+  /*--------------------------------------------------------------------------
+  Liens publics
+  --------------------------------------------------------------------------*/
+  {
+    path: "/",
+    name: "",
+    component: Home,
+    meta:{
+      title: "Home"
+    }
+  },
+  {
+    path: "/main/pub/error",
+    name: "error",
+    component: error403Page,
+  },
+  {
+    path: "/main/pub/home",
+    name: "home",
+    component: Home,
+    meta:{
+      title: "Home",
+    }
+  },
+  {
+    path: "/main/pub/map",
+    name: "map",
+    component: MapPage,
+    meta:{
+      title: "Site map",
+    }
+  },
+  {
+    path: "/main/pub/search/:query?",
+    name: "search",
+    component: SearchPage,
+    props: (route: RouteLocationNormalized) => ({
+      queryRoute: route.params.query,
+    }),
+    meta:{
+      title: "Search",
+    }
+  },
+  {
+    path: "/main/pub/podcasts/",
+    name: "podcasts",
+    component: PodcastsPage,
+    props: getRouteProps,
+    meta:{
+      title: "Podcasts",
+    }
+  },
+  {
+    path: "/main/pub/emissions/",
+    name: "emissions",
+    component: EmissionsPage,
+    props: getRouteProps,
+    meta:{
+      title: "Emissions",
+    }
+  },
+  {
+    path: "/main/pub/participants",
+    name: "participants",
+    component: ParticpantsPage,
+    props: (route: RouteLocationNormalized) => ({
+      ...getSimpleRouteProps(route),
+      routeOrga:route.query.o,
+    }),
+    meta:{
+      title: "Speakers",
+    }
+  },
+  {
+    path: "/main/pub/emission/:emissionId(\\d+):title([^?]*)?:productor?",
+    name: "emission",
+    component: EmissionPage,
+    props: (route: RouteLocationNormalized) => ({
+      ...getSimpleRouteProps(route),
+      emissionId: parseInt(route.params.emissionId.toString(), 10),
+    }),
+    meta:{
+      title: "",
+      noScroll:true
+    }
+  },
+  {
+    path: "/main/pub/podcast/:podcastId(\\d+):title([^?]*)?:productor?",
+    name: "podcast",
+    component: PodcastPage,
+    props: (route: RouteLocationNormalized) => ({
+      podcastId: parseInt(route.params.podcastId.toString(), 10)
+    }),
+    meta:{
+      title: ""
+    }
+  },
+  {
+    path: "/main/pub/video/:podcastId(\\d+):title([^?]*)?:productor?",
+    name: "video",
+    component: VideoPage,
+    props: (route: RouteLocationNormalized) => ({
+      podcastId: parseInt(route.params.podcastId.toString(), 10),
+    }),
+    meta:{
+      title: ""
+    }
+  },
+  {
+    path: "/main/pub/participant/:participantId(\\d+):title([^?]*)?:productor?",
+    name: "participant",
+    component: ParticipantPage,
+    props: (route: RouteLocationNormalized) => ({
+      ...getSimpleRouteProps(route),
+      participantId: parseInt(route.params.participantId.toString(), 10),
+    }),
+    meta:{
+      title: "",
+      noScroll:true
+    }
+  },
+  {
+    path: "/main/pub/category/:iabId/:productor?",
+    name: "category",
+    component: CategoryPage,
+    props: (route: RouteLocationNormalized) => ({
+      iabId: parseInt(route.params.iabId.toString(), 10),
+      productor: route.params.productor,
+    }),
+    meta:{
+      title: "",
+    }
+  },
+  {
+    path: "/main/pub/rubrique/:rubriqueId(\\d+):title([^?]*)?:productor?",
+    name: "rubrique",
+    component: RubriquePage,
+    props: (route: RouteLocationNormalized) => ({
+      ...getSimpleRouteProps(route),
+      rubriqueId: parseInt(route.params.rubriqueId.toString(), 10),
+      routeOrga:route.query.o,
+    }),
+    meta:{
+      title: "",
+    }
+  },
+  {
+    path: "/main/pub/tag/:tag([^?]*)?:productor?",
+    name: "tag",
+    component: TagPage,
+    props: (route: RouteLocationNormalized) => ({
+      ...getSimpleRouteProps(route),
+      tag: route.params.tag,
+      routeOrga:route.query.o,
+    }),
+    meta:{
+      title: "",
+    }
+  },
+  {
+    path: "/main/pub/lives/:productor?",
+    name: "lives",
+    component: LivesPage,
+    props: (route: RouteLocationNormalized) => ({
+      productor: route.params.productor,
+    }),
+    meta:{
+      title: "Radio & Live",
+    }
+  },
+  {
+    path: "/main/pub/radio/:canalId(\\d+):title([^?]*)?:productor?",
+    name: "radio",
+    component: RadioPage,
+    props: (route: RouteLocationNormalized) => ({
+      canalId: parseInt(route.params.canalId.toString(), 10),
+    }),
+    meta:{
+      title: ""
+    }
+  },
+  {
+    path: "/main/pub/playlists/",
+    name: "playlists",
+    component: PlaylistsPage,
+    props: (route: RouteLocationNormalized) => ({
+      ...getSimpleRouteProps(route),
+      routeOrga:route.query.o,
+    }),
+    meta:{
+      title: "Playlists"
+    }
+  },
+  {
+    path: "/main/pub/playlist/:playlistId(\\d+):title([^?]*)?:productor?",
+    name: "playlist",
+    component: PlaylistPage,
+    props: (route: RouteLocationNormalized) => ({
+      ...getSimpleRouteProps(route),
+      playlistId: parseInt(route.params.playlistId.toString(), 10),
+    }),
+    meta:{
+      title: "",
+      noScroll:true
+    }
+  },
+  { path: "/logout", component: PageLogout },
+  { path: "/sso/logout", component: PageLogout },
+  { path: "/:pathMatch(.*)*", component: PageNotFound },
+];

package/src/router/utils.ts

@@ -5,6 +5,47 @@ import { Rubriquage } from "../stores/class/rubrique/rubriquage";
 import classicApi from "../api/classicApi";
 import { useAuthStore, AuthStore } from "../stores/AuthStore";
 import { deepEqual } from "../helper/equals";
+import { RouteLocationNormalized } from "vue-router";
+import { RouteProps } from "../components/composable/route/types";
+import { ROUTE_PARAMS } from "../components/composable/route/types";
+
+export function getSimpleRouteProps(route: RouteLocationNormalized): RouteProps {
+  return {
+    pr: route.query.pr ? parseInt(route.query.pr.toString(), 10) : undefined,
+    ps: route.query.ps ? parseInt(route.query.ps.toString(), 10) : undefined,
+    routeQuery: route.query.q as string ?? ""
+  };
+}
+
+/**
+ * Return route props used for filtering
+ */
+export function getRouteProps(route: RouteLocationNormalized): RouteProps {
+  let routeEmissionGroups: number[]|undefined = undefined;
+  const reg = route.query[ROUTE_PARAMS.EmissionGroups];
+
+  if (reg !== undefined) {
+    if (Array.isArray(reg)) {
+      routeEmissionGroups = reg.map(g => parseInt(g, 10));
+    } else {
+      routeEmissionGroups = [parseInt(reg, 10)];
+    }
+  }
+  
+  return {
+    ...getSimpleRouteProps(route),
+    routeMonetisable: route.query.m as string ?? "",
+    routeIab: route.query.i ? parseInt(route.query.i.toString(), 10) : undefined,
+    routeSort: route.query.s as string ?? "",
+    routeIncludeHidden: route.query.h as string ?? "",
+    routeFrom: route.query.from as string|undefined,
+    routeTo: route.query.to as string|undefined,
+    routeOrga:route.query.o as string|undefined,
+    routeRubriques :route.query.r as string ?? route.query.rubriquesId as string|undefined,
+    routeBeneficiaries: route.query[ROUTE_PARAMS.Beneficiaries] as string[]|undefined,
+    routeEmissionGroups
+  }
+}
 
 async function changeOrgaFilter(orgaFilter: string, filterStore: FilterStore){
   const saveStore = useSaveFetchStore();
@@ -37,7 +78,7 @@ let resolved = false;
 /**
  * Utility function seting up the router with a custom beforeEach
  */
-export function setupRouter(router: Router, getMyOrgaActive: (authStore: AuthStore) => Promise<string>): void {
+export function setupRouter(router: Router, getMyOrgaActive: (authStore: AuthStore) => Promise<void>): void {
   router.beforeResolve(async () =>{
     fetchMyOrgaActive = false;
     // Reinit variable to allow one redirect
@@ -109,4 +150,4 @@ export function setupRouter(router: Router, getMyOrgaActive: (authStore: AuthSto
       }
     }
   });
-}
+}

package/src/stores/class/general/emission.ts

@@ -3,6 +3,9 @@ import { Organisation } from "./organisation";
 import { Person } from "../user/person";
 import { ItuneCategory } from "./ituneCategory";
 
+/**
+ * An emission
+ */
 export interface Emission {
   imageUrl?: string;
   annotations?: { [key: string]: string | number | boolean | undefined };
@@ -34,20 +37,23 @@ export interface Emission {
   visible?: boolean;
   /** An optional list of tags */
   tags?: string[];
+  /** The ids of groups this emission belongs to */
+  groupIds?: Array<number>
 }
 
-export function emptyEmissionData(): Emission {
+export function emptyEmissionData(orga?: Organisation): Emission {
   return {
     emissionId: 0,
     name: "",
     description: "",
     imageUrl: "",
     iabIds: undefined,
-    orga: {
+    orga: orga ?? {
       id: "",
       name: "",
       imageUrl: "",
     },
+    beneficiaries: [],
     rubriqueIds: [],
     monetisable: "UNDEFINED",
     limits: {},

package/src/style/_variables.scss

@@ -39,4 +39,7 @@
 
     //Font-family
     --octopus-font-family: Montserrat,sans-serif,"Helvetica Neue";
+
+    // ClassicDataTable
+    --table-line-height: 48px;
 }

package/src/style/bootstrap.scss

@@ -179,6 +179,11 @@ input:not([class^="vs__"]), button:not([class^="vs__"]), select:not([class^="vs_
 				margin: 0.3rem;
 			}
 		}
+
+		&.btn-small {
+			font-size: 0.55rem;
+			padding: 0.2rem 0.4rem;
+		}
 		
 		&.admin-button{
 			padding: 0.3rem;