Skip to content

Commit 0c2dd87

Browse files
Backport PR elastic#8207
--------- **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
1 parent 679af88 commit 0c2dd87

1 file changed

Lines changed: 24 additions & 7 deletions

File tree

src/ui/index.js

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,8 @@ export default async (kbnServer, server, config) => {
6060
}
6161
});
6262

63-
server.decorate('reply', 'renderApp', async function (app) {
64-
const isElasticsearchPluginRed = server.plugins.elasticsearch.status.state === 'red';
65-
const uiSettings = server.uiSettings();
66-
const payload = {
63+
async function getPayload(app) {
64+
return {
6765
app: app,
6866
nav: uiExports.navLinks.inOrder,
6967
version: kbnServer.version,
@@ -72,17 +70,36 @@ export default async (kbnServer, server, config) => {
7270
basePath: config.get('server.basePath'),
7371
serverName: config.get('server.name'),
7472
uiSettings: {
75-
defaults: await uiSettings.getDefaults(),
76-
user: isElasticsearchPluginRed ? {} : await uiSettings.getUserProvided()
73+
defaults: await server.uiSettings().getDefaults(),
74+
user: {}
7775
},
7876
vars: defaults(app.getInjectedVars() || {}, uiExports.defaultInjectedVars),
7977
};
78+
}
8079

80+
function viewAppWithPayload(app, payload) {
8181
return this.view(app.templateName, {
8282
app: app,
8383
loadingGif: loadingGif,
8484
kibanaPayload: payload,
8585
bundlePath: `${config.get('server.basePath')}/bundles`,
8686
});
87-
});
87+
}
88+
89+
async function renderApp(app) {
90+
const isElasticsearchPluginRed = server.plugins.elasticsearch.status.state === 'red';
91+
const payload = await getPayload(app);
92+
if (!isElasticsearchPluginRed) {
93+
payload.uiSettings.user = await server.uiSettings().getUserProvided();
94+
}
95+
return viewAppWithPayload.call(this, app, payload);
96+
}
97+
98+
async function renderAppWithDefaultConfig(app) {
99+
const payload = await getPayload(app);
100+
return viewAppWithPayload.call(this, app, payload);
101+
}
102+
103+
server.decorate('reply', 'renderApp', renderApp);
104+
server.decorate('reply', 'renderAppWithDefaultConfig', renderAppWithDefaultConfig);
88105
};

0 commit comments

Comments
 (0)