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

Plugins: Disable install controls for provisioned plugin in cloud (#90479)

Browse Source
This commit is contained in:
Hugo Kiyodi Oshiro 2024-07-24 08:36:15 +02:00 committed by GitHub
parent 8fd2245ce6
commit 5e3a5b355e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/app/features/plugins/admin/components/PluginActions.tsx
View File

@ -34,7 +34,8 @@ export const PluginActions = ({ plugin }: Props) => {
? PluginStatus.UPDATE
: PluginStatus.UNINSTALL
: PluginStatus.INSTALL;
const isInstallControlsDisabled = plugin.isCore || plugin.isDisabled || !isInstallControlsEnabled();
const isInstallControlsDisabled =
plugin.isCore || plugin.isDisabled || plugin.isProvisioned || !isInstallControlsEnabled();
return (
<Stack direction="column">

1
public/app/features/plugins/admin/helpers.ts
View File

@ -81,6 +81,7 @@ export function mergeLocalsAndRemotes({
}
catalogPlugin.isUninstallingFromInstance = Boolean(localCounterpart) && !instancesMap.has(remotePlugin.slug);
catalogPlugin.isProvisioned = provisionedSet.has(remotePlugin.slug);
}
catalogPlugins.push(catalogPlugin);

7
public/app/features/plugins/admin/pages/PluginDetails.test.tsx
View File

@ -355,6 +355,13 @@ describe('Plugin details page', () => {
expect(await queryByRole('button', { name: /(un)?install/i })).not.toBeInTheDocument();
});
it('should not display install / uninstall buttons for provisioned plugins', async () => {
const { queryByRole } = renderPluginDetails({ id, isProvisioned: true });
expect(await queryByRole('button', { name: /update/i })).not.toBeInTheDocument();
expect(await queryByRole('button', { name: /(un)?install/i })).not.toBeInTheDocument();
});
it('should display install link with `config.pluginAdminExternalManageEnabled` set to true', async () => {
config.pluginAdminExternalManageEnabled = true;

1
public/app/features/plugins/admin/types.ts
View File

@ -65,6 +65,7 @@ export interface CatalogPlugin extends WithAccessControlMetadata {
isUninstallingFromInstance?: boolean;
isUpdatingFromInstance?: boolean;
iam?: IdentityAccessManagement;
isProvisioned?: boolean;
}
export interface CatalogPluginDetails {