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

Plugin signing: UI information (#28469)

Browse Source 
* first pass

* return list

* types and cleanup

* add to plugin page and add styles

* update comment

* update comment

* fix component path

* simplify error component

* simplify error struct

* fix tests

* don't export and fix string()

* update naming

* remove frontend

* introduce phantom loader

* track single error

* remove error from base

* remove unused struct

* remove unnecessary filter

* add errors endpoint

* Update set log to use id field

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* skip adding BE plugins

* remove errs from plugin + ds list

* remove unnecessary fields

* add signature state to panels

* Fetch plugins errors

* grafana/ui component tweaks

* DS Picker - add unsigned badge

* VizPicker - add unsigned badge

* PluginSignatureBadge tweaks

* Plugins list - add signatures info box

* New datasource page - add signatures info box

* Plugin page - add signatures info box

* Fix test

* Do not show Core label in viz picker

* Update public/app/features/plugins/PluginsErrorsInfo.tsx

Co-authored-by: Torkel Ödegaard <torkel@grafana.org>

* Update public/app/features/plugins/PluginListPage.test.tsx

Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>

* Update public/app/features/plugins/PluginListPage.tsx

Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>

* Update public/app/features/datasources/NewDataSourcePage.tsx

Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>

* Review comments 1

* Review comments 2

* Update public/app/features/plugins/PluginsErrorsInfo.tsx

* Update public/app/features/plugins/PluginPage.tsx

* Prettier fix

* remove stale backend code

* Docs issues fix

Co-authored-by: Will Browne <will.browne@grafana.com>
Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Torkel Ödegaard <torkel@grafana.org>
Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
This commit is contained in:
Dominik Prokop
2020-10-27 13:08:08 +01:00
committed by GitHub
parent d1ed163fc6
commit 4468d41417
26 changed files with 426 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public/app/core/components/Page/Page.tsx
View File

@@ -1,5 +1,5 @@
// Libraries
import React, { Component } from 'react';
import React, { Component, HTMLAttributes } from 'react';
import { getTitleFromNavModel } from 'app/core/selectors/navModel';
// Components
@@ -11,7 +11,7 @@ import { NavModel } from '@grafana/data';
import { isEqual } from 'lodash';
import { Branding } from '../Branding/Branding';
interface Props {
interface Props extends HTMLAttributes<HTMLDivElement> {
children: React.ReactNode;
navModel: NavModel;
}
@@ -44,13 +44,13 @@ class Page extends Component<Props> {
}
render() {
const { navModel } = this.props;
const { navModel, children, ...otherProps } = this.props;
return (
<div className="page-scrollbar-wrapper">
<div {...otherProps} className="page-scrollbar-wrapper">
<CustomScrollbar autoHeightMin={'100%'} className="custom-scrollbar--page">
<div className="page-scrollbar-content">
<PageHeader model={navModel} />
{this.props.children}
{children}
<Footer />
</div>
</CustomScrollbar>

15
public/app/core/components/Select/DataSourcePicker.tsx
View File

@@ -2,9 +2,10 @@
import React, { PureComponent } from 'react';
// Components
import { Select } from '@grafana/ui';
import { HorizontalGroup, Select } from '@grafana/ui';
import { SelectableValue, DataSourceSelectItem } from '@grafana/data';
import { selectors } from '@grafana/e2e-selectors';
import { isUnsignedPluginSignature, PluginSignatureBadge } from '../../../features/plugins/PluginSignatureBadge';
export interface Props {
onChange: (ds: DataSourceSelectItem) => void;
@@ -57,6 +58,7 @@ export class DataSourcePicker extends PureComponent<Props> {
value: ds.name,
label: ds.name,
imgUrl: ds.meta.info.logos.small,
meta: ds.meta,
}));
const value = current && {
@@ -65,6 +67,7 @@ export class DataSourcePicker extends PureComponent<Props> {
imgUrl: current.meta.info.logos.small,
loading: showLoading,
hideText: hideTextValue,
meta: current.meta,
};
return (
@@ -85,6 +88,16 @@ export class DataSourcePicker extends PureComponent<Props> {
noOptionsMessage="No datasources found"
value={value}
invalid={invalid}
getOptionLabel={o => {
if (isUnsignedPluginSignature(o.meta.signature) && o !== value) {
return (
<HorizontalGroup align="center" justify="space-between">
<span>{o.label}</span> <PluginSignatureBadge status={o.meta.signature} />
</HorizontalGroup>
);
}
return o.label || '';
}}
/>
</div>
);