ru.coon 2.7.32 → 2.7.34

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (34) hide show
  1. package/CHANGELOG.md +47 -0
  2. package/package.json +1 -1
  3. package/src/common/panel/MainUploadPanel.js +16 -1
  4. package/src/nav/AppNavigationMenu.js +2 -2
  5. package/src/nav/AppNavigationMenu.scss +11 -5
  6. package/src/nav/menu/WorkspaceMenuView.js +7 -0
  7. package/src/report/component/EXTJSReportUploadForm.js +1 -0
  8. package/src/report/component/ReportPanel.js +2 -0
  9. package/src/report/plugin/configPanel/CopyRowsFromGridConfigPanel.js +1 -0
  10. package/src/security/component/RoleAccessPanel.js +5 -1
  11. package/src/security/component/ui/UiCPRestrictionEditor.js +31 -8
  12. package/src/security/component/ui/UiCPRestrictionEditorController.js +53 -18
  13. package/src/security/component/url/UrlRestrictionEditor.js +55 -0
  14. package/src/security/component/url/UrlRestrictionEditorController.js +5 -0
  15. package/src/security/securitySettingComponent/RoleEditPanel.js +83 -0
  16. package/src/security/securitySettingComponent/RoleEditPanel.scss +17 -0
  17. package/src/security/securitySettingComponent/RoleEditPanelController.js +211 -0
  18. package/src/security/securitySettingComponent/RoleListPanel.js +35 -0
  19. package/src/security/securitySettingComponent/RoleListPanelController.js +240 -0
  20. package/src/security/securitySettingComponent/command/GitOpaDownloadCommand.js +33 -0
  21. package/src/security/securitySettingComponent/menu/RoleEditMenuController.js +171 -0
  22. package/src/security/securitySettingComponent/menu/RoleEditMenuPanel.js +72 -0
  23. package/src/security/securitySettingComponent/report/RoleEditReportController.js +111 -0
  24. package/src/security/securitySettingComponent/report/RoleEditReportPanel.js +88 -0
  25. package/src/security/securitySettingComponent/uiCP/RoleEditUiCPController.js +139 -0
  26. package/src/security/securitySettingComponent/uiCP/RoleEditUiCPPanel.js +88 -0
  27. package/src/security/securitySettingComponent/url/RoleEditUrlController.js +40 -0
  28. package/src/security/securitySettingComponent/url/RoleEditUrlPanel.js +53 -0
  29. package/src/security/securitySettingComponent/user/RoleEditUserController.js +61 -0
  30. package/src/security/securitySettingComponent/user/RoleEditUserPanel.js +49 -0
  31. package/src/uielement/component/EXTJSUiPanelUploadForm.js +1 -0
  32. package/src/uielement/component/formchips/FilterConditionToolbar.js +3 -6
  33. package/src/uielement/component/formchips/FilterConditionToolbarController.js +10 -1
  34. package/src/version.js +1 -1
package/CHANGELOG.md CHANGED
@@ -1,3 +1,24 @@
1
+ # Version 2.7.34, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9e609fb8d3d88af639747d63fc85cbb46440ac6d)
2
+ * ## Features
3
+ * <span style='color:green'>feat: HT-9095: move expander left, add padding-right (expander under text), update layout on item collapse</span> ([d246e1], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d246e1c110e98959b25e8f4a976104ebb2ea8921))
4
+
5
+ * ## Fixes
6
+ * <span style='color:red'> HT-8148 CopyRowsFromGrid: exportAllRows default false</span> ([9be836], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9be8360fbc00aca06777895a34279463cf1a3696))
7
+ * <span style='color:red'> HT-9046 Ошибки на "чипах" репортов</span> ([baacd7], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/baacd776084b5e89a5df8e94c323510df291f910))
8
+
9
+ * HT-8438 feat: Переименование кнопки Отмена на Закрыть в MainUploadPanel. ([d7fdaa], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d7fdaa103a8cd181d8ee483a137c81e900a846f0))
10
+ * update: CHANGELOG.md ([f4992d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f4992d42314d91d12402df364984b72e14beee51))
11
+
12
+ # Version 2.7.33, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e47cc0c267a947daeb5624b8f174b5a8a8e22375)
13
+ * ## Features
14
+ * <span style='color:green'>feat: HT-6760 компонент для управления правами кастомных панелей</span> ([4f43e8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4f43e856c4a041b681460a74d7819678a71c85f2))
15
+ * <span style='color:green'>feat: HT-6760 компонент для управления правами кастомных панелей</span> ([5d0074], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5d0074b69a22905e54922dd96b008f0b252a8099))
16
+
17
+ * ## Fixes
18
+ * <span style='color:red'> add requiredAuth property support for MainUploadPanel, BFL-13506</span> ([cf56d8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cf56d8856ffd43090110911e176e3ca37ee7c050))
19
+
20
+ * update: CHANGELOG.md ([80aedf], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/80aedfb364555f00fb354d3cd444718756546ffe))
21
+
1
22
  # Version 2.7.32, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/40925f0ca399d6d5da42511e20b8c7fa10acadaf)
