From 980f8f58e01deca259b9fa9c95d74a53ce4f5172 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Tue, 2 Oct 2018 10:26:19 +0200
Subject: [PATCH] add help for groups and correct adding group

---
 .../src/forms/AddEntryToTableField.js         |  9 +++++---
 .../ui-components/src/forms/Textarea.js       | 21 +++++++++++++++++--
 scm-ui/public/locales/en/groups.json          |  7 ++++++-
 scm-ui/src/groups/components/GroupForm.js     |  2 ++
 .../sonia/scm/api/v2/resources/GroupDto.java  |  1 -
 5 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/scm-ui-components/packages/ui-components/src/forms/AddEntryToTableField.js b/scm-ui-components/packages/ui-components/src/forms/AddEntryToTableField.js
index 1770e07807..b783f6efae 100644
--- a/scm-ui-components/packages/ui-components/src/forms/AddEntryToTableField.js
+++ b/scm-ui-components/packages/ui-components/src/forms/AddEntryToTableField.js
@@ -3,13 +3,15 @@ import React from "react";
 
 import { AddButton } from "../buttons";
 import InputField from "./InputField";
+import { translate } from "react-i18next";
 
 type Props = {
   addEntry: string => void,
   disabled: boolean,
   buttonLabel: string,
   fieldLabel: string,
-  errorMessage: string
+  errorMessage: string,
+  t: string => string,
 };
 
 type State = {
@@ -25,7 +27,7 @@ class AddEntryToTableField extends React.Component<Props, State> {
   }
 
   render() {
-    const { disabled, buttonLabel, fieldLabel, errorMessage } = this.props;
+    const { disabled, buttonLabel, fieldLabel, errorMessage, t } = this.props;
     return (
       <div className="field">
         <InputField
@@ -36,6 +38,7 @@ class AddEntryToTableField extends React.Component<Props, State> {
           value={this.state.entryToAdd}
           onReturnPressed={this.appendEntry}
           disabled={disabled}
+          helpText={t("group-form.help.membersHelpText")}
         />
         <AddButton
           label={buttonLabel}
@@ -65,4 +68,4 @@ class AddEntryToTableField extends React.Component<Props, State> {
   };
 }
 
-export default AddEntryToTableField;
+export default translate("groups")(AddEntryToTableField);
diff --git a/scm-ui-components/packages/ui-components/src/forms/Textarea.js b/scm-ui-components/packages/ui-components/src/forms/Textarea.js
index 721bbae77f..c0b5c1bc60 100644
--- a/scm-ui-components/packages/ui-components/src/forms/Textarea.js
+++ b/scm-ui-components/packages/ui-components/src/forms/Textarea.js
@@ -1,5 +1,6 @@
 //@flow
 import React from "react";
+import {Help} from "../index";
 
 export type SelectItem = {
   value: string,
@@ -10,7 +11,8 @@ type Props = {
   label?: string,
   placeholder?: SelectItem[],
   value?: string,
-  onChange: string => void
+  onChange: string => void,
+  helpText?: string
 };
 
 class Textarea extends React.Component<Props> {
@@ -28,13 +30,26 @@ class Textarea extends React.Component<Props> {
     return "";
   };
 
+  renderHelp = () => {
+    const helpText = this.props.helpText;
+    if(helpText){
+      return (
+        <div className="control columns is-vcentered">
+          <Help message={helpText} />
+        </div>);
+    }
+    else
+      return null;
+  };
+
   render() {
     const { placeholder, value } = this.props;
 
     return (
       <div className="field">
         {this.renderLabel()}
-        <div className="control">
+        <div className="field is-grouped">
+        <div className="control is-expanded">
           <textarea
             className="textarea"
             ref={input => {
@@ -45,6 +60,8 @@ class Textarea extends React.Component<Props> {
             value={value}
           />
         </div>
+          {this.renderHelp()}
+        </div>
       </div>
     );
   }
diff --git a/scm-ui/public/locales/en/groups.json b/scm-ui/public/locales/en/groups.json
index 95c42d4452..daa2cc651a 100644
--- a/scm-ui/public/locales/en/groups.json
+++ b/scm-ui/public/locales/en/groups.json
@@ -42,7 +42,12 @@
   "group-form": {
     "submit": "Submit",
     "name-error": "Group name is invalid",
-    "description-error": "Description is invalid"
+    "description-error": "Description is invalid",
+    "help": {
+      "nameHelpText": "Unique name of the group",
+      "descriptionHelpText": "A short description of the group",
+      "memberHelpText": "Usernames of the group members"
+    }
   },
   "delete-group-button": {
     "label": "Delete",
diff --git a/scm-ui/src/groups/components/GroupForm.js b/scm-ui/src/groups/components/GroupForm.js
index 1a29c0a433..4958fbf0fa 100644
--- a/scm-ui/src/groups/components/GroupForm.js
+++ b/scm-ui/src/groups/components/GroupForm.js
@@ -80,6 +80,7 @@ class GroupForm extends React.Component<Props, State> {
           onChange={this.handleGroupNameChange}
           value={group.name}
           validationError={this.state.nameValidationError}
+          helpText={t("group-form.help.nameHelpText")}
         />
       );
     }
@@ -93,6 +94,7 @@ class GroupForm extends React.Component<Props, State> {
           onChange={this.handleDescriptionChange}
           value={group.description}
           validationError={false}
+          helpText={t("group-form.help.descriptionHelpText")}
         />
         <MemberNameTable
           members={this.state.group.members}
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupDto.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupDto.java
index b847412a33..2577b46c4e 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupDto.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupDto.java
@@ -22,7 +22,6 @@ public class GroupDto extends HalRepresentation {
   private Instant lastModified;
   @Pattern(regexp = "^[A-z0-9\\.\\-_@]|[^ ]([A-z0-9\\.\\-_@ ]*[A-z0-9\\.\\-_@]|[^ ])?$")
   private String name;
-  @NotEmpty
   private String type;
   private Map<String, String> properties;
   private List<String> members;