From 5f516d547e9a70907998c6d9541b45baf6d77ac6 Mon Sep 17 00:00:00 2001
From: Tom Ratcliffe <tom.ratcliffe@grafana.com>
Date: Fri, 20 Sep 2024 16:30:32 +0100
Subject: [PATCH] Additional tidy up of unused

---
 public/app/features/alerting/unified/RuleEditor.tsx           | 2 +-
 public/app/features/alerting/unified/Settings.test.tsx        | 4 ++--
 .../unified/components/rules/Filter/RulesFilter.v2.tsx        | 2 ++
 .../unified/components/settings/ConfigurationDrawer.tsx       | 4 +---
 public/app/features/alerting/unified/mocks.ts                 | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/public/app/features/alerting/unified/RuleEditor.tsx b/public/app/features/alerting/unified/RuleEditor.tsx
index bdda3e5d28b..64afeb8ae68 100644
--- a/public/app/features/alerting/unified/RuleEditor.tsx
+++ b/public/app/features/alerting/unified/RuleEditor.tsx
@@ -65,7 +65,7 @@ const RuleEditor = () => {
     }
 
     if (identifier) {
-      return <ExistingRuleEditor key={id} identifier={identifier} id={id} />;
+      return <ExistingRuleEditor key={id} identifier={identifier} />;
     }
 
     if (copyFromIdentifier) {
diff --git a/public/app/features/alerting/unified/Settings.test.tsx b/public/app/features/alerting/unified/Settings.test.tsx
index 401b4b6fee7..84c16a13e9f 100644
--- a/public/app/features/alerting/unified/Settings.test.tsx
+++ b/public/app/features/alerting/unified/Settings.test.tsx
@@ -7,7 +7,7 @@ import SettingsPage from './Settings';
 import DataSourcesResponse from './components/settings/__mocks__/api/datasources.json';
 import { setupGrafanaManagedServer, withExternalOnlySetting } from './components/settings/__mocks__/server';
 import { setupMswServer } from './mockApi';
-import { grantUserRole } from './mocks';
+import { grantAllUserRoles } from './mocks';
 
 jest.mock('@grafana/runtime', () => ({
   ...jest.requireActual('@grafana/runtime'),
@@ -39,7 +39,7 @@ const ui = {
 
 describe('Alerting settings', () => {
   beforeEach(() => {
-    grantUserRole('ServerAdmin');
+    grantAllUserRoles();
     setupGrafanaManagedServer(server);
   });
 
diff --git a/public/app/features/alerting/unified/components/rules/Filter/RulesFilter.v2.tsx b/public/app/features/alerting/unified/components/rules/Filter/RulesFilter.v2.tsx
index 7faa69f1f83..ae44071ad64 100644
--- a/public/app/features/alerting/unified/components/rules/Filter/RulesFilter.v2.tsx
+++ b/public/app/features/alerting/unified/components/rules/Filter/RulesFilter.v2.tsx
@@ -28,6 +28,7 @@ type RulesFilterProps = {
 
 type ActiveTab = 'custom' | 'saved';
 
+// eslint-disable-next-line no-unused-vars
 export default function RulesFilter({ onClear = () => {} }: RulesFilterProps) {
   const styles = useStyles2(getStyles);
   const [activeTab, setActiveTab] = useState<ActiveTab>('custom');
@@ -155,6 +156,7 @@ type TableColumns = {
 };
 
 const SavedSearches = () => {
+  // eslint-disable-next-line no-unused-vars
   const applySearch = useCallback((name: string) => {}, []);
 
   return (
diff --git a/public/app/features/alerting/unified/components/settings/ConfigurationDrawer.tsx b/public/app/features/alerting/unified/components/settings/ConfigurationDrawer.tsx
index 26d1a67e33d..4a1875d28db 100644
--- a/public/app/features/alerting/unified/components/settings/ConfigurationDrawer.tsx
+++ b/public/app/features/alerting/unified/components/settings/ConfigurationDrawer.tsx
@@ -68,9 +68,7 @@ export function useEditConfigurationDrawer() {
             onReset={resetAlertmanagerSettings}
           />
         )}
-        {activeTab === 'versions' && dataSourceName && (
-          <AlertmanagerConfigurationVersionManager alertmanagerName={dataSourceName} />
-        )}
+        {activeTab === 'versions' && dataSourceName && <AlertmanagerConfigurationVersionManager />}
       </Drawer>
     );
   }, [open, dataSourceName, handleDismiss, activeTab, updateAlertmanagerSettings, resetAlertmanagerSettings]);
diff --git a/public/app/features/alerting/unified/mocks.ts b/public/app/features/alerting/unified/mocks.ts
index 514ff806a94..35e63072bf9 100644
--- a/public/app/features/alerting/unified/mocks.ts
+++ b/public/app/features/alerting/unified/mocks.ts
@@ -709,7 +709,7 @@ export const grantUserPermissions = (permissions: AccessControlAction[]) => {
     .mockImplementation((action) => permissions.includes(action as AccessControlAction));
 };
 
-export const grantUserRole = () => {
+export const grantAllUserRoles = () => {
   jest.spyOn(contextSrv, 'hasRole').mockReturnValue(true);
 };