mirror of
https://github.com/grafana/grafana.git
synced 2024-12-01 04:59:15 -06:00
8d3b31ff23
* 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>
141 lines
4.0 KiB
TypeScript
141 lines
4.0 KiB
TypeScript
import React, { PureComponent } from 'react';
|
|
import { connect, ConnectedProps } from 'react-redux';
|
|
import { renderMarkdown } from '@grafana/data';
|
|
import { HorizontalGroup, Pagination, VerticalGroup } from '@grafana/ui';
|
|
|
|
import Page from 'app/core/components/Page/Page';
|
|
import UsersActionBar from './UsersActionBar';
|
|
import UsersTable from './UsersTable';
|
|
import InviteesTable from './InviteesTable';
|
|
import { OrgUser, OrgRole, StoreState } from 'app/types';
|
|
import { loadInvitees, loadUsers, removeUser, updateUser } from './state/actions';
|
|
import { getNavModel } from 'app/core/selectors/navModel';
|
|
import { getInvitees, getUsers, getUsersSearchQuery, getUsersSearchPage } from './state/selectors';
|
|
import { setUsersSearchQuery, setUsersSearchPage } from './state/reducers';
|
|
|
|
function mapStateToProps(state: StoreState) {
|
|
return {
|
|
navModel: getNavModel(state.navIndex, 'users'),
|
|
users: getUsers(state.users),
|
|
searchQuery: getUsersSearchQuery(state.users),
|
|
searchPage: getUsersSearchPage(state.users),
|
|
invitees: getInvitees(state.users),
|
|
externalUserMngInfo: state.users.externalUserMngInfo,
|
|
hasFetched: state.users.hasFetched,
|
|
};
|
|
}
|
|
|
|
const mapDispatchToProps = {
|
|
loadUsers,
|
|
loadInvitees,
|
|
setUsersSearchQuery,
|
|
setUsersSearchPage,
|
|
updateUser,
|
|
removeUser,
|
|
};
|
|
|
|
const connector = connect(mapStateToProps, mapDispatchToProps);
|
|
|
|
export type Props = ConnectedProps<typeof connector>;
|
|
|
|
export interface State {
|
|
showInvites: boolean;
|
|
}
|
|
|
|
const pageLimit = 30;
|
|
|
|
export class UsersListPage extends PureComponent<Props, State> {
|
|
declare externalUserMngInfoHtml: string;
|
|
|
|
constructor(props: Props) {
|
|
super(props);
|
|
|
|
if (this.props.externalUserMngInfo) {
|
|
this.externalUserMngInfoHtml = renderMarkdown(this.props.externalUserMngInfo);
|
|
}
|
|
|
|
this.state = {
|
|
showInvites: false,
|
|
};
|
|
}
|
|
|
|
componentDidMount() {
|
|
this.fetchUsers();
|
|
this.fetchInvitees();
|
|
}
|
|
|
|
async fetchUsers() {
|
|
return await this.props.loadUsers();
|
|
}
|
|
|
|
async fetchInvitees() {
|
|
return await this.props.loadInvitees();
|
|
}
|
|
|
|
onRoleChange = (role: OrgRole, user: OrgUser) => {
|
|
const updatedUser = { ...user, role: role };
|
|
|
|
this.props.updateUser(updatedUser);
|
|
};
|
|
|
|
onShowInvites = () => {
|
|
this.setState((prevState) => ({
|
|
showInvites: !prevState.showInvites,
|
|
}));
|
|
};
|
|
|
|
getPaginatedUsers = (users: OrgUser[]) => {
|
|
const offset = (this.props.searchPage - 1) * pageLimit;
|
|
return users.slice(offset, offset + pageLimit);
|
|
};
|
|
|
|
renderTable() {
|
|
const { invitees, users, setUsersSearchPage } = this.props;
|
|
const paginatedUsers = this.getPaginatedUsers(users);
|
|
const totalPages = Math.ceil(users.length / pageLimit);
|
|
|
|
if (this.state.showInvites) {
|
|
return <InviteesTable invitees={invitees} />;
|
|
} else {
|
|
return (
|
|
<VerticalGroup spacing="md">
|
|
<UsersTable
|
|
users={paginatedUsers}
|
|
onRoleChange={(role, user) => this.onRoleChange(role, user)}
|
|
onRemoveUser={(user) => this.props.removeUser(user.userId)}
|
|
/>
|
|
<HorizontalGroup justify="flex-end">
|
|
<Pagination
|
|
onNavigate={setUsersSearchPage}
|
|
currentPage={this.props.searchPage}
|
|
numberOfPages={totalPages}
|
|
hideWhenSinglePage={true}
|
|
/>
|
|
</HorizontalGroup>
|
|
</VerticalGroup>
|
|
);
|
|
}
|
|
}
|
|
|
|
render() {
|
|
const { navModel, hasFetched } = this.props;
|
|
const externalUserMngInfoHtml = this.externalUserMngInfoHtml;
|
|
|
|
return (
|
|
<Page navModel={navModel}>
|
|
<Page.Contents isLoading={!hasFetched}>
|
|
<>
|
|
<UsersActionBar onShowInvites={this.onShowInvites} showInvites={this.state.showInvites} />
|
|
{externalUserMngInfoHtml && (
|
|
<div className="grafana-info-box" dangerouslySetInnerHTML={{ __html: externalUserMngInfoHtml }} />
|
|
)}
|
|
{hasFetched && this.renderTable()}
|
|
</>
|
|
</Page.Contents>
|
|
</Page>
|
|
);
|
|
}
|
|
}
|
|
|
|
export default connector(UsersListPage);
|