2
23
  * ## Features
3
24
  * <span style='color:green'>feat: HT-8492: create new type field</span> ([0657da], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0657da1e4ba8e54a47eaca571cf71596c8107c7c))
@@ -15,6 +36,9 @@
15
36
  * update: CHANGELOG.md ([935b5a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/935b5a73025d3ff9cdf61188e1b3fb1f754b84da))
16
37
 
17
38
  # Version 2.7.30, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a72ce199d2d79b7a5dcb52cc81cd68e46f34829a)
39
+ * ## Features
40
+ * <span style='color:green'>feat: HT-6760 компонент для управления правами кастомных панелей</span> ([97cda5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/97cda502cccce84bd63fd23a9f4b82fb42caa65b))
41
+
18
42
  * ## Fixes
19
43
  * <span style='color:red'> HT-8422: set filter panel height on afterlayout</span> ([d65a92], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d65a9277c2fcedaba912ff40ba7a912049bdd7f7))
20
44
  * <span style='color:red'> HT-8131 add universal button for collapse/expand report lines in a hierarchy</span> ([0a7edf], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0a7edf4357213fd7872ecb361ce47261b3102b4c))
@@ -38,6 +62,9 @@
38
62
  * update: CHANGELOG.md ([6b1c8b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6b1c8b9cfb4519d95713d70996f2d8f816bcaea4))
39
63
 
40
64
  # Version 2.7.27, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c59dc7400f5e4ee4f7bbfcd42f4aa371d9b2e68f)
65
+ * ## Features
66
+ * <span style='color:green'>feat: HT-6760 компонент для управления правами кастомных панелей</span> ([1428a9], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1428a9b3baed2f41dcf5b454f5b13959700f11d6))
67
+
41
68
  * ## Fixes
42
69
  * <span style='color:red'> HT-8707 checking the component is rendered</span> ([d1fd00], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d1fd008a47ca9a0f2d7a2404c1b21e1d7aa8b2a7))
43
70
  * <span style='color:red'> Запрещен ввод значений в характеристики типа FKV, отсутствующих в списке выбора. Closes HT-8762.</span> ([dece4f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/dece4f2ce361c8c54d11a54dc469099698338c46))
@@ -145,7 +172,9 @@
145
172
 
146
173
  # Version 2.7.15, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1e27a6d56071c26951813a36d45daf805a6f750d)
147
174
  * ## Features
175
+ * <span style='color:green'>feat: HT-6760 компонент для управления правами кастомных панелей</span> ([849569], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/849569ae71cf1996b287c33df5c037d2257b1029))
148
176
  * <span style='color:green'>feat: HT-8131 add universal button for collapse/expand report lines in a hierarchy</span> ([9e7242], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9e7242dadb2907ac135dd9e6bd2bf7309ef5996f))
177
+ * <span style='color:green'>feat: HT-6760 компонент для управления правами кастомных панелей</span> ([ca384d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ca384dc967e98e9366bdbe3afbed6558c45b9678))
149
178
  * <span style='color:green'>feat: Вывод сообщения об ошибках при инициализации плагинов отчета. Closes HT-8531.</span> ([a35d09], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a35d09c39f20263dd032f6accc9d175a8241e111))
150
179
  * <span style='color:green'>feat: Добавлено логирование ошибки, при возврате отчетом более одной строки. Related to HT-8223.</span> ([34491c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/34491c4ee3f5dc6d26f5c04652796d563c9fb6c4))
151
180
  * <span style='color:green'>feat: HT-8131 add universal button for collapse/expand report lines in a hierarchy</span> ([4da24d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4da24d2084419d57871be03bda1d714bc3e2cc7b))
@@ -383,6 +412,9 @@
383
412
  * update: CHANGELOG.md ([471cb3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/471cb32a135f4ce1e9ed5c7e03ea5ab143b84893))
384
413
 
385
414
  # Version 2.6.12, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3fbd123cd431a5a382b5929913df42fabddebea0)
