Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-15 17:56:17 +01:00
Code Issues Packages Projects Releases Activity

transfer remove button of each component to a global remove button

Browse Source
This commit is contained in:
Maren Süwer
2018-08-21 11:27:35 +02:00
parent cd0c1a5f2a
commit 68f62b9b05
7 changed files with 19 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
scm-ui/src/config/components/buttons/RemoveAdminGroupButton.js
View File

@@ -1,34 +0,0 @@
//@flow
import React from "react";
import { DeleteButton } from "../../../components/buttons";
import { translate } from "react-i18next";
import classNames from "classnames";
type Props = {
t: string => string,
groupname: string,
removeGroup: string => void,
disabled: boolean
};
type State = {};
class RemoveAdminGroupButton extends React.Component<Props, State> {
render() {
const { t, groupname, removeGroup, disabled } = this.props;
return (
<div className={classNames("is-pulled-right")}>
<DeleteButton
label={t("admin-settings.remove-group-button")}
action={(event: Event) => {
event.preventDefault();
removeGroup(groupname);
}}
disabled={disabled}
/>
</div>
);
}
}
export default translate("config")(RemoveAdminGroupButton);

34
scm-ui/src/config/components/buttons/RemoveAdminUserButton.js
View File

@@ -1,34 +0,0 @@
//@flow
import React from "react";
import { DeleteButton } from "../../../components/buttons";
import { translate } from "react-i18next";
import classNames from "classnames";
type Props = {
t: string => string,
username: string,
removeUser: string => void,
disabled: boolean
};
type State = {};
class RemoveAdminUserButton extends React.Component<Props, State> {
render() {
const { t, username, removeUser, disabled } = this.props;
return (
<div className={classNames("is-pulled-right")}>
<DeleteButton
label={t("admin-settings.remove-user-button")}
action={(event: Event) => {
event.preventDefault();
removeUser(username);
}}
disabled={disabled}
/>
</div>
);
}
}
export default translate("config")(RemoveAdminUserButton);

36
scm-ui/src/config/components/buttons/RemoveProxyExcludeButton.js
View File

@@ -1,36 +0,0 @@
//@flow
import React from "react";
import {DeleteButton} from "../../../components/buttons";
import { translate } from "react-i18next";
import classNames from "classnames";
type Props = {
t: string => string,
proxyExcludeName: string,
removeProxyExclude: string => void,
disabled: boolean
};
type State = {};
class RemoveProxyExcludeButton extends React.Component<Props, State> {
render() {
const { t , proxyExcludeName, removeProxyExclude} = this.props;
return (
<div className={classNames("is-pulled-right")}>
<DeleteButton
label={t("proxy-settings.remove-proxy-exclude-button")}
action={(event: Event) => {
event.preventDefault();
removeProxyExclude(proxyExcludeName);
}}
disabled={this.props.disabled}
/>
</div>
);
}
}
export default translate("config")(RemoveProxyExcludeButton);

11
scm-ui/src/config/components/table/AdminGroupTable.js
View File

@@ -1,7 +1,7 @@
//@flow
import React from "react";
import { translate } from "react-i18next";
import RemoveAdminGroupButton from "../buttons/RemoveAdminGroupButton";
import { RemoveEntryOfTableButton } from "../../../components/buttons";
type Props = {
adminGroups: string[],
@@ -25,10 +25,11 @@ class AdminGroupTable extends React.Component<Props, State> {
<tr key={group}>
<td key={group}>{group}</td>
<td>
<RemoveAdminGroupButton
groupname={group}
removeGroup={this.removeGroup}
<RemoveEntryOfTableButton
entryname={group}
removeEntry={this.removeEntry}
disabled={disabled}
label={t("admin-settings.remove-group-button")}
/>
</td>
</tr>
@@ -40,7 +41,7 @@ class AdminGroupTable extends React.Component<Props, State> {
);
}
removeGroup = (groupname: string) => {
removeEntry = (groupname: string) => {
const newGroups = this.props.adminGroups.filter(name => name !== groupname);
this.props.onChange(true, newGroups, "adminGroups");
};

11
scm-ui/src/config/components/table/AdminUserTable.js
View File

@@ -1,7 +1,7 @@
//@flow
import React from "react";
import { translate } from "react-i18next";
import RemoveAdminUserButton from "../buttons/RemoveAdminUserButton";
import { RemoveEntryOfTableButton } from "../../../components/buttons";
type Props = {
adminUsers: string[],
@@ -25,10 +25,11 @@ class AdminUserTable extends React.Component<Props, State> {
<tr key={user}>
<td key={user}>{user}</td>
<td>
<RemoveAdminUserButton
username={user}
removeUser={this.removeUser}
<RemoveEntryOfTableButton
entryname={user}
removeEntry={this.removeEntry}
disabled={disabled}
label={t("admin-settings.remove-user-button")}
/>
</td>
</tr>
@@ -40,7 +41,7 @@ class AdminUserTable extends React.Component<Props, State> {
);
}
removeUser = (username: string) => {
removeEntry = (username: string) => {
const newUsers = this.props.adminUsers.filter(name => name !== username);
this.props.onChange(true, newUsers, "adminUsers");
};

11
scm-ui/src/config/components/table/ProxyExcludesTable.js
View File

@@ -1,7 +1,7 @@
//@flow
import React from "react";
import { translate } from "react-i18next";
import RemoveProxyExcludeButton from "../buttons/RemoveProxyExcludeButton";
import { RemoveEntryOfTableButton } from "../../../components/buttons";
type Props = {
proxyExcludes: string[],
@@ -25,10 +25,11 @@ class ProxyExcludesTable extends React.Component<Props, State> {
<tr key={excludes}>
<td key={excludes}>{excludes}</td>
<td>
<RemoveProxyExcludeButton
proxyExcludeName={excludes}
removeProxyExclude={this.removeProxyExclude}
<RemoveEntryOfTableButton
entryname={excludes}
removeEntry={this.removeEntry}
disabled={this.props.disabled}
label={t("proxy-settings.remove-proxy-exclude-button")}
/>
</td>
</tr>
@@ -40,7 +41,7 @@ class ProxyExcludesTable extends React.Component<Props, State> {
);
}
removeProxyExclude = (excludename: string) => {
removeEntry = (excludename: string) => {
const newExcludes = this.props.proxyExcludes.filter(
name => name !== excludename
);