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

Bug: Allow to uninstall a deprecated plugin (#74444)

Browse Source
This commit is contained in:
Andres Martinez Gotor 2023-09-12 10:33:09 +02:00 committed by GitHub
parent 29238c19fd
commit 8cb93bf3e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
public/app/features/plugins/admin/components/InstallControls/InstallControlsButton.test.tsx
View File

@ -69,4 +69,24 @@ describe('InstallControlsButton', () => {
});
}
);
it("should allow to uninstall a plugin even if it's unpublished", () => {
render(
<TestProvider>
<InstallControlsButton plugin={{ ...plugin, isPublished: false }} pluginStatus={PluginStatus.UNINSTALL} />
</TestProvider>
);
const el = screen.getByRole('button');
expect(el).toHaveTextContent(/uninstall/i);
expect(el).toBeVisible();
});
it('should not render install or upgrade buttons if the plugin is unpublished', () => {
render(
<TestProvider>
<InstallControlsButton plugin={{ ...plugin, isPublished: false }} pluginStatus={PluginStatus.INSTALL} />
</TestProvider>
);
expect(screen.queryByRole('button')).not.toBeInTheDocument();
});
});

7
public/app/features/plugins/admin/components/InstallControls/InstallControlsButton.tsx
View File

@ -17,6 +17,7 @@ type InstallControlsButtonProps = {
plugin: CatalogPlugin;
pluginStatus: PluginStatus;
latestCompatibleVersion?: Version;
hasInstallWarning?: boolean;
setNeedReload?: (needReload: boolean) => void;
};
@ -24,6 +25,7 @@ export function InstallControlsButton({
plugin,
pluginStatus,
latestCompatibleVersion,
hasInstallWarning,
setNeedReload,
}: InstallControlsButtonProps) {
const dispatch = useDispatch();
@ -110,6 +112,11 @@ export function InstallControlsButton({
);
}
if (!plugin.isPublished || hasInstallWarning) {
// Cannot be updated or installed
return null;
}
if (pluginStatus === PluginStatus.UPDATE) {
return (
<HorizontalGroup align="flex-start" width="auto" height="auto">

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

@ -33,15 +33,14 @@ export const PluginActions = ({ plugin }: Props) => {
? PluginStatus.UPDATE
: PluginStatus.UNINSTALL
: PluginStatus.INSTALL;
const isInstallControlsDisabled =
plugin.isCore || plugin.isDisabled || !isInstallControlsEnabled() || hasInstallWarning;
const isInstallControlsDisabled = plugin.isCore || plugin.isDisabled || !isInstallControlsEnabled();
return (
<VerticalGroup>
<HorizontalGroup>
{!isInstallControlsDisabled && (
<>
{isExternallyManaged ? (
{isExternallyManaged && !hasInstallWarning ? (
<ExternallyManagedButton
pluginId={plugin.id}
pluginStatus={pluginStatus}
@ -53,6 +52,7 @@ export const PluginActions = ({ plugin }: Props) => {
latestCompatibleVersion={latestCompatibleVersion}
pluginStatus={pluginStatus}
setNeedReload={setNeedReload}
hasInstallWarning={hasInstallWarning}
/>
)}
</>

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

@ -325,12 +325,13 @@ describe('Plugin details page', () => {
expect(await queryByRole('button', { name: /install/i })).toBeInTheDocument();
});
it('should not display install button for enterprise plugins if license is invalid', async () => {
it('should not display install button for enterprise plugins if license is invalid (but allow uninstall)', async () => {
config.licenseInfo.enabledFeatures = {};
const { queryByRole, queryByText } = renderPluginDetails({ id, isInstalled: true, isEnterprise: true });
expect(await queryByRole('button', { name: /install/i })).not.toBeInTheDocument();
expect(await queryByRole('button', { name: /Install/ })).not.toBeInTheDocument();
expect(await queryByRole('button', { name: /Uninstall/ })).toBeInTheDocument();
expect(queryByText(/no valid Grafana Enterprise license detected/i)).toBeInTheDocument();
expect(queryByRole('link', { name: /learn more/i })).toBeInTheDocument();
});