merge

scm-ui/public/locales/de/config.json

@@ -10,12 +10,12 @@
     "navLink": "Berechtigungsrollen",
     "title": "Berechtigungsrollen",
     "noPermissionRoles": "Keine Berechtigungsrollen gefunden.",
+    "system": "System",
     "createButton": "Berechtigungsrolle erstellen",
     "form": {
-      "name": "Name",
-      "system": "System",
-      "permissions": "Berechtigungen",
       "subtitle": "Berechtigungsrolle bearbeiten",
+      "name": "Name",
+      "permissions": "Berechtigungen",
       "submit": "Speichern"
     }
   },

scm-ui/public/locales/en/config.json

@@ -12,13 +12,16 @@
     "noPermissionRoles": "No permission roles found.",
     "createButton": "Create Permission Role",
     "form": {
+      "subtitle": "Edit Permission Role",
       "name": "Name",
-      "system": "System",
       "permissions": "Permissions",
-      "subtitle": "Edit Permission Roles",
       "submit": "Save"
     }
   },
+  "role": {
+    "name": "Name",
+    "system": "System"
+  },
   "config-form": {
     "submit": "Submit",
     "submit-success-notification": "Configuration changed successfully!",

scm-ui/src/config/containers/Config.js

@@ -10,9 +10,8 @@ import type { Links } from "@scm-manager/ui-types";
 import { Page, Navigation, NavLink, Section } from "@scm-manager/ui-components";
 import { getLinks } from "../../modules/indexResource";
 import GlobalConfig from "./GlobalConfig";
-import RepositoryRoles from "./RepositoryRoles";
+import RepositoryRoles from "../roles/containers/RepositoryRoles";
-import RepositoryRoleForm from "./RepositoryRoleForm"
+import SingleRepositoryRole from "../roles/containers/SingleRepositoryRole";
-import SingleRepositoryRole from "./SingleRepositoryRole";
 
 type Props = {
   links: Links,
@@ -37,7 +36,7 @@ class Config extends React.Component<Props> {
 
   matchesRoles = (route: any) => {
     const url = this.matchedUrl();
-    const regex = new RegExp(`${url}/role/.+/edit`);
+    const regex = new RegExp(`${url}/role/`);
     return route.location.pathname.match(regex);
   };
 
@@ -55,12 +54,19 @@ class Config extends React.Component<Props> {
         <div className="columns">
           <div className="column is-three-quarters">
             <Route path={url} exact component={GlobalConfig} />
+            <Route
+              path={`${url}/role/:role`}
+              render={() => <SingleRepositoryRole baseUrl={`${url}/roles`} />}
+            />
             <Route
               path={`${url}/roles`}
               exact
               render={() => <RepositoryRoles baseUrl={`${url}/roles`} />}
             />
-            <Route path={`${url}/role`} component={SingleRepositoryRole} />
+            <Route
+              path={`${url}/roles/create`}
+              render={() => <CreatePermissionRole />}
+            />
             <ExtensionPoint
               name="config.route"
               props={extensionProps}

scm-ui/src/config/roles/components/PermissionRoleDetail.js

@@ -0,0 +1,29 @@
+//@flow
+import React from "react";
+import { translate } from "react-i18next";
+import type { Role } from "@scm-manager/ui-types";
+import SystemRoleTag from "./SystemRoleTag";
+
+type Props = {
+  role: Role,
+
+  // context props
+  t: string => string,
+};
+
+class PermissionRoleDetail extends React.Component<Props> {
+  render() {
+    const { role, t } = this.props;
+
+    return (
+      <div className="media">
+        <div className="media-content subtitle">
+          <strong>{t("role.name")}:</strong> {role.name}{" "}
+          <SystemRoleTag system={!role._links.update} />
+        </div>
+      </div>
+    );
+  }
+}
+
+export default translate("config")(PermissionRoleDetail);

scm-ui/src/config/roles/components/PermissionRoleRow.js

@@ -2,6 +2,7 @@
 import React from "react";
 import { Link } from "react-router-dom";
 import type { Role } from "@scm-manager/ui-types";
+import SystemRoleTag from "./SystemRoleTag";
 
 type Props = {
   baseUrl: string,
@@ -9,17 +10,20 @@ type Props = {
 };
 
 class PermissionRoleRow extends React.Component<Props> {
-  renderLink(to: string, label: string) {
+  renderLink(to: string, label: string, system?: boolean) {
-    return <Link to={to}>{label}</Link>;
+    return (
+      <Link to={to}>
+        {label} <SystemRoleTag system={system} />
+      </Link>
+    );
   }
 
   render() {
     const { baseUrl, role } = this.props;
-    const singleRoleUrl = baseUrl.substring(0, baseUrl.length - 1);
+    const to = `${baseUrl}/${encodeURIComponent(role.name)}/info`;
-    const to = `${singleRoleUrl}/${encodeURIComponent(role.name)}`;
     return (
       <tr>
-        <td>{this.renderLink(to, role.name)}</td>
+        <td>{this.renderLink(to, role.name, !role._links.update)}</td>
       </tr>
     );
   }

scm-ui/src/config/roles/components/SystemRoleTag.js

@@ -0,0 +1,35 @@
+//@flow
+import React from "react";
+import injectSheet from "react-jss";
+import classNames from "classnames";
+import { translate } from "react-i18next";
+
+type Props = {
+  system?: boolean,
+  classes: any,
+  t: string => string
+};
+
+const styles = {
+  tag: {
+    marginLeft: "0.75rem",
+    verticalAlign: "inherit"
+  }
+};
+
+class SystemRoleTag extends React.Component<Props> {
+  render() {
+    const { system, classes, t } = this.props;
+
+    if (system) {
+      return (
+        <span className={classNames("tag is-dark", classes.tag)}>
+          {t("role.system")}
+        </span>
+      );
+    }
+    return null;
+  }
+}
+
+export default injectSheet(styles)(translate("config")(SystemRoleTag));

scm-ui/src/config/roles/containers/RepositoryRoleForm.js

@@ -4,7 +4,7 @@ import { connect } from "react-redux";
 import { translate } from "react-i18next";
 import type { Role } from "@scm-manager/ui-types";
 import { InputField, SubmitButton } from "@scm-manager/ui-components";
-import PermissionCheckbox from "../../repos/permissions/components/PermissionCheckbox";
+import PermissionCheckbox from "../../../repos/permissions/components/PermissionCheckbox";
 import {
   createRole,
   fetchAvailableVerbs,
@@ -12,7 +12,7 @@ import {
   getVerbsFromState,
   isFetchVerbsPending
 } from "../modules/roles";
-import {getRepositoryRolesLink, getRepositoryVerbsLink} from "../../modules/indexResource";
+import {getRepositoryRolesLink, getRepositoryVerbsLink} from "../../../modules/indexResource";
 
 type Props = {
   role?: Role,

scm-ui/src/config/roles/containers/RepositoryRoles.js

@@ -21,8 +21,8 @@ import {
   isFetchRolesPending,
   getFetchRolesFailure
 } from "../modules/roles";
-import PermissionRoleTable from "../components/table/PermissionRoleTable";
+import PermissionRoleTable from "../components/PermissionRoleTable";
-import { getRolesLink } from "../../modules/indexResource";
+import { getRolesLink } from "../../../modules/indexResource";
 type Props = {
   baseUrl: string,
   roles: Role[],

scm-ui/src/config/roles/containers/SingleRepositoryRole.js

@@ -8,10 +8,10 @@ import {
 } from "@scm-manager/ui-components";
 import { Route } from "react-router";
 import type { History } from "history";
-import { EditRepositoryRoleNavLink, RepositoryRoleDetailNavLink } from "./../components/navLinks";
+import { EditRepositoryRoleNavLink, RepositoryRoleDetailNavLink } from "../../components/navLinks";
 import { translate } from "react-i18next";
 import type { Role } from "@scm-manager/ui-types";
-import {getRepositoryRolesLink} from "../../modules/indexResource";
+import {getRepositoryRolesLink} from "../../../modules/indexResource";
 import {ExtensionPoint} from "@scm-manager/ui-extensions";
 import {fetchRoleByName, getFetchRoleFailure, getRoleByName, isFetchRolePending} from "../modules/roles";
 

scm-ui/src/config/roles/modules/roles.js

@@ -1,10 +1,10 @@
 // @flow
 import { apiClient } from "@scm-manager/ui-components";
-import { isPending } from "../../modules/pending";
+import { isPending } from "../../../modules/pending";
-import { getFailure } from "../../modules/failure";
+import { getFailure } from "../../../modules/failure";
-import * as types from "../../modules/types";
+import * as types from "../../../modules/types";
 import { combineReducers, Dispatch } from "redux";
-import type { Action, PagedCollection, Role } from "@scm-manager/ui-types";
+import type {Action, PagedCollection, Repository, Role} from "@scm-manager/ui-types";
 
 export const FETCH_ROLES = "scm/roles/FETCH_ROLES";
 export const FETCH_ROLES_PENDING = `${FETCH_ROLES}_${types.PENDING_SUFFIX}`;
@@ -469,6 +469,17 @@ export function getRolesFromState(state: Object) {
   return roleEntries;
 }
 
+export function getRoleCreateLink(state: Object) {
+  if (
+    state &&
+    state.list &&
+    state.list._links &&
+    state.list._links.create
+  ) {
+    return state.list._links.create.href;
+  }
+}
+
 export function getVerbsFromState(state: Object) {
   return state.roles.verbs.verbs;
 }

scm-ui/src/createReduxStore.js

@@ -15,7 +15,7 @@ import pending from "./modules/pending";
 import failure from "./modules/failure";
 import permissions from "./repos/permissions/modules/permissions";
 import config from "./config/modules/config";
-import roles from "./config/modules/roles";
+import roles from "./config/roles/modules/roles";
 import namespaceStrategies from "./config/modules/namespaceStrategies";
 import indexResources from "./modules/indexResource";