mirror of
https://github.com/grafana/grafana.git
synced 2025-02-12 00:25:46 -06:00
* build(webpack): bump to v5 and successful yarn start compilation * build(webpack): update postcss dependencies * build(webpack): silence warnings about hash renamed to fullhash * build(webpack): enable persistent cache to store generated webpack modules / chunks * build(webpack): prefer eslintWebpackPlugin over tschecker so eslint doesn't block typechecking * chore(yarn): run yarn-deduplicate to clean up dependencies * chore(yarn): refresh lock file after clean install * build(webpack): prefer output.clean over CleanWebpackPlugin * build(webpack): prefer esbuild over babel-loader for dev config * build(babel): turn off cache compression to improve build performance * build(webpack): get production builds working * build(webpack): remove phantomJS (removed from grafana in v7) specific loader * build(webpack): put back babel for dev builds no performance gain in using esbuild in webpack * build(webpack): prefer terser and optimise css plugins for prod. slower but smaller bundles * build(webpack): clean up redundant code. inform postcss about node_modules * build(webpack): remove deprecation warnings flag * build(webpack): bump packages, dev performance optimisations, attempt to get hot working * chore(storybook): use webpack 5 for dev and production builds * build(storybook): speed up dev build * chore(yarn): refresh lock file * chore(webpack): bump webpack and related deps to latest * refactor(webpack): put back inline-source-map, move start scripts out of grafana toolkit * feat(webpack): prefer react-refresh over react-hot-loader * build(webpack): update webpack.hot to use react-refresh * chore: remove react-hot-loader from codebase * refactor(queryeditorrow): fix circular dependency causing react-fast-refresh errors * revert(webpack): remove stats.errorDetails from common config * build(webpack): bump to v5 and successful yarn start compilation * build(webpack): update postcss dependencies * build(webpack): silence warnings about hash renamed to fullhash * build(webpack): enable persistent cache to store generated webpack modules / chunks * build(webpack): prefer eslintWebpackPlugin over tschecker so eslint doesn't block typechecking * chore(yarn): run yarn-deduplicate to clean up dependencies * chore(yarn): refresh lock file after clean install * build(webpack): prefer output.clean over CleanWebpackPlugin * build(webpack): prefer esbuild over babel-loader for dev config * build(babel): turn off cache compression to improve build performance * build(webpack): get production builds working * build(webpack): remove phantomJS (removed from grafana in v7) specific loader * build(webpack): put back babel for dev builds no performance gain in using esbuild in webpack * build(webpack): prefer terser and optimise css plugins for prod. slower but smaller bundles * build(webpack): clean up redundant code. inform postcss about node_modules * build(webpack): remove deprecation warnings flag * build(webpack): bump packages, dev performance optimisations, attempt to get hot working * chore(storybook): use webpack 5 for dev and production builds * build(storybook): speed up dev build * chore(yarn): refresh lock file * chore(webpack): bump webpack and related deps to latest * refactor(webpack): put back inline-source-map, move start scripts out of grafana toolkit * feat(webpack): prefer react-refresh over react-hot-loader * build(webpack): update webpack.hot to use react-refresh * chore: remove react-hot-loader from codebase * refactor(queryeditorrow): fix circular dependency causing react-fast-refresh errors * revert(webpack): remove stats.errorDetails from common config * revert(webpack): remove include from babel-loader so symlinks (enterprise) work as before * refactor(webpack): fix deprecation warnings in prod builds * fix(storybook): fix failing builds due to replacing css-optimise webpack plugin * fix(storybook): use raw-loader for svg icons * build(webpack): fix dev script colors error * chore(webpack): bump css-loader and react-refresh-webpack-plugin to latest versions Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
171 lines
5.4 KiB
TypeScript
171 lines
5.4 KiB
TypeScript
import React, { PureComponent } from 'react';
|
|
import { connect, ConnectedProps } from 'react-redux';
|
|
// Utils
|
|
import { ApiKey, NewApiKey, StoreState } from 'app/types';
|
|
import { getNavModel } from 'app/core/selectors/navModel';
|
|
import { getApiKeys, getApiKeysCount } from './state/selectors';
|
|
import { addApiKey, deleteApiKey, loadApiKeys } from './state/actions';
|
|
import Page from 'app/core/components/Page/Page';
|
|
import { ApiKeysAddedModal } from './ApiKeysAddedModal';
|
|
import config from 'app/core/config';
|
|
import appEvents from 'app/core/app_events';
|
|
import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
|
|
import { InlineField, InlineSwitch, VerticalGroup } from '@grafana/ui';
|
|
import { rangeUtil } from '@grafana/data';
|
|
import { getTimeZone } from 'app/features/profile/state/selectors';
|
|
import { setSearchQuery } from './state/reducers';
|
|
import { ApiKeysForm } from './ApiKeysForm';
|
|
import { ApiKeysActionBar } from './ApiKeysActionBar';
|
|
import { ApiKeysTable } from './ApiKeysTable';
|
|
import { ApiKeysController } from './ApiKeysController';
|
|
import { ShowModalReactEvent } from 'app/types/events';
|
|
|
|
function mapStateToProps(state: StoreState) {
|
|
return {
|
|
navModel: getNavModel(state.navIndex, 'apikeys'),
|
|
apiKeys: getApiKeys(state.apiKeys),
|
|
searchQuery: state.apiKeys.searchQuery,
|
|
apiKeysCount: getApiKeysCount(state.apiKeys),
|
|
hasFetched: state.apiKeys.hasFetched,
|
|
timeZone: getTimeZone(state.user),
|
|
};
|
|
}
|
|
|
|
const mapDispatchToProps = {
|
|
loadApiKeys,
|
|
deleteApiKey,
|
|
setSearchQuery,
|
|
addApiKey,
|
|
};
|
|
|
|
const connector = connect(mapStateToProps, mapDispatchToProps);
|
|
|
|
interface OwnProps {}
|
|
|
|
export type Props = OwnProps & ConnectedProps<typeof connector>;
|
|
|
|
interface State {
|
|
includeExpired: boolean;
|
|
hasFetched: boolean;
|
|
}
|
|
|
|
export class ApiKeysPageUnconnected extends PureComponent<Props, State> {
|
|
constructor(props: Props) {
|
|
super(props);
|
|
this.state = { includeExpired: false, hasFetched: false };
|
|
}
|
|
|
|
componentDidMount() {
|
|
this.fetchApiKeys();
|
|
}
|
|
|
|
async fetchApiKeys() {
|
|
await this.props.loadApiKeys(this.state.includeExpired);
|
|
}
|
|
|
|
onDeleteApiKey = (key: ApiKey) => {
|
|
this.props.deleteApiKey(key.id!, this.state.includeExpired);
|
|
};
|
|
|
|
onSearchQueryChange = (value: string) => {
|
|
this.props.setSearchQuery(value);
|
|
};
|
|
|
|
onIncludeExpiredChange = (event: React.SyntheticEvent<HTMLInputElement>) => {
|
|
this.setState({ hasFetched: false, includeExpired: event.currentTarget.checked }, this.fetchApiKeys);
|
|
};
|
|
|
|
onAddApiKey = (newApiKey: NewApiKey) => {
|
|
const openModal = (apiKey: string) => {
|
|
const rootPath = window.location.origin + config.appSubUrl;
|
|
|
|
appEvents.publish(
|
|
new ShowModalReactEvent({
|
|
props: {
|
|
apiKey,
|
|
rootPath,
|
|
},
|
|
component: ApiKeysAddedModal,
|
|
})
|
|
);
|
|
};
|
|
|
|
const secondsToLive = newApiKey.secondsToLive;
|
|
try {
|
|
const secondsToLiveAsNumber = secondsToLive ? rangeUtil.intervalToSeconds(secondsToLive) : null;
|
|
const apiKey: ApiKey = {
|
|
...newApiKey,
|
|
secondsToLive: secondsToLiveAsNumber,
|
|
};
|
|
this.props.addApiKey(apiKey, openModal, this.state.includeExpired);
|
|
this.setState((prevState: State) => {
|
|
return {
|
|
...prevState,
|
|
isAdding: false,
|
|
};
|
|
});
|
|
} catch (err) {
|
|
console.error(err);
|
|
}
|
|
};
|
|
|
|
render() {
|
|
const { hasFetched, navModel, apiKeysCount, apiKeys, searchQuery, timeZone } = this.props;
|
|
const { includeExpired } = this.state;
|
|
|
|
if (!hasFetched) {
|
|
return (
|
|
<Page navModel={navModel}>
|
|
<Page.Contents isLoading={true}>{}</Page.Contents>
|
|
</Page>
|
|
);
|
|
}
|
|
|
|
return (
|
|
<Page navModel={navModel}>
|
|
<Page.Contents isLoading={false}>
|
|
<ApiKeysController>
|
|
{({ isAdding, toggleIsAdding }) => {
|
|
const showCTA = !isAdding && apiKeysCount === 0;
|
|
const showTable = apiKeysCount > 0;
|
|
return (
|
|
<>
|
|
{showCTA ? (
|
|
<EmptyListCTA
|
|
title="You haven't added any API keys yet."
|
|
buttonIcon="key-skeleton-alt"
|
|
onClick={toggleIsAdding}
|
|
buttonTitle="New API key"
|
|
proTip="Remember, you can provide view-only API access to other applications."
|
|
/>
|
|
) : null}
|
|
{showTable ? (
|
|
<ApiKeysActionBar
|
|
searchQuery={searchQuery}
|
|
disabled={isAdding}
|
|
onAddClick={toggleIsAdding}
|
|
onSearchChange={this.onSearchQueryChange}
|
|
/>
|
|
) : null}
|
|
<ApiKeysForm show={isAdding} onClose={toggleIsAdding} onKeyAdded={this.onAddApiKey} />
|
|
{showTable ? (
|
|
<VerticalGroup>
|
|
<InlineField label="Show expired">
|
|
<InlineSwitch id="showExpired" value={includeExpired} onChange={this.onIncludeExpiredChange} />
|
|
</InlineField>
|
|
<ApiKeysTable apiKeys={apiKeys} timeZone={timeZone} onDelete={this.onDeleteApiKey} />
|
|
</VerticalGroup>
|
|
) : null}
|
|
</>
|
|
);
|
|
}}
|
|
</ApiKeysController>
|
|
</Page.Contents>
|
|
</Page>
|
|
);
|
|
}
|
|
}
|
|
|
|
const ApiKeysPage = connector(ApiKeysPageUnconnected);
|
|
export default ApiKeysPage;
|