@saooti/octopus-sdk 40.0.0 → 40.0.1

package/package.json

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

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

@@ -42,19 +42,25 @@
             class="flex-shrink-0"
             id-checkbox="search-future-checkbox"
             :label="textNotVisible"
-            :is-disabled="isCheckboxNotValidate && notValid"
+            :is-disabled="isSelectValidity && 'true'!==validity"
             @update:text-init="updateIncludeHidden"
           />
         </div>
-        <div v-if="isCheckboxNotValidate" class="d-flex flex-column mt-3">
-          <ClassicCheckbox
-            :text-init="notValid"
-            class="flex-shrink-0"
-            id-checkbox="search-not-validate-checkbox"
-            :label="textNotValidate"
-            @update:text-init="updateNotValid"
-          />
-        </div>
+        <ClassicSelect
+          v-if="isSelectValidity"
+          :text-init="validity"
+          @update:text-init="updateValidity"
+          id-select="valid-episodes-select"
+          :label="$t('Episodes to validate')+' :'"
+          :display-label="true"
+          classLabel="flex-shrink-0 me-1"
+          class="d-flex align-items-center mt-3 mb-0"
+          :options="[
+            { title: $t('Display only episodes to validate'), value: 'false' },
+            { title: $t('Display episodes to validate'), value: '' },
+            { title: $t('Do not display episodes to validate'), value: 'true' },
+          ]"
+        />
         <ClassicCheckbox
           v-if="!isEmission"
           :text-init="onlyVideo"
