From fa87b1a37876eb6aa88fea936a6e6aeaba0d5eb8 Mon Sep 17 00:00:00 2001 From: Mohamed Karray Date: Tue, 22 Jan 2019 15:08:15 +0100 Subject: [PATCH] Move the MemberNameTable component to the scm-ui project to be used in combination with the Autocomplete component --- .../packages/ui-components/src/forms}/MemberNameTable.js | 7 +------ .../packages/ui-components/src/forms/index.js | 1 + scm-ui/src/groups/components/GroupForm.js | 7 ++++++- 3 files changed, 8 insertions(+), 7 deletions(-) rename {scm-ui/src/groups/components => scm-ui-components/packages/ui-components/src/forms}/MemberNameTable.js (87%) diff --git a/scm-ui/src/groups/components/MemberNameTable.js b/scm-ui-components/packages/ui-components/src/forms/MemberNameTable.js similarity index 87% rename from scm-ui/src/groups/components/MemberNameTable.js rename to scm-ui-components/packages/ui-components/src/forms/MemberNameTable.js index 59f12461fe..5c8dcf3712 100644 --- a/scm-ui/src/groups/components/MemberNameTable.js +++ b/scm-ui-components/packages/ui-components/src/forms/MemberNameTable.js @@ -2,8 +2,7 @@ import React from "react"; import { translate } from "react-i18next"; import { - RemoveEntryOfTableButton, - LabelWithHelpIcon + RemoveEntryOfTableButton } from "@scm-manager/ui-components"; type Props = { @@ -19,10 +18,6 @@ class MemberNameTable extends React.Component { const { t } = this.props; return (
- {this.props.members.map(member => { diff --git a/scm-ui-components/packages/ui-components/src/forms/index.js b/scm-ui-components/packages/ui-components/src/forms/index.js index 3bc3820f16..8d27ab05cd 100644 --- a/scm-ui-components/packages/ui-components/src/forms/index.js +++ b/scm-ui-components/packages/ui-components/src/forms/index.js @@ -2,6 +2,7 @@ export { default as AddEntryToTableField } from "./AddEntryToTableField.js"; export { default as AutocompleteAddEntryToTableField } from "./AutocompleteAddEntryToTableField.js"; +export { default as MemberNameTable } from "./MemberNameTable.js"; export { default as Checkbox } from "./Checkbox.js"; export { default as InputField } from "./InputField.js"; export { default as Select } from "./Select.js"; diff --git a/scm-ui/src/groups/components/GroupForm.js b/scm-ui/src/groups/components/GroupForm.js index 589914021c..7cc2ee5d24 100644 --- a/scm-ui/src/groups/components/GroupForm.js +++ b/scm-ui/src/groups/components/GroupForm.js @@ -3,6 +3,8 @@ import React from "react"; import { translate } from "react-i18next"; import { AutocompleteAddEntryToTableField, + LabelWithHelpIcon, + MemberNameTable, InputField, SubmitButton, Textarea @@ -10,7 +12,6 @@ import { import type { Group, SelectValue } from "@scm-manager/ui-types"; import * as validator from "./groupValidation"; -import MemberNameTable from "./MemberNameTable"; type Props = { t: string => string, @@ -97,6 +98,10 @@ class GroupForm extends React.Component { validationError={false} helpText={t("group-form.help.descriptionHelpText")} /> +