ru.coon 2.5.45 → 2.5.46

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+# Version 2.5.46, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a60918e34030d42d694153e8a86fa2c13c97e3a0)
+* Update src/util.js ([da9c30], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/da9c307688b60cfa198137929578f257e3d0645f))
+* HT-7570 Падает SelectionModelFeature ([df48e2], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/df48e24511eec0e5572d30984fbf6d24ec2e09cd))
+* HT-7570 Падает SelectionModelFeature ([09366e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/09366ee08c7700ba03ea46ebb5bc9461963ea9d3))
+* execute commands by alias ([8bbb51], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8bbb5103462c18d7e82050feaaa119188a96f5a9))
+* Update src/util.js ([d8230b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d8230b854d313a82eab2243bb264da9b239ebd6b))
+* update: CHANGELOG.md ([0ba408], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0ba4083336d6e3a3ea078bb20c8bf40e8c19c9c7))
+
 # Version 2.5.45, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f1e28ba95e77bbe4be40d19ea9fde58a74fbb645)
 * ## Fixes
 * <span style='color:red'> hot-fix: move EditorJs to coon from project</span> ([12daf8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/12daf8abb9dbaf48910870616b0e6d52f3b2bbfd))

package/package.json

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

package/src/SystemProperties.js

@@ -140,7 +140,7 @@ Ext.define('Coon.SystemProperties', {
                 return Promise.resolve(valuesMap.get(prop));
             } else {
                 return Coon.util.promisifyCmd(
-                    'Coon.command.GetPropertyFromConfigurationCommand',
+                    'command.GetPropertyFromConfigurationCommand',
                     prop
                 )
                     .then((data) => {

package/src/nav/editor/menu/NavMenuTreeController.js

@@ -88,7 +88,7 @@ Ext.define('Coon.nav.editor.menu.NavMenuTreeController', {
      */
 
     loadMenuData: function(record) {
-        Coon.util.promisifyCmd('Coon.report.command.GetDynamicReportDataCommand', 'MENU_ENTRY_LIST')
+        Coon.util.promisifyCmd('command.GetDynamicReportDataCommand', 'MENU_ENTRY_LIST')
             .then((data) => {
                 if (Ext.isArray(data.list)) {
                     const groupWorkspace = this.getGroupMenuByWorkspaceCd(data.list);

package/src/report/component/settings/ReportCustomPluginPropertiesGrid.js

@@ -25,7 +25,8 @@ Ext.define('Coon.report.component.settings.ReportCustomPluginPropertiesGrid', {
                         if (config.isDeleted || !config.xtype) {
                             return;
                         }
-                        const plugin = Ext.createByAlias('plugin.' + config.xtype, config.jsonProperties);
+                        const alias = (config.type === 'GRID_FEATURE' ? 'feature.' : 'plugin.') + config.xtype;
+                        const plugin = Ext.createByAlias(alias, config.jsonProperties);
                         if (!plugin) {
                             return;
                         }

package/src/report/component/settings/history/ReportFormHistoryPanelController.js

@@ -33,7 +33,7 @@ Ext.define('Coon.report.component.settings.history.ReportFormHistoryPanelControl
         if (id) {
             grid.mask();
             Coon.util.promisifyCmd(
-                'Coon.uielement.command.GetReportVersionListCommand',
+                'command.GetReportVersionListCommand',
                 id)
                 .then((rows) => {
                     grid.unmask();
@@ -60,7 +60,7 @@ Ext.define('Coon.report.component.settings.history.ReportFormHistoryPanelControl
         const mainInfoSqlPanel = this.lookupReference('mainInfoSqlPanel');
         ct.mask();
         Coon.util.promisifyCmd(
-            'Coon.uielement.command.GetReportRevisionCommand',
+            'command.GetReportRevisionCommand',
             record.get('reportId'),
             record.get('revisionId')
         )
@@ -192,12 +192,12 @@ Ext.define('Coon.report.component.settings.history.ReportFormHistoryPanelControl
         if (this.getViewModel().get('selectionCount') == 2) {
             promises = [
                 Coon.util.promisifyCmd(
-                    'Coon.uielement.command.GetReportRevisionCommand',
+                    'command.GetReportRevisionCommand',
                     selection[0].get('reportId'),
                     selection[0].get('revisionId')
                 ),
                 Coon.util.promisifyCmd(
-                    'Coon.uielement.command.GetReportRevisionCommand',
+                    'command.GetReportRevisionCommand',
                     selection[1].get('reportId'),
                     selection[1].get('revisionId')
                 )
@@ -211,7 +211,7 @@ Ext.define('Coon.report.component.settings.history.ReportFormHistoryPanelControl
             const mainData = this.getViewModel().get('report');
             promises = [
                 Coon.util.promisifyCmd(
-                    'Coon.uielement.command.GetReportRevisionCommand',
+                    'command.GetReportRevisionCommand',
                     selection[0].get('reportId'),
                     selection[0].get('revisionId')
                 )

package/src/report/component/settings/plugin/ReportFormPluginGridController.js

@@ -25,7 +25,7 @@ Ext.define('Coon.report.component.settings.plugin.ReportFormPluginGridController
 
     addHandler: function(xtype) {
         const defaultUiElementCd = `${xtype}_DEFAULTS`;
-        Coon.util.promisifyCmd('Coon.uielement.command.GetUIElementCommand', defaultUiElementCd)
+        Coon.util.promisifyCmd('command.GetUIElementCommand', defaultUiElementCd)
             .then(function(data) {
                 this.addNewPlugin(xtype, Ext.decode(data.propertyData, true), defaultUiElementCd);
             }.bind(this))

package/src/research/command/GetCoonChartStructure.js

@@ -54,7 +54,7 @@ Ext.define('Coon.research.command.GetCoonChartStructure', {
 
     async get(uiElementCd) {
         try {
-            const ui = await Coon.util.promisifyCmd('Coon.uielement.command.GetUIElementCommand', uiElementCd);
+            const ui = await Coon.util.promisifyCmd('command.GetUIElementCommand', uiElementCd);
             return this.decode(ui);
         } catch (ex) {
             Coon.log.error('[ERROR], GetCoonChartStructure: ', ex);

package/src/research/command/GetReportStructure.js

@@ -144,7 +144,7 @@ Ext.define('Coon.research.command.GetReportStructure', {
 
     async get(reportId) {
         try {
-            const cfg = await Coon.util.promisifyCmd('Coon.report.command.LoadDynamicReportCommand', reportId, true);
+            const cfg = await Coon.util.promisifyCmd('command.LoadDynamicReportCommand', reportId, true);
             return this.decode(cfg);
         } catch (ex) {
             Coon.log.error('[ERROR], GetReportStructure: ', ex);

package/src/research/command/GetUiStructure.js

@@ -114,7 +114,7 @@ Ext.define('Coon.research.command.GetUIStructure', {
 
     async get(uiElementCd, nullable) {
         try {
-            const ui = await Coon.util.promisifyCmd('Coon.uielement.command.GetUIElementCommand', uiElementCd, nullable);
+            const ui = await Coon.util.promisifyCmd('command.GetUIElementCommand', uiElementCd, nullable);
             return this.decode(ui);
         } catch (ex) {
             Coon.log.error('[ERROR], GetUIStructure: ', ex);

package/src/research/command/GetWidgetPanelStructure.js

@@ -66,7 +66,7 @@ Ext.define('Coon.research.command.GetWidgetPanelStructure', {
 
     async get(uiElementCd) {
         try {
-            const ui = await Coon.util.promisifyCmd('Coon.uielement.command.GetUIElementCommand', uiElementCd);
+            const ui = await Coon.util.promisifyCmd('command.GetUIElementCommand', uiElementCd);
             return this.decode(ui);
         } catch (ex) {
             Coon.log.error('[ERROR], GetWidgetPanelStructure: ', ex);

package/src/uielement/component/settings/version/UiCPVersionPanelController.js

@@ -28,7 +28,7 @@ Ext.define('Coon.uielement.component.settings.version.UiCPVersionPanelController
         if (id) {
             grid.mask();
             Coon.util.promisifyCmd(
-                'Coon.uielement.command.GetUIElementVersionListCommand',
+                'command.GetUIElementVersionListCommand',
                 id)
                 .then((rows) => {
                     grid.unmask();
@@ -53,7 +53,7 @@ Ext.define('Coon.uielement.component.settings.version.UiCPVersionPanelController
         const viewer = ct.down('UiAceEditor');
         ct.mask();
         Coon.util.promisifyCmd(
-            'Coon.uielement.command.GetUIElementRevisionCommand',
+            'command.GetUIElementRevisionCommand',
             record.get('uiElementId'),
             record.get('revisionId')
         )
@@ -179,12 +179,12 @@ Ext.define('Coon.uielement.component.settings.version.UiCPVersionPanelController
         if (this.getViewModel().get('selectionCount') == 2) {
             promises = [
                 Coon.util.promisifyCmd(
-                    'Coon.uielement.command.GetUIElementRevisionCommand',
+                    'command.GetUIElementRevisionCommand',
                     selection[0].get('uiElementId'),
                     selection[0].get('revisionId')
                 ),
                 Coon.util.promisifyCmd(
-                    'Coon.uielement.command.GetUIElementRevisionCommand',
+                    'command.GetUIElementRevisionCommand',
                     selection[1].get('uiElementId'),
                     selection[1].get('revisionId')
                 )
@@ -201,7 +201,7 @@ Ext.define('Coon.uielement.component.settings.version.UiCPVersionPanelController
             const UiCustomPanelEditor = this.getView().up('UiCustomPanelEditor');
             UiCustomPanelEditor.getController().beatify();
             Coon.util.promisifyCmd(
-                'Coon.uielement.command.GetUIElementRevisionCommand',
+                'command.GetUIElementRevisionCommand',
                 selection[0].get('uiElementId'),
                 selection[0].get('revisionId')
             ).then((versionData) => {

package/src/util.js

@@ -19,7 +19,14 @@ Ext.define('Coon.util', {
     },
 
     isCommandAlias(cmd) {
-        return typeof cmd === 'string' && typeof Ext.ClassManager.getByAlias(cmd) === 'function';
+        return typeof cmd === 'string' && cmd.startsWith('command.') && typeof Ext.ClassManager.getByAlias(cmd) === 'function';
+    },
+
+    isCommandClass(cmd) {
+        return typeof cmd === 'string' &&
+            Ext.ClassManager.classes[cmd] &&
+            Ext.ClassManager.classes[cmd].prototype &&
+            Ext.ClassManager.classes[cmd].prototype.isCommand;
     },
 
     promisifyCmd(cls, ...args) {
@@ -28,11 +35,21 @@ Ext.define('Coon.util', {
             alias = cls.command;
             cls.getParamsFromObject = true;
         }
+
         let command;
-        command = Coon.util.isCommand(alias) && alias;
-        command = Coon.util.isCommandAlias(alias) && Ext.create(alias, {processError: true})
+        if (this.isCommand(alias)) {
+            command = alias;
+        } else {
+            if (!Coon.util.isCommandAlias(alias)) {
+                if (!this.isCommandClass(alias)) {
+                    throw new Error(alias + ' is not a command class!');
+                }
+                Coon.log.debug(alias, 'is not a command alias');
+            }
+            command = Ext.create(alias, {processError: true});
+        }
         if (!command) {
-            throw new Error('promisifyCmd command in invalid!')
+            throw new Error('promisifyCmd command is invalid!');
         }
         return new Promise((resolve, reject) => {
             if (cls.getParamsFromObject) {

package/src/version.js

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

package/src/report/plugin/grid/ExportReportDataToFilePlugin.md

@@ -1,7 +0,0 @@
-**спецификация:**
-
-входные параметры:
-
-- exportFileFormat [xls/pdf]
-- allowUserSelectColumnsToUpload
-- addToSearchButton добавить в кнопку "поиск", в этом случае в качестве параметра отправляем текущие параметры из FilterPanel(useRawFilterParams: true)