Explore: Rich History (#22570)
* Explore: Refactor active buttons css
* Explore: Add query history button
* WIP: Creating drawer
* WIP: Create custom drawer (for now)
* Revert changes to Drawer.tsx
* WIP: Layout finished
* Rich History: Set up boilerplate for Settings
* WIP: Query history cards
* Refactor, split components
* Add resizability, interactivity
* Save history to local storage
* Visualise queries from queryhistory local storage
* Set up query history settings
* Refactor
* Create link, un-refactored verison
* Copyable url
* WIP: Add slider
* Commenting feature
* Slider filtration
* Add headings
* Hide Rich history behind feature toggle
* Cleaning up, refactors
* Update tests
* Implement getQueryDisplayText
* Update lockfile for new dependencies
* Update heading based on sorting
* Fix typescript strinctNullCheck errors
* Fix Forms, new forms
* Fixes based on provided feedback
* Fixes, splitting component into two
* Add tooltips, add delete history button
* Clicking on card adds queries to query rows
* Delete history, width of drawers
* UI/UX changes, updates
* Add number of queries to headings, box shadows
* Fix slider, remove feature toggle
* Fix typo in the beta announcement
* Fix how the rich history state is rendered when initialization
* Move updateFilters when activeDatasourceFilter onlyto RichHistory, remove duplicated code
* Fix typescript strictnull errors, not used variables errors
2020-03-10 09:08:15 -05:00
|
|
|
import React from 'react';
|
|
|
|
import { css } from 'emotion';
|
|
|
|
import { uniqBy } from 'lodash';
|
|
|
|
|
|
|
|
// Types
|
|
|
|
import { RichHistoryQuery, ExploreId } from 'app/types/explore';
|
|
|
|
|
|
|
|
// Utils
|
|
|
|
import { stylesFactory, useTheme } from '@grafana/ui';
|
|
|
|
import { GrafanaTheme, SelectableValue } from '@grafana/data';
|
|
|
|
import { getExploreDatasources } from '../state/selectors';
|
|
|
|
|
|
|
|
import { SortOrder } from '../../../core/utils/explore';
|
|
|
|
import { sortQueries } from '../../../core/utils/richHistory';
|
|
|
|
|
|
|
|
// Components
|
|
|
|
import RichHistoryCard from './RichHistoryCard';
|
|
|
|
import { sortOrderOptions } from './RichHistory';
|
|
|
|
import { Select } from '@grafana/ui';
|
|
|
|
|
2020-03-17 17:24:27 -05:00
|
|
|
export interface Props {
|
Explore: Rich History (#22570)
* Explore: Refactor active buttons css
* Explore: Add query history button
* WIP: Creating drawer
* WIP: Create custom drawer (for now)
* Revert changes to Drawer.tsx
* WIP: Layout finished
* Rich History: Set up boilerplate for Settings
* WIP: Query history cards
* Refactor, split components
* Add resizability, interactivity
* Save history to local storage
* Visualise queries from queryhistory local storage
* Set up query history settings
* Refactor
* Create link, un-refactored verison
* Copyable url
* WIP: Add slider
* Commenting feature
* Slider filtration
* Add headings
* Hide Rich history behind feature toggle
* Cleaning up, refactors
* Update tests
* Implement getQueryDisplayText
* Update lockfile for new dependencies
* Update heading based on sorting
* Fix typescript strinctNullCheck errors
* Fix Forms, new forms
* Fixes based on provided feedback
* Fixes, splitting component into two
* Add tooltips, add delete history button
* Clicking on card adds queries to query rows
* Delete history, width of drawers
* UI/UX changes, updates
* Add number of queries to headings, box shadows
* Fix slider, remove feature toggle
* Fix typo in the beta announcement
* Fix how the rich history state is rendered when initialization
* Move updateFilters when activeDatasourceFilter onlyto RichHistory, remove duplicated code
* Fix typescript strictnull errors, not used variables errors
2020-03-10 09:08:15 -05:00
|
|
|
queries: RichHistoryQuery[];
|
|
|
|
sortOrder: SortOrder;
|
|
|
|
activeDatasourceOnly: boolean;
|
|
|
|
datasourceFilters: SelectableValue[] | null;
|
|
|
|
exploreId: ExploreId;
|
|
|
|
onChangeSortOrder: (sortOrder: SortOrder) => void;
|
|
|
|
onSelectDatasourceFilters: (value: SelectableValue[] | null) => void;
|
|
|
|
}
|
|
|
|
|
|
|
|
const getStyles = stylesFactory((theme: GrafanaTheme) => {
|
|
|
|
const bgColor = theme.isLight ? theme.colors.gray5 : theme.colors.dark4;
|
|
|
|
return {
|
|
|
|
container: css`
|
|
|
|
display: flex;
|
|
|
|
.label-slider {
|
|
|
|
font-size: ${theme.typography.size.sm};
|
|
|
|
&:last-of-type {
|
|
|
|
margin-top: ${theme.spacing.lg};
|
|
|
|
}
|
|
|
|
&:first-of-type {
|
|
|
|
margin-top: ${theme.spacing.sm};
|
|
|
|
font-weight: ${theme.typography.weight.semibold};
|
|
|
|
margin-bottom: ${theme.spacing.xs};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
`,
|
|
|
|
containerContent: css`
|
|
|
|
width: 100%;
|
|
|
|
`,
|
|
|
|
selectors: css`
|
|
|
|
display: flex;
|
|
|
|
justify-content: space-between;
|
|
|
|
`,
|
|
|
|
multiselect: css`
|
|
|
|
width: 60%;
|
|
|
|
.gf-form-select-box__multi-value {
|
|
|
|
background-color: ${bgColor};
|
|
|
|
padding: ${theme.spacing.xxs} ${theme.spacing.xs} ${theme.spacing.xxs} ${theme.spacing.sm};
|
|
|
|
border-radius: ${theme.border.radius.sm};
|
|
|
|
}
|
|
|
|
`,
|
|
|
|
sort: css`
|
|
|
|
width: 170px;
|
|
|
|
`,
|
|
|
|
sessionName: css`
|
|
|
|
display: flex;
|
|
|
|
align-items: flex-start;
|
|
|
|
justify-content: flex-start;
|
|
|
|
margin-top: ${theme.spacing.lg};
|
|
|
|
h4 {
|
|
|
|
margin: 0 10px 0 0;
|
|
|
|
}
|
|
|
|
`,
|
|
|
|
heading: css`
|
|
|
|
font-size: ${theme.typography.heading.h4};
|
|
|
|
margin: ${theme.spacing.md} ${theme.spacing.xxs} ${theme.spacing.sm} ${theme.spacing.xxs};
|
|
|
|
`,
|
|
|
|
};
|
|
|
|
});
|
|
|
|
|
|
|
|
export function RichHistoryStarredTab(props: Props) {
|
|
|
|
const {
|
|
|
|
datasourceFilters,
|
|
|
|
onSelectDatasourceFilters,
|
|
|
|
queries,
|
|
|
|
onChangeSortOrder,
|
|
|
|
sortOrder,
|
|
|
|
activeDatasourceOnly,
|
|
|
|
exploreId,
|
|
|
|
} = props;
|
|
|
|
|
|
|
|
const theme = useTheme();
|
|
|
|
const styles = getStyles(theme);
|
|
|
|
const listOfDsNamesWithQueries = uniqBy(queries, 'datasourceName').map(d => d.datasourceName);
|
|
|
|
const exploreDatasources = getExploreDatasources()
|
|
|
|
?.filter(ds => listOfDsNamesWithQueries.includes(ds.name))
|
|
|
|
.map(d => {
|
|
|
|
return { value: d.value!, label: d.value!, imgUrl: d.meta.info.logos.small };
|
|
|
|
});
|
|
|
|
const listOfDatasourceFilters = datasourceFilters?.map(d => d.value);
|
|
|
|
|
|
|
|
const starredQueries = queries.filter(q => q.starred === true);
|
|
|
|
const starredQueriesFilteredByDatasource = datasourceFilters
|
|
|
|
? starredQueries?.filter(q => listOfDatasourceFilters?.includes(q.datasourceName))
|
|
|
|
: starredQueries;
|
|
|
|
const sortedStarredQueries = sortQueries(starredQueriesFilteredByDatasource, sortOrder);
|
|
|
|
|
|
|
|
return (
|
|
|
|
<div className={styles.container}>
|
|
|
|
<div className={styles.containerContent}>
|
|
|
|
<div className={styles.selectors}>
|
|
|
|
{!activeDatasourceOnly && (
|
2020-03-17 17:24:27 -05:00
|
|
|
<div aria-label="Filter datasources" className={styles.multiselect}>
|
Explore: Rich History (#22570)
* Explore: Refactor active buttons css
* Explore: Add query history button
* WIP: Creating drawer
* WIP: Create custom drawer (for now)
* Revert changes to Drawer.tsx
* WIP: Layout finished
* Rich History: Set up boilerplate for Settings
* WIP: Query history cards
* Refactor, split components
* Add resizability, interactivity
* Save history to local storage
* Visualise queries from queryhistory local storage
* Set up query history settings
* Refactor
* Create link, un-refactored verison
* Copyable url
* WIP: Add slider
* Commenting feature
* Slider filtration
* Add headings
* Hide Rich history behind feature toggle
* Cleaning up, refactors
* Update tests
* Implement getQueryDisplayText
* Update lockfile for new dependencies
* Update heading based on sorting
* Fix typescript strinctNullCheck errors
* Fix Forms, new forms
* Fixes based on provided feedback
* Fixes, splitting component into two
* Add tooltips, add delete history button
* Clicking on card adds queries to query rows
* Delete history, width of drawers
* UI/UX changes, updates
* Add number of queries to headings, box shadows
* Fix slider, remove feature toggle
* Fix typo in the beta announcement
* Fix how the rich history state is rendered when initialization
* Move updateFilters when activeDatasourceFilter onlyto RichHistory, remove duplicated code
* Fix typescript strictnull errors, not used variables errors
2020-03-10 09:08:15 -05:00
|
|
|
<Select
|
|
|
|
isMulti={true}
|
|
|
|
options={exploreDatasources}
|
|
|
|
value={datasourceFilters}
|
2020-03-17 10:06:02 -05:00
|
|
|
placeholder="Filter queries for specific data sources(s)"
|
Explore: Rich History (#22570)
* Explore: Refactor active buttons css
* Explore: Add query history button
* WIP: Creating drawer
* WIP: Create custom drawer (for now)
* Revert changes to Drawer.tsx
* WIP: Layout finished
* Rich History: Set up boilerplate for Settings
* WIP: Query history cards
* Refactor, split components
* Add resizability, interactivity
* Save history to local storage
* Visualise queries from queryhistory local storage
* Set up query history settings
* Refactor
* Create link, un-refactored verison
* Copyable url
* WIP: Add slider
* Commenting feature
* Slider filtration
* Add headings
* Hide Rich history behind feature toggle
* Cleaning up, refactors
* Update tests
* Implement getQueryDisplayText
* Update lockfile for new dependencies
* Update heading based on sorting
* Fix typescript strinctNullCheck errors
* Fix Forms, new forms
* Fixes based on provided feedback
* Fixes, splitting component into two
* Add tooltips, add delete history button
* Clicking on card adds queries to query rows
* Delete history, width of drawers
* UI/UX changes, updates
* Add number of queries to headings, box shadows
* Fix slider, remove feature toggle
* Fix typo in the beta announcement
* Fix how the rich history state is rendered when initialization
* Move updateFilters when activeDatasourceFilter onlyto RichHistory, remove duplicated code
* Fix typescript strictnull errors, not used variables errors
2020-03-10 09:08:15 -05:00
|
|
|
onChange={onSelectDatasourceFilters}
|
|
|
|
/>
|
|
|
|
</div>
|
|
|
|
)}
|
2020-03-17 17:24:27 -05:00
|
|
|
<div aria-label="Sort queries" className={styles.sort}>
|
Explore: Rich History (#22570)
* Explore: Refactor active buttons css
* Explore: Add query history button
* WIP: Creating drawer
* WIP: Create custom drawer (for now)
* Revert changes to Drawer.tsx
* WIP: Layout finished
* Rich History: Set up boilerplate for Settings
* WIP: Query history cards
* Refactor, split components
* Add resizability, interactivity
* Save history to local storage
* Visualise queries from queryhistory local storage
* Set up query history settings
* Refactor
* Create link, un-refactored verison
* Copyable url
* WIP: Add slider
* Commenting feature
* Slider filtration
* Add headings
* Hide Rich history behind feature toggle
* Cleaning up, refactors
* Update tests
* Implement getQueryDisplayText
* Update lockfile for new dependencies
* Update heading based on sorting
* Fix typescript strinctNullCheck errors
* Fix Forms, new forms
* Fixes based on provided feedback
* Fixes, splitting component into two
* Add tooltips, add delete history button
* Clicking on card adds queries to query rows
* Delete history, width of drawers
* UI/UX changes, updates
* Add number of queries to headings, box shadows
* Fix slider, remove feature toggle
* Fix typo in the beta announcement
* Fix how the rich history state is rendered when initialization
* Move updateFilters when activeDatasourceFilter onlyto RichHistory, remove duplicated code
* Fix typescript strictnull errors, not used variables errors
2020-03-10 09:08:15 -05:00
|
|
|
<Select
|
|
|
|
options={sortOrderOptions}
|
2020-03-17 10:06:02 -05:00
|
|
|
value={sortOrderOptions.filter(order => order.value === sortOrder)}
|
Explore: Rich History (#22570)
* Explore: Refactor active buttons css
* Explore: Add query history button
* WIP: Creating drawer
* WIP: Create custom drawer (for now)
* Revert changes to Drawer.tsx
* WIP: Layout finished
* Rich History: Set up boilerplate for Settings
* WIP: Query history cards
* Refactor, split components
* Add resizability, interactivity
* Save history to local storage
* Visualise queries from queryhistory local storage
* Set up query history settings
* Refactor
* Create link, un-refactored verison
* Copyable url
* WIP: Add slider
* Commenting feature
* Slider filtration
* Add headings
* Hide Rich history behind feature toggle
* Cleaning up, refactors
* Update tests
* Implement getQueryDisplayText
* Update lockfile for new dependencies
* Update heading based on sorting
* Fix typescript strinctNullCheck errors
* Fix Forms, new forms
* Fixes based on provided feedback
* Fixes, splitting component into two
* Add tooltips, add delete history button
* Clicking on card adds queries to query rows
* Delete history, width of drawers
* UI/UX changes, updates
* Add number of queries to headings, box shadows
* Fix slider, remove feature toggle
* Fix typo in the beta announcement
* Fix how the rich history state is rendered when initialization
* Move updateFilters when activeDatasourceFilter onlyto RichHistory, remove duplicated code
* Fix typescript strictnull errors, not used variables errors
2020-03-10 09:08:15 -05:00
|
|
|
placeholder="Sort queries by"
|
|
|
|
onChange={e => onChangeSortOrder(e.value as SortOrder)}
|
|
|
|
/>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
{sortedStarredQueries.map(q => {
|
|
|
|
return <RichHistoryCard query={q} key={q.ts} exploreId={exploreId} />;
|
|
|
|
})}
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
);
|
|
|
|
}
|