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 Fix: Only display latest version if a plugin is not installed (#78178)

Browse Source
This commit is contained in:
Andres Martinez Gotor 2023-11-16 10:47:42 +01:00 committed by GitHub
parent 9452a6fcf7
commit 05cf8c9253
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
public/app/features/plugins/admin/components/PluginDetailsHeaderDependencies.tsx
View File

@ -4,24 +4,17 @@ import React from 'react';
import { GrafanaTheme2 } from '@grafana/data';
import { useStyles2, Icon, Stack } from '@grafana/ui';
import { Version, CatalogPlugin, PluginIconName } from '../types';
import { CatalogPlugin, PluginIconName } from '../types';
type Props = {
plugin: CatalogPlugin;
latestCompatibleVersion?: Version;
grafanaDependency?: string;
className?: string;
};
export function PluginDetailsHeaderDependencies({
plugin,
latestCompatibleVersion,
className,
}: Props): React.ReactElement | null {
export function PluginDetailsHeaderDependencies({ plugin, grafanaDependency }: Props): React.ReactElement | null {
const styles = useStyles2(getStyles);
const pluginDependencies = plugin.details?.pluginDependencies;
const grafanaDependency = plugin.isInstalled
? plugin.details?.grafanaDependency
: latestCompatibleVersion?.grafanaDependency || plugin.details?.grafanaDependency;
const hasNoDependencyInfo = !grafanaDependency && (!pluginDependencies || !pluginDependencies.length);
if (hasNoDependencyInfo) {

15
public/app/features/plugins/admin/hooks/usePluginInfo.tsx
View File

@ -19,7 +19,11 @@ export const usePluginInfo = (plugin?: CatalogPlugin): PageInfoItem[] => {
// Populate info
const latestCompatibleVersion = getLatestCompatibleVersion(plugin.details?.versions);
const version = plugin.installedVersion || latestCompatibleVersion?.version;
const useLatestCompatibleInfo = !plugin.isInstalled;
let version = plugin.installedVersion;
if (!version && useLatestCompatibleInfo && latestCompatibleVersion?.version) {
version = latestCompatibleVersion?.version;
}
if (Boolean(version)) {
info.push({
@ -47,15 +51,16 @@ export const usePluginInfo = (plugin?: CatalogPlugin): PageInfoItem[] => {
}
const pluginDependencies = plugin.details?.pluginDependencies;
const grafanaDependency = plugin.isInstalled
? plugin.details?.grafanaDependency
: latestCompatibleVersion?.grafanaDependency || plugin.details?.grafanaDependency;
let grafanaDependency = plugin.details?.grafanaDependency;
if (useLatestCompatibleInfo && latestCompatibleVersion?.grafanaDependency) {
grafanaDependency = latestCompatibleVersion?.grafanaDependency;
}
const hasNoDependencyInfo = !grafanaDependency && (!pluginDependencies || !pluginDependencies.length);
if (!hasNoDependencyInfo) {
info.push({
label: 'Dependencies',
value: <PluginDetailsHeaderDependencies plugin={plugin} latestCompatibleVersion={latestCompatibleVersion} />,
value: <PluginDetailsHeaderDependencies plugin={plugin} grafanaDependency={grafanaDependency} />,
});
}