From 3318e5291e67413cf205eac2183ee963a466ba32 Mon Sep 17 00:00:00 2001
From: Florian Scholdei <florian.scholdei@cloudogu.com>
Date: Fri, 18 Jan 2019 10:10:03 +0100
Subject: [PATCH] updated config navigation

---
 scm-ui/public/locales/en/config.json         |  10 +-
 scm-ui/src/config/containers/Config.js       | 173 ++++++++++---------
 scm-ui/src/config/containers/GlobalConfig.js |   6 +-
 3 files changed, 94 insertions(+), 95 deletions(-)

diff --git a/scm-ui/public/locales/en/config.json b/scm-ui/public/locales/en/config.json
index 1a33da8c8b..436b96cab8 100644
--- a/scm-ui/public/locales/en/config.json
+++ b/scm-ui/public/locales/en/config.json
@@ -1,12 +1,10 @@
 {
   "config": {
-    "navigation-title": "Navigation"
-  },
-  "global-config": {
+    "navigationLabel": "Configuration Navigation",
+    "globalConfigurationNavLink": "Global Configuration",
     "title": "Configuration",
-    "navigation-label": "Global Configuration",
-    "error-title": "Error",
-    "error-subtitle": "Unknown Config Error"
+    "errorTitle": "Error",
+    "errorSubtitle": "Unknown Config Error"
   },
   "config-form": {
     "submit": "Submit",
diff --git a/scm-ui/src/config/containers/Config.js b/scm-ui/src/config/containers/Config.js
index 60dc9bb75f..04de525c95 100644
--- a/scm-ui/src/config/containers/Config.js
+++ b/scm-ui/src/config/containers/Config.js
@@ -1,86 +1,87 @@
-// @flow
-import React from "react";
-import { translate } from "react-i18next";
-import { Route } from "react-router";
-import { ExtensionPoint } from "@scm-manager/ui-extensions";
-
-import type { Links } from "@scm-manager/ui-types";
-import { Page, Navigation, NavLink, Section } from "@scm-manager/ui-components";
-import GlobalConfig from "./GlobalConfig";
-import type { History } from "history";
-import {connect} from "react-redux";
-import {compose} from "redux";
-import { getLinks } from "../../modules/indexResource";
-
-type Props = {
-  links: Links,
-
-  // context objects
-  t: string => string,
-  match: any,
-  history: History
-};
-
-class Config extends React.Component<Props> {
-  stripEndingSlash = (url: string) => {
-    if (url.endsWith("/")) {
-      return url.substring(0, url.length - 2);
-    }
-    return url;
-  };
-
-  matchedUrl = () => {
-    return this.stripEndingSlash(this.props.match.url);
-  };
-
-  render() {
-    const { links, t } = this.props;
-
-    const url = this.matchedUrl();
-    const extensionProps = {
-      links,
-      url
-    };
-
-    return (
-      <Page>
-        <div className="columns">
-          <div className="column is-three-quarters">
-            <Route path={url} exact component={GlobalConfig} />
-            <ExtensionPoint name="config.route"
-                            props={extensionProps}
-                            renderAll={true}
-            />
-          </div>
-          <div className="column is-one-quarter">
-            <Navigation>
-              <Section label={t("config.navigation-title")}>
-                <NavLink
-                  to={`${url}`}
-                  label={t("global-config.navigation-label")}
-                />
-                <ExtensionPoint name="config.navigation"
-                                props={extensionProps}
-                                renderAll={true}
-                />
-              </Section>
-            </Navigation>
-          </div>
-        </div>
-      </Page>
-    );
-  }
-}
-
-const mapStateToProps = (state: any) => {
-  const links = getLinks(state);
-  return {
-    links
-  };
-};
-
-export default compose(
-  connect(mapStateToProps),
-  translate("config")
-)(Config);
-
+// @flow
+import React from "react";
+import { translate } from "react-i18next";
+import { Route } from "react-router";
+import { ExtensionPoint } from "@scm-manager/ui-extensions";
+
+import type { Links } from "@scm-manager/ui-types";
+import { Page, Navigation, NavLink, Section } from "@scm-manager/ui-components";
+import GlobalConfig from "./GlobalConfig";
+import type { History } from "history";
+import { connect } from "react-redux";
+import { compose } from "redux";
+import { getLinks } from "../../modules/indexResource";
+
+type Props = {
+  links: Links,
+
+  // context objects
+  t: string => string,
+  match: any,
+  history: History
+};
+
+class Config extends React.Component<Props> {
+  stripEndingSlash = (url: string) => {
+    if (url.endsWith("/")) {
+      return url.substring(0, url.length - 2);
+    }
+    return url;
+  };
+
+  matchedUrl = () => {
+    return this.stripEndingSlash(this.props.match.url);
+  };
+
+  render() {
+    const { links, t } = this.props;
+
+    const url = this.matchedUrl();
+    const extensionProps = {
+      links,
+      url
+    };
+
+    return (
+      <Page>
+        <div className="columns">
+          <div className="column is-three-quarters">
+            <Route path={url} exact component={GlobalConfig} />
+            <ExtensionPoint
+              name="config.route"
+              props={extensionProps}
+              renderAll={true}
+            />
+          </div>
+          <div className="column is-one-quarter">
+            <Navigation>
+              <Section label={t("config.navigationLabel")}>
+                <NavLink
+                  to={`${url}`}
+                  label={t("config.globalConfigurationNavLink")}
+                />
+                <ExtensionPoint
+                  name="config.navigation"
+                  props={extensionProps}
+                  renderAll={true}
+                />
+              </Section>
+            </Navigation>
+          </div>
+        </div>
+      </Page>
+    );
+  }
+}
+
+const mapStateToProps = (state: any) => {
+  const links = getLinks(state);
+  return {
+    links
+  };
+};
+
+export default compose(
+  connect(mapStateToProps),
+  translate("config")
+)(Config);
diff --git a/scm-ui/src/config/containers/GlobalConfig.js b/scm-ui/src/config/containers/GlobalConfig.js
index 71be3fdd7f..eac8e27bee 100644
--- a/scm-ui/src/config/containers/GlobalConfig.js
+++ b/scm-ui/src/config/containers/GlobalConfig.js
@@ -78,8 +78,8 @@ class GlobalConfig extends React.Component<Props, State> {
     if (error) {
       return (
         <ErrorPage
-          title={t("global-config.error-title")}
-          subtitle={t("global-config.error-subtitle")}
+          title={t("config.errorTitle")}
+          subtitle={t("config.errorSubtitle")}
           error={error}
           configUpdatePermission={configUpdatePermission}
         />
@@ -91,7 +91,7 @@ class GlobalConfig extends React.Component<Props, State> {
 
     return (
       <div>
-        <Title title={t("global-config.title")} />
+        <Title title={t("config.title")} />
         {this.renderConfigChangedNotification()}
         <ConfigForm
           submitForm={config => this.modifyConfig(config)}