VCST-2271: Replace Show module bundles checkbox with toolbar button (#2860)

OlegoO · web-flow · commit 031f56f41d35 · 2024-11-19T21:08:10.000+02:00
diff --git a/src/VirtoCommerce.Platform.Web/npm-shrinkwrap.json b/src/VirtoCommerce.Platform.Web/npm-shrinkwrap.json
diff --git 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"
     }
   }
-}
+}
diff --git 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
@@ -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"
     }
   }
-}
+}
diff --git 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é"
     }
   }
-}
+}
diff --git 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
@@ -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
@@ -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"
     }
   }
-}
+}
diff --git 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"
     }
   }
-}
+}
diff --git 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": "Время ожидания шлюза истекло"
     }
   }
-}
+}
diff --git 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
@@ -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
@@ -1,4 +1,4 @@
-<div class="blade-static" ng-class="{'__expanded': blade.mode==='browse'}" ng-if="blade.currentEntities.length">
+<div class="blade-static" ng-if="blade.currentEntities.length">
     <div class="form-group">
         <div class="form-input __search">
             <input placeholder="{{'platform.placeholders.search-keyword' | translate }}" ng-model="blade.searchText" ng-keyup="gridApi.grid.queueGridRefresh()">
@@ -7,15 +7,6 @@
             </button>
         </div>
     </div>
-    <div class="form-group" ng-if="blade.mode==='browse'" style="margin-top:-25px">
-        <div class="form-input">
-            <label class="form-label __switch">
-                <input type="checkbox" ng-model="blade.isGrouped" />
-                <span class="switch"></span>
-            </label>
-        </div>
-        <label class="form-label">{{ 'platform.blades.modules-list.labels.grouping' | translate }}</label>
-    </div>
 </div>
 <div class="blade-content __medium-wide">
     <div class="blade-inner">
@@ -69,7 +60,7 @@
     <div ng-if="row.groupHeader && col.isRowHeader" ng-repeat="(colRenderIndex, col) in colContainer.renderedColumns track by col.uid" ui-grid-one-bind-id-grid="rowRenderIndex + '-' + col.uid + '-cell'" class="ui-grid-cell" ng-class="{'ui-grid-row-header-cell': col.isRowHeader }" role="{{col.isRowHeader ? 'rowheader' : 'gridcell' }}" ui-grid-cell></div>
     <div ng-if="row.groupHeader && !col.isRowHeader" ng-click='grid.appScope.toggleRow(row)' ng-repeat="(colRenderIndex, col) in colContainer.renderedColumns | limitTo:1 track by col.uid" class="ui-grid-cell __filters">
         <div class="ui-grid-cell-contents">
-            <div class="inner-contents"><span class="inner-t">{{grid.appScope.getGroupInfo(row.entity).groupVal | translate}}: <span class="count">{{grid.appScope.getGroupInfo(row.entity).value | number:0}}</span></span></div>
+            <div class="inner-contents"><span class="inner-t" style="text-transform: capitalize;">{{grid.appScope.getGroupInfo(row.entity).groupVal | translate}}: <span class="count">{{grid.appScope.getGroupInfo(row.entity).value | number:0}}</span></span></div>
         </div>
     </div>
     <div ng-if="!row.groupHeader" ng-click='col.isRowHeader || grid.appScope.blade.selectNode(row.entity)' ng-repeat="(colRenderIndex, col) in colContainer.renderedColumns track by col.uid" ui-grid-one-bind-id-grid="rowRenderIndex + '-' + col.uid + '-cell'" class="ui-grid-cell" ng-class="{'ui-grid-row-header-cell': col.isRowHeader, '__selected': row.entity.id===grid.appScope.selectedNodeId }" role="{{col.isRowHeader ? 'rowheader' : 'gridcell' }}" ui-grid-cell context-menu="grid.appScope.contextMenuEntity = row.entity" data-target="mdl_menu"></div>
@@ -91,7 +82,7 @@
             <span class="error" ng-if="row.entity.validationErrors.length"><span ng-repeat="x in row.entity.validationErrors"> {{x}};</span></span>
             <span class="table-descr" title="{{row.entity.description}}" style="overflow: hidden; text-overflow: ellipsis;" ng-if="!row.entity.validationErrors.length">{{row.entity.description}}</span>
             <div title="{{ 'platform.blades.module-detail.labels.owners' | translate: row.entity }}" style="overflow: hidden; text-overflow: ellipsis;" ng-if="!row.entity.validationErrors.length">
-                <span class="table-t"><span class="table-descr">{{ 'platform.blades.module-detail.labels.owners' | translate }}</span> {{ row.entity.$owner }}</span>
+                <span class="table-t"><span class="table-descr">{{ 'platform.blades.module-detail.labels.owners' | translate }} {{ row.entity.$owner }}</span></span>
             </div>
         </div>
     </div>

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@`
`24`	`24`	`"import": "Importieren",`
`25`	`25`	`"import-sample-data": "Beispieldaten importieren",`
`26`	`26`	`"install": "Installieren",`
	`27`	`+ "grouping": "Bündel anzeigen",`
	`28`	`+ "ungrouping": "Bündel ausblenden",`
`27`	`29`	`"manage": "Verwalten",`
`28`	`30`	`"more": "Mehr",`
`29`	`31`	`"no": "Nein",`
`@@ -185,4 +187,4 @@`
`185`	`187`	`"504": "Gateway-Zeitüberschreitung"`
`186`	`188`	`}`
`187`	`189`	`}`
`188`		`-}`
	`190`	`+}`