@glissandoo/lib 1.121.0 → 1.123.0-dev.210.1

package/models/Customer/index.d.ts

@@ -23,7 +23,7 @@ export default class Customer extends CustomerBasic<CustomerData> {
     }[];
     get howDidYouHearAboutUs(): string | null;
     get groupIds(): string[];
-    get glissandooAdminUrl(): string;
+    getGlissandooAdminUrl(adminHost: string): string;
     get mrr(): number;
     get manual(): boolean;
     get notes(): string | null;

package/models/Customer/index.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const collections_1 = require("../../helpers/collections");
-const glissandooAdmin_1 = require("../../helpers/glissandooAdmin");
+const externalUrls_1 = require("../../helpers/externalUrls");
 const types_1 = require("../../helpers/types");
 const basic_1 = __importDefault(require("./basic"));
 class Customer extends basic_1.default {
@@ -63,8 +63,8 @@ class Customer extends basic_1.default {
     get groupIds() {
         return this.data.groupIds || [];
     }
-    get glissandooAdminUrl() {
-        return (0, glissandooAdmin_1.getGlissandooAdminEntityURL)(collections_1.CollectionNames.Customer, this.id);
+    getGlissandooAdminUrl(adminHost) {
+        return (0, externalUrls_1.buildAdminEntityUrl)(adminHost, collections_1.CollectionNames.Customer, this.id);
     }
     get mrr() {
         return this.data.mrr || 0;

package/models/Customer/types.js

@@ -4,4 +4,4 @@ exports.CustomerRoles = void 0;
 var CustomerRoles;
 (function (CustomerRoles) {
     CustomerRoles["Admin"] = "admin";
-})(CustomerRoles = exports.CustomerRoles || (exports.CustomerRoles = {}));
+})(CustomerRoles || (exports.CustomerRoles = CustomerRoles = {}));

package/models/Evento/Player/types.js

@@ -6,12 +6,12 @@ var EventPlayerRollCallVia;
     EventPlayerRollCallVia["QR"] = "QR";
     EventPlayerRollCallVia["GeoLoc"] = "GeoLoc";
     EventPlayerRollCallVia["Admin"] = "Admin";
-})(EventPlayerRollCallVia = exports.EventPlayerRollCallVia || (exports.EventPlayerRollCallVia = {}));
+})(EventPlayerRollCallVia || (exports.EventPlayerRollCallVia = EventPlayerRollCallVia = {}));
 var EventPlayerStatus;
 (function (EventPlayerStatus) {
     EventPlayerStatus["Confirmed"] = "confirmed";
     EventPlayerStatus["Declined"] = "declined";
-})(EventPlayerStatus = exports.EventPlayerStatus || (exports.EventPlayerStatus = {}));
+})(EventPlayerStatus || (exports.EventPlayerStatus = EventPlayerStatus = {}));
 var EventPlayerReason;
 (function (EventPlayerReason) {
     EventPlayerReason["Sick"] = "Sick";
@@ -19,4 +19,4 @@ var EventPlayerReason;
     EventPlayerReason["ArrivingLate"] = "ArrivingLate";
     EventPlayerReason["LeavingEarly"] = "LeavingEarly";
     EventPlayerReason["Other"] = "Other";
-})(EventPlayerReason = exports.EventPlayerReason || (exports.EventPlayerReason = {}));
+})(EventPlayerReason || (exports.EventPlayerReason = EventPlayerReason = {}));

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

@@ -1,7 +1,8 @@
 import { Timestamp } from '@google-cloud/firestore';
-import { ThemeBasicData } from '../../Repertory/types';
+import { SourceComposition, ThemeBasicData } from '../../Repertory/types';
 export interface EventRepertoryData extends ThemeBasicData {
     order: number;
     createdAt: Timestamp;
     createdBy: string;
+    sourceComposition?: SourceComposition | null;
 }

package/models/Evento/index.d.ts