415
+ * ## Features
416
+ * <span style='color:green'>feat: HT-6760 компонент для управления правами кастомных панелей</span> ([d2d66d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d2d66de15b77e01bf96a49ade94b7a6ca65cde1e))
417
+
386
418
  * ## Fixes
387
419
  * <span style='color:red'>BFL-11558 hot fix</span> ([66e78d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/66e78dfde422a1b5938be7d43b607eadac52bd04))
388
420
 
@@ -423,6 +455,7 @@ This reverts commit ec83613d1dd2673b448c9fabee62287e9160f6bf. ([e6e94a], [link](
423
455
  # Version 2.6.7, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6802942bc71e923767f61cfc703ea6385d7f932e)
424
456
  * ## Features
425
457
  * <span style='color:green'>feat: HT-8060: if we have grid AutoSize option true and have saved grid columns config set it in false</span> ([2c6e2d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2c6e2d28a88cfbd383ea963e35cd7289e8412c49))
458
+ * <span style='color:green'>feat: HT-6760 компонент для управления правами кастомных панелей</span> ([5f91bd], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5f91bd8847c6ccd524f09b19789b5ac08f7345c6))
426
459
 
427
460
  * ## Fixes
428
461
  * <span style='color:red'> HT-7489 убрана лишняя зависимость mode-sql</span> ([f8ae6d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f8ae6d20e8285ddeaaa9063f1e9f5524ed0832d5))
@@ -485,6 +518,7 @@ This reverts commit ec83613d1dd2673b448c9fabee62287e9160f6bf. ([e6e94a], [link](
485
518
 
486
519
  # Version 2.6.0, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/78a28499d4ba7dc466ba5ff5a4b815d191c349bf)
487
520
  * ## Features
521
+ * <span style='color:green'>feat: HT-6760 компонент для управления правами кастомных панелей</span> ([0ce0c9], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0ce0c9c6e57c3dcf2c6f195abc3d65a71ddff478))
488
522
  * <span style='color:green'>feat: HT-7986: chars editor interface upgrade</span> ([9af20a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9af20aa30d2b1fa494994e0cf7d84b26b19604e0))
489
523
  * <span style='color:green'>feat: HT-7986: chars editor interface upgrade</span> ([ccf1d4], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ccf1d42831f67ca298e2598422430da06b01ab49))
490
524
 
@@ -731,6 +765,10 @@ fix ExecuteCommandPlugin - remove reject on failure if command hasnt erorHandler
731
765
  * update: CHANGELOG.md ([0ba408], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0ba4083336d6e3a3ea078bb20c8bf40e8c19c9c7))
732
766
 
733
767
  # Version 2.5.45, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f1e28ba95e77bbe4be40d19ea9fde58a74fbb645)
768
+ * ## Features
769
+ * <span style='color:green'>feat: HT-6760 компонент для управления правами кастомных панелей</span> ([c8c4cb], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c8c4cb9c90246e73808061371e145bc9ce1412ec))
770
+ * <span style='color:green'>feat: HT-6760 компонент для управления правами кастомных панелей</span> ([b145cb], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b145cb9ef0a36d48ca04c0910152c66ec8ed03cd))
771
+
734
772
  * ## Fixes
735
773
  * <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))
736
774
 
@@ -861,6 +899,7 @@ fix ExecuteCommandPlugin - remove reject on failure if command hasnt erorHandler
861
899
 
862
900
  # Version 2.5.31, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/51eafa59b0b64087dacaafd66b754c04ada7e027)
863
901
  * ## Features
902
+ * <span style='color:green'>feat: HT-6760 компонент для управления правами кастомных панелей</span> ([e24426], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e24426d69b5746beb618716ea408a52859608700))
864
903
  * <span style='color:green'>feat: HT-6956 add SQL beautifier</span> ([a3968b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a3968bb98d16fbc294d355930b53f5e707d52ad7))
865
904
  * <span style='color:green'>feat: BFL-8598 добавлена возможность скрытия легенды обязательных полей</span> ([1ac031], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1ac031674684a282c769ea74bc9bd1b0f04484bc))
866
905
  * <span style='color:green'>feat: HT-4550 changed to Ext.ajax</span> ([3a4af5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3a4af588bb24b481c427749ca8d658edc9d42a57))
@@ -929,6 +968,7 @@ fix ExecuteCommandPlugin - remove reject on failure if command hasnt erorHandler
929
968
  * ## Features
930
969
  * <span style='color:green'>feat: HT-6865 доработка сервиса начитывания репортов</span> ([d5204c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d5204c0e6470e9f4858b800da4bfb779bd9d3d6a))
