Disabled edit alert button on management ui for non registered UI ale…

…rt types (elastic#60439)
YulNaumenko · Mar 17, 2020 · 7c99b4d · 7c99b4d
1 parent 9fcfa40
commit 7c99b4d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/x-pack/plugins/alerting/server/plugin.ts b/x-pack/plugins/alerting/server/plugin.ts
@@ -173,16 +173,6 @@ export class AlertingPlugin {
     muteAlertInstanceRoute(router, this.licenseState);
     unmuteAlertInstanceRoute(router, this.licenseState);
 
-    alertTypeRegistry.register({
-      id: 'test',
-      actionGroups: [{ id: 'default', name: 'Default' }],
-      defaultActionGroupId: 'default',
-      name: 'Test',
-      executor: async options => {
-        return { status: 'ok' };
-      },
-    });
-
     return {
       registerType: alertTypeRegistry.register.bind(alertTypeRegistry),
     };

diff --git a/...iggers_actions_ui/public/application/sections/alerts_list/components/alerts_list.test.tsx b/...iggers_actions_ui/public/application/sections/alerts_list/components/alerts_list.test.tsx
@@ -242,6 +242,8 @@ describe('alerts_list component with items', () => {
       alertTypeRegistry: alertTypeRegistry as any,
     };
 
+    alertTypeRegistry.has.mockReturnValue(true);
+
     wrapper = mountWithIntl(
       <AppContextProvider appDeps={deps}>
         <AlertsList />
@@ -257,11 +259,15 @@ describe('alerts_list component with items', () => {
     expect(loadActionTypes).toHaveBeenCalled();
   }
 
-  it('renders table of connectors', async () => {
+  it('renders table of alerts', async () => {
     await setup();
     expect(wrapper.find('EuiBasicTable')).toHaveLength(1);
     expect(wrapper.find('EuiTableRow')).toHaveLength(2);
   });
+  it('renders edit button for registered alert types', async () => {
+    await setup();
+    expect(wrapper.find('[data-test-subj="alertsTableCell-editLink"]').length).toBeGreaterThan(0);
+  });
 });
 
 describe('alerts_list component empty with show only capability', () => {
@@ -455,6 +461,8 @@ describe('alerts_list with show only capability', () => {
       alertTypeRegistry: alertTypeRegistry as any,
     };
 
+    alertTypeRegistry.has.mockReturnValue(false);
+
     wrapper = mountWithIntl(
       <AppContextProvider appDeps={deps}>
         <AlertsList />
@@ -473,4 +481,8 @@ describe('alerts_list with show only capability', () => {
     expect(wrapper.find('EuiTableRow')).toHaveLength(2);
     // TODO: check delete button
   });
+  it('not renders edit button for non registered alert types', async () => {
+    await setup();
+    expect(wrapper.find('[data-test-subj="alertsTableCell-editLink"]').length).toBe(0);
+  });
 });
diff --git a/...ns/triggers_actions_ui/public/application/sections/alerts_list/components/alerts_list.tsx b/...ns/triggers_actions_ui/public/application/sections/alerts_list/components/alerts_list.tsx
@@ -225,7 +225,7 @@ export const AlertsList: React.FunctionComponent = () => {
         ? [
             {
               render: (item: AlertTableItem) => {
-                return (
+                return alertTypeRegistry.has(item.alertTypeId) ? (
                   <EuiLink
                     data-test-subj="alertsTableCell-editLink"
                     color="primary"
@@ -236,6 +236,8 @@ export const AlertsList: React.FunctionComponent = () => {
                       id="xpack.triggersActionsUI.sections.alertsList.alertsListTable.columns.editLinkTitle"
                     />
                   </EuiLink>
+                ) : (
+                  <></>
                 );
               },
             },