@@ -30,8 +30,8 @@ export default class Evento extends EventoPromoter<EventData> {
     get repertoryIds(): string[];
     get repertoryCount(): number;
     get activeInvitationLink(): boolean;
-    get invitationLink(): string;
-    get shortDynamicLink(): string;
+    getInvitationLink(landingHost: string): string;
+    getShortDynamicLink(landingHost: string): string;
     get deletedAt(): FirebaseFirestore.Timestamp | null;
     get deletedBy(): string | null;
     get createdAt(): FirebaseFirestore.Timestamp;
@@ -49,6 +49,7 @@ export default class Evento extends EventoPromoter<EventData> {
     get repertoryList(): {
         id: string;
         order: number;
+        sourceComposition?: import("../Repertory/types").SourceComposition | null;
         title: string;
         compositor: string | null;
         tags: string[];

package/models/Evento/index.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = require("lodash");
+const externalUrls_1 = require("../../helpers/externalUrls");
 const orders_1 = require("../../helpers/instruments/orders");
 const orders_2 = require("../../helpers/musicStyles/orders");
 const lang_1 = require("../../lang");
@@ -74,15 +75,15 @@ class Evento extends promoter_1.default {
     get activeInvitationLink() {
         return this.data.activeInvitationLink || false;
     }
-    get invitationLink() {
-        const link = `https://glissandoo.com/joinevent/${this.id}`;
+    getInvitationLink(landingHost) {
+        const link = (0, externalUrls_1.buildEventInvitationUrl)(landingHost, this.id);
         if (lang_1.LanguagesTypes.ES === this.lang) {
             return link;
         }
         return `${link}?lang=${this.lang}`;
     }
-    get shortDynamicLink() {
-        const link = `https://glissandoo.com/event/${this.id}`;
+    getShortDynamicLink(landingHost) {
+        const link = (0, externalUrls_1.buildEventUrl)(landingHost, this.id);
         if (lang_1.LanguagesTypes.ES === this.lang) {
             return link;
         }

package/models/Evento/types.d.ts

@@ -5,41 +5,9 @@ import { EventoPayoutRuleEntry } from '../../types/payoutRule';
 import { StageTemplate } from '../Group/StageTemplate/types';
 import { GroupBasicData } from '../Group/types';
 import { PlayerBasicData } from '../Player/types';
-import { ThemeBasicData } from '../Repertory/types';
+import { SourceComposition, ThemeBasicData } from '../Repertory/types';
 import { EventPlayerAnswers, EventPlayerReason, EventPlayerStatus } from './Player/types';
-export declare enum EventHistoryAction {
-    Created = "created",
-    Deleted = "deleted",
-    CloseSelectionMode = "close_selection_mode",
-    EditResponseDeadline = "edit_response_deadline",
-    EditDate = "edit_date",
-    EditTime = "edit_time",
-    EditLocality = "edit_locality",
-    EditImages = "edit_images",
-    EditAttachments = "edit_attachments",
-    EditStage = "edit_stage",
-    EditDescription = "edit_description",
-    EditQuestions = "edit_questions",
-    EditReminders = "edit_reminders",
-    PlayerAdd = "player_add",
-    PlayerRemove = "player_remove",
-    PlayerStatusChange = "player_status_change",
-    RepertoireAdd = "repertoire_add",
-    RepertoireRemove = "repertoire_remove",
-    EditDisplayName = "edit_display_name",
-    EditMaxAttendance = "edit_max_attendance",
-    RollCall = "roll_call",
-    NotifyPendingPlayers = "notify_pending_players",
-    PlayerAttendance = "player_attendance",
-    PlayerAttendanceByAdmin = "player_attendance_by_admin",
-    PlayerSetNote = "player_set_note",
-    PlayerSetQuestions = "player_set_questions",
-    PlayerRollCallQR = "player_roll_call_qr",
-    PlayerRollCallGeoLoc = "player_roll_call_geo_loc",
-    PayoutInitialize = "payout_initialize",
-    PayoutEditConfig = "payout_edit_config",
-    PayoutEditRules = "payout_edit_rules"
-}
+export { EventHistoryAction } from '../supabase/EventHistory/types';
 export declare enum EventReminderOptions {
     OneHours = "1-hours",
     ThreeHours = "3-hours",
@@ -125,6 +93,7 @@ export interface AEventPlayerBasicData extends EventPlayerBasicData {
 }
 export interface EventThemeBasicData extends ThemeBasicData {
     order: number;
+    sourceComposition?: SourceComposition | null;
 }
 export interface AEventThemeBasicData extends EventThemeBasicData {
     id: string;
@@ -188,9 +157,21 @@ export interface EventData extends EventPromoterData {
     readonly createdOn: CreatedOn;
 }
 export interface EventPayoutConfig {
-    grossAmount: number;
+    /**
+     * Event budget. `null` means "to be determined" (an Income payment is still
+     * generated, with `totalAmount: null`). `0` means no budget (no Income
+     * payment is generated). `> 0` is a concrete amount.
+     */
+    grossAmount: number | null;
     currency: string;
     importByMember: number | null;
     rules: EventoPayoutRuleEntry[];
     expenses: string[];
+    /**
+     * Id of the auto-generated `Income` GroupPayment that materializes the
+     * event budget (`grossAmount`), assigned to the group itself. `null` when
+     * the budget is `0` or for legacy events created before incomes were
+     * tracked.
+     */
+    incomeId?: string | null;
 }

package/models/Evento/types.js

@@ -1,40 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EventSelectionMode = exports.EventStatusByTime = exports.EventRepeatPeriod = exports.EventType = exports.EventFiles = exports.EventResponseDeadlineOptions = exports.EventReminderOptions = exports.EventHistoryAction = void 0;
-var EventHistoryAction;
-(function (EventHistoryAction) {
-    EventHistoryAction["Created"] = "created";
-    EventHistoryAction["Deleted"] = "deleted";
-    EventHistoryAction["CloseSelectionMode"] = "close_selection_mode";
-    EventHistoryAction["EditResponseDeadline"] = "edit_response_deadline";
-    EventHistoryAction["EditDate"] = "edit_date";
-    EventHistoryAction["EditTime"] = "edit_time";
-    EventHistoryAction["EditLocality"] = "edit_locality";
-    EventHistoryAction["EditImages"] = "edit_images";
-    EventHistoryAction["EditAttachments"] = "edit_attachments";
-    EventHistoryAction["EditStage"] = "edit_stage";
-    EventHistoryAction["EditDescription"] = "edit_description";
-    EventHistoryAction["EditQuestions"] = "edit_questions";
-    EventHistoryAction["EditReminders"] = "edit_reminders";
-    EventHistoryAction["PlayerAdd"] = "player_add";
-    EventHistoryAction["PlayerRemove"] = "player_remove";
-    EventHistoryAction["PlayerStatusChange"] = "player_status_change";
-    EventHistoryAction["RepertoireAdd"] = "repertoire_add";
-    EventHistoryAction["RepertoireRemove"] = "repertoire_remove";
-    EventHistoryAction["EditDisplayName"] = "edit_display_name";
-    EventHistoryAction["EditMaxAttendance"] = "edit_max_attendance";
-    EventHistoryAction["RollCall"] = "roll_call";
-    EventHistoryAction["NotifyPendingPlayers"] = "notify_pending_players";
-    EventHistoryAction["PlayerAttendance"] = "player_attendance";
-    EventHistoryAction["PlayerAttendanceByAdmin"] = "player_attendance_by_admin";
-    EventHistoryAction["PlayerSetNote"] = "player_set_note";
-    EventHistoryAction["PlayerSetQuestions"] = "player_set_questions";
-    EventHistoryAction["PlayerRollCallQR"] = "player_roll_call_qr";
-    EventHistoryAction["PlayerRollCallGeoLoc"] = "player_roll_call_geo_loc";
-    EventHistoryAction["PayoutInitialize"] = "payout_initialize";
-    EventHistoryAction["PayoutEditConfig"] = "payout_edit_config";
-    EventHistoryAction["PayoutEditRules"] = "payout_edit_rules";
-})(EventHistoryAction = exports.EventHistoryAction || (exports.EventHistoryAction = {}));
+var types_1 = require("../supabase/EventHistory/types");
+Object.defineProperty(exports, "EventHistoryAction", { enumerable: true, get: function () { return types_1.EventHistoryAction; } });
 var EventReminderOptions;
 (function (EventReminderOptions) {
     EventReminderOptions["OneHours"] = "1-hours";
@@ -45,7 +13,7 @@ var EventReminderOptions;
     EventReminderOptions["OneWeek"] = "1-weeks";
     EventReminderOptions["TwoWeeks"] = "2-weeks";
     EventReminderOptions["Custom"] = "custom";
-})(EventReminderOptions = exports.EventReminderOptions || (exports.EventReminderOptions = {}));
+})(EventReminderOptions || (exports.EventReminderOptions = EventReminderOptions = {}));
 var EventResponseDeadlineOptions;
 (function (EventResponseDeadlineOptions) {
     EventResponseDeadlineOptions["BeforeEvent"] = "BeforeEvent";
@@ -53,35 +21,35 @@ var EventResponseDeadlineOptions;
     EventResponseDeadlineOptions["OneDayBefore"] = "OneDayBefore";
     EventResponseDeadlineOptions["OneWeekBefore"] = "OneWeekBefore";
     EventResponseDeadlineOptions["Custom"] = "Custom";
-})(EventResponseDeadlineOptions = exports.EventResponseDeadlineOptions || (exports.EventResponseDeadlineOptions = {}));
+})(EventResponseDeadlineOptions || (exports.EventResponseDeadlineOptions = EventResponseDeadlineOptions = {}));
 var EventFiles;
 (function (EventFiles) {
     EventFiles["StageThumbnail"] = "stageThumbnail.png";
     EventFiles["StagePDF"] = "stage.pdf";
     EventFiles["Cover"] = "cover.jpeg";
-})(EventFiles = exports.EventFiles || (exports.EventFiles = {}));
+})(EventFiles || (exports.EventFiles = EventFiles = {}));
 var EventType;
 (function (EventType) {
     EventType["Practice"] = "practice";
     EventType["Performance"] = "performance";
     EventType["Other"] = "other";
-})(EventType = exports.EventType || (exports.EventType = {}));
+})(EventType || (exports.EventType = EventType = {}));
 var EventRepeatPeriod;
 (function (EventRepeatPeriod) {
     EventRepeatPeriod["None"] = "none";
     EventRepeatPeriod["Weekly"] = "weekly";
     EventRepeatPeriod["Biweekly"] = "biweekly";
     EventRepeatPeriod["Monthly"] = "monthly";
-})(EventRepeatPeriod = exports.EventRepeatPeriod || (exports.EventRepeatPeriod = {}));
+})(EventRepeatPeriod || (exports.EventRepeatPeriod = EventRepeatPeriod = {}));
 // Se usa en la cabecera de la vista de evento de la app
 var EventStatusByTime;
 (function (EventStatusByTime) {
     EventStatusByTime["Future"] = "future";
     EventStatusByTime["Now"] = "now";
     EventStatusByTime["Past"] = "past";
-})(EventStatusByTime = exports.EventStatusByTime || (exports.EventStatusByTime = {}));
+})(EventStatusByTime || (exports.EventStatusByTime = EventStatusByTime = {}));
 var EventSelectionMode;
 (function (EventSelectionMode) {
     EventSelectionMode["Open"] = "open";
     EventSelectionMode["Closed"] = "closed";
-})(EventSelectionMode = exports.EventSelectionMode || (exports.EventSelectionMode = {}));
+})(EventSelectionMode || (exports.EventSelectionMode = EventSelectionMode = {}));