931
970
  * <span style='color:green'>feat: BFL-8383 механизм сравнения конфигураций кастомных панелей</span> ([4514f1], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4514f131b714942a8314d772726ce33989d334fa))
971
+ * <span style='color:green'>feat: HT-6760 компонент для управления правами кастомных панелей</span> ([92ed5c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/92ed5c448ea3ef1a8ae37951b12139cd6d148612))
932
972
 
933
973
  * ## Fixes
934
974
  * <span style='color:red'> HT-4550 fix excel file download</span> ([b81e8d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b81e8d28b762e38362624149ddaaf9d9b5daa272))
@@ -987,6 +1027,7 @@ isolate lastValue from native ComboBox logic</span> ([57078e], [link](http://git
987
1027
  # Version 2.5.19, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/60dafd3ee4e54456992b474b81201242521c3991)
988
1028
  * ## Features
989
1029
  * <span style='color:green'>feat: HT-4550 configPanel changes</span> ([7d3ac0], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7d3ac0a6a4a1124c3b1a240e26a4096635573e6a))
1030
+ * <span style='color:green'>feat: BFL-5531 компонент для управления правами кастомных панелей</span> ([7c6c22], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7c6c224a30e08ecafea5f513badfa7c8d25930f6))
990
1031
 
991
1032
  * ## Fixes
992
1033
  * <span style='color:red'>fix HT-7070
@@ -1020,6 +1061,7 @@ fix ReportPropertiesPanelController</span> ([e2b928], [link](http://gitlab-dbr.s
1020
1061
  * <span style='color:green'>feat: TR-67140 разработка универсальной компонент-формы для обработки статуса требуемых полей</span> ([20e76d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/20e76d097db4ddf9120ddc56f86b6470ab7335ca))
1021
1062
  * <span style='color:green'>feat: HT-4550 add localization field property</span> ([b3bd46], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b3bd466dd68c893fefae86ae7e16877aedb861ba))
1022
1063
  * <span style='color:green'>feat BFL-7734: передача headers в ASyncBaseCommand</span> ([ed1202], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ed1202d1f90cb9c73bd858598a28f63b519642c7))
1064
+ * <span style='color:green'>feat: BFL-5531 компонент для управления правами кастомных панелей</span> ([fa5ce6], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/fa5ce69287e739ef6bf91a8220c5605284ca7b4a))
1023
1065
 
1024
1066
  * ## Fixes
1025
1067
  * <span style='color:red'>fix ReportPanel saving
@@ -1223,12 +1265,16 @@ ReportSqlPreviewPanel - add UiAceEditor as sql preview field(readOnly) with sql
1223
1265
  * update: CHANGELOG.md ([4f30ec], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4f30ec6b33ae95a9ab578bffca7c6dbfb63d564b))
1224
1266
 
1225
1267
  # Version 2.4.42, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3ee58968d5317eada421e0dc7305015761e4bcbe)
1268
+ * ## Features
1269
+ * <span style='color:green'>feat: BFL-5531 компонент для управления правами кастомных панелей</span> ([6037c3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6037c35a23354b1cfc0cc5376fe2db6d2080fbb7))
1270
+
1226
1271
  * add SelectIconClassPanel to ru.coon ([409ee0], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/409ee069080f9f1bbe08727b850e267707ebdc54))
1227
1272
  * update: CHANGELOG.md ([cab0be], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cab0beabbbe9e1ada4ccea28763253c0e5feb839))
1228
1273
 
1229
1274
  # Version 2.4.41, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/95627ef5983aa5f2fd5eaf8bd4b808ba169a48fb)
1230
1275
  * ## Features
1231
1276
  * <span style='color:green'>feat: HT-4550 Приведение boolean полей к string при экспорте</span> ([1765f1], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1765f1c1959e585ee724021ceaa840b0fb3c2485))
1277
+ * <span style='color:green'>feat: BFL-5531 компонент для управления правами кастомных панелей</span> ([630150], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6301506c6df9c577e12722c902b84a9abeaba946))
1232
1278
  * <span style='color:green'>feat: HT-6314 Изменение отображения CharacteristicGridCopyPlugin</span> ([5fa321], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5fa3214c6e395bc66804a7acc7fe062780da1dfd))
1233
1279
 
1234
1280
  * add no-console rule to eslint rules ([aa512d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/aa512db0fb0165af39481718d010c9748c5cebb5))
