Merge v1.1 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 156fe76..75276d2 100644 (file)
--- a/skyquake/plugins/composer/src/src/stores/ComposerAppStore.js
+++ b/skyquake/plugins/composer/src/src/stores/ComposerAppStore.js
@@ -125,7 +125,7 @@ class ComposerAppStore {
                this.files = false;
                this.filesState = {};
                this.downloadJobs = {};
-               this.displayedPanel = 'forwarding' //or parameter
+               this.containers = [];
                //End File  manager values
                this.bindListeners({
                        onResize: PanelResizeAction.RESIZE,
@@ -202,8 +202,17 @@ class ComposerAppStore {
        }
 
        updateItem(item) {
+               const self = this;
+               let containers = [];
+               let cpNumber = 0;
                if(!document.body.classList.contains('resizing')) {
-                       this.setState({item: _.cloneDeep(item)});
+                       containers = [item].reduce(DescriptorModelFactory.buildCatalogItemFactory(CatalogDataStore.getState().catalogs), []);
+
+                       containers.filter(d => DescriptorModelFactory.isConnectionPoint(d)).forEach(d => {
+                               d.cpNumber = ++cpNumber;
+                               containers.filter(d => DescriptorModelFactory.isVnfdConnectionPointRef(d)).filter(ref => ref.key === d.key).forEach(ref => ref.cpNumber = d.cpNumber);
+                       });
+                       this.setState({containers: containers, item: _.cloneDeep(item)});
                }
                SelectionManager.refreshOutline();
        }
@@ -342,23 +351,13 @@ class ComposerAppStore {
                this.setState({showJSONViewer: false});
        }
 
-       toggleCanvasPanelTray(event) {
+       toggleCanvasPanelTray() {
                const layout = this.layout;
-               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')) {
+               if (layout.bottom > 25) {
                        this.closeCanvasPanelTray();
                } else {
                        this.openCanvasPanelTray();
                }
-               if(panelEvent != 'arrow'){
-                       this.setState({displayedPanel: panelEvent})
-               }
        }
 
        openCanvasPanelTray() {