[RFR] Cleanup after ES6 refactoring

UPGRADE-0.7.md

@@ -6,17 +6,17 @@ ng-admin 0.7 breaks compatibility with 0.5 and makes the "factories" configurati
 
 ## Configuration factory
 
-Configuration is now done through a `NgAdminConfigurationFactoryProvider`. You can retrieve it directly from Angular DI. You just have to retrieve your application from this factory instead of the `NgAdminConfigurationProvider` as previously:
+The configuration is now done through the `AdminDescription` object. You can retrieve it directly from Angular DI. You just have to retrieve your application from this factory instead of the `NgAdminConfigurationProvider` as previously. In addition, `NgAdminConfigurationProvider` was renamed to `NgAdminProvider`:
 
 ``` diff
 - app.config(function (NgAdminConfigurationProvider, RestangularProvider) {
-+ app.config(function (NgAdminConfigurationFactoryProvider, NgAdminConfigurationProvider, RestangularProvider) {
++ app.config(function (AdminDescription, NgAdminProvider, RestangularProvider) {
 -     var nga = NgAdminConfigurationProvider;
-+     var nga = NgAdminConfigurationFactoryProvider;
++     var nga = AdminDescription;
 
       // ...
 
 -     nga.configure(admin);
-+     NgAdminConfigurationProvider.configure(admin);
++     NgAdminProvider.configure(admin);
   });
 ```

examples/blog/config.js

@@ -4,8 +4,8 @@
 
     var app = angular.module('myApp', ['ng-admin']);
 
-    app.config(function (NgAdminConfigurationFactory, NgAdminConfigurationProvider, RestangularProvider) {
-        var nga = NgAdminConfigurationFactory;
+    app.config(function (AdminDescription, NgAdminProvider, RestangularProvider) {
+        var nga = AdminDescription;
 
         function truncate(value) {
             if (!value) {
@@ -242,7 +242,7 @@
                 nga.field('published', 'boolean')
             ]);
 
-        NgAdminConfigurationProvider.configure(admin);
+        NgAdminProvider.configure(admin);
     });
 
     app.directive('postLink', ['$location', function ($location) {

src/javascripts/ng-admin.js

@@ -25,7 +25,7 @@ require.config({
         'angular-ui-codemirror': 'bower_components/angular-ui-codemirror/ui-codemirror.min',
         'MainModule': 'ng-admin/Main/MainModule',
         'CrudModule': 'ng-admin/Crud/CrudModule',
-        'NgAdminConfigurationFactory': '../../build/ng-admin-configuration'
+        'AdminDescription': '../../build/ng-admin-configuration'
     },
     shim: {
         'restangular': {
@@ -50,10 +50,10 @@ define(function (require) {
     require('MainModule');
     require('CrudModule');
 
-    var configurationFactory = require('NgAdminConfigurationFactory');
+    var AdminDescription = require('AdminDescription');
 
-    var factory = angular.module('NgAdminConfigurationFactory', []);
-    factory.constant('NgAdminConfigurationFactory', new configurationFactory());
+    var factory = angular.module('AdminDescriptionModule', []);
+    factory.constant('AdminDescription', new AdminDescription());
 
-    angular.module('ng-admin', ['main', 'crud', 'NgAdminConfigurationFactory']);
+    angular.module('ng-admin', ['main', 'crud', 'AdminDescriptionModule']);
 });

src/javascripts/ng-admin/Crud/column/maColumn.js

@@ -60,7 +60,7 @@ define(function (require) {
         };
     }
 
-    maColumn.$inject = ['$location', '$anchorScroll', '$compile', 'NgAdminConfiguration', 'FieldViewConfiguration'];
+    maColumn.$inject = ['$location', '$anchorScroll', '$compile', 'NgAdmin', 'FieldViewConfiguration'];
 
     return maColumn;
 });

src/javascripts/ng-admin/Crud/column/maReferenceManyLinkColumn.js

@@ -29,7 +29,7 @@ define(function (require) {
         };
     }
 
-    maReferenceManyLinkColumn.$inject = ['$location', 'NgAdminConfiguration'];
+    maReferenceManyLinkColumn.$inject = ['$location', 'NgAdmin'];
 
     return maReferenceManyLinkColumn;
 });

src/javascripts/ng-admin/Crud/form/FormController.js

@@ -134,7 +134,7 @@ define(function () {
         this.entity = undefined;
     };
 
-    FormController.$inject = ['$scope', '$location', '$filter', 'CreateQueries', 'UpdateQueries', 'Validator', 'NgAdminConfiguration', 'progression', 'notification', 'view', 'entry'];
+    FormController.$inject = ['$scope', '$location', '$filter', 'CreateQueries', 'UpdateQueries', 'Validator', 'NgAdmin', 'progression', 'notification', 'view', 'entry'];
 
     return FormController;
 });

src/javascripts/ng-admin/Crud/repository/CreateQueries.js

@@ -32,7 +32,7 @@ define(function (require) {
             });
     };
 
-    CreateQueries.$inject = ['$q', 'Restangular', 'NgAdminConfiguration'];
+    CreateQueries.$inject = ['$q', 'Restangular', 'NgAdmin'];
 
     return CreateQueries;
 });

