@glissandoo/lib 1.16.11 → 1.17.1

package/functions/eventRepertory.d.ts

@@ -16,4 +16,13 @@ export declare namespace EventoRepertoryFbFunctionsTypes {
         filename: string;
         path: string;
     }
+    interface DownloadParams {
+        eventId: string;
+        instrumentId: InstrumentId;
+        tags: string[];
+    }
+    interface DownloadResult {
+        filename: string;
+        path: string;
+    }
 }

package/functions/index.d.ts

@@ -17,6 +17,7 @@ export declare enum FbFunctionName {
     EventPublish = "event-publish",
     EventRemove = "event-remove",
     EventRepertoryDownloadPdf = "eventRepertory-downloadPdf",
+    EventRepertoryDownload = "eventRepertory-download",
     EventRepertoryEdit = "eventRepertory-edit",
     EventSetRollcall = "event-setRollCall",
     FederationAddConfirmedAdmin = "federation-addConfirmedAdmin",

package/functions/index.js

@@ -21,6 +21,7 @@ var FbFunctionName;
     FbFunctionName["EventPublish"] = "event-publish";
     FbFunctionName["EventRemove"] = "event-remove";
     FbFunctionName["EventRepertoryDownloadPdf"] = "eventRepertory-downloadPdf";
+    FbFunctionName["EventRepertoryDownload"] = "eventRepertory-download";
     FbFunctionName["EventRepertoryEdit"] = "eventRepertory-edit";
     FbFunctionName["EventSetRollcall"] = "event-setRollCall";
     FbFunctionName["FederationAddConfirmedAdmin"] = "federation-addConfirmedAdmin";

package/functions/regions.js

@@ -60,6 +60,7 @@ const regionByFunctions = {
     [index_1.FbFunctionName.EventPlayerEdit]: GCloudRegions.UsCentral1,
     [index_1.FbFunctionName.EventRepertoryEdit]: GCloudRegions.UsCentral1,
     [index_1.FbFunctionName.EventRepertoryDownloadPdf]: GCloudRegions.EuropeWest6,
+    [index_1.FbFunctionName.EventRepertoryDownload]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.FederationAddPendingAdmin]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.FederationAddConfirmedAdmin]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.FederationRemoveAdmin]: GCloudRegions.EuropeWest6,

package/helpers/utils.js

@@ -10,7 +10,6 @@ const lodash_1 = require("lodash");
 const get_1 = __importDefault(require("lodash/get"));
 const lang_1 = require("../lang");
 const Instrument_1 = __importDefault(require("../models/Instrument"));
-const instruments_1 = require("./instruments");
 const replaceVarsBrackets = (string, values) => {
     const matches = string.match(/[^[\]]+(?=])/g);
     let replaceString = string;
