ru.coon 3.0.79 → 3.0.80

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+# Version 3.0.80, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3b43f1d4de9199df4725890955ab76c6e4491cdc)
+* refactoring OpenPanelPlugin ([67cd0c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/67cd0c0b004f89f7fb3607497a43f960ae4f0735))
+* update: CHANGELOG.md ([6e78bf], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6e78bf0dd1e0394557f2aba6b2fa56c1f022fc86))
+
 # Version 3.0.79, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/05cc0396686f91876a09be0e05bed80d6e3591a8)
 * ## Fixes
 * <span style='color:red'> HT-13828 upd</span> ([54a357], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/54a357933afc6b44569625816ad724d56053c012))

package/package.json

@@ -4,7 +4,7 @@
     "name": "ru.coon"
   },
   "description": "",
-  "version": "3.0.79",
+  "version": "3.0.80",
   "repository": {
     "type": "git",
     "url": "git+http://gitlab-dbr.sigma-it.local/dbr/ru.coon"

package/src/uielement/plugin/OpenPanelPlugin.js

@@ -21,17 +21,37 @@ Ext.define('Coon.uielement.plugin.OpenPanelPlugin', {
     },
 
     init: function(view) {
-        this.view = view;
-        if (view.getController()) {
-            this.getViewModel = () => view.getController().getViewModel();
-            view.getController()[this.handlerName] = Ext.bind(this.handler, this);
+        if (!this.handlerName) {
+            Coon.log.error('OpenPanelPlugin.init: handlerName is required');
+            return;
+        }
+        if (!this.getCmp().getViewModel()) {
+            Coon.log.error('OpenPanelPlugin.init: viewModel is required');
+            return;
+        }
+        if (!this.config.uiElementCd) {
+            Coon.log.error('OpenPanelPlugin.init: uiElementCd is required');
+            return;
+        }
+        this.cmpController = view.getController();
+        if (this.cmpController) {
+            this.getViewModel = () => this.cmpController.getViewModel();
+            this.cmpController[this.handlerName] = Ext.bind(this.handler, this);
+            this.getCmp().onDestroy(function() {
+                this.cmpController[this.handlerName] = undefined;
+            }, this);
         }
         this.initBindable();
     },
 
     getFromModel: function(value) {
-        if (Ext.isString(value) && value.startsWith('{')) {
-            value = this.view.getViewModel().get(value.substring(1, value.length - 1));
+        if (
+            Ext.isString(value) &&
+            value.length > 2 &&
+            value.startsWith('{') &&
+            value.endsWith('}')
+        ) {
+            value = this.getCmp().getViewModel().get(value.substring(1, value.length - 1));
         }
         return value;
     },
@@ -44,16 +64,25 @@ Ext.define('Coon.uielement.plugin.OpenPanelPlugin', {
         if (this.uiElementCd) {
             this.uiElementCd = this.getFromModel(this.uiElementCd);
             const command = Ext.create('command.GetUIElementCommand');
+            command.on('failure', function(error) {
+                Coon.log.error(`OpenPanelPlugin.handler: failed to get UIElement [${this.uiElementCd}]`, error);
+            });
             command.on('complete', function(UIElementBean) {
                 const elementNS = Coon.uielement.UIElementBeanFields;
                 const exists = Ext.ClassManager.getByAlias('widget.' + UIElementBean[elementNS.$xtype]);
-                if (exists === undefined) {
-                    Coon.log.log(UIElementBean[elementNS.$xtype] + ' does not exist');
+                if (!exists) {
+                    Coon.log.log(UIElementBean.xtype + ' does not exist');
                     return;
                 }
                 this.panelXType = UIElementBean[elementNS.$xtype];
-                this.defaultProperties = JSON5.parse(UIElementBean['propertyData']);
-                this.openPanel();
+                try {
+                    this.openPanel(
+                        JSON5.parse(UIElementBean['propertyData'])
+                    );
+                } catch (ex) {
+                    Coon.log.error('OpenPanelPlugin.handler: invalid propertyData JSON5', ex);
+                    return;
+                }
             }, this);
             command.execute(this.uiElementCd);
         } else {
@@ -135,15 +164,17 @@ Ext.define('Coon.uielement.plugin.OpenPanelPlugin', {
     },
 
     addPanelEventListeners(panel) {
+        if (!this.cmpController) {
+            return;
+        }
         Object.entries(
             this.panelEventListeners || {}
-        )
-            .forEach(([eventName, handlerName]) => {
-                const handler = this.view.getController()[handlerName];
-                if (typeof handler === 'function') {
-                    panel.on(eventName, handler, this.view);
-                }
-            });
+        ).forEach(([eventName, handlerName]) => {
+            const handler = this.cmpController[handlerName];
+            if (typeof handler === 'function') {
+                panel.on(eventName, handler, this.getCmp());
+            }
+        });
     },
 
     setInitArguments() {
@@ -153,10 +184,13 @@ Ext.define('Coon.uielement.plugin.OpenPanelPlugin', {
         }
     },
 
-    openPanel: function() {
-        const defaultProperties = this.defaultProperties || {};
-        const properties = Ext.apply(defaultProperties, this.properties);
+    openPanel: function(cmpProperties = {}) {
+        const properties = Ext.apply({}, cmpProperties, this.properties);
         this.panelXType = this.getFromModel(this.panelXType);
+        if (!Ext.ClassManager.getByAlias(`widget.${this.panelXType}`)) {
+            Coon.log.error(`OpenPanelPlugin.openPanel: panelXType [${this.panelXType}] does not exist`);
+            return;
+        }
         const panel = Ext.widget(this.panelXType, properties);
 
         this.setInitArguments();

package/src/version.js

@@ -1,4 +1,4 @@
 Ext.define('Coon.version', {
     singleton: true,
-    number: '3.0.79',
+    number: '3.0.80',
 });