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

enable failing tests again and use form instead of table for create permission

Browse Source
This commit is contained in:
Maren Süwer
2018-09-11 16:17:11 +02:00
parent fe33e55bef
commit 09924a03cb
3 changed files with 35 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scm-ui/src/repos/components/PermissionsNavLink.test.js
View File

@@ -4,7 +4,11 @@ import "../../tests/enzyme";
import "../../tests/i18n"; import "../../tests/i18n";
import PermissionsNavLink from "./PermissionsNavLink"; import PermissionsNavLink from "./PermissionsNavLink";
xdescribe("PermissionsNavLink", () => { jest.mock("@scm-manager/ui-components", () => ({
NavAction: require.requireActual("@scm-manager/ui-components").NavAction
}));
describe("PermissionsNavLink", () => {
it("should render nothing, if the modify link is missing", () => { it("should render nothing, if the modify link is missing", () => {
const repository = { const repository = {
_links: {} _links: {}

69
scm-ui/src/repos/permissions/components/CreatePermissionForm.js
View File

@@ -1,7 +1,11 @@
// @flow // @flow
import React from "react"; import React from "react";
import { translate } from "react-i18next"; import { translate } from "react-i18next";
import { Checkbox, InputField, SubmitButton } from "../../../../../scm-ui-components/packages/ui-components/src/index"; import {
Checkbox,
InputField,
SubmitButton
} from "../../../../../scm-ui-components/packages/ui-components/src/index";
import TypeSelector from "./TypeSelector"; import TypeSelector from "./TypeSelector";
import type { import type {
PermissionCollection, PermissionCollection,
@@ -41,45 +45,30 @@ class CreatePermissionForm extends React.Component<Props, State> {
<h2 className="subtitle"> <h2 className="subtitle">
{t("add-permission.add-permission-heading")} {t("add-permission.add-permission-heading")}
</h2> </h2>
<table className="table"> <form onSubmit={this.submit}>
<tbody> <InputField
<tr> label={t("permission.name")}
<td>{t("permission.name")}</td> value={name ? name : ""}
<td> onChange={this.handleNameChange}
<InputField validationError={this.currentPermissionIncludeName()}
value={name ? name : ""} errorMessage={t("add-permission.name-input-invalid")}
onChange={this.handleNameChange} />
validationError={this.currentPermissionIncludeName()} <Checkbox
errorMessage={t("add-permission.name-input-invalid")} label={t("permission.group-permission")}
/> checked={groupPermission ? groupPermission : false}
</td> onChange={this.handleGroupPermissionChange}
</tr> />
<tr> <TypeSelector
<td>{t("permission.group-permission")}</td> label={t("permission.type")}
<td> handleTypeChange={this.handleTypeChange}
<Checkbox type={type ? type : "READ"}
checked={groupPermission ? groupPermission : false} />
onChange={this.handleGroupPermissionChange} <SubmitButton
/> label={t("add-permission.submit-button")}
</td> loading={loading}
</tr> disabled={this.isValid()}
<tr> />
<td>{t("permission.type")}</td> </form>
<td>
<TypeSelector
handleTypeChange={this.handleTypeChange}
type={type ? type : "READ"}
/>
</td>
</tr>
</tbody>
</table>
<SubmitButton
label={t("add-permission.submit-button")}
action={this.submit}
loading={loading}
disabled={this.isValid()}
/>
</div> </div>
); );
} }

5
scm-ui/src/repos/permissions/components/buttons/DeletePermissionButton.js
View File

@@ -2,10 +2,7 @@
import React from "react"; import React from "react";
import { translate } from "react-i18next"; import { translate } from "react-i18next";
import type { Permission } from "../../types/Permissions"; import type { Permission } from "../../types/Permissions";
import { import { confirmAlert, DeleteButton } from "@scm-manager/ui-components";
confirmAlert,
DeleteButton
} from "../../../../../../scm-ui-components/packages/ui-components/src/index";
type Props = { type Props = {
permission: Permission, permission: Permission,