@glissandoo/lib 1.17.8 → 1.18.1

package/helpers/auth.d.ts

@@ -17,10 +17,10 @@ export declare enum AuthErrors {
     NoPartnerhispAdmin = "error.auth.noPartnershipAdmin",
     Unauthenticated = "error.auth.unauthenticated"
 }
-export type AuthURLParams = {
+export interface AuthURLParams {
     error?: string;
     return_to?: string;
     callbackFbName?: FbFunctionName;
     callbackFbParam?: string;
-};
+}
 export declare const getAuthURL: (path: string, lang: LanguagesTypes, params?: AuthURLParams) => string;

package/helpers/auth.js

@@ -14,11 +14,11 @@ var AuthErrors;
 })(AuthErrors = exports.AuthErrors || (exports.AuthErrors = {}));
 const getAuthURL = (path, lang, params) => {
     const url = new URL(lang === lang_1.defaultLocale ? path : [lang, path].join('/'), AUTH_HOST);
-    if (params) {
-        for (const param of Object.entries(params)) {
-            url.searchParams.set(param[0], param[1]);
+    Object.entries(params || {}).forEach(([key, value]) => {
+        if (typeof value === 'string') {
+            url.searchParams.set(key, value);
         }
-    }
+    });
     return url.toString();
 };
 exports.getAuthURL = getAuthURL;

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

@@ -4,7 +4,7 @@ import { LanguagesTypes } from '../../../lang';
 import EventoTiny from '../../Evento/tiny';
 import Theme from '../../Repertory/basic';
 import { FileSectionId } from './File/Section/types';
-import { AGroupRepertoryClaim, GroupRepertoireVisibility, GroupRepertoryData } from './types';
+import { GroupRepertoireVisibility, GroupRepertoryData } from './types';
 export default class GroupRepertory extends Theme<GroupRepertoryData> {
     private lang;
     constructor(doc: firestore.DocumentSnapshot, lang?: LanguagesTypes);
@@ -55,10 +55,17 @@ export default class GroupRepertory extends Theme<GroupRepertoryData> {
     get thumbnailURL(): string | null;
     get ownerId(): string;
     get lastEventDatetime(): firestore.Timestamp | null;
-    get claims(): Record<string, Record<string, import("./types").GroupRepertoryClaimType>>;
-    get claimsList(): AGroupRepertoryClaim[];
-    claimsByInstrument(instrumentId: string): Record<string, import("./types").GroupRepertoryClaimType>;
-    getPlayersByInstrumentClaimed(instrumentId: string, onlyNoNotified?: boolean): string[];
+    get claims(): Partial<Record<InstrumentId, Record<string, import("./types").GroupRepertoryClaimType>>>;
+    get claimsList(): {
+        createdAt: firestore.Timestamp;
+        notifiedAt: firestore.Timestamp | null;
+        userId: string;
+        instrumentId: InstrumentId;
+        hasFile: boolean;
+    }[];
+    hasInstrumentAFile(instrumentId: InstrumentId): boolean;
+    claimsByInstrument(instrumentId: InstrumentId): Record<string, import("./types").GroupRepertoryClaimType>;
+    getPlayersByInstrumentClaimed(instrumentId: InstrumentId, onlyNoNotified?: boolean): string[];
     isInstrumentClaimed(instrumentId: string): boolean;
     isInstrumentClaimedByPlayer(instrumentId: InstrumentId, userId: string): boolean;
     /** @deprecated use sections */

package/models/Group/Repertory/index.js

@@ -9,10 +9,12 @@ const lodash_1 = require("lodash");
 const get_1 = __importDefault(require("lodash/get"));
 const orderBy_1 = __importDefault(require("lodash/orderBy"));
 const objects_1 = require("../../../helpers/objects");
+const ts_extras_1 = require("../../../helpers/ts-extras");
 const lang_1 = require("../../../lang");
 const tiny_1 = __importDefault(require("../../Evento/tiny"));
 const basic_1 = __importDefault(require("../../Repertory/basic"));
-const types_1 = require("./types");
+const types_1 = require("./File/Section/types");
+const types_2 = require("./types");
 class GroupRepertory extends basic_1.default {
     constructor(doc, lang = lang_1.defaultLocale) {
         super(doc);
@@ -55,7 +57,7 @@ class GroupRepertory extends basic_1.default {
         return this.data.mainFilePath;
     }
     get visibility() {
-        return this.data.visibility || types_1.GroupRepertoireVisibility.ByEvent;
+        return this.data.visibility || types_2.GroupRepertoireVisibility.ByEvent;
     }
     get votes() {
         return this.data.votes || {};
@@ -130,23 +132,24 @@ class GroupRepertory extends basic_1.default {
         return this.data.claims || {};
     }
     get claimsList() {
-        const list = [];
-        Object.keys(this.claims).map((instrumentId) => {
-            Object.keys(this.claims[instrumentId] || {}).map((userId) => {
-                list.push({
-                    userId,
-                    instrumentId: instrumentId,
-                    ...this.claims[instrumentId][userId],
-                });
-            });
-        });
-        return list;
+        return (0, ts_extras_1.objectEntries)(this.claims)
+            .map(([iId, users]) => (0, ts_extras_1.objectEntries)(users || {}).map(([userId, claim]) => ({
+            userId,
+            instrumentId: iId,
+            hasFile: this.hasInstrumentAFile(iId),
+            ...(claim || {}),
+        })))
+            .flat();
+    }
+    hasInstrumentAFile(instrumentId) {
+        return (this.sectionIds.includes(types_1.FileSectionIdReserved.All) ||
+            this.sectionIds.includes(instrumentId));
     }
     claimsByInstrument(instrumentId) {
         if (!this.isInstrumentClaimed(instrumentId)) {
             return {};
         }
-        return instrumentId in this.claims ? this.claims[instrumentId] : {};
+        return instrumentId in this.claims ? this.claims[instrumentId] || {} : {};
     }
     getPlayersByInstrumentClaimed(instrumentId, onlyNoNotified = false) {
         const claimsByInstrument = this.claimsByInstrument(instrumentId);
@@ -162,7 +165,7 @@ class GroupRepertory extends basic_1.default {
         if (!this.isInstrumentClaimed(instrumentId)) {
             return false;
         }
-        return userId in this.claims[instrumentId];
+        return userId in (this.claims[instrumentId] || {});
     }
     /** @deprecated use sections */
     getInstrument(id) {

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

@@ -37,6 +37,7 @@ export interface AGroupRepertoireScoreFilePage extends GroupRepertoireScoreFileP
 }
 type PageNumber = string;
 type FileId = string;
+type UserId = string;
 export interface GroupRepertoireFileSections {
     tags?: string[];
     pages?: Record<PageNumber, GroupRepertoireScoreFilePage>;
@@ -75,7 +76,7 @@ export interface GroupRepertoryData extends ThemeBasicData {
     editedAt: Timestamp | null;
     visibility: GroupRepertoireVisibility;
     lastEventDatetime: Timestamp | null;
-    claims: Record<string, Record<string, GroupRepertoryClaimType>>;
+    claims: Partial<Record<InstrumentId, Record<UserId, GroupRepertoryClaimType>>>;
     clonedFrom: DocumentReference | null;
     readonly owner: DocumentReference;
     readonly createdAt: Timestamp;

package/package.json

@@ -1,10 +1,11 @@
 {
 	"name": "@glissandoo/lib",
-	"version": "1.17.8",
+	"version": "1.18.1",
 	"description": "Glissandoo library js",
 	"main": "./index.js",
 	"types": "./index.d.ts",
 	"scripts": {
+		"tsc": "tsc",
 		"build": "tsc",
 		"build:watch": "tsc --watch",
 		"test": "echo \"Error: no test specified\" && exit 1",