@@ -1688,6 +1734,7 @@ This reverts commit 0797f80cda34caf39cc4c5eb0a9ddd2c53ad1d7f. ([9db6cd], [link](
1688
1734
 
1689
1735
  # Version 2.3.2, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1fad7ad35b2e8126da6b48f87d21813d2d795fd1)
1690
1736
  * ## Features
1737
+ * <span style='color:green'>feat: BFL-5531компонент для управления правами кастомных панелей</span> ([4c7521], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4c752166453a9c71330e6a7f1511ed7a5828683c))
1691
1738
  * <span style='color:green'>feat: TR-63829: add Characteristic editing</span> ([58654a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/58654ab2a56f601b263d92dd5dc7a7514d7bd033))
1692
1739
 
1693
1740
  * ## Fixes
package/package.json CHANGED
@@ -4,7 +4,7 @@
4
4
  "name": "ru.coon"
5
5
  },
6
6
  "description": "",
7
- "version": "2.7.32",
7
+ "version": "2.7.34",
8
8
  "repository": {
9
9
  "type": "git",
10
10
  "url": "git+http://gitlab-dbr.sigma-it.local/dbr/ru.coon"
@@ -80,6 +80,21 @@ Ext.define('Coon.common.panel.MainUploadPanel', {
80
80
  }, this.formConfig));
81
81
  this.items = [this.uploadForm];
82
82
  this.callParent();
83
+ if (this.requiredAuth) {
84
+ return this.checkAuth();
85
+ }
86
+ },
87
+
88
+ async checkAuth() {
89
+ const isEnabled = await Coon.common.component.Auth.isEnabled();
90
+ try {
91
+ if (isEnabled && ! await Coon.common.component.Auth.handleAuthorization()) {
92
+ this.mask('Не удалось авторизоваться');
93
+ throw new Error('Не удалось авторизоваться');
94
+ }
95
+ } catch (ex) {
96
+ Coon.log.log(ex);
97
+ }
83
98
  },
84
99
 
