Merge "RIFT-15154: Config parameter map" into master_vca_intg

[osm/UI.git] / skyquake / plugins / composer / src / src / stores / ComposerAppStore.js

diff --git a/skyquake/plugins/composer/src/src/stores/ComposerAppStore.js b/skyquake/plugins/composer/src/src/stores/ComposerAppStore.js
index 4f27868..30352a5 100644 (file)
--- a/skyquake/plugins/composer/src/src/stores/ComposerAppStore.js
+++ b/skyquake/plugins/composer/src/src/stores/ComposerAppStore.js
@@ -209,6 +209,7 @@ class ComposerAppStore {
 
        editCatalogItem(item) {
                let self = this;
+               self.closeFileManagerSockets();
                if (item && item.uiState) {
                        item.uiState.isOpenForEdit = true;
                        if (item.uiState.type !== 'nsd') {
@@ -340,13 +341,21 @@ class ComposerAppStore {
                this.setState({showJSONViewer: false});
        }
 
-       toggleCanvasPanelTray() {
+       toggleCanvasPanelTray(event) {
                const layout = this.layout;
-               if (layout.bottom > 25) {
+               const attrMap = event.target.attributes;
+               let panelEvent = null;
+               for(let k in attrMap) {
+                       if(attrMap[k].name == 'data-event') {
+                               panelEvent = attrMap[k].nodeValue;
+                       }
+               }
+               if ((layout.bottom > 25) && ((panelEvent == this.displayedPanel) || panelEvent == 'arrow')) {
                        this.closeCanvasPanelTray();
                } else {
                        this.openCanvasPanelTray();
                }
+               this.setState({displayedPanel: panelEvent})
        }
 
        openCanvasPanelTray() {