@glissandoo/lib 1.51.1 → 1.51.2

package/models/Evento/Player/index.d.ts

@@ -19,4 +19,5 @@ export default class EventoPlayer extends PlayerBasic<EventPlayerData> {
     get history(): import("./types").EventPlayerHistory[];
     get interested(): true | null;
     get selected(): boolean | null;
+    get isActive(): boolean;
 }

package/models/Evento/Player/index.js

@@ -56,5 +56,8 @@ class EventoPlayer extends basic_1.default {
     get selected() {
         return !(0, lodash_1.isUndefined)(this.data.selected) ? this.data.selected : null;
     }
+    get isActive() {
+        return this.exists && this.selected !== false;
+    }
 }
 exports.default = EventoPlayer;

package/models/Evento/index.d.ts

@@ -1,3 +1,4 @@
+import { InstrumentId } from '../../helpers/instruments';
 import { LanguagesTypes } from '../../lang';
 import { DocumentReference, DocumentSnapshot } from '../../types/firestore';
 import { EventPlayerStatus } from './Player/types';
@@ -45,10 +46,9 @@ export default class Evento extends EventoPromoter<EventData> {
         tags: string[];
         media: import("../Repertory/types").ThemeMediaType | null;
     }[];
-    get activePlayers(): string[];
-    playersList({ showAll, order }: {
+    playersList({ showAll, order }?: {
         showAll?: boolean;
-        order?: string[];
+        order?: InstrumentId[];
     }): {
         note?: string | null | undefined;
         reason?: import("./Player/types").EventPlayerReason | null | undefined;
@@ -56,7 +56,7 @@ export default class Evento extends EventoPromoter<EventData> {
         rollcall: EventPlayerStatus | null;
         interested: true | null;
         selected: boolean | null;
-        mainInstrument: import("../../helpers/instruments").InstrumentId;
+        mainInstrument: InstrumentId;
         username: string;
         displayName: string;
         photoURL: string;
@@ -72,7 +72,7 @@ export default class Evento extends EventoPromoter<EventData> {
     get templateId(): string | null;
     get repeat(): import("./types").EventRepeatType | null;
     isPlayer: (userId: string) => boolean;
-    isPlayerActive: (userId: string) => boolean;
+    isPlayerActive: (userId: string) => boolean | null;
     getPlayer: (userId: string) => EventPlayerBasicData | null;
     isPlayerConfirmed(player: EventPlayerBasicData): boolean;
     isPlayerDeclined(player: EventPlayerBasicData): boolean;

package/models/Evento/index.js

@@ -15,13 +15,11 @@ class Evento extends promoter_1.default {
     constructor(doc, lang = lang_1.defaultLocale) {
         super(doc, lang);
         this.isPlayer = (userId) => {
-            return this.activePlayers.includes(userId);
+            return this.playerIds.includes(userId);
         };
         this.isPlayerActive = (userId) => {
             const player = this.getPlayer(userId);
-            if (!player)
-                return false;
-            return this.isSelectionModeClose ? !!player.selected : true;
+            return player && player.selected !== false;
         };
         this.getPlayer = (userId) => {
             return userId in this.players ? this.players[userId] : null;
@@ -137,11 +135,8 @@ class Evento extends promoter_1.default {
         }));
         return (0, lodash_1.orderBy)(repertory, 'order', 'asc');
     }
-    get activePlayers() {
-        return Object.keys(this.players) || [];
-    }
-    playersList({ showAll, order }) {
-        const players = this.activePlayers.map((playerId) => ({
+    playersList({ showAll, order } = {}) {
+        const players = this.playerIds.map((playerId) => ({
             id: playerId,
             ...this.players[playerId],
         }));
@@ -153,19 +148,19 @@ class Evento extends promoter_1.default {
         return orderedPlayers.filter((player) => this.isPlayerActive(player.id));
     }
     get confirmedPlayers() {
-        return this.activePlayers.filter((playerId) => this.isPlayerConfirmed(this.players[playerId]));
+        return this.playerIds.filter((playerId) => this.isPlayerConfirmed(this.players[playerId]));
     }
     get declinedPlayers() {
-        return this.activePlayers.filter((playerId) => this.isPlayerDeclined(this.players[playerId]));
+        return this.playerIds.filter((playerId) => this.isPlayerDeclined(this.players[playerId]));
     }
     get pendingPlayers() {
-        return this.activePlayers.filter((playerId) => !this.players[playerId].status);
+        return this.playerIds.filter((playerId) => !this.players[playerId].status);
     }
     get confirmedRollCallPlayers() {
-        return this.activePlayers.filter((playerId) => this.isPlayerRollCallConfirmed(this.players[playerId]));
+        return this.playerIds.filter((playerId) => this.isPlayerRollCallConfirmed(this.players[playerId]));
     }
     get declinedRollCallPlayers() {
-        return this.activePlayers.filter((playerId) => this.isPlayerRollCallDeclined(this.players[playerId]));
+        return this.playerIds.filter((playerId) => this.isPlayerRollCallDeclined(this.players[playerId]));
     }
     get isRollCalled() {
         return this.rollCalledAt !== null;

package/models/User/index.js

@@ -105,7 +105,7 @@ class User extends basic_1.default {
         return this.data.appConfig[value];
     }
     getNotificationSetting(key) {
-        return this.data.notificationSettings[key] || false;
+        return this.data.notificationSettings[key];
     }
     get registerVia() {
         return this.data.registerVia || null;

package/package.json

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