Merge branch 'fleet/permissions' of https://github.com/mattapperson/k…

…ibana into fleet/permissions
elastic · Oct 15, 2019 · fa695f7 · fa695f7
2 parents c842231 + 9c1c8ef
commit fa695f7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/x-pack/legacy/plugins/fleet/public/pages/agent_list/index.tsx b/x-pack/legacy/plugins/fleet/public/pages/agent_list/index.tsx
@@ -159,7 +159,7 @@ export const AgentListPage: React.SFC<RouterProps> = ({ libs }) => {
             />
           </EuiButton>
         ) : (
-          <div />
+          null
         )
       }
     />

diff --git a/x-pack/legacy/plugins/graph/index.js b/x-pack/legacy/plugins/graph/index.js
@@ -36,9 +36,7 @@ export function graph(kibana) {
       return Joi.object({
         enabled: Joi.boolean().default(true),
         canEditDrillDownUrls: Joi.boolean().default(true),
-        savePolicy: Joi.string()
-          .valid(['config', 'configAndDataWithConsent', 'configAndData', 'none'])
-          .default('configAndData'),
+        savePolicy: Joi.string().valid(['config', 'configAndDataWithConsent', 'configAndData', 'none']).default('configAndData'),
       }).default();
     },
 
@@ -47,7 +45,7 @@ export function graph(kibana) {
         const config = server.config();
         return {
           graphSavePolicy: config.get('xpack.graph.savePolicy'),
-          canEditDrillDownUrls: config.get('xpack.graph.canEditDrillDownUrls'),
+          canEditDrillDownUrls: config.get('xpack.graph.canEditDrillDownUrls')
         };
       });
 
@@ -74,8 +72,8 @@ export function graph(kibana) {
               read: ['index-pattern', 'graph-workspace'],
             },
             ui: [],
-          },
-        },
+          }
+        }
       });
 
       initServer(server);