package/models/Federation/index.d.ts

@@ -23,6 +23,6 @@ export default class Federation extends Model<FederationData> {
     get deletedAt(): FirebaseFirestore.Timestamp | null;
     get deletedBy(): string | null;
     get isActive(): boolean;
-    get glissandooAdminUrl(): string;
+    getGlissandooAdminUrl(adminHost: string): string;
     get besm(): boolean;
 }

package/models/Federation/index.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const collections_1 = require("../../helpers/collections");
-const glissandooAdmin_1 = require("../../helpers/glissandooAdmin");
+const externalUrls_1 = require("../../helpers/externalUrls");
 const types_1 = require("../../helpers/types");
 const Model_1 = __importDefault(require("../Model"));
 class Federation extends Model_1.default {
@@ -75,8 +75,8 @@ class Federation extends Model_1.default {
     get isActive() {
         return !this.deletedAt && this.exists;
     }
-    get glissandooAdminUrl() {
-        return (0, glissandooAdmin_1.getGlissandooAdminEntityURL)(collections_1.CollectionNames.Federation, this.id);
+    getGlissandooAdminUrl(adminHost) {
+        return (0, externalUrls_1.buildAdminEntityUrl)(adminHost, collections_1.CollectionNames.Federation, this.id);
     }
     get besm() {
         return this.data.besm || false;

package/models/Group/Analytics/types.js

@@ -10,4 +10,4 @@ var SatisfactionIndexElements;
     SatisfactionIndexElements["EVENTS_ATTENDANCE_PREVISION_RATIO"] = "eventsAttendancePrevisionRatio";
     SatisfactionIndexElements["EVENTS_ANSWER_RATIO"] = "eventsAnswerRatio";
     SatisfactionIndexElements["EVENTS_WITH_REPERTORY_RATIO"] = "eventsWithRepertoryRatio";
-})(SatisfactionIndexElements = exports.SatisfactionIndexElements || (exports.SatisfactionIndexElements = {}));
+})(SatisfactionIndexElements || (exports.SatisfactionIndexElements = SatisfactionIndexElements = {}));

