feat(articles): Article Admin feature

This feature introduces a breaking change, that restricts the User's that can create/edit/delete Articles to only those that have the `admin` Role. Fixed ESLint issues. Resolved merge conflicts, and moved new client Article Service `createOrUpdate` functionality to new Admin feature controller. Removed edit functionality from client-side Article controller.
meanjs · Jul 25, 2016 · ca86625 · ca86625
1 parent 5817a48
commit ca86625
Show file tree

Hide file tree

Showing 20 changed files with 913 additions and 469 deletions.
diff --git a/modules/articles/client/articles.client.module.js b/modules/articles/client/articles.client.module.js
@@ -2,6 +2,8 @@
   'use strict';
 
   app.registerModule('articles', ['core']);// The core module is required for special route handling; see /core/client/config/core.client.routes
+  app.registerModule('articles.admin', ['core.admin']);
+  app.registerModule('articles.admin.routes', ['core.admin.routes']);
   app.registerModule('articles.services');
   app.registerModule('articles.routes', ['ui.router', 'core.routes', 'articles.services']);
 }(ApplicationConfiguration));
diff --git a/modules/articles/client/config/articles-admin.client.config.js b/modules/articles/client/config/articles-admin.client.config.js
@@ -0,0 +1,17 @@
+(function () {
+  'use strict';
+
+  // Configuring the Articles Admin module
+  angular
+    .module('articles.admin')
+    .run(menuConfig);
+
+  menuConfig.$inject = ['menuService'];
+
+  function menuConfig(Menus) {
+    Menus.addSubMenuItem('topbar', 'admin', {
+      title: 'Manage Articles',
+      state: 'admin.articles.list'
+    });
+  }
+}());
diff --git a/modules/articles/client/config/articles-admin.client.routes.js b/modules/articles/client/config/articles-admin.client.routes.js
@@ -0,0 +1,65 @@
+(function () {
+  'use strict';
+
+  angular
+    .module('articles.admin.routes')
+    .config(routeConfig);
+
+  routeConfig.$inject = ['$stateProvider'];
+
+  function routeConfig($stateProvider) {
+    $stateProvider
+      .state('admin.articles', {
+        abstract: true,
+        url: '/articles',
+        template: '<ui-view/>'
+      })
+      .state('admin.articles.list', {
+        url: '',
+        templateUrl: 'modules/articles/client/views/admin/list-articles.client.view.html',
+        controller: 'ArticlesListController',
+        controllerAs: 'vm',
+        data: {
+          roles: ['admin']
+        }
+      })
+      .state('admin.articles.create', {
+        url: '/create',
+        templateUrl: 'modules/articles/client/views/admin/form-article.client.view.html',
+        controller: 'ArticlesController',
+        controllerAs: 'vm',
+        data: {
+          roles: ['admin']
+        },
+        resolve: {
+          articleResolve: newArticle
+        }
+      })
+      .state('admin.articles.edit', {
+        url: '/:articleId/edit',
+        templateUrl: 'modules/articles/client/views/admin/form-article.client.view.html',
+        controller: 'ArticlesController',
+        controllerAs: 'vm',
+        data: {
+          roles: ['admin']
+        },
+        resolve: {
+          articleResolve: getArticle
+        }
+      });
+  }
+
+  getArticle.$inject = ['$stateParams', 'ArticlesService'];
+
+  function getArticle($stateParams, ArticlesService) {
+    return ArticlesService.get({
+      articleId: $stateParams.articleId
+    }).$promise;
+  }
+
+  newArticle.$inject = ['ArticlesService'];
+
+  function newArticle(ArticlesService) {
+    return new ArticlesService();
+  }
+}());
diff --git a/modules/articles/client/config/articles.client.menus.js b/modules/articles/client/config/articles.client.menus.js
@@ -18,14 +18,8 @@
     // Add the dropdown list item
     menuService.addSubMenuItem('topbar', 'articles', {
       title: 'List Articles',
-      state: 'articles.list'
-    });
-
-    // Add the dropdown create item
-    menuService.addSubMenuItem('topbar', 'articles', {
-      title: 'Create Article',
-      state: 'articles.create',
-      roles: ['user']
+      state: 'articles.list',
+      roles: ['*']
     });
   }
 }());
