Load available permissions and find matching role

2025-11-09 15:05:44 +01:00 · 2019-01-24 09:53:26 +01:00
parent 5d3cbff461
commit 5b8518fbd9
4 changed files with 286 additions and 219 deletions
--- a/scm-ui/src/repos/permissions/components/TypeSelector.js
+++ b/scm-ui/src/repos/permissions/components/TypeSelector.js
@@ -1,42 +1,51 @@
-// @flow
-import React from "react";
-import { translate } from "react-i18next";
-import { Select } from "@scm-manager/ui-components";
-
-type Props = {
-  t: string => string,
-  handleTypeChange: string => void,
-  type: string,
-  label?: string,
-  helpText?: string,
-  loading?: boolean
-};
-
-class TypeSelector extends React.Component<Props> {
-  render() {
-    const { type, handleTypeChange, loading, label, helpText } = this.props;
-    const types = ["READ", "OWNER", "WRITE"];
-
-    return (
-      <Select
-        onChange={handleTypeChange}
-        value={type ? type : "READ"}
-        options={this.createSelectOptions(types)}
-        loading={loading}
-        label={label}
-        helpText={helpText}
-      />
-    );
-  }
-
-  createSelectOptions(types: string[]) {
-    return types.map(type => {
-      return {
-        label: type,
-        value: type
-      };
-    });
-  }
-}
-
-export default translate("repos")(TypeSelector);
+// @flow
+import React from "react";
+import { translate } from "react-i18next";
+import { Select } from "@scm-manager/ui-components";
+
+type Props = {
+  t: string => string,
+  availableTypes: string[],
+  handleTypeChange: string => void,
+  type: string,
+  label?: string,
+  helpText?: string,
+  loading?: boolean
+};
+
+class TypeSelector extends React.Component<Props> {
+  render() {
+    const {
+      availableTypes,
+      type,
+      handleTypeChange,
+      loading,
+      label,
+      helpText
+    } = this.props;
+
+    if (!availableTypes) return null;
+
+    return (
+      <Select
+        onChange={handleTypeChange}
+        value={type ? type : availableTypes[0]}
+        options={this.createSelectOptions(availableTypes)}
+        loading={loading}
+        label={label}
+        helpText={helpText}
+      />
+    );
+  }
+
+  createSelectOptions(types: string[]) {
+    return types.map(type => {
+      return {
+        label: type,
+        value: type
+      };
+    });
+  }
+}
+
+export default translate("repos")(TypeSelector);
--- a/scm-ui/src/repos/permissions/containers/Permissions.js
+++ b/scm-ui/src/repos/permissions/containers/Permissions.js
@@ -6,6 +6,7 @@ import {
  fetchAvailablePermissionsIfNeeded,
  fetchPermissions,
  getFetchAvailablePermissionsFailure,
+  getAvailablePermissions,
  getFetchPermissionsFailure,
  isFetchAvailablePermissionsPending,
  isFetchPermissionsPending,
@@ -22,6 +23,7 @@ import {
 } from "../modules/permissions";
 import { Loading, ErrorPage } from "@scm-manager/ui-components";
 import type {
+  AvailableRepositoryPermissions,
  Permission,
  PermissionCollection,
  PermissionCreateEntry
@@ -36,6 +38,7 @@ import {
 } from "../../../modules/indexResource";

 type Props = {
+  availablePermissions: AvailableRepositoryPermissions,
  namespace: string,
  repoName: string,
  loading: boolean,
@@ -97,6 +100,7 @@ class Permissions extends React.Component<Props> {

  render() {
    const {
+      availablePermissions,
      loading,
      error,
      permissions,
@@ -118,7 +122,7 @@ class Permissions extends React.Component<Props> {
      );
    }

-    if (loading || !permissions) {
+    if (loading || !permissions || !availablePermissions) {
      return <Loading />;
    }

@@ -149,6 +153,7 @@ class Permissions extends React.Component<Props> {
            {permissions.map(permission => {
              return (
                <SinglePermission
+                  availablePermissions={availablePermissions}
                  key={permission.name + permission.groupPermission.toString()}
                  namespace={namespace}
                  repoName={repoName}
@@ -186,7 +191,9 @@ const mapStateToProps = (state, ownProps) => {
  const permissionsLink = getPermissionsLink(state, namespace, repoName);
  const groupAutoCompleteLink = getGroupAutoCompleteLink(state);
  const userAutoCompleteLink = getUserAutoCompleteLink(state);
+  const availablePermissions = getAvailablePermissions(state);
  return {
+    availablePermissions,
    namespace,
    repoName,
    error,
--- a/scm-ui/src/repos/permissions/containers/SinglePermission.js
+++ b/scm-ui/src/repos/permissions/containers/SinglePermission.js
@@ -1,176 +1,221 @@
-// @flow
-import React from "react";
-import type { Permission } from "@scm-manager/ui-types";
-import { translate } from "react-i18next";
-import {
-  modifyPermission,
-  isModifyPermissionPending,
-  deletePermission,
-  isDeletePermissionPending
-} from "../modules/permissions";
-import { connect } from "react-redux";
-import type { History } from "history";
-import { Checkbox } from "@scm-manager/ui-components";
-import DeletePermissionButton from "../components/buttons/DeletePermissionButton";
-import TypeSelector from "../components/TypeSelector";
-
-type Props = {
-  submitForm: Permission => void,
-  modifyPermission: (Permission, string, string) => void,
-  permission: Permission,
-  t: string => string,
-  namespace: string,
-  repoName: string,
-  match: any,
-  history: History,
-  loading: boolean,
-  deletePermission: (Permission, string, string) => void,
-  deleteLoading: boolean
-};
-
-type State = {
-  permission: Permission
-};
-
-class SinglePermission extends React.Component<Props, State> {
-  constructor(props: Props) {
-    super(props);
-
-    this.state = {
-      permission: {
-        name: "",
-        type: "READ",
-        groupPermission: false,
-        _links: {}
-      }
-    };
-  }
-
-  componentDidMount() {
-    const { permission } = this.props;
-    if (permission) {
-      this.setState({
-        permission: {
-          name: permission.name,
-          type: permission.type,
-          groupPermission: permission.groupPermission,
-          _links: permission._links
-        }
-      });
-    }
-  }
-
-  deletePermission = () => {
-    this.props.deletePermission(
-      this.props.permission,
-      this.props.namespace,
-      this.props.repoName
-    );
-  };
-
-  render() {
-    const { permission } = this.state;
-    const { loading, namespace, repoName } = this.props;
-    const typeSelector =
-      this.props.permission._links && this.props.permission._links.update ? (
-        <td>
-          <TypeSelector
-            handleTypeChange={this.handleTypeChange}
-            type={permission.type ? permission.type : "READ"}
-            loading={loading}
-          />
-        </td>
-      ) : (
-        <td>{permission.type}</td>
-      );
-
-    return (
-      <tr>
-        <td>{permission.name}</td>
-        <td>
-          <Checkbox checked={permission ? permission.groupPermission : false} />
-        </td>
-        {typeSelector}
-        <td>
-          <DeletePermissionButton
-            permission={permission}
-            namespace={namespace}
-            repoName={repoName}
-            deletePermission={this.deletePermission}
-            loading={this.props.deleteLoading}
-          />
-        </td>
-      </tr>
-    );
-  }
-
-  handleTypeChange = (type: string) => {
-    this.setState({
-      permission: {
-        ...this.state.permission,
-        type: type
-      }
-    });
-    this.modifyPermission(type);
-  };
-
-  modifyPermission = (type: string) => {
-    let permission = this.state.permission;
-    permission.type = type;
-    this.props.modifyPermission(
-      permission,
-      this.props.namespace,
-      this.props.repoName
-    );
-  };
-
-  createSelectOptions(types: string[]) {
-    return types.map(type => {
-      return {
-        label: type,
-        value: type
-      };
-    });
-  }
-}
-
-const mapStateToProps = (state, ownProps) => {
-  const permission = ownProps.permission;
-  const loading = isModifyPermissionPending(
-    state,
-    ownProps.namespace,
-    ownProps.repoName,
-    permission
-  );
-  const deleteLoading = isDeletePermissionPending(
-    state,
-    ownProps.namespace,
-    ownProps.repoName,
-    permission
-  );
-
-  return { loading, deleteLoading };
-};
-
-const mapDispatchToProps = dispatch => {
-  return {
-    modifyPermission: (
-      permission: Permission,
-      namespace: string,
-      repoName: string
-    ) => {
-      dispatch(modifyPermission(permission, namespace, repoName));
-    },
-    deletePermission: (
-      permission: Permission,
-      namespace: string,
-      repoName: string
-    ) => {
-      dispatch(deletePermission(permission, namespace, repoName));
-    }
-  };
-};
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(translate("repos")(SinglePermission));
+// @flow
+import React from "react";
+import type {
+  AvailableRepositoryPermissions,
+  Permission
+} from "@scm-manager/ui-types";
+import { translate } from "react-i18next";
+import {
+  modifyPermission,
+  isModifyPermissionPending,
+  deletePermission,
+  isDeletePermissionPending
+} from "../modules/permissions";
+import { connect } from "react-redux";
+import type { History } from "history";
+import { Checkbox } from "@scm-manager/ui-components";
+import DeletePermissionButton from "../components/buttons/DeletePermissionButton";
+import TypeSelector from "../components/TypeSelector";
+
+type Props = {
+  availablePermissions: AvailableRepositoryPermissions,
+  submitForm: Permission => void,
+  modifyPermission: (Permission, string, string) => void,
+  permission: Permission,
+  t: string => string,
+  namespace: string,
+  repoName: string,
+  match: any,
+  history: History,
+  loading: boolean,
+  deletePermission: (Permission, string, string) => void,
+  deleteLoading: boolean
+};
+
+type State = {
+  role: string,
+  permission: Permission
+};
+
+class SinglePermission extends React.Component<Props, State> {
+  constructor(props: Props) {
+    super(props);
+
+    const defaultPermission = props.availablePermissions.availableRoles
+      ? props.availablePermissions.availableRoles[0]
+      : {};
+
+    this.state = {
+      permission: {
+        name: "",
+        verbs: defaultPermission.verbs,
+        groupPermission: false,
+        _links: {}
+      },
+      role: defaultPermission.name
+    };
+  }
+
+  componentDidMount() {
+    const { permission } = this.props;
+
+    const matchingRole = this.findMatchingRoleName();
+
+    if (permission) {
+      this.setState({
+        permission: {
+          name: permission.name,
+          verbs: permission.verbs,
+          groupPermission: permission.groupPermission,
+          _links: permission._links
+        },
+        role: matchingRole
+      });
+    }
+  }
+
+  findMatchingRoleName = () => {
+    const { availablePermissions, permission } = this.props;
+    if (!permission) {
+      return "";
+    }
+    const matchingRole = availablePermissions.availableRoles.find(role => {
+      return this.equalVerbs(role.verbs, permission.verbs);
+    });
+
+    if (matchingRole) {
+      return matchingRole.name;
+    } else {
+      return "";
+    }
+  };
+  equalVerbs = (verbs1: string[], verbs2: string[]) => {
+    if (!verbs1 || !verbs2) {
+      return false;
+    }
+
+    if (verbs1.length !== verbs2.length) {
+      return false;
+    }
+
+    return verbs1.every(verb => verbs2.includes(verb));
+  };
+
+  deletePermission = () => {
+    this.props.deletePermission(
+      this.props.permission,
+      this.props.namespace,
+      this.props.repoName
+    );
+  };
+
+  render() {
+    const { role, permission } = this.state;
+    const { availablePermissions, loading, namespace, repoName } = this.props;
+    const availableRoleNames = availablePermissions.availableRoles.map(
+      r => r.name
+    );
+    const typeSelector =
+      this.props.permission._links && this.props.permission._links.update ? (
+        <td>
+          <TypeSelector
+            handleTypeChange={this.handleTypeChange}
+            availableTypes={availableRoleNames}
+            type={role}
+            loading={loading}
+          />
+        </td>
+      ) : (
+        <td>{role}</td>
+      );
+
+    return (
+      <tr>
+        <td>{permission.name}</td>
+        <td>
+          <Checkbox checked={permission ? permission.groupPermission : false} />
+        </td>
+        {typeSelector}
+        <td>
+          <DeletePermissionButton
+            permission={permission}
+            namespace={namespace}
+            repoName={repoName}
+            deletePermission={this.deletePermission}
+            loading={this.props.deleteLoading}
+          />
+        </td>
+      </tr>
+    );
+  }
+
+  handleTypeChange = (type: string) => {
+    this.setState({
+      permission: {
+        ...this.state.permission,
+        type: type
+      }
+    });
+    this.modifyPermission(type);
+  };
+
+  modifyPermission = (type: string) => {
+    let permission = this.state.permission;
+    permission.type = type;
+    this.props.modifyPermission(
+      permission,
+      this.props.namespace,
+      this.props.repoName
+    );
+  };
+
+  createSelectOptions(types: string[]) {
+    return types.map(type => {
+      return {
+        label: type,
+        value: type
+      };
+    });
+  }
+}
+
+const mapStateToProps = (state, ownProps) => {
+  const permission = ownProps.permission;
+  const loading = isModifyPermissionPending(
+    state,
+    ownProps.namespace,
+    ownProps.repoName,
+    permission
+  );
+  const deleteLoading = isDeletePermissionPending(
+    state,
+    ownProps.namespace,
+    ownProps.repoName,
+    permission
+  );
+
+  return { loading, deleteLoading };
+};
+
+const mapDispatchToProps = dispatch => {
+  return {
+    modifyPermission: (
+      permission: Permission,
+      namespace: string,
+      repoName: string
+    ) => {
+      dispatch(modifyPermission(permission, namespace, repoName));
+    },
+    deletePermission: (
+      permission: Permission,
+      namespace: string,
+      repoName: string
+    ) => {
+      dispatch(deletePermission(permission, namespace, repoName));
+    }
+  };
+};
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(translate("repos")(SinglePermission));
--- a/scm-ui/src/repos/permissions/modules/permissions.js
+++ b/scm-ui/src/repos/permissions/modules/permissions.js
@@ -534,6 +534,12 @@ export default function reducer(

 // selectors

+export function getAvailablePermissions(state: Object) {
+  if (state.permissions) {
+    return state.permissions.available;
+  }
+}
+
 export function getPermissionsOfRepo(
  state: Object,
  namespace: string,