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

Annotations: Allow addition of custom values whilst tags are loading (#40702)

Browse Source
This commit is contained in:
Ashley Harrison 2021-10-21 14:55:02 +01:00 committed by GitHub
parent 740444680c
commit 447a088750
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/grafana-ui/src/components/Select/SelectBase.tsx
View File

@ -88,6 +88,7 @@ const CustomControl = (props: any) => {
export function SelectBase<T>({ export function SelectBase<T>({
allowCustomValue = false, allowCustomValue = false,
allowCreateWhileLoading = false,
'aria-label': ariaLabel, 'aria-label': ariaLabel,
autoFocus = false, autoFocus = false,
backspaceRemovesValue = true, backspaceRemovesValue = true,
@ -227,6 +228,7 @@ export function SelectBase<T>({
if (allowCustomValue) { if (allowCustomValue) {
ReactSelectComponent = Creatable as any; ReactSelectComponent = Creatable as any;
creatableProps.allowCreateWhileLoading = allowCreateWhileLoading;
creatableProps.formatCreateLabel = formatCreateLabel ?? ((input: string) => `Create: ${input}`); creatableProps.formatCreateLabel = formatCreateLabel ?? ((input: string) => `Create: ${input}`);
creatableProps.onCreateOption = onCreateOption; creatableProps.onCreateOption = onCreateOption;
creatableProps.isValidNewOption = isValidNewOption; creatableProps.isValidNewOption = isValidNewOption;

1
packages/grafana-ui/src/components/Select/types.ts
View File

@ -9,6 +9,7 @@ export type InputActionMeta = {
export interface SelectCommonProps<T> { export interface SelectCommonProps<T> {
/** Aria label applied to the input field */ /** Aria label applied to the input field */
['aria-label']?: string; ['aria-label']?: string;
allowCreateWhileLoading?: boolean;
allowCustomValue?: boolean; allowCustomValue?: boolean;
/** Focus is set to the Select when rendered*/ /** Focus is set to the Select when rendered*/
autoFocus?: boolean; autoFocus?: boolean;

1
public/app/core/components/TagFilter/TagFilter.tsx
View File

@ -68,6 +68,7 @@ export const TagFilter: FC<Props> = ({
const value = tags.map((tag) => ({ value: tag, label: tag, count: 0 })); const value = tags.map((tag) => ({ value: tag, label: tag, count: 0 }));
const selectOptions = { const selectOptions = {
allowCreateWhileLoading: true,
allowCustomValue, allowCustomValue,
formatCreateLabel, formatCreateLabel,
defaultOptions: true, defaultOptions: true,