merge

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

@@ -66,7 +66,7 @@ class Config extends React.Component<Props> {
             />
             <Route
               path={`${url}/roles/create`}
-              render={() => <CreateRepositoryRole disabled={false} />}
+              render={() => <CreateRepositoryRole disabled={false} history={this.props.history} />}
             />
             <ExtensionPoint
               name="config.route"

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

@@ -1,29 +0,0 @@
-//@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/PermissionRoleDetails.js

@@ -0,0 +1,41 @@
+//@flow
+import React from "react";
+import { translate } from "react-i18next";
+import type { Role } from "@scm-manager/ui-types";
+import ExtensionPoint from "@scm-manager/ui-extensions/lib/ExtensionPoint";
+import PermissionRoleDetailsTable from "./PermissionRoleDetailsTable";
+import {Button, Subtitle} from "@scm-manager/ui-components";
+
+type Props = {
+  role: Role,
+  url: string,
+
+  // context props
+  t: string => string,
+};
+
+class PermissionRoleDetails extends React.Component<Props> {
+  render() {
+    const { role, url } = this.props;
+
+    return (
+
+      <div>
+        <PermissionRoleDetailsTable role={role}/>
+        <hr/>
+        <Subtitle subtitle={"repositoryRoles.edit"}/>
+        <Button label={"test"} link={`${url}/edit`} color="primary" />
+        <div className="content">
+          <ExtensionPoint
+            name="roles.repositoryRole-details.information"
+            renderAll={true}
+            props={{ role }}
+          />
+        </div>
+      </div>
+
+    );
+  }
+}
+
+export default translate("config")(PermissionRoleDetails);

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

@@ -0,0 +1,65 @@
+//@flow
+import React from "react";
+import type { Role } from "@scm-manager/ui-types";
+import { translate } from "react-i18next";
+import { compose } from "redux";
+import injectSheet from "react-jss";
+
+type Props = {
+  role: Role,
+  // context props
+  t: string => string
+};
+
+const styles = {
+  spacing: {
+    padding: "0 !important"
+  }
+};
+
+class PermissionRoleDetailsTable extends React.Component<Props> {
+  render() {
+    const { role, t } = this.props;
+    return (
+      <table className="table content">
+        <tbody>
+          <tr>
+            <th>{t("repositoryRole.name")}</th>
+            <td>{role.name}</td>
+          </tr>
+          <tr>
+            <th>{t("repositoryRole.type")}</th>
+            <td>{role.type}</td>
+          </tr>
+          {this.renderVerbs()}
+        </tbody>
+      </table>
+    );
+  }
+
+  renderVerbs() {
+    const { role, t, classes } = this.props;
+
+    let verbs = null;
+    if (role.verbs.length > 0) {
+      verbs = (
+        <tr>
+          <th>{t("repositoryRole.verbs")}</th>
+          <td className={classes.spacing}>
+            <ul>
+              {role.verbs.map(verb => {
+                return <li>{verb}</li>;
+              })}
+            </ul>
+          </td>
+        </tr>
+      );
+    }
+    return verbs;
+  }
+}
+
+export default compose(
+  injectSheet(styles),
+  translate("config")
+)(PermissionRoleDetailsTable);

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

@@ -19,14 +19,14 @@ type Props = {
   repositoryRolesLink: string,
 
   //dispatch function
-  addRole: (link: string, role: Role) => void
+  addRole: (link: string, role: Role, callback?: () => void) => void
 };
 
 class CreateRepositoryRole extends React.Component<Props> {
-  //Callback after dispatch
+
   repositoryRoleCreated = (role: Role) => {
     const { history } = this.props;
-    history.push("/role/" + role.name);
+    history.push("/config/role/" + role.name);
   };
 
   createRepositoryRole = (role: Role) => {
@@ -63,8 +63,8 @@ const mapStateToProps = (state, ownProps) => {
 
 const mapDispatchToProps = dispatch => {
   return {
-    addRole: (link: string, role: Role) => {
-      dispatch(createRole(link, role));
+    addRole: (link: string, role: Role, callback?: () => void) => {
+      dispatch(createRole(link, role, callback));
     }
   };
 };
@@ -72,4 +72,4 @@ const mapDispatchToProps = dispatch => {
 export default connect(
   mapStateToProps,
   mapDispatchToProps
-)(translate("roles")(CreateRepositoryRole));
+)(translate("config")(CreateRepositoryRole));

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

@@ -0,0 +1,71 @@
+// @flow
+import React from "react";
+import RepositoryRoleForm from "./RepositoryRoleForm";
+import { connect } from "react-redux";
+import { translate } from "react-i18next";
+import {
+  getModifyRoleFailure,
+  isModifyRolePending,
+  modifyRole,
+} from "../modules/roles";
+import type { Role } from "@scm-manager/ui-types";
+
+type Props = {
+  disabled: boolean,
+  role: Role,
+  repositoryRolesLink: string,
+
+  //dispatch function
+  updateRole: (link: string, role: Role, callback?: () => void) => void
+};
+
+
+
+class EditRepositoryRole extends React.Component<Props> {
+
+  repositoryRoleUpdated = (role: Role) => {
+    const { history } = this.props;
+    history.push("/config/role/" + role.name);
+  };
+
+  updateRepositoryRole = (role: Role) => {
+    this.props.updateRole(role, () =>
+      this.repositoryRoleUpdated(role)
+    );
+  };
+
+  render() {
+    return (
+      <>
+        <RepositoryRoleForm
+          disabled={false}
+          role={this.props.role}
+          submitForm={role => this.updateRepositoryRole(role)}
+        />
+      </>
+    );
+  }
+}
+
+const mapStateToProps = (state, ownProps) => {
+  const loading = isModifyRolePending(state);
+  const error = getModifyRoleFailure(state);
+
+  return {
+    loading,
+    error,
+  };
+};
+
+const mapDispatchToProps = dispatch => {
+  return {
+    updateRole: (role: Role, callback?: () => void) => {
+      dispatch(modifyRole(role, callback));
+    }
+  };
+};
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(translate("config")(EditRepositoryRole));

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

@@ -6,7 +6,6 @@ import type { Role } from "@scm-manager/ui-types";
 import { InputField, SubmitButton } from "@scm-manager/ui-components";
 import PermissionCheckbox from "../../../repos/permissions/components/PermissionCheckbox";
 import {
-  createRole,
   fetchAvailableVerbs,
   getFetchVerbsFailure,
   getVerbsFromState,
@@ -27,7 +26,6 @@ type Props = {
 
   // dispatch functions
   fetchAvailableVerbs: (link: string) => void
-  // addRole: (link: string, role: Role) => void
 };
 
 type State = {
@@ -51,6 +49,9 @@ class RepositoryRoleForm extends React.Component<Props, State> {
   componentDidMount() {
     const { fetchAvailableVerbs, verbsLink} = this.props;
     fetchAvailableVerbs(verbsLink);
+    if (this.props.role) {
+      this.setState({role: this.props.role})
+    }
   }
 
   isFalsy(value) {
@@ -107,7 +108,6 @@ class RepositoryRoleForm extends React.Component<Props, State> {
       : availableVerbs.map(verb => (
           <PermissionCheckbox
             key={verb}
-            // disabled={readOnly}
             name={verb}
             checked={role.verbs.includes(verb)}
             onChange={this.handleVerbChange}
@@ -164,13 +164,10 @@ const mapDispatchToProps = dispatch => {
     fetchAvailableVerbs: (link: string) => {
       dispatch(fetchAvailableVerbs(link));
     },
-    // addRole: (link: string, role: Role) => {
-    //   createRole(link, role)
-    // }
   };
 };
 
 export default connect(
   mapStateToProps,
   mapDispatchToProps
-)(translate("roles")(RepositoryRoleForm));
+)(translate("config")(RepositoryRoleForm));

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

@@ -1,22 +1,24 @@
 //@flow
 import React from "react";
 import { connect } from "react-redux";
-import {
-  Page,
-  Loading,
-  ErrorPage
-} from "@scm-manager/ui-components";
+import { Loading, ErrorPage, Title } from "@scm-manager/ui-components";
 import { Route } from "react-router";
 import type { History } from "history";
-import { EditRepositoryRoleNavLink, RepositoryRoleDetailNavLink } from "../../components/navLinks";
+import { EditRepositoryRoleNavLink } from "../../components/navLinks";
 import { translate } from "react-i18next";
 import type { Role } from "@scm-manager/ui-types";
-import {getRepositoryRolesLink} from "../../../modules/indexResource";
-import {ExtensionPoint} from "@scm-manager/ui-extensions";
-import {fetchRoleByName, getFetchRoleFailure, getRoleByName, isFetchRolePending} from "../modules/roles";
-import RepositoryRoleForm from "./RepositoryRoleForm";
-import {withRouter} from "react-router-dom";
-import PermissionRoleDetail from "../components/PermissionRoleDetail";
+import { getRepositoryRolesLink } from "../../../modules/indexResource";
+import { ExtensionPoint } from "@scm-manager/ui-extensions";
+import {
+  fetchRoleByName,
+  getFetchRoleFailure,
+  getRoleByName,
+  isFetchRolePending
+} from "../modules/roles";
+import { withRouter } from "react-router-dom";
+import PermissionRoleDetail from "../components/PermissionRoleDetails";
+import EditRepositoryRole from "./EditRepositoryRole";
+import Switch from "react-router-dom/es/Switch";
 
 type Props = {
   roleName: string,
@@ -37,8 +39,11 @@ type Props = {
 
 class SingleRepositoryRole extends React.Component<Props> {
   componentDidMount() {
-    this.props.fetchRoleByName(this.props.repositoryRolesLink, this.props.roleName);
-    console.log(this.props.match)
+    this.props.fetchRoleByName(
+      this.props.repositoryRolesLink,
+      this.props.roleName
+    );
+    console.log(this.props.match);
   }
 
   stripEndingSlash = (url: string) => {
@@ -77,22 +82,27 @@ class SingleRepositoryRole extends React.Component<Props> {
     };
 
     return (
-      <Page title={role.displayName}>
+      <>
+        <Title title={t("repositoryRoles.title")} />
         <div className="columns">
           <div className="column is-three-quarters">
-            <Route path={url} component={() => <PermissionRoleDetail role={role} />} />
-            <Route
-              path={`${url}/settings/general`}
-              component={() => <EditRepositoryRoleNavLink role={role} />}
-            />
-            <ExtensionPoint
-              name="user.route"
-              props={extensionProps}
-              renderAll={true}
-            />
+              <Route
+                path={url}
+                component={() => <PermissionRoleDetail role={role} url={url} />}
+              />
+              <Route
+                path={`${url}`}
+                exact
+                component={() => <EditRepositoryRole role={role} />}
+              />
+              <ExtensionPoint
+                name="roles.route"
+                props={extensionProps}
+                renderAll={true}
+              />
           </div>
         </div>
-      </Page>
+      </>
     );
   }
 }
@@ -120,7 +130,9 @@ const mapDispatchToProps = dispatch => {
   };
 };
 
-export default withRouter(connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(translate("users")(SingleRepositoryRole)));
+export default withRouter(
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  )(translate("config")(SingleRepositoryRole))
+);