PT-14394: AngularJS error when user open GenericExport (#83)

fix: Error Expected array but received when user open Generic Export blade.
VirtoCommerce · Nov 14, 2023 · a78adfc · a78adfc
1 parent 9f46136
commit a78adfc
Show file tree

Hide file tree

Showing 4 changed files with 181 additions and 153 deletions.
diff --git a/src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-type-selector.tpl.html b/src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-type-selector.tpl.html
@@ -18,7 +18,7 @@
                     <span class="list-descr" ng-if="data.localizedGroupName">{{data.localizedGroupName}}</span>
                     <span class="list-descr" ng-if="data.localizedDescription">{{data.localizedDescription}}</span>
                 </li>
-                <li class="list-item" ng-repeat="data in blade.currentEntities | orderBy: 'localizedName' track by data.groupName" ng-class="{'__selected': data.groupName === selectedNodeId}" ng-click='selectNode(data)' ng-if="!blade.searchText">
+                <li class="list-item" ng-repeat="data in blade.currentEntities | toArray | orderBy: 'localizedName' track by data.groupName" ng-class="{'__selected': data.groupName === selectedNodeId}" ng-click='selectNode(data)' ng-if="!blade.searchText">
                     <span class="list-t">{{data.localizedName}}</span>
                     <span class="list-descr" ng-if="data.localizedDescription">{{data.localizedDescription}}</span>
                 </li>

diff --git a/src/VirtoCommerce.ExportModule.Web/Scripts/export.js b/src/VirtoCommerce.ExportModule.Web/Scripts/export.js
@@ -5,7 +5,7 @@ if (AppDependencies !== undefined) {
     AppDependencies.push(moduleName);
 }
 
-angular.module(moduleName, ['ui.grid.cellNav', 'ui.grid.edit', 'ui.grid.validate'])
+angular.module(moduleName, ['ui.grid.cellNav', 'ui.grid.edit', 'ui.grid.validate', 'angular-toArrayFilter'])
     .config(['$stateProvider', function ($stateProvider) {
         $stateProvider.state('workspace.exportModule', {
             url: '/generic-export',

diff --git a/src/VirtoCommerce.ExportModule.Web/Scripts/filters/toArrayFilter.js b/src/VirtoCommerce.ExportModule.Web/Scripts/filters/toArrayFilter.js
@@ -0,0 +1,18 @@
+angular.module('angular-toArrayFilter', [])
+    .filter('toArray', function () {
+        return function (obj, addKey) {
+            if (!angular.isObject(obj)) return obj;
+            if (addKey === false) {
+                return Object.keys(obj).map(function (key) {
+                    return obj[key];
+                });
+            } else {
+                return Object.keys(obj).map(function (key) {
+                    var value = obj[key];
+                    return angular.isObject(value) ?
+                        Object.defineProperty(value, '$key', { enumerable: false, value: key }) :
+                        { $key: key, $value: value };
+                });
+            }
+        };
+    });