mirror of
https://github.com/grafana/grafana.git
synced 2025-02-12 08:35:43 -06:00
* ServiceAccounts: refactor ServiceAccountRoleRow * Refactor ServiceAccountRoleRow * Refactor ServiceAccountProfile * Refactor components * Change service accounts icon * Refine service accounts page header * Improve service accounts filtering * Change delete button style * Tweak account id * Auto focus name field when create service account * Add disable/enable button * Enable/disable service accounts * Optimize updating service account (do not fetch all) * Remove status column (replace by enable/disable button) * Add banner with service accounts description * Add tokens from main page * Update tokens count when add token from main page * Fix action buttons column * Fix tokens count when change role * Refine table row classes * Fix buttons * Simplify working with state * Show message when service account updated * Able to filter disabled accounts * Mark disabled accounts in a table * Refine disabled account view * Move non-critical components to separate folder * Remove confusing focusing * Fix date picker position when creating new token * DatePicker: able to set minimum date that can be selected * Don't allow to select expiration dates prior today * Set tomorrow as a default token expiration date * Fix displaying expiration period * Rename Add token button * Refine page styles * Show modal when disabling SA from main page * Arrange role picker * Refine SA page styles * Generate default token name * More smooth navigation between SA pages * Stop loading indicator in case of error * Remove legacy styles usage * Tweaks after code review Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com> * Get rid of useDisapatch in favor of mapDispatchToProps * Tests for ServiceAccountsListPage * Tests for service account page * Show new role picker only with license * Get rid of deprecated css classes * Apply suggestion from code review Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com> * Fix service accounts icon * Tests for service account create page * Return service account info when update * Add behaviour tests for ServiceAccountsListPage * Fix disabled cursor on confirm button * More behavior tests for service account page * Temporary disable service account migration banner * Use safe where condition Co-authored-by: Jguer <joao.guerreiro@grafana.com> * Apply review suggestions Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com> * Remove autofocus from search Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com> Co-authored-by: Jguer <joao.guerreiro@grafana.com>
201 lines
6.5 KiB
TypeScript
201 lines
6.5 KiB
TypeScript
import React, { PureComponent } from 'react';
|
|
import { connect, ConnectedProps } from 'react-redux';
|
|
|
|
// Utils
|
|
import { rangeUtil } from '@grafana/data';
|
|
import { InlineField, InlineSwitch, VerticalGroup } from '@grafana/ui';
|
|
import appEvents from 'app/core/app_events';
|
|
import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
|
|
import Page from 'app/core/components/Page/Page';
|
|
import config from 'app/core/config';
|
|
import { contextSrv } from 'app/core/core';
|
|
import { getNavModel } from 'app/core/selectors/navModel';
|
|
import { getTimeZone } from 'app/features/profile/state/selectors';
|
|
import { AccessControlAction, ApiKey, NewApiKey, StoreState } from 'app/types';
|
|
import { ShowModalReactEvent } from 'app/types/events';
|
|
|
|
import { ApiKeysActionBar } from './ApiKeysActionBar';
|
|
import { ApiKeysAddedModal } from './ApiKeysAddedModal';
|
|
import { ApiKeysController } from './ApiKeysController';
|
|
import { ApiKeysForm } from './ApiKeysForm';
|
|
import { ApiKeysTable } from './ApiKeysTable';
|
|
import { addApiKey, deleteApiKey, loadApiKeys, toggleIncludeExpired } from './state/actions';
|
|
import { setSearchQuery } from './state/reducers';
|
|
import { getApiKeys, getApiKeysCount, getIncludeExpired, getIncludeExpiredDisabled } from './state/selectors';
|
|
|
|
function mapStateToProps(state: StoreState) {
|
|
const canCreate = contextSrv.hasAccess(AccessControlAction.ActionAPIKeysCreate, true);
|
|
|
|
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),
|
|
includeExpired: getIncludeExpired(state.apiKeys),
|
|
includeExpiredDisabled: getIncludeExpiredDisabled(state.apiKeys),
|
|
canCreate: canCreate,
|
|
};
|
|
}
|
|
|
|
const mapDispatchToProps = {
|
|
loadApiKeys,
|
|
deleteApiKey,
|
|
setSearchQuery,
|
|
toggleIncludeExpired,
|
|
addApiKey,
|
|
};
|
|
|
|
const connector = connect(mapStateToProps, mapDispatchToProps);
|
|
|
|
interface OwnProps {}
|
|
|
|
export type Props = OwnProps & ConnectedProps<typeof connector>;
|
|
|
|
interface State {
|
|
isAdding: boolean;
|
|
}
|
|
|
|
export class ApiKeysPageUnconnected extends PureComponent<Props, State> {
|
|
constructor(props: Props) {
|
|
super(props);
|
|
}
|
|
|
|
componentDidMount() {
|
|
this.fetchApiKeys();
|
|
}
|
|
|
|
async fetchApiKeys() {
|
|
await this.props.loadApiKeys();
|
|
}
|
|
|
|
onDeleteApiKey = (key: ApiKey) => {
|
|
this.props.deleteApiKey(key.id!);
|
|
};
|
|
|
|
onSearchQueryChange = (value: string) => {
|
|
this.props.setSearchQuery(value);
|
|
};
|
|
|
|
onIncludeExpiredChange = (event: React.SyntheticEvent<HTMLInputElement>) => {
|
|
this.props.toggleIncludeExpired();
|
|
};
|
|
|
|
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.setState((prevState: State) => {
|
|
return {
|
|
...prevState,
|
|
isAdding: false,
|
|
};
|
|
});
|
|
} catch (err) {
|
|
console.error(err);
|
|
}
|
|
};
|
|
|
|
render() {
|
|
const {
|
|
hasFetched,
|
|
navModel,
|
|
apiKeysCount,
|
|
apiKeys,
|
|
searchQuery,
|
|
timeZone,
|
|
includeExpired,
|
|
includeExpiredDisabled,
|
|
canCreate,
|
|
} = this.props;
|
|
|
|
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 (
|
|
<>
|
|
{/* TODO: enable when API keys to service accounts migration is ready
|
|
{config.featureToggles.serviceAccounts && (
|
|
<Alert title="Switch from API keys to Service accounts" severity="info">
|
|
Service accounts give you more control. API keys will be automatically migrated into tokens inside
|
|
respective service accounts. The current API keys will still work, but will be called tokens and
|
|
you will find them in the detail view of a respective service account.
|
|
</Alert>
|
|
)} */}
|
|
{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."
|
|
buttonDisabled={!canCreate}
|
|
/>
|
|
) : null}
|
|
{showTable ? (
|
|
<ApiKeysActionBar
|
|
searchQuery={searchQuery}
|
|
disabled={isAdding || !canCreate}
|
|
onAddClick={toggleIsAdding}
|
|
onSearchChange={this.onSearchQueryChange}
|
|
/>
|
|
) : null}
|
|
<ApiKeysForm
|
|
show={isAdding}
|
|
onClose={toggleIsAdding}
|
|
onKeyAdded={this.onAddApiKey}
|
|
disabled={!canCreate}
|
|
/>
|
|
{showTable ? (
|
|
<VerticalGroup>
|
|
<InlineField disabled={includeExpiredDisabled} label="Include expired keys">
|
|
<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;
|