Merged in feature/custom_roles_overview (pull request #250)

custom roles overview
2025-11-11 07:55:47 +01:00 · 2019-05-16 11:53:42 +00:00
parent f7c4ec06ce 4a08b47bd1
commit 4d5a86fdb4
90 changed files with 5248 additions and 547 deletions
--- a/scm-ui/src/repos/permissions/containers/AdvancedPermissionsDialog.js
+++ b/scm-ui/src/repos/permissions/containers/AdvancedPermissionsDialog.js
@@ -26,9 +26,11 @@ class AdvancedPermissionsDialog extends React.Component<Props, State> {

    const verbs = {};
    props.availableVerbs.forEach(
-      verb => (verbs[verb] = props.selectedVerbs.includes(verb))
+      verb =>
+        (verbs[verb] = props.selectedVerbs
+          ? props.selectedVerbs.includes(verb)
+          : false)
    );
-
    this.state = { verbs };
  }

--- a/scm-ui/src/repos/permissions/containers/CreatePermissionForm.js
+++ b/scm-ui/src/repos/permissions/containers/CreatePermissionForm.js
@@ -1,6 +1,12 @@
 // @flow
 import React from "react";
 import { translate } from "react-i18next";
+import type {
+  RepositoryRole,
+  PermissionCollection,
+  PermissionCreateEntry,
+  SelectValue
+} from "@scm-manager/ui-types";
 import {
  Subtitle,
  Autocomplete,
@@ -9,30 +15,28 @@ import {
  LabelWithHelpIcon,
  Radio
 } from "@scm-manager/ui-components";
-import RoleSelector from "../components/RoleSelector";
-import type {
-  AvailableRepositoryPermissions,
-  PermissionCollection,
-  PermissionCreateEntry,
-  SelectValue
-} from "@scm-manager/ui-types";
 import * as validator from "../components/permissionValidation";
-import { findMatchingRoleName } from "../modules/permissions";
+import RoleSelector from "../components/RoleSelector";
 import AdvancedPermissionsDialog from "./AdvancedPermissionsDialog";
+import { findVerbsForRole } from "../modules/permissions";

 type Props = {
-  t: string => string,
-  availablePermissions: AvailableRepositoryPermissions,
+  availableRoles: RepositoryRole[],
+  availableVerbs: string[],
  createPermission: (permission: PermissionCreateEntry) => void,
  loading: boolean,
  currentPermissions: PermissionCollection,
  groupAutoCompleteLink: string,
-  userAutoCompleteLink: string
+  userAutoCompleteLink: string,
+
+  // Context props
+  t: string => string
 };

 type State = {
  name: string,
-  verbs: string[],
+  role?: string,
+  verbs?: string[],
  groupPermission: boolean,
  valid: boolean,
  value?: SelectValue,
@@ -45,7 +49,8 @@ class CreatePermissionForm extends React.Component<Props, State> {

    this.state = {
      name: "",
-      verbs: props.availablePermissions.availableRoles[0].verbs,
+      role: props.availableRoles[0].name,
+      verbs: undefined,
      groupPermission: false,
      valid: true,
      value: undefined,
@@ -90,6 +95,7 @@ class CreatePermissionForm extends React.Component<Props, State> {
        });
      });
  }
+
  renderAutocompletionField = () => {
    const { t } = this.props;
    if (this.state.groupPermission) {
@@ -133,19 +139,17 @@ class CreatePermissionForm extends React.Component<Props, State> {
  };

  render() {
-    const { t, availablePermissions, loading } = this.props;
+    const { t, availableRoles, availableVerbs, loading } = this.props;
+    const { role, verbs, showAdvancedDialog } = this.state;

-    const { verbs, showAdvancedDialog } = this.state;
+    const availableRoleNames = availableRoles.map(r => r.name);

-    const availableRoleNames = availablePermissions.availableRoles.map(
-      r => r.name
-    );
-    const matchingRole = findMatchingRoleName(availablePermissions, verbs);
+    const selectedVerbs = role ? findVerbsForRole(availableRoles, role) : verbs;

    const advancedDialog = showAdvancedDialog ? (
      <AdvancedPermissionsDialog
-        availableVerbs={availablePermissions.availableVerbs}
-        selectedVerbs={verbs}
+        availableVerbs={availableVerbs}
+        selectedVerbs={selectedVerbs}
        onClose={this.closeAdvancedPermissionsDialog}
        onSubmit={this.submitAdvancedPermissionsDialog}
      />
@@ -187,7 +191,7 @@ class CreatePermissionForm extends React.Component<Props, State> {
                    label={t("permission.role")}
                    helpText={t("permission.help.roleHelpText")}
                    handleRoleChange={this.handleRoleChange}
-                    role={matchingRole}
+                    role={role}
                  />
                </div>
                <div className="column">
@@ -228,6 +232,7 @@ class CreatePermissionForm extends React.Component<Props, State> {
  submitAdvancedPermissionsDialog = (newVerbs: string[]) => {
    this.setState({
      showAdvancedDialog: false,
+      role: undefined,
      verbs: newVerbs
    });
  };
@@ -235,6 +240,7 @@ class CreatePermissionForm extends React.Component<Props, State> {
  submit = e => {
    this.props.createPermission({
      name: this.state.name,
+      role: this.state.role,
      verbs: this.state.verbs,
      groupPermission: this.state.groupPermission
    });
@@ -245,7 +251,8 @@ class CreatePermissionForm extends React.Component<Props, State> {
  removeState = () => {
    this.setState({
      name: "",
-      verbs: this.props.availablePermissions.availableRoles[0].verbs,
+      role: this.props.availableRoles[0].name,
+      verbs: undefined,
      valid: true,
      value: undefined
    });
@@ -257,14 +264,13 @@ class CreatePermissionForm extends React.Component<Props, State> {
      return;
    }
    this.setState({
-      verbs: selectedRole.verbs
+      role: selectedRole.name,
+      verbs: []
    });
  };

  findAvailableRole = (roleName: string) => {
-    return this.props.availablePermissions.availableRoles.find(
-      role => role.name === roleName
-    );
+    return this.props.availableRoles.find(role => role.name === roleName);
  };
 }

--- a/scm-ui/src/repos/permissions/containers/Permissions.js
+++ b/scm-ui/src/repos/permissions/containers/Permissions.js
@@ -19,7 +19,9 @@ import {
  getDeletePermissionsFailure,
  getModifyPermissionsFailure,
  modifyPermissionReset,
-  deletePermissionReset
+  deletePermissionReset,
+  getAvailableRepositoryRoles,
+  getAvailableRepositoryVerbs
 } from "../modules/permissions";
 import {
  Loading,
@@ -28,10 +30,10 @@ import {
  LabelWithHelpIcon
 } from "@scm-manager/ui-components";
 import type {
-  AvailableRepositoryPermissions,
  Permission,
  PermissionCollection,
-  PermissionCreateEntry
+  PermissionCreateEntry,
+  RepositoryRole
 } from "@scm-manager/ui-types";
 import SinglePermission from "./SinglePermission";
 import CreatePermissionForm from "./CreatePermissionForm";
@@ -39,11 +41,15 @@ import type { History } from "history";
 import { getPermissionsLink } from "../../modules/repos";
 import {
  getGroupAutoCompleteLink,
+  getRepositoryRolesLink,
+  getRepositoryVerbsLink,
  getUserAutoCompleteLink
 } from "../../../modules/indexResource";

 type Props = {
-  availablePermissions: AvailableRepositoryPermissions,
+  availablePermissions: boolean,
+  availableRepositoryRoles: RepositoryRole[],
+  availableVerbs: string[],
  namespace: string,
  repoName: string,
  loading: boolean,
@@ -51,12 +57,17 @@ type Props = {
  permissions: PermissionCollection,
  hasPermissionToCreate: boolean,
  loadingCreatePermission: boolean,
+  repositoryRolesLink: string,
+  repositoryVerbsLink: string,
  permissionsLink: string,
  groupAutoCompleteLink: string,
  userAutoCompleteLink: string,

  //dispatch functions
-  fetchAvailablePermissionsIfNeeded: () => void,
+  fetchAvailablePermissionsIfNeeded: (
+    repositoryRolesLink: string,
+    repositoryVerbsLink: string
+  ) => void,
  fetchPermissions: (link: string, namespace: string, repoName: string) => void,
  createPermission: (
    link: string,
@@ -74,7 +85,6 @@ type Props = {
  history: History
 };

-
 class Permissions extends React.Component<Props> {
  componentDidMount() {
    const {
@@ -85,13 +95,15 @@ class Permissions extends React.Component<Props> {
      modifyPermissionReset,
      createPermissionReset,
      deletePermissionReset,
-      permissionsLink
+      permissionsLink,
+      repositoryRolesLink,
+      repositoryVerbsLink
    } = this.props;

    createPermissionReset(namespace, repoName);
    modifyPermissionReset(namespace, repoName);
    deletePermissionReset(namespace, repoName);
-    fetchAvailablePermissionsIfNeeded();
+    fetchAvailablePermissionsIfNeeded(repositoryRolesLink, repositoryVerbsLink);
    fetchPermissions(permissionsLink, namespace, repoName);
  }

@@ -107,6 +119,8 @@ class Permissions extends React.Component<Props> {
  render() {
    const {
      availablePermissions,
+      availableRepositoryRoles,
+      availableVerbs,
      loading,
      error,
      permissions,
@@ -134,7 +148,8 @@ class Permissions extends React.Component<Props> {

    const createPermissionForm = hasPermissionToCreate ? (
      <CreatePermissionForm
-        availablePermissions={availablePermissions}
+        availableRoles={availableRepositoryRoles}
+        availableVerbs={availableVerbs}
        createPermission={permission => this.createPermission(permission)}
        loading={loadingCreatePermission}
        currentPermissions={permissions}
@@ -174,7 +189,8 @@ class Permissions extends React.Component<Props> {
            {permissions.map(permission => {
              return (
                <SinglePermission
-                  availablePermissions={availablePermissions}
+                  availableRepositoryRoles={availableRepositoryRoles}
+                  availableRepositoryVerbs={availableVerbs}
                  key={permission.name + permission.groupPermission.toString()}
                  namespace={namespace}
                  repoName={repoName}
@@ -209,14 +225,23 @@ const mapStateToProps = (state, ownProps) => {
    repoName
  );
  const hasPermissionToCreate = hasCreatePermission(state, namespace, repoName);
+  const repositoryRolesLink = getRepositoryRolesLink(state);
+  const repositoryVerbsLink = getRepositoryVerbsLink(state);
  const permissionsLink = getPermissionsLink(state, namespace, repoName);
  const groupAutoCompleteLink = getGroupAutoCompleteLink(state);
  const userAutoCompleteLink = getUserAutoCompleteLink(state);
  const availablePermissions = getAvailablePermissions(state);
+  const availableRepositoryRoles = getAvailableRepositoryRoles(state);
+  const availableVerbs = getAvailableRepositoryVerbs(state);
+
  return {
    availablePermissions,
+    availableRepositoryRoles,
+    availableVerbs,
    namespace,
    repoName,
+    repositoryRolesLink,
+    repositoryVerbsLink,
    error,
    loading,
    permissions,
@@ -233,8 +258,16 @@ const mapDispatchToProps = dispatch => {
    fetchPermissions: (link: string, namespace: string, repoName: string) => {
      dispatch(fetchPermissions(link, namespace, repoName));
    },
-    fetchAvailablePermissionsIfNeeded: () => {
-      dispatch(fetchAvailablePermissionsIfNeeded());
+    fetchAvailablePermissionsIfNeeded: (
+      repositoryRolesLink: string,
+      repositoryVerbsLink: string
+    ) => {
+      dispatch(
+        fetchAvailablePermissionsIfNeeded(
+          repositoryRolesLink,
+          repositoryVerbsLink
+        )
+      );
    },
    createPermission: (
      link: string,
--- a/scm-ui/src/repos/permissions/containers/SinglePermission.js
+++ b/scm-ui/src/repos/permissions/containers/SinglePermission.js
@@ -1,16 +1,13 @@
 // @flow
 import React from "react";
-import type {
-  AvailableRepositoryPermissions,
-  Permission
-} from "@scm-manager/ui-types";
+import type { RepositoryRole, Permission } from "@scm-manager/ui-types";
 import { translate } from "react-i18next";
 import {
  modifyPermission,
  isModifyPermissionPending,
  deletePermission,
  isDeletePermissionPending,
-  findMatchingRoleName
+  findVerbsForRole
 } from "../modules/permissions";
 import { connect } from "react-redux";
 import type { History } from "history";
@@ -22,7 +19,8 @@ import classNames from "classnames";
 import injectSheet from "react-jss";

 type Props = {
-  availablePermissions: AvailableRepositoryPermissions,
+  availableRepositoryRoles: RepositoryRole[],
+  availableRepositoryVerbs: string[],
  submitForm: Permission => void,
  modifyPermission: (
    permission: Permission,
@@ -46,7 +44,6 @@ type Props = {
 };

 type State = {
-  role: string,
  permission: Permission,
  showAdvancedDialog: boolean
 };
@@ -68,39 +65,34 @@ class SinglePermission extends React.Component<Props, State> {
  constructor(props: Props) {
    super(props);

-    const defaultPermission = props.availablePermissions.availableRoles
-      ? props.availablePermissions.availableRoles[0]
+    const defaultPermission = props.availableRepositoryRoles
+      ? props.availableRepositoryRoles[0]
      : {};

    this.state = {
      permission: {
        name: "",
+        role: undefined,
        verbs: defaultPermission.verbs,
        groupPermission: false,
        _links: {}
      },
-      role: defaultPermission.name,
      showAdvancedDialog: false
    };
  }

  componentDidMount() {
-    const { availablePermissions, permission } = this.props;
-
-    const matchingRole = findMatchingRoleName(
-      availablePermissions,
-      permission.verbs
-    );
+    const { permission } = this.props;

    if (permission) {
      this.setState({
        permission: {
          name: permission.name,
+          role: permission.role,
          verbs: permission.verbs,
          groupPermission: permission.groupPermission,
          _links: permission._links
-        },
-        role: matchingRole
+        }
      });
    }
  }
@@ -114,37 +106,41 @@ class SinglePermission extends React.Component<Props, State> {
  };

  render() {
-    const { role, permission, showAdvancedDialog } = this.state;
+    const { permission, showAdvancedDialog } = this.state;
    const {
      t,
-      availablePermissions,
+      availableRepositoryRoles,
+      availableRepositoryVerbs,
      loading,
      namespace,
      repoName,
      classes
    } = this.props;
-    const availableRoleNames = availablePermissions.availableRoles.map(
-      r => r.name
-    );
+    const availableRoleNames =
+      !!availableRepositoryRoles && availableRepositoryRoles.map(r => r.name);
    const readOnly = !this.mayChangePermissions();
    const roleSelector = readOnly ? (
-      <td>{role}</td>
+      <td>{permission.role ? permission.role : t("permission.custom")}</td>
    ) : (
      <td>
        <RoleSelector
          handleRoleChange={this.handleRoleChange}
          availableRoles={availableRoleNames}
-          role={role}
+          role={permission.role}
          loading={loading}
        />
      </td>
    );

-    const advancedDialg = showAdvancedDialog ? (
+    const selectedVerbs = permission.role
+      ? findVerbsForRole(availableRepositoryRoles, permission.role)
+      : permission.verbs;
+
+    const advancedDialog = showAdvancedDialog ? (
      <AdvancedPermissionsDialog
        readOnly={readOnly}
-        availableVerbs={availablePermissions.availableVerbs}
-        selectedVerbs={permission.verbs}
+        availableVerbs={availableRepositoryVerbs}
+        selectedVerbs={selectedVerbs}
        onClose={this.closeAdvancedPermissionsDialog}
        onSubmit={this.submitAdvancedPermissionsDialog}
      />
@@ -152,9 +148,15 @@ class SinglePermission extends React.Component<Props, State> {

    const iconType =
      permission && permission.groupPermission ? (
-        <i title={t("permission.group")} className={classNames("fas fa-user-friends", classes.iconColor)} />
+        <i
+          title={t("permission.group")}
+          className={classNames("fas fa-user-friends", classes.iconColor)}
+        />
      ) : (
-        <i title={t("permission.user")} className={classNames("fas fa-user", classes.iconColor)} />
+        <i
+          title={t("permission.user")}
+          className={classNames("fas fa-user", classes.iconColor)}
+        />
      );

    return (
@@ -177,7 +179,7 @@ class SinglePermission extends React.Component<Props, State> {
            deletePermission={this.deletePermission}
            loading={this.props.deleteLoading}
          />
-          {advancedDialg}
+          {advancedDialog}
        </td>
      </tr>
    );
@@ -197,41 +199,41 @@ class SinglePermission extends React.Component<Props, State> {

  submitAdvancedPermissionsDialog = (newVerbs: string[]) => {
    const { permission } = this.state;
-    const newRole = findMatchingRoleName(
-      this.props.availablePermissions,
-      newVerbs
-    );
    this.setState(
      {
        showAdvancedDialog: false,
-        permission: { ...permission, verbs: newVerbs },
-        role: newRole
+        permission: { ...permission, role: undefined, verbs: newVerbs }
      },
-      () => this.modifyPermission(newVerbs)
+      () => this.modifyPermissionVerbs(newVerbs)
    );
  };

  handleRoleChange = (role: string) => {
-    const selectedRole = this.findAvailableRole(role);
+    const { permission } = this.state;
    this.setState(
      {
-        permission: {
-          ...this.state.permission,
-          verbs: selectedRole.verbs
-        },
-        role: role
+        permission: { ...permission, role: role, verbs: undefined }
      },
-      () => this.modifyPermission(selectedRole.verbs)
+      () => this.modifyPermissionRole(role)
    );
  };

  findAvailableRole = (roleName: string) => {
-    return this.props.availablePermissions.availableRoles.find(
-      role => role.name === roleName
+    const { availableRepositoryRoles } = this.props;
+    return availableRepositoryRoles.find(role => role.name === roleName);
+  };
+
+  modifyPermissionRole = (role: string) => {
+    let permission = this.state.permission;
+    permission.role = role;
+    this.props.modifyPermission(
+      permission,
+      this.props.namespace,
+      this.props.repoName
    );
  };

-  modifyPermission = (verbs: string[]) => {
+  modifyPermissionVerbs = (verbs: string[]) => {
    let permission = this.state.permission;
    permission.verbs = verbs;
    this.props.modifyPermission(