Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
2f5bea27
Unverified
Commit
2f5bea27
authored
Apr 23, 2020
by
Torkel Ödegaard
Committed by
GitHub
Apr 23, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
NewDataSourcePage: Restore signature badge lost in merge (#23832)
parent
e35f27ea
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
28 deletions
+20
-28
public/app/core/components/Card/Card.tsx
+12
-1
public/app/features/datasources/NewDataSourcePage.tsx
+8
-27
No files found.
public/app/core/components/Card/Card.tsx
View file @
2f5bea27
...
...
@@ -5,13 +5,23 @@ export interface CardProps {
logoUrl
?:
string
;
title
:
string
;
description
?:
string
;
labels
?:
React
.
ReactNode
;
actions
?:
React
.
ReactNode
;
onClick
?:
()
=>
void
;
ariaLabel
?:
string
;
className
?:
string
;
}
export
const
Card
:
React
.
FC
<
CardProps
>
=
({
logoUrl
,
title
,
description
,
actions
,
onClick
,
ariaLabel
,
className
})
=>
{
export
const
Card
:
React
.
FC
<
CardProps
>
=
({
logoUrl
,
title
,
description
,
labels
,
actions
,
onClick
,
ariaLabel
,
className
,
})
=>
{
const
mainClassName
=
cx
(
'add-data-source-item'
,
className
);
return
(
...
...
@@ -20,6 +30,7 @@ export const Card: React.FC<CardProps> = ({ logoUrl, title, description, actions
<
div
className=
"add-data-source-item-text-wrapper"
>
<
span
className=
"add-data-source-item-text"
>
{
title
}
</
span
>
{
description
&&
<
span
className=
"add-data-source-item-desc"
>
{
description
}
</
span
>
}
{
labels
&&
<
div
>
{
labels
}
</
div
>
}
</
div
>
{
actions
&&
<
div
className=
"add-data-source-item-actions"
>
{
actions
}
</
div
>
}
</
div
>
...
...
public/app/features/datasources/NewDataSourcePage.tsx
View file @
2f5bea27
...
...
@@ -145,36 +145,17 @@ const DataSourceTypeCard: FC<DataSourceTypeCardProps> = props => {
{
!
isPhantom
&&
<
Button
>
Select
</
Button
>
}
</>
}
className=
{
isPhantom
&&
'add-data-source-item--phantom'
}
onClick=
{
onClick
}
aria
-
label=
{
e2e
.
pages
.
AddDataSource
.
selectors
.
dataSourcePlugins
(
plugin
.
name
)
}
>
<
img
className=
"add-data-source-item-logo"
src=
{
plugin
.
info
.
logos
.
small
}
/>
<
div
className=
"add-data-source-item-text-wrapper"
>
<
span
className=
"add-data-source-item-text"
>
{
plugin
.
name
}
</
span
>
{
plugin
.
info
.
description
&&
<
span
className=
"add-data-source-item-desc"
>
{
plugin
.
info
.
description
}
</
span
>
}
{
!
isPhantom
&&
(
labels=
{
!
isPhantom
&&
(
<
div
>
<
PluginSignatureBadge
status=
{
plugin
.
signature
}
/>
</
div
>
)
}
</
div
>
<
div
className=
"add-data-source-item-actions"
>
{
learnMoreLink
&&
(
<
LinkButton
variant=
"secondary"
href=
{
`${learnMoreLink.url}?utm_source=grafana_add_ds`
}
target=
"_blank"
rel=
"noopener"
onClick=
{
onLearnMoreClick
}
icon=
"external-link-alt"
>
{
learnMoreLink
.
name
}
</
LinkButton
>
)
}
{
!
isPhantom
&&
<
Button
>
Select
</
Button
>
}
</
div
>
</
Card
>
)
}
className=
{
isPhantom
&&
'add-data-source-item--phantom'
}
onClick=
{
onClick
}
aria
-
label=
{
e2e
.
pages
.
AddDataSource
.
selectors
.
dataSourcePlugins
(
plugin
.
name
)
}
/>
);
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment