@glissandoo/lib 1.53.7 → 1.53.8

package/lang/pt.json

@@ -46,6 +46,7 @@
     "instruments.agogo": "Agogô",
     "instruments.altoClarinet": "Clarinete Alto",
     "instruments.altoSaxophone": "Saxofone alto",
+    "instruments.auxiliar": "Assistente",
     "instruments.bagpipes": "Gaita de Foles",
     "instruments.bandurria": "Bandurria",
     "instruments.banjo": "Banjo",
@@ -77,6 +78,7 @@
     "instruments.englishHorn": "Corne Inglês",
     "instruments.euphonium": "Eufónio",
     "instruments.flabiol": "Flabiol",
+    "instruments.flagBearer": "Porta-estandarte",
     "instruments.flugelhorn": "Fliscorne",
     "instruments.flute": "Flauta",
     "instruments.frenchHorn": "Trompa",
@@ -275,8 +277,8 @@
     "repertoireTags.4": "4º",
     "repertoireTags.principal": "Principal",
     "sections.all": "Todos",
-    "theme.claim.new.text": "{string:user.0.displayName} uma revisão em {instrument:extra.instrumentId} para “{string:extra.title}”",
+    "theme.claim.new.text": "{string:user.0.displayName} uma revisão em {instrument:extra.[instrumentId,customInstrumentName]} para “{string:extra.title}”",
     "theme.claim.new.title": "Uma revisão da partitura foi enviada por um músico",
-    "theme.claim.update.text": "A partitura {instrument:extra.instrumentId} da obra “{string:extra.title}” foi adicionada.",
-    "theme.claim.update.title": "Nova partitura {instrument:extra.instrumentId} foi adicionada"
+    "theme.claim.update.text": "A partitura {instrument:extra.[instrumentId,customInstrumentName]} da obra “{string:extra.title}” foi adicionada.",
+    "theme.claim.update.title": "Nova partitura {instrument:extra.[instrumentId,customInstrumentName]} foi adicionada"
 }

package/models/Group/index.d.ts

@@ -66,8 +66,13 @@ export default class Group extends GroupBasic<GroupData> {
     get trialEndAt(): Date;
     get glissandooAdminUrl(): string;
     get createdOn(): import("./types").GroupCreatedOn;
-    get instruments(): Partial<Record<import("../../helpers/instruments").InstrumentId, import("./types").GroupInstrument>>;
-    get instrumentsList(): import("../../helpers/instruments").InstrumentId[];
+    get instruments(): Partial<Record<import("../../helpers/instruments").DefaultInstrumentId, import("./types").DefaultGroupInstrument>> & Record<`customInstrument-${string}`, import("./types").CustomGroupInstrument>;
+    get instrumentsList(): Pick<(import("./types").DefaultGroupInstrument & {
+        id: import("../../helpers/instruments").DefaultInstrumentId | `customInstrument-${string}`;
+    }) | (import("./types").CustomGroupInstrument & {
+        id: import("../../helpers/instruments").DefaultInstrumentId | `customInstrument-${string}`;
+    }), "id">[];
+    get instrumentsIds(): (import("../../helpers/instruments").DefaultInstrumentId | `customInstrument-${string}`)[];
     get visitedDashboardAt(): Record<string, import("../../types/firestore").Timestamp>;
     get onboardingMessages(): import("./types").GroupOnboardingMessage[];
 }

package/models/Group/index.js

@@ -189,7 +189,10 @@ class Group extends basic_1.default {
         return this.data.instruments || {};
     }
     get instrumentsList() {
-        return (0, objects_1.orderedMapToArray)(this.instruments).map(({ id }) => id);
+        return (0, objects_1.orderedMapToArray)(this.instruments);
+    }
+    get instrumentsIds() {
+        return this.instrumentsList.map(({ id }) => id);
     }
     get visitedDashboardAt() {
         return this.data.visitedDashboardAt || null;

package/models/Group/types.d.ts

@@ -1,4 +1,4 @@
-import { InstrumentId } from '../../helpers/instruments';
+import { CustomInstrumentId, DefaultInstrumentId } from '../../helpers/instruments';
 import { MusicStyleType } from '../../helpers/musicStyles';
 import { PlansGroup } from '../../helpers/plans';
 import { DocumentReference, GeoPoint, Timestamp } from '../../types/firestore';
@@ -91,12 +91,21 @@ export interface GroupRepertoireTag {
 export interface AGroupRepertoireTag extends GroupRepertoireTag {
     id: string;
 }
-export interface GroupInstrument {
+export interface DefaultGroupInstrument {
     order: number;
 }
-export interface AGroupInstrument extends GroupInstrument {
-    id: InstrumentId;
+export interface CustomGroupInstrument extends DefaultGroupInstrument {
+    icon: string;
+    name: string;
+    basedOnInstrument: DefaultInstrumentId;
 }
+export interface AGroupDefaultInstrument extends DefaultGroupInstrument {
+    id: DefaultInstrumentId;
+}
+export interface AGroupCustomInstrument extends CustomGroupInstrument {
+    id: CustomInstrumentId;
+}
+export type AGroupInstrument = AGroupDefaultInstrument | AGroupCustomInstrument;
 export interface GroupData extends GroupBasicData {
     playerIds: string[];
     players: Record<string, PlayerBasicData>;
@@ -124,7 +133,7 @@ export interface GroupData extends GroupBasicData {
     eventCount: Record<EventType, number>;
     communicationCount: number;
     country: string;
-    instruments: Partial<Record<InstrumentId, GroupInstrument>>;
+    instruments: Partial<Record<DefaultInstrumentId, DefaultGroupInstrument>> & Record<CustomInstrumentId, CustomGroupInstrument>;
     metadata: Record<string, string>;
     firstAnswerAt: Timestamp | null;
     repertoireTags: Record<string, GroupRepertoireTag>;

package/models/Instrument/group.d.ts

@@ -0,0 +1,12 @@
+import Instrument from '.';
+import { CustomInstrumentId, InstrumentId } from '../../helpers/instruments';
+import { LanguagesTypes } from '../../lang';
+import { GroupData } from '../Group/types';
+export default class GroupInstrument extends Instrument {
+    private groupInstruments;
+    constructor(id: InstrumentId, lang: LanguagesTypes | undefined, groupInstruments: GroupData['instruments']);
+    static isCustom(instrumentId: InstrumentId): instrumentId is CustomInstrumentId;
+    get isCustomInstrument(): boolean;
+    get name(): string;
+    get icon(): string;
+}

package/models/Instrument/group.js

@@ -0,0 +1,30 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const _1 = __importDefault(require("."));
+const lang_1 = require("../../lang");
+class GroupInstrument extends _1.default {
+    constructor(id, lang = lang_1.defaultLocale, groupInstruments) {
+        super(id, lang);
+        this.groupInstruments = groupInstruments;
+    }
+    static isCustom(instrumentId) {
+        return instrumentId.startsWith('customInstrument-');
+    }
+    get isCustomInstrument() {
+        return GroupInstrument.isCustom(this.id);
+    }
+    get name() {
+        return GroupInstrument.isCustom(this.id) && this.id in this.groupInstruments
+            ? this.groupInstruments[this.id].name
+            : super.name;
+    }
+    get icon() {
+        return GroupInstrument.isCustom(this.id) && this.id in this.groupInstruments
+            ? this.groupInstruments[this.id].icon
+            : super.icon;
+    }
+}
+exports.default = GroupInstrument;

package/package.json

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