src/javascripts/ng-admin/Crud/repository/DeleteQueries.js

@@ -29,7 +29,7 @@ define(function (require) {
             .customDELETE();
     };
 
-    DeleteQueries.$inject = ['$q', 'Restangular', 'NgAdminConfiguration'];
+    DeleteQueries.$inject = ['$q', 'Restangular', 'NgAdmin'];
 
     return DeleteQueries;
 });

src/javascripts/ng-admin/Crud/repository/Queries.js

@@ -18,7 +18,7 @@ define(function () {
         this.Restangular.setFullResponse(true);  // To get also the headers
     }
 
-    Queries.$inject = ['$q', 'Restangular', 'NgAdminConfiguration'];
+    Queries.$inject = ['$q', 'Restangular', 'NgAdmin'];
 
     return Queries;
 });

src/javascripts/ng-admin/Crud/repository/RetrieveQueries.js

@@ -287,7 +287,7 @@ define(function (require) {
         return entry;
     };
 
-    RetrieveQueries.$inject = ['$q', 'Restangular', 'NgAdminConfiguration'];
+    RetrieveQueries.$inject = ['$q', 'Restangular', 'NgAdmin'];
 
     return RetrieveQueries;
 });

src/javascripts/ng-admin/Crud/repository/UpdateQueries.js

@@ -35,7 +35,7 @@ define(function (require) {
             });
     };
 
-    UpdateQueries.$inject = ['$q', 'Restangular', 'NgAdminConfiguration'];
+    UpdateQueries.$inject = ['$q', 'Restangular', 'NgAdmin'];
 
     return UpdateQueries;
 });

src/javascripts/ng-admin/Crud/routing.js

