@glissandoo/lib 1.1.12 → 1.3.0

package/functions/group.d.ts

@@ -1,4 +1,3 @@
-import { MusicStyleId } from '../helpers/musicStyles';
 import { GroupBasicData, GroupData, GroupStatus } from '../models/Group/types';
 export declare namespace GroupFbFunctionsTypes {
     interface PublishParams {
@@ -6,7 +5,7 @@ export declare namespace GroupFbFunctionsTypes {
         locality: string;
         latitude: number;
         longitude: number;
-        musicStyle: MusicStyleId;
+        musicStyle: string;
         photoURL: string;
     }
     interface PublishResult {

package/helpers/instruments/index.d.ts

@@ -2,6 +2,7 @@ import { LanguagesTypes } from '../../lang';
 import Instrument from '../../models/Instrument';
 export declare enum InstrumentId {
     Accordion = "accordion",
+    Bagpipes = "bagpipes",
     Banjo = "banjo",
     Baritone = "baritone",
     Bass = "bass",
@@ -9,6 +10,7 @@ export declare enum InstrumentId {
     BassDrum = "bass-drum",
     Bassoon = "bassoon",
     BassoonContra = "contraBass",
+    Castanets = "castanets",
     Cello = "cello",
     Choir = "choir",
     Clarinet = "clarinet",
@@ -45,6 +47,7 @@ export declare enum InstrumentId {
     SaxLow = "lowSaxophone",
     SaxSoprano = "sopranoSaxophone",
     SaxTenor = "tenorSax",
+    Silbote = "silbote",
     Singer = "singer",
     Soprano = "soprano",
     Tabal = "tabal",

package/helpers/instruments/index.js

@@ -8,6 +8,7 @@ const Instrument_1 = __importDefault(require("../../models/Instrument"));
 var InstrumentId;
 (function (InstrumentId) {
     InstrumentId["Accordion"] = "accordion";
+    InstrumentId["Bagpipes"] = "bagpipes";
     InstrumentId["Banjo"] = "banjo";
     InstrumentId["Baritone"] = "baritone";
     InstrumentId["Bass"] = "bass";
@@ -15,6 +16,7 @@ var InstrumentId;
     InstrumentId["BassDrum"] = "bass-drum";
     InstrumentId["Bassoon"] = "bassoon";
     InstrumentId["BassoonContra"] = "contraBass";
+    InstrumentId["Castanets"] = "castanets";
     InstrumentId["Cello"] = "cello";
     InstrumentId["Choir"] = "choir";
     InstrumentId["Clarinet"] = "clarinet";
@@ -51,6 +53,7 @@ var InstrumentId;
     InstrumentId["SaxLow"] = "lowSaxophone";
     InstrumentId["SaxSoprano"] = "sopranoSaxophone";
     InstrumentId["SaxTenor"] = "tenorSax";
+    InstrumentId["Silbote"] = "silbote";
     InstrumentId["Singer"] = "singer";
     InstrumentId["Soprano"] = "soprano";
     InstrumentId["Tabal"] = "tabal";
@@ -71,6 +74,7 @@ var InstrumentId;
 })(InstrumentId = exports.InstrumentId || (exports.InstrumentId = {}));
 exports.InstrumentIcons = {
     [InstrumentId.Accordion]: 'accordion',
+    [InstrumentId.Bagpipes]: 'bagpipes',
     [InstrumentId.Banjo]: 'banjo',
     [InstrumentId.Baritone]: 'choirMen',
     [InstrumentId.BassChoir]: 'choirMen',
@@ -78,6 +82,7 @@ exports.InstrumentIcons = {
     [InstrumentId.BassDrum]: 'drumBass',
     [InstrumentId.Bassoon]: 'bassoon',
     [InstrumentId.BassoonContra]: 'bassoon',
+    [InstrumentId.Castanets]: 'castanets',
     [InstrumentId.Cello]: 'cello',
     [InstrumentId.Choir]: 'choirMen',
     [InstrumentId.ClarinetBass]: 'clarinet',
@@ -114,6 +119,7 @@ exports.InstrumentIcons = {
     [InstrumentId.SaxLow]: 'saxophoneHigh',
     [InstrumentId.SaxSoprano]: 'saxophone',
     [InstrumentId.SaxTenor]: 'saxophone',
+    [InstrumentId.Silbote]: 'silbote',
     [InstrumentId.Singer]: 'microphone',
     [InstrumentId.Soprano]: 'choirWomen',
     [InstrumentId.Tabal]: 'tabal',
@@ -133,7 +139,6 @@ exports.InstrumentIcons = {
     [InstrumentId.Violin]: 'violin',
 };
 const hideInstruments = [
-    InstrumentId.Accordion,
     InstrumentId.Banjo,
     InstrumentId.Harmonica,
     InstrumentId.DJ,

package/helpers/musicStyles/index.d.ts

@@ -6,4 +6,5 @@ export declare enum MusicStyleId {
     Choir = "coro",
     Orchestra = "orquesta-sinfonica"
 }
+export declare type MusicStyleType = MusicStyleId | string;
 export declare const list: (lang: LanguagesTypes) => MusicStyle[];

package/helpers/musicStyles/orders.d.ts

@@ -1,4 +1,4 @@
 import { InstrumentId } from '../instruments';
-import { MusicStyleId } from './index';
-export declare const getInstrumentsOrderByMusicStyle: (musicStyle: MusicStyleId) => InstrumentId[];
-export declare const orderByMusicStyle: <T>(list: T[], field: string, musicStyle: MusicStyleId) => T[];
+import { MusicStyleType } from './index';
+export declare const getInstrumentsOrderByMusicStyle: (musicStyle: MusicStyleType) => InstrumentId[];
+export declare const orderByMusicStyle: <T>(list: T[], field: string, musicStyle: MusicStyleType) => T[];

package/helpers/musicStyles/orders.js

@@ -117,7 +117,9 @@ const orders = {
         instruments_1.InstrumentId.DrumSet,
     ],
 };
-const getInstrumentsOrderByMusicStyle = (musicStyle) => musicStyle in orders ? orders[musicStyle] : Object.values(instruments_1.InstrumentId);
+const getInstrumentsOrderByMusicStyle = (musicStyle) => {
+    return musicStyle in orders ? orders[musicStyle] : Object.values(instruments_1.InstrumentId);
+};
 exports.getInstrumentsOrderByMusicStyle = getInstrumentsOrderByMusicStyle;
 const orderByMusicStyle = (list, field, musicStyle) => {
     const order = exports.getInstrumentsOrderByMusicStyle(musicStyle);

package/lang/index.d.ts

@@ -1084,5 +1084,5 @@ export declare const getDateLang: (lang: LanguagesTypes) => {
         time: string;
     };
 };
-export declare const getTranslation: (key: string, lang: LanguagesTypes) => string;
+export declare const getTranslation: (key: string, lang: LanguagesTypes) => string | null;
 export default languageProvider;

package/lang/index.js

@@ -91,11 +91,7 @@ const getDateLang = (lang) => {
 };
 exports.getDateLang = getDateLang;
 const getTranslation = (key, lang) => {
-    const translation = get_1.default(languageProvider, [lang, 'messages', key]);
-    if (!translation) {
-        return '';
-    }
-    return translation;
+    return get_1.default(languageProvider, [lang, 'messages', key]) || null;
 };
 exports.getTranslation = getTranslation;
 exports.default = languageProvider;

package/models/Evento/basic.js

@@ -36,7 +36,7 @@ class EventoBasic extends Model_1.default {
         if (this.displayName) {
             return this.displayName;
         }
-        return lang_1.getTranslation(this.type, this.lang) || lang_1.getTranslation('event', this.lang);
+        return (lang_1.getTranslation(this.type, this.lang) || lang_1.getTranslation('event', this.lang) || 'event');
     }
     get type() {
         return this.data.type;

package/models/Evento/tiny.js

@@ -14,7 +14,7 @@ class EventoTiny {
         if (this.displayName) {
             return this.displayName;
         }
-        return lang_1.getTranslation(this.type, this.lang) || lang_1.getTranslation('event', this.lang);
+        return (lang_1.getTranslation(this.type, this.lang) || lang_1.getTranslation('event', this.lang) || this.type);
     }
     get type() {
         return this.data.type;

package/models/Group/basic.d.ts

@@ -12,6 +12,6 @@ export default class GroupBasic<D> extends Model<D & GroupBasicData> {
     get locality(): string;
     get location(): FirebaseFirestore.GeoPoint;
     get username(): string;
-    get musicStyle(): import("../../helpers/musicStyles").MusicStyleId;
+    get musicStyle(): string;
     get musicStyleString(): string;
 }

package/models/Group/basic.js

@@ -45,7 +45,8 @@ class GroupBasic extends Model_1.default {
         return this.data.musicStyle;
     }
     get musicStyleString() {
-        return lang_1.getTranslation(`musicStyles.${this.musicStyle}`, this.lang);
+        const translation = lang_1.getTranslation(`musicStyles.${this.musicStyle}`, this.lang);
+        return translation || this.musicStyle;
     }
 }
 exports.default = GroupBasic;

package/models/Group/types.d.ts

@@ -1,5 +1,5 @@
 import { DocumentReference, GeoPoint, Timestamp } from '@google-cloud/firestore';
-import { MusicStyleId } from '../../helpers/musicStyles';
+import { MusicStyleType } from '../../helpers/musicStyles';
 import { PlayerBasicData } from '../Player/types';
 export declare enum GroupConfig {
     IncludesMembersToEventsWhenJoined = "includesMembersToEventsWhenJoined"
@@ -39,7 +39,7 @@ export interface GroupTinyData {
 }
 export interface GroupBasicData extends GroupTinyData {
     username: string;
-    musicStyle: MusicStyleId;
+    musicStyle: MusicStyleType;
     locality: string;
     location: GeoPoint;
 }

package/models/Instrument/index.js

@@ -8,7 +8,8 @@ class Instrument {
         this.lang = lang;
     }
     get name() {
-        return lang_1.getTranslation(`instruments.${this.id}`, this.lang);
+        const translation = lang_1.getTranslation(`instruments.${this.id}`, this.lang);
+        return translation || this.id;
     }
     get icon() {
         return instruments_1.InstrumentIcons[this.id] || 'warning';

package/models/MusicStyle/index.d.ts

@@ -1,8 +1,8 @@
-import { MusicStyleId } from '../../helpers/musicStyles';
+import { MusicStyleType } from '../../helpers/musicStyles';
 import { LanguagesTypes } from '../../lang';
 export default class MusicStyle {
-    id: MusicStyleId;
+    id: MusicStyleType;
     private lang;
-    constructor(id: MusicStyleId, lang?: LanguagesTypes);
+    constructor(id: MusicStyleType, lang?: LanguagesTypes);
     get name(): string;
 }

package/models/MusicStyle/index.js

@@ -7,7 +7,8 @@ class MusicStyle {
         this.lang = lang;
     }
     get name() {
-        return lang_1.getTranslation(`musicStyles.${this.id}`, this.lang);
+        const translation = lang_1.getTranslation(`musicStyles.${this.id}`, this.lang);
+        return translation || this.id;
     }
 }
 exports.default = MusicStyle;

package/models/Player/basic.js

@@ -21,7 +21,8 @@ class PlayerBasic extends basic_1.default {
         return this.data.mainInstrument;
     }
     get instrument() {
-        return lang_1.getTranslation(`instruments.${this.mainInstrument}`, this.lang);
+        const translation = lang_1.getTranslation(`instruments.${this.mainInstrument}`, this.lang);
+        return translation || this.mainInstrument;
     }
 }
 exports.default = PlayerBasic;

package/models/User/Group/index.js

@@ -18,7 +18,8 @@ class UserGroup extends basic_1.default {
         return this.data.mainInstrument;
     }
     get instrument() {
-        return lang_1.getTranslation(`instruments.${this.mainInstrument}`, this.lang);
+        const translation = lang_1.getTranslation(`instruments.${this.mainInstrument}`, this.lang);
+        return translation || this.mainInstrument;
     }
     get instruments() {
         return this.data.instruments || [];

package/models/User/Notification/index.js

@@ -12,7 +12,9 @@ class Notification extends Model_1.default {
         super(doc);
         this.getTranslationByAction = (key) => {
             const translation = lang_1.getTranslation(`${this.action}.${key}`, this.lang);
-            return utils_1.replaceKeysNotification(translation, this.meta, this.lang);
+            return !translation
+                ? this.action
+                : utils_1.replaceKeysNotification(translation, this.meta, this.lang);
         };
         this.lang = lang;
     }

package/package.json

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