Hide the 'create agent' button when there are no keys / Remove the ca…

…llout when invalidating a key
elastic · Dec 6, 2021 · 2d30f02 · 2d30f02
1 parent de2585e
commit 2d30f02
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/x-pack/plugins/apm/public/components/app/Settings/agent_keys/agent_keys_table.tsx b/x-pack/plugins/apm/public/components/app/Settings/agent_keys/agent_keys_table.tsx
@@ -18,10 +18,10 @@ import { ConfirmDeleteModal } from './confirm_delete_modal';
 
 interface Props {
   agentKeys: ApiKey[];
-  refetchAgentKeys: () => void;
+  onKeyDelete: () => void;
 }
 
-export function AgentKeysTable({ agentKeys, refetchAgentKeys }: Props) {
+export function AgentKeysTable({ agentKeys, onKeyDelete }: Props) {
   const [agentKeyToBeDeleted, setAgentKeyToBeDeleted] = useState<ApiKey>();
 
   const columns: Array<EuiBasicTableColumn<ApiKey>> = [
@@ -159,7 +159,7 @@ export function AgentKeysTable({ agentKeys, refetchAgentKeys }: Props) {
           agentKey={agentKeyToBeDeleted}
           onConfirm={() => {
             setAgentKeyToBeDeleted(undefined);
-            refetchAgentKeys();
+            onKeyDelete();
           }}
         />
       )}

diff --git a/x-pack/plugins/apm/public/components/app/Settings/agent_keys/index.tsx b/x-pack/plugins/apm/public/components/app/Settings/agent_keys/index.tsx
@@ -157,7 +157,10 @@ export function AgentKeys() {
       content = (
         <AgentKeysTable
           agentKeys={agentKeys ?? []}
-          refetchAgentKeys={refetchAgentKeys}
+          onKeyDelete={() => {
+            setCreatedAgentKey(undefined);
+            refetchAgentKeys();
+          }}
         />
       );
     }
@@ -182,7 +185,7 @@ export function AgentKeys() {
             </h2>
           </EuiTitle>
         </EuiFlexItem>
-        {areApiKeysEnabled && canManage && (
+        {areApiKeysEnabled && canManage && !isEmpty(agentKeys) && (
           <EuiFlexItem grow={false}>
             <EuiButton
               onClick={() => setIsFlyoutVisible(true)}