diff --git a/src/VirtoCommerce.Platform.Web/npm-shrinkwrap.json b/src/VirtoCommerce.Platform.Web/npm-shrinkwrap.json index 495c74e701..6120545eba 100644 --- a/src/VirtoCommerce.Platform.Web/npm-shrinkwrap.json +++ b/src/VirtoCommerce.Platform.Web/npm-shrinkwrap.json @@ -2048,9 +2048,9 @@ "dev": true }, "node_modules/elliptic": { - "version": "6.5.7", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz", - "integrity": "sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==", + "version": "6.6.1", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.6.1.tgz", + "integrity": "sha512-RaddvvMatK2LJHqFJ+YA4WysVN5Ita9E35botqIYspQ4TkRAlCicdzKOjlyv/1Za5RyTNn7di//eEV0uTAfe3g==", "peer": true, "dependencies": { "bn.js": "^4.11.9", @@ -4545,9 +4545,9 @@ } }, "node_modules/rangy": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/rangy/-/rangy-1.3.1.tgz", - "integrity": "sha512-gfo1FOzdvcrcCR+wf0XMKPJBD3p2nHUw2wvNtuKsaHoI2dXQ9vH2QIpSQMV+mWLvKSqPfDNThhlyK8UN1hJijw==" + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/rangy/-/rangy-1.3.2.tgz", + "integrity": "sha512-fS1C4MOyk8T+ZJZdLcgrukPWxkyDXa+Hd2Kj+Zg4wIK71yrWgmjzHubzPMY1G+WD9EgGxMp3fIL0zQ1ickmSWA==" }, "node_modules/readable-stream": { "version": "2.3.8", diff --git a/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/de.VirtoCommerce.Common.json b/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/de.VirtoCommerce.Common.json index 24e307ba8c..884406c795 100644 --- a/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/de.VirtoCommerce.Common.json +++ b/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/de.VirtoCommerce.Common.json @@ -24,6 +24,8 @@ "import": "Importieren", "import-sample-data": "Beispieldaten importieren", "install": "Installieren", + "grouping": "Bündel anzeigen", + "ungrouping": "Bündel ausblenden", "manage": "Verwalten", "more": "Mehr", "no": "Nein", @@ -185,4 +187,4 @@ "504": "Gateway-Zeitüberschreitung" } } -} \ No newline at end of file +} diff --git a/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/en.VirtoCommerce.Common.json b/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/en.VirtoCommerce.Common.json index 541bb51893..c23580478d 100644 --- a/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/en.VirtoCommerce.Common.json +++ b/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/en.VirtoCommerce.Common.json @@ -24,6 +24,8 @@ "import": "Import", "import-sample-data": "Import sample data", "install": "Install", + "grouping": "Show bundles", + "ungrouping": "Hide bundles", "manage": "Manage", "more": "More", "no": "No", diff --git a/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/es.VirtoCommerce.Common.json b/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/es.VirtoCommerce.Common.json index 8364db962d..623db96e6c 100644 --- a/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/es.VirtoCommerce.Common.json +++ b/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/es.VirtoCommerce.Common.json @@ -24,6 +24,8 @@ "import": "Importar", "import-sample-data": "Importar datos de muestra", "install": "Instalar", + "grouping": "Mostrar paquetes", + "ungrouping": "Ocultar paquetes", "manage": "Gestionar", "more": "Más", "no": "No", @@ -185,4 +187,4 @@ "504": "Tiempo de espera de la puerta de enlace" } } -} \ No newline at end of file +} diff --git a/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/fr.VirtoCommerce.Common.json b/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/fr.VirtoCommerce.Common.json index 78333b8e79..4e86aabb05 100644 --- a/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/fr.VirtoCommerce.Common.json +++ b/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/fr.VirtoCommerce.Common.json @@ -24,6 +24,8 @@ "import": "Importer", "import-sample-data": "Importer des données d'exemple", "install": "Installer", + "grouping": "Afficher les bundles", + "ungrouping": "Masquer les bundles", "manage": "Gérer", "more": "Plus", "no": "Non", @@ -185,4 +187,4 @@ "504": "Délai de passerelle dépassé" } } -} \ No newline at end of file +} diff --git a/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/it.VirtoCommerce.Common.json b/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/it.VirtoCommerce.Common.json index 0b6eb8850c..b9ec7f79b7 100644 --- a/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/it.VirtoCommerce.Common.json +++ b/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/it.VirtoCommerce.Common.json @@ -24,6 +24,8 @@ "import": "Importa", "import-sample-data": "Importa dati di esempio", "install": "Installa", + "grouping": "Mostra pacchetti", + "ungrouping": "Nascondi pacchetti", "manage": "Gestisci", "more": "Altro", "no": "No", diff --git a/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/ja.VirtoCommerce.Common.json b/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/ja.VirtoCommerce.Common.json index fc74c3fdad..ce70f31f90 100644 --- a/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/ja.VirtoCommerce.Common.json +++ b/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/ja.VirtoCommerce.Common.json @@ -24,6 +24,8 @@ "import": "インポート", "import-sample-data": "サンプルデータをインポート", "install": "インストール", + "grouping": "バンドルを表示", + "ungrouping": "バンドルを非表示", "manage": "管理", "more": "その他", "no": "いいえ", diff --git a/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/pl.VirtoCommerce.Common.json b/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/pl.VirtoCommerce.Common.json index 24f4d666da..21f60419ca 100644 --- a/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/pl.VirtoCommerce.Common.json +++ b/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/pl.VirtoCommerce.Common.json @@ -24,6 +24,8 @@ "import": "Importuj", "import-sample-data": "Importuj przykładowe dane", "install": "Zainstaluj", + "grouping": "Pokaż pakiety", + "ungrouping": "Ukryj pakiety", "manage": "Zarządzaj", "more": "Więcej", "no": "Nie", @@ -185,4 +187,4 @@ "504": "Przekroczony czas bramy" } } -} \ No newline at end of file +} diff --git a/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/pt.VirtoCommerce.Common.json b/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/pt.VirtoCommerce.Common.json index 8e474c468e..9dd5515172 100644 --- a/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/pt.VirtoCommerce.Common.json +++ b/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/pt.VirtoCommerce.Common.json @@ -24,6 +24,8 @@ "import": "Importar", "import-sample-data": "Importar dados de exemplo", "install": "Instalar", + "grouping": "Mostrar pacotes", + "ungrouping": "Ocultar pacotes", "manage": "Gerenciar", "more": "Mais", "no": "Não", @@ -185,4 +187,4 @@ "504": "Tempo limite do gateway" } } -} \ No newline at end of file +} diff --git a/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/ru.VirtoCommerce.Common.json b/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/ru.VirtoCommerce.Common.json index 6bebe5dddf..ce30354000 100644 --- a/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/ru.VirtoCommerce.Common.json +++ b/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/ru.VirtoCommerce.Common.json @@ -24,6 +24,8 @@ "import": "Импортировать", "import-sample-data": "Импортировать примеры данных", "install": "Установить", + "grouping": "Показать пакеты", + "ungrouping": "Скрыть пакеты", "manage": "Управлять", "more": "Ещё", "no": "Нет", @@ -185,4 +187,4 @@ "504": "Время ожидания шлюза истекло" } } -} \ No newline at end of file +} diff --git a/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/zh.VirtoCommerce.Common.json b/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/zh.VirtoCommerce.Common.json index ae7241f084..1501ee956a 100644 --- a/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/zh.VirtoCommerce.Common.json +++ b/src/VirtoCommerce.Platform.Web/wwwroot/Localizations/zh.VirtoCommerce.Common.json @@ -24,6 +24,8 @@ "import": "导入", "import-sample-data": "导入示例数据", "install": "安装", + "grouping": "显示捆绑包", + "ungrouping": "隐藏捆绑包", "manage": "管理", "more": "更多", "no": "否", diff --git a/src/VirtoCommerce.Platform.Web/wwwroot/js/app/modularity/blades/modules-list.js b/src/VirtoCommerce.Platform.Web/wwwroot/js/app/modularity/blades/modules-list.js index 827273923d..bde3058c54 100644 --- a/src/VirtoCommerce.Platform.Web/wwwroot/js/app/modularity/blades/modules-list.js +++ b/src/VirtoCommerce.Platform.Web/wwwroot/js/app/modularity/blades/modules-list.js @@ -1,6 +1,6 @@ angular.module('platformWebApp') -.controller('platformWebApp.modulesListController', ['$scope', 'platformWebApp.bladeNavigationService', 'uiGridConstants', 'platformWebApp.uiGridHelper', 'platformWebApp.moduleHelper', '$timeout', -function ($scope, bladeNavigationService, uiGridConstants, uiGridHelper, moduleHelper, $timeout) { + .controller('platformWebApp.modulesListController', ['$scope', 'platformWebApp.bladeNavigationService', 'uiGridConstants', 'platformWebApp.uiGridHelper', 'platformWebApp.moduleHelper', '$timeout', '$translate', +function ($scope, bladeNavigationService, uiGridConstants, uiGridHelper, moduleHelper, $timeout, $translate) { $scope.uiGridConstants = uiGridConstants; var blade = $scope.blade; @@ -59,6 +59,21 @@ function ($scope, bladeNavigationService, uiGridConstants, uiGridHelper, moduleH executeMethod: function () { $scope.confirmActionInDialog('uninstall', $scope.gridApi.selection.getSelectedRows()); }, canExecuteMethod: installedItemsChecked, permission: 'platform:module:manage' + }, + { + name: "platform.commands.grouping", + icon: 'fas fa-cubes', + executeMethod: function () { + blade.isGrouped = !blade.isGrouped; + if (blade.isGrouped) { + this.name = $translate.instant("platform.commands.ungrouping"); + } + else { + this.name = $translate.instant("platform.commands.grouping"); + } + }, + canExecuteMethod: function () { return true; }, + permission: 'platform:module:view' } ]; break; diff --git a/src/VirtoCommerce.Platform.Web/wwwroot/js/app/modularity/blades/modules-list.tpl.html b/src/VirtoCommerce.Platform.Web/wwwroot/js/app/modularity/blades/modules-list.tpl.html index 6e803d83e0..574f1ff487 100644 --- a/src/VirtoCommerce.Platform.Web/wwwroot/js/app/modularity/blades/modules-list.tpl.html +++ b/src/VirtoCommerce.Platform.Web/wwwroot/js/app/modularity/blades/modules-list.tpl.html @@ -1,4 +1,4 @@ -