IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: Remove accesscontrol license feature requirement for contact points RBAC (#94418)

Browse Source
This commit is contained in:
Tom Ratcliffe 2024-10-10 10:18:25 +01:00 committed by GitHub
parent 152f70a6a4
commit f6abde3328
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
public/app/features/alerting/unified/components/contact-points/ContactPoints.test.tsx
View File

@ -3,11 +3,7 @@ import { ComponentProps, ReactNode } from 'react';
import { render, screen, userEvent, waitFor, waitForElementToBeRemoved, within } from 'test/test-utils'; import { render, screen, userEvent, waitFor, waitForElementToBeRemoved, within } from 'test/test-utils';
import { selectors } from '@grafana/e2e-selectors'; import { selectors } from '@grafana/e2e-selectors';
import { import { flushMicrotasks, testWithFeatureToggles } from 'app/features/alerting/unified/test/test-utils';
flushMicrotasks,
testWithFeatureToggles,
testWithLicenseFeatures,
} from 'app/features/alerting/unified/test/test-utils';
import { K8sAnnotations } from 'app/features/alerting/unified/utils/k8s/constants'; import { K8sAnnotations } from 'app/features/alerting/unified/utils/k8s/constants';
import { AlertManagerDataSourceJsonData, AlertManagerImplementation } from 'app/plugins/datasource/alertmanager/types'; import { AlertManagerDataSourceJsonData, AlertManagerImplementation } from 'app/plugins/datasource/alertmanager/types';
import { AccessControlAction } from 'app/types'; import { AccessControlAction } from 'app/types';
@ -533,32 +529,20 @@ describe('contact points', () => {
).toBeInTheDocument(); ).toBeInTheDocument();
}); });
it('does not show manage permissions', async () => { it('shows manage permissions and allows closing', async () => {
renderGrafanaContactPoints(); const { user } = renderGrafanaContactPoints();
await clickMoreActionsButton('lotsa-emails'); await clickMoreActionsButton('lotsa-emails');
expect(screen.queryByRole('menuitem', { name: /manage permissions/i })).not.toBeInTheDocument(); await user.click(await screen.findByRole('menuitem', { name: /manage permissions/i }));
});
describe('accesscontrol license feature enabled', () => { const permissionsDialog = await screen.findByRole('dialog', { name: /drawer title manage permissions/i });
testWithLicenseFeatures(['accesscontrol']);
it('shows manage permissions and allows closing', async () => { expect(permissionsDialog).toBeInTheDocument();
const { user } = renderGrafanaContactPoints(); expect(await screen.findByRole('table')).toBeInTheDocument();
await clickMoreActionsButton('lotsa-emails'); await user.click(within(permissionsDialog).getAllByRole('button', { name: /close/i })[0]);
expect(permissionsDialog).not.toBeInTheDocument();
await user.click(await screen.findByRole('menuitem', { name: /manage permissions/i }));
const permissionsDialog = await screen.findByRole('dialog', { name: /drawer title manage permissions/i });
expect(permissionsDialog).toBeInTheDocument();
expect(await screen.findByRole('table')).toBeInTheDocument();
await user.click(within(permissionsDialog).getAllByRole('button', { name: /close/i })[0]);
expect(permissionsDialog).not.toBeInTheDocument();
});
}); });
}); });
}); });

3
public/app/features/alerting/unified/components/contact-points/utils.ts
View File

@ -2,7 +2,6 @@ import { difference, groupBy, take, trim, upperFirst } from 'lodash';
import { ReactNode } from 'react'; import { ReactNode } from 'react';
import { config } from '@grafana/runtime'; import { config } from '@grafana/runtime';
import { contextSrv } from 'app/core/core';
import { canAdminEntity, shouldUseK8sApi } from 'app/features/alerting/unified/utils/k8s/utils'; import { canAdminEntity, shouldUseK8sApi } from 'app/features/alerting/unified/utils/k8s/utils';
import { import {
AlertManagerCortexConfig, AlertManagerCortexConfig,
@ -210,4 +209,4 @@ function getNotifierMetadata(notifiers: NotifierDTO[], receiver: GrafanaManagedR
} }
export const showManageContactPointPermissions = (alertmanager: string, contactPoint: GrafanaManagedContactPoint) => export const showManageContactPointPermissions = (alertmanager: string, contactPoint: GrafanaManagedContactPoint) =>
shouldUseK8sApi(alertmanager) && contextSrv.licensedAccessControlEnabled() && canAdminEntity(contactPoint); shouldUseK8sApi(alertmanager) && canAdminEntity(contactPoint);