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

Search: minor fixes (#23984)

Browse Source 
* Search: Use folder id as key when present

* Search: Do not render modals if not open
This commit is contained in:
Alex Khomenko 2020-04-28 15:31:11 +03:00 committed by GitHub
parent 88e9fccbc7
commit dd31207ecf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/features/search/components/ConfirmDeleteModal.tsx
View File

@ -46,7 +46,7 @@ export const ConfirmDeleteModal: FC<Props> = ({ results, onDeleteItems, isOpen,
});
};
return (
return isOpen ? (
<ConfirmModal
isOpen={isOpen}
title="Delete"
@ -59,7 +59,7 @@ export const ConfirmDeleteModal: FC<Props> = ({ results, onDeleteItems, isOpen,
onConfirm={deleteItems}
onDismiss={onDismiss}
/>
);
) : null;
};
const getStyles = stylesFactory((theme: GrafanaTheme) => {

4
public/app/features/search/components/MoveToFolderModal.tsx
View File

@ -44,7 +44,7 @@ export const MoveToFolderModal: FC<Props> = ({ results, onMoveItems, isOpen, onD
}
};
return (
return isOpen ? (
<Modal
className={styles.modal}
title="Choose Dashboard Folder"
@ -71,7 +71,7 @@ export const MoveToFolderModal: FC<Props> = ({ results, onMoveItems, isOpen, onD
</HorizontalGroup>
</>
</Modal>
);
) : null;
};
const getStyles = stylesFactory((theme: GrafanaTheme) => {

2
public/app/features/search/components/SearchResults.tsx
View File

@ -36,7 +36,7 @@ export const SearchResults: FC<Props> = ({
<div className={styles.wrapper}>
{results.map(section => {
return (
<div aria-label="Search section" className={styles.section} key={section.title}>
<div aria-label="Search section" className={styles.section} key={section.id || section.title}>
<SectionHeader onSectionClick={onToggleSection} {...{ onToggleChecked, editable, section }} />
<div aria-label="Search items" className={styles.sectionItems}>
{section.expanded && section.items.map(item => <SearchItem key={item.id} {...itemProps} item={item} />)}