rename defaultNamespaceStrategy to namespaceStrategy

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

@@ -2,8 +2,7 @@
 import React from "react";
 import { translate } from "react-i18next";
 import { SubmitButton, Notification } from "@scm-manager/ui-components";
-import type { NamespaceStrategies } from "@scm-manager/ui-types";
-import type { Config } from "@scm-manager/ui-types";
+import type { NamespaceStrategies, Config } from "@scm-manager/ui-types";
 import ProxySettings from "./ProxySettings";
 import GeneralSettings from "./GeneralSettings";
 import BaseUrlSettings from "./BaseUrlSettings";
@@ -57,7 +56,7 @@ class ConfigForm extends React.Component<Props, State> {
         pluginUrl: "",
         loginAttemptLimitTimeout: 0,
         enabledXsrfProtection: true,
-        defaultNamespaceStrategy: "",
+        namespaceStrategy: "",
         _links: {}
       },
       showNotification: false,
@@ -131,7 +130,7 @@ class ConfigForm extends React.Component<Props, State> {
           skipFailedAuthenticators={config.skipFailedAuthenticators}
           pluginUrl={config.pluginUrl}
           enabledXsrfProtection={config.enabledXsrfProtection}
-          defaultNamespaceStrategy={config.defaultNamespaceStrategy}
+          namespaceStrategy={config.namespaceStrategy}
           onChange={(isValid, changedValue, name) =>
             this.onChange(isValid, changedValue, name)
           }

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

@@ -1,7 +1,7 @@
 // @flow
 import React from "react";
 import { translate } from "react-i18next";
-import { Checkbox, InputField, Select } from "@scm-manager/ui-components";
+import { Checkbox, InputField} from "@scm-manager/ui-components";
 import type { NamespaceStrategies } from "@scm-manager/ui-types";
 import NamespaceStrategySelect from "./NamespaceStrategySelect";
 
@@ -14,7 +14,7 @@ type Props = {
   skipFailedAuthenticators: boolean,
   pluginUrl: string,
   enabledXsrfProtection: boolean,
-  defaultNamespaceStrategy: string,
+  namespaceStrategy: string,
   namespaceStrategies?: NamespaceStrategies,
   onChange: (boolean, any, string) => void,
   hasUpdatePermission: boolean,
@@ -35,7 +35,7 @@ class GeneralSettings extends React.Component<Props> {
       skipFailedAuthenticators,
       pluginUrl,
       enabledXsrfProtection,
-      defaultNamespaceStrategy,
+      namespaceStrategy,
       hasUpdatePermission,
       namespaceStrategies
     } = this.props;
@@ -74,12 +74,12 @@ class GeneralSettings extends React.Component<Props> {
                 </div>
                 <div className="column is-half">
                   <NamespaceStrategySelect
-                    label={t("general-settings.default-namespace-strategy")}
-                    onChange={this.handleDefaultNamespaceStrategyChange}
-                    value={defaultNamespaceStrategy}
+                    label={t("general-settings.namespace-strategy")}
+                    onChange={this.handleNamespaceStrategyChange}
+                    value={namespaceStrategy}
                     disabled={!hasUpdatePermission}
                     namespaceStrategies={namespaceStrategies}
-                    helpText={t("help.defaultNameSpaceStrategyHelpText")}
+                    helpText={t("help.nameSpaceStrategyHelpText")}
                   />
                 </div>
             </div>
@@ -153,19 +153,17 @@ class GeneralSettings extends React.Component<Props> {
   handleAnonymousAccessEnabledChange = (value: string) => {
     this.props.onChange(true, value, "anonymousAccessEnabled");
   };
-
   handleSkipFailedAuthenticatorsChange = (value: string) => {
     this.props.onChange(true, value, "skipFailedAuthenticators");
   };
   handlePluginUrlChange = (value: string) => {
     this.props.onChange(true, value, "pluginUrl");
   };
-
   handleEnabledXsrfProtectionChange = (value: boolean) => {
     this.props.onChange(true, value, "enabledXsrfProtection");
   };
-  handleDefaultNamespaceStrategyChange = (value: string) => {
-    this.props.onChange(true, value, "defaultNamespaceStrategy");
+  handleNamespaceStrategyChange = (value: string) => {
+    this.props.onChange(true, value, "namespaceStrategy");
   };
 }
 

scm-ui/src/config/modules/config.test.js

@@ -50,7 +50,7 @@ const config = {
     "http://plugins.scm-manager.org/scm-plugin-backend/api/{version}/plugins?os={os}&arch={arch}&snapshot=false",
   loginAttemptLimitTimeout: 300,
   enabledXsrfProtection: true,
-  defaultNamespaceStrategy: "sonia.scm.repository.DefaultNamespaceStrategy",
+  namespaceStrategy: "UsernameNamespaceStrategy",
   _links: {
     self: { href: "http://localhost:8081/api/v2/config" },
     update: { href: "http://localhost:8081/api/v2/config" }
@@ -79,7 +79,7 @@ const configWithNullValues = {
     "http://plugins.scm-manager.org/scm-plugin-backend/api/{version}/plugins?os={os}&arch={arch}&snapshot=false",
   loginAttemptLimitTimeout: 300,
   enabledXsrfProtection: true,
-  defaultNamespaceStrategy: "sonia.scm.repository.DefaultNamespaceStrategy",
+  namespaceStrategy: "UsernameNamespaceStrategy",
   _links: {
     self: { href: "http://localhost:8081/api/v2/config" },
     update: { href: "http://localhost:8081/api/v2/config" }

scm-ui/src/config/modules/namespaceStrategies.js

@@ -91,7 +91,7 @@ export default function reducer(
     const config = action.payload;
     return {
       ...state,
-      current: config.defaultNamespaceStrategy
+      current: config.namespaceStrategy
     };
   }
   return state;

scm-ui/src/config/modules/namespaceStrategies.test.js

@@ -149,7 +149,7 @@ describe("namespace strategies reducer", () => {
     const modifyConfigAction = {
       type: MODIFY_CONFIG_SUCCESS,
       payload: {
-        defaultNamespaceStrategy: "CustomNamespaceStrategy"
+        namespaceStrategy: "CustomNamespaceStrategy"
       }
     };
     const newState = reducer(strategies, modifyConfigAction);