PR feedback

chrisronline · chrisronline · commit 4970da2e72b2 · 2019-11-13T14:22:24.000-05:00
diff --git a/x-pack/legacy/plugins/monitoring/public/lib/setup_mode.js b/x-pack/legacy/plugins/monitoring/public/lib/setup_mode.js
@@ -82,8 +82,8 @@ export const updateSetupModeData = async (uuid, fetchWithoutClusterUuid = false)
   const oldData = setupModeState.data;
   const data = await fetchCollectionData(uuid, fetchWithoutClusterUuid);
   setupModeState.data = data;
-  if (chrome.getInjected('isOnCloud') || data.hasPermissions === false) {
-    const text = data.hasPermissions === false
+  if (chrome.getInjected('isOnCloud') || !data.hasPermissions) {
+    const text = !data.hasPermissions
       ? i18n.translate('xpack.monitoring.setupMode.notAvailablePermissions', {
         defaultMessage: 'You do not have the necessary permissions to do this.'
       })
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/setup/collection/get_collection_status.js b/x-pack/legacy/plugins/monitoring/server/lib/setup/collection/get_collection_status.js
@@ -346,7 +346,9 @@ export const getCollectionStatus = async (req, indexPatterns, clusterUuid, nodeU
   const hasPermissions = await hasNecessaryPermissions(req);
   if (!hasPermissions) {
     return {
-      hasPermissions: false
+      _meta: {
+        hasPermissions: false
+      }
     };
   }
   const liveClusterUuid = skipLiveData ? null : await getLiveElasticsearchClusterUuid(req);
@@ -580,6 +582,7 @@ export const getCollectionStatus = async (req, indexPatterns, clusterUuid, nodeU
   status._meta = {
     secondsAgo: NUMBER_OF_SECONDS_AGO_TO_LOOK,
     liveClusterUuid,
+    hasPermissions,
   };
 
   return status;
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/detect_apm.json b/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/detect_apm.json
@@ -51,6 +51,7 @@
   },
   "_meta": {
     "secondsAgo": 30,
-    "liveClusterUuid": null
+    "liveClusterUuid": null,
+    "hasPermissions": true
   }
 }
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/detect_beats.json b/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/detect_beats.json
@@ -60,6 +60,7 @@
   },
   "_meta": {
     "secondsAgo": 30,
-    "liveClusterUuid": null
+    "liveClusterUuid": null,
+    "hasPermissions": true
   }
 }
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/detect_beats_management.json b/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/detect_beats_management.json
@@ -51,6 +51,7 @@
   },
   "_meta": {
     "secondsAgo": 30,
-    "liveClusterUuid": null
+    "liveClusterUuid": null,
+    "hasPermissions": true
   }
 }
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/detect_logstash.json b/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/detect_logstash.json
@@ -51,6 +51,7 @@
   },
   "_meta": {
     "secondsAgo": 30,
-    "liveClusterUuid": null
+    "liveClusterUuid": null,
+    "hasPermissions": true
   }
 }
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/detect_logstash_management.json b/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/detect_logstash_management.json
@@ -51,6 +51,7 @@
   },
   "_meta": {
     "secondsAgo": 30,
-    "liveClusterUuid": null
+    "liveClusterUuid": null,
+    "hasPermissions": true
   }
 }
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/es_and_kibana_exclusive_mb.json b/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/es_and_kibana_exclusive_mb.json
@@ -71,6 +71,7 @@
   },
   "_meta": {
     "secondsAgo": 30,
-    "liveClusterUuid": null
+    "liveClusterUuid": null,
+    "hasPermissions": true
   }
 }
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/es_and_kibana_mb.json b/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/es_and_kibana_mb.json
@@ -71,6 +71,7 @@
   },
   "_meta": {
     "secondsAgo": 30,
-    "liveClusterUuid": null
+    "liveClusterUuid": null,
+    "hasPermissions": true
   }
 }
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/kibana_exclusive_mb.json b/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/kibana_exclusive_mb.json
@@ -71,6 +71,7 @@
   },
   "_meta": {
     "secondsAgo": 30,
-    "liveClusterUuid": null
+    "liveClusterUuid": null,
+    "hasPermissions": true
   }
 }
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/kibana_mb.json b/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/kibana_mb.json
@@ -71,6 +71,7 @@
   },
   "_meta": {
     "secondsAgo": 30,
-    "liveClusterUuid": null
+    "liveClusterUuid": null,
+    "hasPermissions": true
   }
 }
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/security.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/security.js
@@ -54,7 +54,7 @@ export default function ({ getService }) {
         .send({ timeRange })
         .expect(200);
 
-      expect(body.hasPermissions).to.be(false);
+      expect(body._meta.hasPermissions).to.be(false);
     });
   });
 }

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@`
`51`	`51`	`},`
`52`	`52`	`"_meta": {`
`53`	`53`	`"secondsAgo": 30,`
`54`		`- "liveClusterUuid": null`
	`54`	`+ "liveClusterUuid": null,`
	`55`	`+ "hasPermissions": true`
`55`	`56`	`}`
`56`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@`
`60`	`60`	`},`
`61`	`61`	`"_meta": {`
`62`	`62`	`"secondsAgo": 30,`
`63`		`- "liveClusterUuid": null`
	`63`	`+ "liveClusterUuid": null,`
	`64`	`+ "hasPermissions": true`
`64`	`65`	`}`
`65`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@`
`71`	`71`	`},`
`72`	`72`	`"_meta": {`
`73`	`73`	`"secondsAgo": 30,`
`74`		`- "liveClusterUuid": null`
	`74`	`+ "liveClusterUuid": null,`
	`75`	`+ "hasPermissions": true`
`75`	`76`	`}`
`76`	`77`	`}`