From cc8be054d174e0402b5fbf3d6604e680a9aed69b Mon Sep 17 00:00:00 2001
From: Florian Scholdei <florian.scholdei@cloudogu.com>
Date: Wed, 17 Apr 2019 12:19:17 +0200
Subject: [PATCH] added query-string to package.json and run prettier

---
 scm-ui/package.json           |  5 +++--
 scm-ui/src/containers/Main.js | 14 ++++++-------
 scm-ui/yarn.lock              | 37 +++++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/scm-ui/package.json b/scm-ui/package.json
index 6844ea3ec7..851a385235 100644
--- a/scm-ui/package.json
+++ b/scm-ui/package.json
@@ -20,9 +20,10 @@
     "moment": "^2.22.2",
     "node-sass": "^4.9.3",
     "postcss-easy-import": "^3.0.0",
-    "react": "^16.4.2",
+    "react": "^16.8.6",
+    "query-string": "5",
     "react-diff-view": "^1.8.1",
-    "react-dom": "^16.4.2",
+    "react-dom": "^16.8.6",
     "react-i18next": "^7.9.0",
     "react-jss": "^8.6.0",
     "react-redux": "^5.0.7",
diff --git a/scm-ui/src/containers/Main.js b/scm-ui/src/containers/Main.js
index 570455d18d..48debaf5b8 100644
--- a/scm-ui/src/containers/Main.js
+++ b/scm-ui/src/containers/Main.js
@@ -2,15 +2,15 @@
 import React from "react";
 
 import { Redirect, Route, Switch, withRouter } from "react-router-dom";
-import type {Links} from "@scm-manager/ui-types";
+import type { Links } from "@scm-manager/ui-types";
 
 import Overview from "../repos/containers/Overview";
 import Users from "../users/containers/Users";
 import Login from "../containers/Login";
 import Logout from "../containers/Logout";
 
-import {ProtectedRoute} from "@scm-manager/ui-components";
-import {binder,  ExtensionPoint } from "@scm-manager/ui-extensions";
+import { ProtectedRoute } from "@scm-manager/ui-components";
+import { binder, ExtensionPoint } from "@scm-manager/ui-extensions";
 
 import AddUser from "../users/containers/AddUser";
 import SingleUser from "../users/containers/SingleUser";
@@ -33,14 +33,14 @@ class Main extends React.Component<Props> {
   render() {
     const { authenticated, links } = this.props;
     const redirectUrlFactory = binder.getExtension("main.redirect", this.props);
-    let url ="/repos";
-    if (redirectUrlFactory){
+    let url = "/repos";
+    if (redirectUrlFactory) {
       url = redirectUrlFactory(this.props);
     }
     return (
       <div className="main">
         <Switch>
-          <Redirect exact from="/" to={url}/>
+          <Redirect exact from="/" to={url} />
           <Route exact path="/login" component={Login} />
           <Route path="/logout" component={Logout} />
           <ProtectedRoute
@@ -125,7 +125,7 @@ class Main extends React.Component<Props> {
           <ExtensionPoint
             name="main.route"
             renderAll={true}
-            props={{authenticated, links}}
+            props={{ authenticated, links }}
           />
         </Switch>
       </div>
diff --git a/scm-ui/yarn.lock b/scm-ui/yarn.lock
index 5b6ec89ef3..ac7c7b0122 100644
--- a/scm-ui/yarn.lock
+++ b/scm-ui/yarn.lock
@@ -6831,6 +6831,14 @@ qs@~6.5.1, qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
 
+query-string@5:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
+  dependencies:
+    decode-uri-component "^0.2.0"
+    object-assign "^4.1.0"
+    strict-uri-encode "^1.0.0"
+
 querystring-es3@~0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
@@ -6920,6 +6928,15 @@ react-dom@^16.4.2:
     prop-types "^15.6.2"
     schedule "^0.5.0"
 
+react-dom@^16.8.6:
+  version "16.8.6"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.6.tgz#71d6303f631e8b0097f56165ef608f051ff6e10f"
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+    prop-types "^15.6.2"
+    scheduler "^0.13.6"
+
 react-i18next@^7.9.0:
   version "7.13.0"
   resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-7.13.0.tgz#a6f64fd749215ec70400f90da6cbde2a9c5b1588"
@@ -7050,6 +7067,15 @@ react@^16.4.2:
     prop-types "^15.6.2"
     schedule "^0.5.0"
 
+react@^16.8.6:
+  version "16.8.6"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.8.6.tgz#ad6c3a9614fd3a4e9ef51117f54d888da01f2bbe"
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+    prop-types "^15.6.2"
+    scheduler "^0.13.6"
+
 read-cache@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
@@ -7562,6 +7588,13 @@ schedule@^0.5.0:
   dependencies:
     object-assign "^4.1.1"
 
+scheduler@^0.13.6:
+  version "0.13.6"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.6.tgz#466a4ec332467b31a91b9bf74e5347072e4cd889"
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+
 scss-tokenizer@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
@@ -7990,6 +8023,10 @@ stream-throttle@^0.1.3:
     commander "^2.2.0"
     limiter "^1.0.5"
 
+strict-uri-encode@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
+
 string-length@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/string-length/-/string-length-2.0.0.tgz#d40dbb686a3ace960c1cffca562bf2c45f8363ed"