From db6d0464e9dc457387223cea10da55b82b4f0a28 Mon Sep 17 00:00:00 2001
From: Gilles De Mey <gilles.de.mey@gmail.com>
Date: Wed, 11 Jan 2023 12:37:11 +0100
Subject: [PATCH] Alerting: revert #60728 (#61222)

---
 ...esTable.test.tsx => AmRoutesTable.test.ts} | 26 +---------------
 .../components/amroutes/AmRoutesTable.tsx     | 30 +++++--------------
 2 files changed, 8 insertions(+), 48 deletions(-)
 rename public/app/features/alerting/unified/components/amroutes/{AmRoutesTable.test.tsx => AmRoutesTable.test.ts} (88%)

diff --git a/public/app/features/alerting/unified/components/amroutes/AmRoutesTable.test.tsx b/public/app/features/alerting/unified/components/amroutes/AmRoutesTable.test.ts
similarity index 88%
rename from public/app/features/alerting/unified/components/amroutes/AmRoutesTable.test.tsx
rename to public/app/features/alerting/unified/components/amroutes/AmRoutesTable.test.ts
index 197145f8dd4..a0ced048f8f 100644
--- a/public/app/features/alerting/unified/components/amroutes/AmRoutesTable.test.tsx
+++ b/public/app/features/alerting/unified/components/amroutes/AmRoutesTable.test.ts
@@ -1,13 +1,9 @@
-import { render, screen } from '@testing-library/react';
-import { noop } from 'lodash';
-import React from 'react';
-
 import { MatcherOperator } from 'app/plugins/datasource/alertmanager/types';
 
 import { FormAmRoute } from '../../types/amroutes';
 import { MatcherFieldValue } from '../../types/silence-form';
 
-import { AmRoutesTable, deleteRoute, getFilteredRoutes, updatedRoute } from './AmRoutesTable';
+import { deleteRoute, getFilteredRoutes, updatedRoute } from './AmRoutesTable';
 
 const defaultAmRoute: FormAmRoute = {
   id: '',
@@ -193,24 +189,4 @@ describe('deleteRoute', () => {
     expect(updatedRoutes[1].id).toBe('2');
     expect(updatedRoutes[2].id).toBe('3');
   });
-
-  it('Should warn about policies with no contact point', () => {
-    const routes: FormAmRoute[] = [
-      buildAmRoute({ id: 'no-contact-point' }),
-      buildAmRoute({ id: 'with-contact-point', receiver: 'TestContactPoint' }),
-    ];
-
-    render(
-      <AmRoutesTable
-        onChange={noop}
-        onCancelAdd={noop}
-        routes={routes}
-        isAddMode={false}
-        alertManagerSourceName={'grafana'}
-        receivers={[]}
-      />
-    );
-    expect(screen.getByText('None')).toBeInTheDocument();
-    expect(screen.getByText('TestContactPoint')).toBeInTheDocument();
-  });
 });
diff --git a/public/app/features/alerting/unified/components/amroutes/AmRoutesTable.tsx b/public/app/features/alerting/unified/components/amroutes/AmRoutesTable.tsx
index d6c17ff3965..9f34dbffd26 100644
--- a/public/app/features/alerting/unified/components/amroutes/AmRoutesTable.tsx
+++ b/public/app/features/alerting/unified/components/amroutes/AmRoutesTable.tsx
@@ -1,7 +1,7 @@
 import { intersectionWith, isEqual } from 'lodash';
 import React, { FC, useCallback, useEffect, useMemo, useState } from 'react';
 
-import { Badge, Button, ConfirmModal, HorizontalGroup, IconButton, Tooltip } from '@grafana/ui';
+import { Button, ConfirmModal, HorizontalGroup, IconButton } from '@grafana/ui';
 import { contextSrv } from 'app/core/services/context_srv';
 
 import { FormAmRoute } from '../../types/amroutes';
@@ -95,10 +95,6 @@ export const AmRoutesTable: FC<AmRoutesTableProps> = ({
   const expandItem = useCallback((item: RouteTableItemProps) => setExpandedId(item.id), []);
   const collapseItem = useCallback(() => setExpandedId(undefined), []);
 
-  const missingReceiver = (route: FormAmRoute) => {
-    return Boolean(route.receiver) === false;
-  };
-
   const cols: RouteTableColumnProps[] = [
     {
       id: 'matchingCriteria',
@@ -124,24 +120,12 @@ export const AmRoutesTable: FC<AmRoutesTableProps> = ({
       label: 'Contact point',
       renderCell: (item) => {
         const type = getGrafanaAppReceiverType(receivers, item.data.receiver);
-
-        if (!missingReceiver(item.data)) {
-          return (
-            <>
-              {item.data.receiver} {type && <GrafanaAppBadge grafanaAppType={type} />}
-            </>
-          );
-        }
-
-        return (
-          <Tooltip
-            content={'No notifications will be delivered for this policy until a contact point is configured.'}
-            placement="top"
-          >
-            <span>
-              <Badge color="orange" icon="exclamation-triangle" text="None" />
-            </span>
-          </Tooltip>
+        return item.data.receiver ? (
+          <>
+            {item.data.receiver} {type && <GrafanaAppBadge grafanaAppType={type} />}
+          </>
+        ) : (
+          '-'
         );
       },
       size: 5,