@glissandoo/lib 1.51.0 → 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/Player/types.d.ts

@@ -1,6 +1,6 @@
+import { EmptyObject } from 'type-fest';
 import { Timestamp } from '../../../types/firestore';
 import { EventPlayerBasicData, EventRollcallHistory } from '../../Evento/types';
-import { EmptyObject } from 'type-fest';
 export declare enum EventPlayerStatus {
     Confirmed = "confirmed",
     Declined = "declined"
@@ -45,12 +45,6 @@ export interface EventPlayerData extends EventPlayerBasicData {
     joinedAt: Timestamp;
     rollCalledAt: Timestamp | null;
     history: EventPlayerHistory[];
-    /** @deprecated use rollcall */
-    statusHistory: EventPlayerStatusHistory[];
-    /** @deprecated use rollcall */
-    rollcallHistory: EventPlayerRollcallHistory[];
-    /** @deprecated use rollcall */
-    rollCallStatus?: EventPlayerStatus;
 }
 export interface AEventPlayerData extends EventPlayerData {
     id: string;

package/models/Evento/basic.d.ts

@@ -19,4 +19,7 @@ export default class EventoBasic<D> extends ModelWithLang<EventBasicData & D> {
     get isOutDate(): boolean;
     get isHappening(): boolean;
     get timezone(): string;
+    get responseDeadlineAt(): import("../../types/firestore").Timestamp;
+    get isResponseAllowed(): boolean;
+    get selectionMode(): import("./types").EventSelectionMode | null;
 }

package/models/Evento/basic.js

@@ -27,7 +27,9 @@ class EventoBasic extends lang_2.default {
             datetime: this.datetime,
             datetimeEnd: this.datetimeEnd,
             type: this.type,
-            timezone: this.data.timezone,
+            timezone: this.timezone,
+            responseDeadlineAt: this.responseDeadlineAt,
+            selectionMode: this.selectionMode,
         };
     }
     get displayName() {
@@ -72,5 +74,14 @@ class EventoBasic extends lang_2.default {
     get timezone() {
         return this.data.timezone || 'Europe/Madrid';
     }
+    get responseDeadlineAt() {
+        return this.data.responseDeadlineAt || this.datetime;
+    }
+    get isResponseAllowed() {
+        return (0, date_fns_1.isFuture)(this.responseDeadlineAt.toDate());
+    }
+    get selectionMode() {
+        return this.data.selectionMode || null;
+    }
 }
 exports.default = EventoBasic;

package/models/Evento/index.d.ts

@@ -1,8 +1,9 @@
+import { InstrumentId } from '../../helpers/instruments';
 import { LanguagesTypes } from '../../lang';
 import { DocumentReference, DocumentSnapshot } from '../../types/firestore';
 import { EventPlayerStatus } from './Player/types';
 import EventoPromoter from './promoter';
-import { EventData, EventPlayerBasicData, EventResponseDeadlineOptions, EventSelectionMode, EventStatusByTime } from './types';
+import { EventData, EventPlayerBasicData, EventResponseDeadlineOptions, EventStatusByTime } from './types';
 export default class Evento extends EventoPromoter<EventData> {
     constructor(doc: DocumentSnapshot, lang?: LanguagesTypes);
     get maxAttendance(): number | null;
@@ -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;
@@ -82,10 +82,6 @@ export default class Evento extends EventoPromoter<EventData> {
         option: EventResponseDeadlineOptions;
         customAt: import("../../types/firestore").Timestamp | null;
     };
-    get responseDeadlineAt(): import("../../types/firestore").Timestamp;
-    get isResponseAllowed(): boolean;
-    get selectionMode(): EventSelectionMode | null;
     get selectionModeClosedAt(): import("../../types/firestore").Timestamp | null;
     get isSelectionModeClose(): boolean;
-    get isSelectionModeOpen(): 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;
@@ -197,23 +192,11 @@ class Evento extends promoter_1.default {
             customAt: null,
         });
     }
-    get responseDeadlineAt() {
-        return this.data.responseDeadlineAt || this.datetime;
-    }
-    get isResponseAllowed() {
-        return (0, date_fns_1.isFuture)(this.responseDeadlineAt.toDate());
-    }
-    get selectionMode() {
-        return this.data.selectionMode || null;
-    }
     get selectionModeClosedAt() {
         return this.data.selectionModeClosedAt || null;
     }
     get isSelectionModeClose() {
         return (this.selectionModeClosedAt !== null && this.selectionMode === types_2.EventSelectionMode.Closed);
     }
-    get isSelectionModeOpen() {
-        return (this.selectionModeClosedAt === null && this.selectionMode === types_2.EventSelectionMode.Open);
-    }
 }
 exports.default = Evento;

package/models/Evento/types.d.ts

@@ -82,6 +82,8 @@ export interface EventBasicData extends EventTinyData {
     locality: string | null;
     online: boolean;
     datetimeEnd: Timestamp;
+    responseDeadlineAt: Timestamp;
+    selectionMode: EventSelectionMode | null;
 }
 export interface EventPromoterData extends EventBasicData {
     readonly promoter: DocumentReference;
@@ -116,9 +118,6 @@ export interface EventData extends EventPromoterData {
         option: EventResponseDeadlineOptions;
         customAt: Timestamp | null;
     };
-    responseDeadlineAt: Timestamp;
-    mode: EventSelectionMode;
-    selectionMode: EventSelectionMode | null;
     selectionModeClosedAt: Timestamp | null;
     readonly owner: DocumentReference;
     readonly createdAt: Timestamp;

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

@@ -1,5 +1,5 @@
 import { Timestamp } from '../../../types/firestore';
-import { EventBasicData, EventSelectionMode } from '../../Evento/types';
+import { EventBasicData } from '../../Evento/types';
 export interface GroupEventData extends EventBasicData {
     players_count: number;
     players_confirmed_count: number;
@@ -7,9 +7,8 @@ export interface GroupEventData extends EventBasicData {
     players_interested_count: number;
     players_selected_count: number;
     players_deselected_count: number;
-    rollCalledAt: Timestamp | null;
-    selectionMode: EventSelectionMode | null;
     players_confirmed_rollcall_count: number;
     players_declined_rollcall_count: number;
     repertory_count: number;
+    rollCalledAt: Timestamp | 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.0",
+	"version": "1.51.2",
 	"description": "Glissandoo library js",
 	"main": "./index.js",
 	"types": "./index.d.ts",