@@ -40,11 +39,10 @@ const replaceKeysNotification = (string, values, lang) => {
             switch (type) {
                 case 'instrument': {
                     const instrumentId = get_1.default(newValues, key.split('.'));
-                    if (!Object.values(instruments_1.InstrumentId).includes(instrumentId)) {
-                        throw new Error(`Invalid instrumentId: ${instrumentId} from value: ${value}`);
-                    }
                     const instrument = new Instrument_1.default(instrumentId, lang);
-                    replaceString = replaceString.replace(match, instrument.name.toLowerCase());
+                    if (instrument) {
+                        replaceString = replaceString.replace(match, instrument.name.toLowerCase());
+                    }
                     break;
                 }
                 case 'date': {

package/models/Group/Repertory/File/Section/index.d.ts

@@ -1,3 +1,4 @@
+import { MusicStyleType } from '../../../../../helpers/musicStyles';
 import { LanguagesTypes } from '../../../../../lang';
 import { FileSectionId } from './types';
 export default class GroupRepertoryFileSection {
@@ -5,4 +6,5 @@ export default class GroupRepertoryFileSection {
     private lang;
     constructor(id: FileSectionId, lang?: LanguagesTypes);
     get name(): string;
+    getOrder(musicStyle: MusicStyleType): number;
 }

package/models/Group/Repertory/File/Section/index.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const orders_1 = require("../../../../../helpers/fileSections/orders");
 const lang_1 = require("../../../../../lang");
 const Instrument_1 = __importDefault(require("../../../../Instrument"));
 const types_1 = require("./types");
@@ -16,5 +17,8 @@ class GroupRepertoryFileSection {
             ? lang_1.getTranslation(`sections.all`, this.lang)
             : new Instrument_1.default(this.id).name) || this.id);
     }
+    getOrder(musicStyle) {
+        return orders_1.getOrderByMusicStyle(musicStyle).indexOf(this.id) + 1 || Infinity;
+    }
 }
 exports.default = GroupRepertoryFileSection;

package/models/Group/Repertory/index.d.ts

@@ -24,7 +24,7 @@ export default class GroupRepertory extends Theme<GroupRepertoryData> {
     get filesPath(): Partial<Record<FileSectionId, import("./types").GroupRepertoireFilePathItem[]>>;
     get filesPathList(): {
         path: string;
-        tag: string | null;
+        tag: string;
         sectionId: FileSectionId;
     }[];
     /** @deprecated use sections */

package/models/Group/Repertory/types.d.ts

@@ -36,6 +36,7 @@ export interface AGroupRepertoireScoreFilePage extends GroupRepertoireScoreFileP
     id: FileSectionId;
 }
 declare type PageNumber = string;
+declare type FileId = string;
 export interface GroupRepertoireFileSections {
     tags?: string[];
     pages?: Record<PageNumber, GroupRepertoireScoreFilePage>;
@@ -51,7 +52,7 @@ export interface GroupRepertoireFile {
 }
 export interface GroupRepertoireFilePathItem {
     path: string;
-    tag: string | null;
+    tag: string;
 }
 export interface GroupRepertoryData extends ThemeBasicData {
     events: string[];
@@ -67,7 +68,7 @@ export interface GroupRepertoryData extends ThemeBasicData {
     audios: string[];
     /** @deprecated  */
     identifyAt: Timestamp | null;
-    files: Record<string, GroupRepertoireFile>;
+    files: Record<FileId, GroupRepertoireFile>;
     filesPath: Partial<Record<FileSectionId, GroupRepertoireFilePathItem[]>>;
     votes: Record<string, number>;
     thumbnailURL: string | null;

package/models/Group/index.d.ts

@@ -2,7 +2,7 @@ import { DocumentReference, DocumentSnapshot } from '@google-cloud/firestore';
 import { PlansGroup } from '../../helpers/plans';
 import { LanguagesTypes } from '../../lang';
 import GroupBasic from './basic';
-import { GroupData, GroupRepertoireTag, GroupStatus, SocialNetwork } from './types';
+import { GroupData, GroupStatus, SocialNetwork } from './types';
 export default class Group extends GroupBasic<GroupData> {
     constructor(doc: DocumentSnapshot, lang?: LanguagesTypes);
     get owner(): DocumentReference;
@@ -61,10 +61,9 @@ export default class Group extends GroupBasic<GroupData> {
         id: string;
     })[];
     get firstAnswerAt(): FirebaseFirestore.Timestamp | null;
-    get repertoireTags(): Record<string, GroupRepertoireTag>;
-    get repertoireTagsList(): (GroupRepertoireTag & {
+    get repertoireTags(): Record<string, import("./types").GroupRepertoireTag>;
+    get repertoireTagsList(): (import("./types").GroupRepertoireTag & {
         id: string;
     })[];
     getRepertoireTagName(id: string): string | null;
-    getRepertoireTagNameTranslator(): (id: string, repertoireTags?: Record<string, GroupRepertoireTag>, lang?: LanguagesTypes) => string | null;
 }

package/models/Group/index.js

@@ -174,13 +174,5 @@ class Group extends basic_1.default {
         const tag = this.repertoireTags[id];
         return tag.default ? lang_1.getTranslation(tag.title, this.lang) : tag.title;
     }
-    getRepertoireTagNameTranslator() {
-        return (id, repertoireTags = { ...this.repertoireTags }, lang = this.lang) => {
-            if (!(id in repertoireTags))
-                return null;
-            const tag = repertoireTags[id];
-            return tag.default ? lang_1.getTranslation(tag.title, lang) : tag.title;
-        };
-    }
 }
 exports.default = Group;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@glissandoo/lib",
-	"version": "1.16.11",
+	"version": "1.17.1",
 	"description": "Glissandoo library js",
 	"main": "./index.js",
 	"types": "./index.d.ts",