@glissandoo/lib 1.79.0 → 1.81.0

package/helpers/appScenes.d.ts

@@ -56,7 +56,19 @@ export declare enum AppScenes {
     Group = "group",
     GroupPlayer = "groupPlayer",
     GroupsNavigation = "GroupsNavigation",
+    GroupTab = "GroupTab",
     GroupView = "GroupView",
+    GroupPlayerEditInstruments = "GroupPlayerEditInstruments",
+    GroupSettings = "GroupSettings",
+    GroupSettingsStack = "GroupSettingsStack",
+    GroupSettingsDisplayName = "GroupSettingsDisplayName",
+    GroupSettingsUsername = "GroupSettingsUsername",
+    GroupSettingsMusicStyle = "GroupSettingsMusicStyle",
+    GroupSettingsLocality = "GroupSettingsLocality",
+    GroupSettingsPhotoURL = "GroupSettingsPhotoURL",
+    GroupSettingsDelete = "GroupSettingsDelete",
+    GroupSettingsConfigShowAttendance = "GroupSettingsConfigShowAttendance",
+    GroupSettingsAddresses = "GroupSettingsAddresses",
     Join = "Join",
     JoinImageProfile = "AddProfileImage",
     JoinInstrument = "SelectGroupInstrument",
@@ -75,6 +87,7 @@ export declare enum AppScenes {
     ThemeView = "ThemeView",
     VisorImage = "visorImage",
     VisorPDF = "visorPDF",
+    VisorQR = "VisorQR",
     NewGroup = "NewGroup",
     NewGroupInfo = "NewGroupInfo",
     NewGroupMusicStyle = "NewGroupMusicStyle",

package/helpers/appScenes.js

@@ -60,7 +60,19 @@ var AppScenes;
     AppScenes["Group"] = "group";
     AppScenes["GroupPlayer"] = "groupPlayer";
     AppScenes["GroupsNavigation"] = "GroupsNavigation";
+    AppScenes["GroupTab"] = "GroupTab";
     AppScenes["GroupView"] = "GroupView";
+    AppScenes["GroupPlayerEditInstruments"] = "GroupPlayerEditInstruments";
+    AppScenes["GroupSettings"] = "GroupSettings";
+    AppScenes["GroupSettingsStack"] = "GroupSettingsStack";
+    AppScenes["GroupSettingsDisplayName"] = "GroupSettingsDisplayName";
+    AppScenes["GroupSettingsUsername"] = "GroupSettingsUsername";
+    AppScenes["GroupSettingsMusicStyle"] = "GroupSettingsMusicStyle";
+    AppScenes["GroupSettingsLocality"] = "GroupSettingsLocality";
+    AppScenes["GroupSettingsPhotoURL"] = "GroupSettingsPhotoURL";
+    AppScenes["GroupSettingsDelete"] = "GroupSettingsDelete";
+    AppScenes["GroupSettingsConfigShowAttendance"] = "GroupSettingsConfigShowAttendance";
+    AppScenes["GroupSettingsAddresses"] = "GroupSettingsAddresses";
     AppScenes["Join"] = "Join";
     AppScenes["JoinImageProfile"] = "AddProfileImage";
     AppScenes["JoinInstrument"] = "SelectGroupInstrument";
@@ -79,6 +91,7 @@ var AppScenes;
     AppScenes["ThemeView"] = "ThemeView";
     AppScenes["VisorImage"] = "visorImage";
     AppScenes["VisorPDF"] = "visorPDF";
+    AppScenes["VisorQR"] = "VisorQR";
     AppScenes["NewGroup"] = "NewGroup";
     AppScenes["NewGroupInfo"] = "NewGroupInfo";
     AppScenes["NewGroupMusicStyle"] = "NewGroupMusicStyle";

package/helpers/fileSections/orders.d.ts

@@ -1,7 +1,4 @@
-import { FileSectionId } from '../../models/Group/Repertory/File/Section/types';
-import { MusicStyleType } from '../musicStyles/index';
-export declare const orders: {
-    [k: string]: FileSectionId[];
-};
-export declare const getOrderByMusicStyle: (musicStyle: MusicStyleType) => FileSectionId[];
-export declare const orderByMusicStyle: <T>(list: T[], field: keyof T, musicStyle: MusicStyleType) => T[];
+import { FileSectionIdReserved } from '../../models/Group/Repertory/File/Section/types';
+import { InstrumentId } from '../instruments';
+export declare const getFileSectionsOrder: (instrumentsOrder: InstrumentId[]) => (InstrumentId | FileSectionIdReserved)[];
+export declare const orderByInstruments: <T>(list: T[], field: keyof T, instrumentsOrder: InstrumentId[]) => T[];

package/helpers/fileSections/orders.js

@@ -1,20 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.orderByMusicStyle = exports.getOrderByMusicStyle = exports.orders = void 0;
+exports.orderByInstruments = exports.getFileSectionsOrder = void 0;
 const types_1 = require("../../models/Group/Repertory/File/Section/types");
-const fileSections_1 = require("../fileSections");
-const orders_1 = require("../musicStyles/orders");
 const utils_1 = require("../utils");
-exports.orders = Object.fromEntries(Object.entries(orders_1.orders).map(([musicStyle, instruments]) => [
-    musicStyle,
-    [types_1.FileSectionIdReserved.All, ...instruments],
-]));
-const getOrderByMusicStyle = (musicStyle) => {
-    return musicStyle in exports.orders ? exports.orders[musicStyle] : fileSections_1.fileSectionIdList;
+const getFileSectionsOrder = (instrumentsOrder) => [
+    types_1.FileSectionIdReserved.All,
+    ...instrumentsOrder,
+];
+exports.getFileSectionsOrder = getFileSectionsOrder;
+const orderByInstruments = (list, field, instrumentsOrder) => {
+    const fileSectionsOrder = (0, exports.getFileSectionsOrder)(instrumentsOrder);
+    return (0, utils_1.sortByMatch)(list, field, fileSectionsOrder);
 };
-exports.getOrderByMusicStyle = getOrderByMusicStyle;
-const orderByMusicStyle = (list, field, musicStyle) => {
-    const order = (0, exports.getOrderByMusicStyle)(musicStyle);
-    return (0, utils_1.sortByMatch)(list, field, order);
-};
-exports.orderByMusicStyle = orderByMusicStyle;
+exports.orderByInstruments = orderByInstruments;

package/helpers/instruments/orders.d.ts

@@ -0,0 +1,2 @@
+import { InstrumentId } from '.';
+export declare const orderByInstruments: <T>(list: T[], field: keyof T, instrumentsOrder: InstrumentId[]) => T[];

package/helpers/instruments/orders.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.orderByInstruments = void 0;
+const utils_1 = require("../utils");
+const orderByInstruments = (list, field, instrumentsOrder) => {
+    return (0, utils_1.sortByMatch)(list, field, instrumentsOrder);
+};
+exports.orderByInstruments = orderByInstruments;

package/models/Evento/index.js

@@ -6,11 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const date_fns_1 = require("date-fns");
 const lodash_1 = require("lodash");
 const orders_1 = require("../../helpers/musicStyles/orders");
-const utils_1 = require("../../helpers/utils");
 const lang_1 = require("../../lang");
 const basic_1 = __importDefault(require("./Player/basic"));
 const promoter_1 = __importDefault(require("./promoter"));
 const types_1 = require("./types");
+const orders_2 = require("../../helpers/instruments/orders");
 class Evento extends promoter_1.default {
     constructor(doc, lang = lang_1.defaultLocale) {
         super(doc, lang);
@@ -141,7 +141,7 @@ class Evento extends promoter_1.default {
             }))
             : Object.entries(this.players).map(([id, player]) => new basic_1.default(this.id, { id, ...player }));
         const orderedPlayers = order
-            ? (0, utils_1.sortByMatch)(players, 'mainInstrument', order)
+            ? (0, orders_2.orderByInstruments)(players, 'mainInstrument', order)
             : (0, orders_1.orderByMusicStyle)(players, 'mainInstrument', this.promoterInfo.musicStyle);
         if (showAll)
             return orderedPlayers;

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

@@ -1,4 +1,4 @@
-import { MusicStyleType } from '../../../../../helpers/musicStyles';
+import { InstrumentId } from '../../../../../helpers/instruments';
 import { LanguagesTypes } from '../../../../../lang';
 import { FileSectionId } from './types';
 export default class GroupRepertoryFileSection {
@@ -6,5 +6,5 @@ export default class GroupRepertoryFileSection {
     private lang;
     constructor(id: FileSectionId, lang?: LanguagesTypes);
     get name(): string;
-    getOrder(musicStyle: MusicStyleType): number;
+    getOrder(instrumentsIds: InstrumentId[]): number;
 }

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

@@ -17,8 +17,8 @@ class GroupRepertoryFileSection {
             ? (0, lang_1.getTranslation)(`sections.all`, this.lang)
             : new Instrument_1.default(this.id, this.lang).name) || this.id);
     }
-    getOrder(musicStyle) {
-        return (0, orders_1.getOrderByMusicStyle)(musicStyle).indexOf(this.id) + 1 || Infinity;
+    getOrder(instrumentsIds) {
+        return (0, orders_1.getFileSectionsOrder)(instrumentsIds).indexOf(this.id) + 1 || Infinity;
     }
 }
 exports.default = GroupRepertoryFileSection;

package/models/Group/index.js

@@ -7,12 +7,12 @@ const date_fns_1 = require("date-fns");
 const lodash_1 = require("lodash");
 const collections_1 = require("../../helpers/collections");
 const glissandooAdmin_1 = require("../../helpers/glissandooAdmin");
-const orders_1 = require("../../helpers/musicStyles/orders");
 const objects_1 = require("../../helpers/objects");
 const plans_1 = require("../../helpers/plans");
 const lang_1 = require("../../lang");
 const basic_1 = __importDefault(require("./basic"));
 const types_1 = require("./types");
+const orders_1 = require("../../helpers/instruments/orders");
 class Group extends basic_1.default {
     constructor(doc, lang = lang_1.defaultLocale) {
         super(doc, lang);
@@ -97,7 +97,7 @@ class Group extends basic_1.default {
             ...this.players[playerId],
             id: playerId,
         }));
-        return (0, orders_1.orderByMusicStyle)(players, 'mainInstrument', this.musicStyle);
+        return (0, orders_1.orderByInstruments)(players, 'mainInstrument', this.instrumentsIds);
     }
     get isActive() {
         return this.exists && !this.deletedAt;

package/package.json

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