Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-05-06 22:36:46 +02:00
Code Issues Packages Projects Releases Activity

merge

Browse Source
This commit is contained in:
Eduard Heimbuch
2019-05-16 09:13:59 +02:00
parent 45733db6fa ff46c3ef42
commit 319804868f
10 changed files with 102 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scm-ui-components/packages/ui-components/src/buttons/Button.js
View File

@@ -12,6 +12,8 @@ export type ButtonProps = {
fullWidth?: boolean,
className?: string,
children?: React.Node,
// context props
classes: any
};

13
scm-ui-components/packages/ui-types/src/RepositoryPermissions.js
View File

@@ -1,14 +1,15 @@
//@flow
import type {Links} from "./hal";
export type PermissionCreateEntry = {
name: string,
role?: string,
verbs?: string[],
groupPermission: boolean
}
export type Permission = PermissionCreateEntry & {
_links: Links
};
export type PermissionCreateEntry = {
name: string,
verbs: string[],
groupPermission: boolean
}
export type PermissionCollection = Permission[];

4
scm-ui/public/locales/de/config.json
View File

@@ -29,6 +29,10 @@
"submit": "Speichern"
}
},
"role": {
"name": "Name",
"system": "System"
},
"config-form": {
"submit": "Speichern",
"submit-success-notification": "Einstellungen wurden erfolgreich geändert!",

1
scm-ui/public/locales/de/repos.json
View File

@@ -119,6 +119,7 @@
"error-subtitle": "Unbekannter Fehler bei Berechtigung",
"name": "Benutzer oder Gruppe",
"role": "Rolle",
"custom": "CUSTOM",
"permissions": "Berechtigung",
"group-permission": "Gruppenberechtigung",
"user-permission": "Benutzerberechtigung",

1
scm-ui/public/locales/en/repos.json
View File

@@ -122,6 +122,7 @@
"error-subtitle": "Unknown permissions error",
"name": "User or group",
"role": "Role",
"custom": "CUSTOM",
"permissions": "Permissions",
"group-permission": "Group Permission",
"user-permission": "User Permission",

6
scm-ui/src/repos/permissions/containers/AdvancedPermissionsDialog.js
View File

@@ -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 };
}

49
scm-ui/src/repos/permissions/containers/CreatePermissionForm.js
View File

