From f20a9360889966fb927f0b505722819c0aeb07cc Mon Sep 17 00:00:00 2001
From: Maja Grubic <maja.grubic@elastic.co>
Date: Wed, 26 Feb 2020 10:30:35 +0000
Subject: [PATCH 1/2] Show empty screen with error message if no permissions

---
 .../public/dashboard/np_ready/application.ts  |  4 ++++
 .../np_ready/dashboard_app_controller.tsx     | 23 ++++++++++++-------
 .../kibana/public/dashboard/plugin.ts         |  4 ++++
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts
index 7239d8f2258a..488e11b8a287 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts
@@ -57,6 +57,10 @@ export interface RenderDeps {
   savedDashboards: SavedObjectLoader;
   dashboardConfig: KibanaLegacyStart['dashboardConfig'];
   dashboardCapabilities: any;
+  embeddableCapabilities: {
+    visualizeCapabilities: any;
+    mapsCapabilities: any;
+  };
   uiSettings: IUiSettingsClient;
   chrome: ChromeStart;
   addBasePath: (path: string) => string;
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx
index 075516d52bab..2eb069abca17 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx
@@ -108,6 +108,7 @@ export class DashboardAppController {
     embeddable,
     share,
     dashboardCapabilities,
+    embeddableCapabilities: { visualizeCapabilities, mapsCapabilities },
     data: { query: queryService },
     core: {
       notifications,
@@ -134,7 +135,6 @@ export class DashboardAppController {
     } = syncQuery(queryService, kbnUrlStateStorage);
 
     let lastReloadRequestTime = 0;
-
     const dash = ($scope.dash = $route.current.locals.dash);
     if (dash.id) {
       chrome.docTitle.change(dash.title);
@@ -171,11 +171,18 @@ export class DashboardAppController {
       dashboardStateManager.getIsViewMode() &&
       !dashboardConfig.getHideWriteControls();
 
-    const getIsEmptyInReadonlyMode = () =>
-      !dashboardStateManager.getPanels().length &&
-      !getShouldShowEditHelp() &&
-      !getShouldShowViewHelp() &&
-      dashboardConfig.getHideWriteControls();
+    const getIsEmptyInReadonlyModeOrUserHasNoPermissions = () => {
+      const readonlyMode =
+        !dashboardStateManager.getPanels().length &&
+        !getShouldShowEditHelp() &&
+        !getShouldShowViewHelp() &&
+        dashboardConfig.getHideWriteControls();
+      const userHasNoPermissions =
+        !dashboardStateManager.getPanels().length &&
+        !visualizeCapabilities.save &&
+        !mapsCapabilities.save;
+      return readonlyMode || userHasNoPermissions;
+    };
 
     const addVisualization = () => {
       navActions[TopNavIds.VISUALIZE]();
@@ -241,7 +248,7 @@ export class DashboardAppController {
       }
       const shouldShowEditHelp = getShouldShowEditHelp();
       const shouldShowViewHelp = getShouldShowViewHelp();
-      const isEmptyInReadonlyMode = getIsEmptyInReadonlyMode();
+      const isEmptyInReadonlyMode = getIsEmptyInReadonlyModeOrUserHasNoPermissions();
       return {
         id: dashboardStateManager.savedDashboard.id || '',
         filters: queryFilter.getFilters(),
@@ -298,7 +305,7 @@ export class DashboardAppController {
           dashboardContainer.renderEmpty = () => {
             const shouldShowEditHelp = getShouldShowEditHelp();
             const shouldShowViewHelp = getShouldShowViewHelp();
-            const isEmptyInReadOnlyMode = getIsEmptyInReadonlyMode();
+            const isEmptyInReadOnlyMode = getIsEmptyInReadonlyModeOrUserHasNoPermissions();
             const isEmptyState = shouldShowEditHelp || shouldShowViewHelp || isEmptyInReadOnlyMode;
             return isEmptyState ? (
               <DashboardEmptyScreen
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/plugin.ts b/src/legacy/core_plugins/kibana/public/dashboard/plugin.ts
index 7d64ee969212..c9c591d4a6aa 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/plugin.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/plugin.ts
@@ -145,6 +145,10 @@ export class DashboardPlugin implements Plugin {
           savedQueryService: dataStart.query.savedQueries,
           embeddable,
           dashboardCapabilities: coreStart.application.capabilities.dashboard,
+          embeddableCapabilities: {
+            visualizeCapabilities: coreStart.application.capabilities.visualize,
+            mapsCapabilities: coreStart.application.capabilities.maps,
+          },
           localStorage: new Storage(localStorage),
         };
         const { renderApp } = await import('./np_ready/application');

From a221597a39d348c764160d4c8cea0ca058cdc08f Mon Sep 17 00:00:00 2001
From: Maja Grubic <maja.grubic@elastic.co>
Date: Thu, 27 Feb 2020 10:05:57 +0000
Subject: [PATCH 2/2] Renaming function

---
 .../public/dashboard/np_ready/dashboard_app_controller.tsx  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx
index 2eb069abca17..56f4aa90aa02 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx
@@ -171,7 +171,7 @@ export class DashboardAppController {
       dashboardStateManager.getIsViewMode() &&
       !dashboardConfig.getHideWriteControls();
 
-    const getIsEmptyInReadonlyModeOrUserHasNoPermissions = () => {
+    const shouldShowUnauthorizedEmptyState = () => {
       const readonlyMode =
         !dashboardStateManager.getPanels().length &&
         !getShouldShowEditHelp() &&
@@ -248,7 +248,7 @@ export class DashboardAppController {
       }
       const shouldShowEditHelp = getShouldShowEditHelp();
       const shouldShowViewHelp = getShouldShowViewHelp();
-      const isEmptyInReadonlyMode = getIsEmptyInReadonlyModeOrUserHasNoPermissions();
+      const isEmptyInReadonlyMode = shouldShowUnauthorizedEmptyState();
       return {
         id: dashboardStateManager.savedDashboard.id || '',
         filters: queryFilter.getFilters(),
@@ -305,7 +305,7 @@ export class DashboardAppController {
           dashboardContainer.renderEmpty = () => {
             const shouldShowEditHelp = getShouldShowEditHelp();
             const shouldShowViewHelp = getShouldShowViewHelp();
-            const isEmptyInReadOnlyMode = getIsEmptyInReadonlyModeOrUserHasNoPermissions();
+            const isEmptyInReadOnlyMode = shouldShowUnauthorizedEmptyState();
             const isEmptyState = shouldShowEditHelp || shouldShowViewHelp || isEmptyInReadOnlyMode;
             return isEmptyState ? (
               <DashboardEmptyScreen