Merge branch 'menu-command-api' of github.com:jonnytest1/workadventure into metadataScriptingApi

front/src/Phaser/Game/GameMap.ts

@@ -137,8 +137,8 @@ export class GameMap {
     public findPhaserLayer(layerName: string): TilemapLayer | undefined {
         let i = 0;
         let found = false;
-        while (!found && i<this.flatLayers.length) {
-            if (this.flatLayers[i].name === layerName) {
+        while (!found && i<this.phaserLayers.length) {
+            if (this.phaserLayers[i].layer.name === layerName) {
                 found = true;
             }
             else {

front/src/Phaser/Game/GameScene.ts

@@ -90,9 +90,11 @@ import { TextUtils } from "../Components/TextUtils";
 import { touchScreenManager } from "../../Touch/TouchScreenManager";
 import { PinchManager } from "../UserInput/PinchManager";
 import { joystickBaseImg, joystickBaseKey, joystickThumbImg, joystickThumbKey } from "../Components/MobileJoystick";
-import { waScaleManager } from "../Services/WaScaleManager";
+import { MenuScene, MenuSceneName } from '../Menu/MenuScene';
+import {waScaleManager } from "../Services/WaScaleManager";
 import type { HasPlayerMovedEvent } from '../../Api/Events/HasPlayerMovedEvent';
 
+
 export interface GameSceneInitInterface {
     initPosition: PointInterface | null,
     reconnecting: boolean
@@ -884,10 +886,12 @@ ${escapedMessage}
         }));
 
         this.iframeSubscriptionList.push(iframeListener.showLayerStream.subscribe((layerEvent)=>{
+            console.log('show');
             this.setLayerVisibility(layerEvent.name, true);
         }));
 
         this.iframeSubscriptionList.push(iframeListener.hideLayerStream.subscribe((layerEvent)=>{
+            console.log('hide');
             this.setLayerVisibility(layerEvent.name, false);
         }));
 
@@ -917,16 +921,12 @@ ${escapedMessage}
     }
 
     private setLayerVisibility(layerName: string, visible: boolean): void {
-        const phaserlayer = this.gameMap.findPhaserLayer(layerName);
-        if (phaserlayer === undefined) {
+        const phaserLayer = this.gameMap.findPhaserLayer(layerName);
+        if (phaserLayer === undefined) {
             console.warn('Could not find layer "' + layerName + '" when calling WA.hideLayer / WA.showLayer');
             return;
         }
-        if(phaserlayer.type != "tilelayer"){
-            console.warn('The layer "' + layerName + '" is not a tilelayer. It can not be show/hide');
-            return;
-        }
-        phaserlayer.setVisible(visible);
+        phaserLayer.setVisible(visible);
         this.dirty = true;
     }
 
@@ -941,6 +941,8 @@ ${escapedMessage}
         const {roomId, hash} = Room.getIdFromIdentifier(exitKey, this.MapUrlFile, this.instance);
         if (!roomId) throw new Error('Could not find the room from its exit key: '+exitKey);
         urlManager.pushStartLayerNameToUrl(hash);
+        const menuScene: MenuScene = this.scene.get(MenuSceneName) as MenuScene
+        menuScene.reset()
         if (roomId !== this.scene.key) {
             if (this.scene.get(roomId) === null) {
                 console.error("next room not loaded", exitKey);

front/src/Phaser/Menu/MenuScene.ts

@@ -10,6 +10,9 @@ import {GameConnexionTypes} from "../../Url/UrlManager";
 import {WarningContainer, warningContainerHtml, warningContainerKey} from "../Components/WarningContainer";
 import {worldFullWarningStream} from "../../Connexion/WorldFullWarningStream";
 import {menuIconVisible} from "../../Stores/MenuStore";
+import { HtmlUtils } from '../../WebRtc/HtmlUtils';
+import { iframeListener } from '../../Api/IframeListener';
+import { Subscription } from 'rxjs';
 
 export const MenuSceneName = 'MenuScene';
 const gameMenuKey = 'gameMenu';
@@ -36,12 +39,17 @@ export class MenuScene extends Phaser.Scene {
     private menuButton!: Phaser.GameObjects.DOMElement;
     private warningContainer: WarningContainer | null = null;
     private warningContainerTimeout: NodeJS.Timeout | null = null;
-
+    private subscriptions = new Subscription()
     constructor() {
         super({key: MenuSceneName});
 
         this.gameQualityValue = localUserStore.getGameQualityValue();
         this.videoQualityValue = localUserStore.getVideoQualityValue();
+
+        this.subscriptions.add(iframeListener.registerMenuCommandStream.subscribe(menuCommand => {
+            this.addMenuOption(menuCommand);
+
+        }))
     }
 
     preload () {
@@ -53,6 +61,13 @@ export class MenuScene extends Phaser.Scene {
         this.load.html(warningContainerKey, warningContainerHtml);
     }
 
+    reset() {
+        const addedMenuItems=[...this.menuElement.node.querySelectorAll(".fromApi")];
+        for(let index=addedMenuItems.length-1;index>=0;index--){
+            addedMenuItems[index].remove()
+        }
+    }
+
     create() {
         menuIconVisible.set(true);
         this.menuElement = this.add.dom(closedSideMenuX, 30).createFromCache(gameMenuKey);
@@ -268,13 +283,30 @@ export class MenuScene extends Phaser.Scene {
         });
     }
 
-    private onMenuClick(event:MouseEvent) {
-        if((event?.target as HTMLInputElement).classList.contains('not-button')){
+    public addMenuOption(menuText: string) {
+        const wrappingSection = document.createElement("section")
+        const excapedHtml = HtmlUtils.escapeHtml(menuText);
+        wrappingSection.innerHTML = `<button class="fromApi" id="${excapedHtml}">${excapedHtml}</button>`
+        const menuItemContainer = this.menuElement.node.querySelector("#gameMenu main");
+        if (menuItemContainer) {
+            menuItemContainer.querySelector(`#${excapedHtml}.fromApi`)?.remove()
+            menuItemContainer.insertBefore(wrappingSection, menuItemContainer.querySelector("#socialLinks"))
+        }
+    }
+
+    private onMenuClick(event: MouseEvent) {
+        const htmlMenuItem = (event?.target as HTMLInputElement);
+        if (htmlMenuItem.classList.contains('not-button')) {
             return;
         }
         event.preventDefault();
 
-        switch ((event?.target as HTMLInputElement).id) {
+        if (htmlMenuItem.classList.contains("fromApi")) {
+            iframeListener.sendMenuClickedEvent(htmlMenuItem.id)
+            return
+        }
+
+        switch (htmlMenuItem.id) {
             case 'changeNameButton':
                 this.closeSideMenu();
                 gameManager.leaveGame(this, LoginSceneName, new LoginScene());