@@ -92,6 +98,9 @@ const CategorySearchFilter = defineAsyncComponent(
 const RubriqueFilter = defineAsyncComponent(
   () => import("./RubriqueFilter.vue"),
 );
+const ClassicSelect = defineAsyncComponent(
+  () => import("../../form/ClassicSelect.vue"),
+);
 const ClassicCheckbox = defineAsyncComponent(
   () => import("../../form/ClassicCheckbox.vue"),
 );
@@ -106,6 +115,7 @@ export default defineComponent({
     DateFilter,
     SearchOrder,
     ChevronDownIcon,
+    ClassicSelect
   },
   mixins: [orgaComputed, rubriquesFilterParam],
   props: {
@@ -119,7 +129,7 @@ export default defineComponent({
     searchPattern: { default: "", type: String },
     fromDate: { default: undefined, type: String },
     toDate: { default: undefined, type: String },
-    notValid: { default: false, type: Boolean },
+    validity: { default: 'true', type: String },
     rubriqueFilter: {
       default: () => [],
       type: Array as () => Array<RubriquageFilter>,
@@ -133,7 +143,7 @@ export default defineComponent({
     "update:iabId",
     "update:sort",
     "update:includeHidden",
-    "update:notValid",
+    "update:validity",
     "update:rubriqueFilter",
     "update:onlyVideo",
   ],
@@ -163,7 +173,7 @@ export default defineComponent({
         ? this.$t("Consider podcasts no visible")
         : this.$t("See podcasts no visible");
     },
-    isCheckboxNotValidate(): boolean {
+    isSelectValidity(): boolean {
       return (
         undefined !== this.organisation &&
         this.organisationRight &&
@@ -173,11 +183,6 @@ export default defineComponent({
         this.includeHidden
       );
     },
-    textNotValidate(): string {
-      return this.isRoleProduction
-        ? this.$t("Display all podcasts to validate")
-        : this.$t("Display my podcasts to validate");
-    },
   },
   watch: {
     organisation(): void {
@@ -228,9 +233,9 @@ export default defineComponent({
       this.$emit("update:includeHidden", value);
       this.updateRouteParam({ h: value.toString() });
     },
-    updateNotValid(value: boolean) {
-      this.$emit("update:notValid", value);
-      this.updateRouteParam({ nv: value.toString() });
+    updateValidity(value: boolean) {
+      this.$emit("update:validity", value);
+      this.updateRouteParam({ vl: value.toString() });
     },
     updateOnlyVideo(value: boolean) {
       this.$emit("update:onlyVideo", value);

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

@@ -87,7 +87,7 @@ export default defineComponent({
     showCount: { default: false, type: Boolean },
     displaySortText: { default: true, type: Boolean },
     sortCriteria: { default: undefined, type: String },
-    notValid: { default: undefined, type: Boolean },
+    validity: { default: 'true', type: String },
     rubriqueId: { default: () => [], type: Array as () => Array<number> },
     rubriquageId: { default: () => [], type: Array as () => Array<number> },
     noRubriquageId: { default: () => [], type: Array as () => Array<number> },
@@ -125,7 +125,7 @@ export default defineComponent({
     changed(): string {
       return `${this.organisation}|${this.emissionId}|${this.sortCriteria}|${this.sort}
       ${this.iabId}|${this.participantId}|${this.query}|${this.monetisable}|${this.popularSort}|
-      ${this.rubriqueId}|${this.rubriquageId}|${this.before}|${this.after}|${this.includeHidden}|${this.noRubriquageId}|${this.notValid}|
+      ${this.rubriqueId}|${this.rubriquageId}|${this.before}|${this.after}|${this.includeHidden}|${this.noRubriquageId}|${this.validity}|
       ${this.withVideo}`;
     },
     organisation(): Array<string> {
@@ -204,11 +204,11 @@ export default defineComponent({
         rubriqueId: this.rubriqueId.length ? this.rubriqueId : undefined,
         rubriquageId: this.rubriquageId.length ? this.rubriquageId : undefined,
         includeHidden: this.includeHidden,
-        validity: undefined !== this.notValid ? !this.notValid : undefined,
-        publisherId:
-          this.notValid && !this.isRoleProduction
+        validity: this.validity,
+        /* publisherId:
+          !this.onlyValid && !this.isRoleProduction
             ? this.authProfile?.userId
-            : undefined,
+            : undefined, */
         includeStatus: ["READY", "PROCESSING"],
         withVideo: this.withVideo,
       };

package/src/components/mixins/routeParam/advancedParamInit.ts

@@ -4,8 +4,9 @@ import { paginateParamInit } from "./paginateParamInit";
 import { rubriquesFilterParam } from "./rubriquesFilterParam";
 import { defineComponent } from 'vue';
 import { mapState } from "pinia";
-import { RubriquageFilter } from "@/stores/class/rubrique/rubriquageFilter";
+import { RubriquageFilter } from "../../../stores/class/rubrique/rubriquageFilter";
 import dayjs from "dayjs";
+import { useAuthStore } from "../../../stores/AuthStore";
 export const advancedParamInit = defineComponent({
   mixins: [orgaComputed, paginateParamInit, rubriquesFilterParam],
   props: {
@@ -19,6 +20,7 @@ export const advancedParamInit = defineComponent({
     routeTo: { default: undefined, type: String },
     routeOrga: { default: undefined, type: String },
     routeRubriques: { default: "", type: String },
+    routeValidity: { default: "", type: String },
   },
   data() {
     return {
@@ -30,7 +32,7 @@ export const advancedParamInit = defineComponent({
       toDate: undefined as string | undefined,
       includeHidden: false as boolean,
       sort: "DATE" as string, // SCORE, DATE, POPULARITY, NAME, LAST_PODCAST_DESC
-      notValid: false as boolean,
+      validity: 'true' as string,
       iabId: undefined as number | undefined,
       noRubriquageId: [] as Array<number>,
       rubriquageId: [] as Array<number>,
@@ -40,6 +42,7 @@ export const advancedParamInit = defineComponent({
     };
   },
   computed:{
+    ...mapState(useAuthStore, ["isRoleContribution",]),
     ...mapState(useFilterStore, ["filterRubrique", "filterIab"]),
     organisationRight(): boolean {
       return this.isEditRights(this.organisationId);
@@ -91,6 +94,9 @@ export const advancedParamInit = defineComponent({
     routeIncludeHidden(){
       this.initIncludeHidden();
     },
+    routeValidity(){
+      this.initValidity();
+    },
     routeFrom(){
       this.initFromDate();
     },
@@ -118,6 +124,7 @@ export const advancedParamInit = defineComponent({
       this.iabId = this.filterIab?.id ?? this.routeIab;
       this.initRubriquageFilter();
       this.initIncludeHidden();
+      this.initValidity();
       this.initMonetisable();
       this.initSort();
       this.initFromDate();
@@ -163,6 +170,14 @@ export const advancedParamInit = defineComponent({
     initIncludeHidden(){
       this.includeHidden = undefined !== this.organisation && this.organisationRight && "false"!==this.routeIncludeHidden;
     },
+    initValidity(){
+      const cantDisplay = this.isPodcastmaker || this.isEmission || !this.includeHidden || !this.isRoleContribution || !this.organisationRight;
+      if(cantDisplay){
+        this.validity = "true";
+      }else{
+        this.validity = this.routeValidity;
+      }
+    },
     initRubriquageFilter(){
       if(this.routeRubriques === this.stringifyRubriquesFilter(this.rubriqueFilter)){
         return

package/src/components/pages/PodcastsPage.vue

@@ -12,7 +12,7 @@
       v-model:include-hidden="includeHidden"
       v-model:from-date="fromDate"
       v-model:to-date="toDate"
-      v-model:not-valid="notValid"
+      v-model:validity="validity"
       v-model:rubrique-filter="rubriqueFilter"
       :search-pattern="searchPattern"
       :is-emission="false"
@@ -29,12 +29,12 @@
       :after="fromDate"
       :sort-criteria="sort"
       :include-hidden="includeHidden"
-      :not-valid="notValid"
       :iab-id="iabId"
       :rubrique-id="rubriquesFilterArrayIds.rubriqueId"
       :rubriquage-id="rubriquesFilterArrayIds.rubriquageId"
       :no-rubriquage-id="rubriquesFilterArrayIds.noRubriquageId"
       :with-video="withVideo"
+      :validity="validity"
     />
   </section>
 </template>
@@ -63,14 +63,13 @@ export default defineComponent({
     routeIncludeHidden: { default: "", type: String },
     routeFrom: { default: undefined, type: String },
     routeTo: { default: undefined, type: String },
-    routeNotValid: { default: "", type: String },
+    routeValidity: { default: "", type: String },
     routeOnlyVideo: { default: "", type: String },
     routeOrga: { default: undefined, type: String },
     routeRubriques: { default: "", type: String },
   },
   data() {
     return {
-      notValid: false as boolean,
       onlyVideo: false as boolean,
     };
   },
@@ -83,15 +82,6 @@ export default defineComponent({
     },
   },
   watch: {
-    routeNotValid: {
-      immediate: true,
-      handler() {
-        this.notValid =
-          undefined !== this.organisation &&
-          this.organisationRight &&
-          "true" === this.routeNotValid;
-      },
-    },
     routeOnlyVideo: {
       immediate: true,
       handler() {

package/src/locale/de.ts

@@ -264,10 +264,10 @@ export default {
   "Recaptcha not active": "Google CAPTCHA ist deaktiviert",
   "Comment waiting":
     "Der Kommentar ist für andere Besucher erst sichtbar, nachdem er validiert wurde.",
-  "Display all podcasts to validate":
-    "Alle noch nicht validierten Podcasts anzeigen",
-  "Display my podcasts to validate":
-    "Meine noch nicht validierten Podcasts anzeigen",
+  "Episodes to validate":"Episoden zur Validierung",
+  "Display only episodes to validate": "Nur Episoden zur Validierung anzeigen",
+  "Display episodes to validate": "Zeigen Sie Episoden zur Validierung an",
+  "Do not display episodes to validate": "Episoden zur Validierung nicht anzeigen",
   "Podcast not validated": "Nicht validierter Podcast",
   "Podcast to validate": "Podcast noch nicht validiert",
   "Change locale": "Ändere die Sprache",

package/src/locale/en.ts

@@ -259,8 +259,10 @@ export default {
   "Recaptcha not active": "The captcha google is deactivated",
   "Comment waiting":
     "The comment will not be visible to other users until it has been validated",
-  "Display all podcasts to validate": "Display all podcasts to validate",
-  "Display my podcasts to validate": "Display my podcasts to validate",
+  "Episodes to validate":"Episodes to validate",
+  "Display only episodes to validate": "Display only episodes to validate",
+  "Display episodes to validate": "Display episodes to validate",
+  "Do not display episodes to validate": "Do not display episodes to validate",
   "Podcast not validated": "Podcast not validated",
   "Podcast to validate": "Podcast to validate",
   "Change locale": "Change the language",

package/src/locale/es.ts

@@ -264,10 +264,10 @@ export default {
   "Recaptcha not active": "El Captcha de Google está desactivado",
   "Comment waiting":
     "Los demás usuarios podrán ver el comentario tras su validación",
-  "Display all podcasts to validate":
-    "Mostrar todos los pódcast pendientes de validación",
-  "Display my podcasts to validate":
-    "Mostrar mis pódcast pendientes de validación",
+  "Episodes to validate":"Episodios para validar",
+  "Display only episodes to validate": "Mostrar solo episodios para validar",
+  "Display episodes to validate": "Mostrar episodios para validar",
+  "Do not display episodes to validate": "No mostrar episodios para validar",
   "Podcast not validated": "Pódcast no validado",
   "Podcast to validate": "Pódcast pendiente de validación",
   "Change locale": "Cambiar el idioma",

package/src/locale/fr.ts

@@ -266,8 +266,10 @@ export default {
   "Recaptcha not active": "Attention le captcha google est désactivé",
   "Comment waiting":
     "Le commentaire ne sera pas visible par les autres utilisateurs tant qu'il n'aura pas été validé.",
-  "Display all podcasts to validate": "Afficher tous les épisodes à valider",
-  "Display my podcasts to validate": "Afficher mes épisodes à valider",
+  "Episodes to validate":"Épisodes à valider",
+  "Display only episodes to validate": "Afficher uniquement les épisodes à valider",
+  "Display episodes to validate": "Afficher les épisodes à valider",
+  "Do not display episodes to validate": "Ne pas afficher les épisodes à valider",
   "Podcast not validated": "L'épisode n'est pas validé",
   "Podcast to validate": "Épisode à valider",
   "Change locale": "Changer la langue",

package/src/locale/it.ts

@@ -261,8 +261,10 @@ export default{
     'Recaptcha not active': 'Google captcha disattivato', 
     'Comment waiting':
       "Questo commento non sarà visibile ad altri utenti fino a quando non sarà validato", 
-    'Display all podcasts to validate': 'Mostra tutti i podcast da validare',
-    'Display my podcasts to validate': 'Mostra i miei podcast da validare',
+    "Episodes to validate":"Episodi da convalidare",
+    "Display only episodes to validate": "Mostra solo gli episodi da convalidare",
+    "Display episodes to validate": "Mostra episodi da convalidare",
+    "Do not display episodes to validate": "Non visualizzare gli episodi per convalidarli",
     'Podcast not validated': "Podcast non validato",
     'Podcast to validate': 'Podcast da validare',
     'Change locale': 'Cambia la lingua', 

package/src/locale/sl.ts

@@ -256,9 +256,10 @@ export default {
   "Recaptcha error": "Google Recaptcha meni, da niste človek",
   "Recaptcha not active": "Captcha google je deaktiviran",
   "Comment waiting": "Komentar je do potrditve skrit za druge uporabnike",
-  "Display all podcasts to validate":
-    "Prikaži vse podkaste, ki jih je treba potrditi",
-  "Display my podcasts to validate": "Prikaži moje podkaste za potrditev",
+  "Episodes to validate":"Epizode za potrditev",
+  "Display only episodes to validate": "Pokaži samo epizode za potrditev",
+  "Display episodes to validate": "Prikaži epizode za potrditev",
+  "Do not display episodes to validate": "Ne prikazuj epizod za preverjanje",
   "Podcast not validated": "Podkasti niso potrjeni",
   "Podcast to validate": "Podkasti, ki jih je treba potrditi",
   "Change locale": "Spremenite jezik",

package/src/router/router.ts

@@ -91,7 +91,7 @@ const routes: Array<RouteRecordRaw> = [
       routeIncludeHidden: route.query.h ?? "",
       routeFrom: route.query.from,
       routeTo: route.query.to,
-      routeNotValid:route.query.nv ?? "",
+      routeValidity:route.query.vl ?? "",
       routeOnlyVideo:route.query.v ?? "",
       routeOrga:route.query.o,
       routeRubriques :route.query.r,