[RFR] Backward compatibility

Gruntfile.js

@@ -250,7 +250,7 @@ module.exports = function (grunt) {
 
     grunt.registerTask('test:local', ['mochaTest', 'karma', 'build:dev', 'copy_build:dev', 'test:local:e2e']);
     grunt.registerTask('test:local:e2e', ['json_server', 'connect', 'protractor']);
-    grunt.registerTask('build:dev', ['requirejs:dev', 'compass:dev', 'concat:css']);
+    grunt.registerTask('build:dev', ['ngconfig', 'requirejs:dev', 'compass:dev', 'concat:css']);
     grunt.registerTask('copy_build:dev', ['copy:es6_dev', 'copy:es6_devmap', 'copy:js_dev', 'copy:angular', 'copy:css_dev', 'copy:fonts_dev', 'clean']);
 
     // register default task

README.md

@@ -80,8 +80,8 @@ Here is a full example for a backend that will let you create, update, and delet
 
 var app = angular.module('myApp', ['ng-admin']);
 
-app.config(function (AdminDescription, NgAdminProvider) {
-    var nga = AdminDescription;
+app.config(function (NgAdminConfigurationProvider) {
+    var nga = NgAdminConfigurationProvider;
     var app = nga.application('ng-admin backend demo') // application main title
         .baseApiUrl('http://localhost:3000/'); // main API endpoint
 
@@ -100,7 +100,7 @@ app.config(function (AdminDescription, NgAdminProvider) {
     post.dashboardView() // customize the dashboard panel for this entity
         .title('Recent posts')
         .order(1) // display the post panel first in the dashboard
-        .limit(5) // limit the panel to the 5 latest posts
+        .perPage(5) // limit the panel to the 5 latest posts
         .fields([nga.field('title').isDetailLink(true).map(truncate)]); // fields() called with arguments add fields to the view
 
     post.listView()
@@ -156,7 +156,7 @@ app.config(function (AdminDescription, NgAdminProvider) {
                 .template('<other-page-link></other-link-link>')
         ]);
 
-    NgAdminProvider.configure(app);
+    nga.configure(app);
 });
 ```
 
@@ -261,7 +261,7 @@ Defines the API endpoint for a view. It can be a string or a function.
 
 The `dashboardView` also defines `sortField` and `sortDir` fields like the `listView`.
 
-* `limit(Number)`
+* `perPage(Number)`
 Set the number of items.
 
 * `order(Number)`

UPGRADE-0.7.md

@@ -4,19 +4,15 @@
 
 ng-admin 0.7 breaks compatibility with 0.5 and makes the "factories" configuration API compulsory. If your configuration uses `nga.field()`, it will still work woth 0.7. If it uses `new Field()`, you'll need to follow [the 0.6 upgrade guide](https://github.com/marmelab/ng-admin/blob/b3c7b1afc6a52651df6ba4454d8461620339b4da/UPGRADE-0.6.md).
 
-## Configuration factory
+## Field type
 
-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`:
+Method `Field.type()` is no longer supported as a setter. Instead, you should specify the second argument from the field factory.
 
 ``` diff
-- app.config(function (NgAdminConfigurationProvider, RestangularProvider) {
-+ app.config(function (AdminDescription, NgAdminProvider, RestangularProvider) {
--     var nga = NgAdminConfigurationProvider;
-+     var nga = AdminDescription;
+- nga.field('created_at').type('date')
++ nga.field('created_at', 'date')
+```
 
-      // ...
+## perPage instead of limit
 
--     nga.configure(admin);
-+     NgAdminProvider.configure(admin);
-  });
-```
+Dashboard view `limit()` method has been deprecated. Please use the `perPage` method instead.

examples/blog/config.js

@@ -4,8 +4,8 @@
 
     var app = angular.module('myApp', ['ng-admin']);
 
-    app.config(function (AdminDescription, NgAdminProvider, RestangularProvider) {
-        var nga = AdminDescription;
+    app.config(function (NgAdminConfigurationProvider, RestangularProvider) {
+        var nga = NgAdminConfigurationProvider;
 
         function truncate(value) {
             if (!value) {
@@ -66,7 +66,7 @@
         post.dashboardView() // customize the dashboard panel for this entity
             .title('Recent posts')
             .order(1) // display the post panel first in the dashboard
-            .limit(5) // limit the panel to the 5 latest posts
+            .perPage(5) // limit the panel to the 5 latest posts
             .fields([nga.field('title').isDetailLink(true).map(truncate)]); // fields() called with arguments add fields to the view
 
         post.listView()
@@ -133,7 +133,7 @@
         comment.dashboardView()
             .title('Last comments')
             .order(2) // display the comment panel second in the dashboard
-            .limit(5)
+            .perPage(5)
             .fields([
                 nga.field('id'),
                 nga.field('body', 'wysiwyg')
@@ -218,7 +218,7 @@
         tag.dashboardView()
             .title('Recent tags')
             .order(3)
-            .limit(10)
+            .perPage(10)
             .fields([
                 nga.field('id'),
                 nga.field('name'),
@@ -248,7 +248,7 @@
                 nga.field('published', 'boolean')
             ]);
 
-        NgAdminProvider.configure(admin);
+        nga.configure(admin);
     });
 
     app.directive('postLink', ['$location', function ($location) {

src/javascripts/ng-admin.js

@@ -55,5 +55,8 @@ define(function (require) {
     var factory = angular.module('AdminDescriptionModule', []);
     factory.constant('AdminDescription', new AdminDescription());
 
-    angular.module('ng-admin', ['main', 'crud', 'AdminDescriptionModule']);
+    var ngadmin = angular.module('ng-admin', ['main', 'crud', 'AdminDescriptionModule']);
+    ngadmin.config(function(NgAdminConfigurationProvider, AdminDescription) {
+        NgAdminConfigurationProvider.setAdminDescription(AdminDescription);
+    });
 });

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

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

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

@@ -29,7 +29,7 @@ define(function (require) {
         };
     }
 
-    maReferenceManyLinkColumn.$inject = ['$location', 'NgAdmin'];
+    maReferenceManyLinkColumn.$inject = ['$location', 'NgAdminConfiguration'];
 
     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', 'NgAdmin', 'progression', 'notification', 'view', 'entry'];
+    FormController.$inject = ['$scope', '$location', '$filter', 'CreateQueries', 'UpdateQueries', 'Validator', 'NgAdminConfiguration', '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', 'NgAdmin'];
+    CreateQueries.$inject = ['$q', 'Restangular', 'NgAdminConfiguration'];
 
     return CreateQueries;
 });

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

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

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

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

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

@@ -35,7 +35,7 @@ define(function (require) {
             });
     };
 
-    UpdateQueries.$inject = ['$q', 'Restangular', 'NgAdmin'];
+    UpdateQueries.$inject = ['$q', 'Restangular', 'NgAdminConfiguration'];
 
     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', 'NgAdmin', function ($stateParams, Configuration) {
+        return ['$stateParams', 'NgAdminConfiguration', 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', 'NgAdmin', function ($stateParams, Configuration) {
+        return ['$stateParams', 'NgAdminConfiguration', 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('NgAdmin', require('ng-admin/Main/component/provider/NgAdmin'));
+    MainModule.provider('NgAdminConfiguration', require('ng-admin/Main/component/provider/NgAdminConfiguration'));
 
     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

@@ -26,7 +26,7 @@ define(function () {
         this.$scope = undefined;
     };
 
-    AppController.$inject = ['$scope', '$location', 'NgAdmin'];
+    AppController.$inject = ['$scope', '$location', 'NgAdminConfiguration'];
 
     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', 'NgAdmin'];
+    SidebarController.$inject = ['$scope', '$location', '$sce', '$filter', 'NgAdminConfiguration'];
 
     return SidebarController;
 });

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

@@ -0,0 +1,45 @@
+/*global define*/
+
+define(function () {
+    'use strict';
+
+    function NgAdminConfiguration() {
+        this.config = null;
+        this.adminDescription = null;
+    }
+
+    NgAdminConfiguration.prototype.setAdminDescription = function(adminDescription) {
+        this.adminDescription = adminDescription;
+    }
+
+    NgAdminConfiguration.prototype.configure = function (config) {
+        this.config = config;
+    };
+
+    NgAdminConfiguration.prototype.$get = function () {
+        var config = this.config;
+        return function () {
+            return config;
+        };
+    };
+
+    NgAdminConfiguration.prototype.application = function(name) {
+        return this.adminDescription.application(name);
+    };
+
+    NgAdminConfiguration.prototype.entity = function(name) {
+        return this.adminDescription.entity(name);
+    };
+
+    NgAdminConfiguration.prototype.field = function(name, type) {
+        return this.adminDescription.field(name, type);
+    };
+
+    NgAdminConfiguration.prototype.registerFieldType = function(name, type) {
+        return this.adminDescription.registerFieldType(name, type);
+    };
+
+    NgAdminConfiguration.$inject = [];
+
+    return NgAdminConfiguration;
+});

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

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

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

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

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

@@ -46,6 +46,10 @@ class Factory {
         this._fieldTypes[name] = constructor;
     }
 
+    getFieldConstructor(name) {
+        return this._fieldTypes[name];
+    }
+
     _init() {
         this.registerFieldType('boolean', BooleanField);
         this.registerFieldType('choice', ChoiceField);

src/javascripts/ng-admin/es6/lib/Field/ReferenceField.js

@@ -17,8 +17,10 @@ class ReferenceField extends ChoiceField {
         this._detailLink = true;
     }
 
-    get perPage() {
-        return this._perPage;
+    perPage(perPage) {
+        if (!arguments.length) return this._perPage;
+        this._perPage = perPage;
+        return this;
     }
 
     targetEntity(entity) {
@@ -48,7 +50,7 @@ class ReferenceField extends ChoiceField {
     }
 
     getReferencedView() {
-        return this._referencedView.perPage(this.perPage);
+        return this._referencedView.perPage(this._perPage);
     }
 
     filters(filters) {