package/models/Group/Payment/supabase.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.historyRowToItem = exports.rowToGroupPaymentData = exports.GROUP_PAYMENT_HISTORY_TABLE = exports.GROUP_PAYMENT_TABLE = void 0;
+exports.GROUP_PAYMENT_HISTORY_TABLE = exports.GROUP_PAYMENT_TABLE = void 0;
+exports.rowToGroupPaymentData = rowToGroupPaymentData;
+exports.historyRowToItem = historyRowToItem;
 exports.GROUP_PAYMENT_TABLE = 'group_payment';
 exports.GROUP_PAYMENT_HISTORY_TABLE = 'group_payment_history';
 /**
@@ -33,7 +35,6 @@ function rowToGroupPaymentData(row, history = []) {
         editedBy: row.editedBy,
     };
 }
-exports.rowToGroupPaymentData = rowToGroupPaymentData;
 function historyRowToItem(row) {
     return {
         action: row.action,
@@ -43,4 +44,3 @@ function historyRowToItem(row) {
         changedBy: row.changed_by,
     };
 }
-exports.historyRowToItem = historyRowToItem;

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

@@ -94,3 +94,51 @@ export interface GroupPaymentData {
     editedBy: string | null;
 }
 export type AGroupPaymentData = GroupPaymentData;
+/**
+ * Estados visibles en la lista unificada de pagos de un evento.
+ * Reutiliza los valores de `GroupPaymentStatus` y añade el sintético
+ * `forecast` para las filas de previsión (no persistidas en Postgres).
+ */
+export declare enum EventPaymentStatus {
+    Pending = "pending",
+    Paid = "paid",
+    Cancelled = "cancelled",
+    Forecast = "forecast"
+}
+/**
+ * Item unificado devuelto por la callable `event-payments`.
+ *
+ * Comparte la forma de `GroupPaymentData`. Las filas reales mantienen su
+ * `status` persistido; las de previsión usan `status === EventPaymentStatus.Forecast`
+ * como discriminador y dejan en `null` los campos no aplicables
+ * (`createdAt`, `createdBy`, `paymentMethod`, etc.).
+ */
+export interface EventPaymentItem {
+    /** Real: UUID del row. Previsión: sintético `forecast-<playerId>`. */
+    id: string;
+    groupId: string;
+    type: GroupPaymentType;
+    eventId: string | null;
+    playerId: string | null;
+    concept: string;
+    assignedTo: string;
+    totalAmount: number | null;
+    baseAmount: number | null;
+    appliedRules: AppliedRuleEntry[];
+    currency: string;
+    status: EventPaymentStatus;
+    /** Siempre `[]` en este resultado (history se carga on-demand). */
+    history: GroupPaymentHistoryItem[];
+    paymentMethod: GroupPaymentMethod | null;
+    paidAt: string | null;
+    paidBy: string | null;
+    note: string | null;
+    /**
+     * Real: fecha de creación del row. Previsión: fecha de creación del evento.
+     */
+    createdAt: string;
+    /** Real: userId creador. Previsión: `SYSTEM`. */
+    createdBy: string;
+    editedAt: string | null;
+    editedBy: string | null;
+}

package/models/Group/Payment/types.js

@@ -1,26 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GroupPaymentHistoryAction = exports.GroupPaymentMethod = exports.GroupPaymentStatus = exports.GroupPaymentType = void 0;
+exports.EventPaymentStatus = exports.GroupPaymentHistoryAction = exports.GroupPaymentMethod = exports.GroupPaymentStatus = exports.GroupPaymentType = void 0;
 var GroupPaymentType;
 (function (GroupPaymentType) {
     GroupPaymentType["Income"] = "income";
     GroupPaymentType["Expense"] = "expense";
-})(GroupPaymentType = exports.GroupPaymentType || (exports.GroupPaymentType = {}));
+})(GroupPaymentType || (exports.GroupPaymentType = GroupPaymentType = {}));
 var GroupPaymentStatus;
 (function (GroupPaymentStatus) {
     GroupPaymentStatus["Pending"] = "pending";
     GroupPaymentStatus["Paid"] = "paid";
     GroupPaymentStatus["Cancelled"] = "cancelled";
-})(GroupPaymentStatus = exports.GroupPaymentStatus || (exports.GroupPaymentStatus = {}));
+})(GroupPaymentStatus || (exports.GroupPaymentStatus = GroupPaymentStatus = {}));
 var GroupPaymentMethod;
 (function (GroupPaymentMethod) {
     GroupPaymentMethod["Cash"] = "cash";
     GroupPaymentMethod["Transfer"] = "transfer";
-})(GroupPaymentMethod = exports.GroupPaymentMethod || (exports.GroupPaymentMethod = {}));
+})(GroupPaymentMethod || (exports.GroupPaymentMethod = GroupPaymentMethod = {}));
 var GroupPaymentHistoryAction;
 (function (GroupPaymentHistoryAction) {
     GroupPaymentHistoryAction["Status"] = "status";
     GroupPaymentHistoryAction["Amount"] = "amount";
     GroupPaymentHistoryAction["Concept"] = "concept";
     GroupPaymentHistoryAction["Method"] = "method";
-})(GroupPaymentHistoryAction = exports.GroupPaymentHistoryAction || (exports.GroupPaymentHistoryAction = {}));
+})(GroupPaymentHistoryAction || (exports.GroupPaymentHistoryAction = GroupPaymentHistoryAction = {}));
+/**
+ * Estados visibles en la lista unificada de pagos de un evento.
+ * Reutiliza los valores de `GroupPaymentStatus` y añade el sintético
+ * `forecast` para las filas de previsión (no persistidas en Postgres).
+ */
+var EventPaymentStatus;
+(function (EventPaymentStatus) {
+    EventPaymentStatus["Pending"] = "pending";
+    EventPaymentStatus["Paid"] = "paid";
+    EventPaymentStatus["Cancelled"] = "cancelled";
+    EventPaymentStatus["Forecast"] = "forecast";
+})(EventPaymentStatus || (exports.EventPaymentStatus = EventPaymentStatus = {}));

package/models/Group/Player/types.js

@@ -6,4 +6,4 @@ var GroupPlayerRole;
     GroupPlayerRole["Admin"] = "admin";
     GroupPlayerRole["Member"] = "member";
     GroupPlayerRole["Guest"] = "guest";
-})(GroupPlayerRole = exports.GroupPlayerRole || (exports.GroupPlayerRole = {}));
+})(GroupPlayerRole || (exports.GroupPlayerRole = GroupPlayerRole = {}));

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

@@ -1,12 +1,12 @@
 import { InstrumentId } from '../../../../../helpers/instruments';
 import { LanguagesTypes } from '../../../../../lang';
-import { GroupInstruments } from '../../../types';
+import { InstrumentsRecord } from '../../../../../helpers/instruments';
 import { FileSectionId } from './types';
 export default class GroupRepertoryFileSection {
     id: FileSectionId;
-    groupInstruments: GroupInstruments;
+    groupInstruments: InstrumentsRecord;
     private lang;
-    constructor(id: FileSectionId, instruments: GroupInstruments, lang?: LanguagesTypes);
+    constructor(id: FileSectionId, instruments: InstrumentsRecord, lang?: LanguagesTypes);
     get name(): string;
     getOrder(instrumentsIds: InstrumentId[]): number;
 }

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

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const orders_1 = require("../../../../../helpers/fileSections/orders");
 const lang_1 = require("../../../../../lang");
-const group_1 = __importDefault(require("../../../../Instrument/group"));
+const fromRecord_1 = __importDefault(require("../../../../Instrument/fromRecord"));
 const types_1 = require("./types");
 class GroupRepertoryFileSection {
     constructor(id, instruments, lang = lang_1.defaultLocale) {
@@ -16,7 +16,8 @@ class GroupRepertoryFileSection {
     get name() {
         return ((this.id === types_1.FileSectionIdReserved.All
             ? (0, lang_1.getTranslation)(`sections.all`, this.lang)
-            : new group_1.default(this.id, this.lang, this.groupInstruments).name) || this.id);
+            : new fromRecord_1.default(this.id, this.lang, this.groupInstruments).name) ||
+            this.id);
     }
     getOrder(instrumentsIds) {
         return (0, orders_1.getFileSectionsOrder)(instrumentsIds).indexOf(this.id) + 1 || Infinity;

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

@@ -3,3 +3,10 @@ export declare enum FileSectionIdReserved {
     All = "all"
 }
 export type FileSectionId = InstrumentId | FileSectionIdReserved;
+export type SectionRecord<T extends object = object> = Partial<Record<FileSectionId, T>>;
+export type SectionRecordByTags<T extends object = object> = SectionRecord<{
+    tag: string;
+} & T>;
+export type SectionArrayRecordByTags<T extends object = object> = SectionRecord<({
+    tag: string;
+} & T)[]>;

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

@@ -4,4 +4,4 @@ exports.FileSectionIdReserved = void 0;
 var FileSectionIdReserved;
 (function (FileSectionIdReserved) {
     FileSectionIdReserved["All"] = "all";
-})(FileSectionIdReserved = exports.FileSectionIdReserved || (exports.FileSectionIdReserved = {}));
+})(FileSectionIdReserved || (exports.FileSectionIdReserved = FileSectionIdReserved = {}));

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

@@ -1,7 +1,9 @@
 import { FileSectionId } from '../File/Section/types';
 import { GroupRepertoireFile } from '../types';
+import { RepertoireFileId } from '../../../Repertory/types';
+import { FileSectionItem } from './types';
 export default class ThemeFile {
-    id: string;
+    id: RepertoireFileId;
     private data;
     constructor(id: string, data: GroupRepertoireFile);
     get path(): string;
@@ -17,7 +19,7 @@ export default class ThemeFile {
     get sectionsList(): {
         sectionId: FileSectionId;
         tagsByFile: string[];
-        tagsByPages: Record<string, number[]>;
+        tagsByPages: FileSectionItem["tagsByPages"];
     }[];
     get sectionListByTags(): {
         sectionId: FileSectionId;

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = require("lodash");
 const objects_1 = require("../../../../helpers/objects");
-const types_1 = require("../../types");
+const types_1 = require("../../../../helpers/types");
 class ThemeFile {
     constructor(id, data) {
         this.id = id;
@@ -44,7 +44,7 @@ class ThemeFile {
             const sectionId = section.id;
             if (this.isFileByPages) {
                 const items = Object.entries(section.pages || {}).flatMap(([page, { tags }]) => this.isNoTag(tags)
-                    ? { page: Number(page), tag: types_1.GroupRepertoireTagReserved.NoTag }
+                    ? { page: Number(page), tag: types_1.RepertoireTagReserved.NoTag }
                     : tags.map((tag) => ({ page: Number(page), tag })));
                 const tagsByPages = (0, lodash_1.mapValues)((0, lodash_1.groupBy)(items, 'tag'), (v) => v.map((t) => t.page));
                 return {
@@ -55,7 +55,7 @@ class ThemeFile {
             }
             return {
                 sectionId,
-                tagsByFile: this.isNoTag(section.tags) ? [types_1.GroupRepertoireTagReserved.NoTag] : section.tags || [],
+                tagsByFile: this.isNoTag(section.tags) ? [types_1.RepertoireTagReserved.NoTag] : section.tags || [],
                 tagsByPages: {},
             };
         });
@@ -75,7 +75,7 @@ class ThemeFile {
         return this.data.identifyAt || null;
     }
     isNoTag(tags = []) {
-        return tags.length === 0 || tags.includes(types_1.GroupRepertoireTagReserved.NoTag);
+        return tags.length === 0 || tags.includes(types_1.RepertoireTagReserved.NoTag);
     }
 }
 exports.default = ThemeFile;

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

@@ -1,8 +1,7 @@
-/// <reference types="node" />
 import path from 'path';
 import Group from '../../';
+import { InstrumentsRecord } from '../../../../helpers/instruments';
 import { LanguagesTypes } from '../../../../lang';
-import { GroupInstruments } from '../../types';
 import FileSection from '../File/Section';
 import { FileSectionId } from '../File/Section/types';
 import { GroupRepertoireFilePathItem } from '../types';
@@ -10,8 +9,8 @@ export default class ThemeFilePath {
     sectionId: FileSectionId;
     protected data: GroupRepertoireFilePathItem;
     protected lang: LanguagesTypes;
-    protected instruments: GroupInstruments;
-    constructor(sectionId: FileSectionId, data: GroupRepertoireFilePathItem, instruments: GroupInstruments, lang?: LanguagesTypes);
+    protected instruments: InstrumentsRecord;
+    constructor(sectionId: FileSectionId, data: GroupRepertoireFilePathItem, instruments: InstrumentsRecord, lang?: LanguagesTypes);
     get path(): string;
     get parsedPath(): path.ParsedPath;
     get ext(): string;

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

@@ -1,10 +1,11 @@
 import { InstrumentId } from '../../../helpers/instruments';
+import { rateSteps } from '../../../helpers/rates';
 import { LanguagesTypes } from '../../../lang';
 import EventoTiny from '../../Evento/tiny';
 import { DocumentModel } from '../../Model';
 import Theme from '../../Repertory/basic';
 import { FileSectionId } from './File/Section/types';
-import { GroupRepertoireVisibility, GroupRepertoryData } from './types';
+import { GroupRepertoireVisibility, GroupRepertoryData, SourceComposition, AcquisitionStatus } from './types';
 export default class GroupRepertory extends Theme<GroupRepertoryData> {
     lang: LanguagesTypes;
     constructor(doc: DocumentModel, lang?: LanguagesTypes);
@@ -15,16 +16,20 @@ export default class GroupRepertory extends Theme<GroupRepertoryData> {
         id: string;
     })[];
     get sectionIds(): FileSectionId[];
-    get filesPath(): Partial<Record<FileSectionId, import("./types").GroupRepertoireFilePathItem[]>>;
-    get filesPathList(): {
+    get filesPath(): Partial<Record<FileSectionId, ({
+        tag: string;
+    } & {
         path: string;
+    })[]>>;
+    get filesPathList(): {
         tag: string;
+        path: string;
         sectionId: FileSectionId;
     }[];
     get visibility(): GroupRepertoireVisibility;
     get votes(): Record<string, import("./types").VoteValue>;
     get votesCount(): number;
-    get votesCountByValues(): Record<"love" | "like" | "neutral" | "dislike", number>;
+    get votesCountByValues(): Record<(typeof rateSteps)[number]["id"], number>;
     voteByUserId(userId: string): import("./types").VoteValue;
     get rating(): number;
     get events(): string[];
@@ -37,6 +42,9 @@ export default class GroupRepertory extends Theme<GroupRepertoryData> {
     get thumbnailURL(): string | null;
     get ownerId(): string;
     get lastEventDatetime(): FirebaseFirestore.Timestamp | null;
+    get sourceComposition(): SourceComposition | null;
+    get acquisitionStatus(): AcquisitionStatus | null;
+    get isFromComposer(): boolean;
     get claims(): Partial<Record<InstrumentId, Record<string, import("./types").GroupRepertoryClaimType>>>;
     get claimsList(): {
         createdAt: FirebaseFirestore.Timestamp;