@@ -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 {
Autocomplete,
SubmitButton,
@@ -8,31 +14,27 @@ import {
LabelWithHelpIcon,
Radio
} from "@scm-manager/ui-components";
import RoleSelector from "../components/RoleSelector";
import type {
RepositoryRole,
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";
type Props = {
t: string => string,
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 +47,8 @@ class CreatePermissionForm extends React.Component<Props, State> {
this.state = {
name: "",
verbs: props.availableRoles[0].verbs,
role: props.availableRoles[0].name,
verbs: undefined,
groupPermission: false,
valid: true,
value: undefined,
@@ -90,6 +93,7 @@ class CreatePermissionForm extends React.Component<Props, State> {
});
});
}
renderAutocompletionField = () => {
const { t } = this.props;
if (this.state.groupPermission) {
@@ -134,13 +138,9 @@ class CreatePermissionForm extends React.Component<Props, State> {
render() {
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 matchingRole = findMatchingRoleName(availableRoles, verbs);
const availableRoleNames = availableRoles.map(r => r.name);
const advancedDialog = showAdvancedDialog ? (
<AdvancedPermissionsDialog
@@ -189,7 +189,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">
@@ -230,6 +230,7 @@ class CreatePermissionForm extends React.Component<Props, State> {
submitAdvancedPermissionsDialog = (newVerbs: string[]) => {
this.setState({
showAdvancedDialog: false,
role: undefined,
verbs: newVerbs
});
};
@@ -237,6 +238,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
});
@@ -247,7 +249,8 @@ class CreatePermissionForm extends React.Component<Props, State> {
removeState = () => {
this.setState({
name: "",
verbs: this.props.availableRoles[0].verbs,
role: this.props.availableRoles[0].name,
verbs: undefined,
valid: true,
value: undefined
});
@@ -259,14 +262,12 @@ class CreatePermissionForm extends React.Component<Props, State> {
return;
}
this.setState({
verbs: selectedRole.verbs
role: selectedRole.name
});
};
findAvailableRole = (roleName: string) => {
return this.props.availableRoles.find(
role => role.name === roleName
);
return this.props.availableRoles.find(role => role.name === roleName);
};
}

27
scm-ui/src/repos/permissions/containers/Permissions.js
View File

@@ -19,7 +19,9 @@ import {
getDeletePermissionsFailure,
getModifyPermissionsFailure,
modifyPermissionReset,
deletePermissionReset, getAvailableRepositoryRoles, getAvailableRepositoryVerbs
deletePermissionReset,
getAvailableRepositoryRoles,
getAvailableRepositoryVerbs
} from "../modules/permissions";
import {
Loading,
@@ -38,11 +40,14 @@ import CreatePermissionForm from "./CreatePermissionForm";
import type { History } from "history";
import { getPermissionsLink } from "../../modules/repos";
import {
getGroupAutoCompleteLink, getRepositoryRolesLink, getRepositoryVerbsLink,
getGroupAutoCompleteLink,
getRepositoryRolesLink,
getRepositoryVerbsLink,
getUserAutoCompleteLink
} from "../../../modules/indexResource";
type Props = {
availablePermissions: boolean,
availableRepositoryRoles: RepositoryRole[],
availableVerbs: string[],
namespace: string,
@@ -59,7 +64,10 @@ type Props = {
userAutoCompleteLink: string,
//dispatch functions
fetchAvailablePermissionsIfNeeded: () => void,
fetchAvailablePermissionsIfNeeded: (
repositoryRolesLink: string,
repositoryVerbsLink: string
) => void,
fetchPermissions: (link: string, namespace: string, repoName: string) => void,
createPermission: (
link: string,
@@ -77,7 +85,6 @@ type Props = {
history: History
};
class Permissions extends React.Component<Props> {
componentDidMount() {
const {
@@ -251,8 +258,16 @@ const mapDispatchToProps = dispatch => {
fetchPermissions: (link: string, namespace: string, repoName: string) => {
dispatch(fetchPermissions(link, namespace, repoName));
},
fetchAvailablePermissionsIfNeeded: (repositoryRolesLink: string, repositoryVerbsLink: string) => {
dispatch(fetchAvailablePermissionsIfNeeded(repositoryRolesLink, repositoryVerbsLink));
fetchAvailablePermissionsIfNeeded: (
repositoryRolesLink: string,
repositoryVerbsLink: string
) => {
dispatch(
fetchAvailablePermissionsIfNeeded(
repositoryRolesLink,
repositoryVerbsLink
)
);
},
createPermission: (
link: string,

80
scm-ui/src/repos/permissions/containers/SinglePermission.js
View File

@@ -1,16 +1,12 @@
// @flow
import React from "react";
import type {
RepositoryRole,
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
isDeletePermissionPending
} from "../modules/permissions";
import { connect } from "react-redux";
import type { History } from "history";
@@ -47,7 +43,6 @@ type Props = {
};
type State = {
role: string,
permission: Permission,
showAdvancedDialog: boolean
};
@@ -69,39 +64,34 @@ class SinglePermission extends React.Component<Props, State> {
constructor(props: Props) {
super(props);
const defaultPermission = props.availableRoles
? props.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 { availableRepositoryRoles, permission } = this.props;
const matchingRole = findMatchingRoleName(
availableRepositoryRoles,
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
}
});
}
}
@@ -115,7 +105,7 @@ class SinglePermission extends React.Component<Props, State> {
};
render() {
const { role, permission, showAdvancedDialog } = this.state;
const { permission, showAdvancedDialog } = this.state;
const {
t,
availableRepositoryRoles,
@@ -125,18 +115,17 @@ class SinglePermission extends React.Component<Props, State> {
repoName,
classes
} = this.props;
const availableRoleNames = !!availableRepositoryRoles && availableRepositoryRoles.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>
@@ -154,9 +143,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 (
@@ -199,42 +194,41 @@ class SinglePermission extends React.Component<Props, State> {
submitAdvancedPermissionsDialog = (newVerbs: string[]) => {
const { permission } = this.state;
const newRole = findMatchingRoleName(
this.props.availableRoles,
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) => {
const { availableRepositoryRoles } = this.props;
return availableRepositoryRoles.find(
role => role.name === roleName
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(

32
scm-ui/src/repos/permissions/modules/permissions.js
View File

@@ -739,35 +739,3 @@ export function getModifyPermissionsFailure(
}
return null;
}
export function findMatchingRoleName(
availableRoles: RepositoryRole[],
verbs: string[]
) {
if (!verbs) {
return "";
}
const matchingRole =
!!availableRoles &&
availableRoles.find(role => {
return equalVerbs(role.verbs, verbs);
});
if (matchingRole) {
return matchingRole.name;
} else {
return "";
}
}
function equalVerbs(verbs1: string[], verbs2: string[]) {
if (!verbs1 || !verbs2) {
return false;
}
if (verbs1.length !== verbs2.length) {
return false;
}
return verbs1.every(verb => verbs2.includes(verb));
}