step towards a single-entry-point js app (#1362)

3 files changed, 64 insertions, 8 deletions

diff --git a/server/sonar-web/src/main/js/apps/users/components/UsersAppContainer.js b/server/sonar-web/src/main/js/apps/users/components/UsersAppContainer.js
new file mode 100644
index 00000000000..8442a308327
--- /dev/null
+++ b/server/sonar-web/src/main/js/apps/users/components/UsersAppContainer.js
@@ -0,0 +1,31 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2016 SonarSource SA
+ * mailto:contact AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+import React from 'react';
+import init from '../init';
+
+export default class UsersAppContainer extends React.Component {
+  componentDidMount () {
+    init(this.refs.container);
+  }
+
+  render () {
+    return <div ref="container"/>;
+  }
+}
diff --git a/server/sonar-web/src/main/js/apps/users/app.js b/server/sonar-web/src/main/js/apps/users/init.js
index 14ea47e63e3..cd1dc8a6568 100644
--- a/server/sonar-web/src/main/js/apps/users/app.js
+++ b/server/sonar-web/src/main/js/apps/users/init.js
@@ -29,11 +29,9 @@ import { getIdentityProviders } from '../../api/users';
 
 const App = new Marionette.Application();
 
-const init = function (providers) {
-  const options = window.sonarqube;
-
+const init = function (el, providers) {
   // Layout
-  this.layout = new Layout({ el: options.el });
+  this.layout = new Layout({ el });
   this.layout.render();
 
   // Collection
@@ -59,9 +57,10 @@ const init = function (providers) {
   this.users.fetch();
 };
 
-App.on('start', function () {
-  getIdentityProviders().then(r => init.call(App, r.identityProviders));
+App.on('start', function (el) {
+  getIdentityProviders().then(r => init.call(App, el, r.identityProviders));
 });
 
-window.sonarqube.appStarted.then(options => App.start(options));
-
+export default function (el) {
+  App.start(el);
+}
diff --git a/server/sonar-web/src/main/js/apps/users/routes.js b/server/sonar-web/src/main/js/apps/users/routes.js
new file mode 100644
index 00000000000..b727131f339
--- /dev/null
+++ b/server/sonar-web/src/main/js/apps/users/routes.js
@@ -0,0 +1,26 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2016 SonarSource SA
+ * mailto:contact AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+import React from 'react';
+import { IndexRoute } from 'react-router';
+import UsersAppContainer from './components/UsersAppContainer';
+
+export default (
+    <IndexRoute component={UsersAppContainer}/>
+);