Close #1625 Squashed commit of the following: commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon Jul 13 15:50:15 2020 +0300 minor commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab Merge: 702c55ed fecf5494 Author: Andrey Meshkov <am@adguard.com> Date: Mon Jul 13 15:32:44 2020 +0300 Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625 commit 702c55edc1ba2ab330eda8189498dfff33c92f5f Author: Andrey Meshkov <am@adguard.com> Date: Mon Jul 13 15:32:41 2020 +0300 fix makefile when there's no gopath commit fecf5494b8c1719cb70044f336fe99c341802d25 Merge: d4c811f98a417604Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon Jul 13 15:30:21 2020 +0300 Merge branch 'master' into feature/1625 commit d4c811f9630dee448012434e2f50f34ab8b8b899 Merge: b0a037daa33164bfAuthor: ArtemBaskal <a.baskal@adguard.com> Date: Mon Jul 13 12:35:16 2020 +0300 Merge branch 'master' into feature/1625 commit b0a037daf48913fd8a4cda16d520835630072520 Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon Jul 13 12:34:42 2020 +0300 Simplify sync logs action creators commit eeeb620ae100a554f59783fc2a14fad525ce1a82 Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon Jul 13 11:17:08 2020 +0300 Review changes commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9 Author: ArtemBaskal <a.baskal@adguard.com> Date: Fri Jul 10 15:23:37 2020 +0300 Update tracker tooltip class commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54 Author: ArtemBaskal <a.baskal@adguard.com> Date: Fri Jul 10 13:46:10 2020 +0300 Replace depricated addListener commit 2ac0843239853da1725d2e038b5e4cbaef253732 Author: ArtemBaskal <a.baskal@adguard.com> Date: Fri Jul 10 13:39:45 2020 +0300 Validate response_status url param commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1 Author: ArtemBaskal <a.baskal@adguard.com> Date: Fri Jul 10 12:58:18 2020 +0300 Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action commit 4b11c6a34049bd133077bad035d267f87cdec141 Author: ArtemBaskal <a.baskal@adguard.com> Date: Thu Jul 9 19:41:48 2020 +0300 Normalize input search commit 3fded3575b21bdd017723f5e487c268074599e4f Author: ArtemBaskal <a.baskal@adguard.com> Date: Thu Jul 9 18:20:05 2020 +0300 Optimize search commit 9073e032e4aadcdef9d826f16a10c300ee46b30e Author: ArtemBaskal <a.baskal@adguard.com> Date: Thu Jul 9 14:28:41 2020 +0300 Update url string params commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1 Author: ArtemBaskal <a.baskal@adguard.com> Date: Thu Jul 9 12:55:50 2020 +0300 Fix reset search commit 33f769aed56369aacedd29ffd52b527b527d4a59 Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed Jul 8 19:13:21 2020 +0300 WIP: Add permlinks commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed Jul 8 14:42:28 2020 +0300 Refactor Counters, add response_status links to query log commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue Jul 7 19:33:04 2020 +0300 Delete unnecessary file commit b20816e9dad79866e3ec04d3093c972967b3b226 Merge: 6281084e d2c3af5c Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue Jul 7 19:30:44 2020 +0300 Resolve conflict commit d2c3af5cf227d76f876d6d94ca016d4b242b2515 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue Jul 7 17:14:51 2020 +0300 + client: Add git hooks ... and 5 more commits
361 lines
12 KiB
JavaScript
361 lines
12 KiB
JavaScript
import React, { Component, Fragment } from 'react';
|
||
import PropTypes from 'prop-types';
|
||
import { Trans, withTranslation } from 'react-i18next';
|
||
import ReactTable from 'react-table';
|
||
|
||
import { MODAL_TYPE } from '../../../helpers/constants';
|
||
import { normalizeTextarea } from '../../../helpers/helpers';
|
||
import Card from '../../ui/Card';
|
||
import Modal from './Modal';
|
||
import CellWrap from '../../ui/CellWrap';
|
||
import LogsSearchLink from '../../ui/LogsSearchLink';
|
||
|
||
class ClientsTable extends Component {
|
||
handleFormAdd = (values) => {
|
||
this.props.addClient(values);
|
||
};
|
||
|
||
handleFormUpdate = (values, name) => {
|
||
this.props.updateClient(values, name);
|
||
};
|
||
|
||
handleSubmit = (values) => {
|
||
const config = values;
|
||
|
||
if (values) {
|
||
if (values.blocked_services) {
|
||
config.blocked_services = Object
|
||
.keys(values.blocked_services)
|
||
.filter((service) => values.blocked_services[service]);
|
||
}
|
||
|
||
if (values.upstreams && typeof values.upstreams === 'string') {
|
||
config.upstreams = normalizeTextarea(values.upstreams);
|
||
} else {
|
||
config.upstreams = [];
|
||
}
|
||
|
||
if (values.tags) {
|
||
config.tags = values.tags.map((tag) => tag.value);
|
||
} else {
|
||
config.tags = [];
|
||
}
|
||
}
|
||
|
||
if (this.props.modalType === MODAL_TYPE.EDIT_FILTERS) {
|
||
this.handleFormUpdate(config, this.props.modalClientName);
|
||
} else {
|
||
this.handleFormAdd(config);
|
||
}
|
||
};
|
||
|
||
getOptionsWithLabels = (options) => (
|
||
options.map((option) => ({
|
||
value: option,
|
||
label: option,
|
||
}))
|
||
);
|
||
|
||
getClient = (name, clients) => {
|
||
const client = clients.find((item) => name === item.name);
|
||
|
||
if (client) {
|
||
const {
|
||
upstreams, tags, whois_info, ...values
|
||
} = client;
|
||
return {
|
||
upstreams: (upstreams && upstreams.join('\n')) || '',
|
||
tags: (tags && this.getOptionsWithLabels(tags)) || [],
|
||
...values,
|
||
};
|
||
}
|
||
|
||
return {
|
||
ids: [''],
|
||
tags: [],
|
||
use_global_settings: true,
|
||
use_global_blocked_services: true,
|
||
};
|
||
};
|
||
|
||
handleDelete = (data) => {
|
||
// eslint-disable-next-line no-alert
|
||
if (window.confirm(this.props.t('client_confirm_delete', { key: data.name }))) {
|
||
this.props.deleteClient(data);
|
||
this.props.getStats();
|
||
}
|
||
};
|
||
|
||
columns = [
|
||
{
|
||
Header: this.props.t('table_client'),
|
||
accessor: 'ids',
|
||
minWidth: 150,
|
||
Cell: (row) => {
|
||
const { value } = row;
|
||
|
||
return (
|
||
<div className="logs__row o-hidden">
|
||
<span className="logs__text">
|
||
{value.map((address) => (
|
||
<div key={address} title={address}>
|
||
{address}
|
||
</div>
|
||
))}
|
||
</span>
|
||
</div>
|
||
);
|
||
},
|
||
},
|
||
{
|
||
Header: this.props.t('table_name'),
|
||
accessor: 'name',
|
||
minWidth: 120,
|
||
Cell: CellWrap,
|
||
},
|
||
{
|
||
Header: this.props.t('settings'),
|
||
accessor: 'use_global_settings',
|
||
minWidth: 120,
|
||
Cell: ({ value }) => {
|
||
const title = value ? (
|
||
<Trans>settings_global</Trans>
|
||
) : (
|
||
<Trans>settings_custom</Trans>
|
||
);
|
||
|
||
return (
|
||
<div className="logs__row o-hidden">
|
||
<div className="logs__text">{title}</div>
|
||
</div>
|
||
);
|
||
},
|
||
},
|
||
{
|
||
Header: this.props.t('blocked_services'),
|
||
accessor: 'blocked_services',
|
||
minWidth: 180,
|
||
Cell: (row) => {
|
||
const { value, original } = row;
|
||
|
||
if (original.use_global_blocked_services) {
|
||
return <Trans>settings_global</Trans>;
|
||
}
|
||
|
||
return (
|
||
<div className="logs__row logs__row--icons">
|
||
{value && value.length > 0
|
||
? value.map((service) => (
|
||
<svg
|
||
className="service__icon service__icon--table"
|
||
title={service}
|
||
key={service}
|
||
>
|
||
<use xlinkHref={`#service_${service}`} />
|
||
</svg>
|
||
))
|
||
: '–'}
|
||
</div>
|
||
);
|
||
},
|
||
},
|
||
{
|
||
Header: this.props.t('upstreams'),
|
||
accessor: 'upstreams',
|
||
minWidth: 120,
|
||
Cell: ({ value }) => {
|
||
const title = value && value.length > 0 ? (
|
||
<Trans>settings_custom</Trans>
|
||
) : (
|
||
<Trans>settings_global</Trans>
|
||
);
|
||
|
||
return (
|
||
<div className="logs__row o-hidden">
|
||
<div className="logs__text">{title}</div>
|
||
</div>
|
||
);
|
||
},
|
||
},
|
||
{
|
||
Header: this.props.t('tags_title'),
|
||
accessor: 'tags',
|
||
minWidth: 140,
|
||
Cell: (row) => {
|
||
const { value } = row;
|
||
|
||
if (!value || value.length < 1) {
|
||
return '–';
|
||
}
|
||
|
||
return (
|
||
<div className="logs__row o-hidden">
|
||
<span className="logs__text">
|
||
{value.map((tag) => (
|
||
<div key={tag} title={tag} className="small">
|
||
{tag}
|
||
</div>
|
||
))}
|
||
</span>
|
||
</div>
|
||
);
|
||
},
|
||
},
|
||
{
|
||
Header: this.props.t('requests_count'),
|
||
id: 'statistics',
|
||
accessor: (row) => this.props.normalizedTopClients.configured[row.name] || 0,
|
||
sortMethod: (a, b) => b - a,
|
||
minWidth: 120,
|
||
Cell: (row) => {
|
||
const content = CellWrap(row);
|
||
|
||
if (!row.value) {
|
||
return content;
|
||
}
|
||
|
||
return <LogsSearchLink search={row.original.ids[0]}>{content}</LogsSearchLink>;
|
||
},
|
||
},
|
||
{
|
||
Header: this.props.t('actions_table_header'),
|
||
accessor: 'actions',
|
||
maxWidth: 100,
|
||
Cell: (row) => {
|
||
const clientName = row.original.name;
|
||
const {
|
||
toggleClientModal, processingDeleting, processingUpdating, t,
|
||
} = this.props;
|
||
|
||
return (
|
||
<div className="logs__row logs__row--center">
|
||
<button
|
||
type="button"
|
||
className="btn btn-icon btn-outline-primary btn-sm mr-2"
|
||
onClick={() => toggleClientModal({
|
||
type: MODAL_TYPE.EDIT_FILTERS,
|
||
name: clientName,
|
||
})
|
||
}
|
||
disabled={processingUpdating}
|
||
title={t('edit_table_action')}
|
||
>
|
||
<svg className="icons">
|
||
<use xlinkHref="#edit" />
|
||
</svg>
|
||
</button>
|
||
<button
|
||
type="button"
|
||
className="btn btn-icon btn-outline-secondary btn-sm"
|
||
onClick={() => this.handleDelete({ name: clientName })}
|
||
disabled={processingDeleting}
|
||
title={t('delete_table_action')}
|
||
>
|
||
<svg className="icons">
|
||
<use xlinkHref="#delete" />
|
||
</svg>
|
||
</button>
|
||
</div>
|
||
);
|
||
},
|
||
},
|
||
];
|
||
|
||
render() {
|
||
const {
|
||
t,
|
||
clients,
|
||
isModalOpen,
|
||
modalType,
|
||
modalClientName,
|
||
toggleClientModal,
|
||
processingAdding,
|
||
processingUpdating,
|
||
supportedTags,
|
||
} = this.props;
|
||
|
||
const currentClientData = this.getClient(modalClientName, clients);
|
||
const tagsOptions = this.getOptionsWithLabels(supportedTags);
|
||
|
||
return (
|
||
<Card
|
||
title={t('clients_title')}
|
||
subtitle={t('clients_desc')}
|
||
bodyType="card-body box-body--settings"
|
||
>
|
||
<Fragment>
|
||
<ReactTable
|
||
data={clients || []}
|
||
columns={this.columns}
|
||
defaultSorted={[
|
||
{
|
||
id: 'statistics',
|
||
asc: true,
|
||
},
|
||
]}
|
||
className="-striped -highlight card-table-overflow"
|
||
showPagination
|
||
defaultPageSize={10}
|
||
minRows={5}
|
||
showPageSizeOptions={false}
|
||
showPageJump={false}
|
||
renderTotalPagesCount={() => false}
|
||
previousText={
|
||
<svg className="icons icon--small icon--gray w-100 h-100">
|
||
<use xlinkHref="#arrow-left" />
|
||
</svg>}
|
||
nextText={
|
||
<svg className="icons icon--small icon--gray w-100 h-100">
|
||
<use xlinkHref="#arrow-right" />
|
||
</svg>}
|
||
loadingText={t('loading_table_status')}
|
||
pageText=''
|
||
ofText=''
|
||
rowsText={t('rows_table_footer_text')}
|
||
noDataText={t('clients_not_found')}
|
||
getPaginationProps={() => ({ className: 'custom-pagination' })}
|
||
/>
|
||
<button
|
||
type="button"
|
||
className="btn btn-success btn-standard mt-3"
|
||
onClick={() => toggleClientModal(MODAL_TYPE.ADD_FILTERS)}
|
||
disabled={processingAdding}
|
||
>
|
||
<Trans>client_add</Trans>
|
||
</button>
|
||
<Modal
|
||
isModalOpen={isModalOpen}
|
||
modalType={modalType}
|
||
toggleClientModal={toggleClientModal}
|
||
currentClientData={currentClientData}
|
||
handleSubmit={this.handleSubmit}
|
||
processingAdding={processingAdding}
|
||
processingUpdating={processingUpdating}
|
||
tagsOptions={tagsOptions}
|
||
/>
|
||
</Fragment>
|
||
</Card>
|
||
);
|
||
}
|
||
}
|
||
|
||
ClientsTable.propTypes = {
|
||
t: PropTypes.func.isRequired,
|
||
clients: PropTypes.array.isRequired,
|
||
normalizedTopClients: PropTypes.object.isRequired,
|
||
toggleClientModal: PropTypes.func.isRequired,
|
||
deleteClient: PropTypes.func.isRequired,
|
||
addClient: PropTypes.func.isRequired,
|
||
updateClient: PropTypes.func.isRequired,
|
||
isModalOpen: PropTypes.bool.isRequired,
|
||
modalType: PropTypes.string.isRequired,
|
||
modalClientName: PropTypes.string.isRequired,
|
||
processingAdding: PropTypes.bool.isRequired,
|
||
processingDeleting: PropTypes.bool.isRequired,
|
||
processingUpdating: PropTypes.bool.isRequired,
|
||
getStats: PropTypes.func.isRequired,
|
||
supportedTags: PropTypes.array.isRequired,
|
||
};
|
||
|
||
export default withTranslation()(ClientsTable);
|