docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
disabled={processingDhcp} | <mask> className="btn btn-standart mr-2 btn-gray"
<mask> onClick={() => this.props.toggleDhcp(config)}
<mask> >
<mask> <Trans>dhcp_disable</Trans>
<mask> </button>
<mask> );
</s> Only allow single click on buttons
Closes #544 </s> remove disabled={!filledConfig || activeDhcpFound}
</s> add disabled={!filledConfig || activeDhcpFound || processingDhcp} </s> remove <button className="btn btn-success btn-standart mr-2" type="submit" onClick={this.props.toggleFilteringModal}><Trans>add_filter_btn</Trans></button>
<button className="btn btn-primary btn-standart" type="submit" onClick={this.props.refreshFilters}><Trans>check_updates_btn</Trans></button>
</s> add <button
className="btn btn-success btn-standart mr-2"
type="submit"
onClick={this.props.toggleFilteringModal}
>
<Trans>add_filter_btn</Trans>
</button>
<button
className="btn btn-primary btn-standart"
type="submit"
onClick={this.props.refreshFilters}
disabled={processingRefreshFilters}
>
<Trans>check_updates_btn</Trans>
</button> </s> remove <button type="button" className={`btn btn-sm mr-2 ${buttonClass}`} onClick={() => this.props.toggleProtection(protectionEnabled)}>
</s> add <button
type="button"
className={`btn btn-sm mr-2 ${buttonClass}`}
onClick={() => this.props.toggleProtection(protectionEnabled)}
disabled={processingProtection}
> </s> remove {
!this.props.isFilterAdded &&
<div className="modal-footer">
<button type="button" className="btn btn-secondary" onClick={this.closeModal}><Trans>cancel_btn</Trans></button>
<button type="button" className="btn btn-success" onClick={this.handleNext} disabled={isValidForSubmit}><Trans>add_filter_btn</Trans></button>
</div>
</s> add {!this.props.isFilterAdded &&
<div className="modal-footer">
<button
type="button"
className="btn btn-secondary"
onClick={this.closeModal}
>
<Trans>cancel_btn</Trans>
</button>
<button
type="button"
className="btn btn-success"
onClick={this.handleNext}
disabled={isValidForSubmit || processingAddFilter}
>
<Trans>add_filter_btn</Trans>
</button>
</div> | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1bb428a6a32e43ffad711ab641cd37eeec91769 | client/src/components/Settings/Dhcp/index.js |
disabled={!filledConfig || activeDhcpFound || processingDhcp} | <mask> <button
<mask> type="button"
<mask> className="btn btn-standart mr-2 btn-success"
<mask> onClick={() => this.handleToggle(config)}
<mask> disabled={!filledConfig || activeDhcpFound}
<mask> >
<mask> <Trans>dhcp_enable</Trans>
<mask> </button>
<mask> );
<mask> }
</s> Only allow single click on buttons
Closes #544 </s> remove {
!this.props.isFilterAdded &&
<div className="modal-footer">
<button type="button" className="btn btn-secondary" onClick={this.closeModal}><Trans>cancel_btn</Trans></button>
<button type="button" className="btn btn-success" onClick={this.handleNext} disabled={isValidForSubmit}><Trans>add_filter_btn</Trans></button>
</div>
</s> add {!this.props.isFilterAdded &&
<div className="modal-footer">
<button
type="button"
className="btn btn-secondary"
onClick={this.closeModal}
>
<Trans>cancel_btn</Trans>
</button>
<button
type="button"
className="btn btn-success"
onClick={this.handleNext}
disabled={isValidForSubmit || processingAddFilter}
>
<Trans>add_filter_btn</Trans>
</button>
</div> </s> remove <button type="button" className={`btn btn-sm mr-2 ${buttonClass}`} onClick={() => this.props.toggleProtection(protectionEnabled)}>
</s> add <button
type="button"
className={`btn btn-sm mr-2 ${buttonClass}`}
onClick={() => this.props.toggleProtection(protectionEnabled)}
disabled={processingProtection}
> </s> remove <button className="btn btn-success btn-standart mr-2" type="submit" onClick={this.props.toggleFilteringModal}><Trans>add_filter_btn</Trans></button>
<button className="btn btn-primary btn-standart" type="submit" onClick={this.props.refreshFilters}><Trans>check_updates_btn</Trans></button>
</s> add <button
className="btn btn-success btn-standart mr-2"
type="submit"
onClick={this.props.toggleFilteringModal}
>
<Trans>add_filter_btn</Trans>
</button>
<button
className="btn btn-primary btn-standart"
type="submit"
onClick={this.props.refreshFilters}
disabled={processingRefreshFilters}
>
<Trans>check_updates_btn</Trans>
</button> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1bb428a6a32e43ffad711ab641cd37eeec91769 | client/src/components/Settings/Dhcp/index.js |
processingAddFilter, | <mask> const {
<mask> isOpen,
<mask> title,
<mask> inputDescription,
<mask> } = this.props;
<mask> const { isUrlValid, url, name } = this.state;
<mask> const inputUrlClass = classnames({
<mask> 'form-control mb-2': true,
</s> Only allow single click on buttons
Closes #544 </s> remove const { filters, userRules } = this.props.filtering;
</s> add const { filters, userRules, processingRefreshFilters } = this.props.filtering; </s> remove const newState = { ...state, config: newConfig };
</s> add const newState = { ...state, config: newConfig, processingDhcp: false }; </s> remove const { config, active } = this.props.dhcp;
</s> add const { config, active, processingDhcp } = this.props.dhcp; </s> remove dispatch(refreshFiltersSuccess);
</s> add dispatch(refreshFiltersSuccess()); | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1bb428a6a32e43ffad711ab641cd37eeec91769 | client/src/components/ui/Modal.js |
<input type="text" className={inputNameClass} placeholder={this.props.t('enter_name_hint')} onChange={this.handleNameChange} />
<input type="text" className={inputUrlClass} placeholder={this.props.t('enter_url_hint')} onChange={this.handleUrlChange} /> | <mask> const renderBody = () => {
<mask> if (!this.props.isFilterAdded) {
<mask> return (
<mask> <React.Fragment>
<mask> <input type="text" className={inputNameClass} placeholder={ this.props.t('enter_name_hint') } onChange={this.handleNameChange} />
<mask> <input type="text" className={inputUrlClass} placeholder={ this.props.t('enter_url_hint') } onChange={this.handleUrlChange} />
<mask> {inputDescription &&
<mask> <div className="description">
<mask> {inputDescription}
<mask> </div>}
<mask> </React.Fragment>
</s> Only allow single click on buttons
Closes #544 </s> remove const { filters, userRules } = this.props.filtering;
</s> add const { filters, userRules, processingRefreshFilters } = this.props.filtering; </s> remove const { config, active } = this.props.dhcp;
</s> add const { config, active, processingDhcp } = this.props.dhcp; </s> remove {this.renderButtons(queryLogEnabled)}
</s> add {this.renderButtons(queryLogEnabled, dashboard.logStatusProcessing)} </s> remove dispatch(refreshFiltersSuccess);
</s> add dispatch(refreshFiltersSuccess()); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1bb428a6a32e43ffad711ab641cd37eeec91769 | client/src/components/ui/Modal.js |
isOpen={isOpen} | <mask> return (
<mask> <ReactModal
<mask> className="Modal__Bootstrap modal-dialog modal-dialog-centered"
<mask> closeTimeoutMS={0}
<mask> isOpen={ isOpen }
<mask> onRequestClose={this.closeModal}
<mask> >
<mask> <div className="modal-content">
<mask> <div className="modal-header">
<mask> <h4 className="modal-title">
</s> Only allow single click on buttons
Closes #544 </s> remove const { filters, userRules } = this.props.filtering;
</s> add const { filters, userRules, processingRefreshFilters } = this.props.filtering; </s> remove {
!this.props.isFilterAdded &&
<div className="modal-footer">
<button type="button" className="btn btn-secondary" onClick={this.closeModal}><Trans>cancel_btn</Trans></button>
<button type="button" className="btn btn-success" onClick={this.handleNext} disabled={isValidForSubmit}><Trans>add_filter_btn</Trans></button>
</div>
</s> add {!this.props.isFilterAdded &&
<div className="modal-footer">
<button
type="button"
className="btn btn-secondary"
onClick={this.closeModal}
>
<Trans>cancel_btn</Trans>
</button>
<button
type="button"
className="btn btn-success"
onClick={this.handleNext}
disabled={isValidForSubmit || processingAddFilter}
>
<Trans>add_filter_btn</Trans>
</button>
</div> </s> remove <button className="btn btn-success btn-standart mr-2" type="submit" onClick={this.props.toggleFilteringModal}><Trans>add_filter_btn</Trans></button>
<button className="btn btn-primary btn-standart" type="submit" onClick={this.props.refreshFilters}><Trans>check_updates_btn</Trans></button>
</s> add <button
className="btn btn-success btn-standart mr-2"
type="submit"
onClick={this.props.toggleFilteringModal}
>
<Trans>add_filter_btn</Trans>
</button>
<button
className="btn btn-primary btn-standart"
type="submit"
onClick={this.props.refreshFilters}
disabled={processingRefreshFilters}
>
<Trans>check_updates_btn</Trans>
</button> </s> remove {this.renderButtons(queryLogEnabled)}
</s> add {this.renderButtons(queryLogEnabled, dashboard.logStatusProcessing)} </s> remove <input type="text" className={inputNameClass} placeholder={ this.props.t('enter_name_hint') } onChange={this.handleNameChange} />
<input type="text" className={inputUrlClass} placeholder={ this.props.t('enter_url_hint') } onChange={this.handleUrlChange} />
</s> add <input type="text" className={inputNameClass} placeholder={this.props.t('enter_name_hint')} onChange={this.handleNameChange} />
<input type="text" className={inputUrlClass} placeholder={this.props.t('enter_url_hint')} onChange={this.handleUrlChange} /> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1bb428a6a32e43ffad711ab641cd37eeec91769 | client/src/components/ui/Modal.js |
{renderBody()} | <mask> <span className="sr-only">Close</span>
<mask> </button>
<mask> </div>
<mask> <div className="modal-body">
<mask> { renderBody()}
<mask> </div>
<mask> {
<mask> !this.props.isFilterAdded &&
<mask> <div className="modal-footer">
<mask> <button type="button" className="btn btn-secondary" onClick={this.closeModal}><Trans>cancel_btn</Trans></button>
</s> Only allow single click on buttons
Closes #544 </s> remove {
!this.props.isFilterAdded &&
<div className="modal-footer">
<button type="button" className="btn btn-secondary" onClick={this.closeModal}><Trans>cancel_btn</Trans></button>
<button type="button" className="btn btn-success" onClick={this.handleNext} disabled={isValidForSubmit}><Trans>add_filter_btn</Trans></button>
</div>
</s> add {!this.props.isFilterAdded &&
<div className="modal-footer">
<button
type="button"
className="btn btn-secondary"
onClick={this.closeModal}
>
<Trans>cancel_btn</Trans>
</button>
<button
type="button"
className="btn btn-success"
onClick={this.handleNext}
disabled={isValidForSubmit || processingAddFilter}
>
<Trans>add_filter_btn</Trans>
</button>
</div> </s> remove <button className="btn btn-success btn-standart mr-2" type="submit" onClick={this.props.toggleFilteringModal}><Trans>add_filter_btn</Trans></button>
<button className="btn btn-primary btn-standart" type="submit" onClick={this.props.refreshFilters}><Trans>check_updates_btn</Trans></button>
</s> add <button
className="btn btn-success btn-standart mr-2"
type="submit"
onClick={this.props.toggleFilteringModal}
>
<Trans>add_filter_btn</Trans>
</button>
<button
className="btn btn-primary btn-standart"
type="submit"
onClick={this.props.refreshFilters}
disabled={processingRefreshFilters}
>
<Trans>check_updates_btn</Trans>
</button> </s> remove {this.renderButtons(queryLogEnabled)}
</s> add {this.renderButtons(queryLogEnabled, dashboard.logStatusProcessing)} </s> remove const { filters, userRules } = this.props.filtering;
</s> add const { filters, userRules, processingRefreshFilters } = this.props.filtering; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1bb428a6a32e43ffad711ab641cd37eeec91769 | client/src/components/ui/Modal.js |
{!this.props.isFilterAdded &&
<div className="modal-footer">
<button
type="button"
className="btn btn-secondary"
onClick={this.closeModal}
>
<Trans>cancel_btn</Trans>
</button>
<button
type="button"
className="btn btn-success"
onClick={this.handleNext}
disabled={isValidForSubmit || processingAddFilter}
>
<Trans>add_filter_btn</Trans>
</button>
</div> | <mask> </div>
<mask> <div className="modal-body">
<mask> { renderBody()}
<mask> </div>
<mask> {
<mask> !this.props.isFilterAdded &&
<mask> <div className="modal-footer">
<mask> <button type="button" className="btn btn-secondary" onClick={this.closeModal}><Trans>cancel_btn</Trans></button>
<mask> <button type="button" className="btn btn-success" onClick={this.handleNext} disabled={isValidForSubmit}><Trans>add_filter_btn</Trans></button>
<mask> </div>
<mask> }
<mask> </div>
<mask> </ReactModal>
<mask> );
<mask> }
</s> Only allow single click on buttons
Closes #544 </s> remove { renderBody()}
</s> add {renderBody()} </s> remove <button className="btn btn-success btn-standart mr-2" type="submit" onClick={this.props.toggleFilteringModal}><Trans>add_filter_btn</Trans></button>
<button className="btn btn-primary btn-standart" type="submit" onClick={this.props.refreshFilters}><Trans>check_updates_btn</Trans></button>
</s> add <button
className="btn btn-success btn-standart mr-2"
type="submit"
onClick={this.props.toggleFilteringModal}
>
<Trans>add_filter_btn</Trans>
</button>
<button
className="btn btn-primary btn-standart"
type="submit"
onClick={this.props.refreshFilters}
disabled={processingRefreshFilters}
>
<Trans>check_updates_btn</Trans>
</button> </s> remove disabled={!filledConfig || activeDhcpFound}
</s> add disabled={!filledConfig || activeDhcpFound || processingDhcp} </s> remove {this.renderButtons(queryLogEnabled)}
</s> add {this.renderButtons(queryLogEnabled, dashboard.logStatusProcessing)} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1bb428a6a32e43ffad711ab641cd37eeec91769 | client/src/components/ui/Modal.js |
processingAddFilter: PropTypes.bool, | <mask> inputDescription: PropTypes.string,
<mask> addFilter: PropTypes.func.isRequired,
<mask> isFilterAdded: PropTypes.bool,
<mask> t: PropTypes.func,
<mask> };
<mask>
<mask> export default withNamespaces()(Modal);
</s> Only allow single click on buttons
Closes #544 </s> remove dispatch(refreshFiltersRequest);
</s> add dispatch(refreshFiltersRequest()); </s> remove const newState = { ...state, config: newConfig };
</s> add const newState = { ...state, config: newConfig, processingDhcp: false }; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1bb428a6a32e43ffad711ab641cd37eeec91769 | client/src/components/ui/Modal.js |
[actions.toggleProtectionRequest]: state => ({ ...state, processingProtection: true }),
[actions.toggleProtectionFailure]: state => ({ ...state, processingProtection: false }), | <mask> },
<mask>
<mask> [actions.toggleProtectionSuccess]: (state) => {
<mask> const newState = {
<mask> ...state,
<mask> protectionEnabled: !state.protectionEnabled,
</s> Only allow single click on buttons
Closes #544 </s> remove const newState = { ...state, protectionEnabled: !state.protectionEnabled };
</s> add const newState = {
...state,
protectionEnabled: !state.protectionEnabled,
processingProtection: false,
}; </s> remove const newState = { ...state, config: newConfig };
</s> add const newState = { ...state, config: newConfig, processingDhcp: false }; | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1bb428a6a32e43ffad711ab641cd37eeec91769 | client/src/reducers/index.js |
const newState = {
...state,
protectionEnabled: !state.protectionEnabled,
processingProtection: false,
}; | <mask> return newState;
<mask> },
<mask>
<mask> [actions.toggleProtectionSuccess]: (state) => {
<mask> const newState = { ...state, protectionEnabled: !state.protectionEnabled };
<mask> return newState;
<mask> },
<mask>
<mask> [actions.handleUpstreamChange]: (state, { payload }) => {
<mask> const { upstreamDns } = payload;
</s> Only allow single click on buttons
Closes #544 </s> remove const newState = { ...state, config: newConfig };
</s> add const newState = { ...state, config: newConfig, processingDhcp: false }; </s> remove renderButtons(queryLogEnabled) {
</s> add renderButtons(queryLogEnabled, logStatusProcessing) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1bb428a6a32e43ffad711ab641cd37eeec91769 | client/src/reducers/index.js |
processingProtection: false, | <mask> processingFiltering: true,
<mask> upstreamDns: [],
<mask> protectionEnabled: false,
<mask> });
<mask>
<mask> const queryLogs = handleActions({
<mask> [actions.getLogsRequest]: state => ({ ...state, getLogsProcessing: true }),
</s> Only allow single click on buttons
Closes #544 </s> remove const newState = { ...state, protectionEnabled: !state.protectionEnabled };
</s> add const newState = {
...state,
protectionEnabled: !state.protectionEnabled,
processingProtection: false,
}; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1bb428a6a32e43ffad711ab641cd37eeec91769 | client/src/reducers/index.js |
processingAddFilter: false,
processingRefreshFilters: false, | <mask> isFilteringModalOpen: false,
<mask> processingFilters: false,
<mask> processingRules: false,
<mask> filters: [],
<mask> userRules: '',
<mask> });
<mask>
<mask> const toasts = handleActions({
<mask> [actions.addErrorToast]: (state, { payload }) => {
</s> Only allow single click on buttons
Closes #544 </s> remove const newState = { ...state, protectionEnabled: !state.protectionEnabled };
</s> add const newState = {
...state,
protectionEnabled: !state.protectionEnabled,
processingProtection: false,
}; </s> remove const newState = { ...state, config: newConfig };
</s> add const newState = { ...state, config: newConfig, processingDhcp: false }; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1bb428a6a32e43ffad711ab641cd37eeec91769 | client/src/reducers/index.js |
[actions.toggleDhcpRequest]: state => ({ ...state, processingDhcp: true }),
[actions.toggleDhcpFailure]: state => ({ ...state, processingDhcp: false }), | <mask> processingStatus: false,
<mask> }),
<mask>
<mask> [actions.toggleDhcpSuccess]: (state) => {
<mask> const { config } = state;
<mask> const newConfig = { ...config, enabled: !config.enabled };
<mask> const newState = { ...state, config: newConfig, processingDhcp: false };
<mask> return newState;
<mask> },
</s> Only allow single click on buttons
Closes #544 </s> remove const newState = { ...state, config: newConfig };
</s> add const newState = { ...state, config: newConfig, processingDhcp: false }; </s> remove const newState = { ...state, protectionEnabled: !state.protectionEnabled };
</s> add const newState = {
...state,
protectionEnabled: !state.protectionEnabled,
processingProtection: false,
}; </s> remove renderButtons(queryLogEnabled) {
</s> add renderButtons(queryLogEnabled, logStatusProcessing) { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1bb428a6a32e43ffad711ab641cd37eeec91769 | client/src/reducers/index.js |
const newState = { ...state, config: newConfig, processingDhcp: false }; | <mask>
<mask> [actions.toggleDhcpSuccess]: (state) => {
<mask> const { config } = state;
<mask> const newConfig = { ...config, enabled: !config.enabled };
<mask> const newState = { ...state, config: newConfig };
<mask> return newState;
<mask> },
<mask> }, {
<mask> processing: true,
<mask> processingStatus: false,
</s> Only allow single click on buttons
Closes #544 </s> remove const newState = { ...state, protectionEnabled: !state.protectionEnabled };
</s> add const newState = {
...state,
protectionEnabled: !state.protectionEnabled,
processingProtection: false,
}; </s> remove renderButtons(queryLogEnabled) {
</s> add renderButtons(queryLogEnabled, logStatusProcessing) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1bb428a6a32e43ffad711ab641cd37eeec91769 | client/src/reducers/index.js |
processingDhcp: false, | <mask> processing: true,
<mask> processingStatus: false,
<mask> processingInterfaces: false,
<mask> config: {
<mask> enabled: false,
<mask> },
<mask> active: null,
<mask> leases: [],
</s> Only allow single click on buttons
Closes #544 </s> remove const newState = { ...state, config: newConfig };
</s> add const newState = { ...state, config: newConfig, processingDhcp: false }; </s> remove const newState = { ...state, protectionEnabled: !state.protectionEnabled };
</s> add const newState = {
...state,
protectionEnabled: !state.protectionEnabled,
processingProtection: false,
}; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1bb428a6a32e43ffad711ab641cd37eeec91769 | client/src/reducers/index.js |
"github.com/AdguardTeam/golibs/log" | <mask>
<mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/digineo/go-ipset/v2"
<mask> "github.com/mdlayher/netlink"
<mask> "github.com/ti-mo/netfilter"
<mask> )
<mask>
</s> Pull request: aghnet: fix adding entry into multiple ipsets
Updates #3638.
Squashed commit of the following:
commit f9c52176806051c2e3d5e34a440a919ca022c319
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:31:46 2021 +0300
aghnet: fix docs
commit 1167806d73ba14d0145a2d1e11cece5dbb7958aa
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:26:28 2021 +0300
all: imp docs, names
commit ba08f5c759fe4d83a4709f619fa65dffe3e9e164
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:14:05 2021 +0300
aghnet: fix adding entry into multiple ipsets </s> remove firstRun bool // if set to true, don't run any services except HTTP web inteface, and serve only first-run html
</s> add firstRun bool // if set to true, don't run any services except HTTP web interface, and serve only first-run html </s> remove // Add implements the aghnet.IpsetManager inteface for *fakeIpsetMgr.
</s> add // Add implements the aghnet.IpsetManager interface for *fakeIpsetMgr. </s> remove log.Debug("ipset: added %d new ips", n)
</s> add log.Debug("ipset: added %d new ipset entries", n) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1e064db592278db7c07285d9be44fe3e4412bee | internal/aghnet/ipset_linux.go |
// ipsInIpset is the type of a set of IP-address-to-ipset mappings.
type ipsInIpset map[ipInIpsetEntry]unit
// ipInIpsetEntry is the type for entries in an ipsInIpset set.
type ipInIpsetEntry struct {
ipsetName string
ipArr [net.IPv6len]byte
}
| <mask> // unit is a convenient alias for struct{}.
<mask> type unit = struct{}
<mask>
<mask> // ipsetMgr is the Linux Netfilter ipset manager.
<mask> type ipsetMgr struct {
<mask> nameToIpset map[string]ipsetProps
<mask> domainToIpsets map[string][]ipsetProps
</s> Pull request: aghnet: fix adding entry into multiple ipsets
Updates #3638.
Squashed commit of the following:
commit f9c52176806051c2e3d5e34a440a919ca022c319
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:31:46 2021 +0300
aghnet: fix docs
commit 1167806d73ba14d0145a2d1e11cece5dbb7958aa
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:26:28 2021 +0300
all: imp docs, names
commit ba08f5c759fe4d83a4709f619fa65dffe3e9e164
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:14:05 2021 +0300
aghnet: fix adding entry into multiple ipsets </s> remove addedIPs map[[16]byte]unit
</s> add addedIPs ipsInIpset </s> remove for _, iparr := range newAddedIPs {
m.addedIPs[iparr] = unit{}
</s> add for _, e := range newAddedEntries {
m.addedIPs[e] = unit{} </s> remove // Add implements the aghnet.IpsetManager inteface for *fakeIpsetMgr.
</s> add // Add implements the aghnet.IpsetManager interface for *fakeIpsetMgr. | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1e064db592278db7c07285d9be44fe3e4412bee | internal/aghnet/ipset_linux.go |
addedIPs ipsInIpset | <mask> // read the IPs already in sets, so we can assume that all incoming IPs
<mask> // are either added to all corresponding ipsets or not. When that stops
<mask> // being the case, for example if we add dynamic reconfiguration of
<mask> // ipsets, this map will need to become a per-ipset-name one.
<mask> addedIPs map[[16]byte]unit
<mask>
<mask> ipv4Conn ipsetConn
<mask> ipv6Conn ipsetConn
<mask> }
<mask>
</s> Pull request: aghnet: fix adding entry into multiple ipsets
Updates #3638.
Squashed commit of the following:
commit f9c52176806051c2e3d5e34a440a919ca022c319
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:31:46 2021 +0300
aghnet: fix docs
commit 1167806d73ba14d0145a2d1e11cece5dbb7958aa
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:26:28 2021 +0300
all: imp docs, names
commit ba08f5c759fe4d83a4709f619fa65dffe3e9e164
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:14:05 2021 +0300
aghnet: fix adding entry into multiple ipsets </s> remove for _, iparr := range newAddedIPs {
m.addedIPs[iparr] = unit{}
</s> add for _, e := range newAddedEntries {
m.addedIPs[e] = unit{} </s> remove firstRun bool // if set to true, don't run any services except HTTP web inteface, and serve only first-run html
</s> add firstRun bool // if set to true, don't run any services except HTTP web interface, and serve only first-run html | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1e064db592278db7c07285d9be44fe3e4412bee | internal/aghnet/ipset_linux.go |
addedIPs: make(ipsInIpset), | <mask> domainToIpsets: make(map[string][]ipsetProps),
<mask>
<mask> dial: dial,
<mask>
<mask> addedIPs: make(map[[16]byte]unit),
<mask> }
<mask>
<mask> err = m.dialNetfilter(&netlink.Config{})
<mask> if err != nil {
<mask> return nil, fmt.Errorf("dialing netfilter: %w", err)
</s> Pull request: aghnet: fix adding entry into multiple ipsets
Updates #3638.
Squashed commit of the following:
commit f9c52176806051c2e3d5e34a440a919ca022c319
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:31:46 2021 +0300
aghnet: fix docs
commit 1167806d73ba14d0145a2d1e11cece5dbb7958aa
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:26:28 2021 +0300
all: imp docs, names
commit ba08f5c759fe4d83a4709f619fa65dffe3e9e164
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:14:05 2021 +0300
aghnet: fix adding entry into multiple ipsets </s> remove // Add implements the aghnet.IpsetManager inteface for *fakeIpsetMgr.
</s> add // Add implements the aghnet.IpsetManager interface for *fakeIpsetMgr. </s> remove newAddedIPs = append(newAddedIPs, iparr)
</s> add newAddedEntries = append(newAddedEntries, e) </s> remove var newAddedIPs [][16]byte
</s> add var newAddedEntries []ipInIpsetEntry </s> remove for _, iparr := range newAddedIPs {
m.addedIPs[iparr] = unit{}
</s> add for _, e := range newAddedEntries {
m.addedIPs[e] = unit{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1e064db592278db7c07285d9be44fe3e4412bee | internal/aghnet/ipset_linux.go |
var newAddedEntries []ipInIpsetEntry | <mask> return 0, nil
<mask> }
<mask>
<mask> var entries []*ipset.Entry
<mask> var newAddedIPs [][16]byte
<mask> for _, ip := range ips {
<mask> var iparr [16]byte
<mask> copy(iparr[:], ip.To16())
<mask> if _, added := m.addedIPs[iparr]; added {
<mask> continue
</s> Pull request: aghnet: fix adding entry into multiple ipsets
Updates #3638.
Squashed commit of the following:
commit f9c52176806051c2e3d5e34a440a919ca022c319
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:31:46 2021 +0300
aghnet: fix docs
commit 1167806d73ba14d0145a2d1e11cece5dbb7958aa
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:26:28 2021 +0300
all: imp docs, names
commit ba08f5c759fe4d83a4709f619fa65dffe3e9e164
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:14:05 2021 +0300
aghnet: fix adding entry into multiple ipsets </s> remove var iparr [16]byte
copy(iparr[:], ip.To16())
if _, added := m.addedIPs[iparr]; added {
</s> add e := ipInIpsetEntry{
ipsetName: set.name,
}
copy(e.ipArr[:], ip.To16())
if _, added := m.addedIPs[e]; added { </s> remove for _, iparr := range newAddedIPs {
m.addedIPs[iparr] = unit{}
</s> add for _, e := range newAddedEntries {
m.addedIPs[e] = unit{} </s> remove newAddedIPs = append(newAddedIPs, iparr)
</s> add newAddedEntries = append(newAddedEntries, e) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1e064db592278db7c07285d9be44fe3e4412bee | internal/aghnet/ipset_linux.go |
e := ipInIpsetEntry{
ipsetName: set.name,
}
copy(e.ipArr[:], ip.To16())
if _, added := m.addedIPs[e]; added { | <mask>
<mask> var entries []*ipset.Entry
<mask> var newAddedIPs [][16]byte
<mask> for _, ip := range ips {
<mask> var iparr [16]byte
<mask> copy(iparr[:], ip.To16())
<mask> if _, added := m.addedIPs[iparr]; added {
<mask> continue
<mask> }
<mask>
<mask> entries = append(entries, ipset.NewEntry(ipset.EntryIP(ip)))
<mask> newAddedIPs = append(newAddedIPs, iparr)
</s> Pull request: aghnet: fix adding entry into multiple ipsets
Updates #3638.
Squashed commit of the following:
commit f9c52176806051c2e3d5e34a440a919ca022c319
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:31:46 2021 +0300
aghnet: fix docs
commit 1167806d73ba14d0145a2d1e11cece5dbb7958aa
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:26:28 2021 +0300
all: imp docs, names
commit ba08f5c759fe4d83a4709f619fa65dffe3e9e164
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:14:05 2021 +0300
aghnet: fix adding entry into multiple ipsets </s> remove var newAddedIPs [][16]byte
</s> add var newAddedEntries []ipInIpsetEntry </s> remove newAddedIPs = append(newAddedIPs, iparr)
</s> add newAddedEntries = append(newAddedEntries, e) </s> remove for _, iparr := range newAddedIPs {
m.addedIPs[iparr] = unit{}
</s> add for _, e := range newAddedEntries {
m.addedIPs[e] = unit{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1e064db592278db7c07285d9be44fe3e4412bee | internal/aghnet/ipset_linux.go |
newAddedEntries = append(newAddedEntries, e) | <mask> continue
<mask> }
<mask>
<mask> entries = append(entries, ipset.NewEntry(ipset.EntryIP(ip)))
<mask> newAddedIPs = append(newAddedIPs, iparr)
<mask> }
<mask>
<mask> n = len(entries)
<mask> if n == 0 {
<mask> return 0, nil
</s> Pull request: aghnet: fix adding entry into multiple ipsets
Updates #3638.
Squashed commit of the following:
commit f9c52176806051c2e3d5e34a440a919ca022c319
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:31:46 2021 +0300
aghnet: fix docs
commit 1167806d73ba14d0145a2d1e11cece5dbb7958aa
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:26:28 2021 +0300
all: imp docs, names
commit ba08f5c759fe4d83a4709f619fa65dffe3e9e164
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:14:05 2021 +0300
aghnet: fix adding entry into multiple ipsets </s> remove var iparr [16]byte
copy(iparr[:], ip.To16())
if _, added := m.addedIPs[iparr]; added {
</s> add e := ipInIpsetEntry{
ipsetName: set.name,
}
copy(e.ipArr[:], ip.To16())
if _, added := m.addedIPs[e]; added { </s> remove var newAddedIPs [][16]byte
</s> add var newAddedEntries []ipInIpsetEntry </s> remove for _, iparr := range newAddedIPs {
m.addedIPs[iparr] = unit{}
</s> add for _, e := range newAddedEntries {
m.addedIPs[e] = unit{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1e064db592278db7c07285d9be44fe3e4412bee | internal/aghnet/ipset_linux.go |
for _, e := range newAddedEntries {
m.addedIPs[e] = unit{} | <mask> }
<mask>
<mask> // Only add these to the cache once we're sure that all of them were
<mask> // actually sent to the ipset.
<mask> for _, iparr := range newAddedIPs {
<mask> m.addedIPs[iparr] = unit{}
<mask> }
<mask>
<mask> return n, nil
<mask> }
<mask>
</s> Pull request: aghnet: fix adding entry into multiple ipsets
Updates #3638.
Squashed commit of the following:
commit f9c52176806051c2e3d5e34a440a919ca022c319
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:31:46 2021 +0300
aghnet: fix docs
commit 1167806d73ba14d0145a2d1e11cece5dbb7958aa
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:26:28 2021 +0300
all: imp docs, names
commit ba08f5c759fe4d83a4709f619fa65dffe3e9e164
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:14:05 2021 +0300
aghnet: fix adding entry into multiple ipsets </s> remove var newAddedIPs [][16]byte
</s> add var newAddedEntries []ipInIpsetEntry </s> remove addedIPs map[[16]byte]unit
</s> add addedIPs ipsInIpset </s> remove var iparr [16]byte
copy(iparr[:], ip.To16())
if _, added := m.addedIPs[iparr]; added {
</s> add e := ipInIpsetEntry{
ipsetName: set.name,
}
copy(e.ipArr[:], ip.To16())
if _, added := m.addedIPs[e]; added { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1e064db592278db7c07285d9be44fe3e4412bee | internal/aghnet/ipset_linux.go |
log.Debug("ipset: added %d ips to set %s", nn, set.name)
| <mask> default:
<mask> return n, fmt.Errorf("unexpected family %s for ipset %q", set.family, set.name)
<mask> }
<mask>
<mask> n += nn
<mask> }
<mask>
<mask> return n, nil
<mask> }
<mask>
</s> Pull request: aghnet: fix adding entry into multiple ipsets
Updates #3638.
Squashed commit of the following:
commit f9c52176806051c2e3d5e34a440a919ca022c319
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:31:46 2021 +0300
aghnet: fix docs
commit 1167806d73ba14d0145a2d1e11cece5dbb7958aa
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:26:28 2021 +0300
all: imp docs, names
commit ba08f5c759fe4d83a4709f619fa65dffe3e9e164
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:14:05 2021 +0300
aghnet: fix adding entry into multiple ipsets </s> remove for _, iparr := range newAddedIPs {
m.addedIPs[iparr] = unit{}
</s> add for _, e := range newAddedEntries {
m.addedIPs[e] = unit{} </s> remove newAddedIPs = append(newAddedIPs, iparr)
</s> add newAddedEntries = append(newAddedEntries, e) </s> remove log.Debug("ipset: added %d new ips", n)
</s> add log.Debug("ipset: added %d new ipset entries", n) </s> remove var newAddedIPs [][16]byte
</s> add var newAddedEntries []ipInIpsetEntry | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1e064db592278db7c07285d9be44fe3e4412bee | internal/aghnet/ipset_linux.go |
log.Debug("ipset: found %d sets", len(sets))
| <mask> if len(sets) == 0 {
<mask> return 0, nil
<mask> }
<mask>
<mask> return m.addToSets(host, ip4s, ip6s, sets)
<mask> }
<mask>
<mask> // Close implements the IpsetManager interface for *ipsetMgr.
<mask> func (m *ipsetMgr) Close() (err error) {
</s> Pull request: aghnet: fix adding entry into multiple ipsets
Updates #3638.
Squashed commit of the following:
commit f9c52176806051c2e3d5e34a440a919ca022c319
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:31:46 2021 +0300
aghnet: fix docs
commit 1167806d73ba14d0145a2d1e11cece5dbb7958aa
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:26:28 2021 +0300
all: imp docs, names
commit ba08f5c759fe4d83a4709f619fa65dffe3e9e164
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:14:05 2021 +0300
aghnet: fix adding entry into multiple ipsets </s> remove // Add implements the aghnet.IpsetManager inteface for *fakeIpsetMgr.
</s> add // Add implements the aghnet.IpsetManager interface for *fakeIpsetMgr. </s> remove newAddedIPs = append(newAddedIPs, iparr)
</s> add newAddedEntries = append(newAddedEntries, e) </s> remove var newAddedIPs [][16]byte
</s> add var newAddedEntries []ipInIpsetEntry </s> remove for _, iparr := range newAddedIPs {
m.addedIPs[iparr] = unit{}
</s> add for _, e := range newAddedEntries {
m.addedIPs[e] = unit{} </s> remove addedIPs: make(map[[16]byte]unit),
</s> add addedIPs: make(ipsInIpset), | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1e064db592278db7c07285d9be44fe3e4412bee | internal/aghnet/ipset_linux.go |
log.Debug("ipset: added %d new ipset entries", n) | <mask>
<mask> return resultCodeSuccess
<mask> }
<mask>
<mask> log.Debug("ipset: added %d new ips", n)
<mask>
<mask> return resultCodeSuccess
<mask> }
</s> Pull request: aghnet: fix adding entry into multiple ipsets
Updates #3638.
Squashed commit of the following:
commit f9c52176806051c2e3d5e34a440a919ca022c319
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:31:46 2021 +0300
aghnet: fix docs
commit 1167806d73ba14d0145a2d1e11cece5dbb7958aa
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:26:28 2021 +0300
all: imp docs, names
commit ba08f5c759fe4d83a4709f619fa65dffe3e9e164
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:14:05 2021 +0300
aghnet: fix adding entry into multiple ipsets </s> remove var newAddedIPs [][16]byte
</s> add var newAddedEntries []ipInIpsetEntry </s> remove newAddedIPs = append(newAddedIPs, iparr)
</s> add newAddedEntries = append(newAddedEntries, e) </s> remove for _, iparr := range newAddedIPs {
m.addedIPs[iparr] = unit{}
</s> add for _, e := range newAddedEntries {
m.addedIPs[e] = unit{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1e064db592278db7c07285d9be44fe3e4412bee | internal/dnsforward/ipset.go |
// Add implements the aghnet.IpsetManager interface for *fakeIpsetMgr. | <mask> ip4s []net.IP
<mask> ip6s []net.IP
<mask> }
<mask>
<mask> // Add implements the aghnet.IpsetManager inteface for *fakeIpsetMgr.
<mask> func (m *fakeIpsetMgr) Add(host string, ip4s, ip6s []net.IP) (n int, err error) {
<mask> m.ip4s = append(m.ip4s, ip4s...)
<mask> m.ip6s = append(m.ip6s, ip6s...)
<mask>
<mask> return len(ip4s) + len(ip6s), nil
</s> Pull request: aghnet: fix adding entry into multiple ipsets
Updates #3638.
Squashed commit of the following:
commit f9c52176806051c2e3d5e34a440a919ca022c319
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:31:46 2021 +0300
aghnet: fix docs
commit 1167806d73ba14d0145a2d1e11cece5dbb7958aa
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:26:28 2021 +0300
all: imp docs, names
commit ba08f5c759fe4d83a4709f619fa65dffe3e9e164
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:14:05 2021 +0300
aghnet: fix adding entry into multiple ipsets </s> remove addedIPs: make(map[[16]byte]unit),
</s> add addedIPs: make(ipsInIpset), </s> remove for _, iparr := range newAddedIPs {
m.addedIPs[iparr] = unit{}
</s> add for _, e := range newAddedEntries {
m.addedIPs[e] = unit{} </s> remove newAddedIPs = append(newAddedIPs, iparr)
</s> add newAddedEntries = append(newAddedEntries, e) </s> remove var newAddedIPs [][16]byte
</s> add var newAddedEntries []ipInIpsetEntry | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1e064db592278db7c07285d9be44fe3e4412bee | internal/dnsforward/ipset_test.go |
firstRun bool // if set to true, don't run any services except HTTP web interface, and serve only first-run html | <mask> // --
<mask>
<mask> configFilename string // Config filename (can be overridden via the command line arguments)
<mask> workDir string // Location of our directory, used to protect against CWD being somewhere else
<mask> firstRun bool // if set to true, don't run any services except HTTP web inteface, and serve only first-run html
<mask> pidFileName string // PID file name. Empty if no PID file was created.
<mask> disableUpdate bool // If set, don't check for updates
<mask> controlLock sync.Mutex
<mask> tlsRoots *x509.CertPool // list of root CAs for TLSv1.2
<mask> tlsCiphers []uint16 // list of TLS ciphers to use
</s> Pull request: aghnet: fix adding entry into multiple ipsets
Updates #3638.
Squashed commit of the following:
commit f9c52176806051c2e3d5e34a440a919ca022c319
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:31:46 2021 +0300
aghnet: fix docs
commit 1167806d73ba14d0145a2d1e11cece5dbb7958aa
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:26:28 2021 +0300
all: imp docs, names
commit ba08f5c759fe4d83a4709f619fa65dffe3e9e164
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 22 14:14:05 2021 +0300
aghnet: fix adding entry into multiple ipsets </s> remove addedIPs map[[16]byte]unit
</s> add addedIPs ipsInIpset </s> remove for _, iparr := range newAddedIPs {
m.addedIPs[iparr] = unit{}
</s> add for _, e := range newAddedEntries {
m.addedIPs[e] = unit{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1e064db592278db7c07285d9be44fe3e4412bee | internal/home/home.go |
import React, { Component } from 'react'; | <mask> import React from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import ReactTable from 'react-table';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask>
<mask> const columns = [{
</s> - client: fixed leases table on mobile
Closes #688 </s> remove const Leases = props => (
<ReactTable
data={props.leases || []}
columns={columns}
showPagination={false}
noDataText={ props.t('dhcp_leases_not_found') }
minRows={6}
className="-striped -highlight card-table-overflow"
/>
);
</s> add render() {
const { leases, t } = this.props;
return (
<ReactTable
data={leases || []}
columns={[
{
Header: 'MAC',
accessor: 'mac',
Cell: this.cellWrap,
}, {
Header: 'IP',
accessor: 'ip',
Cell: this.cellWrap,
}, {
Header: <Trans>dhcp_table_hostname</Trans>,
accessor: 'hostname',
Cell: this.cellWrap,
}, {
Header: <Trans>dhcp_table_expires</Trans>,
accessor: 'expires',
Cell: this.cellWrap,
},
]}
showPagination={false}
noDataText={t('dhcp_leases_not_found')}
minRows={6}
className="-striped -highlight card-table-overflow"
/>
);
}
} </s> remove const columns = [{
Header: 'MAC',
accessor: 'mac',
}, {
Header: 'IP',
accessor: 'ip',
}, {
Header: <Trans>dhcp_table_hostname</Trans>,
accessor: 'hostname',
}, {
Header: <Trans>dhcp_table_expires</Trans>,
accessor: 'expires',
}];
</s> add class Leases extends Component {
cellWrap = ({ value }) => (
<div className="logs__row logs__row--overflow">
<span className="logs__text" title={value}>
{value}
</span>
</div>
); | [
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e231230f1b2045b705602b2c9d3a14c47f276273 | client/src/components/Settings/Dhcp/Leases.js |
class Leases extends Component {
cellWrap = ({ value }) => (
<div className="logs__row logs__row--overflow">
<span className="logs__text" title={value}>
{value}
</span>
</div>
); | <mask> import PropTypes from 'prop-types';
<mask> import ReactTable from 'react-table';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask>
<mask> const columns = [{
<mask> Header: 'MAC',
<mask> accessor: 'mac',
<mask> }, {
<mask> Header: 'IP',
<mask> accessor: 'ip',
<mask> }, {
<mask> Header: <Trans>dhcp_table_hostname</Trans>,
<mask> accessor: 'hostname',
<mask> }, {
<mask> Header: <Trans>dhcp_table_expires</Trans>,
<mask> accessor: 'expires',
<mask> }];
<mask>
<mask> const Leases = props => (
<mask> <ReactTable
<mask> data={props.leases || []}
<mask> columns={columns}
</s> - client: fixed leases table on mobile
Closes #688 </s> remove import React from 'react';
</s> add import React, { Component } from 'react'; </s> remove const Leases = props => (
<ReactTable
data={props.leases || []}
columns={columns}
showPagination={false}
noDataText={ props.t('dhcp_leases_not_found') }
minRows={6}
className="-striped -highlight card-table-overflow"
/>
);
</s> add render() {
const { leases, t } = this.props;
return (
<ReactTable
data={leases || []}
columns={[
{
Header: 'MAC',
accessor: 'mac',
Cell: this.cellWrap,
}, {
Header: 'IP',
accessor: 'ip',
Cell: this.cellWrap,
}, {
Header: <Trans>dhcp_table_hostname</Trans>,
accessor: 'hostname',
Cell: this.cellWrap,
}, {
Header: <Trans>dhcp_table_expires</Trans>,
accessor: 'expires',
Cell: this.cellWrap,
},
]}
showPagination={false}
noDataText={t('dhcp_leases_not_found')}
minRows={6}
className="-striped -highlight card-table-overflow"
/>
);
}
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e231230f1b2045b705602b2c9d3a14c47f276273 | client/src/components/Settings/Dhcp/Leases.js |
render() {
const { leases, t } = this.props;
return (
<ReactTable
data={leases || []}
columns={[
{
Header: 'MAC',
accessor: 'mac',
Cell: this.cellWrap,
}, {
Header: 'IP',
accessor: 'ip',
Cell: this.cellWrap,
}, {
Header: <Trans>dhcp_table_hostname</Trans>,
accessor: 'hostname',
Cell: this.cellWrap,
}, {
Header: <Trans>dhcp_table_expires</Trans>,
accessor: 'expires',
Cell: this.cellWrap,
},
]}
showPagination={false}
noDataText={t('dhcp_leases_not_found')}
minRows={6}
className="-striped -highlight card-table-overflow"
/>
);
}
} | <mask> Header: <Trans>dhcp_table_expires</Trans>,
<mask> accessor: 'expires',
<mask> }];
<mask>
<mask> const Leases = props => (
<mask> <ReactTable
<mask> data={props.leases || []}
<mask> columns={columns}
<mask> showPagination={false}
<mask> noDataText={ props.t('dhcp_leases_not_found') }
<mask> minRows={6}
<mask> className="-striped -highlight card-table-overflow"
<mask> />
<mask> );
<mask>
<mask> Leases.propTypes = {
<mask> leases: PropTypes.array,
<mask> t: PropTypes.func,
<mask> };
</s> - client: fixed leases table on mobile
Closes #688 </s> remove import React from 'react';
</s> add import React, { Component } from 'react'; </s> remove const columns = [{
Header: 'MAC',
accessor: 'mac',
}, {
Header: 'IP',
accessor: 'ip',
}, {
Header: <Trans>dhcp_table_hostname</Trans>,
accessor: 'hostname',
}, {
Header: <Trans>dhcp_table_expires</Trans>,
accessor: 'expires',
}];
</s> add class Leases extends Component {
cellWrap = ({ value }) => (
<div className="logs__row logs__row--overflow">
<span className="logs__text" title={value}>
{value}
</span>
</div>
); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e231230f1b2045b705602b2c9d3a14c47f276273 | client/src/components/Settings/Dhcp/Leases.js |
returnOK(w)
if f, ok := w.(http.Flusher); ok {
f.Flush()
}
| <mask> web.conf.BindPort = newSettings.Web.Port
<mask>
<mask> registerControlHandlers()
<mask>
<mask> // this needs to be done in a goroutine because Shutdown() is a blocking call, and it will block
<mask> // until all requests are finished, and _we_ are inside a request right now, so it will block indefinitely
<mask> if restartHTTP {
<mask> go func() {
<mask> _ = Context.web.httpServer.Shutdown(context.TODO())
<mask> }()
</s> - Web: flush the bufferred response data before performing global operations </s> remove
returnOK(w)
</s> add </s> remove time.Sleep(time.Second) // TODO: could not find a way to reliably know that data was fully sent to client by https server, so we wait a bit to let response through before closing the server
</s> add </s> remove time.Sleep(time.Second) // wait (hopefully) until response is sent (not sure whether it's really necessary)
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e24143a1962c16763cb73f4e41b30117bcf0d80c | home/control_install.go |
<mask> go func() {
<mask> _ = Context.web.httpServer.Shutdown(context.TODO())
<mask> }()
<mask> }
<mask>
<mask> returnOK(w)
<mask> }
<mask>
<mask> func (web *Web) registerInstallHandlers() {
<mask> http.HandleFunc("/control/install/get_addresses", preInstall(ensureGET(web.handleInstallGetAddresses)))
<mask> http.HandleFunc("/control/install/check_config", preInstall(ensurePOST(web.handleInstallCheckConfig)))
</s> - Web: flush the bufferred response data before performing global operations </s> remove time.Sleep(time.Second) // TODO: could not find a way to reliably know that data was fully sent to client by https server, so we wait a bit to let response through before closing the server
</s> add </s> remove time.Sleep(time.Second) // wait (hopefully) until response is sent (not sure whether it's really necessary)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e24143a1962c16763cb73f4e41b30117bcf0d80c | home/control_install.go | |
if f, ok := w.(http.Flusher); ok {
f.Flush()
} | <mask> return
<mask> }
<mask>
<mask> returnOK(w)
<mask>
<mask> go finishUpdate(u)
<mask> }
</s> - Web: flush the bufferred response data before performing global operations </s> remove time.Sleep(time.Second) // wait (hopefully) until response is sent (not sure whether it's really necessary)
</s> add </s> remove
returnOK(w)
</s> add </s> remove time.Sleep(time.Second) // TODO: could not find a way to reliably know that data was fully sent to client by https server, so we wait a bit to let response through before closing the server
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e24143a1962c16763cb73f4e41b30117bcf0d80c | home/control_update.go |
<mask> }
<mask>
<mask> returnOK(w)
<mask>
<mask> time.Sleep(time.Second) // wait (hopefully) until response is sent (not sure whether it's really necessary)
<mask> go finishUpdate(u)
<mask> }
</s> - Web: flush the bufferred response data before performing global operations </s> remove time.Sleep(time.Second) // TODO: could not find a way to reliably know that data was fully sent to client by https server, so we wait a bit to let response through before closing the server
</s> add </s> remove
returnOK(w)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e24143a1962c16763cb73f4e41b30117bcf0d80c | home/control_update.go | |
if f, ok := w.(http.Flusher); ok {
f.Flush()
}
| <mask> tlsConfigStatus: t.status,
<mask> }
<mask> marshalTLS(w, data2)
<mask> // this needs to be done in a goroutine because Shutdown() is a blocking call, and it will block
<mask> // until all requests are finished, and _we_ are inside a request right now, so it will block indefinitely
<mask> if restartHTTPS {
<mask> go func() {
<mask> Context.web.TLSConfigChanged(data)
<mask> }()
</s> - Web: flush the bufferred response data before performing global operations </s> remove time.Sleep(time.Second) // TODO: could not find a way to reliably know that data was fully sent to client by https server, so we wait a bit to let response through before closing the server
</s> add </s> remove
returnOK(w)
</s> add </s> remove time.Sleep(time.Second) // wait (hopefully) until response is sent (not sure whether it's really necessary)
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e24143a1962c16763cb73f4e41b30117bcf0d80c | home/tls.go |
<mask> // this needs to be done in a goroutine because Shutdown() is a blocking call, and it will block
<mask> // until all requests are finished, and _we_ are inside a request right now, so it will block indefinitely
<mask> if restartHTTPS {
<mask> go func() {
<mask> time.Sleep(time.Second) // TODO: could not find a way to reliably know that data was fully sent to client by https server, so we wait a bit to let response through before closing the server
<mask> Context.web.TLSConfigChanged(data)
<mask> }()
<mask> }
<mask> }
<mask>
</s> - Web: flush the bufferred response data before performing global operations </s> remove time.Sleep(time.Second) // wait (hopefully) until response is sent (not sure whether it's really necessary)
</s> add </s> remove
returnOK(w)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e24143a1962c16763cb73f4e41b30117bcf0d80c | home/tls.go | |
const getLogsWithParams = async (config) => {
const { older_than, filter, ...values } = config;
const rawLogs = await apiClient.getQueryLog({ ...filter, older_than });
const { data, oldest } = rawLogs;
const logs = normalizeLogs(data);
return {
logs, oldest, older_than, filter, ...values,
};
};
| <mask> import { normalizeLogs } from '../helpers/helpers';
<mask>
<mask> export const setLogsPagination = createAction('LOGS_PAGINATION');
<mask> export const setLogsPage = createAction('SET_LOG_PAGE');
<mask>
<mask> export const getLogsRequest = createAction('GET_LOGS_REQUEST');
<mask> export const getLogsFailure = createAction('GET_LOGS_FAILURE');
</s> + client: separate filters from the table component </s> remove export const setLogsFilter = createAction('LOGS_FILTER');
</s> add export const setLogsPage = createAction('SET_LOG_PAGE'); </s> remove import { getLogs, getLogsConfig, setLogsPagination, setLogsFilter } from '../actions/queryLogs';
</s> add import { getLogs, getLogsConfig, setLogsPagination, setLogsFilter, setLogsPage } from '../actions/queryLogs'; </s> remove const { filter, older_than } = config;
const rawLogs = await apiClient.getQueryLog({ ...filter, older_than });
const { data, oldest } = rawLogs;
const logs = normalizeLogs(data);
dispatch(getLogsSuccess({
logs, oldest, filter, ...config,
}));
</s> add const logs = await getLogsWithParams(config);
dispatch(getLogsSuccess(logs)); | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/actions/queryLogs.js |
export const setLogsPage = createAction('SET_LOG_PAGE'); | <mask> import { addErrorToast, addSuccessToast } from './index';
<mask> import { normalizeLogs } from '../helpers/helpers';
<mask>
<mask> export const setLogsPagination = createAction('LOGS_PAGINATION');
<mask> export const setLogsFilter = createAction('LOGS_FILTER');
<mask>
<mask> export const getLogsRequest = createAction('GET_LOGS_REQUEST');
<mask> export const getLogsFailure = createAction('GET_LOGS_FAILURE');
<mask> export const getLogsSuccess = createAction('GET_LOGS_SUCCESS');
<mask>
</s> + client: separate filters from the table component </s> remove import { getLogs, getLogsConfig, setLogsPagination, setLogsFilter } from '../actions/queryLogs';
</s> add import { getLogs, getLogsConfig, setLogsPagination, setLogsFilter, setLogsPage } from '../actions/queryLogs'; </s> remove const { filter, older_than } = config;
const rawLogs = await apiClient.getQueryLog({ ...filter, older_than });
const { data, oldest } = rawLogs;
const logs = normalizeLogs(data);
dispatch(getLogsSuccess({
logs, oldest, filter, ...config,
}));
</s> add const logs = await getLogsWithParams(config);
dispatch(getLogsSuccess(logs)); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/actions/queryLogs.js |
const logs = await getLogsWithParams(config);
dispatch(getLogsSuccess(logs)); | <mask>
<mask> export const getLogs = config => async (dispatch) => {
<mask> dispatch(getLogsRequest());
<mask> try {
<mask> const { filter, older_than } = config;
<mask> const rawLogs = await apiClient.getQueryLog({ ...filter, older_than });
<mask> const { data, oldest } = rawLogs;
<mask> const logs = normalizeLogs(data);
<mask> dispatch(getLogsSuccess({
<mask> logs, oldest, filter, ...config,
<mask> }));
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(getLogsFailure(error));
<mask> }
<mask> };
</s> + client: separate filters from the table component </s> remove const { pageSize, page, pages } = state;
const { filter, oldest } = this.props.queryLogs;
</s> add const { pages } = state;
const {
filter, oldest, page,
} = this.props.queryLogs; </s> remove getLogs = (older_than, filter, page, pageSize, filtered) => {
</s> add getLogs = (older_than, filter, page) => { </s> remove older_than, filter, page, pageSize, filtered,
</s> add older_than, filter, page, pageSize: TABLE_DEFAULT_PAGE_SIZE, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/actions/queryLogs.js |
export const setLogsFilterRequest = createAction('SET_LOGS_FILTER_REQUEST');
export const setLogsFilterFailure = createAction('SET_LOGS_FILTER_FAILURE');
export const setLogsFilterSuccess = createAction('SET_LOGS_FILTER_SUCCESS');
export const setLogsFilter = filter => async (dispatch) => {
dispatch(setLogsFilterRequest());
try {
const logs = await getLogsWithParams({ older_than: '', filter });
dispatch(setLogsFilterSuccess(logs));
dispatch(setLogsPage(0));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setLogsFilterFailure(error));
}
};
| <mask> };
<mask>
<mask> export const clearLogsRequest = createAction('CLEAR_LOGS_REQUEST');
<mask> export const clearLogsFailure = createAction('CLEAR_LOGS_FAILURE');
<mask> export const clearLogsSuccess = createAction('CLEAR_LOGS_SUCCESS');
<mask>
<mask> export const clearLogs = () => async (dispatch) => {
</s> + client: separate filters from the table component </s> remove export const setLogsFilter = createAction('LOGS_FILTER');
</s> add export const setLogsPage = createAction('SET_LOG_PAGE'); </s> remove const { filter, older_than } = config;
const rawLogs = await apiClient.getQueryLog({ ...filter, older_than });
const { data, oldest } = rawLogs;
const logs = normalizeLogs(data);
dispatch(getLogsSuccess({
logs, oldest, filter, ...config,
}));
</s> add const logs = await getLogsWithParams(config);
dispatch(getLogsSuccess(logs)); </s> remove handleLogsFiltering = debounce((older_than, filter, page, pageSize, filtered) => {
this.props.getLogs({
older_than,
filter,
page,
pageSize,
filtered,
});
}, DEBOUNCE_TIMEOUT);
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/actions/queryLogs.js |
<mask> import escapeRegExp from 'lodash/escapeRegExp';
<mask> import endsWith from 'lodash/endsWith';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask> import { HashLink as Link } from 'react-router-hash-link';
<mask> import debounce from 'lodash/debounce';
<mask>
<mask> import {
<mask> formatTime,
<mask> formatDateTime,
<mask> isValidQuestionType,
</s> + client: separate filters from the table component </s> remove isValidQuestionType,
</s> add </s> remove import { SERVICES, FILTERED_STATUS, DEBOUNCE_TIMEOUT, DEFAULT_LOGS_FILTER } from '../../helpers/constants';
</s> add import { SERVICES, FILTERED_STATUS, DEFAULT_LOGS_FILTER, RESPONSE_FILTER, TABLE_DEFAULT_PAGE_SIZE } from '../../helpers/constants'; </s> remove import { getLogs, getLogsConfig, setLogsPagination, setLogsFilter } from '../actions/queryLogs';
</s> add import { getLogs, getLogsConfig, setLogsPagination, setLogsFilter, setLogsPage } from '../actions/queryLogs'; </s> remove import Tooltip from '../ui/Tooltip';
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/components/Logs/index.js | |
<mask>
<mask> import {
<mask> formatTime,
<mask> formatDateTime,
<mask> isValidQuestionType,
<mask> } from '../../helpers/helpers';
<mask> import { SERVICES, FILTERED_STATUS, DEBOUNCE_TIMEOUT, DEFAULT_LOGS_FILTER } from '../../helpers/constants';
<mask> import { getTrackerData } from '../../helpers/trackers/trackers';
<mask> import { formatClientCell } from '../../helpers/formatClientCell';
<mask>
</s> + client: separate filters from the table component </s> remove import { SERVICES, FILTERED_STATUS, DEBOUNCE_TIMEOUT, DEFAULT_LOGS_FILTER } from '../../helpers/constants';
</s> add import { SERVICES, FILTERED_STATUS, DEFAULT_LOGS_FILTER, RESPONSE_FILTER, TABLE_DEFAULT_PAGE_SIZE } from '../../helpers/constants'; </s> remove import debounce from 'lodash/debounce';
</s> add </s> remove import { getLogs, getLogsConfig, setLogsPagination, setLogsFilter } from '../actions/queryLogs';
</s> add import { getLogs, getLogsConfig, setLogsPagination, setLogsFilter, setLogsPage } from '../actions/queryLogs'; </s> remove export const setLogsFilter = createAction('LOGS_FILTER');
</s> add export const setLogsPage = createAction('SET_LOG_PAGE'); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/components/Logs/index.js | |
import { SERVICES, FILTERED_STATUS, DEFAULT_LOGS_FILTER, RESPONSE_FILTER, TABLE_DEFAULT_PAGE_SIZE } from '../../helpers/constants'; | <mask> formatTime,
<mask> formatDateTime,
<mask> isValidQuestionType,
<mask> } from '../../helpers/helpers';
<mask> import { SERVICES, FILTERED_STATUS, DEBOUNCE_TIMEOUT, DEFAULT_LOGS_FILTER } from '../../helpers/constants';
<mask> import { getTrackerData } from '../../helpers/trackers/trackers';
<mask> import { formatClientCell } from '../../helpers/formatClientCell';
<mask>
<mask> import PageTitle from '../ui/PageTitle';
<mask> import Card from '../ui/Card';
</s> + client: separate filters from the table component </s> remove isValidQuestionType,
</s> add </s> remove import debounce from 'lodash/debounce';
</s> add </s> remove import { getLogs, getLogsConfig, setLogsPagination, setLogsFilter } from '../actions/queryLogs';
</s> add import { getLogs, getLogsConfig, setLogsPagination, setLogsFilter, setLogsPage } from '../actions/queryLogs'; </s> remove import Tooltip from '../ui/Tooltip';
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/components/Logs/index.js |
import Filters from './Filters'; | <mask> import { getTrackerData } from '../../helpers/trackers/trackers';
<mask> import { formatClientCell } from '../../helpers/formatClientCell';
<mask>
<mask> import PageTitle from '../ui/PageTitle';
<mask> import Card from '../ui/Card';
<mask> import Loading from '../ui/Loading';
<mask> import PopoverFiltered from '../ui/PopoverFilter';
</s> + client: separate filters from the table component </s> remove import { SERVICES, FILTERED_STATUS, DEBOUNCE_TIMEOUT, DEFAULT_LOGS_FILTER } from '../../helpers/constants';
</s> add import { SERVICES, FILTERED_STATUS, DEFAULT_LOGS_FILTER, RESPONSE_FILTER, TABLE_DEFAULT_PAGE_SIZE } from '../../helpers/constants'; </s> remove import Tooltip from '../ui/Tooltip';
</s> add </s> remove isValidQuestionType,
</s> add </s> remove import debounce from 'lodash/debounce';
</s> add </s> remove import { getLogs, getLogsConfig, setLogsPagination, setLogsFilter } from '../actions/queryLogs';
</s> add import { getLogs, getLogsConfig, setLogsPagination, setLogsFilter, setLogsPage } from '../actions/queryLogs'; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/components/Logs/index.js |
<mask> import Card from '../ui/Card';
<mask> import Loading from '../ui/Loading';
<mask> import PopoverFiltered from '../ui/PopoverFilter';
<mask> import Popover from '../ui/Popover';
<mask> import Tooltip from '../ui/Tooltip';
<mask> import './Logs.css';
<mask>
<mask> const TABLE_FIRST_PAGE = 0;
<mask> const TABLE_DEFAULT_PAGE_SIZE = 100;
<mask> const INITIAL_REQUEST_DATA = ['', DEFAULT_LOGS_FILTER, TABLE_FIRST_PAGE, TABLE_DEFAULT_PAGE_SIZE];
</s> + client: separate filters from the table component </s> remove const TABLE_DEFAULT_PAGE_SIZE = 100;
</s> add </s> remove import { SERVICES, FILTERED_STATUS, DEBOUNCE_TIMEOUT, DEFAULT_LOGS_FILTER } from '../../helpers/constants';
</s> add import { SERVICES, FILTERED_STATUS, DEFAULT_LOGS_FILTER, RESPONSE_FILTER, TABLE_DEFAULT_PAGE_SIZE } from '../../helpers/constants'; </s> remove import { getLogs, getLogsConfig, setLogsPagination, setLogsFilter } from '../actions/queryLogs';
</s> add import { getLogs, getLogsConfig, setLogsPagination, setLogsFilter, setLogsPage } from '../actions/queryLogs'; </s> remove import debounce from 'lodash/debounce';
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/components/Logs/index.js | |
<mask> import Tooltip from '../ui/Tooltip';
<mask> import './Logs.css';
<mask>
<mask> const TABLE_FIRST_PAGE = 0;
<mask> const TABLE_DEFAULT_PAGE_SIZE = 100;
<mask> const INITIAL_REQUEST_DATA = ['', DEFAULT_LOGS_FILTER, TABLE_FIRST_PAGE, TABLE_DEFAULT_PAGE_SIZE];
<mask> const FILTERED_REASON = 'Filtered';
<mask> const RESPONSE_FILTER = {
<mask> ALL: 'all',
<mask> FILTERED: 'filtered',
</s> + client: separate filters from the table component </s> remove const RESPONSE_FILTER = {
ALL: 'all',
FILTERED: 'filtered',
};
</s> add </s> remove import Tooltip from '../ui/Tooltip';
</s> add </s> remove export const setLogsFilter = createAction('LOGS_FILTER');
</s> add export const setLogsPage = createAction('SET_LOG_PAGE'); </s> remove import { getLogs, getLogsConfig, setLogsPagination, setLogsFilter } from '../actions/queryLogs';
</s> add import { getLogs, getLogsConfig, setLogsPagination, setLogsFilter, setLogsPage } from '../actions/queryLogs'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/components/Logs/index.js | |
<mask> const TABLE_FIRST_PAGE = 0;
<mask> const TABLE_DEFAULT_PAGE_SIZE = 100;
<mask> const INITIAL_REQUEST_DATA = ['', DEFAULT_LOGS_FILTER, TABLE_FIRST_PAGE, TABLE_DEFAULT_PAGE_SIZE];
<mask> const FILTERED_REASON = 'Filtered';
<mask> const RESPONSE_FILTER = {
<mask> ALL: 'all',
<mask> FILTERED: 'filtered',
<mask> };
<mask>
<mask> class Logs extends Component {
<mask> componentDidMount() {
<mask> this.getLogs(...INITIAL_REQUEST_DATA);
<mask> this.props.getFilteringStatus();
</s> + client: separate filters from the table component </s> remove const TABLE_DEFAULT_PAGE_SIZE = 100;
</s> add </s> remove import Tooltip from '../ui/Tooltip';
</s> add </s> remove [actions.setLogsFilter]: (state, { payload }) => (
{ ...state, filter: payload }
),
</s> add [actions.setLogsPage]: (state, { payload }) => ({
...state,
page: payload,
}),
[actions.setLogsFilterRequest]: state => ({ ...state, processingGetLogs: true }),
[actions.setLogsFilterFailure]: state => ({ ...state, processingGetLogs: false }),
[actions.setLogsFilterSuccess]: (state, { payload }) => {
const { logs, oldest, filter } = payload;
const pageSize = 100;
const page = 0;
const pages = Math.ceil(logs.length / pageSize);
const total = logs.length;
const rowsStart = pageSize * page;
const rowsEnd = (pageSize * page) + pageSize;
const logsSlice = logs.slice(rowsStart, rowsEnd);
const isFiltered = Object.keys(filter).some(key => filter[key]);
return {
...state,
oldest,
filter,
isFiltered,
pages,
total,
logs: logsSlice,
allLogs: logs,
processingGetLogs: false,
};
}, </s> remove const { pageSize, page, pages } = state;
const { filter, oldest } = this.props.queryLogs;
</s> add const { pages } = state;
const {
filter, oldest, page,
} = this.props.queryLogs; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/components/Logs/index.js | |
this.props.setLogsPage(TABLE_FIRST_PAGE); | <mask>
<mask> class Logs extends Component {
<mask> componentDidMount() {
<mask> this.getLogs(...INITIAL_REQUEST_DATA);
<mask> this.props.getFilteringStatus();
<mask> this.props.getClients();
<mask> this.props.getLogsConfig();
<mask> }
<mask>
</s> + client: separate filters from the table component </s> remove const RESPONSE_FILTER = {
ALL: 'all',
FILTERED: 'filtered',
};
</s> add </s> remove getLogs = (older_than, filter, page, pageSize, filtered) => {
</s> add getLogs = (older_than, filter, page) => { </s> remove import { getLogs, getLogsConfig, setLogsPagination, setLogsFilter } from '../actions/queryLogs';
</s> add import { getLogs, getLogsConfig, setLogsPagination, setLogsFilter, setLogsPage } from '../actions/queryLogs'; </s> remove isValidQuestionType,
</s> add </s> remove const { pageSize, page, pages } = state;
const { filter, oldest } = this.props.queryLogs;
</s> add const { pages } = state;
const {
filter, oldest, page,
} = this.props.queryLogs; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/components/Logs/index.js |
getLogs = (older_than, filter, page) => { | <mask> this.props.getClients();
<mask> this.props.getLogsConfig();
<mask> }
<mask>
<mask> getLogs = (older_than, filter, page, pageSize, filtered) => {
<mask> if (this.props.queryLogs.enabled) {
<mask> this.props.getLogs({
<mask> older_than, filter, page, pageSize, filtered,
<mask> });
<mask> }
</s> + client: separate filters from the table component </s> remove older_than, filter, page, pageSize, filtered,
</s> add older_than, filter, page, pageSize: TABLE_DEFAULT_PAGE_SIZE, </s> remove handleLogsFiltering = debounce((older_than, filter, page, pageSize, filtered) => {
this.props.getLogs({
older_than,
filter,
page,
pageSize,
filtered,
});
}, DEBOUNCE_TIMEOUT);
</s> add </s> remove this.props.setLogsPagination({ page, pageSize });
</s> add this.props.setLogsPagination({ page, pageSize: TABLE_DEFAULT_PAGE_SIZE }); </s> remove this.getLogs(oldest, filter, page, pageSize, false);
</s> add this.getLogs(oldest, filter, page); </s> remove const { pageSize, page, pages } = state;
const { filter, oldest } = this.props.queryLogs;
</s> add const { pages } = state;
const {
filter, oldest, page,
} = this.props.queryLogs; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/components/Logs/index.js |
older_than, filter, page, pageSize: TABLE_DEFAULT_PAGE_SIZE, | <mask>
<mask> getLogs = (older_than, filter, page, pageSize, filtered) => {
<mask> if (this.props.queryLogs.enabled) {
<mask> this.props.getLogs({
<mask> older_than, filter, page, pageSize, filtered,
<mask> });
<mask> }
<mask> };
<mask>
<mask> refreshLogs = () => {
</s> + client: separate filters from the table component </s> remove getLogs = (older_than, filter, page, pageSize, filtered) => {
</s> add getLogs = (older_than, filter, page) => { </s> remove handleLogsFiltering = debounce((older_than, filter, page, pageSize, filtered) => {
this.props.getLogs({
older_than,
filter,
page,
pageSize,
filtered,
});
}, DEBOUNCE_TIMEOUT);
</s> add </s> remove this.props.setLogsPagination({ page, pageSize });
</s> add this.props.setLogsPagination({ page, pageSize: TABLE_DEFAULT_PAGE_SIZE }); </s> remove const { pageSize, page, pages } = state;
const { filter, oldest } = this.props.queryLogs;
</s> add const { pages } = state;
const {
filter, oldest, page,
} = this.props.queryLogs; </s> remove this.getLogs(oldest, filter, page, pageSize, false);
</s> add this.getLogs(oldest, filter, page); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/components/Logs/index.js |
<mask> refreshLogs = () => {
<mask> window.location.reload();
<mask> };
<mask>
<mask> handleLogsFiltering = debounce((older_than, filter, page, pageSize, filtered) => {
<mask> this.props.getLogs({
<mask> older_than,
<mask> filter,
<mask> page,
<mask> pageSize,
<mask> filtered,
<mask> });
<mask> }, DEBOUNCE_TIMEOUT);
<mask>
<mask> renderTooltip = (isFiltered, rule, filter, service) =>
<mask> isFiltered && <PopoverFiltered rule={rule} filter={filter} service={service} />;
<mask>
<mask> renderResponseList = (response, status) => {
<mask> if (response.length > 0) {
</s> + client: separate filters from the table component </s> remove older_than, filter, page, pageSize, filtered,
</s> add older_than, filter, page, pageSize: TABLE_DEFAULT_PAGE_SIZE, </s> remove getLogs = (older_than, filter, page, pageSize, filtered) => {
</s> add getLogs = (older_than, filter, page) => { </s> remove const { pageSize, page, pages } = state;
const { filter, oldest } = this.props.queryLogs;
</s> add const { pages } = state;
const {
filter, oldest, page,
} = this.props.queryLogs; </s> remove this.props.setLogsPagination({ page, pageSize });
</s> add this.props.setLogsPagination({ page, pageSize: TABLE_DEFAULT_PAGE_SIZE }); </s> remove this.getLogs(oldest, filter, page, pageSize, false);
</s> add this.getLogs(oldest, filter, page); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/components/Logs/index.js | |
<mask> </Fragment>
<mask> );
<mask> };
<mask>
<mask> getFilterInput = ({ filter, onChange }) => (
<mask> <Fragment>
<mask> <div className="logs__input-wrap">
<mask> <input
<mask> type="text"
<mask> className="form-control"
<mask> onChange={event => onChange(event.target.value)}
<mask> value={filter ? filter.value : ''}
<mask> />
<mask> <span className="logs__notice">
<mask> <Tooltip text={this.props.t('query_log_strict_search')} type='tooltip-custom--logs' />
<mask> </span>
<mask> </div>
<mask> </Fragment>
<mask> );
<mask>
<mask> getFilters = (filtered) => {
<mask> const filteredObj = filtered.reduce((acc, cur) => ({ ...acc, [cur.id]: cur.value }), {});
<mask> const {
<mask> domain, client, type, response,
<mask> } = filteredObj;
<mask>
<mask> return {
<mask> filter_domain: domain || '',
<mask> filter_client: client || '',
<mask> filter_question_type: isValidQuestionType(type) ? type.toUpperCase() : '',
<mask> filter_response_status: response === RESPONSE_FILTER.FILTERED ? response : '',
<mask> };
<mask> };
<mask>
<mask> fetchData = (state) => {
<mask> const { pageSize, page, pages } = state;
<mask> const { filter, oldest } = this.props.queryLogs;
<mask> const isLastPage = pages && (page + 1 === pages);
<mask>
</s> + client: separate filters from the table component </s> remove const { pageSize, page, pages } = state;
const { filter, oldest } = this.props.queryLogs;
</s> add const { pages } = state;
const {
filter, oldest, page,
} = this.props.queryLogs; </s> remove this.getLogs(oldest, filter, page, pageSize, false);
</s> add this.getLogs(oldest, filter, page); </s> remove logs, oldest, older_than, page, pageSize, filtered,
</s> add logs, oldest, older_than, page, pageSize, </s> remove [actions.setLogsFilter]: (state, { payload }) => (
{ ...state, filter: payload }
),
</s> add [actions.setLogsPage]: (state, { payload }) => ({
...state,
page: payload,
}),
[actions.setLogsFilterRequest]: state => ({ ...state, processingGetLogs: true }),
[actions.setLogsFilterFailure]: state => ({ ...state, processingGetLogs: false }),
[actions.setLogsFilterSuccess]: (state, { payload }) => {
const { logs, oldest, filter } = payload;
const pageSize = 100;
const page = 0;
const pages = Math.ceil(logs.length / pageSize);
const total = logs.length;
const rowsStart = pageSize * page;
const rowsEnd = (pageSize * page) + pageSize;
const logsSlice = logs.slice(rowsStart, rowsEnd);
const isFiltered = Object.keys(filter).some(key => filter[key]);
return {
...state,
oldest,
filter,
isFiltered,
pages,
total,
logs: logsSlice,
allLogs: logs,
processingGetLogs: false,
};
}, </s> remove this.props.setLogsPagination({ page, pageSize });
</s> add this.props.setLogsPagination({ page, pageSize: TABLE_DEFAULT_PAGE_SIZE }); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/components/Logs/index.js | |
const { pages } = state;
const {
filter, oldest, page,
} = this.props.queryLogs; | <mask> };
<mask> };
<mask>
<mask> fetchData = (state) => {
<mask> const { pageSize, page, pages } = state;
<mask> const { filter, oldest } = this.props.queryLogs;
<mask> const isLastPage = pages && (page + 1 === pages);
<mask>
<mask> if (isLastPage) {
<mask> this.getLogs(oldest, filter, page, pageSize, false);
<mask> } else {
</s> + client: separate filters from the table component </s> remove this.getLogs(oldest, filter, page, pageSize, false);
</s> add this.getLogs(oldest, filter, page); </s> remove getFilterInput = ({ filter, onChange }) => (
<Fragment>
<div className="logs__input-wrap">
<input
type="text"
className="form-control"
onChange={event => onChange(event.target.value)}
value={filter ? filter.value : ''}
/>
<span className="logs__notice">
<Tooltip text={this.props.t('query_log_strict_search')} type='tooltip-custom--logs' />
</span>
</div>
</Fragment>
);
getFilters = (filtered) => {
const filteredObj = filtered.reduce((acc, cur) => ({ ...acc, [cur.id]: cur.value }), {});
const {
domain, client, type, response,
} = filteredObj;
return {
filter_domain: domain || '',
filter_client: client || '',
filter_question_type: isValidQuestionType(type) ? type.toUpperCase() : '',
filter_response_status: response === RESPONSE_FILTER.FILTERED ? response : '',
};
};
</s> add </s> remove this.props.setLogsPagination({ page, pageSize });
</s> add this.props.setLogsPagination({ page, pageSize: TABLE_DEFAULT_PAGE_SIZE }); </s> remove older_than, filter, page, pageSize, filtered,
</s> add older_than, filter, page, pageSize: TABLE_DEFAULT_PAGE_SIZE, </s> remove getLogs = (older_than, filter, page, pageSize, filtered) => {
</s> add getLogs = (older_than, filter, page) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/components/Logs/index.js |
this.getLogs(oldest, filter, page); | <mask> const { filter, oldest } = this.props.queryLogs;
<mask> const isLastPage = pages && (page + 1 === pages);
<mask>
<mask> if (isLastPage) {
<mask> this.getLogs(oldest, filter, page, pageSize, false);
<mask> } else {
<mask> this.props.setLogsPagination({ page, pageSize });
<mask> }
<mask> };
<mask>
</s> + client: separate filters from the table component </s> remove const { pageSize, page, pages } = state;
const { filter, oldest } = this.props.queryLogs;
</s> add const { pages } = state;
const {
filter, oldest, page,
} = this.props.queryLogs; </s> remove this.props.setLogsPagination({ page, pageSize });
</s> add this.props.setLogsPagination({ page, pageSize: TABLE_DEFAULT_PAGE_SIZE }); </s> remove getFilterInput = ({ filter, onChange }) => (
<Fragment>
<div className="logs__input-wrap">
<input
type="text"
className="form-control"
onChange={event => onChange(event.target.value)}
value={filter ? filter.value : ''}
/>
<span className="logs__notice">
<Tooltip text={this.props.t('query_log_strict_search')} type='tooltip-custom--logs' />
</span>
</div>
</Fragment>
);
getFilters = (filtered) => {
const filteredObj = filtered.reduce((acc, cur) => ({ ...acc, [cur.id]: cur.value }), {});
const {
domain, client, type, response,
} = filteredObj;
return {
filter_domain: domain || '',
filter_client: client || '',
filter_question_type: isValidQuestionType(type) ? type.toUpperCase() : '',
filter_response_status: response === RESPONSE_FILTER.FILTERED ? response : '',
};
};
</s> add </s> remove getLogs = (older_than, filter, page, pageSize, filtered) => {
</s> add getLogs = (older_than, filter, page) => { </s> remove older_than, filter, page, pageSize, filtered,
</s> add older_than, filter, page, pageSize: TABLE_DEFAULT_PAGE_SIZE, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/components/Logs/index.js |
this.props.setLogsPagination({ page, pageSize: TABLE_DEFAULT_PAGE_SIZE }); | <mask>
<mask> if (isLastPage) {
<mask> this.getLogs(oldest, filter, page, pageSize, false);
<mask> } else {
<mask> this.props.setLogsPagination({ page, pageSize });
<mask> }
<mask> };
<mask>
<mask> handleFilterChange = (filtered) => {
<mask> const filters = this.getFilters(filtered);
</s> + client: separate filters from the table component </s> remove this.getLogs(oldest, filter, page, pageSize, false);
</s> add this.getLogs(oldest, filter, page); </s> remove const { pageSize, page, pages } = state;
const { filter, oldest } = this.props.queryLogs;
</s> add const { pages } = state;
const {
filter, oldest, page,
} = this.props.queryLogs; </s> remove older_than, filter, page, pageSize, filtered,
</s> add older_than, filter, page, pageSize: TABLE_DEFAULT_PAGE_SIZE, </s> remove getLogs = (older_than, filter, page, pageSize, filtered) => {
</s> add getLogs = (older_than, filter, page) => { </s> remove } else if (filtered) {
logsWithOffset = logs;
allLogs = logs;
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/components/Logs/index.js |
processingGetLogs, processingGetConfig, logs, pages, page, | <mask> renderLogs() {
<mask> const { queryLogs, dashboard, t } = this.props;
<mask> const { processingClients } = dashboard;
<mask> const {
<mask> processingGetLogs, processingGetConfig, logs, pages,
<mask> } = queryLogs;
<mask> const isLoading = processingGetLogs || processingClients || processingGetConfig;
<mask>
<mask> const columns = [
<mask> {
</s> + client: separate filters from the table component </s> remove import { getLogs, getLogsConfig, setLogsPagination, setLogsFilter } from '../actions/queryLogs';
</s> add import { getLogs, getLogsConfig, setLogsPagination, setLogsFilter, setLogsPage } from '../actions/queryLogs'; </s> remove const { filter, older_than } = config;
const rawLogs = await apiClient.getQueryLog({ ...filter, older_than });
const { data, oldest } = rawLogs;
const logs = normalizeLogs(data);
dispatch(getLogsSuccess({
logs, oldest, filter, ...config,
}));
</s> add const logs = await getLogsWithParams(config);
dispatch(getLogsSuccess(logs)); </s> remove const { pageSize, page, pages } = state;
const { filter, oldest } = this.props.queryLogs;
</s> add const { pages } = state;
const {
filter, oldest, page,
} = this.props.queryLogs; </s> remove [actions.setLogsFilter]: (state, { payload }) => (
{ ...state, filter: payload }
),
</s> add [actions.setLogsPage]: (state, { payload }) => ({
...state,
page: payload,
}),
[actions.setLogsFilterRequest]: state => ({ ...state, processingGetLogs: true }),
[actions.setLogsFilterFailure]: state => ({ ...state, processingGetLogs: false }),
[actions.setLogsFilterSuccess]: (state, { payload }) => {
const { logs, oldest, filter } = payload;
const pageSize = 100;
const page = 0;
const pages = Math.ceil(logs.length / pageSize);
const total = logs.length;
const rowsStart = pageSize * page;
const rowsEnd = (pageSize * page) + pageSize;
const logsSlice = logs.slice(rowsStart, rowsEnd);
const isFiltered = Object.keys(filter).some(key => filter[key]);
return {
...state,
oldest,
filter,
isFiltered,
pages,
total,
logs: logsSlice,
allLogs: logs,
processingGetLogs: false,
};
}, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/components/Logs/index.js |
<mask> {
<mask> Header: t('time_table_header'),
<mask> accessor: 'time',
<mask> maxWidth: 100,
<mask> filterable: false,
<mask> Cell: this.getTimeCell,
<mask> },
<mask> {
<mask> Header: t('domain_name_table_header'),
<mask> accessor: 'domain',
</s> + client: separate filters from the table component </s> remove [actions.setLogsFilter]: (state, { payload }) => (
{ ...state, filter: payload }
),
</s> add [actions.setLogsPage]: (state, { payload }) => ({
...state,
page: payload,
}),
[actions.setLogsFilterRequest]: state => ({ ...state, processingGetLogs: true }),
[actions.setLogsFilterFailure]: state => ({ ...state, processingGetLogs: false }),
[actions.setLogsFilterSuccess]: (state, { payload }) => {
const { logs, oldest, filter } = payload;
const pageSize = 100;
const page = 0;
const pages = Math.ceil(logs.length / pageSize);
const total = logs.length;
const rowsStart = pageSize * page;
const rowsEnd = (pageSize * page) + pageSize;
const logsSlice = logs.slice(rowsStart, rowsEnd);
const isFiltered = Object.keys(filter).some(key => filter[key]);
return {
...state,
oldest,
filter,
isFiltered,
pages,
total,
logs: logsSlice,
allLogs: logs,
processingGetLogs: false,
};
}, </s> remove handleLogsFiltering = debounce((older_than, filter, page, pageSize, filtered) => {
this.props.getLogs({
older_than,
filter,
page,
pageSize,
filtered,
});
}, DEBOUNCE_TIMEOUT);
</s> add </s> remove import { getLogs, getLogsConfig, setLogsPagination, setLogsFilter } from '../actions/queryLogs';
</s> add import { getLogs, getLogsConfig, setLogsPagination, setLogsFilter, setLogsPage } from '../actions/queryLogs'; </s> remove const { pageSize, page, pages } = state;
const { filter, oldest } = this.props.queryLogs;
</s> add const { pages } = state;
const {
filter, oldest, page,
} = this.props.queryLogs; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/components/Logs/index.js | |
<mask>
<mask> return (
<mask> <ReactTable
<mask> manual
<mask> filterable
<mask> minRows={5}
<mask> pages={pages}
<mask> columns={columns}
<mask> sortable={false}
<mask> data={logs || []}
</s> + client: separate filters from the table component </s> remove {enabled && !processingGetConfig && <Card>{this.renderLogs()}</Card>}
</s> add {enabled && !processingGetConfig && (
<Fragment>
<Card>
<Filters
filter={queryLogs.filter}
setLogsFilter={this.props.setLogsFilter}
/>
</Card>
<Card>{this.renderLogs()}</Card>
</Fragment>
)} </s> remove renderCurrentPage={() => false}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/components/Logs/index.js | |
page={page} | <mask> manual
<mask> minRows={5}
<mask> pages={pages}
<mask> columns={columns}
<mask> filterable={false}
<mask> sortable={false}
<mask> data={logs || []}
<mask> loading={isLoading}
</s> + client: separate filters from the table component </s> remove filterable
</s> add </s> remove processingGetLogs, processingGetConfig, logs, pages,
</s> add processingGetLogs, processingGetConfig, logs, pages, page, </s> remove renderCurrentPage={() => false}
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/components/Logs/index.js |
filterable={false} | <mask> pages={pages}
<mask> columns={columns}
<mask> sortable={false}
<mask> data={logs || []}
<mask> loading={isLoading}
<mask> showPagination={true}
</s> + client: separate filters from the table component </s> remove filterable
</s> add </s> remove onFilteredChange={this.handleFilterChange}
</s> add onPageChange={newPage => this.props.setLogsPage(newPage)} </s> remove processingGetLogs, processingGetConfig, logs, pages,
</s> add processingGetLogs, processingGetConfig, logs, pages, page, | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/components/Logs/index.js |
showPaginationTop={true} | <mask> sortable={false}
<mask> data={logs || []}
<mask> loading={isLoading}
<mask> showPagination={true}
<mask> showPageJump={false}
<mask> showPageSizeOptions={false}
<mask> onFetchData={this.fetchData}
<mask> onPageChange={newPage => this.props.setLogsPage(newPage)}
</s> + client: separate filters from the table component </s> remove onFilteredChange={this.handleFilterChange}
</s> add onPageChange={newPage => this.props.setLogsPage(newPage)} </s> remove filterable
</s> add </s> remove renderCurrentPage={() => false}
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/components/Logs/index.js |
onPageChange={newPage => this.props.setLogsPage(newPage)} | <mask> showPagination={true}
<mask> showPageJump={false}
<mask> showPageSizeOptions={false}
<mask> onFetchData={this.fetchData}
<mask> onFilteredChange={this.handleFilterChange}
<mask> className="logs__table"
<mask> defaultPageSize={TABLE_DEFAULT_PAGE_SIZE}
<mask> previousText={t('previous_btn')}
<mask> nextText={t('next_btn')}
<mask> loadingText={t('loading_table_status')}
</s> + client: separate filters from the table component </s> remove const { pageSize, page, pages } = state;
const { filter, oldest } = this.props.queryLogs;
</s> add const { pages } = state;
const {
filter, oldest, page,
} = this.props.queryLogs; </s> remove handleLogsFiltering = debounce((older_than, filter, page, pageSize, filtered) => {
this.props.getLogs({
older_than,
filter,
page,
pageSize,
filtered,
});
}, DEBOUNCE_TIMEOUT);
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/components/Logs/index.js |
<mask> rowsText={t('rows_table_footer_text')}
<mask> noDataText={t('no_logs_found')}
<mask> pageText={''}
<mask> ofText={''}
<mask> renderCurrentPage={() => false}
<mask> renderTotalPagesCount={() => false}
<mask> defaultFilterMethod={(filter, row) => {
<mask> const id = filter.pivotId || filter.id;
<mask> return row[id] !== undefined
<mask> ? String(row[id]).indexOf(filter.value) !== -1
</s> + client: separate filters from the table component </s> remove getFilterInput = ({ filter, onChange }) => (
<Fragment>
<div className="logs__input-wrap">
<input
type="text"
className="form-control"
onChange={event => onChange(event.target.value)}
value={filter ? filter.value : ''}
/>
<span className="logs__notice">
<Tooltip text={this.props.t('query_log_strict_search')} type='tooltip-custom--logs' />
</span>
</div>
</Fragment>
);
getFilters = (filtered) => {
const filteredObj = filtered.reduce((acc, cur) => ({ ...acc, [cur.id]: cur.value }), {});
const {
domain, client, type, response,
} = filteredObj;
return {
filter_domain: domain || '',
filter_client: client || '',
filter_question_type: isValidQuestionType(type) ? type.toUpperCase() : '',
filter_response_status: response === RESPONSE_FILTER.FILTERED ? response : '',
};
};
</s> add </s> remove logs, oldest, older_than, page, pageSize, filtered,
</s> add logs, oldest, older_than, page, pageSize, </s> remove [actions.setLogsFilter]: (state, { payload }) => (
{ ...state, filter: payload }
),
</s> add [actions.setLogsPage]: (state, { payload }) => ({
...state,
page: payload,
}),
[actions.setLogsFilterRequest]: state => ({ ...state, processingGetLogs: true }),
[actions.setLogsFilterFailure]: state => ({ ...state, processingGetLogs: false }),
[actions.setLogsFilterSuccess]: (state, { payload }) => {
const { logs, oldest, filter } = payload;
const pageSize = 100;
const page = 0;
const pages = Math.ceil(logs.length / pageSize);
const total = logs.length;
const rowsStart = pageSize * page;
const rowsEnd = (pageSize * page) + pageSize;
const logsSlice = logs.slice(rowsStart, rowsEnd);
const isFiltered = Object.keys(filter).some(key => filter[key]);
return {
...state,
oldest,
filter,
isFiltered,
pages,
total,
logs: logsSlice,
allLogs: logs,
processingGetLogs: false,
};
}, </s> remove processingGetLogs, processingGetConfig, logs, pages,
</s> add processingGetLogs, processingGetConfig, logs, pages, page, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/components/Logs/index.js | |
{enabled && !processingGetConfig && (
<Fragment>
<Card>
<Filters
filter={queryLogs.filter}
setLogsFilter={this.props.setLogsFilter}
/>
</Card>
<Card>{this.renderLogs()}</Card>
</Fragment>
)} | <mask> return (
<mask> <Fragment>
<mask> <PageTitle title={t('query_log')}>{refreshButton}</PageTitle>
<mask> {enabled && processingGetConfig && <Loading />}
<mask> {enabled && !processingGetConfig && <Card>{this.renderLogs()}</Card>}
<mask> {!enabled && !processingGetConfig && (
<mask> <Card>
<mask> <div className="lead text-center py-6">
<mask> <Trans
<mask> components={[
</s> + client: separate filters from the table component </s> remove getFilterInput = ({ filter, onChange }) => (
<Fragment>
<div className="logs__input-wrap">
<input
type="text"
className="form-control"
onChange={event => onChange(event.target.value)}
value={filter ? filter.value : ''}
/>
<span className="logs__notice">
<Tooltip text={this.props.t('query_log_strict_search')} type='tooltip-custom--logs' />
</span>
</div>
</Fragment>
);
getFilters = (filtered) => {
const filteredObj = filtered.reduce((acc, cur) => ({ ...acc, [cur.id]: cur.value }), {});
const {
domain, client, type, response,
} = filteredObj;
return {
filter_domain: domain || '',
filter_client: client || '',
filter_question_type: isValidQuestionType(type) ? type.toUpperCase() : '',
filter_response_status: response === RESPONSE_FILTER.FILTERED ? response : '',
};
};
</s> add </s> remove this.getLogs(oldest, filter, page, pageSize, false);
</s> add this.getLogs(oldest, filter, page); </s> remove handleLogsFiltering = debounce((older_than, filter, page, pageSize, filtered) => {
this.props.getLogs({
older_than,
filter,
page,
pageSize,
filtered,
});
}, DEBOUNCE_TIMEOUT);
</s> add </s> remove const { pageSize, page, pages } = state;
const { filter, oldest } = this.props.queryLogs;
</s> add const { pages } = state;
const {
filter, oldest, page,
} = this.props.queryLogs; </s> remove filterable
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/components/Logs/index.js |
setLogsPage: PropTypes.func.isRequired, | <mask> getLogsConfig: PropTypes.func.isRequired,
<mask> setLogsPagination: PropTypes.func.isRequired,
<mask> setLogsFilter: PropTypes.func.isRequired,
<mask> t: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(Logs);
</s> + client: separate filters from the table component | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/components/Logs/index.js |
width: 255px; | <mask> bottom: initial;
<mask> top: calc(100% + 10px);
<mask> right: -10px;
<mask> left: initial;
<mask> transform: none;
<mask> }
<mask>
<mask> .tooltip-custom--logs:after {
<mask> top: 8px;
<mask> border-top: none;
</s> + client: separate filters from the table component </s> remove this.getLogs(oldest, filter, page, pageSize, false);
</s> add this.getLogs(oldest, filter, page); </s> remove const { pageSize, page, pages } = state;
const { filter, oldest } = this.props.queryLogs;
</s> add const { pages } = state;
const {
filter, oldest, page,
} = this.props.queryLogs; </s> remove getFilterInput = ({ filter, onChange }) => (
<Fragment>
<div className="logs__input-wrap">
<input
type="text"
className="form-control"
onChange={event => onChange(event.target.value)}
value={filter ? filter.value : ''}
/>
<span className="logs__notice">
<Tooltip text={this.props.t('query_log_strict_search')} type='tooltip-custom--logs' />
</span>
</div>
</Fragment>
);
getFilters = (filtered) => {
const filteredObj = filtered.reduce((acc, cur) => ({ ...acc, [cur.id]: cur.value }), {});
const {
domain, client, type, response,
} = filteredObj;
return {
filter_domain: domain || '',
filter_client: client || '',
filter_question_type: isValidQuestionType(type) ? type.toUpperCase() : '',
filter_response_status: response === RESPONSE_FILTER.FILTERED ? response : '',
};
};
</s> add </s> remove isValidQuestionType,
</s> add </s> remove import { getLogs, getLogsConfig, setLogsPagination, setLogsFilter } from '../actions/queryLogs';
</s> add import { getLogs, getLogsConfig, setLogsPagination, setLogsFilter, setLogsPage } from '../actions/queryLogs'; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/components/ui/Tooltip.css |
import { getLogs, getLogsConfig, setLogsPagination, setLogsFilter, setLogsPage } from '../actions/queryLogs'; | <mask> import { connect } from 'react-redux';
<mask> import { addSuccessToast, getClients } from '../actions';
<mask> import { getFilteringStatus, setRules } from '../actions/filtering';
<mask> import { getLogs, getLogsConfig, setLogsPagination, setLogsFilter } from '../actions/queryLogs';
<mask> import Logs from '../components/Logs';
<mask>
<mask> const mapStateToProps = (state) => {
<mask> const { queryLogs, dashboard, filtering } = state;
<mask> const props = { queryLogs, dashboard, filtering };
</s> + client: separate filters from the table component </s> remove isValidQuestionType,
</s> add </s> remove import { SERVICES, FILTERED_STATUS, DEBOUNCE_TIMEOUT, DEFAULT_LOGS_FILTER } from '../../helpers/constants';
</s> add import { SERVICES, FILTERED_STATUS, DEFAULT_LOGS_FILTER, RESPONSE_FILTER, TABLE_DEFAULT_PAGE_SIZE } from '../../helpers/constants'; </s> remove import debounce from 'lodash/debounce';
</s> add </s> remove export const setLogsFilter = createAction('LOGS_FILTER');
</s> add export const setLogsPage = createAction('SET_LOG_PAGE'); | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/containers/Logs.js |
setLogsPage, | <mask> getLogsConfig,
<mask> setLogsPagination,
<mask> setLogsFilter,
<mask> };
<mask>
<mask> export default connect(
<mask> mapStateToProps,
<mask> mapDispatchToProps,
<mask> )(Logs);
</s> + client: separate filters from the table component </s> remove import { getLogs, getLogsConfig, setLogsPagination, setLogsFilter } from '../actions/queryLogs';
</s> add import { getLogs, getLogsConfig, setLogsPagination, setLogsFilter, setLogsPage } from '../actions/queryLogs'; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/containers/Logs.js |
export const DEBOUNCE_FILTER_TIMEOUT = 500; | <mask> export const EMPTY_DATE = '0001-01-01T00:00:00Z';
<mask>
<mask> export const DEBOUNCE_TIMEOUT = 300;
<mask> export const CHECK_TIMEOUT = 1000;
<mask> export const STOP_TIMEOUT = 10000;
<mask>
<mask> export const UNSAFE_PORTS = [
<mask> 1,
</s> + client: separate filters from the table component </s> remove export const setLogsFilter = createAction('LOGS_FILTER');
</s> add export const setLogsPage = createAction('SET_LOG_PAGE'); </s> remove const { filter, older_than } = config;
const rawLogs = await apiClient.getQueryLog({ ...filter, older_than });
const { data, oldest } = rawLogs;
const logs = normalizeLogs(data);
dispatch(getLogsSuccess({
logs, oldest, filter, ...config,
}));
</s> add const logs = await getLogsWithParams(config);
dispatch(getLogsSuccess(logs)); </s> remove processingGetLogs, processingGetConfig, logs, pages,
</s> add processingGetLogs, processingGetConfig, logs, pages, page, | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/helpers/constants.js |
[actions.setLogsPage]: (state, { payload }) => ({
...state,
page: payload,
}),
[actions.setLogsFilterRequest]: state => ({ ...state, processingGetLogs: true }),
[actions.setLogsFilterFailure]: state => ({ ...state, processingGetLogs: false }),
[actions.setLogsFilterSuccess]: (state, { payload }) => {
const { logs, oldest, filter } = payload;
const pageSize = 100;
const page = 0;
const pages = Math.ceil(logs.length / pageSize);
const total = logs.length;
const rowsStart = pageSize * page;
const rowsEnd = (pageSize * page) + pageSize;
const logsSlice = logs.slice(rowsStart, rowsEnd);
const isFiltered = Object.keys(filter).some(key => filter[key]);
return {
...state,
oldest,
filter,
isFiltered,
pages,
total,
logs: logsSlice,
allLogs: logs,
processingGetLogs: false,
};
}, | <mask> logs: logsSlice,
<mask> };
<mask> },
<mask>
<mask> [actions.setLogsFilter]: (state, { payload }) => (
<mask> { ...state, filter: payload }
<mask> ),
<mask>
<mask> [actions.getLogsRequest]: state => ({ ...state, processingGetLogs: true }),
<mask> [actions.getLogsFailure]: state => ({ ...state, processingGetLogs: false }),
<mask> [actions.getLogsSuccess]: (state, { payload }) => {
<mask> const {
</s> + client: separate filters from the table component </s> remove logs, oldest, older_than, page, pageSize, filtered,
</s> add logs, oldest, older_than, page, pageSize, </s> remove getFilterInput = ({ filter, onChange }) => (
<Fragment>
<div className="logs__input-wrap">
<input
type="text"
className="form-control"
onChange={event => onChange(event.target.value)}
value={filter ? filter.value : ''}
/>
<span className="logs__notice">
<Tooltip text={this.props.t('query_log_strict_search')} type='tooltip-custom--logs' />
</span>
</div>
</Fragment>
);
getFilters = (filtered) => {
const filteredObj = filtered.reduce((acc, cur) => ({ ...acc, [cur.id]: cur.value }), {});
const {
domain, client, type, response,
} = filteredObj;
return {
filter_domain: domain || '',
filter_client: client || '',
filter_question_type: isValidQuestionType(type) ? type.toUpperCase() : '',
filter_response_status: response === RESPONSE_FILTER.FILTERED ? response : '',
};
};
</s> add </s> remove handleLogsFiltering = debounce((older_than, filter, page, pageSize, filtered) => {
this.props.getLogs({
older_than,
filter,
page,
pageSize,
filtered,
});
}, DEBOUNCE_TIMEOUT);
</s> add </s> remove const { pageSize, page, pages } = state;
const { filter, oldest } = this.props.queryLogs;
</s> add const { pages } = state;
const {
filter, oldest, page,
} = this.props.queryLogs; </s> remove older_than, filter, page, pageSize, filtered,
</s> add older_than, filter, page, pageSize: TABLE_DEFAULT_PAGE_SIZE, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/reducers/queryLogs.js |
logs, oldest, older_than, page, pageSize, | <mask> [actions.getLogsRequest]: state => ({ ...state, processingGetLogs: true }),
<mask> [actions.getLogsFailure]: state => ({ ...state, processingGetLogs: false }),
<mask> [actions.getLogsSuccess]: (state, { payload }) => {
<mask> const {
<mask> logs, oldest, older_than, page, pageSize, filtered,
<mask> } = payload;
<mask> let logsWithOffset = state.allLogs.length > 0 ? state.allLogs : logs;
<mask> let allLogs = logs;
<mask>
<mask> if (older_than) {
</s> + client: separate filters from the table component </s> remove [actions.setLogsFilter]: (state, { payload }) => (
{ ...state, filter: payload }
),
</s> add [actions.setLogsPage]: (state, { payload }) => ({
...state,
page: payload,
}),
[actions.setLogsFilterRequest]: state => ({ ...state, processingGetLogs: true }),
[actions.setLogsFilterFailure]: state => ({ ...state, processingGetLogs: false }),
[actions.setLogsFilterSuccess]: (state, { payload }) => {
const { logs, oldest, filter } = payload;
const pageSize = 100;
const page = 0;
const pages = Math.ceil(logs.length / pageSize);
const total = logs.length;
const rowsStart = pageSize * page;
const rowsEnd = (pageSize * page) + pageSize;
const logsSlice = logs.slice(rowsStart, rowsEnd);
const isFiltered = Object.keys(filter).some(key => filter[key]);
return {
...state,
oldest,
filter,
isFiltered,
pages,
total,
logs: logsSlice,
allLogs: logs,
processingGetLogs: false,
};
}, </s> remove } else if (filtered) {
logsWithOffset = logs;
allLogs = logs;
</s> add </s> remove getFilterInput = ({ filter, onChange }) => (
<Fragment>
<div className="logs__input-wrap">
<input
type="text"
className="form-control"
onChange={event => onChange(event.target.value)}
value={filter ? filter.value : ''}
/>
<span className="logs__notice">
<Tooltip text={this.props.t('query_log_strict_search')} type='tooltip-custom--logs' />
</span>
</div>
</Fragment>
);
getFilters = (filtered) => {
const filteredObj = filtered.reduce((acc, cur) => ({ ...acc, [cur.id]: cur.value }), {});
const {
domain, client, type, response,
} = filteredObj;
return {
filter_domain: domain || '',
filter_client: client || '',
filter_question_type: isValidQuestionType(type) ? type.toUpperCase() : '',
filter_response_status: response === RESPONSE_FILTER.FILTERED ? response : '',
};
};
</s> add </s> remove older_than, filter, page, pageSize, filtered,
</s> add older_than, filter, page, pageSize: TABLE_DEFAULT_PAGE_SIZE, </s> remove getLogs = (older_than, filter, page, pageSize, filtered) => {
</s> add getLogs = (older_than, filter, page) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/reducers/queryLogs.js |
<mask>
<mask> if (older_than) {
<mask> logsWithOffset = [...state.allLogs, ...logs];
<mask> allLogs = [...state.allLogs, ...logs];
<mask> } else if (filtered) {
<mask> logsWithOffset = logs;
<mask> allLogs = logs;
<mask> }
<mask>
<mask> const pages = Math.ceil(logsWithOffset.length / pageSize);
<mask> const total = logsWithOffset.length;
<mask> const rowsStart = pageSize * page;
</s> + client: separate filters from the table component </s> remove logs, oldest, older_than, page, pageSize, filtered,
</s> add logs, oldest, older_than, page, pageSize, </s> remove [actions.setLogsFilter]: (state, { payload }) => (
{ ...state, filter: payload }
),
</s> add [actions.setLogsPage]: (state, { payload }) => ({
...state,
page: payload,
}),
[actions.setLogsFilterRequest]: state => ({ ...state, processingGetLogs: true }),
[actions.setLogsFilterFailure]: state => ({ ...state, processingGetLogs: false }),
[actions.setLogsFilterSuccess]: (state, { payload }) => {
const { logs, oldest, filter } = payload;
const pageSize = 100;
const page = 0;
const pages = Math.ceil(logs.length / pageSize);
const total = logs.length;
const rowsStart = pageSize * page;
const rowsEnd = (pageSize * page) + pageSize;
const logsSlice = logs.slice(rowsStart, rowsEnd);
const isFiltered = Object.keys(filter).some(key => filter[key]);
return {
...state,
oldest,
filter,
isFiltered,
pages,
total,
logs: logsSlice,
allLogs: logs,
processingGetLogs: false,
};
}, </s> remove this.props.setLogsPagination({ page, pageSize });
</s> add this.props.setLogsPagination({ page, pageSize: TABLE_DEFAULT_PAGE_SIZE }); </s> remove const { pageSize, page, pages } = state;
const { filter, oldest } = this.props.queryLogs;
</s> add const { pages } = state;
const {
filter, oldest, page,
} = this.props.queryLogs; </s> remove this.getLogs(oldest, filter, page, pageSize, false);
</s> add this.getLogs(oldest, filter, page); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/reducers/queryLogs.js | |
page: 0, | <mask> logs: [],
<mask> interval: 1,
<mask> allLogs: [],
<mask> pages: 0,
<mask> total: 0,
<mask> enabled: true,
<mask> oldest: '',
<mask> filter: DEFAULT_LOGS_FILTER,
</s> + client: separate filters from the table component </s> remove [actions.setLogsFilter]: (state, { payload }) => (
{ ...state, filter: payload }
),
</s> add [actions.setLogsPage]: (state, { payload }) => ({
...state,
page: payload,
}),
[actions.setLogsFilterRequest]: state => ({ ...state, processingGetLogs: true }),
[actions.setLogsFilterFailure]: state => ({ ...state, processingGetLogs: false }),
[actions.setLogsFilterSuccess]: (state, { payload }) => {
const { logs, oldest, filter } = payload;
const pageSize = 100;
const page = 0;
const pages = Math.ceil(logs.length / pageSize);
const total = logs.length;
const rowsStart = pageSize * page;
const rowsEnd = (pageSize * page) + pageSize;
const logsSlice = logs.slice(rowsStart, rowsEnd);
const isFiltered = Object.keys(filter).some(key => filter[key]);
return {
...state,
oldest,
filter,
isFiltered,
pages,
total,
logs: logsSlice,
allLogs: logs,
processingGetLogs: false,
};
}, </s> remove getFilterInput = ({ filter, onChange }) => (
<Fragment>
<div className="logs__input-wrap">
<input
type="text"
className="form-control"
onChange={event => onChange(event.target.value)}
value={filter ? filter.value : ''}
/>
<span className="logs__notice">
<Tooltip text={this.props.t('query_log_strict_search')} type='tooltip-custom--logs' />
</span>
</div>
</Fragment>
);
getFilters = (filtered) => {
const filteredObj = filtered.reduce((acc, cur) => ({ ...acc, [cur.id]: cur.value }), {});
const {
domain, client, type, response,
} = filteredObj;
return {
filter_domain: domain || '',
filter_client: client || '',
filter_question_type: isValidQuestionType(type) ? type.toUpperCase() : '',
filter_response_status: response === RESPONSE_FILTER.FILTERED ? response : '',
};
};
</s> add </s> remove const TABLE_DEFAULT_PAGE_SIZE = 100;
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/reducers/queryLogs.js |
isFiltered: false, | <mask> enabled: true,
<mask> oldest: '',
<mask> filter: DEFAULT_LOGS_FILTER,
<mask> },
<mask> );
<mask>
<mask> export default queryLogs;
</s> + client: separate filters from the table component </s> remove getFilterInput = ({ filter, onChange }) => (
<Fragment>
<div className="logs__input-wrap">
<input
type="text"
className="form-control"
onChange={event => onChange(event.target.value)}
value={filter ? filter.value : ''}
/>
<span className="logs__notice">
<Tooltip text={this.props.t('query_log_strict_search')} type='tooltip-custom--logs' />
</span>
</div>
</Fragment>
);
getFilters = (filtered) => {
const filteredObj = filtered.reduce((acc, cur) => ({ ...acc, [cur.id]: cur.value }), {});
const {
domain, client, type, response,
} = filteredObj;
return {
filter_domain: domain || '',
filter_client: client || '',
filter_question_type: isValidQuestionType(type) ? type.toUpperCase() : '',
filter_response_status: response === RESPONSE_FILTER.FILTERED ? response : '',
};
};
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e243e69a6e9b2fae677ad4b3647fb1074675c95c | client/src/reducers/queryLogs.js |
d: dnsfilter.New(nil), | <mask> func setupPlugin(c *caddy.Controller) (*plug, error) {
<mask> // create new Plugin and copy default values
<mask> p := &plug{
<mask> settings: defaultPluginSettings,
<mask> d: dnsfilter.New(),
<mask> }
<mask>
<mask> log.Println("Initializing the CoreDNS plugin")
<mask>
<mask> for c.Next() {
</s> dnsfilter -- Add parameter to New() to supply optional initial config. </s> remove dnsFilter := dnsfilter.New()
</s> add dnsFilter := dnsfilter.New(&new.Config) // sets safebrowsing, safesearch and parental </s> remove func New() *Dnsfilter {
</s> add func New(c *Config) *Dnsfilter { </s> remove s.dnsFilter = dnsfilter.New()
</s> add s.dnsFilter = dnsfilter.New(nil) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e26837d9e87223a477fd8beb3151d98eeb52c5cd | coredns_plugin/coredns_plugin.go |
func New(c *Config) *Dnsfilter { | <mask> // lifecycle helper functions
<mask> //
<mask>
<mask> // New creates properly initialized DNS Filter that is ready to be used
<mask> func New() *Dnsfilter {
<mask> d := new(Dnsfilter)
<mask>
<mask> d.storage = make(map[string]bool)
<mask> d.important = newRulesTable()
<mask> d.whiteList = newRulesTable()
</s> dnsfilter -- Add parameter to New() to supply optional initial config. </s> remove d: dnsfilter.New(),
</s> add d: dnsfilter.New(nil), </s> remove dnsFilter := dnsfilter.New()
</s> add dnsFilter := dnsfilter.New(&new.Config) // sets safebrowsing, safesearch and parental </s> remove s.dnsFilter = dnsfilter.New()
</s> add s.dnsFilter = dnsfilter.New(nil) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e26837d9e87223a477fd8beb3151d98eeb52c5cd | dnsfilter/dnsfilter.go |
if c != nil {
d.Config = *c
} | <mask> Timeout: defaultHTTPTimeout,
<mask> }
<mask> d.safeBrowsingServer = defaultSafebrowsingServer
<mask> d.parentalServer = defaultParentalServer
<mask>
<mask> return d
<mask> }
<mask>
<mask> // Destroy is optional if you want to tidy up goroutines without waiting for them to die off
<mask> // right now it closes idle HTTP connections if there are any
</s> dnsfilter -- Add parameter to New() to supply optional initial config. </s> remove func New() *Dnsfilter {
</s> add func New(c *Config) *Dnsfilter { </s> remove s.dnsFilter = dnsfilter.New()
</s> add s.dnsFilter = dnsfilter.New(nil) </s> remove dnsFilter := dnsfilter.New()
</s> add dnsFilter := dnsfilter.New(&new.Config) // sets safebrowsing, safesearch and parental </s> remove d: dnsfilter.New(),
</s> add d: dnsfilter.New(nil), | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e26837d9e87223a477fd8beb3151d98eeb52c5cd | dnsfilter/dnsfilter.go |
s.dnsFilter = dnsfilter.New(nil) | <mask> }
<mask>
<mask> if s.dnsFilter == nil {
<mask> log.Printf("Creating dnsfilter")
<mask> s.dnsFilter = dnsfilter.New()
<mask> }
<mask>
<mask> go s.packetLoop()
<mask>
<mask> return nil
</s> dnsfilter -- Add parameter to New() to supply optional initial config. </s> remove dnsFilter := dnsfilter.New()
</s> add dnsFilter := dnsfilter.New(&new.Config) // sets safebrowsing, safesearch and parental </s> remove d: dnsfilter.New(),
</s> add d: dnsfilter.New(nil), </s> remove func New() *Dnsfilter {
</s> add func New(c *Config) *Dnsfilter { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e26837d9e87223a477fd8beb3151d98eeb52c5cd | dnsforward/dnsforward.go |
dnsFilter := dnsfilter.New(&new.Config) // sets safebrowsing, safesearch and parental | <mask> // they're exactly the same, do nothing
<mask> return
<mask> }
<mask>
<mask> dnsFilter := dnsfilter.New()
<mask> for _, f := range newFilters {
<mask> for _, rule := range f.Rules {
<mask> err := dnsFilter.AddRule(rule, f.ID)
<mask> if err == dnsfilter.ErrAlreadyExists || err == dnsfilter.ErrInvalidSyntax {
<mask> continue
</s> dnsfilter -- Add parameter to New() to supply optional initial config. </s> remove d: dnsfilter.New(),
</s> add d: dnsfilter.New(nil), </s> remove s.dnsFilter = dnsfilter.New()
</s> add s.dnsFilter = dnsfilter.New(nil) </s> remove func New() *Dnsfilter {
</s> add func New(c *Config) *Dnsfilter { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e26837d9e87223a477fd8beb3151d98eeb52c5cd | dnsforward/dnsforward.go |
func handleFilteringStatus(w http.ResponseWriter, r *http.Request) { | <mask> UserRules []string `json:"user_rules"`
<mask> }
<mask>
<mask> // Get filtering configuration
<mask> func handleFilteringInfo(w http.ResponseWriter, r *http.Request) {
<mask> resp := filteringConfig{}
<mask> config.RLock()
<mask> resp.Enabled = config.DNS.FilteringEnabled
<mask> resp.Interval = config.DNS.FiltersUpdateIntervalHours
<mask> for _, f := range config.Filters {
</s> * API changes
* filtering_info -> filtering/status
* filtering_config -> filtering/config </s> remove err := json.NewDecoder(r.Body).Decode(&req)
if err != nil {
httpError(r, w, http.StatusBadRequest, "json decode: %s", err)
return
}
</s> add q := r.URL.Query()
req.olderThan = q.Get("older_than")
req.filterDomain = q.Get("filter_domain")
req.filterClient = q.Get("filter_client")
req.filterQuestionType = q.Get("filter_question_type")
req.filterResponseStatus = q.Get("filter_response_status") </s> remove if len(req.Filter.QuestionType) != 0 {
qtype, ok := dns.StringToType[req.Filter.QuestionType]
</s> add if len(req.filterQuestionType) != 0 {
qtype, ok := dns.StringToType[req.filterQuestionType] </s> remove OlderThan string `json:"older_than"`
Filter filterJSON `json:"filter"`
</s> add olderThan string
filterDomain string
filterClient string
filterQuestionType string
filterResponseStatus string </s> remove Domain: req.Filter.Domain,
Client: req.Filter.Client,
</s> add Domain: req.filterDomain,
Client: req.filterClient, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e2c26ec554e4cf38b424fc02c1369a6768ef78ab | home/control_filtering.go |
httpRegister(http.MethodGet, "/control/filtering/status", handleFilteringStatus)
httpRegister(http.MethodPost, "/control/filtering/config", handleFilteringConfig) | <mask> }
<mask>
<mask> // RegisterFilteringHandlers - register handlers
<mask> func RegisterFilteringHandlers() {
<mask> httpRegister(http.MethodGet, "/control/filtering_info", handleFilteringInfo)
<mask> httpRegister(http.MethodPost, "/control/filtering_config", handleFilteringConfig)
<mask> httpRegister(http.MethodPost, "/control/filtering/add_url", handleFilteringAddURL)
<mask> httpRegister(http.MethodPost, "/control/filtering/remove_url", handleFilteringRemoveURL)
<mask> httpRegister(http.MethodPost, "/control/filtering/set_url", handleFilteringSetURL)
<mask> httpRegister(http.MethodPost, "/control/filtering/refresh", handleFilteringRefresh)
<mask> httpRegister(http.MethodPost, "/control/filtering/set_rules", handleFilteringSetRules)
</s> * API changes
* filtering_info -> filtering/status
* filtering_config -> filtering/config </s> remove l.conf.HTTPRegister("POST", "/control/querylog", l.handleQueryLog)
</s> add l.conf.HTTPRegister("GET", "/control/querylog", l.handleQueryLog) </s> remove func handleFilteringInfo(w http.ResponseWriter, r *http.Request) {
</s> add func handleFilteringStatus(w http.ResponseWriter, r *http.Request) { </s> remove OlderThan string `json:"older_than"`
Filter filterJSON `json:"filter"`
</s> add olderThan string
filterDomain string
filterClient string
filterQuestionType string
filterResponseStatus string </s> remove err := json.NewDecoder(r.Body).Decode(&req)
if err != nil {
httpError(r, w, http.StatusBadRequest, "json decode: %s", err)
return
}
</s> add q := r.URL.Query()
req.olderThan = q.Get("older_than")
req.filterDomain = q.Get("filter_domain")
req.filterClient = q.Get("filter_client")
req.filterQuestionType = q.Get("filter_question_type")
req.filterResponseStatus = q.Get("filter_response_status") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e2c26ec554e4cf38b424fc02c1369a6768ef78ab | home/control_filtering.go |
get: | <mask> # Query log methods
<mask> # --------------------------------------------------
<mask>
<mask> /querylog:
<mask> post:
<mask> tags:
<mask> - log
<mask> operationId: queryLog
<mask> summary: 'Get DNS server query log'
<mask> parameters:
</s> * API changes
* filtering_info -> filtering/status
* filtering_config -> filtering/config </s> remove /filtering_info:
</s> add /filtering/status: </s> remove - in: "body"
name: "body"
schema:
$ref: '#/definitions/QueryLogRequest'
</s> add - name: older_than
in: query
type: string
- name: filter_domain
in: query
type: string
description: "Filter by domain name"
- name: filter_client
in: query
type: string
description: "Filter by client"
- name: filter_question_type
in: query
type: string
description: "Filter by question type"
- name: filter_response_status
in: query
type: string
description: "Filter by response status"
enum:
-
- filtered </s> remove /filtering_config:
</s> add /filtering/config: </s> remove operationId: filteringInfo
</s> add operationId: filteringStatus </s> remove QueryLogRequest:
type: "object"
description: "Query log request data"
properties:
offset:
type: "integer"
example: 1234
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e2c26ec554e4cf38b424fc02c1369a6768ef78ab | openapi/openapi.yaml |
- name: older_than
in: query
type: string
- name: filter_domain
in: query
type: string
description: "Filter by domain name"
- name: filter_client
in: query
type: string
description: "Filter by client"
- name: filter_question_type
in: query
type: string
description: "Filter by question type"
- name: filter_response_status
in: query
type: string
description: "Filter by response status"
enum:
-
- filtered | <mask> - log
<mask> operationId: queryLog
<mask> summary: 'Get DNS server query log'
<mask> parameters:
<mask> - in: "body"
<mask> name: "body"
<mask> schema:
<mask> $ref: '#/definitions/QueryLogRequest'
<mask> responses:
<mask> 200:
<mask> description: OK
<mask> schema:
<mask> $ref: '#/definitions/QueryLog'
</s> * API changes
* filtering_info -> filtering/status
* filtering_config -> filtering/config </s> remove post:
</s> add get: </s> remove $ref: "#/definitions/FilterInfo"
</s> add $ref: "#/definitions/FilterStatus" </s> remove operationId: filteringInfo
</s> add operationId: filteringStatus </s> remove /filtering_config:
</s> add /filtering/config: </s> remove QueryLogRequest:
type: "object"
description: "Query log request data"
properties:
offset:
type: "integer"
example: 1234
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e2c26ec554e4cf38b424fc02c1369a6768ef78ab | openapi/openapi.yaml |
/filtering/status: | <mask> # --------------------------------------------------
<mask> # Filtering status methods
<mask> # --------------------------------------------------
<mask>
<mask> /filtering_info:
<mask> get:
<mask> tags:
<mask> - filtering
<mask> operationId: filteringInfo
<mask> summary: 'Get filtering parameters'
</s> * API changes
* filtering_info -> filtering/status
* filtering_config -> filtering/config </s> remove post:
</s> add get: </s> remove operationId: filteringInfo
</s> add operationId: filteringStatus </s> remove /filtering_config:
</s> add /filtering/config: </s> remove $ref: "#/definitions/FilterInfo"
</s> add $ref: "#/definitions/FilterStatus" </s> remove - in: "body"
name: "body"
schema:
$ref: '#/definitions/QueryLogRequest'
</s> add - name: older_than
in: query
type: string
- name: filter_domain
in: query
type: string
description: "Filter by domain name"
- name: filter_client
in: query
type: string
description: "Filter by client"
- name: filter_question_type
in: query
type: string
description: "Filter by question type"
- name: filter_response_status
in: query
type: string
description: "Filter by response status"
enum:
-
- filtered | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e2c26ec554e4cf38b424fc02c1369a6768ef78ab | openapi/openapi.yaml |
operationId: filteringStatus | <mask> /filtering_info:
<mask> get:
<mask> tags:
<mask> - filtering
<mask> operationId: filteringInfo
<mask> summary: 'Get filtering parameters'
<mask> responses:
<mask> 200:
<mask> description: OK
<mask> schema:
</s> * API changes
* filtering_info -> filtering/status
* filtering_config -> filtering/config </s> remove /filtering_info:
</s> add /filtering/status: </s> remove /filtering_config:
</s> add /filtering/config: </s> remove $ref: "#/definitions/FilterInfo"
</s> add $ref: "#/definitions/FilterStatus" </s> remove - in: "body"
name: "body"
schema:
$ref: '#/definitions/QueryLogRequest'
</s> add - name: older_than
in: query
type: string
- name: filter_domain
in: query
type: string
description: "Filter by domain name"
- name: filter_client
in: query
type: string
description: "Filter by client"
- name: filter_question_type
in: query
type: string
description: "Filter by question type"
- name: filter_response_status
in: query
type: string
description: "Filter by response status"
enum:
-
- filtered </s> remove post:
</s> add get: | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e2c26ec554e4cf38b424fc02c1369a6768ef78ab | openapi/openapi.yaml |
$ref: "#/definitions/FilterStatus" | <mask> responses:
<mask> 200:
<mask> description: OK
<mask> schema:
<mask> $ref: "#/definitions/FilterInfo"
<mask>
<mask> /filtering_config:
<mask> post:
<mask> tags:
<mask> - filtering
</s> * API changes
* filtering_info -> filtering/status
* filtering_config -> filtering/config </s> remove /filtering_config:
</s> add /filtering/config: </s> remove operationId: filteringInfo
</s> add operationId: filteringStatus </s> remove - in: "body"
name: "body"
schema:
$ref: '#/definitions/QueryLogRequest'
</s> add - name: older_than
in: query
type: string
- name: filter_domain
in: query
type: string
description: "Filter by domain name"
- name: filter_client
in: query
type: string
description: "Filter by client"
- name: filter_question_type
in: query
type: string
description: "Filter by question type"
- name: filter_response_status
in: query
type: string
description: "Filter by response status"
enum:
-
- filtered </s> remove post:
</s> add get: </s> remove /filtering_info:
</s> add /filtering/status: | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e2c26ec554e4cf38b424fc02c1369a6768ef78ab | openapi/openapi.yaml |
/filtering/config: | <mask> description: OK
<mask> schema:
<mask> $ref: "#/definitions/FilterInfo"
<mask>
<mask> /filtering_config:
<mask> post:
<mask> tags:
<mask> - filtering
<mask> operationId: filteringConfig
<mask> summary: 'Set filtering parameters'
</s> * API changes
* filtering_info -> filtering/status
* filtering_config -> filtering/config </s> remove $ref: "#/definitions/FilterInfo"
</s> add $ref: "#/definitions/FilterStatus" </s> remove operationId: filteringInfo
</s> add operationId: filteringStatus </s> remove /filtering_info:
</s> add /filtering/status: </s> remove - in: "body"
name: "body"
schema:
$ref: '#/definitions/QueryLogRequest'
</s> add - name: older_than
in: query
type: string
- name: filter_domain
in: query
type: string
description: "Filter by domain name"
- name: filter_client
in: query
type: string
description: "Filter by client"
- name: filter_question_type
in: query
type: string
description: "Filter by question type"
- name: filter_response_status
in: query
type: string
description: "Filter by response status"
enum:
-
- filtered </s> remove post:
</s> add get: | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e2c26ec554e4cf38b424fc02c1369a6768ef78ab | openapi/openapi.yaml |
FilterStatus: | <mask> url:
<mask> type: "string"
<mask> example: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt"
<mask>
<mask> FilterInfo:
<mask> type: "object"
<mask> description: "Filtering settings"
<mask> properties:
<mask> enabled:
<mask> type: "boolean"
</s> * API changes
* filtering_info -> filtering/status
* filtering_config -> filtering/config </s> remove QueryLogRequest:
type: "object"
description: "Query log request data"
properties:
offset:
type: "integer"
example: 1234
</s> add </s> remove - in: "body"
name: "body"
schema:
$ref: '#/definitions/QueryLogRequest'
</s> add - name: older_than
in: query
type: string
- name: filter_domain
in: query
type: string
description: "Filter by domain name"
- name: filter_client
in: query
type: string
description: "Filter by client"
- name: filter_question_type
in: query
type: string
description: "Filter by question type"
- name: filter_response_status
in: query
type: string
description: "Filter by response status"
enum:
-
- filtered </s> remove $ref: "#/definitions/FilterInfo"
</s> add $ref: "#/definitions/FilterStatus" </s> remove /filtering_config:
</s> add /filtering/config: </s> remove operationId: filteringInfo
</s> add operationId: filteringStatus | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e2c26ec554e4cf38b424fc02c1369a6768ef78ab | openapi/openapi.yaml |
<mask> description: "Query log"
<mask> items:
<mask> $ref: "#/definitions/QueryLogItem"
<mask>
<mask> QueryLogRequest:
<mask> type: "object"
<mask> description: "Query log request data"
<mask> properties:
<mask> offset:
<mask> type: "integer"
<mask> example: 1234
<mask>
<mask> QueryLogConfig:
<mask> type: "object"
<mask> description: "Query log configuration"
<mask> properties:
<mask> enabled:
</s> * API changes
* filtering_info -> filtering/status
* filtering_config -> filtering/config </s> remove FilterInfo:
</s> add FilterStatus: </s> remove - in: "body"
name: "body"
schema:
$ref: '#/definitions/QueryLogRequest'
</s> add - name: older_than
in: query
type: string
- name: filter_domain
in: query
type: string
description: "Filter by domain name"
- name: filter_client
in: query
type: string
description: "Filter by client"
- name: filter_question_type
in: query
type: string
description: "Filter by question type"
- name: filter_response_status
in: query
type: string
description: "Filter by response status"
enum:
-
- filtered </s> remove $ref: "#/definitions/FilterInfo"
</s> add $ref: "#/definitions/FilterStatus" </s> remove post:
</s> add get: </s> remove /filtering_config:
</s> add /filtering/config: | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e2c26ec554e4cf38b424fc02c1369a6768ef78ab | openapi/openapi.yaml | |
<mask>
<mask> http.Error(w, text, code)
<mask> }
<mask>
<mask> type filterJSON struct {
<mask> Domain string `json:"domain"`
<mask> Client string `json:"client"`
<mask> QuestionType string `json:"question_type"`
<mask> ResponseStatus string `json:"response_status"`
<mask> }
<mask>
<mask> type request struct {
<mask> OlderThan string `json:"older_than"`
<mask> Filter filterJSON `json:"filter"`
<mask> }
<mask>
</s> * API changes
* filtering_info -> filtering/status
* filtering_config -> filtering/config </s> remove OlderThan string `json:"older_than"`
Filter filterJSON `json:"filter"`
</s> add olderThan string
filterDomain string
filterClient string
filterQuestionType string
filterResponseStatus string </s> remove - in: "body"
name: "body"
schema:
$ref: '#/definitions/QueryLogRequest'
</s> add - name: older_than
in: query
type: string
- name: filter_domain
in: query
type: string
description: "Filter by domain name"
- name: filter_client
in: query
type: string
description: "Filter by client"
- name: filter_question_type
in: query
type: string
description: "Filter by question type"
- name: filter_response_status
in: query
type: string
description: "Filter by response status"
enum:
-
- filtered </s> remove if len(req.Filter.ResponseStatus) != 0 {
switch req.Filter.ResponseStatus {
</s> add if len(req.filterResponseStatus) != 0 {
switch req.filterResponseStatus { </s> remove if len(req.OlderThan) != 0 {
params.OlderThan, err = time.Parse(time.RFC3339Nano, req.OlderThan)
</s> add if len(req.olderThan) != 0 {
params.OlderThan, err = time.Parse(time.RFC3339Nano, req.olderThan) </s> remove if len(req.Filter.QuestionType) != 0 {
qtype, ok := dns.StringToType[req.Filter.QuestionType]
</s> add if len(req.filterQuestionType) != 0 {
qtype, ok := dns.StringToType[req.filterQuestionType] | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e2c26ec554e4cf38b424fc02c1369a6768ef78ab | querylog/qlog_http.go | |
olderThan string
filterDomain string
filterClient string
filterQuestionType string
filterResponseStatus string | <mask> ResponseStatus string `json:"response_status"`
<mask> }
<mask>
<mask> type request struct {
<mask> OlderThan string `json:"older_than"`
<mask> Filter filterJSON `json:"filter"`
<mask> }
<mask>
<mask> // "value" -> value, return TRUE
<mask> func getDoubleQuotesEnclosedValue(s *string) bool {
<mask> t := *s
</s> * API changes
* filtering_info -> filtering/status
* filtering_config -> filtering/config </s> remove type filterJSON struct {
Domain string `json:"domain"`
Client string `json:"client"`
QuestionType string `json:"question_type"`
ResponseStatus string `json:"response_status"`
}
</s> add </s> remove func handleFilteringInfo(w http.ResponseWriter, r *http.Request) {
</s> add func handleFilteringStatus(w http.ResponseWriter, r *http.Request) { </s> remove l.conf.HTTPRegister("POST", "/control/querylog", l.handleQueryLog)
</s> add l.conf.HTTPRegister("GET", "/control/querylog", l.handleQueryLog) </s> remove if len(req.Filter.QuestionType) != 0 {
qtype, ok := dns.StringToType[req.Filter.QuestionType]
</s> add if len(req.filterQuestionType) != 0 {
qtype, ok := dns.StringToType[req.filterQuestionType] | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e2c26ec554e4cf38b424fc02c1369a6768ef78ab | querylog/qlog_http.go |
var err error | <mask> return false
<mask> }
<mask>
<mask> func (l *queryLog) handleQueryLog(w http.ResponseWriter, r *http.Request) {
<mask> req := request{}
<mask> q := r.URL.Query()
<mask> req.olderThan = q.Get("older_than")
<mask> req.filterDomain = q.Get("filter_domain")
</s> * API changes
* filtering_info -> filtering/status
* filtering_config -> filtering/config </s> remove err := json.NewDecoder(r.Body).Decode(&req)
if err != nil {
httpError(r, w, http.StatusBadRequest, "json decode: %s", err)
return
}
</s> add q := r.URL.Query()
req.olderThan = q.Get("older_than")
req.filterDomain = q.Get("filter_domain")
req.filterClient = q.Get("filter_client")
req.filterQuestionType = q.Get("filter_question_type")
req.filterResponseStatus = q.Get("filter_response_status") </s> remove func handleFilteringInfo(w http.ResponseWriter, r *http.Request) {
</s> add func handleFilteringStatus(w http.ResponseWriter, r *http.Request) { </s> remove l.conf.HTTPRegister("POST", "/control/querylog", l.handleQueryLog)
</s> add l.conf.HTTPRegister("GET", "/control/querylog", l.handleQueryLog) </s> remove if len(req.Filter.QuestionType) != 0 {
qtype, ok := dns.StringToType[req.Filter.QuestionType]
</s> add if len(req.filterQuestionType) != 0 {
qtype, ok := dns.StringToType[req.filterQuestionType] </s> remove Domain: req.Filter.Domain,
Client: req.Filter.Client,
</s> add Domain: req.filterDomain,
Client: req.filterClient, | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e2c26ec554e4cf38b424fc02c1369a6768ef78ab | querylog/qlog_http.go |
q := r.URL.Query()
req.olderThan = q.Get("older_than")
req.filterDomain = q.Get("filter_domain")
req.filterClient = q.Get("filter_client")
req.filterQuestionType = q.Get("filter_question_type")
req.filterResponseStatus = q.Get("filter_response_status") | <mask> }
<mask>
<mask> func (l *queryLog) handleQueryLog(w http.ResponseWriter, r *http.Request) {
<mask> req := request{}
<mask> err := json.NewDecoder(r.Body).Decode(&req)
<mask> if err != nil {
<mask> httpError(r, w, http.StatusBadRequest, "json decode: %s", err)
<mask> return
<mask> }
<mask>
<mask> params := getDataParams{
<mask> Domain: req.Filter.Domain,
<mask> Client: req.Filter.Client,
<mask> ResponseStatus: responseStatusAll,
</s> * API changes
* filtering_info -> filtering/status
* filtering_config -> filtering/config </s> remove Domain: req.Filter.Domain,
Client: req.Filter.Client,
</s> add Domain: req.filterDomain,
Client: req.filterClient, </s> remove if len(req.OlderThan) != 0 {
params.OlderThan, err = time.Parse(time.RFC3339Nano, req.OlderThan)
</s> add if len(req.olderThan) != 0 {
params.OlderThan, err = time.Parse(time.RFC3339Nano, req.olderThan) </s> remove if len(req.Filter.QuestionType) != 0 {
qtype, ok := dns.StringToType[req.Filter.QuestionType]
</s> add if len(req.filterQuestionType) != 0 {
qtype, ok := dns.StringToType[req.filterQuestionType] </s> remove func handleFilteringInfo(w http.ResponseWriter, r *http.Request) {
</s> add func handleFilteringStatus(w http.ResponseWriter, r *http.Request) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e2c26ec554e4cf38b424fc02c1369a6768ef78ab | querylog/qlog_http.go |
Domain: req.filterDomain,
Client: req.filterClient, | <mask> return
<mask> }
<mask>
<mask> params := getDataParams{
<mask> Domain: req.Filter.Domain,
<mask> Client: req.Filter.Client,
<mask> ResponseStatus: responseStatusAll,
<mask> }
<mask> if len(req.OlderThan) != 0 {
<mask> params.OlderThan, err = time.Parse(time.RFC3339Nano, req.OlderThan)
<mask> if err != nil {
</s> * API changes
* filtering_info -> filtering/status
* filtering_config -> filtering/config </s> remove if len(req.OlderThan) != 0 {
params.OlderThan, err = time.Parse(time.RFC3339Nano, req.OlderThan)
</s> add if len(req.olderThan) != 0 {
params.OlderThan, err = time.Parse(time.RFC3339Nano, req.olderThan) </s> remove err := json.NewDecoder(r.Body).Decode(&req)
if err != nil {
httpError(r, w, http.StatusBadRequest, "json decode: %s", err)
return
}
</s> add q := r.URL.Query()
req.olderThan = q.Get("older_than")
req.filterDomain = q.Get("filter_domain")
req.filterClient = q.Get("filter_client")
req.filterQuestionType = q.Get("filter_question_type")
req.filterResponseStatus = q.Get("filter_response_status") </s> remove if len(req.Filter.QuestionType) != 0 {
qtype, ok := dns.StringToType[req.Filter.QuestionType]
</s> add if len(req.filterQuestionType) != 0 {
qtype, ok := dns.StringToType[req.filterQuestionType] </s> remove if len(req.Filter.ResponseStatus) != 0 {
switch req.Filter.ResponseStatus {
</s> add if len(req.filterResponseStatus) != 0 {
switch req.filterResponseStatus { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e2c26ec554e4cf38b424fc02c1369a6768ef78ab | querylog/qlog_http.go |
if len(req.olderThan) != 0 {
params.OlderThan, err = time.Parse(time.RFC3339Nano, req.olderThan) | <mask> Domain: req.Filter.Domain,
<mask> Client: req.Filter.Client,
<mask> ResponseStatus: responseStatusAll,
<mask> }
<mask> if len(req.OlderThan) != 0 {
<mask> params.OlderThan, err = time.Parse(time.RFC3339Nano, req.OlderThan)
<mask> if err != nil {
<mask> httpError(r, w, http.StatusBadRequest, "invalid time stamp: %s", err)
<mask> return
<mask> }
<mask> }
</s> * API changes
* filtering_info -> filtering/status
* filtering_config -> filtering/config </s> remove Domain: req.Filter.Domain,
Client: req.Filter.Client,
</s> add Domain: req.filterDomain,
Client: req.filterClient, </s> remove err := json.NewDecoder(r.Body).Decode(&req)
if err != nil {
httpError(r, w, http.StatusBadRequest, "json decode: %s", err)
return
}
</s> add q := r.URL.Query()
req.olderThan = q.Get("older_than")
req.filterDomain = q.Get("filter_domain")
req.filterClient = q.Get("filter_client")
req.filterQuestionType = q.Get("filter_question_type")
req.filterResponseStatus = q.Get("filter_response_status") </s> remove if len(req.Filter.ResponseStatus) != 0 {
switch req.Filter.ResponseStatus {
</s> add if len(req.filterResponseStatus) != 0 {
switch req.filterResponseStatus { </s> remove if len(req.Filter.QuestionType) != 0 {
qtype, ok := dns.StringToType[req.Filter.QuestionType]
</s> add if len(req.filterQuestionType) != 0 {
qtype, ok := dns.StringToType[req.filterQuestionType] | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e2c26ec554e4cf38b424fc02c1369a6768ef78ab | querylog/qlog_http.go |
if len(req.filterQuestionType) != 0 {
qtype, ok := dns.StringToType[req.filterQuestionType] | <mask> if getDoubleQuotesEnclosedValue(¶ms.Client) {
<mask> params.StrictMatchClient = true
<mask> }
<mask>
<mask> if len(req.Filter.QuestionType) != 0 {
<mask> qtype, ok := dns.StringToType[req.Filter.QuestionType]
<mask> if !ok {
<mask> httpError(r, w, http.StatusBadRequest, "invalid question_type")
<mask> return
<mask> }
<mask> params.QuestionType = qtype
</s> * API changes
* filtering_info -> filtering/status
* filtering_config -> filtering/config </s> remove if len(req.Filter.ResponseStatus) != 0 {
switch req.Filter.ResponseStatus {
</s> add if len(req.filterResponseStatus) != 0 {
switch req.filterResponseStatus { </s> remove if len(req.OlderThan) != 0 {
params.OlderThan, err = time.Parse(time.RFC3339Nano, req.OlderThan)
</s> add if len(req.olderThan) != 0 {
params.OlderThan, err = time.Parse(time.RFC3339Nano, req.olderThan) </s> remove Domain: req.Filter.Domain,
Client: req.Filter.Client,
</s> add Domain: req.filterDomain,
Client: req.filterClient, </s> remove err := json.NewDecoder(r.Body).Decode(&req)
if err != nil {
httpError(r, w, http.StatusBadRequest, "json decode: %s", err)
return
}
</s> add q := r.URL.Query()
req.olderThan = q.Get("older_than")
req.filterDomain = q.Get("filter_domain")
req.filterClient = q.Get("filter_client")
req.filterQuestionType = q.Get("filter_question_type")
req.filterResponseStatus = q.Get("filter_response_status") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e2c26ec554e4cf38b424fc02c1369a6768ef78ab | querylog/qlog_http.go |
if len(req.filterResponseStatus) != 0 {
switch req.filterResponseStatus { | <mask> }
<mask> params.QuestionType = qtype
<mask> }
<mask>
<mask> if len(req.Filter.ResponseStatus) != 0 {
<mask> switch req.Filter.ResponseStatus {
<mask> case "filtered":
<mask> params.ResponseStatus = responseStatusFiltered
<mask> default:
<mask> httpError(r, w, http.StatusBadRequest, "invalid response_status")
<mask> return
</s> * API changes
* filtering_info -> filtering/status
* filtering_config -> filtering/config </s> remove if len(req.Filter.QuestionType) != 0 {
qtype, ok := dns.StringToType[req.Filter.QuestionType]
</s> add if len(req.filterQuestionType) != 0 {
qtype, ok := dns.StringToType[req.filterQuestionType] </s> remove if len(req.OlderThan) != 0 {
params.OlderThan, err = time.Parse(time.RFC3339Nano, req.OlderThan)
</s> add if len(req.olderThan) != 0 {
params.OlderThan, err = time.Parse(time.RFC3339Nano, req.olderThan) </s> remove err := json.NewDecoder(r.Body).Decode(&req)
if err != nil {
httpError(r, w, http.StatusBadRequest, "json decode: %s", err)
return
}
</s> add q := r.URL.Query()
req.olderThan = q.Get("older_than")
req.filterDomain = q.Get("filter_domain")
req.filterClient = q.Get("filter_client")
req.filterQuestionType = q.Get("filter_question_type")
req.filterResponseStatus = q.Get("filter_response_status") </s> remove Domain: req.Filter.Domain,
Client: req.Filter.Client,
</s> add Domain: req.filterDomain,
Client: req.filterClient, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e2c26ec554e4cf38b424fc02c1369a6768ef78ab | querylog/qlog_http.go |
l.conf.HTTPRegister("GET", "/control/querylog", l.handleQueryLog) | <mask> }
<mask>
<mask> // Register web handlers
<mask> func (l *queryLog) initWeb() {
<mask> l.conf.HTTPRegister("POST", "/control/querylog", l.handleQueryLog)
<mask> l.conf.HTTPRegister("GET", "/control/querylog_info", l.handleQueryLogInfo)
<mask> l.conf.HTTPRegister("POST", "/control/querylog_clear", l.handleQueryLogClear)
<mask> l.conf.HTTPRegister("POST", "/control/querylog_config", l.handleQueryLogConfig)
<mask> }
</s> * API changes
* filtering_info -> filtering/status
* filtering_config -> filtering/config </s> remove httpRegister(http.MethodGet, "/control/filtering_info", handleFilteringInfo)
httpRegister(http.MethodPost, "/control/filtering_config", handleFilteringConfig)
</s> add httpRegister(http.MethodGet, "/control/filtering/status", handleFilteringStatus)
httpRegister(http.MethodPost, "/control/filtering/config", handleFilteringConfig) </s> remove err := json.NewDecoder(r.Body).Decode(&req)
if err != nil {
httpError(r, w, http.StatusBadRequest, "json decode: %s", err)
return
}
</s> add q := r.URL.Query()
req.olderThan = q.Get("older_than")
req.filterDomain = q.Get("filter_domain")
req.filterClient = q.Get("filter_client")
req.filterQuestionType = q.Get("filter_question_type")
req.filterResponseStatus = q.Get("filter_response_status") </s> remove func handleFilteringInfo(w http.ResponseWriter, r *http.Request) {
</s> add func handleFilteringStatus(w http.ResponseWriter, r *http.Request) { </s> remove OlderThan string `json:"older_than"`
Filter filterJSON `json:"filter"`
</s> add olderThan string
filterDomain string
filterClient string
filterQuestionType string
filterResponseStatus string | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e2c26ec554e4cf38b424fc02c1369a6768ef78ab | querylog/qlog_http.go |
startFiltering()
| <mask> return errorx.Decorate(err, "Couldn't start forwarding DNS server")
<mask> }
<mask>
<mask> const topClientsNumber = 100 // the number of clients to get
<mask> topClients := config.stats.GetTopClientsIP(topClientsNumber)
<mask> for _, ip := range topClients {
<mask> ipAddr := net.ParseIP(ip)
</s> - filters: auto-update didn't work </s> remove if config.DNS.FiltersUpdateIntervalHours != 0 && refreshStatus != 0 {
</s> add if config.DNS.FiltersUpdateIntervalHours != 0 && refreshStatus == 0 { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e2ff8628ada0b9c2aac5dd6c1d9a6bb70de25854 | home/dns.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.