Backport PR elastic#8207

elastic-jasper · elastic-jasper · commit 0c2dd87601f0 · 2016-09-09T18:05:22.000-04:00
--------- **Commit 1:** Provide method to render without sending .kibana/config * Original sha: 8fdcb83 * Authored by Jonathan Budzenski <jon@jbudz.me> on 2016-09-09T19:05:07Z **Commit 2:** Provide explicit render methods for including and excluding settings * Original sha: b680ba2 * Authored by Jonathan Budzenski <jon@jbudz.me> on 2016-09-09T20:41:11Z
diff --git a/src/ui/index.js b/src/ui/index.js
@@ -60,10 +60,8 @@ export default async (kbnServer, server, config) => {
     }
   });
 
-  server.decorate('reply', 'renderApp', async function (app) {
-    const isElasticsearchPluginRed = server.plugins.elasticsearch.status.state === 'red';
-    const uiSettings = server.uiSettings();
-    const payload = {
+  async function getPayload(app) {
+    return {
       app: app,
       nav: uiExports.navLinks.inOrder,
       version: kbnServer.version,
@@ -72,17 +70,36 @@ export default async (kbnServer, server, config) => {
       basePath: config.get('server.basePath'),
       serverName: config.get('server.name'),
       uiSettings: {
-        defaults: await uiSettings.getDefaults(),
-        user: isElasticsearchPluginRed ? {} : await uiSettings.getUserProvided()
+        defaults: await server.uiSettings().getDefaults(),
+        user: {}
       },
       vars: defaults(app.getInjectedVars() || {}, uiExports.defaultInjectedVars),
     };
+  }
 
+  function viewAppWithPayload(app, payload) {
     return this.view(app.templateName, {
       app: app,
       loadingGif: loadingGif,
       kibanaPayload: payload,
       bundlePath: `${config.get('server.basePath')}/bundles`,
     });
-  });
+  }
+
+  async function renderApp(app) {
+    const isElasticsearchPluginRed = server.plugins.elasticsearch.status.state === 'red';
+    const payload = await getPayload(app);
+    if (!isElasticsearchPluginRed) {
+      payload.uiSettings.user = await server.uiSettings().getUserProvided();
+    }
+    return viewAppWithPayload.call(this, app, payload);
+  }
+
+  async function renderAppWithDefaultConfig(app) {
+    const payload = await getPayload(app);
+    return viewAppWithPayload.call(this, app, payload);
+  }
+
+  server.decorate('reply', 'renderApp', renderApp);
+  server.decorate('reply', 'renderAppWithDefaultConfig', renderAppWithDefaultConfig);
 };