@@ -10,7 +10,7 @@ define(function (require) {
         deleteTemplate = require('text!./delete/delete.html');
 
     function templateProvider(viewName, defaultView) {
-        return ['$stateParams', 'NgAdminConfiguration', function ($stateParams, Configuration) {
+        return ['$stateParams', 'NgAdmin', function ($stateParams, Configuration) {
             var customTemplate;
             var view = Configuration().getViewByEntityAndType($stateParams.entity, viewName);
             customTemplate = view.template();
@@ -22,7 +22,7 @@ define(function (require) {
     }
 
     function viewProvider(viewName) {
-        return ['$stateParams', 'NgAdminConfiguration', function ($stateParams, Configuration) {
+        return ['$stateParams', 'NgAdmin', function ($stateParams, Configuration) {
             var view = Configuration().getViewByEntityAndType($stateParams.entity, viewName);
             if (!view.isEnabled()) {
                 throw new Error('The ' + viewName + ' is disabled for this entity');

src/javascripts/ng-admin/Main/MainModule.js

@@ -17,7 +17,7 @@ define(function (require) {
     MainModule.service('PanelBuilder', require('ng-admin/Main/component/service/PanelBuilder'));
     MainModule.service('Validator', require('ng-admin/Main/component/service/Validator'));
 
-    MainModule.provider('NgAdminConfiguration', require('ng-admin/Main/component/provider/NgAdminConfiguration'));
+    MainModule.provider('NgAdmin', require('ng-admin/Main/component/provider/NgAdmin'));
 
     MainModule.filter('enabled', require('ng-admin/Main/component/filter/Enabled'));
     MainModule.filter('orderElement', require('ng-admin/Main/component/filter/OrderElement'));

src/javascripts/ng-admin/Main/component/controller/AppController.js

@@ -7,7 +7,7 @@ define(function () {
      *
      * @param {$scope}               $scope
      * @param {$location}            $location
-     * @param {NgAdminConfiguration} Configuration
+     * @param {NgAdmin} Configuration
      * @constructor
      */
     var AppController = function ($scope, $location, Configuration) {
@@ -26,7 +26,7 @@ define(function () {
         this.$scope = undefined;
     };
 
-    AppController.$inject = ['$scope', '$location', 'NgAdminConfiguration'];
+    AppController.$inject = ['$scope', '$location', 'NgAdmin'];
 
     return AppController;
 });

src/javascripts/ng-admin/Main/component/controller/SidebarController.js

@@ -53,7 +53,7 @@ define(function () {
         this.$filter = undefined;
     };
 
-    SidebarController.$inject = ['$scope', '$location', '$sce', '$filter', 'NgAdminConfiguration'];
+    SidebarController.$inject = ['$scope', '$location', '$sce', '$filter', 'NgAdmin'];
 
     return SidebarController;
 });

src/javascripts/ng-admin/Main/component/provider/NgAdmin.js

@@ -0,0 +1,24 @@
+/*global define*/
+
+define(function () {
+    'use strict';
+
+    function NgAdmin() {
+        this.config = null;
+    }
+
+    NgAdmin.prototype.configure = function (config) {
+        this.config = config;
+    };
+
+    NgAdmin.prototype.$get = function () {
+        var config = this.config;
+        return function () {
+            return config;
+        };
+    };
+
+    NgAdmin.$inject = [];
+
+    return NgAdmin;
+});

src/javascripts/ng-admin/Main/component/service/PanelBuilder.js

@@ -66,7 +66,7 @@ define(function () {
         });
     };
 
-    PanelBuilder.$inject = ['$q', '$filter', '$location', 'RetrieveQueries', 'NgAdminConfiguration'];
+    PanelBuilder.$inject = ['$q', '$filter', '$location', 'RetrieveQueries', 'NgAdmin'];
 
     return PanelBuilder;
 });

src/javascripts/ng-admin/Main/config/factories.js

@@ -27,7 +27,7 @@ define(function (require) {
         nga.registerFieldType('wysiwyg', require('ng-admin/Main/component/service/config/fieldTypes/WysiwygField'));
     }
 
-    factories.$inject = ['NgAdminConfigurationProvider'];
+    factories.$inject = ['NgAdminProvider'];
 
     return factories;
 });

src/javascripts/ng-admin/Main/config/routing.js

@@ -12,7 +12,7 @@ define(function (require) {
             abstract: true,
             controller: 'AppController',
             controllerAs: 'appController',
-            templateProvider: ['NgAdminConfiguration', function(Configuration) {
+            templateProvider: ['NgAdmin', function(Configuration) {
                 return Configuration().layout() || layoutTemplate;
             }]
         });

src/javascripts/ng-admin/es6/lib/View/View.js

@@ -1,5 +1,4 @@
 import Entry from "../Entry";
-import arrayUtils from "../Utils/arrayUtils";
 
 class View {
     constructor(name) {
@@ -80,52 +79,40 @@ class View {
         return this;
     }
 
+
+    /*
+     * Supports various syntax
+     * fields([ Field1, Field2 ])
+     * fields(Field1, Field2)
+     * fields([Field1, {Field2, Field3}])
+     * fields(Field1, {Field2, Field3})
+     * fields({Field2, Field3})
+     */
     fields() {
         if (!arguments.length) return View._indexFieldsByName(this._fields);
 
-        for (let i = 0, c = arguments.length ; i < c ; i++) {
-            let argument = this._fieldify(arguments[i]);
-
-            switch (argument.constructor.name) {
-                case 'Field':
-                    this._fields.push(argument);
-                    break;
-
-                case 'Object':
-                    for (var fieldName in argument) {
-                        this._fields.push(argument[fieldName]);
-                    }
-                    break;
-
-                case 'Array':
-                    this._fields = this._fields.concat(arrayUtils.flatten(argument));
-                    break;
-            }
-        }
+        [].slice.call(arguments).map(function(argument) {
+            View.flatten(argument).map(arg => this.addField(arg));
+        }, this)
 
         return this;
     }
 
-    _fieldify(arr) {
-        if (!Array.isArray(arr)) {
-            return arr;
-        }
-
-        var result = [];
-        for (let i = 0, c = arr.length ; i < c ; i++) {
-            var element = arr[i]
-            if (element.constructor.name === 'Object') {
-                for (let fieldName in element) {
-                    result.push(this._fieldify(element[fieldName]));
-                }
-
-                continue;
+    static flatten(arg) {
+        if (arg.constructor.name === 'Object') {
+            let result = [];
+            for (let fieldName in arg) {
+                result = result.concat(View.flatten(arg[fieldName]));
             }
-
-            result.push(element);
+            return result;
         }
-
-        return result;
+        if (Array.isArray(arg)) {
+            return arg.reduce(function(previous, current) {
+                return previous.concat(View.flatten(current))
+            }, []);
+        }
+        // arg is a scalar
+        return [arg];
     }
 
     get type() {