From 4ca15ad02367a2d4bf11f6d4599f23c3639048f0 Mon Sep 17 00:00:00 2001 From: Emmanuel QUENTIN Date: Wed, 20 May 2015 09:44:19 +0200 Subject: [PATCH 1/3] Fix button display when a view is disabled --- src/javascripts/ng-admin/Crud/delete/batchDelete.html | 2 +- src/javascripts/ng-admin/Crud/delete/delete.html | 2 +- src/javascripts/ng-admin/Crud/form/create.html | 2 +- src/javascripts/ng-admin/Crud/form/edit.html | 2 +- src/javascripts/ng-admin/Crud/show/show.html | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/javascripts/ng-admin/Crud/delete/batchDelete.html b/src/javascripts/ng-admin/Crud/delete/batchDelete.html index 3758ef85..57dad6fe 100644 --- a/src/javascripts/ng-admin/Crud/delete/batchDelete.html +++ b/src/javascripts/ng-admin/Crud/delete/batchDelete.html @@ -1,7 +1,7 @@
- +
diff --git a/src/javascripts/ng-admin/Crud/delete/delete.html b/src/javascripts/ng-admin/Crud/delete/delete.html index 958ce5c9..884d0a49 100644 --- a/src/javascripts/ng-admin/Crud/delete/delete.html +++ b/src/javascripts/ng-admin/Crud/delete/delete.html @@ -1,7 +1,7 @@
- +
diff --git a/src/javascripts/ng-admin/Crud/form/create.html b/src/javascripts/ng-admin/Crud/form/create.html index 8d4631f3..248a5642 100644 --- a/src/javascripts/ng-admin/Crud/form/create.html +++ b/src/javascripts/ng-admin/Crud/form/create.html @@ -1,7 +1,7 @@
- +
diff --git a/src/javascripts/ng-admin/Crud/form/edit.html b/src/javascripts/ng-admin/Crud/form/edit.html index 2339374d..daf6f46b 100644 --- a/src/javascripts/ng-admin/Crud/form/edit.html +++ b/src/javascripts/ng-admin/Crud/form/edit.html @@ -1,7 +1,7 @@
- + diff --git a/src/javascripts/ng-admin/Crud/show/show.html b/src/javascripts/ng-admin/Crud/show/show.html index 18bb5aac..0d030945 100644 --- a/src/javascripts/ng-admin/Crud/show/show.html +++ b/src/javascripts/ng-admin/Crud/show/show.html @@ -1,7 +1,7 @@
- + From 9b4b5653316a1e2d1846d8c9bd077288d7a1d0fd Mon Sep 17 00:00:00 2001 From: Emmanuel QUENTIN Date: Wed, 20 May 2015 10:09:02 +0200 Subject: [PATCH 2/3] Disable views by default --- src/javascripts/ng-admin/Crud/column/maColumn.js | 2 +- src/javascripts/ng-admin/Crud/routing.js | 2 +- src/javascripts/ng-admin/es6/lib/View/DeleteView.js | 1 + src/javascripts/ng-admin/es6/lib/View/View.js | 6 +++--- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/javascripts/ng-admin/Crud/column/maColumn.js b/src/javascripts/ng-admin/Crud/column/maColumn.js index 2fbd7bd2..84ff3649 100644 --- a/src/javascripts/ng-admin/Crud/column/maColumn.js +++ b/src/javascripts/ng-admin/Crud/column/maColumn.js @@ -15,7 +15,7 @@ define(function (require) { var referenceEntity = field.targetEntity().name(); var relatedEntity = Configuration().getEntity(referenceEntity); if (!relatedEntity) return false; - return relatedEntity.isReadOnly ? relatedEntity.showView().isEnabled() : relatedEntity.editionView().isEnabled(); + return relatedEntity.isReadOnly ? relatedEntity.showView().enabled : relatedEntity.editionView().enabled; }; return { diff --git a/src/javascripts/ng-admin/Crud/routing.js b/src/javascripts/ng-admin/Crud/routing.js index 302042fd..41d31f39 100644 --- a/src/javascripts/ng-admin/Crud/routing.js +++ b/src/javascripts/ng-admin/Crud/routing.js @@ -32,7 +32,7 @@ define(function (require) { error404.status = 404; // trigger the 404 error throw error404; } - if (!view.isEnabled()) { + if (!view.enabled) { throw new Error('The ' + viewName + ' is disabled for this entity'); } return view; diff --git a/src/javascripts/ng-admin/es6/lib/View/DeleteView.js b/src/javascripts/ng-admin/es6/lib/View/DeleteView.js index 07782c85..4a3f7a21 100644 --- a/src/javascripts/ng-admin/es6/lib/View/DeleteView.js +++ b/src/javascripts/ng-admin/es6/lib/View/DeleteView.js @@ -4,6 +4,7 @@ class DeleteView extends View { constructor(name) { super(name); this._type = 'DeleteView'; + this._enabled = true; } } diff --git a/src/javascripts/ng-admin/es6/lib/View/View.js b/src/javascripts/ng-admin/es6/lib/View/View.js index 40bc3862..c96d8598 100644 --- a/src/javascripts/ng-admin/es6/lib/View/View.js +++ b/src/javascripts/ng-admin/es6/lib/View/View.js @@ -8,7 +8,7 @@ class View { this._description = ''; this._template = null; - this._enabled = true; + this._enabled = false; this._fields = []; this._type = null; this._name = name; @@ -18,7 +18,7 @@ class View { } get enabled() { - return this._enabled; + return this._enabled || this._fields.length; } title(title) { @@ -57,7 +57,7 @@ class View { * @deprecated Use getter "enabled" instead */ isEnabled() { - return this._enabled; + return this.enabled; } /** From 7ba34e99b8bd75a59542604f7b7ddf788569d5bb Mon Sep 17 00:00:00 2001 From: Emmanuel QUENTIN Date: Wed, 20 May 2015 11:27:51 +0200 Subject: [PATCH 3/3] Fix tests --- .../ng-admin/es6/lib/Application.js | 3 +- .../ng-admin/es6/lib/View/MenuView.js | 4 ++ src/javascripts/ng-admin/es6/lib/View/View.js | 6 ++- .../ng-admin/es6/tests/lib/ApplicationTest.js | 42 +++++++++++++++---- .../es6/tests/lib/Entity/EntityTest.js | 5 ++- .../service/config/ApplicationSpec.js | 10 ++--- 6 files changed, 55 insertions(+), 15 deletions(-) diff --git a/src/javascripts/ng-admin/es6/lib/Application.js b/src/javascripts/ng-admin/es6/lib/Application.js index cb5999dc..8ce23cb6 100644 --- a/src/javascripts/ng-admin/es6/lib/Application.js +++ b/src/javascripts/ng-admin/es6/lib/Application.js @@ -101,7 +101,8 @@ class Application { this._menu = this.buildMenuFromEntities(); } return this._menu - }; + } + this._menu = menu; return this; } diff --git a/src/javascripts/ng-admin/es6/lib/View/MenuView.js b/src/javascripts/ng-admin/es6/lib/View/MenuView.js index 217a6b65..ae88e111 100644 --- a/src/javascripts/ng-admin/es6/lib/View/MenuView.js +++ b/src/javascripts/ng-admin/es6/lib/View/MenuView.js @@ -7,6 +7,10 @@ class MenuView extends View { this._icon = null; } + get enabled() { + return this._enabled || this.entity.views['ListView'].enabled; + } + icon() { if (arguments.length) { console.warn('entity.menuView() is deprecated. Please use the Menu class instead'); diff --git a/src/javascripts/ng-admin/es6/lib/View/View.js b/src/javascripts/ng-admin/es6/lib/View/View.js index c96d8598..b5eda3c1 100644 --- a/src/javascripts/ng-admin/es6/lib/View/View.js +++ b/src/javascripts/ng-admin/es6/lib/View/View.js @@ -18,7 +18,7 @@ class View { } get enabled() { - return this._enabled || this._fields.length; + return this._enabled || !!this._fields.length; } title(title) { @@ -47,10 +47,14 @@ class View { disable() { this._enabled = false; + + return this; } enable() { this._enabled = true; + + return this; } /** diff --git a/src/javascripts/ng-admin/es6/tests/lib/ApplicationTest.js b/src/javascripts/ng-admin/es6/tests/lib/ApplicationTest.js index 0a85dcc9..75158f97 100644 --- a/src/javascripts/ng-admin/es6/tests/lib/ApplicationTest.js +++ b/src/javascripts/ng-admin/es6/tests/lib/ApplicationTest.js @@ -102,10 +102,16 @@ describe('Application', function() { }); it('should return only views of type', () => { - let application = new Application(); + let application = new Application(), + post = new Entity('post'), + comment = new Entity('comment'); + + post.views["DashboardView"].enable(); + comment.views["DashboardView"].enable(); + application - .addEntity(new Entity('post')) - .addEntity(new Entity('comment')); + .addEntity(post) + .addEntity(comment); let views = application.getViewsOfType('DashboardView'); @@ -121,9 +127,13 @@ describe('Application', function() { it('should return only enabled views of type', () => { let application = new Application(); let comment = new Entity('comment'); + let post = new Entity('post'); + comment.views.DashboardView.disable(); + post.views.DashboardView.enable(); + application - .addEntity(new Entity('post')) + .addEntity(post) .addEntity(comment); let views = application.getViewsOfType('DashboardView'); @@ -135,6 +145,11 @@ describe('Application', function() { it('should return ordered views of type', function() { let application = new Application(); let [post, comment, tag] = [new Entity('post'), new Entity('comment'), new Entity('tag')]; + + post.views["DashboardView"].enable(); + comment.views["DashboardView"].enable(); + tag.views["DashboardView"].enable(); + post.views.DashboardView.order(2); comment.views.DashboardView.order(1); tag.views.DashboardView.order(3); @@ -165,10 +180,17 @@ describe('Application', function() { describe('buildMenuFromEntities', () => { it('should create a menu based on the entity list', () => { - let application = new Application(); + let application = new Application(), + comment = new Entity('comment'), + post = new Entity('post'); + + comment.views.ListView.enable(); + post.views.ListView.enable(); + application - .addEntity(new Entity('post')) - .addEntity(new Entity('comment')); + .addEntity(post) + .addEntity(comment); + let menu = application.buildMenuFromEntities(); assert.equal(2, menu.children().length); let [menu1, menu2] = menu.children(); @@ -178,9 +200,15 @@ describe('Application', function() { it('should use the menuView order when provided', () => { let application = new Application(); let [e1, e2, e3] = [new Entity('e1'), new Entity('e2'), new Entity('e3')]; + e1.menuView().order(2); e2.menuView().order(1); e3.menuView().order(3); + + e1.views.ListView.enable(); + e2.views.ListView.enable(); + e3.views.ListView.enable(); + application .addEntity(e1) .addEntity(e2) diff --git a/src/javascripts/ng-admin/es6/tests/lib/Entity/EntityTest.js b/src/javascripts/ng-admin/es6/tests/lib/Entity/EntityTest.js index 623d7e9a..83f189cb 100644 --- a/src/javascripts/ng-admin/es6/tests/lib/Entity/EntityTest.js +++ b/src/javascripts/ng-admin/es6/tests/lib/Entity/EntityTest.js @@ -46,10 +46,13 @@ describe('Entity', function() { it('should set read-only attribute', function() { entity.readOnly(); assert.equal(true, entity.isReadOnly); - }) ; + }); it('should disable all edition views', function() { entity.readOnly(); + entity.views.ListView.enable(); + entity.views.DashboardView.enable(); + assert.equal(true, entity.menuView().enabled); assert.equal(true, entity.dashboardView().enabled); assert.equal(true, entity.listView().enabled); diff --git a/src/javascripts/test/unit/Main/component/service/config/ApplicationSpec.js b/src/javascripts/test/unit/Main/component/service/config/ApplicationSpec.js index 25c865c2..1ddbf2a4 100644 --- a/src/javascripts/test/unit/Main/component/service/config/ApplicationSpec.js +++ b/src/javascripts/test/unit/Main/component/service/config/ApplicationSpec.js @@ -35,9 +35,9 @@ define(function (require) { var app = new Application(), entity1 = new Entity('myEntity1'), entity2 = new Entity('myEntity2'), - dashboard = entity1.dashboardView(), - dashboard2 = entity2.dashboardView(), - createView = entity2.creationView(); + dashboard = entity1.dashboardView().enable(), + dashboard2 = entity2.dashboardView().enable(), + createView = entity2.creationView().enable(); app.addEntity(entity1); app.addEntity(entity2); @@ -47,8 +47,8 @@ define(function (require) { lists = app.getViewsOfType('ListView'); expect(dashboards.length).toBe(2); - expect(forms.length).toBe(2); - expect(lists.length).toBe(2); + expect(forms.length).toBe(1); + expect(lists.length).toBe(0); expect(dashboards[0].getEntity().name()).toBe('myEntity1'); expect(dashboards[1].getEntity().name()).toBe('myEntity2');