diff --git a/modules/articles/client/config/articles.client.routes.js b/modules/articles/client/config/articles.client.routes.js
@@ -23,32 +23,6 @@
           pageTitle: 'Articles List'
         }
       })
-      .state('articles.create', {
-        url: '/create',
-        templateUrl: 'modules/articles/client/views/form-article.client.view.html',
-        controller: 'ArticlesController',
-        controllerAs: 'vm',
-        resolve: {
-          articleResolve: newArticle
-        },
-        data: {
-          roles: ['user', 'admin'],
-          pageTitle: 'Articles Create'
-        }
-      })
-      .state('articles.edit', {
-        url: '/:articleId/edit',
-        templateUrl: 'modules/articles/client/views/form-article.client.view.html',
-        controller: 'ArticlesController',
-        controllerAs: 'vm',
-        resolve: {
-          articleResolve: getArticle
-        },
-        data: {
-          roles: ['user', 'admin'],
-          pageTitle: 'Edit Article {{ articleResolve.title }}'
-        }
-      })
       .state('articles.view', {
         url: '/:articleId',
         templateUrl: 'modules/articles/client/views/view-article.client.view.html',
@@ -70,10 +44,4 @@
       articleId: $stateParams.articleId
     }).$promise;
   }
-
-  newArticle.$inject = ['ArticlesService'];
-
-  function newArticle(ArticlesService) {
-    return new ArticlesService();
-  }
 }());
diff --git a/modules/articles/client/controllers/admin/article.client.controller.js b/modules/articles/client/controllers/admin/article.client.controller.js
@@ -0,0 +1,48 @@
+(function () {
+  'use strict';
+
+  angular
+    .module('articles.admin')
+    .controller('ArticlesController', ArticlesController);
+
+  ArticlesController.$inject = ['$scope', '$state', '$window', 'articleResolve', 'Authentication'];
+
+  function ArticlesController($scope, $state, $window, article, Authentication) {
+    var vm = this;
+
+    vm.article = article;
+    vm.authentication = Authentication;
+    vm.error = null;
+    vm.form = {};
+    vm.remove = remove;
+    vm.save = save;
+
+    // Remove existing Article
+    function remove() {
+      if ($window.confirm('Are you sure you want to delete?')) {
+        vm.article.$remove($state.go('admin.articles.list'));
+      }
+    }
+
+    // Save Article
+    function save(isValid) {
+      if (!isValid) {
+        $scope.$broadcast('show-errors-check-validity', 'vm.form.articleForm');
+        return false;
+      }
+
+      // Create a new article, or update the current instance
+      vm.article.createOrUpdate()
+        .then(successCallback)
+        .catch(errorCallback);
+
+      function successCallback(res) {
+        $state.go('admin.articles.list'); // should we send the User to the list or the updated Article's view?
+      }
+
+      function errorCallback(res) {
+        vm.error = res.data.message;
+      }
+    }
+  }
+}());
diff --git a/modules/articles/client/controllers/admin/list-articles.client.controller.js b/modules/articles/client/controllers/admin/list-articles.client.controller.js
@@ -0,0 +1,15 @@
+(function () {
+  'use strict';
+
+  angular
+    .module('articles')
+    .controller('ArticlesListController', ArticlesListController);
+
+  ArticlesListController.$inject = ['ArticlesService'];
+
+  function ArticlesListController(ArticlesService) {
+    var vm = this;
+
+    vm.articles = ArticlesService.query();
+  }
+}());
diff --git a/modules/articles/client/controllers/articles.client.controller.js b/modules/articles/client/controllers/articles.client.controller.js
@@ -5,46 +5,14 @@
     .module('articles')
     .controller('ArticlesController', ArticlesController);
 
-  ArticlesController.$inject = ['$scope', '$state', 'articleResolve', '$window', 'Authentication'];
+  ArticlesController.$inject = ['$scope', 'articleResolve', 'Authentication'];
 
