merge

scm-ui/src/users/containers/SingleUser.js

@@ -27,11 +27,13 @@ import {
 import {
   DeleteUserNavLink,
   EditUserNavLink,
-  SetPasswordNavLink
+  SetPasswordNavLink,
+  SetPermissionsNavLink
 } from "./../components/navLinks";
 import { translate } from "react-i18next";
 import { getUsersLink } from "../../modules/indexResource";
 import SetUserPassword from "../components/SetUserPassword";
+import SetPermissions from "../../permissions/components/SetPermissions";
 
 type Props = {
   name: string,
@@ -106,6 +108,14 @@ class SingleUser extends React.Component<Props> {
               path={`${url}/password`}
               component={() => <SetUserPassword user={user} />}
             />
+            <Route
+              path={`${url}/permissions`}
+              component={() => (
+                <SetPermissions
+                  selectedPermissionsLink={user._links.permissions}
+                />
+              )}
+            />
           </div>
           <div className="column">
             <Navigation>
@@ -120,6 +130,10 @@ class SingleUser extends React.Component<Props> {
                   user={user}
                   passwordUrl={`${url}/password`}
                 />
+                <SetPermissionsNavLink
+                  user={user}
+                  permissionsUrl={`${url}/permissions`}
+                />
               </Section>
               <Section label={t("single-user.actions-label")}>
                 <DeleteUserNavLink user={user} deleteUser={this.deleteUser} />