review changes

scm-ui-components/packages/ui-components/src/GroupAutocomplete.js

@@ -1,34 +1,24 @@
 // @flow
 import React from "react";
 import { translate } from "react-i18next";
-import type { SelectValue } from "@scm-manager/ui-types";
+import type AutocompleteProps from "./UserGroupAutocomplete";
 import UserGroupAutocomplete from "./UserGroupAutocomplete";
 
-type Props = {
+type Props = AutocompleteProps & {
-  groupAutocompleteLink: string,
-  valueSelected: SelectValue => void,
-  value?: SelectValue,
-
   // Context props
   t: string => string
 };
 
 class GroupAutocomplete extends React.Component<Props> {
-  selectName = (selection: SelectValue) => {
-    this.props.valueSelected(selection);
-  };
-
   render() {
-    const { groupAutocompleteLink, t, value } = this.props;
+    const { t } = this.props;
     return (
       <UserGroupAutocomplete
-        autocompleteLink={groupAutocompleteLink}
         label={t("autocomplete.group")}
         noOptionsMessage={t("autocomplete.noGroupOptions")}
         loadingMessage={t("autocomplete.loading")}
         placeholder={t("autocomplete.groupPlaceholder")}
-        valueSelected={this.selectName}
+        {...this.props}
-        value={value}
       />
     );
   }

scm-ui-components/packages/ui-components/src/UserAutocomplete.js

@@ -1,34 +1,24 @@
 // @flow
 import React from "react";
 import { translate } from "react-i18next";
-import type { SelectValue } from "@scm-manager/ui-types";
+import type AutocompleteProps from "./UserGroupAutocomplete";
 import UserGroupAutocomplete from "./UserGroupAutocomplete";
 
-type Props = {
+type Props = AutocompleteProps & {
-  userAutocompleteLink: string,
-  valueSelected: SelectValue => void,
-  value?: SelectValue,
-
   // Context props
   t: string => string
 };
 
 class UserAutocomplete extends React.Component<Props> {
-  selectName = (selection: SelectValue) => {
-    this.props.valueSelected(selection);
-  };
-
   render() {
-    const { userAutocompleteLink, t, value } = this.props;
+    const { t } = this.props;
     return (
       <UserGroupAutocomplete
-        autocompleteLink={userAutocompleteLink}
         label={t("autocomplete.user")}
         noOptionsMessage={t("autocomplete.noUserOptions")}
         loadingMessage={t("autocomplete.loading")}
         placeholder={t("autocomplete.userPlaceholder")}
-        valueSelected={this.selectName}
+        {...this.props}
-        value={value}
       />
     );
   }

scm-ui-components/packages/ui-components/src/UserGroupAutocomplete.js

@@ -3,17 +3,20 @@ import React from "react";
 import type { SelectValue } from "@scm-manager/ui-types";
 import Autocomplete from "./Autocomplete";
 
-type Props = {
+export type AutocompleteProps = {
   autocompleteLink: string,
-  label: string,
-  noOptionsMessage: string,
-  loadingMessage: string,
-  placeholder: string,
   valueSelected: SelectValue => void,
   value?: SelectValue
 };
 
-class UserGroupAutocomplete extends React.Component<Props> {
+type Props = AutocompleteProps & {
+  label: string,
+  noOptionsMessage: string,
+  loadingMessage: string,
+  placeholder: string
+};
+
+export default class UserGroupAutocomplete extends React.Component<Props> {
   loadSuggestions = (inputValue: string) => {
     const url = this.props.autocompleteLink;
     const link = url + "?q=";
@@ -37,21 +40,13 @@ class UserGroupAutocomplete extends React.Component<Props> {
   };
 
   render() {
-    const { autocompleteLink, label, noOptionsMessage, loadingMessage, placeholder, value } = this.props;
     return (
       <Autocomplete
-        autocompleteLink={autocompleteLink}
-        label={label}
-        noOptionsMessage={noOptionsMessage}
-        loadingMessage={loadingMessage}
-        placeholder={placeholder}
         loadSuggestions={this.loadSuggestions}
         valueSelected={this.selectName}
-        value={value}
         creatable={true}
+        {...this.props}
       />
-    ); // {...this.props}
+    );
   }
 }
-
-export default UserGroupAutocomplete;

scm-ui/src/repos/permissions/containers/CreatePermissionForm.js

@@ -74,7 +74,7 @@ class CreatePermissionForm extends React.Component<Props, State> {
     if (group) {
       return (
         <GroupAutocomplete
-          groupAutocompleteLink={this.props.groupAutocompleteLink}
+          autocompleteLink={this.props.groupAutocompleteLink}
           valueSelected={this.selectName}
           value={this.state.value ? this.state.value : ""}
         />
@@ -82,7 +82,7 @@ class CreatePermissionForm extends React.Component<Props, State> {
     }
     return (
       <UserAutocomplete
-        userAutocompleteLink={this.props.userAutocompleteLink}
+        autocompleteLink={this.props.userAutocompleteLink}
         valueSelected={this.selectName}
         value={this.state.value ? this.state.value : ""}
       />