85
100
  createButtons: function() {
@@ -94,7 +109,7 @@ Ext.define('Coon.common.panel.MainUploadPanel', {
94
109
  }),
95
110
 
96
111
  Ext.create('Ext.Button', {
97
- text: Coon.MessageResources.getMessage('Ext.ccb.uploadforms.closeButton', 'Отмена'),
112
+ text: Coon.MessageResources.getMessage('Ext.ccb.uploadforms.closeButton', 'Закрыть'),
98
113
  reference: 'closeButton',
99
114
  handler: this.closeFunction.bind(this),
100
115
  hidden: this.hideButtons,
@@ -16,10 +16,10 @@ Ext.define('Coon.nav.AppNavigationMenu', {
16
16
  workspace_icon: null,
17
17
  navCollapsed: false,
18
18
  collapsedWidth: 44,
19
- fullWidth: 260,
19
+ fullWidth: 280,
20
20
  },
21
21
  },
22
- fullWidth: 260,
22
+ fullWidth: 280,
23
23
  cls: 'AppNavigationMenu',
24
24
  layout: {
25
25
  type: 'vbox',
@@ -3,6 +3,12 @@
3
3
  display: none;
4
4
  }
5
5
 
6
+ .x-treelist-item-text{
7
+ padding-right: 20px;
8
+ }
9
+ .x-treelist-item-expander{
10
+ margin-right: 12px;
11
+ }
6
12
  .x-btn-arrow-right:after {
7
13
  color: white;
8
14
  }
@@ -11,17 +17,17 @@
11
17
 
12
18
  .x-panel-body-default {
13
19
  .x-box-inner {
14
- width: 260px !important;
20
+ width: 280px !important;
15
21
 
16
22
  .x-box-target {
17
- width: 260px !important;
23
+ width: 280px !important;
18
24
 
19
25
  .x-btn-default-small {
20
- width: 260px !important;
26
+ width: 280px !important;
21
27
  }
22
28
 
23
29
  .x-menuview {
24
- width: 260px !important;
30
+ width: 280px !important;
25
31
  }
26
32
  }
27
33
  }
@@ -32,7 +38,7 @@
32
38
  }
33
39
 
34
40
  .x-treelist-menu {
35
- width: 260px !important;
41
+ width: 280px !important;
36
42
  }
37
43
 
38
44
  .x-btn-button-default-small {
@@ -6,6 +6,13 @@ Ext.define('Coon.nav.menu.WorkspaceMenuView', {
6
6
  xtype: 'WorkspaceMenuView',
7
7
  ui: 'menu',
8
8
  cls: 'WorkspaceMenuView',
9
+ listeners: {
10
+ itemcollapse: (cmp) => {
11
+ Ext.defer(() => {
12
+ cmp.updateLayout();
13
+ }, 300, this);
14
+ },
15
+ },
9
16
  scrollable: true,
10
17
  expanderFirst: false,
11
18
  highlightPath: true,
@@ -8,6 +8,7 @@ Ext.define('Coon.report.component.EXTJSReportUploadForm', {
8
8
  alternateClassName: 'Sigma.common.components.report.list.EXTJSReportUploadForm',
9
9
 
10
10
  title: 'Импорт отчета',
11
+ requiredAuth: true,
11
12
  uploadFieldLabel: 'Файл с отчетом',
12
13
  uploadURL: 'ReportFormImport/import',
13
14
  allowMultipleUpload: false,
@@ -63,6 +63,7 @@ Ext.define('Coon.report.component.ReportPanel', {
63
63
  preventDblClick: false,
64
64
  enableHighlightingRequiredFields: false,
65
65
  enableChipToolbar: false,
66
+ filtered: false,
66
67
  },
67
68
  defaults: {
68
69
  split: true,
@@ -918,6 +919,7 @@ Ext.define('Coon.report.component.ReportPanel', {
918
919
  if (this.northPanel.isValid()) {
919
920
  this.grid.clear();
920
921
  this.currentParamList = this.northPanel.collectParams();
922
+ this.filtered = true;
921
923
  this.northPanel.fireEvent('filterhandlerevent');
922
924
  this.beforeCommandExecuter(this.beforeApplyFilterCommand(this), [this.currentParamList], function() {
923
925
  this.loadData(this.currentParamList, typeof invalidateCache === 'boolean' && invalidateCache);
@@ -364,6 +364,7 @@ Ext.define('Coon.report.plugin.configPanel.CopyRowsFromGridConfigPanel', {
364
364
  xtype: 'checkbox',
365
365
  boxLabel: 'выгружать все строки',
366
366
  name: 'exportAllRows',
367
+ value: true,
367
368
  };
368
369
  },
369
370
  });
@@ -31,7 +31,11 @@ Ext.define('Coon.security.component.roleAccessPanel', {
31
31
  },
32
32
  {
33
33
  xtype: 'UiCPRestrictionEditor',
34
- title: 'кастомные панели',
34
+ title: 'кастомные панели и репорты',
35
+ },
36
+ {
37
+ xtype: 'UrlsRestrictionEditor',
38
+ title: 'urls',
35
39
  }
36
40
  ]);
37
41
  })
@@ -12,6 +12,7 @@ Ext.define('Coon.security.component.ui.UiCPRestrictionEditor', {
12
12
 
13
13
  layout: {
14
14
  type: 'hbox',
15
+ align: 'stretch',
15
16
  },
16
17
 
17
18
  tbar: [
@@ -34,22 +35,44 @@ Ext.define('Coon.security.component.ui.UiCPRestrictionEditor', {
34
35
 
35
36
  items: [
36
37
  {
37
- xtype: 'ReportPanel',
38
- reference: 'ReportPanel',
39
- margin: 8,
40
- title: '',
41
- reportId: 'DSL_UI_CUSTOM_PANELS_LIST',
38
+ xtype: 'tabpanel',
39
+ title: 'Источник',
40
+ reference: 'mainTabPanel',
42
41
  flex: 1,
43
- preprocessPluginConfig: (config, xtype) => !['OpenCustomPanelButtonPlugin', 'ExecuteCommandButtonPlugin'].includes(xtype) && config,
42
+ items: [
43
+ {
44
+ xtype: 'ReportPanel',
45
+ reference: 'UiCPReportPanel',
46
+ margin: 8,
47
+ title: 'Кастомные панели',
48
+ fixedTitle: true,
49
+ reportId: 'DSL_UI_CUSTOM_PANELS_LIST',
50
+ flex: 1,
51
+ preprocessPluginConfig: (config, xtype) => !['OpenCustomPanelButtonPlugin',
52
+ 'ExecuteCommandButtonPlugin'].includes(xtype) && config,
53
+ },
54
+ {
55
+ xtype: 'ReportPanel',
56
+ reference: 'ReportsReportPanel',
57
+ title: 'Репорты',
58
+ fixedTitle: true,
59
+ margin: 8,
60
+ reportId: 'YY_REPORTS_LIST',
61
+ flex: 1,
62
+ preprocessPluginConfig: (config, xtype) => !['OpenCustomPanelButtonPlugin', 'ExecuteCommandButtonPlugin',
63
+ 'CopyRowsFromGrid', 'OpenURLButtonPlugin'].includes(xtype) && config,
64
+ }
65
+ ],
44
66
  },
45
67
  {
46
68
  xtype: 'tabpanel',
47
- reference: 'tabpanel',
69
+ title: 'Настройки доступа',
70
+ reference: 'childTabPanel',
48
71
  flex: 1,
49
72
  items: [
50
73
  {
51
74
  xtype: 'panel',
52
- title: 'настройки доступа',
75
+ title: 'Кнопки/плагины',
53
76
  layout: 'form',
54
77
  padding: 10,
55
78
  reference: 'editor',
@@ -19,7 +19,7 @@ Ext.define('Coon.security.component.ui.UiCPRestrictionEditorController', {
19
19
  'button[reference=saveBtn]': {
20
20
  click: 'save',
21
21
  },
22
- 'tabpanel': {
22
+ 'tabpanel[reference=childTabPanel]': {
23
23
  tabchange: 'onTabChange',
24
24
  },
25
25
  },
@@ -38,7 +38,7 @@ Ext.define('Coon.security.component.ui.UiCPRestrictionEditorController', {
38
38
  },
39
39
 
40
40
  onTabChange(_, component) {
41
- const record = this.lookup('ReportPanel').grid.selection;
41
+ const record = this.lookup('mainTabPanel').getActiveTab().grid.selection;
42
42
  record && component.fireEvent('select', record);
43
43
  },
44
44
 
@@ -64,7 +64,8 @@ Ext.define('Coon.security.component.ui.UiCPRestrictionEditorController', {
64
64
  if (Array.isArray(roles)) {
65
65
  this.locals.roleStore.loadData(roles.map((name) => ({name})));
66
66
  }
67
- this.lookup('ReportPanel').grid && this.lookup('ReportPanel').grid.setSelection();
67
+ this.lookup('UiCPReportPanel').grid && this.lookup('UiCPReportPanel').grid.setSelection();
68
+ this.lookup('ReportsReportPanel').grid && this.lookup('ReportsReportPanel').grid.setSelection();
68
69
  this.lookup('editor').removeAll();
69
70
  },
70
71
 
@@ -76,6 +77,10 @@ Ext.define('Coon.security.component.ui.UiCPRestrictionEditorController', {
76
77
  return Coon.util.promisifyCmd('command.GetUIElementCommand', uiElementCd, true).catch(() => false);
77
78
  },
78
79
 
80
+ getReportConfiguration(reportId) {
81
+ return Coon.util.promisifyCmd('command.LoadDynamicReportCommand', reportId, true).catch(() => false);
82
+ },
83
+
79
84
  getFieldConfig(key) {
80
85
  return {
81
86
  xtype: 'RoleTagField',
@@ -89,20 +94,38 @@ Ext.define('Coon.security.component.ui.UiCPRestrictionEditorController', {
89
94
  },
90
95
 
91
96
  selectUiPanel(grid, record) {
92
- this.lookup('tabpanel').getActiveTab().fireEvent('select', record);
93
- this.locals.data = {id: record.get('UI_ELEMENT_CD')};
97
+ const type = record.get('CM_REPORT_CD') ? 'report' : 'cp';
98
+ const dataId = record.get('UI_ELEMENT_CD') || record.get('CM_REPORT_CD');
99
+ this.lookup('childTabPanel').getActiveTab().fireEvent('select', record);
100
+ this.locals.data = {id: dataId};
94
101
  if (
95
102
  record.get('PROPERTY_DATA') &&
96
103
  typeof record.get('PROPERTY_DATA') === 'string' &&
97
104
  Coon.util.parseJSON5(record.get('PROPERTY_DATA'))
98
105
  ) {
99
- this.refillEditor(record.get('UI_ELEMENT_CD'), record.get('PROPERTY_DATA'));
100
- } else {
106
+ this.refillEditor(record.get('UI_ELEMENT_CD'), record.get('PROPERTY_DATA'), type);
107
+ } else if (record.get('UI_ELEMENT_CD')) {
101
108
  this.getView().mask('please wait, loading...');
102
109
  this.getUiElement(record.get('UI_ELEMENT_CD'))
103
110
  .then((data) => {
104
111
  this.getView().unmask();
105
- this.refillEditor(data.id, data.propertyData);
112
+ this.refillEditor(data.id, data.propertyData, type);
113
+ })
114
+ .catch((error) => {
115
+ this.getView().unmask();
116
+ console.error('UiCustomPanelRestrictionEditor', error);
117
+ });
118
+ } else if (record.get('CM_REPORT_CD')) {
119
+ this.getView().mask('please wait, loading...');
120
+ this.getReportConfiguration(record.get('CM_REPORT_CD'))
121
+ .then((data) => {
122
+ this.getView().unmask();
123
+ const plugins = [];
124
+ data.plugins.map((plugin) => {
125
+ ['ExecuteCommandButtonPlugin', 'ExecuteCommandAndSaveNotePlugin', 'OpenCustomPanelButtonPlugin']
126
+ .includes(plugin.uiElement.xtype) && plugins.push(Coon.util.parseJSON5(plugin.uiElement.propertyData));
127
+ });
128
+ this.refillEditor(data.reportId, plugins, type);
106
129
  })
107
130
  .catch((error) => {
108
131
  this.getView().unmask();
@@ -111,19 +134,27 @@ Ext.define('Coon.security.component.ui.UiCPRestrictionEditorController', {
111
134
  }
112
135
  },
113
136
 
114
- refillEditor(id, propertyData) {
137
+ refillEditor(id, propertyData, type) {
115
138
  const editor = this.lookup('editor');
116
- const {map} = Ext.create('Coon.security.Map', {
117
- propertyData,
118
- type: 'uiElement',
119
- mapId: id,
120
- });
139
+ let keys;
121
140
  editor.removeAll();
122
- const keys = Object.keys(map[id].buttons || []);
123
- if (!keys.length) {
124
- return;
141
+ if (type === 'cp') {
142
+ const {map} = Ext.create('Coon.security.Map', {
143
+ propertyData,
144
+ type: 'uiElement',
145
+ mapId: id,
146
+ });
147
+ keys = Object.keys(map[id].buttons || []);
148
+ if (!keys.length) {
149
+ return;
150
+ }
151
+ this.getPanelRestrictionConfig();
152
+ } else if (type === 'report') {
153
+ propertyData.map((pluginEl) => {
154
+ pluginEl.buttonText && keys.push(pluginEl.buttonText);
155
+ });
156
+ this.getReportRestrictionConfig();
125
157
  }
126
- this.getPanelRestrictionConfig();
127
158
  keys.forEach((key) => {
128
159
  editor.add(this.getFieldConfig(key));
129
160
  }, this);
@@ -138,6 +169,10 @@ Ext.define('Coon.security.component.ui.UiCPRestrictionEditorController', {
138
169
  }
139
170
  },
140
171
 
172
+ getReportRestrictionConfig() {
173
+
174
+ },
175
+
141
176
  changeRole(field, value) {
142
177
  this.locals.result = this.locals.result || {};
143
178
  this.locals.result[field.fieldLabel] = value;
@@ -0,0 +1,55 @@
1
+ Ext.define('Coon.security.component.url.UrlRestrictionEditor', {
2
+ extend: 'Ext.panel.Panel',
3
+ xtype: 'UrlsRestrictionEditor',
4
+
5
+ requires: [
6
+ 'Coon.security.component.url.UrlRestrictionEditorController',
7
+ ],
8
+
9
+ controller: 'UrlRestrictionEditorController',
10
+
11
+ layout: {
12
+ type: 'hbox',
13
+ align: 'stretch',
14
+ },
15
+
16
+ tbar: [
17
+ {
18
+ iconCls: 'svg-icon svg-icon-update-arrows',
19
+ itemId: 'reload',
20
+ },
21
+ '->',
22
+ {
23
+ text: 'сохранить изменения',
24
+ cls: 'saveBtn',
25
+ reference: 'saveBtn',
26
+ disabled: true,
27
+ },
28
+ {
29
+ text: 'выгрузить в файл',
30
+ reference: 'exportToFileBtn',
31
+ }
32
+ ],
33
+
34
+ items: [
35
+ {
36
+ xtype: 'ReportPanel',
37
+ reference: 'ReportPanel',
38
+ margin: 8,
39
+ title: '',
40
+ reportId: 'REPORTS',
41
+ flex: 1,
42
+ preprocessPluginConfig: (config, xtype) => !['OpenCustomPanelButtonPlugin', 'ExecuteCommandButtonPlugin',
43
+ 'CopyRowsFromGrid', 'OpenURLButtonPlugin'].includes(xtype) && config,
44
+ },
45
+ {
46
+ xtype: 'panel',
47
+ title: 'настройки доступа',
48
+ layout: 'form',
49
+ padding: 10,
50
+ flex: 1,
51
+ reference: 'editor',
52
+ defaults: {padding: 8},
53
+ }
54
+ ],
55
+ });
@@ -0,0 +1,5 @@
1
+ Ext.define('Coon.security.component.url.UrlRestrictionEditorController', {
2
+ extend: 'Ext.app.ViewController',
3
+ alias: 'controller.UrlRestrictionEditorController',
4
+
5
+ });