Merge with 2.0.0-m3

scm-ui-components/packages/ui-components/src/forms/DropDown.js

@@ -5,6 +5,7 @@ import classNames from "classnames";
 
 type Props = {
   options: string[],
+  optionValues?: string[],
   optionSelected: string => void,
   preselectedOption?: string,
   className: any,
@@ -13,7 +14,7 @@ type Props = {
 
 class DropDown extends React.Component<Props> {
   render() {
-    const { options, preselectedOption, className, disabled } = this.props;
+    const { options, optionValues, preselectedOption, className, disabled } = this.props;
     return (
       <div className={classNames(className, "select")}>
         <select
@@ -22,9 +23,9 @@ class DropDown extends React.Component<Props> {
           disabled={disabled}
         >
           <option key="" />
-          {options.map(option => {
+          {options.map((option, index) => {
             return (
-              <option key={option} value={option}>
+              <option key={option} value={optionValues && optionValues[index] ? optionValues[index] : option}>
                 {option}
               </option>
             );

scm-ui/src/config/components/form/BaseUrlSettings.js

@@ -19,15 +19,6 @@ class BaseUrlSettings extends React.Component<Props> {
       <div>
         <Subtitle subtitle={t("base-url-settings.name")} />
         <div className="columns">
-          <div className="column is-half">
-            <Checkbox
-              checked={forceBaseUrl}
-              label={t("base-url-settings.force-base-url")}
-              onChange={this.handleForceBaseUrlChange}
-              disabled={!hasUpdatePermission}
-              helpText={t("help.forceBaseUrlHelpText")}
-            />
-          </div>
           <div className="column is-half">
             <InputField
               label={t("base-url-settings.base-url")}
@@ -37,6 +28,15 @@ class BaseUrlSettings extends React.Component<Props> {
               helpText={t("help.baseUrlHelpText")}
             />
           </div>
+          <div className="column is-half">
+            <Checkbox
+              checked={forceBaseUrl}
+              label={t("base-url-settings.force-base-url")}
+              onChange={this.handleForceBaseUrlChange}
+              disabled={!hasUpdatePermission}
+              helpText={t("help.forceBaseUrlHelpText")}
+            />
+          </div>
         </div>
       </div>
     );