[Refactor] Refine New user modal (#3529)

client/app/lib/utils.js

@@ -3,14 +3,22 @@ import { isFunction, each, extend } from 'lodash';
 export function routesToAngularRoutes(routes, template) {
   const result = {};
   template = extend({}, template); // convert to object
-  each(routes, ({ path, title, key }) => {
-    result[path] = extend({
+  each(routes, ({ path, title, key, ...resolve }) => {
+    // Convert to functions
+    each(resolve, (value, prop) => {
+      resolve[prop] = () => value;
+    });
+
+    result[path] = {
+      ...template,
       title,
       // keep `resolve` from `template` (if exists)
-      resolve: extend({
+      resolve: {
+        ...template.resolve,
+        ...resolve,
         currentPage: () => key,
-      }, template.resolve),
-    }, template);
+      },
+    };
   });
   return result;
 }

client/app/pages/users/UsersList.jsx

@@ -27,7 +27,7 @@ import { currentUser } from '@/services/auth';
 import { policy } from '@/services/policy';
 import { User } from '@/services/user';
 import navigateTo from '@/services/navigateTo';
-import { $location, toastr } from '@/services/ng';
+import { toastr } from '@/services/ng';
 import { absoluteUrl } from '@/services/utils';
 
 function UsersListActions({ user, enableUser, disableUser, deleteUser }) {
@@ -121,7 +121,7 @@ class UsersList extends React.Component {
   ];
 
   componentDidMount() {
-    if ($location.path() === '/users/new') {
+    if (this.props.controller.params.isNewUserPage) {
       this.showCreateUserDialog();
     }
   }
@@ -154,12 +154,12 @@ class UsersList extends React.Component {
           this.props.controller.update();
         }
       }).finally(() => {
-        if ($location.path() === '/users/new') {
+        if (this.props.controller.params.isNewUserPage) {
           navigateTo('users');
         }
       });
     }
-  }
+  };
 
   onTableRowClick = (event, item) => navigateTo('users/' + item.id);
 

client/app/pages/users/index.js

@@ -12,6 +12,7 @@ export default function init() {
       path: '/users/new',
       title: 'Users',
       key: 'active',
+      isNewUserPage: true,
     },
     {
       path: '/users/pending',