-  function ArticlesController($scope, $state, article, $window, Authentication) {
+  function ArticlesController($scope, article, Authentication) {
     var vm = this;
 
     vm.article = article;
     vm.authentication = Authentication;
     vm.error = null;
-    vm.form = {};
-    vm.remove = remove;
-    vm.save = save;
 
-    // Remove existing Article
-    function remove() {
-      if ($window.confirm('Are you sure you want to delete?')) {
-        vm.article.$remove($state.go('articles.list'));
-      }
-    }
-
-    // Save Article
-    function save(isValid) {
-      if (!isValid) {
-        $scope.$broadcast('show-errors-check-validity', 'vm.form.articleForm');
-        return false;
-      }
-
-      // Create a new article, or update the current instance
-      vm.article.createOrUpdate()
-        .then(successCallback)
-        .catch(errorCallback);
-
-      function successCallback(res) {
-        $state.go('articles.view', {
-          articleId: res._id
-        });
-      }
-
-      function errorCallback(res) {
-        vm.error = res.data.message;
-      }
-    }
   }
 }());
diff --git a/...lient/views/form-article.client.view.html → ...views/admin/form-article.client.view.html b/...lient/views/form-article.client.view.html → ...views/admin/form-article.client.view.html
@@ -2,6 +2,11 @@
   <div class="page-header">
     <h1>{{vm.article._id ? 'Edit Article' : 'New Article'}}</h1>
   </div>
+  <div class="pull-right">
+    <a class="btn btn-primary" ng-click="vm.remove()">
+      <i class="glyphicon glyphicon-trash"></i>
+    </a>
+  </div>
   <div class="col-md-12">
     <form name="vm.form.articleForm" class="form-horizontal" ng-submit="vm.save(vm.form.articleForm.$valid)" novalidate>
       <fieldset>

diff --git a/modules/articles/client/views/admin/list-articles.client.view.html b/modules/articles/client/views/admin/list-articles.client.view.html
@@ -0,0 +1,26 @@
+<section>
+  <div class="page-header">
+    <h1>
+      Articles
+      <a class="btn btn-primary pull-right" data-ui-sref="admin.articles.create">
+        <i class="glyphicon glyphicon-plus"></i>
+      </a>
+    </h1>
+  </div>
+  <div class="list-group">
+    <a data-ng-repeat="article in vm.articles" data-ui-sref="admin.articles.edit({articleId: article._id})" class="list-group-item">
+      <small class="list-group-item-text">
+        Posted on
+        <span data-ng-bind="article.created | date:'mediumDate'"></span>
+        by
+        <span ng-if="article.user" ng-bind="article.user.displayName"></span>
+        <span ng-if="!article.user">Deleted User</span>
+      </small>
+      <h4 class="list-group-item-heading" data-ng-bind="article.title"></h4>
+      <p class="list-group-item-text" data-ng-bind="article.content"></p>
+    </a>
+  </div>
+  <div class="alert alert-warning text-center" data-ng-if="articles.$resolved && !articles.length">
+    No articles yet, why don't you <a data-ui-sref="admin.articles.create">create one</a>?
+  </div>
+</section>
diff --git a/modules/articles/client/views/list-articles.client.view.html b/modules/articles/client/views/list-articles.client.view.html
@@ -15,7 +15,4 @@ <h4 class="list-group-item-heading" ng-bind="article.title"></h4>
       <p class="list-group-item-text" ng-bind="article.content"></p>
     </a>
   </div>
-  <div class="alert alert-warning text-center" ng-if="vm.articles.$resolved && !vm.articles.length">
-    No articles yet, why don't you <a ui-sref="articles.create">create one</a>?
-  </div>
 </section>
diff --git a/modules/articles/client/views/view-article.client.view.html b/modules/articles/client/views/view-article.client.view.html
@@ -2,14 +2,6 @@
   <div class="page-header">
     <h1 ng-bind="vm.article.title"></h1>
   </div>
-  <div class="pull-right" ng-show="vm.article.isCurrentUserOwner">
-    <a class="btn btn-primary" ui-sref="articles.edit({ articleId: vm.article._id })">
-      <i class="glyphicon glyphicon-edit"></i>
-    </a>
-    <a class="btn btn-primary" ng-click="vm.remove()">
-      <i class="glyphicon glyphicon-trash"></i>
-    </a>
-  </div>
   <small>
     <em class="text-muted">
       Posted on

diff --git a/modules/articles/server/policies/articles.server.policy.js b/modules/articles/server/policies/articles.server.policy.js
@@ -25,7 +25,7 @@ exports.invokeRolesPolicies = function () {
     roles: ['user'],
     allows: [{
       resources: '/api/articles',
-      permissions: ['get', 'post']
+      permissions: ['get']
     }, {
       resources: '/api/articles/:articleId',
       permissions: ['get']