From ccdd37baa4887aefca9a01c51b469bd78f34d913 Mon Sep 17 00:00:00 2001 From: CJ Cenizal Date: Tue, 29 Jan 2019 11:05:56 -0800 Subject: [PATCH] Refine wording of CCR permission denied page, to specify cluster privileges. --- .../cross_cluster_replication/public/app/app.js | 12 ++++++------ .../server/routes/api/ccr.js | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/x-pack/plugins/cross_cluster_replication/public/app/app.js b/x-pack/plugins/cross_cluster_replication/public/app/app.js index 985306ddd67b9..39ecd816de5c5 100644 --- a/x-pack/plugins/cross_cluster_replication/public/app/app.js +++ b/x-pack/plugins/cross_cluster_replication/public/app/app.js @@ -54,7 +54,7 @@ export const App = injectI18n( isFetchingPermissions: false, fetchPermissionError: undefined, hasPermission: false, - missingPermissions: [], + missingClusterPrivileges: [], }; } @@ -76,12 +76,12 @@ export const App = injectI18n( }); try { - const { hasPermission, missingPermissions } = await loadPermissions(); + const { hasPermission, missingClusterPrivileges } = await loadPermissions(); this.setState({ isFetchingPermissions: false, hasPermission, - missingPermissions, + missingClusterPrivileges, }); } catch (error) { // Expect an error in the shape provided by Angular's $http service. @@ -110,7 +110,7 @@ export const App = injectI18n( isFetchingPermissions, fetchPermissionError, hasPermission, - missingPermissions, + missingClusterPrivileges, } = this.state; if (!isAvailable() || !isActive()) { @@ -189,8 +189,8 @@ export const App = injectI18n(

} /> diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/ccr.js b/x-pack/plugins/cross_cluster_replication/server/routes/api/ccr.js index 09e74a57899b9..33012ddbc779f 100644 --- a/x-pack/plugins/cross_cluster_replication/server/routes/api/ccr.js +++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/ccr.js @@ -63,7 +63,7 @@ export const registerCcrRoutes = (server) => { }, }); - const missingPermissions = Object.keys(cluster).reduce((permissions, permissionName) => { + const missingClusterPrivileges = Object.keys(cluster).reduce((permissions, permissionName) => { if (!cluster[permissionName]) { permissions.push(permissionName); return permissions; @@ -72,7 +72,7 @@ export const registerCcrRoutes = (server) => { return { hasPermission, - missingPermissions, + missingClusterPrivileges, }; } catch(err) { if (isEsError(err)) {