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

first try on delete user

Browse Source
This commit is contained in:
Florian Scholdei
2019-01-18 13:42:11 +01:00
parent 8f340ceab0
commit 71fc38dd1d
6 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scm-ui/public/locales/en/users.json
View File

@@ -27,7 +27,8 @@
} }
}, },
"user-form": { "user-form": {
"submit": "Submit" "submit": "Submit",
"deleteUser": "Delete User"
}, },
"add-user": { "add-user": {
"title": "Create User", "title": "Create User",

8
scm-ui/src/users/components/navLinks/DeleteUserNavLink.js → scm-ui/src/users/components/DeleteUser.js
View File

@@ -2,7 +2,7 @@
import React from "react"; import React from "react";
import { translate } from "react-i18next"; import { translate } from "react-i18next";
import type { User } from "@scm-manager/ui-types"; import type { User } from "@scm-manager/ui-types";
import { NavAction, confirmAlert } from "@scm-manager/ui-components"; import { DeleteButton, confirmAlert } from "@scm-manager/ui-components";
type Props = { type Props = {
user: User, user: User,
@@ -11,7 +11,7 @@ type Props = {
deleteUser: (user: User) => void deleteUser: (user: User) => void
}; };
class DeleteUserNavLink extends React.Component<Props> { class DeleteUser extends React.Component<Props> {
static defaultProps = { static defaultProps = {
confirmDialog: true confirmDialog: true
}; };
@@ -49,8 +49,8 @@ class DeleteUserNavLink extends React.Component<Props> {
if (!this.isDeletable()) { if (!this.isDeletable()) {
return null; return null;
} }
return <NavAction label={t("delete-user-button.label")} action={action} />; return <DeleteButton label={t("user-form.deleteUser")} action={action} />;
} }
} }
export default translate("users")(DeleteUserNavLink); export default translate("users")(DeleteUser);

14
scm-ui/src/users/components/navLinks/DeleteUserNavLink.test.js → scm-ui/src/users/components/DeleteUser.test.js
View File

@@ -1,8 +1,8 @@
import React from "react"; import React from "react";
import { mount, shallow } from "enzyme"; import { mount, shallow } from "enzyme";
import "../../../tests/enzyme"; import "../../tests/enzyme";
import "../../../tests/i18n"; import "../../../tests/i18n";
import DeleteUserNavLink from "./DeleteUserNavLink"; import DeleteUser from "../DeleteUser";
import { confirmAlert } from "@scm-manager/ui-components"; import { confirmAlert } from "@scm-manager/ui-components";
jest.mock("@scm-manager/ui-components", () => ({ jest.mock("@scm-manager/ui-components", () => ({
@@ -10,14 +10,14 @@ jest.mock("@scm-manager/ui-components", () => ({
NavAction: require.requireActual("@scm-manager/ui-components").NavAction NavAction: require.requireActual("@scm-manager/ui-components").NavAction
})); }));
describe("DeleteUserNavLink", () => { describe("DeleteUser", () => {
it("should render nothing, if the delete link is missing", () => { it("should render nothing, if the delete link is missing", () => {
const user = { const user = {
_links: {} _links: {}
}; };
const navLink = shallow( const navLink = shallow(
<DeleteUserNavLink user={user} deleteUser={() => {}} /> <DeleteUser user={user} deleteUser={() => {}} />
); );
expect(navLink.text()).toBe(""); expect(navLink.text()).toBe("");
}); });
@@ -32,7 +32,7 @@ describe("DeleteUserNavLink", () => {
}; };
const navLink = mount( const navLink = mount(
<DeleteUserNavLink user={user} deleteUser={() => {}} /> <DeleteUser user={user} deleteUser={() => {}} />
); );
expect(navLink.text()).not.toBe(""); expect(navLink.text()).not.toBe("");
}); });
@@ -47,7 +47,7 @@ describe("DeleteUserNavLink", () => {
}; };
const navLink = mount( const navLink = mount(
<DeleteUserNavLink user={user} deleteUser={() => {}} /> <DeleteUser user={user} deleteUser={() => {}} />
); );
navLink.find("a").simulate("click"); navLink.find("a").simulate("click");
@@ -69,7 +69,7 @@ describe("DeleteUserNavLink", () => {
} }
const navLink = mount( const navLink = mount(
<DeleteUserNavLink <DeleteUser
user={user} user={user}
confirmDialog={false} confirmDialog={false}
deleteUser={capture} deleteUser={capture}

4
scm-ui/src/users/components/UserForm.js
View File

@@ -10,6 +10,7 @@ import {
validation as validator validation as validator
} from "@scm-manager/ui-components"; } from "@scm-manager/ui-components";
import * as userValidator from "./userValidation"; import * as userValidator from "./userValidation";
import DeleteUser from "./DeleteUser";
type Props = { type Props = {
submitForm: User => void, submitForm: User => void,
@@ -153,6 +154,9 @@ class UserForm extends React.Component<Props, State> {
label={t("user-form.submit")} label={t("user-form.submit")}
/> />
</div> </div>
<div className="column">
<DeleteUser user={user} />
</div>
</div> </div>
</form> </form>
); );

1
scm-ui/src/users/components/navLinks/index.js
View File

@@ -1,3 +1,2 @@
export { default as DeleteUserNavLink } from "./DeleteUserNavLink";
export { default as EditUserNavLink } from "./EditUserNavLink"; export { default as EditUserNavLink } from "./EditUserNavLink";
export { default as SetPasswordNavLink } from "./SetPasswordNavLink"; export { default as SetPasswordNavLink } from "./SetPasswordNavLink";

1
scm-ui/src/users/containers/SingleUser.js
View File

@@ -26,7 +26,6 @@ import {
} from "../modules/users"; } from "../modules/users";
import { import {
DeleteUserNavLink,
EditUserNavLink, EditUserNavLink,
SetPasswordNavLink SetPasswordNavLink
} from "./../components/navLinks"; } from "./../components/navLinks";