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 |
|---|---|---|---|---|
ip := ips[0] | <mask> if err != nil {
<mask> t.Fatalf("Failed to lookup for %s", safeDomain)
<mask> }
<mask>
<mask> var ip net.IP
<mask> for _, i := range ips {
<mask> if len(i) == net.IPv6len && i.To4() != nil {
<mask> ip = i
<mask> }
<mask> }
</s> Add safesearch test for dnsforward </s> remove if ip == nil || len(ip) == 0 {
ip = ips[0]
}
// Enable safesearch and check host
d.SafeSearchEnabled = true
</s> add </s> remove if res.IP == nil || len(res.IP) == 0 {
res.IP = addrs[0]
}
</s> add </s> remove func createTestMessage() *dns.Msg {
</s> add func exchangeAndAssertResponse(t *testing.T, client dns.Client, addr net.Addr, host, ip string) {
req := createTestMessage(host)
reply, _, err := client.Exchange(req, addr.String())
if err != nil {
t.Fatalf("Couldn't talk to server %s: %s", addr, err)
}
assertResponse(t, reply, ip)
}
func createGoogleATestMessage() *dns.Msg {
return createTestMessage("google-public-dns-a.google.com.")
}
func createTestMessage(host string) *dns.Msg { </s> remove req := createTestMessage()
</s> add req := createGoogleATestMessage() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0f4f22e0d328528683ad70acd25d61f292326de | dnsfilter/dnsfilter_test.go |
<mask> ip = i
<mask> }
<mask> }
<mask>
<mask> if ip == nil || len(ip) == 0 {
<mask> ip = ips[0]
<mask> }
<mask>
<mask> // Enable safesearch and check host
<mask> d.SafeSearchEnabled = true
<mask>
<mask> result, err = d.CheckHost(domain)
<mask> if err != nil {
<mask> t.Fatalf("CheckHost for safesearh domain %s failed cause %s", domain, err)
<mask> }
<mask>
</s> Add safesearch test for dnsforward </s> remove var ip net.IP
</s> add ip := ips[0] </s> remove if res.IP == nil || len(res.IP) == 0 {
res.IP = addrs[0]
}
</s> add </s> remove func createTestMessage() *dns.Msg {
</s> add func exchangeAndAssertResponse(t *testing.T, client dns.Client, addr net.Addr, host, ip string) {
req := createTestMessage(host)
reply, _, err := client.Exchange(req, addr.String())
if err != nil {
t.Fatalf("Couldn't talk to server %s: %s", addr, err)
}
assertResponse(t, reply, ip)
}
func createGoogleATestMessage() *dns.Msg {
return createTestMessage("google-public-dns-a.google.com.")
}
func createTestMessage(host string) *dns.Msg { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0f4f22e0d328528683ad70acd25d61f292326de | dnsfilter/dnsfilter_test.go | |
req := createGoogleATestMessage() | <mask> t.Fatalf("Failed to start server: %s", err)
<mask> }
<mask>
<mask> // message over UDP
<mask> req := createTestMessage()
<mask> addr := s.dnsProxy.Addr("udp")
<mask> client := dns.Client{Net: "udp"}
<mask> reply, _, err := client.Exchange(req, addr.String())
<mask> if err != nil {
<mask> t.Fatalf("Couldn't talk to server %s: %s", addr, err)
</s> Add safesearch test for dnsforward </s> remove req = createTestMessage()
</s> add req = createGoogleATestMessage() </s> remove func createTestMessage() *dns.Msg {
</s> add func exchangeAndAssertResponse(t *testing.T, client dns.Client, addr net.Addr, host, ip string) {
req := createTestMessage(host)
reply, _, err := client.Exchange(req, addr.String())
if err != nil {
t.Fatalf("Couldn't talk to server %s: %s", addr, err)
}
assertResponse(t, reply, ip)
}
func createGoogleATestMessage() *dns.Msg {
return createTestMessage("google-public-dns-a.google.com.")
}
func createTestMessage(host string) *dns.Msg { </s> remove assertResponse(t, reply)
</s> add assertGoogleAResponse(t, reply) </s> remove var ip net.IP
</s> add ip := ips[0] </s> remove assertResponse(t, reply)
</s> add assertGoogleAResponse(t, reply) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0f4f22e0d328528683ad70acd25d61f292326de | dnsforward/dnsforward_test.go |
assertGoogleAResponse(t, reply) | <mask> reply, _, err := client.Exchange(req, addr.String())
<mask> if err != nil {
<mask> t.Fatalf("Couldn't talk to server %s: %s", addr, err)
<mask> }
<mask> assertResponse(t, reply)
<mask>
<mask> // check query log and stats
<mask> log := s.GetQueryLog()
<mask> assert.Equal(t, 1, len(log), "Log size")
<mask> stats := s.GetStatsTop()
</s> Add safesearch test for dnsforward </s> remove assertResponse(t, reply)
</s> add assertGoogleAResponse(t, reply) </s> remove req := createTestMessage()
</s> add req := createGoogleATestMessage() </s> remove req = createTestMessage()
</s> add req = createGoogleATestMessage() </s> remove func createTestMessage() *dns.Msg {
</s> add func exchangeAndAssertResponse(t *testing.T, client dns.Client, addr net.Addr, host, ip string) {
req := createTestMessage(host)
reply, _, err := client.Exchange(req, addr.String())
if err != nil {
t.Fatalf("Couldn't talk to server %s: %s", addr, err)
}
assertResponse(t, reply, ip)
}
func createGoogleATestMessage() *dns.Msg {
return createTestMessage("google-public-dns-a.google.com.")
}
func createTestMessage(host string) *dns.Msg { </s> remove var ip net.IP
</s> add ip := ips[0] | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0f4f22e0d328528683ad70acd25d61f292326de | dnsforward/dnsforward_test.go |
req = createGoogleATestMessage() | <mask> assert.Equal(t, 0, len(stats.Blocked), "Top blocked length")
<mask> assert.Equal(t, 1, len(stats.Clients), "Top clients length")
<mask>
<mask> // message over TCP
<mask> req = createTestMessage()
<mask> addr = s.dnsProxy.Addr("tcp")
<mask> client = dns.Client{Net: "tcp"}
<mask> reply, _, err = client.Exchange(req, addr.String())
<mask> if err != nil {
<mask> t.Fatalf("Couldn't talk to server %s: %s", addr, err)
</s> Add safesearch test for dnsforward </s> remove req := createTestMessage()
</s> add req := createGoogleATestMessage() </s> remove assertResponse(t, reply)
</s> add assertGoogleAResponse(t, reply) </s> remove assertResponse(t, reply)
</s> add assertGoogleAResponse(t, reply) </s> remove func createTestMessage() *dns.Msg {
</s> add func exchangeAndAssertResponse(t *testing.T, client dns.Client, addr net.Addr, host, ip string) {
req := createTestMessage(host)
reply, _, err := client.Exchange(req, addr.String())
if err != nil {
t.Fatalf("Couldn't talk to server %s: %s", addr, err)
}
assertResponse(t, reply, ip)
}
func createGoogleATestMessage() *dns.Msg {
return createTestMessage("google-public-dns-a.google.com.")
}
func createTestMessage(host string) *dns.Msg { </s> remove if ip == nil || len(ip) == 0 {
ip = ips[0]
}
// Enable safesearch and check host
d.SafeSearchEnabled = true
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0f4f22e0d328528683ad70acd25d61f292326de | dnsforward/dnsforward_test.go |
assertGoogleAResponse(t, reply) | <mask> reply, _, err = client.Exchange(req, addr.String())
<mask> if err != nil {
<mask> t.Fatalf("Couldn't talk to server %s: %s", addr, err)
<mask> }
<mask> assertResponse(t, reply)
<mask>
<mask> // check query log and stats again
<mask> log = s.GetQueryLog()
<mask> assert.Equal(t, 2, len(log), "Log size")
<mask> stats = s.GetStatsTop()
</s> Add safesearch test for dnsforward </s> remove assertResponse(t, reply)
</s> add assertGoogleAResponse(t, reply) </s> remove req = createTestMessage()
</s> add req = createGoogleATestMessage() </s> remove func createTestMessage() *dns.Msg {
</s> add func exchangeAndAssertResponse(t *testing.T, client dns.Client, addr net.Addr, host, ip string) {
req := createTestMessage(host)
reply, _, err := client.Exchange(req, addr.String())
if err != nil {
t.Fatalf("Couldn't talk to server %s: %s", addr, err)
}
assertResponse(t, reply, ip)
}
func createGoogleATestMessage() *dns.Msg {
return createTestMessage("google-public-dns-a.google.com.")
}
func createTestMessage(host string) *dns.Msg { </s> remove req := createTestMessage()
</s> add req := createGoogleATestMessage() </s> remove if ip == nil || len(ip) == 0 {
ip = ips[0]
}
// Enable safesearch and check host
d.SafeSearchEnabled = true
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0f4f22e0d328528683ad70acd25d61f292326de | dnsforward/dnsforward_test.go |
func exchangeAndAssertResponse(t *testing.T, client dns.Client, addr net.Addr, host, ip string) {
req := createTestMessage(host)
reply, _, err := client.Exchange(req, addr.String())
if err != nil {
t.Fatalf("Couldn't talk to server %s: %s", addr, err)
}
assertResponse(t, reply, ip)
}
func createGoogleATestMessage() *dns.Msg {
return createTestMessage("google-public-dns-a.google.com.")
}
func createTestMessage(host string) *dns.Msg { | <mask> t.Fatalf("Cannot remove %s: %s", dir, err)
<mask> }
<mask> }
<mask>
<mask> func createTestMessage() *dns.Msg {
<mask> req := dns.Msg{}
<mask> req.Id = dns.Id()
<mask> req.RecursionDesired = true
<mask> req.Question = []dns.Question{
<mask> {Name: "google-public-dns-a.google.com.", Qtype: dns.TypeA, Qclass: dns.ClassINET},
</s> Add safesearch test for dnsforward </s> remove {Name: "google-public-dns-a.google.com.", Qtype: dns.TypeA, Qclass: dns.ClassINET},
</s> add {Name: host, Qtype: dns.TypeA, Qclass: dns.ClassINET}, </s> remove req = createTestMessage()
</s> add req = createGoogleATestMessage() </s> remove if ip == nil || len(ip) == 0 {
ip = ips[0]
}
// Enable safesearch and check host
d.SafeSearchEnabled = true
</s> add </s> remove req := createTestMessage()
</s> add req := createGoogleATestMessage() </s> remove var ip net.IP
</s> add ip := ips[0] | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0f4f22e0d328528683ad70acd25d61f292326de | dnsforward/dnsforward_test.go |
{Name: host, Qtype: dns.TypeA, Qclass: dns.ClassINET}, | <mask> req := dns.Msg{}
<mask> req.Id = dns.Id()
<mask> req.RecursionDesired = true
<mask> req.Question = []dns.Question{
<mask> {Name: "google-public-dns-a.google.com.", Qtype: dns.TypeA, Qclass: dns.ClassINET},
<mask> }
<mask> return &req
<mask> }
<mask>
<mask> func assertResponse(t *testing.T, reply *dns.Msg) {
</s> Add safesearch test for dnsforward </s> remove func createTestMessage() *dns.Msg {
</s> add func exchangeAndAssertResponse(t *testing.T, client dns.Client, addr net.Addr, host, ip string) {
req := createTestMessage(host)
reply, _, err := client.Exchange(req, addr.String())
if err != nil {
t.Fatalf("Couldn't talk to server %s: %s", addr, err)
}
assertResponse(t, reply, ip)
}
func createGoogleATestMessage() *dns.Msg {
return createTestMessage("google-public-dns-a.google.com.")
}
func createTestMessage(host string) *dns.Msg { </s> remove func assertResponse(t *testing.T, reply *dns.Msg) {
</s> add func assertGoogleAResponse(t *testing.T, reply *dns.Msg) {
assertResponse(t, reply, "8.8.8.8")
}
func assertResponse(t *testing.T, reply *dns.Msg, ip string) { </s> remove if ip == nil || len(ip) == 0 {
ip = ips[0]
}
// Enable safesearch and check host
d.SafeSearchEnabled = true
</s> add </s> remove if res.IP == nil || len(res.IP) == 0 {
res.IP = addrs[0]
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0f4f22e0d328528683ad70acd25d61f292326de | dnsforward/dnsforward_test.go |
func assertGoogleAResponse(t *testing.T, reply *dns.Msg) {
assertResponse(t, reply, "8.8.8.8")
}
func assertResponse(t *testing.T, reply *dns.Msg, ip string) { | <mask> }
<mask> return &req
<mask> }
<mask>
<mask> func assertResponse(t *testing.T, reply *dns.Msg) {
<mask> if len(reply.Answer) != 1 {
<mask> t.Fatalf("DNS server returned reply with wrong number of answers - %d", len(reply.Answer))
<mask> }
<mask> if a, ok := reply.Answer[0].(*dns.A); ok {
<mask> if !net.IPv4(8, 8, 8, 8).Equal(a.A) {
</s> Add safesearch test for dnsforward </s> remove if !net.IPv4(8, 8, 8, 8).Equal(a.A) {
t.Fatalf("DNS server returned wrong answer instead of 8.8.8.8: %v", a.A)
</s> add if !net.ParseIP(ip).Equal(a.A) {
t.Fatalf("DNS server returned wrong answer instead of %s: %v", ip, a.A) </s> remove {Name: "google-public-dns-a.google.com.", Qtype: dns.TypeA, Qclass: dns.ClassINET},
</s> add {Name: host, Qtype: dns.TypeA, Qclass: dns.ClassINET}, </s> remove func createTestMessage() *dns.Msg {
</s> add func exchangeAndAssertResponse(t *testing.T, client dns.Client, addr net.Addr, host, ip string) {
req := createTestMessage(host)
reply, _, err := client.Exchange(req, addr.String())
if err != nil {
t.Fatalf("Couldn't talk to server %s: %s", addr, err)
}
assertResponse(t, reply, ip)
}
func createGoogleATestMessage() *dns.Msg {
return createTestMessage("google-public-dns-a.google.com.")
}
func createTestMessage(host string) *dns.Msg { </s> remove var ip net.IP
</s> add ip := ips[0] | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0f4f22e0d328528683ad70acd25d61f292326de | dnsforward/dnsforward_test.go |
if !net.ParseIP(ip).Equal(a.A) {
t.Fatalf("DNS server returned wrong answer instead of %s: %v", ip, a.A) | <mask> if len(reply.Answer) != 1 {
<mask> t.Fatalf("DNS server returned reply with wrong number of answers - %d", len(reply.Answer))
<mask> }
<mask> if a, ok := reply.Answer[0].(*dns.A); ok {
<mask> if !net.IPv4(8, 8, 8, 8).Equal(a.A) {
<mask> t.Fatalf("DNS server returned wrong answer instead of 8.8.8.8: %v", a.A)
<mask> }
<mask> } else {
<mask> t.Fatalf("DNS server returned wrong answer type instead of A: %v", reply.Answer[0])
<mask> }
<mask> }
</s> Add safesearch test for dnsforward </s> remove func assertResponse(t *testing.T, reply *dns.Msg) {
</s> add func assertGoogleAResponse(t *testing.T, reply *dns.Msg) {
assertResponse(t, reply, "8.8.8.8")
}
func assertResponse(t *testing.T, reply *dns.Msg, ip string) { </s> remove var ip net.IP
</s> add ip := ips[0] </s> remove func createTestMessage() *dns.Msg {
</s> add func exchangeAndAssertResponse(t *testing.T, client dns.Client, addr net.Addr, host, ip string) {
req := createTestMessage(host)
reply, _, err := client.Exchange(req, addr.String())
if err != nil {
t.Fatalf("Couldn't talk to server %s: %s", addr, err)
}
assertResponse(t, reply, ip)
}
func createGoogleATestMessage() *dns.Msg {
return createTestMessage("google-public-dns-a.google.com.")
}
func createTestMessage(host string) *dns.Msg { </s> remove if res.IP == nil || len(res.IP) == 0 {
res.IP = addrs[0]
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0f4f22e0d328528683ad70acd25d61f292326de | dnsforward/dnsforward_test.go |
"statistics_cleared": "Statistics successfully cleared",
"interval_hours": "{{count}} hour",
"interval_hours_plural": "{{count}} hours",
"filters_configuration": "Filters configuration",
"filters_enable": "Enable filters",
"filters_interval": "Filters update interval",
"disabled": "Disabled" | <mask> "statistics_retention": "Statistics retention",
<mask> "statistics_retention_desc": "If you decrease the interval value, some data will be lost",
<mask> "statistics_clear": " Clear statistics",
<mask> "statistics_clear_confirm": "Are you sure you want to clear statistics?",
<mask> "statistics_cleared": "Statistics successfully cleared"
<mask> }
</s> + client: handle filters configuration </s> remove enableFiltering() {
const { path, method } = this.FILTERING_ENABLE;
return this.makeRequest(path, method);
}
disableFiltering() {
const { path, method } = this.FILTERING_DISABLE;
return this.makeRequest(path, method);
}
// TODO find out when to use force parameter
</s> add </s> remove </div>
</s> add </Fragment> </s> remove // Text
previousText={ t('previous_btn') }
nextText={ t('next_btn') }
loadingText={ t('loading_table_status') }
pageText={ t('page_table_footer_text') }
ofText={ t('of_table_footer_text') }
rowsText={ t('rows_table_footer_text') }
noDataText={ t('no_filters_added') }
</s> add previousText={t('previous_btn')}
nextText={t('next_btn')}
loadingText={t('loading_table_status')}
pageText={t('page_table_footer_text')}
ofText={t('of_table_footer_text')}
rowsText={t('rows_table_footer_text')}
noDataText={t('no_filters_added')} </s> remove isOpen={this.props.filtering.isFilteringModalOpen}
toggleModal={this.props.toggleFilteringModal}
addFilter={this.props.addFilter}
isFilterAdded={this.props.filtering.isFilterAdded}
processingAddFilter={this.props.filtering.processingAddFilter}
title={ t('new_filter_btn') }
inputDescription={ t('enter_valid_filter_url') }
</s> add isOpen={isModalOpen}
toggleModal={toggleFilteringModal}
addFilter={addFilter}
isFilterAdded={isFilterAdded}
processingAddFilter={processingAddFilter} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/__locales/en.json |
<mask> import { createAction } from 'redux-actions';
<mask> import { t } from 'i18next';
<mask> import { showLoading, hideLoading } from 'react-redux-loading-bar';
<mask> import axios from 'axios';
<mask>
<mask> import versionCompare from '../helpers/versionCompare';
<mask> import { normalizeFilteringStatus, normalizeTextarea, sortClients } from '../helpers/helpers';
<mask> import { SETTINGS_NAMES, CHECK_TIMEOUT } from '../helpers/constants';
</s> + client: handle filters configuration </s> remove import { normalizeFilteringStatus, normalizeTextarea, sortClients } from '../helpers/helpers';
</s> add import { normalizeTextarea, sortClients } from '../helpers/helpers'; </s> remove import { formatTime, getClientName } from '../../helpers/helpers';
</s> add import { formatTime, formatDateTime, getClientName } from '../../helpers/helpers'; </s> remove import React, { Component } from 'react';
</s> add import React, { Component, Fragment } from 'react'; </s> remove import Modal from './Modal';
</s> add | [
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/actions/index.js | |
import { normalizeTextarea, sortClients } from '../helpers/helpers'; | <mask> import { showLoading, hideLoading } from 'react-redux-loading-bar';
<mask> import axios from 'axios';
<mask>
<mask> import versionCompare from '../helpers/versionCompare';
<mask> import { normalizeFilteringStatus, normalizeTextarea, sortClients } from '../helpers/helpers';
<mask> import { SETTINGS_NAMES, CHECK_TIMEOUT } from '../helpers/constants';
<mask> import { getTlsStatus } from './encryption';
<mask> import apiClient from '../api/Api';
<mask>
<mask> export const addErrorToast = createAction('ADD_ERROR_TOAST');
</s> + client: handle filters configuration </s> remove import { showLoading, hideLoading } from 'react-redux-loading-bar';
</s> add </s> remove import { formatTime, getClientName } from '../../helpers/helpers';
</s> add import { formatTime, formatDateTime, getClientName } from '../../helpers/helpers'; </s> remove import { getFilteringStatus, setRules, addSuccessToast, getClients } from '../actions';
</s> add import { addSuccessToast, getClients } from '../actions';
import { getFilteringStatus, setRules } from '../actions/filtering'; </s> remove import React, { Component } from 'react';
</s> add import React, { Component, Fragment } from 'react'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/actions/index.js |
<mask> export const toggleSetting = (settingKey, status) => async (dispatch) => {
<mask> let successMessage = '';
<mask> try {
<mask> switch (settingKey) {
<mask> case SETTINGS_NAMES.filtering:
<mask> if (status) {
<mask> successMessage = 'disabled_filtering_toast';
<mask> await apiClient.disableFiltering();
<mask> } else {
<mask> successMessage = 'enabled_filtering_toast';
<mask> await apiClient.enableFiltering();
<mask> }
<mask> dispatch(toggleSettingStatus({ settingKey }));
<mask> break;
<mask> case SETTINGS_NAMES.safebrowsing:
<mask> if (status) {
<mask> successMessage = 'disabled_safe_browsing_toast';
<mask> await apiClient.disableSafebrowsing();
<mask> } else {
</s> + client: handle filters configuration </s> remove export const setRulesRequest = createAction('SET_RULES_REQUEST');
export const setRulesFailure = createAction('SET_RULES_FAILURE');
export const setRulesSuccess = createAction('SET_RULES_SUCCESS');
export const setRules = rules => async (dispatch) => {
dispatch(setRulesRequest());
try {
const replacedLineEndings = rules
.replace(/^\n/g, '')
.replace(/\n\s*\n/g, '\n');
await apiClient.setRules(replacedLineEndings);
dispatch(addSuccessToast('updated_custom_filtering_toast'));
dispatch(setRulesSuccess());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setRulesFailure());
}
};
export const getFilteringStatusRequest = createAction('GET_FILTERING_STATUS_REQUEST');
export const getFilteringStatusFailure = createAction('GET_FILTERING_STATUS_FAILURE');
export const getFilteringStatusSuccess = createAction('GET_FILTERING_STATUS_SUCCESS');
export const getFilteringStatus = () => async (dispatch) => {
dispatch(getFilteringStatusRequest());
try {
const status = await apiClient.getFilteringStatus();
dispatch(getFilteringStatusSuccess({ status: normalizeFilteringStatus(status) }));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(getFilteringStatusFailure());
}
};
export const toggleFilterRequest = createAction('FILTER_ENABLE_REQUEST');
export const toggleFilterFailure = createAction('FILTER_ENABLE_FAILURE');
export const toggleFilterSuccess = createAction('FILTER_ENABLE_SUCCESS');
export const toggleFilterStatus = url => async (dispatch, getState) => {
dispatch(toggleFilterRequest());
const state = getState();
const { filters } = state.filtering;
const filter = filters.filter(filter => filter.url === url)[0];
const { enabled } = filter;
let toggleStatusMethod;
if (enabled) {
toggleStatusMethod = apiClient.disableFilter.bind(apiClient);
} else {
toggleStatusMethod = apiClient.enableFilter.bind(apiClient);
}
try {
await toggleStatusMethod(url);
dispatch(toggleFilterSuccess(url));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleFilterFailure());
}
};
export const refreshFiltersRequest = createAction('FILTERING_REFRESH_REQUEST');
export const refreshFiltersFailure = createAction('FILTERING_REFRESH_FAILURE');
export const refreshFiltersSuccess = createAction('FILTERING_REFRESH_SUCCESS');
export const refreshFilters = () => async (dispatch) => {
dispatch(refreshFiltersRequest());
dispatch(showLoading());
try {
const refreshText = await apiClient.refreshFilters();
dispatch(refreshFiltersSuccess());
if (refreshText.includes('OK')) {
if (refreshText.includes('OK 0')) {
dispatch(addSuccessToast('all_filters_up_to_date_toast'));
} else {
dispatch(addSuccessToast(refreshText.replace(/OK /g, '')));
}
} else {
dispatch(addErrorToast({ error: refreshText }));
}
dispatch(getFilteringStatus());
dispatch(hideLoading());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(refreshFiltersFailure());
dispatch(hideLoading());
}
};
export const handleRulesChange = createAction('HANDLE_RULES_CHANGE');
export const addFilterRequest = createAction('ADD_FILTER_REQUEST');
export const addFilterFailure = createAction('ADD_FILTER_FAILURE');
export const addFilterSuccess = createAction('ADD_FILTER_SUCCESS');
export const addFilter = (url, name) => async (dispatch) => {
dispatch(addFilterRequest());
try {
await apiClient.addFilter(url, name);
dispatch(addFilterSuccess(url));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(addFilterFailure());
}
};
export const removeFilterRequest = createAction('ADD_FILTER_REQUEST');
export const removeFilterFailure = createAction('ADD_FILTER_FAILURE');
export const removeFilterSuccess = createAction('ADD_FILTER_SUCCESS');
export const removeFilter = url => async (dispatch) => {
dispatch(removeFilterRequest());
try {
await apiClient.removeFilter(url);
dispatch(removeFilterSuccess(url));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(removeFilterFailure());
}
};
export const toggleFilteringModal = createAction('FILTERING_MODAL_TOGGLE');
</s> add </s> remove const filteringStatus = await apiClient.getFilteringStatus();
</s> add </s> remove export const getFilteringRequest = createAction('GET_FILTERING_REQUEST');
export const getFilteringFailure = createAction('GET_FILTERING_FAILURE');
export const getFilteringSuccess = createAction('GET_FILTERING_SUCCESS');
export const getFiltering = () => async (dispatch) => {
dispatch(getFilteringRequest());
try {
const filteringStatus = await apiClient.getFilteringStatus();
dispatch(getFilteringSuccess(filteringStatus.enabled));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(getFilteringFailure());
}
};
</s> add </s> remove filtering,
</s> add </s> remove if (Object.keys(settings).length > 0) {
return Object.keys(settings).map((key) => {
</s> add const settingsKeys = Object.keys(settings);
if (settingsKeys.length > 0) {
return settingsKeys.map((key) => { | [
"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/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/actions/index.js | |
<mask>
<mask> export const initSettings = settingsList => async (dispatch) => {
<mask> dispatch(initSettingsRequest());
<mask> try {
<mask> const filteringStatus = await apiClient.getFilteringStatus();
<mask> const safebrowsingStatus = await apiClient.getSafebrowsingStatus();
<mask> const parentalStatus = await apiClient.getParentalStatus();
<mask> const safesearchStatus = await apiClient.getSafesearchStatus();
<mask> const {
<mask> filtering,
</s> + client: handle filters configuration </s> remove filtering,
</s> add </s> remove export const getFilteringRequest = createAction('GET_FILTERING_REQUEST');
export const getFilteringFailure = createAction('GET_FILTERING_FAILURE');
export const getFilteringSuccess = createAction('GET_FILTERING_SUCCESS');
export const getFiltering = () => async (dispatch) => {
dispatch(getFilteringRequest());
try {
const filteringStatus = await apiClient.getFilteringStatus();
dispatch(getFilteringSuccess(filteringStatus.enabled));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(getFilteringFailure());
}
};
</s> add </s> remove export const setRulesRequest = createAction('SET_RULES_REQUEST');
export const setRulesFailure = createAction('SET_RULES_FAILURE');
export const setRulesSuccess = createAction('SET_RULES_SUCCESS');
export const setRules = rules => async (dispatch) => {
dispatch(setRulesRequest());
try {
const replacedLineEndings = rules
.replace(/^\n/g, '')
.replace(/\n\s*\n/g, '\n');
await apiClient.setRules(replacedLineEndings);
dispatch(addSuccessToast('updated_custom_filtering_toast'));
dispatch(setRulesSuccess());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setRulesFailure());
}
};
export const getFilteringStatusRequest = createAction('GET_FILTERING_STATUS_REQUEST');
export const getFilteringStatusFailure = createAction('GET_FILTERING_STATUS_FAILURE');
export const getFilteringStatusSuccess = createAction('GET_FILTERING_STATUS_SUCCESS');
export const getFilteringStatus = () => async (dispatch) => {
dispatch(getFilteringStatusRequest());
try {
const status = await apiClient.getFilteringStatus();
dispatch(getFilteringStatusSuccess({ status: normalizeFilteringStatus(status) }));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(getFilteringStatusFailure());
}
};
export const toggleFilterRequest = createAction('FILTER_ENABLE_REQUEST');
export const toggleFilterFailure = createAction('FILTER_ENABLE_FAILURE');
export const toggleFilterSuccess = createAction('FILTER_ENABLE_SUCCESS');
export const toggleFilterStatus = url => async (dispatch, getState) => {
dispatch(toggleFilterRequest());
const state = getState();
const { filters } = state.filtering;
const filter = filters.filter(filter => filter.url === url)[0];
const { enabled } = filter;
let toggleStatusMethod;
if (enabled) {
toggleStatusMethod = apiClient.disableFilter.bind(apiClient);
} else {
toggleStatusMethod = apiClient.enableFilter.bind(apiClient);
}
try {
await toggleStatusMethod(url);
dispatch(toggleFilterSuccess(url));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleFilterFailure());
}
};
export const refreshFiltersRequest = createAction('FILTERING_REFRESH_REQUEST');
export const refreshFiltersFailure = createAction('FILTERING_REFRESH_FAILURE');
export const refreshFiltersSuccess = createAction('FILTERING_REFRESH_SUCCESS');
export const refreshFilters = () => async (dispatch) => {
dispatch(refreshFiltersRequest());
dispatch(showLoading());
try {
const refreshText = await apiClient.refreshFilters();
dispatch(refreshFiltersSuccess());
if (refreshText.includes('OK')) {
if (refreshText.includes('OK 0')) {
dispatch(addSuccessToast('all_filters_up_to_date_toast'));
} else {
dispatch(addSuccessToast(refreshText.replace(/OK /g, '')));
}
} else {
dispatch(addErrorToast({ error: refreshText }));
}
dispatch(getFilteringStatus());
dispatch(hideLoading());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(refreshFiltersFailure());
dispatch(hideLoading());
}
};
export const handleRulesChange = createAction('HANDLE_RULES_CHANGE');
export const addFilterRequest = createAction('ADD_FILTER_REQUEST');
export const addFilterFailure = createAction('ADD_FILTER_FAILURE');
export const addFilterSuccess = createAction('ADD_FILTER_SUCCESS');
export const addFilter = (url, name) => async (dispatch) => {
dispatch(addFilterRequest());
try {
await apiClient.addFilter(url, name);
dispatch(addFilterSuccess(url));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(addFilterFailure());
}
};
export const removeFilterRequest = createAction('ADD_FILTER_REQUEST');
export const removeFilterFailure = createAction('ADD_FILTER_FAILURE');
export const removeFilterSuccess = createAction('ADD_FILTER_SUCCESS');
export const removeFilter = url => async (dispatch) => {
dispatch(removeFilterRequest());
try {
await apiClient.removeFilter(url);
dispatch(removeFilterSuccess(url));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(removeFilterFailure());
}
};
export const toggleFilteringModal = createAction('FILTERING_MODAL_TOGGLE');
</s> add </s> remove case SETTINGS_NAMES.filtering:
if (status) {
successMessage = 'disabled_filtering_toast';
await apiClient.disableFiltering();
} else {
successMessage = 'enabled_filtering_toast';
await apiClient.enableFiltering();
}
dispatch(toggleSettingStatus({ settingKey }));
break;
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/actions/index.js | |
<mask> const safebrowsingStatus = await apiClient.getSafebrowsingStatus();
<mask> const parentalStatus = await apiClient.getParentalStatus();
<mask> const safesearchStatus = await apiClient.getSafesearchStatus();
<mask> const {
<mask> filtering,
<mask> safebrowsing,
<mask> parental,
<mask> safesearch,
<mask> } = settingsList;
<mask> const newSettingsList = {
</s> + client: handle filters configuration </s> remove const filteringStatus = await apiClient.getFilteringStatus();
</s> add </s> remove filtering: { ...filtering, enabled: filteringStatus.enabled },
</s> add </s> remove export const setRulesRequest = createAction('SET_RULES_REQUEST');
export const setRulesFailure = createAction('SET_RULES_FAILURE');
export const setRulesSuccess = createAction('SET_RULES_SUCCESS');
export const setRules = rules => async (dispatch) => {
dispatch(setRulesRequest());
try {
const replacedLineEndings = rules
.replace(/^\n/g, '')
.replace(/\n\s*\n/g, '\n');
await apiClient.setRules(replacedLineEndings);
dispatch(addSuccessToast('updated_custom_filtering_toast'));
dispatch(setRulesSuccess());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setRulesFailure());
}
};
export const getFilteringStatusRequest = createAction('GET_FILTERING_STATUS_REQUEST');
export const getFilteringStatusFailure = createAction('GET_FILTERING_STATUS_FAILURE');
export const getFilteringStatusSuccess = createAction('GET_FILTERING_STATUS_SUCCESS');
export const getFilteringStatus = () => async (dispatch) => {
dispatch(getFilteringStatusRequest());
try {
const status = await apiClient.getFilteringStatus();
dispatch(getFilteringStatusSuccess({ status: normalizeFilteringStatus(status) }));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(getFilteringStatusFailure());
}
};
export const toggleFilterRequest = createAction('FILTER_ENABLE_REQUEST');
export const toggleFilterFailure = createAction('FILTER_ENABLE_FAILURE');
export const toggleFilterSuccess = createAction('FILTER_ENABLE_SUCCESS');
export const toggleFilterStatus = url => async (dispatch, getState) => {
dispatch(toggleFilterRequest());
const state = getState();
const { filters } = state.filtering;
const filter = filters.filter(filter => filter.url === url)[0];
const { enabled } = filter;
let toggleStatusMethod;
if (enabled) {
toggleStatusMethod = apiClient.disableFilter.bind(apiClient);
} else {
toggleStatusMethod = apiClient.enableFilter.bind(apiClient);
}
try {
await toggleStatusMethod(url);
dispatch(toggleFilterSuccess(url));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleFilterFailure());
}
};
export const refreshFiltersRequest = createAction('FILTERING_REFRESH_REQUEST');
export const refreshFiltersFailure = createAction('FILTERING_REFRESH_FAILURE');
export const refreshFiltersSuccess = createAction('FILTERING_REFRESH_SUCCESS');
export const refreshFilters = () => async (dispatch) => {
dispatch(refreshFiltersRequest());
dispatch(showLoading());
try {
const refreshText = await apiClient.refreshFilters();
dispatch(refreshFiltersSuccess());
if (refreshText.includes('OK')) {
if (refreshText.includes('OK 0')) {
dispatch(addSuccessToast('all_filters_up_to_date_toast'));
} else {
dispatch(addSuccessToast(refreshText.replace(/OK /g, '')));
}
} else {
dispatch(addErrorToast({ error: refreshText }));
}
dispatch(getFilteringStatus());
dispatch(hideLoading());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(refreshFiltersFailure());
dispatch(hideLoading());
}
};
export const handleRulesChange = createAction('HANDLE_RULES_CHANGE');
export const addFilterRequest = createAction('ADD_FILTER_REQUEST');
export const addFilterFailure = createAction('ADD_FILTER_FAILURE');
export const addFilterSuccess = createAction('ADD_FILTER_SUCCESS');
export const addFilter = (url, name) => async (dispatch) => {
dispatch(addFilterRequest());
try {
await apiClient.addFilter(url, name);
dispatch(addFilterSuccess(url));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(addFilterFailure());
}
};
export const removeFilterRequest = createAction('ADD_FILTER_REQUEST');
export const removeFilterFailure = createAction('ADD_FILTER_FAILURE');
export const removeFilterSuccess = createAction('ADD_FILTER_SUCCESS');
export const removeFilter = url => async (dispatch) => {
dispatch(removeFilterRequest());
try {
await apiClient.removeFilter(url);
dispatch(removeFilterSuccess(url));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(removeFilterFailure());
}
};
export const toggleFilteringModal = createAction('FILTERING_MODAL_TOGGLE');
</s> add </s> remove case SETTINGS_NAMES.filtering:
if (status) {
successMessage = 'disabled_filtering_toast';
await apiClient.disableFiltering();
} else {
successMessage = 'enabled_filtering_toast';
await apiClient.enableFiltering();
}
dispatch(toggleSettingStatus({ settingKey }));
break;
</s> add </s> remove export const getFilteringRequest = createAction('GET_FILTERING_REQUEST');
export const getFilteringFailure = createAction('GET_FILTERING_FAILURE');
export const getFilteringSuccess = createAction('GET_FILTERING_SUCCESS');
export const getFiltering = () => async (dispatch) => {
dispatch(getFilteringRequest());
try {
const filteringStatus = await apiClient.getFilteringStatus();
dispatch(getFilteringSuccess(filteringStatus.enabled));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(getFilteringFailure());
}
};
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/actions/index.js | |
<mask> parental,
<mask> safesearch,
<mask> } = settingsList;
<mask> const newSettingsList = {
<mask> filtering: { ...filtering, enabled: filteringStatus.enabled },
<mask> safebrowsing: { ...safebrowsing, enabled: safebrowsingStatus.enabled },
<mask> parental: { ...parental, enabled: parentalStatus.enabled },
<mask> safesearch: { ...safesearch, enabled: safesearchStatus.enabled },
<mask> };
<mask> dispatch(initSettingsSuccess({ settingsList: newSettingsList }));
</s> + client: handle filters configuration </s> remove filtering: {
enabled: false,
title: 'block_domain_use_filters_and_hosts',
subtitle: 'filters_block_toggle_hint',
},
</s> add </s> remove filtering,
</s> add </s> remove enableFilter(url) {
const { path, method } = this.FILTERING_ENABLE_FILTER;
const parameter = 'url';
const requestBody = `${parameter}=${url}`;
const config = {
data: requestBody,
header: { 'Content-Type': 'text/plain' },
</s> add setFiltersConfig(config) {
const { path, method } = this.FILTERING_CONFIG;
const parameters = {
data: config,
headers: { 'Content-Type': 'application/json' }, </s> remove disableFilter(url) {
const { path, method } = this.FILTERING_DISABLE_FILTER;
const parameter = 'url';
const requestBody = `${parameter}=${url}`;
const config = {
data: requestBody,
header: { 'Content-Type': 'text/plain' },
</s> add setFilterUrl(config) {
const { path, method } = this.FILTERING_SET_URL;
const parameters = {
data: config,
headers: { 'Content-Type': 'application/json' }, </s> remove return this.makeRequest(path, method, config);
</s> add return this.makeRequest(path, method, parameters); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/actions/index.js | |
<mask> dispatch(initSettingsFailure());
<mask> }
<mask> };
<mask>
<mask> export const getFilteringRequest = createAction('GET_FILTERING_REQUEST');
<mask> export const getFilteringFailure = createAction('GET_FILTERING_FAILURE');
<mask> export const getFilteringSuccess = createAction('GET_FILTERING_SUCCESS');
<mask>
<mask> export const getFiltering = () => async (dispatch) => {
<mask> dispatch(getFilteringRequest());
<mask> try {
<mask> const filteringStatus = await apiClient.getFilteringStatus();
<mask> dispatch(getFilteringSuccess(filteringStatus.enabled));
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(getFilteringFailure());
<mask> }
<mask> };
<mask>
<mask> export const toggleProtectionRequest = createAction('TOGGLE_PROTECTION_REQUEST');
<mask> export const toggleProtectionFailure = createAction('TOGGLE_PROTECTION_FAILURE');
<mask> export const toggleProtectionSuccess = createAction('TOGGLE_PROTECTION_SUCCESS');
<mask>
<mask> export const toggleProtection = status => async (dispatch) => {
</s> + client: handle filters configuration </s> remove export const setRulesRequest = createAction('SET_RULES_REQUEST');
export const setRulesFailure = createAction('SET_RULES_FAILURE');
export const setRulesSuccess = createAction('SET_RULES_SUCCESS');
export const setRules = rules => async (dispatch) => {
dispatch(setRulesRequest());
try {
const replacedLineEndings = rules
.replace(/^\n/g, '')
.replace(/\n\s*\n/g, '\n');
await apiClient.setRules(replacedLineEndings);
dispatch(addSuccessToast('updated_custom_filtering_toast'));
dispatch(setRulesSuccess());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setRulesFailure());
}
};
export const getFilteringStatusRequest = createAction('GET_FILTERING_STATUS_REQUEST');
export const getFilteringStatusFailure = createAction('GET_FILTERING_STATUS_FAILURE');
export const getFilteringStatusSuccess = createAction('GET_FILTERING_STATUS_SUCCESS');
export const getFilteringStatus = () => async (dispatch) => {
dispatch(getFilteringStatusRequest());
try {
const status = await apiClient.getFilteringStatus();
dispatch(getFilteringStatusSuccess({ status: normalizeFilteringStatus(status) }));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(getFilteringStatusFailure());
}
};
export const toggleFilterRequest = createAction('FILTER_ENABLE_REQUEST');
export const toggleFilterFailure = createAction('FILTER_ENABLE_FAILURE');
export const toggleFilterSuccess = createAction('FILTER_ENABLE_SUCCESS');
export const toggleFilterStatus = url => async (dispatch, getState) => {
dispatch(toggleFilterRequest());
const state = getState();
const { filters } = state.filtering;
const filter = filters.filter(filter => filter.url === url)[0];
const { enabled } = filter;
let toggleStatusMethod;
if (enabled) {
toggleStatusMethod = apiClient.disableFilter.bind(apiClient);
} else {
toggleStatusMethod = apiClient.enableFilter.bind(apiClient);
}
try {
await toggleStatusMethod(url);
dispatch(toggleFilterSuccess(url));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleFilterFailure());
}
};
export const refreshFiltersRequest = createAction('FILTERING_REFRESH_REQUEST');
export const refreshFiltersFailure = createAction('FILTERING_REFRESH_FAILURE');
export const refreshFiltersSuccess = createAction('FILTERING_REFRESH_SUCCESS');
export const refreshFilters = () => async (dispatch) => {
dispatch(refreshFiltersRequest());
dispatch(showLoading());
try {
const refreshText = await apiClient.refreshFilters();
dispatch(refreshFiltersSuccess());
if (refreshText.includes('OK')) {
if (refreshText.includes('OK 0')) {
dispatch(addSuccessToast('all_filters_up_to_date_toast'));
} else {
dispatch(addSuccessToast(refreshText.replace(/OK /g, '')));
}
} else {
dispatch(addErrorToast({ error: refreshText }));
}
dispatch(getFilteringStatus());
dispatch(hideLoading());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(refreshFiltersFailure());
dispatch(hideLoading());
}
};
export const handleRulesChange = createAction('HANDLE_RULES_CHANGE');
export const addFilterRequest = createAction('ADD_FILTER_REQUEST');
export const addFilterFailure = createAction('ADD_FILTER_FAILURE');
export const addFilterSuccess = createAction('ADD_FILTER_SUCCESS');
export const addFilter = (url, name) => async (dispatch) => {
dispatch(addFilterRequest());
try {
await apiClient.addFilter(url, name);
dispatch(addFilterSuccess(url));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(addFilterFailure());
}
};
export const removeFilterRequest = createAction('ADD_FILTER_REQUEST');
export const removeFilterFailure = createAction('ADD_FILTER_FAILURE');
export const removeFilterSuccess = createAction('ADD_FILTER_SUCCESS');
export const removeFilter = url => async (dispatch) => {
dispatch(removeFilterRequest());
try {
await apiClient.removeFilter(url);
dispatch(removeFilterSuccess(url));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(removeFilterFailure());
}
};
export const toggleFilteringModal = createAction('FILTERING_MODAL_TOGGLE');
</s> add </s> remove const filteringStatus = await apiClient.getFilteringStatus();
</s> add </s> remove case SETTINGS_NAMES.filtering:
if (status) {
successMessage = 'disabled_filtering_toast';
await apiClient.disableFiltering();
} else {
successMessage = 'enabled_filtering_toast';
await apiClient.enableFiltering();
}
dispatch(toggleSettingStatus({ settingKey }));
break;
</s> add </s> remove renderCheckbox = (row) => {
const { url } = row.original;
const { filters } = this.props.filtering;
const filter = filters.filter(filter => filter.url === url)[0];
</s> add renderCheckbox = ({ original }) => {
const { processingConfigFilter } = this.props.filtering;
const { url, enabled } = original; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/actions/index.js | |
<mask> dispatch(addErrorToast({ error }));
<mask> }
<mask> };
<mask>
<mask> export const setRulesRequest = createAction('SET_RULES_REQUEST');
<mask> export const setRulesFailure = createAction('SET_RULES_FAILURE');
<mask> export const setRulesSuccess = createAction('SET_RULES_SUCCESS');
<mask>
<mask> export const setRules = rules => async (dispatch) => {
<mask> dispatch(setRulesRequest());
<mask> try {
<mask> const replacedLineEndings = rules
<mask> .replace(/^\n/g, '')
<mask> .replace(/\n\s*\n/g, '\n');
<mask> await apiClient.setRules(replacedLineEndings);
<mask> dispatch(addSuccessToast('updated_custom_filtering_toast'));
<mask> dispatch(setRulesSuccess());
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(setRulesFailure());
<mask> }
<mask> };
<mask>
<mask> export const getFilteringStatusRequest = createAction('GET_FILTERING_STATUS_REQUEST');
<mask> export const getFilteringStatusFailure = createAction('GET_FILTERING_STATUS_FAILURE');
<mask> export const getFilteringStatusSuccess = createAction('GET_FILTERING_STATUS_SUCCESS');
<mask>
<mask> export const getFilteringStatus = () => async (dispatch) => {
<mask> dispatch(getFilteringStatusRequest());
<mask> try {
<mask> const status = await apiClient.getFilteringStatus();
<mask> dispatch(getFilteringStatusSuccess({ status: normalizeFilteringStatus(status) }));
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(getFilteringStatusFailure());
<mask> }
<mask> };
<mask>
<mask> export const toggleFilterRequest = createAction('FILTER_ENABLE_REQUEST');
<mask> export const toggleFilterFailure = createAction('FILTER_ENABLE_FAILURE');
<mask> export const toggleFilterSuccess = createAction('FILTER_ENABLE_SUCCESS');
<mask>
<mask> export const toggleFilterStatus = url => async (dispatch, getState) => {
<mask> dispatch(toggleFilterRequest());
<mask> const state = getState();
<mask> const { filters } = state.filtering;
<mask> const filter = filters.filter(filter => filter.url === url)[0];
<mask> const { enabled } = filter;
<mask> let toggleStatusMethod;
<mask> if (enabled) {
<mask> toggleStatusMethod = apiClient.disableFilter.bind(apiClient);
<mask> } else {
<mask> toggleStatusMethod = apiClient.enableFilter.bind(apiClient);
<mask> }
<mask> try {
<mask> await toggleStatusMethod(url);
<mask> dispatch(toggleFilterSuccess(url));
<mask> dispatch(getFilteringStatus());
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(toggleFilterFailure());
<mask> }
<mask> };
<mask>
<mask> export const refreshFiltersRequest = createAction('FILTERING_REFRESH_REQUEST');
<mask> export const refreshFiltersFailure = createAction('FILTERING_REFRESH_FAILURE');
<mask> export const refreshFiltersSuccess = createAction('FILTERING_REFRESH_SUCCESS');
<mask>
<mask> export const refreshFilters = () => async (dispatch) => {
<mask> dispatch(refreshFiltersRequest());
<mask> dispatch(showLoading());
<mask> try {
<mask> const refreshText = await apiClient.refreshFilters();
<mask> dispatch(refreshFiltersSuccess());
<mask>
<mask> if (refreshText.includes('OK')) {
<mask> if (refreshText.includes('OK 0')) {
<mask> dispatch(addSuccessToast('all_filters_up_to_date_toast'));
<mask> } else {
<mask> dispatch(addSuccessToast(refreshText.replace(/OK /g, '')));
<mask> }
<mask> } else {
<mask> dispatch(addErrorToast({ error: refreshText }));
<mask> }
<mask>
<mask> dispatch(getFilteringStatus());
<mask> dispatch(hideLoading());
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(refreshFiltersFailure());
<mask> dispatch(hideLoading());
<mask> }
<mask> };
<mask>
<mask> export const handleRulesChange = createAction('HANDLE_RULES_CHANGE');
<mask>
<mask> export const addFilterRequest = createAction('ADD_FILTER_REQUEST');
<mask> export const addFilterFailure = createAction('ADD_FILTER_FAILURE');
<mask> export const addFilterSuccess = createAction('ADD_FILTER_SUCCESS');
<mask>
<mask> export const addFilter = (url, name) => async (dispatch) => {
<mask> dispatch(addFilterRequest());
<mask> try {
<mask> await apiClient.addFilter(url, name);
<mask> dispatch(addFilterSuccess(url));
<mask> dispatch(getFilteringStatus());
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(addFilterFailure());
<mask> }
<mask> };
<mask>
<mask>
<mask> export const removeFilterRequest = createAction('ADD_FILTER_REQUEST');
<mask> export const removeFilterFailure = createAction('ADD_FILTER_FAILURE');
<mask> export const removeFilterSuccess = createAction('ADD_FILTER_SUCCESS');
<mask>
<mask> export const removeFilter = url => async (dispatch) => {
<mask> dispatch(removeFilterRequest());
<mask> try {
<mask> await apiClient.removeFilter(url);
<mask> dispatch(removeFilterSuccess(url));
<mask> dispatch(getFilteringStatus());
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(removeFilterFailure());
<mask> }
<mask> };
<mask>
<mask> export const toggleFilteringModal = createAction('FILTERING_MODAL_TOGGLE');
<mask>
<mask> export const handleUpstreamChange = createAction('HANDLE_UPSTREAM_CHANGE');
<mask> export const setUpstreamRequest = createAction('SET_UPSTREAM_REQUEST');
<mask> export const setUpstreamFailure = createAction('SET_UPSTREAM_FAILURE');
<mask> export const setUpstreamSuccess = createAction('SET_UPSTREAM_SUCCESS');
<mask>
</s> + client: handle filters configuration </s> remove export const getFilteringRequest = createAction('GET_FILTERING_REQUEST');
export const getFilteringFailure = createAction('GET_FILTERING_FAILURE');
export const getFilteringSuccess = createAction('GET_FILTERING_SUCCESS');
export const getFiltering = () => async (dispatch) => {
dispatch(getFilteringRequest());
try {
const filteringStatus = await apiClient.getFilteringStatus();
dispatch(getFilteringSuccess(filteringStatus.enabled));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(getFilteringFailure());
}
};
</s> add </s> remove case SETTINGS_NAMES.filtering:
if (status) {
successMessage = 'disabled_filtering_toast';
await apiClient.disableFiltering();
} else {
successMessage = 'enabled_filtering_toast';
await apiClient.enableFiltering();
}
dispatch(toggleSettingStatus({ settingKey }));
break;
</s> add </s> remove const filteringStatus = await apiClient.getFilteringStatus();
</s> add </s> remove renderCheckbox = (row) => {
const { url } = row.original;
const { filters } = this.props.filtering;
const filter = filters.filter(filter => filter.url === url)[0];
</s> add renderCheckbox = ({ original }) => {
const { processingConfigFilter } = this.props.filtering;
const { url, enabled } = original; | [
"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/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/actions/index.js | |
FILTERING_INFO = { path: 'filtering_info', method: 'GET' }; | <mask> return this.makeRequest(path, method);
<mask> }
<mask>
<mask> // Filtering
<mask> FILTERING_STATUS = { path: 'filtering/status', method: 'GET' };
<mask> FILTERING_ENABLE = { path: 'filtering/enable', method: 'POST' };
<mask> FILTERING_DISABLE = { path: 'filtering/disable', method: 'POST' };
<mask> FILTERING_ADD_FILTER = { path: 'filtering/add_url', method: 'POST' };
<mask> FILTERING_REMOVE_FILTER = { path: 'filtering/remove_url', method: 'POST' };
<mask> FILTERING_SET_RULES = { path: 'filtering/set_rules', method: 'POST' };
<mask> FILTERING_ENABLE_FILTER = { path: 'filtering/enable_url', method: 'POST' };
<mask> FILTERING_DISABLE_FILTER = { path: 'filtering/disable_url', method: 'POST' };
</s> + client: handle filters configuration </s> remove FILTERING_ENABLE_FILTER = { path: 'filtering/enable_url', method: 'POST' };
FILTERING_DISABLE_FILTER = { path: 'filtering/disable_url', method: 'POST' };
</s> add </s> remove const { path, method } = this.FILTERING_STATUS;
</s> add const { path, method } = this.FILTERING_INFO; </s> remove return this.makeRequest(path, method, config);
</s> add return this.makeRequest(path, method, parameters); </s> remove disableFilter(url) {
const { path, method } = this.FILTERING_DISABLE_FILTER;
const parameter = 'url';
const requestBody = `${parameter}=${url}`;
const config = {
data: requestBody,
header: { 'Content-Type': 'text/plain' },
</s> add setFilterUrl(config) {
const { path, method } = this.FILTERING_SET_URL;
const parameters = {
data: config,
headers: { 'Content-Type': 'application/json' }, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/api/Api.js |
<mask> FILTERING_DISABLE = { path: 'filtering/disable', method: 'POST' };
<mask> FILTERING_ADD_FILTER = { path: 'filtering/add_url', method: 'POST' };
<mask> FILTERING_REMOVE_FILTER = { path: 'filtering/remove_url', method: 'POST' };
<mask> FILTERING_SET_RULES = { path: 'filtering/set_rules', method: 'POST' };
<mask> FILTERING_ENABLE_FILTER = { path: 'filtering/enable_url', method: 'POST' };
<mask> FILTERING_DISABLE_FILTER = { path: 'filtering/disable_url', method: 'POST' };
<mask> FILTERING_REFRESH = { path: 'filtering/refresh', method: 'POST' };
<mask>
<mask> getFilteringStatus() {
<mask> const { path, method } = this.FILTERING_STATUS;
<mask> return this.makeRequest(path, method);
</s> + client: handle filters configuration </s> remove FILTERING_STATUS = { path: 'filtering/status', method: 'GET' };
FILTERING_ENABLE = { path: 'filtering/enable', method: 'POST' };
FILTERING_DISABLE = { path: 'filtering/disable', method: 'POST' };
</s> add FILTERING_INFO = { path: 'filtering_info', method: 'GET' }; </s> remove const { path, method } = this.FILTERING_STATUS;
</s> add const { path, method } = this.FILTERING_INFO; </s> remove return this.makeRequest(path, method, config);
</s> add return this.makeRequest(path, method, parameters); </s> remove enableFiltering() {
const { path, method } = this.FILTERING_ENABLE;
return this.makeRequest(path, method);
}
disableFiltering() {
const { path, method } = this.FILTERING_DISABLE;
return this.makeRequest(path, method);
}
// TODO find out when to use force parameter
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/api/Api.js | |
FILTERING_SET_URL = { path: 'filtering/set_url', method: 'POST' };
FILTERING_CONFIG = { path: 'filtering_config', method: 'POST' }; | <mask> FILTERING_REMOVE_FILTER = { path: 'filtering/remove_url', method: 'POST' };
<mask> FILTERING_SET_RULES = { path: 'filtering/set_rules', method: 'POST' };
<mask> FILTERING_REFRESH = { path: 'filtering/refresh', method: 'POST' };
<mask>
<mask> getFilteringStatus() {
<mask> const { path, method } = this.FILTERING_INFO;
<mask> return this.makeRequest(path, method);
</s> + client: handle filters configuration </s> remove FILTERING_ENABLE_FILTER = { path: 'filtering/enable_url', method: 'POST' };
FILTERING_DISABLE_FILTER = { path: 'filtering/disable_url', method: 'POST' };
</s> add </s> remove const { path, method } = this.FILTERING_STATUS;
</s> add const { path, method } = this.FILTERING_INFO; </s> remove FILTERING_STATUS = { path: 'filtering/status', method: 'GET' };
FILTERING_ENABLE = { path: 'filtering/enable', method: 'POST' };
FILTERING_DISABLE = { path: 'filtering/disable', method: 'POST' };
</s> add FILTERING_INFO = { path: 'filtering_info', method: 'GET' }; </s> remove return this.makeRequest(path, method, config);
</s> add return this.makeRequest(path, method, parameters); </s> remove enableFiltering() {
const { path, method } = this.FILTERING_ENABLE;
return this.makeRequest(path, method);
}
disableFiltering() {
const { path, method } = this.FILTERING_DISABLE;
return this.makeRequest(path, method);
}
// TODO find out when to use force parameter
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/api/Api.js |
const { path, method } = this.FILTERING_INFO; | <mask> FILTERING_DISABLE_FILTER = { path: 'filtering/disable_url', method: 'POST' };
<mask> FILTERING_REFRESH = { path: 'filtering/refresh', method: 'POST' };
<mask>
<mask> getFilteringStatus() {
<mask> const { path, method } = this.FILTERING_STATUS;
<mask> return this.makeRequest(path, method);
<mask> }
<mask>
<mask> enableFiltering() {
<mask> const { path, method } = this.FILTERING_ENABLE;
</s> + client: handle filters configuration </s> remove FILTERING_ENABLE_FILTER = { path: 'filtering/enable_url', method: 'POST' };
FILTERING_DISABLE_FILTER = { path: 'filtering/disable_url', method: 'POST' };
</s> add </s> remove FILTERING_STATUS = { path: 'filtering/status', method: 'GET' };
FILTERING_ENABLE = { path: 'filtering/enable', method: 'POST' };
FILTERING_DISABLE = { path: 'filtering/disable', method: 'POST' };
</s> add FILTERING_INFO = { path: 'filtering_info', method: 'GET' }; </s> remove enableFiltering() {
const { path, method } = this.FILTERING_ENABLE;
return this.makeRequest(path, method);
}
disableFiltering() {
const { path, method } = this.FILTERING_DISABLE;
return this.makeRequest(path, method);
}
// TODO find out when to use force parameter
</s> add </s> remove return this.makeRequest(path, method, config);
</s> add return this.makeRequest(path, method, parameters); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/api/Api.js |
<mask> const { path, method } = this.FILTERING_STATUS;
<mask> return this.makeRequest(path, method);
<mask> }
<mask>
<mask> enableFiltering() {
<mask> const { path, method } = this.FILTERING_ENABLE;
<mask> return this.makeRequest(path, method);
<mask> }
<mask>
<mask> disableFiltering() {
<mask> const { path, method } = this.FILTERING_DISABLE;
<mask> return this.makeRequest(path, method);
<mask> }
<mask>
<mask> // TODO find out when to use force parameter
<mask> refreshFilters() {
<mask> const { path, method } = this.FILTERING_REFRESH;
<mask> return this.makeRequest(path, method);
<mask> }
<mask>
</s> + client: handle filters configuration </s> remove const { path, method } = this.FILTERING_STATUS;
</s> add const { path, method } = this.FILTERING_INFO; </s> remove disableFilter(url) {
const { path, method } = this.FILTERING_DISABLE_FILTER;
const parameter = 'url';
const requestBody = `${parameter}=${url}`;
const config = {
data: requestBody,
header: { 'Content-Type': 'text/plain' },
</s> add setFilterUrl(config) {
const { path, method } = this.FILTERING_SET_URL;
const parameters = {
data: config,
headers: { 'Content-Type': 'application/json' }, </s> remove enableFilter(url) {
const { path, method } = this.FILTERING_ENABLE_FILTER;
const parameter = 'url';
const requestBody = `${parameter}=${url}`;
const config = {
data: requestBody,
header: { 'Content-Type': 'text/plain' },
</s> add setFiltersConfig(config) {
const { path, method } = this.FILTERING_CONFIG;
const parameters = {
data: config,
headers: { 'Content-Type': 'application/json' }, </s> remove return this.makeRequest(path, method, config);
</s> add return this.makeRequest(path, method, parameters); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/api/Api.js | |
setFiltersConfig(config) {
const { path, method } = this.FILTERING_CONFIG;
const parameters = {
data: config,
headers: { 'Content-Type': 'application/json' }, | <mask> };
<mask> return this.makeRequest(path, method, parameters);
<mask> }
<mask>
<mask> enableFilter(url) {
<mask> const { path, method } = this.FILTERING_ENABLE_FILTER;
<mask> const parameter = 'url';
<mask> const requestBody = `${parameter}=${url}`;
<mask> const config = {
<mask> data: requestBody,
<mask> header: { 'Content-Type': 'text/plain' },
<mask> };
<mask> return this.makeRequest(path, method, config);
<mask> }
<mask>
<mask> disableFilter(url) {
</s> + client: handle filters configuration </s> remove return this.makeRequest(path, method, config);
</s> add return this.makeRequest(path, method, parameters); </s> remove disableFilter(url) {
const { path, method } = this.FILTERING_DISABLE_FILTER;
const parameter = 'url';
const requestBody = `${parameter}=${url}`;
const config = {
data: requestBody,
header: { 'Content-Type': 'text/plain' },
</s> add setFilterUrl(config) {
const { path, method } = this.FILTERING_SET_URL;
const parameters = {
data: config,
headers: { 'Content-Type': 'application/json' }, </s> remove return this.makeRequest(path, method, config);
</s> add return this.makeRequest(path, method, parameters); </s> remove enableFiltering() {
const { path, method } = this.FILTERING_ENABLE;
return this.makeRequest(path, method);
}
disableFiltering() {
const { path, method } = this.FILTERING_DISABLE;
return this.makeRequest(path, method);
}
// TODO find out when to use force parameter
</s> add </s> remove const { path, method } = this.FILTERING_STATUS;
</s> add const { path, method } = this.FILTERING_INFO; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/api/Api.js |
return this.makeRequest(path, method, parameters); | <mask> const config = {
<mask> data: requestBody,
<mask> header: { 'Content-Type': 'text/plain' },
<mask> };
<mask> return this.makeRequest(path, method, config);
<mask> }
<mask>
<mask> disableFilter(url) {
<mask> const { path, method } = this.FILTERING_DISABLE_FILTER;
<mask> const parameter = 'url';
</s> + client: handle filters configuration </s> remove disableFilter(url) {
const { path, method } = this.FILTERING_DISABLE_FILTER;
const parameter = 'url';
const requestBody = `${parameter}=${url}`;
const config = {
data: requestBody,
header: { 'Content-Type': 'text/plain' },
</s> add setFilterUrl(config) {
const { path, method } = this.FILTERING_SET_URL;
const parameters = {
data: config,
headers: { 'Content-Type': 'application/json' }, </s> remove enableFilter(url) {
const { path, method } = this.FILTERING_ENABLE_FILTER;
const parameter = 'url';
const requestBody = `${parameter}=${url}`;
const config = {
data: requestBody,
header: { 'Content-Type': 'text/plain' },
</s> add setFiltersConfig(config) {
const { path, method } = this.FILTERING_CONFIG;
const parameters = {
data: config,
headers: { 'Content-Type': 'application/json' }, </s> remove return this.makeRequest(path, method, config);
</s> add return this.makeRequest(path, method, parameters); </s> remove enableFiltering() {
const { path, method } = this.FILTERING_ENABLE;
return this.makeRequest(path, method);
}
disableFiltering() {
const { path, method } = this.FILTERING_DISABLE;
return this.makeRequest(path, method);
}
// TODO find out when to use force parameter
</s> add </s> remove const { path, method } = this.FILTERING_STATUS;
</s> add const { path, method } = this.FILTERING_INFO; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/api/Api.js |
setFilterUrl(config) {
const { path, method } = this.FILTERING_SET_URL;
const parameters = {
data: config,
headers: { 'Content-Type': 'application/json' }, | <mask> };
<mask> return this.makeRequest(path, method, config);
<mask> }
<mask>
<mask> disableFilter(url) {
<mask> const { path, method } = this.FILTERING_DISABLE_FILTER;
<mask> const parameter = 'url';
<mask> const requestBody = `${parameter}=${url}`;
<mask> const config = {
<mask> data: requestBody,
<mask> header: { 'Content-Type': 'text/plain' },
<mask> };
<mask> return this.makeRequest(path, method, config);
<mask> }
<mask>
<mask> // Parental
</s> + client: handle filters configuration </s> remove return this.makeRequest(path, method, config);
</s> add return this.makeRequest(path, method, parameters); </s> remove enableFilter(url) {
const { path, method } = this.FILTERING_ENABLE_FILTER;
const parameter = 'url';
const requestBody = `${parameter}=${url}`;
const config = {
data: requestBody,
header: { 'Content-Type': 'text/plain' },
</s> add setFiltersConfig(config) {
const { path, method } = this.FILTERING_CONFIG;
const parameters = {
data: config,
headers: { 'Content-Type': 'application/json' }, </s> remove return this.makeRequest(path, method, config);
</s> add return this.makeRequest(path, method, parameters); </s> remove enableFiltering() {
const { path, method } = this.FILTERING_ENABLE;
return this.makeRequest(path, method);
}
disableFiltering() {
const { path, method } = this.FILTERING_DISABLE;
return this.makeRequest(path, method);
}
// TODO find out when to use force parameter
</s> add </s> remove const { path, method } = this.FILTERING_STATUS;
</s> add const { path, method } = this.FILTERING_INFO; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/api/Api.js |
return this.makeRequest(path, method, parameters); | <mask> const config = {
<mask> data: requestBody,
<mask> header: { 'Content-Type': 'text/plain' },
<mask> };
<mask> return this.makeRequest(path, method, config);
<mask> }
<mask>
<mask> // Parental
<mask> PARENTAL_STATUS = { path: 'parental/status', method: 'GET' };
<mask> PARENTAL_ENABLE = { path: 'parental/enable', method: 'POST' };
</s> + client: handle filters configuration </s> remove disableFilter(url) {
const { path, method } = this.FILTERING_DISABLE_FILTER;
const parameter = 'url';
const requestBody = `${parameter}=${url}`;
const config = {
data: requestBody,
header: { 'Content-Type': 'text/plain' },
</s> add setFilterUrl(config) {
const { path, method } = this.FILTERING_SET_URL;
const parameters = {
data: config,
headers: { 'Content-Type': 'application/json' }, </s> remove FILTERING_STATUS = { path: 'filtering/status', method: 'GET' };
FILTERING_ENABLE = { path: 'filtering/enable', method: 'POST' };
FILTERING_DISABLE = { path: 'filtering/disable', method: 'POST' };
</s> add FILTERING_INFO = { path: 'filtering_info', method: 'GET' }; </s> remove return this.makeRequest(path, method, config);
</s> add return this.makeRequest(path, method, parameters); </s> remove enableFilter(url) {
const { path, method } = this.FILTERING_ENABLE_FILTER;
const parameter = 'url';
const requestBody = `${parameter}=${url}`;
const config = {
data: requestBody,
header: { 'Content-Type': 'text/plain' },
</s> add setFiltersConfig(config) {
const { path, method } = this.FILTERING_CONFIG;
const parameters = {
data: config,
headers: { 'Content-Type': 'application/json' }, </s> remove FILTERING_ENABLE_FILTER = { path: 'filtering/enable_url', method: 'POST' };
FILTERING_DISABLE_FILTER = { path: 'filtering/disable_url', method: 'POST' };
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/api/Api.js |
<mask> const { value: name } = e.currentTarget;
<mask> this.setState({ ...this.state, name });
<mask> };
<mask>
<mask> handleNext = () => {
<mask> this.props.addFilter(this.state.url, this.state.name);
<mask> setTimeout(() => {
<mask> if (this.props.isFilterAdded) {
<mask> this.closeModal();
<mask> }
<mask> }, 2000);
<mask> };
<mask>
<mask> closeModal = () => {
<mask> this.props.toggleModal();
<mask> this.setState({ ...this.state, ...initialState });
<mask> }
<mask>
</s> + client: handle filters configuration </s> remove }
</s> add }; </s> remove const {
isOpen,
title,
inputDescription,
processingAddFilter,
} = this.props;
</s> add const { isOpen, processingAddFilter } = this.props; </s> remove renderCheckbox = (row) => {
const { url } = row.original;
const { filters } = this.props.filtering;
const filter = filters.filter(filter => filter.url === url)[0];
</s> add renderCheckbox = ({ original }) => {
const { processingConfigFilter } = this.props.filtering;
const { url, enabled } = original; </s> remove export const setRulesRequest = createAction('SET_RULES_REQUEST');
export const setRulesFailure = createAction('SET_RULES_FAILURE');
export const setRulesSuccess = createAction('SET_RULES_SUCCESS');
export const setRules = rules => async (dispatch) => {
dispatch(setRulesRequest());
try {
const replacedLineEndings = rules
.replace(/^\n/g, '')
.replace(/\n\s*\n/g, '\n');
await apiClient.setRules(replacedLineEndings);
dispatch(addSuccessToast('updated_custom_filtering_toast'));
dispatch(setRulesSuccess());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setRulesFailure());
}
};
export const getFilteringStatusRequest = createAction('GET_FILTERING_STATUS_REQUEST');
export const getFilteringStatusFailure = createAction('GET_FILTERING_STATUS_FAILURE');
export const getFilteringStatusSuccess = createAction('GET_FILTERING_STATUS_SUCCESS');
export const getFilteringStatus = () => async (dispatch) => {
dispatch(getFilteringStatusRequest());
try {
const status = await apiClient.getFilteringStatus();
dispatch(getFilteringStatusSuccess({ status: normalizeFilteringStatus(status) }));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(getFilteringStatusFailure());
}
};
export const toggleFilterRequest = createAction('FILTER_ENABLE_REQUEST');
export const toggleFilterFailure = createAction('FILTER_ENABLE_FAILURE');
export const toggleFilterSuccess = createAction('FILTER_ENABLE_SUCCESS');
export const toggleFilterStatus = url => async (dispatch, getState) => {
dispatch(toggleFilterRequest());
const state = getState();
const { filters } = state.filtering;
const filter = filters.filter(filter => filter.url === url)[0];
const { enabled } = filter;
let toggleStatusMethod;
if (enabled) {
toggleStatusMethod = apiClient.disableFilter.bind(apiClient);
} else {
toggleStatusMethod = apiClient.enableFilter.bind(apiClient);
}
try {
await toggleStatusMethod(url);
dispatch(toggleFilterSuccess(url));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleFilterFailure());
}
};
export const refreshFiltersRequest = createAction('FILTERING_REFRESH_REQUEST');
export const refreshFiltersFailure = createAction('FILTERING_REFRESH_FAILURE');
export const refreshFiltersSuccess = createAction('FILTERING_REFRESH_SUCCESS');
export const refreshFilters = () => async (dispatch) => {
dispatch(refreshFiltersRequest());
dispatch(showLoading());
try {
const refreshText = await apiClient.refreshFilters();
dispatch(refreshFiltersSuccess());
if (refreshText.includes('OK')) {
if (refreshText.includes('OK 0')) {
dispatch(addSuccessToast('all_filters_up_to_date_toast'));
} else {
dispatch(addSuccessToast(refreshText.replace(/OK /g, '')));
}
} else {
dispatch(addErrorToast({ error: refreshText }));
}
dispatch(getFilteringStatus());
dispatch(hideLoading());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(refreshFiltersFailure());
dispatch(hideLoading());
}
};
export const handleRulesChange = createAction('HANDLE_RULES_CHANGE');
export const addFilterRequest = createAction('ADD_FILTER_REQUEST');
export const addFilterFailure = createAction('ADD_FILTER_FAILURE');
export const addFilterSuccess = createAction('ADD_FILTER_SUCCESS');
export const addFilter = (url, name) => async (dispatch) => {
dispatch(addFilterRequest());
try {
await apiClient.addFilter(url, name);
dispatch(addFilterSuccess(url));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(addFilterFailure());
}
};
export const removeFilterRequest = createAction('ADD_FILTER_REQUEST');
export const removeFilterFailure = createAction('ADD_FILTER_FAILURE');
export const removeFilterSuccess = createAction('ADD_FILTER_SUCCESS');
export const removeFilter = url => async (dispatch) => {
dispatch(removeFilterRequest());
try {
await apiClient.removeFilter(url);
dispatch(removeFilterSuccess(url));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(removeFilterFailure());
}
};
export const toggleFilteringModal = createAction('FILTERING_MODAL_TOGGLE');
</s> add </s> remove export const getFilteringRequest = createAction('GET_FILTERING_REQUEST');
export const getFilteringFailure = createAction('GET_FILTERING_FAILURE');
export const getFilteringSuccess = createAction('GET_FILTERING_SUCCESS');
export const getFiltering = () => async (dispatch) => {
dispatch(getFilteringRequest());
try {
const filteringStatus = await apiClient.getFilteringStatus();
dispatch(getFilteringSuccess(filteringStatus.enabled));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(getFilteringFailure());
}
};
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Filters/Modal.js | |
}; | <mask>
<mask> closeModal = () => {
<mask> this.props.toggleModal();
<mask> this.setState({ ...this.state, ...initialState });
<mask> }
<mask>
<mask> render() {
<mask> const {
<mask> isOpen,
<mask> title,
</s> + client: handle filters configuration </s> remove handleNext = () => {
this.props.addFilter(this.state.url, this.state.name);
setTimeout(() => {
if (this.props.isFilterAdded) {
this.closeModal();
}
}, 2000);
};
</s> add </s> remove const {
isOpen,
title,
inputDescription,
processingAddFilter,
} = this.props;
</s> add const { isOpen, processingAddFilter } = this.props; </s> remove renderCheckbox = (row) => {
const { url } = row.original;
const { filters } = this.props.filtering;
const filter = filters.filter(filter => filter.url === url)[0];
</s> add renderCheckbox = ({ original }) => {
const { processingConfigFilter } = this.props.filtering;
const { url, enabled } = original; </s> remove const { t } = this.props;
</s> add const { t, userRules } = this.props; </s> remove export const getFilteringRequest = createAction('GET_FILTERING_REQUEST');
export const getFilteringFailure = createAction('GET_FILTERING_FAILURE');
export const getFilteringSuccess = createAction('GET_FILTERING_SUCCESS');
export const getFiltering = () => async (dispatch) => {
dispatch(getFilteringRequest());
try {
const filteringStatus = await apiClient.getFilteringStatus();
dispatch(getFilteringSuccess(filteringStatus.enabled));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(getFilteringFailure());
}
};
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Filters/Modal.js |
const { isOpen, processingAddFilter } = this.props; | <mask> this.setState({ ...this.state, ...initialState });
<mask> }
<mask>
<mask> render() {
<mask> const {
<mask> isOpen,
<mask> title,
<mask> inputDescription,
<mask> processingAddFilter,
<mask> } = this.props;
<mask> const { isUrlValid, url, name } = this.state;
<mask> const inputUrlClass = classnames({
<mask> 'form-control mb-2': true,
<mask> 'is-invalid': url.length > 0 && !isUrlValid,
<mask> 'is-valid': url.length > 0 && isUrlValid,
</s> + client: handle filters configuration </s> remove
const renderBody = () => {
if (!this.props.isFilterAdded) {
return (
<React.Fragment>
<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} />
{inputDescription &&
<div className="description">
{inputDescription}
</div>}
</React.Fragment>
);
}
return (
<div className="description">
<Trans>filter_added_successfully</Trans>
</div>
);
};
const isValidForSubmit = !(url.length > 0 && isUrlValid && name.length > 0);
</s> add const isValidForSubmit = url.length > 0 && isUrlValid && name.length > 0; </s> remove }
</s> add }; </s> remove handleNext = () => {
this.props.addFilter(this.state.url, this.state.name);
setTimeout(() => {
if (this.props.isFilterAdded) {
this.closeModal();
}
}, 2000);
};
</s> add </s> remove const { t } = this.props;
const { filters, userRules, processingRefreshFilters } = this.props.filtering;
</s> add const {
filtering, t, toggleFilteringModal, refreshFilters, addFilter,
} = this.props;
const {
filters,
userRules,
isModalOpen,
isFilterAdded,
processingRefreshFilters,
processingRemoveFilter,
processingAddFilter,
processingFilters,
} = filtering;
</s> remove return { enabled, userRules: newUserRules, filters: newFilters };
</s> add return {
enabled,
userRules: newUserRules,
filters: newFilters,
interval,
}; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Filters/Modal.js |
const isValidForSubmit = url.length > 0 && isUrlValid && name.length > 0; | <mask> const inputNameClass = classnames({
<mask> 'form-control mb-2': true,
<mask> 'is-valid': name.length > 0,
<mask> });
<mask>
<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>
<mask> );
<mask> }
<mask> return (
<mask> <div className="description">
<mask> <Trans>filter_added_successfully</Trans>
<mask> </div>
<mask> );
<mask> };
<mask>
<mask> const isValidForSubmit = !(url.length > 0 && isUrlValid && name.length > 0);
<mask>
<mask> return (
<mask> <ReactModal
<mask> className="Modal__Bootstrap modal-dialog modal-dialog-centered"
<mask> closeTimeoutMS={0}
</s> + client: handle filters configuration </s> remove {renderBody()}
</div>
{!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>
</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}
/>
<div className="description">
<Trans>enter_valid_filter_url</Trans> </s> remove const {
isOpen,
title,
inputDescription,
processingAddFilter,
} = this.props;
</s> add const { isOpen, processingAddFilter } = this.props; </s> remove if (Object.keys(settings).length > 0) {
return Object.keys(settings).map((key) => {
</s> add const settingsKeys = Object.keys(settings);
if (settingsKeys.length > 0) {
return settingsKeys.map((key) => { </s> remove key={key}
</s> add </s> remove <input type="checkbox" className="checkbox__input" onChange={() => this.props.toggleFilterStatus(filter.url)} checked={filter.enabled}/>
<span className="checkbox__label"/>
</s> add <input
type="checkbox"
className="checkbox__input"
onChange={() => this.props.toggleFilterStatus(url, enabled)}
checked={enabled}
disabled={processingConfigFilter}
/>
<span className="checkbox__label" /> | [
"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/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Filters/Modal.js |
<h4 className="modal-title">
<Trans>new_filter_btn</Trans>
</h4>
<button type="button" className="close" onClick={this.closeModal}>
<span className="sr-only">Close</span>
</button> | <mask> onRequestClose={this.closeModal}
<mask> >
<mask> <div className="modal-content">
<mask> <div className="modal-header">
<mask> <h4 className="modal-title">
<mask> {title}
<mask> </h4>
<mask> <button type="button" className="close" onClick={this.closeModal}>
<mask> <span className="sr-only">Close</span>
<mask> </button>
<mask> </div>
<mask> <div className="modal-body">
<mask> {renderBody()}
<mask> </div>
<mask> {!this.props.isFilterAdded &&
</s> + client: handle filters configuration </s> remove {renderBody()}
</div>
{!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>
</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}
/>
<div className="description">
<Trans>enter_valid_filter_url</Trans> </s> remove }
</s> add </div>
<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.props.addFilter(url, name)}
disabled={!isValidForSubmit || processingAddFilter}
>
<Trans>add_filter_btn</Trans>
</button>
</div> </s> remove onClick={this.props.toggleFilteringModal}
</s> add onClick={toggleFilteringModal} </s> remove onClick={this.props.refreshFilters}
</s> add onClick={refreshFilters} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Filters/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}
/>
<div className="description">
<Trans>enter_valid_filter_url</Trans> | <mask> <span className="sr-only">Close</span>
<mask> </button>
<mask> </div>
<mask> <div className="modal-body">
<mask> {renderBody()}
<mask> </div>
<mask> {!this.props.isFilterAdded &&
<mask> <div className="modal-footer">
<mask> <button
<mask> type="button"
<mask> className="btn btn-secondary"
<mask> onClick={this.closeModal}
<mask> >
<mask> <Trans>cancel_btn</Trans>
<mask> </button>
<mask> <button
<mask> type="button"
<mask> className="btn btn-success"
<mask> onClick={this.handleNext}
<mask> disabled={isValidForSubmit || processingAddFilter}
<mask> >
<mask> <Trans>add_filter_btn</Trans>
<mask> </button>
<mask> </div>
<mask> }
<mask> </div>
<mask> </ReactModal>
<mask> );
</s> + client: handle filters configuration </s> remove }
</s> add </div>
<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.props.addFilter(url, name)}
disabled={!isValidForSubmit || processingAddFilter}
>
<Trans>add_filter_btn</Trans>
</button>
</div> </s> remove <h4 className="modal-title">
{title}
</h4>
<button type="button" className="close" onClick={this.closeModal}>
<span className="sr-only">Close</span>
</button>
</s> add <h4 className="modal-title">
<Trans>new_filter_btn</Trans>
</h4>
<button type="button" className="close" onClick={this.closeModal}>
<span className="sr-only">Close</span>
</button> </s> remove onClick={this.props.refreshFilters}
</s> add onClick={refreshFilters} </s> remove onClick={this.props.toggleFilteringModal}
</s> add onClick={toggleFilteringModal} </s> remove
const renderBody = () => {
if (!this.props.isFilterAdded) {
return (
<React.Fragment>
<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} />
{inputDescription &&
<div className="description">
{inputDescription}
</div>}
</React.Fragment>
);
}
return (
<div className="description">
<Trans>filter_added_successfully</Trans>
</div>
);
};
const isValidForSubmit = !(url.length > 0 && isUrlValid && name.length > 0);
</s> add const isValidForSubmit = url.length > 0 && isUrlValid && name.length > 0; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
... | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Filters/Modal.js |
</div>
<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.props.addFilter(url, name)}
disabled={!isValidForSubmit || processingAddFilter}
>
<Trans>add_filter_btn</Trans>
</button>
</div> | <mask> >
<mask> <Trans>add_filter_btn</Trans>
<mask> </button>
<mask> </div>
<mask> }
<mask> </div>
<mask> </ReactModal>
<mask> );
<mask> }
<mask> }
</s> + client: handle filters configuration </s> remove {renderBody()}
</div>
{!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>
</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}
/>
<div className="description">
<Trans>enter_valid_filter_url</Trans> </s> remove isOpen={this.props.filtering.isFilteringModalOpen}
toggleModal={this.props.toggleFilteringModal}
addFilter={this.props.addFilter}
isFilterAdded={this.props.filtering.isFilterAdded}
processingAddFilter={this.props.filtering.processingAddFilter}
title={ t('new_filter_btn') }
inputDescription={ t('enter_valid_filter_url') }
</s> add isOpen={isModalOpen}
toggleModal={toggleFilteringModal}
addFilter={addFilter}
isFilterAdded={isFilterAdded}
processingAddFilter={processingAddFilter} </s> remove </div>
</s> add </Fragment> </s> remove onClick={this.props.refreshFilters}
</s> add onClick={refreshFilters} </s> remove <h4 className="modal-title">
{title}
</h4>
<button type="button" className="close" onClick={this.closeModal}>
<span className="sr-only">Close</span>
</button>
</s> add <h4 className="modal-title">
<Trans>new_filter_btn</Trans>
</h4>
<button type="button" className="close" onClick={this.closeModal}>
<span className="sr-only">Close</span>
</button> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Filters/Modal.js |
<mask>
<mask> Modal.propTypes = {
<mask> toggleModal: PropTypes.func.isRequired,
<mask> isOpen: PropTypes.bool.isRequired,
<mask> title: PropTypes.string.isRequired,
<mask> inputDescription: PropTypes.string,
<mask> addFilter: PropTypes.func.isRequired,
<mask> isFilterAdded: PropTypes.bool,
<mask> processingAddFilter: PropTypes.bool,
<mask> t: PropTypes.func,
<mask> };
</s> + client: handle filters configuration </s> remove isFilterAdded: PropTypes.bool,
processingAddFilter: PropTypes.bool,
t: PropTypes.func,
</s> add isFilterAdded: PropTypes.bool.isRequired,
processingAddFilter: PropTypes.bool.isRequired,
t: PropTypes.func.isRequired, </s> remove userRules: PropTypes.string,
filters: PropTypes.array,
isFilteringModalOpen: PropTypes.bool.isRequired,
isFilterAdded: PropTypes.bool,
processingAddFilter: PropTypes.bool,
processingRefreshFilters: PropTypes.bool,
</s> add userRules: PropTypes.string.isRequired,
filters: PropTypes.array.isRequired,
isModalOpen: PropTypes.bool.isRequired,
isFilterAdded: PropTypes.bool.isRequired,
processingFilters: PropTypes.bool.isRequired,
processingAddFilter: PropTypes.bool.isRequired,
processingRefreshFilters: PropTypes.bool.isRequired,
processingConfigFilter: PropTypes.bool.isRequired,
processingRemoveFilter: PropTypes.bool.isRequired, </s> remove userRules: PropTypes.string,
handleRulesChange: PropTypes.func,
handleRulesSubmit: PropTypes.func,
t: PropTypes.func,
</s> add userRules: PropTypes.string.isRequired,
handleRulesChange: PropTypes.func.isRequired,
handleRulesSubmit: PropTypes.func.isRequired,
t: PropTypes.func.isRequired, </s> remove t: PropTypes.func,
</s> add t: PropTypes.func.isRequired, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Filters/Modal.js | |
isFilterAdded: PropTypes.bool.isRequired,
processingAddFilter: PropTypes.bool.isRequired,
t: PropTypes.func.isRequired, | <mask> isOpen: PropTypes.bool.isRequired,
<mask> title: PropTypes.string.isRequired,
<mask> inputDescription: PropTypes.string,
<mask> addFilter: PropTypes.func.isRequired,
<mask> isFilterAdded: PropTypes.bool,
<mask> processingAddFilter: PropTypes.bool,
<mask> t: PropTypes.func,
<mask> };
<mask>
<mask> export default withNamespaces()(Modal);
</s> + client: handle filters configuration </s> remove title: PropTypes.string.isRequired,
inputDescription: PropTypes.string,
</s> add </s> remove userRules: PropTypes.string,
filters: PropTypes.array,
isFilteringModalOpen: PropTypes.bool.isRequired,
isFilterAdded: PropTypes.bool,
processingAddFilter: PropTypes.bool,
processingRefreshFilters: PropTypes.bool,
</s> add userRules: PropTypes.string.isRequired,
filters: PropTypes.array.isRequired,
isModalOpen: PropTypes.bool.isRequired,
isFilterAdded: PropTypes.bool.isRequired,
processingFilters: PropTypes.bool.isRequired,
processingAddFilter: PropTypes.bool.isRequired,
processingRefreshFilters: PropTypes.bool.isRequired,
processingConfigFilter: PropTypes.bool.isRequired,
processingRemoveFilter: PropTypes.bool.isRequired, </s> remove userRules: PropTypes.string,
handleRulesChange: PropTypes.func,
handleRulesSubmit: PropTypes.func,
t: PropTypes.func,
</s> add userRules: PropTypes.string.isRequired,
handleRulesChange: PropTypes.func.isRequired,
handleRulesSubmit: PropTypes.func.isRequired,
t: PropTypes.func.isRequired, </s> remove t: PropTypes.func,
</s> add t: PropTypes.func.isRequired, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Filters/Modal.js |
const { t, userRules } = this.props; | <mask> this.props.handleRulesSubmit();
<mask> };
<mask>
<mask> render() {
<mask> const { t } = this.props;
<mask> return (
<mask> <Card title={t('custom_filter_rules')} subtitle={t('custom_filter_rules_hint')}>
<mask> <form onSubmit={this.handleSubmit}>
<mask> <textarea
<mask> className="form-control form-control--textarea-large"
</s> + client: handle filters configuration </s> remove value={this.props.userRules}
</s> add value={userRules} </s> remove <div>
<PageTitle title={ t('filters') } />
</s> add <Fragment>
<PageTitle title={t('filters')} /> </s> remove const { t } = this.props;
const { filters, userRules, processingRefreshFilters } = this.props.filtering;
</s> add const {
filtering, t, toggleFilteringModal, refreshFilters, addFilter,
} = this.props;
const {
filters,
userRules,
isModalOpen,
isFilterAdded,
processingRefreshFilters,
processingRemoveFilter,
processingAddFilter,
processingFilters,
} = filtering;
</s> remove const {
isOpen,
title,
inputDescription,
processingAddFilter,
} = this.props;
</s> add const { isOpen, processingAddFilter } = this.props; </s> remove }
</s> add }; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Filters/UserRules.js |
value={userRules} | <mask> <Card title={t('custom_filter_rules')} subtitle={t('custom_filter_rules_hint')}>
<mask> <form onSubmit={this.handleSubmit}>
<mask> <textarea
<mask> className="form-control form-control--textarea-large"
<mask> value={this.props.userRules}
<mask> onChange={this.handleChange}
<mask> />
<mask> <div className="card-actions">
<mask> <button
<mask> className="btn btn-success btn-standard"
</s> + client: handle filters configuration </s> remove const { t } = this.props;
</s> add const { t, userRules } = this.props; </s> remove onClick={this.props.toggleFilteringModal}
</s> add onClick={toggleFilteringModal} </s> remove // Text
previousText={ t('previous_btn') }
nextText={ t('next_btn') }
loadingText={ t('loading_table_status') }
pageText={ t('page_table_footer_text') }
ofText={ t('of_table_footer_text') }
rowsText={ t('rows_table_footer_text') }
noDataText={ t('no_filters_added') }
</s> add previousText={t('previous_btn')}
nextText={t('next_btn')}
loadingText={t('loading_table_status')}
pageText={t('page_table_footer_text')}
ofText={t('of_table_footer_text')}
rowsText={t('rows_table_footer_text')}
noDataText={t('no_filters_added')} </s> remove onClick={this.props.refreshFilters}
</s> add onClick={refreshFilters} </s> remove {renderBody()}
</div>
{!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>
</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}
/>
<div className="description">
<Trans>enter_valid_filter_url</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Filters/UserRules.js |
userRules: PropTypes.string.isRequired,
handleRulesChange: PropTypes.func.isRequired,
handleRulesSubmit: PropTypes.func.isRequired,
t: PropTypes.func.isRequired, | <mask> }
<mask> }
<mask>
<mask> UserRules.propTypes = {
<mask> userRules: PropTypes.string,
<mask> handleRulesChange: PropTypes.func,
<mask> handleRulesSubmit: PropTypes.func,
<mask> t: PropTypes.func,
<mask> };
<mask>
<mask> export default withNamespaces()(UserRules);
</s> + client: handle filters configuration </s> remove t: PropTypes.func,
</s> add t: PropTypes.func.isRequired, </s> remove isFilterAdded: PropTypes.bool,
processingAddFilter: PropTypes.bool,
t: PropTypes.func,
</s> add isFilterAdded: PropTypes.bool.isRequired,
processingAddFilter: PropTypes.bool.isRequired,
t: PropTypes.func.isRequired, </s> remove title: PropTypes.string.isRequired,
inputDescription: PropTypes.string,
</s> add </s> remove userRules: PropTypes.string,
filters: PropTypes.array,
isFilteringModalOpen: PropTypes.bool.isRequired,
isFilterAdded: PropTypes.bool,
processingAddFilter: PropTypes.bool,
processingRefreshFilters: PropTypes.bool,
</s> add userRules: PropTypes.string.isRequired,
filters: PropTypes.array.isRequired,
isModalOpen: PropTypes.bool.isRequired,
isFilterAdded: PropTypes.bool.isRequired,
processingFilters: PropTypes.bool.isRequired,
processingAddFilter: PropTypes.bool.isRequired,
processingRefreshFilters: PropTypes.bool.isRequired,
processingConfigFilter: PropTypes.bool.isRequired,
processingRemoveFilter: PropTypes.bool.isRequired, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Filters/UserRules.js |
import React, { Component, Fragment } from 'react'; | <mask> import React, { Component } from 'react';
<mask> import ReactTable from 'react-table';
<mask> import PropTypes from 'prop-types';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask> import Modal from './Modal';
<mask> import PageTitle from '../ui/PageTitle';
</s> + client: handle filters configuration </s> remove import Modal from './Modal';
</s> add </s> remove import { formatTime, getClientName } from '../../helpers/helpers';
</s> add import { formatTime, formatDateTime, getClientName } from '../../helpers/helpers'; | [
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Filters/index.js |
<mask> import React, { Component } from 'react';
<mask> import ReactTable from 'react-table';
<mask> import PropTypes from 'prop-types';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask> import Modal from './Modal';
<mask> import PageTitle from '../ui/PageTitle';
<mask> import Card from '../ui/Card';
<mask> import UserRules from './UserRules';
<mask>
<mask> class Filters extends Component {
</s> + client: handle filters configuration </s> remove import React, { Component } from 'react';
</s> add import React, { Component, Fragment } from 'react'; </s> remove import { formatTime, getClientName } from '../../helpers/helpers';
</s> add import { formatTime, formatDateTime, getClientName } from '../../helpers/helpers'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Filters/index.js | |
import CellWrap from '../ui/CellWrap'; | <mask> import PageTitle from '../ui/PageTitle';
<mask> import Card from '../ui/Card';
<mask> import UserRules from './UserRules';
<mask> import Modal from './Modal';
<mask>
<mask> class Filters extends Component {
<mask> componentDidMount() {
</s> + client: handle filters configuration </s> remove import Modal from './Modal';
</s> add </s> remove import React, { Component } from 'react';
</s> add import React, { Component, Fragment } from 'react'; </s> remove import { formatTime, getClientName } from '../../helpers/helpers';
</s> add import { formatTime, formatDateTime, getClientName } from '../../helpers/helpers'; | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Filters/index.js |
import Modal from './Modal'; | <mask> import PageTitle from '../ui/PageTitle';
<mask> import Card from '../ui/Card';
<mask> import CellWrap from '../ui/CellWrap';
<mask> import UserRules from './UserRules';
<mask>
<mask> class Filters extends Component {
<mask> componentDidMount() {
<mask> this.props.getFilteringStatus();
<mask> }
<mask>
</s> + client: handle filters configuration </s> remove import Modal from './Modal';
</s> add </s> remove import { formatTime, getClientName } from '../../helpers/helpers';
</s> add import { formatTime, formatDateTime, getClientName } from '../../helpers/helpers'; </s> remove import React, { Component } from 'react';
</s> add import React, { Component, Fragment } from 'react'; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Filters/index.js |
renderCheckbox = ({ original }) => {
const { processingConfigFilter } = this.props.filtering;
const { url, enabled } = original; | <mask> handleRulesSubmit = () => {
<mask> this.props.setRules(this.props.filtering.userRules);
<mask> };
<mask>
<mask> renderCheckbox = (row) => {
<mask> const { url } = row.original;
<mask> const { filters } = this.props.filtering;
<mask> const filter = filters.filter(filter => filter.url === url)[0];
<mask> return (
<mask> <label className="checkbox">
<mask> <input type="checkbox" className="checkbox__input" onChange={() => this.props.toggleFilterStatus(filter.url)} checked={filter.enabled}/>
<mask> <span className="checkbox__label"/>
<mask> </label>
</s> + client: handle filters configuration </s> remove <input type="checkbox" className="checkbox__input" onChange={() => this.props.toggleFilterStatus(filter.url)} checked={filter.enabled}/>
<span className="checkbox__label"/>
</s> add <input
type="checkbox"
className="checkbox__input"
onChange={() => this.props.toggleFilterStatus(url, enabled)}
checked={enabled}
disabled={processingConfigFilter}
/>
<span className="checkbox__label" /> </s> remove export const setRulesRequest = createAction('SET_RULES_REQUEST');
export const setRulesFailure = createAction('SET_RULES_FAILURE');
export const setRulesSuccess = createAction('SET_RULES_SUCCESS');
export const setRules = rules => async (dispatch) => {
dispatch(setRulesRequest());
try {
const replacedLineEndings = rules
.replace(/^\n/g, '')
.replace(/\n\s*\n/g, '\n');
await apiClient.setRules(replacedLineEndings);
dispatch(addSuccessToast('updated_custom_filtering_toast'));
dispatch(setRulesSuccess());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setRulesFailure());
}
};
export const getFilteringStatusRequest = createAction('GET_FILTERING_STATUS_REQUEST');
export const getFilteringStatusFailure = createAction('GET_FILTERING_STATUS_FAILURE');
export const getFilteringStatusSuccess = createAction('GET_FILTERING_STATUS_SUCCESS');
export const getFilteringStatus = () => async (dispatch) => {
dispatch(getFilteringStatusRequest());
try {
const status = await apiClient.getFilteringStatus();
dispatch(getFilteringStatusSuccess({ status: normalizeFilteringStatus(status) }));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(getFilteringStatusFailure());
}
};
export const toggleFilterRequest = createAction('FILTER_ENABLE_REQUEST');
export const toggleFilterFailure = createAction('FILTER_ENABLE_FAILURE');
export const toggleFilterSuccess = createAction('FILTER_ENABLE_SUCCESS');
export const toggleFilterStatus = url => async (dispatch, getState) => {
dispatch(toggleFilterRequest());
const state = getState();
const { filters } = state.filtering;
const filter = filters.filter(filter => filter.url === url)[0];
const { enabled } = filter;
let toggleStatusMethod;
if (enabled) {
toggleStatusMethod = apiClient.disableFilter.bind(apiClient);
} else {
toggleStatusMethod = apiClient.enableFilter.bind(apiClient);
}
try {
await toggleStatusMethod(url);
dispatch(toggleFilterSuccess(url));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleFilterFailure());
}
};
export const refreshFiltersRequest = createAction('FILTERING_REFRESH_REQUEST');
export const refreshFiltersFailure = createAction('FILTERING_REFRESH_FAILURE');
export const refreshFiltersSuccess = createAction('FILTERING_REFRESH_SUCCESS');
export const refreshFilters = () => async (dispatch) => {
dispatch(refreshFiltersRequest());
dispatch(showLoading());
try {
const refreshText = await apiClient.refreshFilters();
dispatch(refreshFiltersSuccess());
if (refreshText.includes('OK')) {
if (refreshText.includes('OK 0')) {
dispatch(addSuccessToast('all_filters_up_to_date_toast'));
} else {
dispatch(addSuccessToast(refreshText.replace(/OK /g, '')));
}
} else {
dispatch(addErrorToast({ error: refreshText }));
}
dispatch(getFilteringStatus());
dispatch(hideLoading());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(refreshFiltersFailure());
dispatch(hideLoading());
}
};
export const handleRulesChange = createAction('HANDLE_RULES_CHANGE');
export const addFilterRequest = createAction('ADD_FILTER_REQUEST');
export const addFilterFailure = createAction('ADD_FILTER_FAILURE');
export const addFilterSuccess = createAction('ADD_FILTER_SUCCESS');
export const addFilter = (url, name) => async (dispatch) => {
dispatch(addFilterRequest());
try {
await apiClient.addFilter(url, name);
dispatch(addFilterSuccess(url));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(addFilterFailure());
}
};
export const removeFilterRequest = createAction('ADD_FILTER_REQUEST');
export const removeFilterFailure = createAction('ADD_FILTER_FAILURE');
export const removeFilterSuccess = createAction('ADD_FILTER_SUCCESS');
export const removeFilter = url => async (dispatch) => {
dispatch(removeFilterRequest());
try {
await apiClient.removeFilter(url);
dispatch(removeFilterSuccess(url));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(removeFilterFailure());
}
};
export const toggleFilteringModal = createAction('FILTERING_MODAL_TOGGLE');
</s> add </s> remove if (Object.keys(settings).length > 0) {
return Object.keys(settings).map((key) => {
</s> add const settingsKeys = Object.keys(settings);
if (settingsKeys.length > 0) {
return settingsKeys.map((key) => { </s> remove <label className="checkbox checkbox--form">
</s> add <label className={`checkbox ${modifier}`}> </s> remove export const getFilteringRequest = createAction('GET_FILTERING_REQUEST');
export const getFilteringFailure = createAction('GET_FILTERING_FAILURE');
export const getFilteringSuccess = createAction('GET_FILTERING_SUCCESS');
export const getFiltering = () => async (dispatch) => {
dispatch(getFilteringRequest());
try {
const filteringStatus = await apiClient.getFilteringStatus();
dispatch(getFilteringSuccess(filteringStatus.enabled));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(getFilteringFailure());
}
};
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Filters/index.js |
<input
type="checkbox"
className="checkbox__input"
onChange={() => this.props.toggleFilterStatus(url, enabled)}
checked={enabled}
disabled={processingConfigFilter}
/>
<span className="checkbox__label" /> | <mask> const { filters } = this.props.filtering;
<mask> const filter = filters.filter(filter => filter.url === url)[0];
<mask> return (
<mask> <label className="checkbox">
<mask> <input type="checkbox" className="checkbox__input" onChange={() => this.props.toggleFilterStatus(filter.url)} checked={filter.enabled}/>
<mask> <span className="checkbox__label"/>
<mask> </label>
<mask> );
<mask> };
<mask>
<mask> handleDelete = (url) => {
</s> + client: handle filters configuration </s> remove renderCheckbox = (row) => {
const { url } = row.original;
const { filters } = this.props.filtering;
const filter = filters.filter(filter => filter.url === url)[0];
</s> add renderCheckbox = ({ original }) => {
const { processingConfigFilter } = this.props.filtering;
const { url, enabled } = original; </s> remove input, placeholder, disabled, meta: { touched, error },
</s> add input,
placeholder,
subtitle,
disabled,
modifier = 'checkbox--form',
meta: { touched, error }, </s> remove <label className="checkbox checkbox--form">
</s> add <label className={`checkbox ${modifier}`}> </s> remove <div className="form__group">
</s> add <div className="form__group form__group--checkbox"> </s> remove export const setRulesRequest = createAction('SET_RULES_REQUEST');
export const setRulesFailure = createAction('SET_RULES_FAILURE');
export const setRulesSuccess = createAction('SET_RULES_SUCCESS');
export const setRules = rules => async (dispatch) => {
dispatch(setRulesRequest());
try {
const replacedLineEndings = rules
.replace(/^\n/g, '')
.replace(/\n\s*\n/g, '\n');
await apiClient.setRules(replacedLineEndings);
dispatch(addSuccessToast('updated_custom_filtering_toast'));
dispatch(setRulesSuccess());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setRulesFailure());
}
};
export const getFilteringStatusRequest = createAction('GET_FILTERING_STATUS_REQUEST');
export const getFilteringStatusFailure = createAction('GET_FILTERING_STATUS_FAILURE');
export const getFilteringStatusSuccess = createAction('GET_FILTERING_STATUS_SUCCESS');
export const getFilteringStatus = () => async (dispatch) => {
dispatch(getFilteringStatusRequest());
try {
const status = await apiClient.getFilteringStatus();
dispatch(getFilteringStatusSuccess({ status: normalizeFilteringStatus(status) }));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(getFilteringStatusFailure());
}
};
export const toggleFilterRequest = createAction('FILTER_ENABLE_REQUEST');
export const toggleFilterFailure = createAction('FILTER_ENABLE_FAILURE');
export const toggleFilterSuccess = createAction('FILTER_ENABLE_SUCCESS');
export const toggleFilterStatus = url => async (dispatch, getState) => {
dispatch(toggleFilterRequest());
const state = getState();
const { filters } = state.filtering;
const filter = filters.filter(filter => filter.url === url)[0];
const { enabled } = filter;
let toggleStatusMethod;
if (enabled) {
toggleStatusMethod = apiClient.disableFilter.bind(apiClient);
} else {
toggleStatusMethod = apiClient.enableFilter.bind(apiClient);
}
try {
await toggleStatusMethod(url);
dispatch(toggleFilterSuccess(url));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleFilterFailure());
}
};
export const refreshFiltersRequest = createAction('FILTERING_REFRESH_REQUEST');
export const refreshFiltersFailure = createAction('FILTERING_REFRESH_FAILURE');
export const refreshFiltersSuccess = createAction('FILTERING_REFRESH_SUCCESS');
export const refreshFilters = () => async (dispatch) => {
dispatch(refreshFiltersRequest());
dispatch(showLoading());
try {
const refreshText = await apiClient.refreshFilters();
dispatch(refreshFiltersSuccess());
if (refreshText.includes('OK')) {
if (refreshText.includes('OK 0')) {
dispatch(addSuccessToast('all_filters_up_to_date_toast'));
} else {
dispatch(addSuccessToast(refreshText.replace(/OK /g, '')));
}
} else {
dispatch(addErrorToast({ error: refreshText }));
}
dispatch(getFilteringStatus());
dispatch(hideLoading());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(refreshFiltersFailure());
dispatch(hideLoading());
}
};
export const handleRulesChange = createAction('HANDLE_RULES_CHANGE');
export const addFilterRequest = createAction('ADD_FILTER_REQUEST');
export const addFilterFailure = createAction('ADD_FILTER_FAILURE');
export const addFilterSuccess = createAction('ADD_FILTER_SUCCESS');
export const addFilter = (url, name) => async (dispatch) => {
dispatch(addFilterRequest());
try {
await apiClient.addFilter(url, name);
dispatch(addFilterSuccess(url));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(addFilterFailure());
}
};
export const removeFilterRequest = createAction('ADD_FILTER_REQUEST');
export const removeFilterFailure = createAction('ADD_FILTER_FAILURE');
export const removeFilterSuccess = createAction('ADD_FILTER_SUCCESS');
export const removeFilter = url => async (dispatch) => {
dispatch(removeFilterRequest());
try {
await apiClient.removeFilter(url);
dispatch(removeFilterSuccess(url));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(removeFilterFailure());
}
};
export const toggleFilteringModal = createAction('FILTERING_MODAL_TOGGLE');
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Filters/index.js |
}; | <mask> // eslint-disable-next-line no-alert
<mask> if (window.confirm(this.props.t('filter_confirm_delete'))) {
<mask> this.props.removeFilter({ url });
<mask> }
<mask> }
<mask>
<mask> columns = [{
<mask> Header: <Trans>enabled_table_header</Trans>,
<mask> accessor: 'enabled',
<mask> Cell: this.renderCheckbox,
</s> + client: handle filters configuration </s> remove columns = [{
Header: <Trans>enabled_table_header</Trans>,
accessor: 'enabled',
Cell: this.renderCheckbox,
width: 90,
className: 'text-center',
}, {
Header: <Trans>name_table_header</Trans>,
accessor: 'name',
Cell: ({ value }) => (<div className="logs__row logs__row--overflow"><span className="logs__text" title={value}>{value}</span></div>),
}, {
Header: <Trans>filter_url_table_header</Trans>,
accessor: 'url',
Cell: ({ value }) => (<div className="logs__row logs__row--overflow"><a href={value} target='_blank' rel='noopener noreferrer' className="link logs__text">{value}</a></div>),
}, {
Header: <Trans>rules_count_table_header</Trans>,
accessor: 'rulesCount',
className: 'text-center',
Cell: props => props.value.toLocaleString(),
}, {
Header: <Trans>last_time_updated_table_header</Trans>,
accessor: 'lastUpdated',
className: 'text-center',
}, {
Header: <Trans>actions_table_header</Trans>,
accessor: 'url',
Cell: ({ value }) => (
<button
type="button"
className="btn btn-icon btn-outline-secondary btn-sm"
onClick={() => this.handleDelete(value)}
title={this.props.t('delete_table_action')}
>
<svg className="icons">
<use xlinkHref="#delete" />
</svg>
</button>
),
className: 'text-center',
width: 80,
sortable: false,
},
</s> add columns = [
{
Header: <Trans>enabled_table_header</Trans>,
accessor: 'enabled',
Cell: this.renderCheckbox,
width: 90,
className: 'text-center',
},
{
Header: <Trans>name_table_header</Trans>,
accessor: 'name',
minWidth: 200,
Cell: CellWrap,
},
{
Header: <Trans>filter_url_table_header</Trans>,
accessor: 'url',
minWidth: 200,
Cell: ({ value }) => (
<div className="logs__row logs__row--overflow">
<a
href={value}
target="_blank"
rel="noopener noreferrer"
className="link logs__text"
>
{value}
</a>
</div>
),
},
{
Header: <Trans>rules_count_table_header</Trans>,
accessor: 'rulesCount',
className: 'text-center',
minWidth: 100,
Cell: props => props.value.toLocaleString(),
},
{
Header: <Trans>last_time_updated_table_header</Trans>,
accessor: 'lastUpdated',
className: 'text-center',
minWidth: 150,
Cell: CellWrap,
},
{
Header: <Trans>actions_table_header</Trans>,
accessor: 'url',
Cell: ({ value }) => (
<button
type="button"
className="btn btn-icon btn-outline-secondary btn-sm"
onClick={() => this.handleDelete(value)}
title={this.props.t('delete_table_action')}
>
<svg className="icons">
<use xlinkHref="#delete" />
</svg>
</button>
),
className: 'text-center',
width: 80,
sortable: false,
}, </s> remove maxWidth: 90,
</s> add maxWidth: 100, </s> remove handleNext = () => {
this.props.addFilter(this.state.url, this.state.name);
setTimeout(() => {
if (this.props.isFilterAdded) {
this.closeModal();
}
}, 2000);
};
</s> add </s> remove enableFiltering() {
const { path, method } = this.FILTERING_ENABLE;
return this.makeRequest(path, method);
}
disableFiltering() {
const { path, method } = this.FILTERING_DISABLE;
return this.makeRequest(path, method);
}
// TODO find out when to use force parameter
</s> add </s> remove if (Object.keys(settings).length > 0) {
return Object.keys(settings).map((key) => {
</s> add const settingsKeys = Object.keys(settings);
if (settingsKeys.length > 0) {
return settingsKeys.map((key) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Filters/index.js |
columns = [
{
Header: <Trans>enabled_table_header</Trans>,
accessor: 'enabled',
Cell: this.renderCheckbox,
width: 90,
className: 'text-center',
},
{
Header: <Trans>name_table_header</Trans>,
accessor: 'name',
minWidth: 200,
Cell: CellWrap,
},
{
Header: <Trans>filter_url_table_header</Trans>,
accessor: 'url',
minWidth: 200,
Cell: ({ value }) => (
<div className="logs__row logs__row--overflow">
<a
href={value}
target="_blank"
rel="noopener noreferrer"
className="link logs__text"
>
{value}
</a>
</div>
),
},
{
Header: <Trans>rules_count_table_header</Trans>,
accessor: 'rulesCount',
className: 'text-center',
minWidth: 100,
Cell: props => props.value.toLocaleString(),
},
{
Header: <Trans>last_time_updated_table_header</Trans>,
accessor: 'lastUpdated',
className: 'text-center',
minWidth: 150,
Cell: CellWrap,
},
{
Header: <Trans>actions_table_header</Trans>,
accessor: 'url',
Cell: ({ value }) => (
<button
type="button"
className="btn btn-icon btn-outline-secondary btn-sm"
onClick={() => this.handleDelete(value)}
title={this.props.t('delete_table_action')}
>
<svg className="icons">
<use xlinkHref="#delete" />
</svg>
</button>
),
className: 'text-center',
width: 80,
sortable: false,
}, | <mask> this.props.removeFilter({ url });
<mask> }
<mask> }
<mask>
<mask> columns = [{
<mask> Header: <Trans>enabled_table_header</Trans>,
<mask> accessor: 'enabled',
<mask> Cell: this.renderCheckbox,
<mask> width: 90,
<mask> className: 'text-center',
<mask> }, {
<mask> Header: <Trans>name_table_header</Trans>,
<mask> accessor: 'name',
<mask> Cell: ({ value }) => (<div className="logs__row logs__row--overflow"><span className="logs__text" title={value}>{value}</span></div>),
<mask> }, {
<mask> Header: <Trans>filter_url_table_header</Trans>,
<mask> accessor: 'url',
<mask> Cell: ({ value }) => (<div className="logs__row logs__row--overflow"><a href={value} target='_blank' rel='noopener noreferrer' className="link logs__text">{value}</a></div>),
<mask> }, {
<mask> Header: <Trans>rules_count_table_header</Trans>,
<mask> accessor: 'rulesCount',
<mask> className: 'text-center',
<mask> Cell: props => props.value.toLocaleString(),
<mask> }, {
<mask> Header: <Trans>last_time_updated_table_header</Trans>,
<mask> accessor: 'lastUpdated',
<mask> className: 'text-center',
<mask> }, {
<mask> Header: <Trans>actions_table_header</Trans>,
<mask> accessor: 'url',
<mask> Cell: ({ value }) => (
<mask> <button
<mask> type="button"
<mask> className="btn btn-icon btn-outline-secondary btn-sm"
<mask> onClick={() => this.handleDelete(value)}
<mask> title={this.props.t('delete_table_action')}
<mask> >
<mask> <svg className="icons">
<mask> <use xlinkHref="#delete" />
<mask> </svg>
<mask> </button>
<mask> ),
<mask> className: 'text-center',
<mask> width: 80,
<mask> sortable: false,
<mask> },
<mask> ];
<mask>
<mask> render() {
<mask> const { t } = this.props;
<mask> const { filters, userRules, processingRefreshFilters } = this.props.filtering;
</s> + client: handle filters configuration </s> remove }
</s> add }; </s> remove maxWidth: 90,
</s> add maxWidth: 100, </s> remove const { t } = this.props;
const { filters, userRules, processingRefreshFilters } = this.props.filtering;
</s> add const {
filtering, t, toggleFilteringModal, refreshFilters, addFilter,
} = this.props;
const {
filters,
userRules,
isModalOpen,
isFilterAdded,
processingRefreshFilters,
processingRemoveFilter,
processingAddFilter,
processingFilters,
} = filtering;
</s> remove const filtering = handleActions({
[actions.setRulesRequest]: state => ({ ...state, processingRules: true }),
[actions.setRulesFailure]: state => ({ ...state, processingRules: false }),
[actions.setRulesSuccess]: state => ({ ...state, processingRules: false }),
[actions.handleRulesChange]: (state, { payload }) => {
const { userRules } = payload;
return { ...state, userRules };
},
[actions.getFilteringStatusRequest]: state => ({ ...state, processingFilters: true }),
[actions.getFilteringStatusFailure]: state => ({ ...state, processingFilters: false }),
[actions.getFilteringStatusSuccess]: (state, { payload }) => {
const { status } = payload;
const { filters, userRules } = status;
const newState = {
...state, filters, userRules, processingFilters: false,
};
return newState;
},
[actions.addFilterRequest]: state =>
({ ...state, processingAddFilter: true, isFilterAdded: false }),
[actions.addFilterFailure]: (state) => {
const newState = { ...state, processingAddFilter: false, isFilterAdded: false };
return newState;
},
[actions.addFilterSuccess]: state =>
({ ...state, processingAddFilter: false, isFilterAdded: true }),
[actions.toggleFilteringModal]: (state) => {
const newState = {
...state,
isFilteringModalOpen: !state.isFilteringModalOpen,
isFilterAdded: false,
};
return newState;
},
[actions.toggleFilterRequest]: state => ({ ...state, processingFilters: true }),
[actions.toggleFilterFailure]: state => ({ ...state, processingFilters: false }),
[actions.toggleFilterSuccess]: state => ({ ...state, processingFilters: false }),
[actions.refreshFiltersRequest]: state => ({ ...state, processingRefreshFilters: true }),
[actions.refreshFiltersFailure]: state => ({ ...state, processingRefreshFilters: false }),
[actions.refreshFiltersSuccess]: state => ({ ...state, processingRefreshFilters: false }),
}, {
isFilteringModalOpen: false,
processingFilters: false,
processingRules: false,
processingAddFilter: false,
processingRefreshFilters: false,
filters: [],
userRules: '',
});
</s> add </s> remove renderCheckbox = (row) => {
const { url } = row.original;
const { filters } = this.props.filtering;
const filter = filters.filter(filter => filter.url === url)[0];
</s> add renderCheckbox = ({ original }) => {
const { processingConfigFilter } = this.props.filtering;
const { url, enabled } = original; | [
"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/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Filters/index.js |
const {
filtering, t, toggleFilteringModal, refreshFilters, addFilter,
} = this.props;
const {
filters,
userRules,
isModalOpen,
isFilterAdded,
processingRefreshFilters,
processingRemoveFilter,
processingAddFilter,
processingFilters,
} = filtering;
| <mask> },
<mask> ];
<mask>
<mask> render() {
<mask> const { t } = this.props;
<mask> const { filters, userRules, processingRefreshFilters } = this.props.filtering;
<mask> return (
<mask> <div>
<mask> <PageTitle title={ t('filters') } />
<mask> <div className="content">
<mask> <div className="row">
</s> + client: handle filters configuration </s> remove <div>
<PageTitle title={ t('filters') } />
</s> add <Fragment>
<PageTitle title={t('filters')} /> </s> remove const { t } = this.props;
</s> add const { t, userRules } = this.props; </s> remove title={ t('filters_and_hosts') }
subtitle={ t('filters_and_hosts_hint') }
</s> add title={t('filters_and_hosts')}
subtitle={t('filters_and_hosts_hint')} </s> remove columns = [{
Header: <Trans>enabled_table_header</Trans>,
accessor: 'enabled',
Cell: this.renderCheckbox,
width: 90,
className: 'text-center',
}, {
Header: <Trans>name_table_header</Trans>,
accessor: 'name',
Cell: ({ value }) => (<div className="logs__row logs__row--overflow"><span className="logs__text" title={value}>{value}</span></div>),
}, {
Header: <Trans>filter_url_table_header</Trans>,
accessor: 'url',
Cell: ({ value }) => (<div className="logs__row logs__row--overflow"><a href={value} target='_blank' rel='noopener noreferrer' className="link logs__text">{value}</a></div>),
}, {
Header: <Trans>rules_count_table_header</Trans>,
accessor: 'rulesCount',
className: 'text-center',
Cell: props => props.value.toLocaleString(),
}, {
Header: <Trans>last_time_updated_table_header</Trans>,
accessor: 'lastUpdated',
className: 'text-center',
}, {
Header: <Trans>actions_table_header</Trans>,
accessor: 'url',
Cell: ({ value }) => (
<button
type="button"
className="btn btn-icon btn-outline-secondary btn-sm"
onClick={() => this.handleDelete(value)}
title={this.props.t('delete_table_action')}
>
<svg className="icons">
<use xlinkHref="#delete" />
</svg>
</button>
),
className: 'text-center',
width: 80,
sortable: false,
},
</s> add columns = [
{
Header: <Trans>enabled_table_header</Trans>,
accessor: 'enabled',
Cell: this.renderCheckbox,
width: 90,
className: 'text-center',
},
{
Header: <Trans>name_table_header</Trans>,
accessor: 'name',
minWidth: 200,
Cell: CellWrap,
},
{
Header: <Trans>filter_url_table_header</Trans>,
accessor: 'url',
minWidth: 200,
Cell: ({ value }) => (
<div className="logs__row logs__row--overflow">
<a
href={value}
target="_blank"
rel="noopener noreferrer"
className="link logs__text"
>
{value}
</a>
</div>
),
},
{
Header: <Trans>rules_count_table_header</Trans>,
accessor: 'rulesCount',
className: 'text-center',
minWidth: 100,
Cell: props => props.value.toLocaleString(),
},
{
Header: <Trans>last_time_updated_table_header</Trans>,
accessor: 'lastUpdated',
className: 'text-center',
minWidth: 150,
Cell: CellWrap,
},
{
Header: <Trans>actions_table_header</Trans>,
accessor: 'url',
Cell: ({ value }) => (
<button
type="button"
className="btn btn-icon btn-outline-secondary btn-sm"
onClick={() => this.handleDelete(value)}
title={this.props.t('delete_table_action')}
>
<svg className="icons">
<use xlinkHref="#delete" />
</svg>
</button>
),
className: 'text-center',
width: 80,
sortable: false,
}, </s> remove renderCheckbox = (row) => {
const { url } = row.original;
const { filters } = this.props.filtering;
const filter = filters.filter(filter => filter.url === url)[0];
</s> add renderCheckbox = ({ original }) => {
const { processingConfigFilter } = this.props.filtering;
const { url, enabled } = original; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Filters/index.js |
<Fragment>
<PageTitle title={t('filters')} /> | <mask> render() {
<mask> const { t } = this.props;
<mask> const { filters, userRules, processingRefreshFilters } = this.props.filtering;
<mask> return (
<mask> <div>
<mask> <PageTitle title={ t('filters') } />
<mask> <div className="content">
<mask> <div className="row">
<mask> <div className="col-md-12">
<mask> <Card
<mask> title={ t('filters_and_hosts') }
</s> + client: handle filters configuration </s> remove const { t } = this.props;
const { filters, userRules, processingRefreshFilters } = this.props.filtering;
</s> add const {
filtering, t, toggleFilteringModal, refreshFilters, addFilter,
} = this.props;
const {
filters,
userRules,
isModalOpen,
isFilterAdded,
processingRefreshFilters,
processingRemoveFilter,
processingAddFilter,
processingFilters,
} = filtering;
</s> remove title={ t('filters_and_hosts') }
subtitle={ t('filters_and_hosts_hint') }
</s> add title={t('filters_and_hosts')}
subtitle={t('filters_and_hosts_hint')} </s> remove const { t } = this.props;
</s> add const { t, userRules } = this.props; </s> remove const {
isOpen,
title,
inputDescription,
processingAddFilter,
} = this.props;
</s> add const { isOpen, processingAddFilter } = this.props; </s> remove renderCheckbox = (row) => {
const { url } = row.original;
const { filters } = this.props.filtering;
const filter = filters.filter(filter => filter.url === url)[0];
</s> add renderCheckbox = ({ original }) => {
const { processingConfigFilter } = this.props.filtering;
const { url, enabled } = original; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Filters/index.js |
title={t('filters_and_hosts')}
subtitle={t('filters_and_hosts_hint')} | <mask> <div className="content">
<mask> <div className="row">
<mask> <div className="col-md-12">
<mask> <Card
<mask> title={ t('filters_and_hosts') }
<mask> subtitle={ t('filters_and_hosts_hint') }
<mask> >
<mask> <ReactTable
<mask> data={filters}
<mask> columns={this.columns}
<mask> showPagination={true}
</s> + client: handle filters configuration </s> remove <div>
<PageTitle title={ t('filters') } />
</s> add <Fragment>
<PageTitle title={t('filters')} /> </s> remove const { t } = this.props;
const { filters, userRules, processingRefreshFilters } = this.props.filtering;
</s> add const {
filtering, t, toggleFilteringModal, refreshFilters, addFilter,
} = this.props;
const {
filters,
userRules,
isModalOpen,
isFilterAdded,
processingRefreshFilters,
processingRemoveFilter,
processingAddFilter,
processingFilters,
} = filtering;
</s> remove // Text
previousText={ t('previous_btn') }
nextText={ t('next_btn') }
loadingText={ t('loading_table_status') }
pageText={ t('page_table_footer_text') }
ofText={ t('of_table_footer_text') }
rowsText={ t('rows_table_footer_text') }
noDataText={ t('no_filters_added') }
</s> add previousText={t('previous_btn')}
nextText={t('next_btn')}
loadingText={t('loading_table_status')}
pageText={t('page_table_footer_text')}
ofText={t('of_table_footer_text')}
rowsText={t('rows_table_footer_text')}
noDataText={t('no_filters_added')} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Filters/index.js |
loading={
processingFilters ||
processingAddFilter ||
processingRemoveFilter ||
processingRefreshFilters
} | <mask> data={filters}
<mask> columns={this.columns}
<mask> showPagination={true}
<mask> defaultPageSize={10}
<mask> minRows={4}
<mask> previousText={t('previous_btn')}
<mask> nextText={t('next_btn')}
<mask> loadingText={t('loading_table_status')}
<mask> pageText={t('page_table_footer_text')}
<mask> ofText={t('of_table_footer_text')}
</s> + client: handle filters configuration </s> remove // Text
previousText={ t('previous_btn') }
nextText={ t('next_btn') }
loadingText={ t('loading_table_status') }
pageText={ t('page_table_footer_text') }
ofText={ t('of_table_footer_text') }
rowsText={ t('rows_table_footer_text') }
noDataText={ t('no_filters_added') }
</s> add previousText={t('previous_btn')}
nextText={t('next_btn')}
loadingText={t('loading_table_status')}
pageText={t('page_table_footer_text')}
ofText={t('of_table_footer_text')}
rowsText={t('rows_table_footer_text')}
noDataText={t('no_filters_added')} </s> remove title={ t('filters_and_hosts') }
subtitle={ t('filters_and_hosts_hint') }
</s> add title={t('filters_and_hosts')}
subtitle={t('filters_and_hosts_hint')} </s> remove const filtering = handleActions({
[actions.setRulesRequest]: state => ({ ...state, processingRules: true }),
[actions.setRulesFailure]: state => ({ ...state, processingRules: false }),
[actions.setRulesSuccess]: state => ({ ...state, processingRules: false }),
[actions.handleRulesChange]: (state, { payload }) => {
const { userRules } = payload;
return { ...state, userRules };
},
[actions.getFilteringStatusRequest]: state => ({ ...state, processingFilters: true }),
[actions.getFilteringStatusFailure]: state => ({ ...state, processingFilters: false }),
[actions.getFilteringStatusSuccess]: (state, { payload }) => {
const { status } = payload;
const { filters, userRules } = status;
const newState = {
...state, filters, userRules, processingFilters: false,
};
return newState;
},
[actions.addFilterRequest]: state =>
({ ...state, processingAddFilter: true, isFilterAdded: false }),
[actions.addFilterFailure]: (state) => {
const newState = { ...state, processingAddFilter: false, isFilterAdded: false };
return newState;
},
[actions.addFilterSuccess]: state =>
({ ...state, processingAddFilter: false, isFilterAdded: true }),
[actions.toggleFilteringModal]: (state) => {
const newState = {
...state,
isFilteringModalOpen: !state.isFilteringModalOpen,
isFilterAdded: false,
};
return newState;
},
[actions.toggleFilterRequest]: state => ({ ...state, processingFilters: true }),
[actions.toggleFilterFailure]: state => ({ ...state, processingFilters: false }),
[actions.toggleFilterSuccess]: state => ({ ...state, processingFilters: false }),
[actions.refreshFiltersRequest]: state => ({ ...state, processingRefreshFilters: true }),
[actions.refreshFiltersFailure]: state => ({ ...state, processingRefreshFilters: false }),
[actions.refreshFiltersSuccess]: state => ({ ...state, processingRefreshFilters: false }),
}, {
isFilteringModalOpen: false,
processingFilters: false,
processingRules: false,
processingAddFilter: false,
processingRefreshFilters: false,
filters: [],
userRules: '',
});
</s> add </s> remove import Modal from './Modal';
</s> add </s> remove }
</s> add </div>
<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.props.addFilter(url, name)}
disabled={!isValidForSubmit || processingAddFilter}
>
<Trans>add_filter_btn</Trans>
</button>
</div> | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Filters/index.js |
previousText={t('previous_btn')}
nextText={t('next_btn')}
loadingText={t('loading_table_status')}
pageText={t('page_table_footer_text')}
ofText={t('of_table_footer_text')}
rowsText={t('rows_table_footer_text')}
noDataText={t('no_filters_added')} | <mask> columns={this.columns}
<mask> showPagination={true}
<mask> defaultPageSize={10}
<mask> minRows={4}
<mask> // Text
<mask> previousText={ t('previous_btn') }
<mask> nextText={ t('next_btn') }
<mask> loadingText={ t('loading_table_status') }
<mask> pageText={ t('page_table_footer_text') }
<mask> ofText={ t('of_table_footer_text') }
<mask> rowsText={ t('rows_table_footer_text') }
<mask> noDataText={ t('no_filters_added') }
<mask> />
<mask> <div className="card-actions">
<mask> <button
<mask> className="btn btn-success btn-standard mr-2"
<mask> type="submit"
</s> + client: handle filters configuration </s> remove onClick={this.props.toggleFilteringModal}
</s> add onClick={toggleFilteringModal} </s> remove title={ t('filters_and_hosts') }
subtitle={ t('filters_and_hosts_hint') }
</s> add title={t('filters_and_hosts')}
subtitle={t('filters_and_hosts_hint')} </s> remove }
</s> add </div>
<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.props.addFilter(url, name)}
disabled={!isValidForSubmit || processingAddFilter}
>
<Trans>add_filter_btn</Trans>
</button>
</div> </s> remove value={this.props.userRules}
</s> add value={userRules} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Filters/index.js |
onClick={toggleFilteringModal} | <mask> <div className="card-actions">
<mask> <button
<mask> className="btn btn-success btn-standard mr-2"
<mask> type="submit"
<mask> onClick={this.props.toggleFilteringModal}
<mask> >
<mask> <Trans>add_filter_btn</Trans>
<mask> </button>
<mask> <button
<mask> className="btn btn-primary btn-standard"
</s> + client: handle filters configuration </s> remove onClick={this.props.refreshFilters}
</s> add onClick={refreshFilters} </s> remove }
</s> add </div>
<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.props.addFilter(url, name)}
disabled={!isValidForSubmit || processingAddFilter}
>
<Trans>add_filter_btn</Trans>
</button>
</div> </s> remove value={this.props.userRules}
</s> add value={userRules} </s> remove // Text
previousText={ t('previous_btn') }
nextText={ t('next_btn') }
loadingText={ t('loading_table_status') }
pageText={ t('page_table_footer_text') }
ofText={ t('of_table_footer_text') }
rowsText={ t('rows_table_footer_text') }
noDataText={ t('no_filters_added') }
</s> add previousText={t('previous_btn')}
nextText={t('next_btn')}
loadingText={t('loading_table_status')}
pageText={t('page_table_footer_text')}
ofText={t('of_table_footer_text')}
rowsText={t('rows_table_footer_text')}
noDataText={t('no_filters_added')} </s> remove {renderBody()}
</div>
{!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>
</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}
/>
<div className="description">
<Trans>enter_valid_filter_url</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Filters/index.js |
onClick={refreshFilters} | <mask> </button>
<mask> <button
<mask> className="btn btn-primary btn-standard"
<mask> type="submit"
<mask> onClick={this.props.refreshFilters}
<mask> disabled={processingRefreshFilters}
<mask> >
<mask> <Trans>check_updates_btn</Trans>
<mask> </button>
<mask> </div>
</s> + client: handle filters configuration </s> remove onClick={this.props.toggleFilteringModal}
</s> add onClick={toggleFilteringModal} </s> remove }
</s> add </div>
<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.props.addFilter(url, name)}
disabled={!isValidForSubmit || processingAddFilter}
>
<Trans>add_filter_btn</Trans>
</button>
</div> </s> remove {renderBody()}
</div>
{!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>
</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}
/>
<div className="description">
<Trans>enter_valid_filter_url</Trans> </s> remove <h4 className="modal-title">
{title}
</h4>
<button type="button" className="close" onClick={this.closeModal}>
<span className="sr-only">Close</span>
</button>
</s> add <h4 className="modal-title">
<Trans>new_filter_btn</Trans>
</h4>
<button type="button" className="close" onClick={this.closeModal}>
<span className="sr-only">Close</span>
</button> </s> remove value={this.props.userRules}
</s> add value={userRules} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Filters/index.js |
isOpen={isModalOpen}
toggleModal={toggleFilteringModal}
addFilter={addFilter}
isFilterAdded={isFilterAdded}
processingAddFilter={processingAddFilter} | <mask> </div>
<mask> </div>
<mask> </div>
<mask> <Modal
<mask> isOpen={this.props.filtering.isFilteringModalOpen}
<mask> toggleModal={this.props.toggleFilteringModal}
<mask> addFilter={this.props.addFilter}
<mask> isFilterAdded={this.props.filtering.isFilterAdded}
<mask> processingAddFilter={this.props.filtering.processingAddFilter}
<mask> title={ t('new_filter_btn') }
<mask> inputDescription={ t('enter_valid_filter_url') }
<mask> />
<mask> </div>
<mask> );
<mask> }
<mask> }
</s> + client: handle filters configuration </s> remove </div>
</s> add </Fragment> </s> remove }
</s> add </div>
<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.props.addFilter(url, name)}
disabled={!isValidForSubmit || processingAddFilter}
>
<Trans>add_filter_btn</Trans>
</button>
</div> </s> remove {renderBody()}
</div>
{!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>
</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}
/>
<div className="description">
<Trans>enter_valid_filter_url</Trans> </s> remove <div>
<PageTitle title={ t('filters') } />
</s> add <Fragment>
<PageTitle title={t('filters')} /> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Filters/index.js |
</Fragment> | <mask> processingAddFilter={this.props.filtering.processingAddFilter}
<mask> title={ t('new_filter_btn') }
<mask> inputDescription={ t('enter_valid_filter_url') }
<mask> />
<mask> </div>
<mask> );
<mask> }
<mask> }
<mask>
<mask> Filters.propTypes = {
</s> + client: handle filters configuration </s> remove isOpen={this.props.filtering.isFilteringModalOpen}
toggleModal={this.props.toggleFilteringModal}
addFilter={this.props.addFilter}
isFilterAdded={this.props.filtering.isFilterAdded}
processingAddFilter={this.props.filtering.processingAddFilter}
title={ t('new_filter_btn') }
inputDescription={ t('enter_valid_filter_url') }
</s> add isOpen={isModalOpen}
toggleModal={toggleFilteringModal}
addFilter={addFilter}
isFilterAdded={isFilterAdded}
processingAddFilter={processingAddFilter} </s> remove <div>
<PageTitle title={ t('filters') } />
</s> add <Fragment>
<PageTitle title={t('filters')} /> </s> remove const { t } = this.props;
const { filters, userRules, processingRefreshFilters } = this.props.filtering;
</s> add const {
filtering, t, toggleFilteringModal, refreshFilters, addFilter,
} = this.props;
const {
filters,
userRules,
isModalOpen,
isFilterAdded,
processingRefreshFilters,
processingRemoveFilter,
processingAddFilter,
processingFilters,
} = filtering;
</s> remove }
</s> add </div>
<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.props.addFilter(url, name)}
disabled={!isValidForSubmit || processingAddFilter}
>
<Trans>add_filter_btn</Trans>
</button>
</div> </s> remove key={key}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Filters/index.js |
userRules: PropTypes.string.isRequired,
filters: PropTypes.array.isRequired,
isModalOpen: PropTypes.bool.isRequired,
isFilterAdded: PropTypes.bool.isRequired,
processingFilters: PropTypes.bool.isRequired,
processingAddFilter: PropTypes.bool.isRequired,
processingRefreshFilters: PropTypes.bool.isRequired,
processingConfigFilter: PropTypes.bool.isRequired,
processingRemoveFilter: PropTypes.bool.isRequired, | <mask> Filters.propTypes = {
<mask> setRules: PropTypes.func,
<mask> getFilteringStatus: PropTypes.func.isRequired,
<mask> filtering: PropTypes.shape({
<mask> userRules: PropTypes.string,
<mask> filters: PropTypes.array,
<mask> isFilteringModalOpen: PropTypes.bool.isRequired,
<mask> isFilterAdded: PropTypes.bool,
<mask> processingAddFilter: PropTypes.bool,
<mask> processingRefreshFilters: PropTypes.bool,
<mask> }),
<mask> removeFilter: PropTypes.func.isRequired,
<mask> toggleFilterStatus: PropTypes.func.isRequired,
<mask> addFilter: PropTypes.func.isRequired,
<mask> toggleFilteringModal: PropTypes.func.isRequired,
</s> + client: handle filters configuration </s> remove title: PropTypes.string.isRequired,
inputDescription: PropTypes.string,
</s> add </s> remove isFilterAdded: PropTypes.bool,
processingAddFilter: PropTypes.bool,
t: PropTypes.func,
</s> add isFilterAdded: PropTypes.bool.isRequired,
processingAddFilter: PropTypes.bool.isRequired,
t: PropTypes.func.isRequired, </s> remove t: PropTypes.func,
</s> add t: PropTypes.func.isRequired, </s> remove userRules: PropTypes.string,
handleRulesChange: PropTypes.func,
handleRulesSubmit: PropTypes.func,
t: PropTypes.func,
</s> add userRules: PropTypes.string.isRequired,
handleRulesChange: PropTypes.func.isRequired,
handleRulesSubmit: PropTypes.func.isRequired,
t: PropTypes.func.isRequired, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Filters/index.js |
t: PropTypes.func.isRequired, | <mask> addFilter: PropTypes.func.isRequired,
<mask> toggleFilteringModal: PropTypes.func.isRequired,
<mask> handleRulesChange: PropTypes.func.isRequired,
<mask> refreshFilters: PropTypes.func.isRequired,
<mask> t: PropTypes.func,
<mask> };
<mask>
<mask>
<mask> export default withNamespaces()(Filters);
</s> + client: handle filters configuration </s> remove userRules: PropTypes.string,
handleRulesChange: PropTypes.func,
handleRulesSubmit: PropTypes.func,
t: PropTypes.func,
</s> add userRules: PropTypes.string.isRequired,
handleRulesChange: PropTypes.func.isRequired,
handleRulesSubmit: PropTypes.func.isRequired,
t: PropTypes.func.isRequired, </s> remove isFilterAdded: PropTypes.bool,
processingAddFilter: PropTypes.bool,
t: PropTypes.func,
</s> add isFilterAdded: PropTypes.bool.isRequired,
processingAddFilter: PropTypes.bool.isRequired,
t: PropTypes.func.isRequired, </s> remove title: PropTypes.string.isRequired,
inputDescription: PropTypes.string,
</s> add </s> remove userRules: PropTypes.string,
filters: PropTypes.array,
isFilteringModalOpen: PropTypes.bool.isRequired,
isFilterAdded: PropTypes.bool,
processingAddFilter: PropTypes.bool,
processingRefreshFilters: PropTypes.bool,
</s> add userRules: PropTypes.string.isRequired,
filters: PropTypes.array.isRequired,
isModalOpen: PropTypes.bool.isRequired,
isFilterAdded: PropTypes.bool.isRequired,
processingFilters: PropTypes.bool.isRequired,
processingAddFilter: PropTypes.bool.isRequired,
processingRefreshFilters: PropTypes.bool.isRequired,
processingConfigFilter: PropTypes.bool.isRequired,
processingRemoveFilter: PropTypes.bool.isRequired, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Filters/index.js |
.logs__text--full {
width: 100%;
}
| <mask> overflow: hidden;
<mask> }
<mask>
<mask> .logs__row .tooltip-custom {
<mask> top: 0;
<mask> margin-left: 0;
<mask> margin-right: 5px;
</s> + client: handle filters configuration </s> remove margin-bottom: 5px;
</s> add margin-bottom: 2px; </s> remove
const renderBody = () => {
if (!this.props.isFilterAdded) {
return (
<React.Fragment>
<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} />
{inputDescription &&
<div className="description">
{inputDescription}
</div>}
</React.Fragment>
);
}
return (
<div className="description">
<Trans>filter_added_successfully</Trans>
</div>
);
};
const isValidForSubmit = !(url.length > 0 && isUrlValid && name.length > 0);
</s> add const isValidForSubmit = url.length > 0 && isUrlValid && name.length > 0; </s> remove enableFiltering() {
const { path, method } = this.FILTERING_ENABLE;
return this.makeRequest(path, method);
}
disableFiltering() {
const { path, method } = this.FILTERING_DISABLE;
return this.makeRequest(path, method);
}
// TODO find out when to use force parameter
</s> add </s> remove import { getFilteringStatus, setRules, addSuccessToast, getClients } from '../actions';
</s> add import { addSuccessToast, getClients } from '../actions';
import { getFilteringStatus, setRules } from '../actions/filtering'; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Logs/Logs.css |
import { formatTime, formatDateTime, getClientName } from '../../helpers/helpers'; | <mask> import endsWith from 'lodash/endsWith';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask> import { HashLink as Link } from 'react-router-hash-link';
<mask>
<mask> import { formatTime, getClientName } from '../../helpers/helpers';
<mask> import { SERVICES, FILTERED_STATUS } from '../../helpers/constants';
<mask> import { getTrackerData } from '../../helpers/trackers/trackers';
<mask> import PageTitle from '../ui/PageTitle';
<mask> import Card from '../ui/Card';
<mask> import Loading from '../ui/Loading';
</s> + client: handle filters configuration </s> remove import Modal from './Modal';
</s> add </s> remove import React, { Component } from 'react';
</s> add import React, { Component, Fragment } from 'react'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Logs/index.js |
<span className="logs__text" title={formatDateTime(value)}> | <mask> checkWhiteList = reason => reason === FILTERED_STATUS.NOT_FILTERED_WHITE_LIST;
<mask>
<mask> getTimeCell = ({ value }) => (
<mask> <div className="logs__row">
<mask> <span className="logs__text" title={value}>
<mask> {formatTime(value)}
<mask> </span>
<mask> </div>
<mask> );
<mask>
</s> + client: handle filters configuration </s> remove columns = [{
Header: <Trans>enabled_table_header</Trans>,
accessor: 'enabled',
Cell: this.renderCheckbox,
width: 90,
className: 'text-center',
}, {
Header: <Trans>name_table_header</Trans>,
accessor: 'name',
Cell: ({ value }) => (<div className="logs__row logs__row--overflow"><span className="logs__text" title={value}>{value}</span></div>),
}, {
Header: <Trans>filter_url_table_header</Trans>,
accessor: 'url',
Cell: ({ value }) => (<div className="logs__row logs__row--overflow"><a href={value} target='_blank' rel='noopener noreferrer' className="link logs__text">{value}</a></div>),
}, {
Header: <Trans>rules_count_table_header</Trans>,
accessor: 'rulesCount',
className: 'text-center',
Cell: props => props.value.toLocaleString(),
}, {
Header: <Trans>last_time_updated_table_header</Trans>,
accessor: 'lastUpdated',
className: 'text-center',
}, {
Header: <Trans>actions_table_header</Trans>,
accessor: 'url',
Cell: ({ value }) => (
<button
type="button"
className="btn btn-icon btn-outline-secondary btn-sm"
onClick={() => this.handleDelete(value)}
title={this.props.t('delete_table_action')}
>
<svg className="icons">
<use xlinkHref="#delete" />
</svg>
</button>
),
className: 'text-center',
width: 80,
sortable: false,
},
</s> add columns = [
{
Header: <Trans>enabled_table_header</Trans>,
accessor: 'enabled',
Cell: this.renderCheckbox,
width: 90,
className: 'text-center',
},
{
Header: <Trans>name_table_header</Trans>,
accessor: 'name',
minWidth: 200,
Cell: CellWrap,
},
{
Header: <Trans>filter_url_table_header</Trans>,
accessor: 'url',
minWidth: 200,
Cell: ({ value }) => (
<div className="logs__row logs__row--overflow">
<a
href={value}
target="_blank"
rel="noopener noreferrer"
className="link logs__text"
>
{value}
</a>
</div>
),
},
{
Header: <Trans>rules_count_table_header</Trans>,
accessor: 'rulesCount',
className: 'text-center',
minWidth: 100,
Cell: props => props.value.toLocaleString(),
},
{
Header: <Trans>last_time_updated_table_header</Trans>,
accessor: 'lastUpdated',
className: 'text-center',
minWidth: 150,
Cell: CellWrap,
},
{
Header: <Trans>actions_table_header</Trans>,
accessor: 'url',
Cell: ({ value }) => (
<button
type="button"
className="btn btn-icon btn-outline-secondary btn-sm"
onClick={() => this.handleDelete(value)}
title={this.props.t('delete_table_action')}
>
<svg className="icons">
<use xlinkHref="#delete" />
</svg>
</button>
),
className: 'text-center',
width: 80,
sortable: false,
}, </s> remove renderCheckbox = (row) => {
const { url } = row.original;
const { filters } = this.props.filtering;
const filter = filters.filter(filter => filter.url === url)[0];
</s> add renderCheckbox = ({ original }) => {
const { processingConfigFilter } = this.props.filtering;
const { url, enabled } = original; </s> remove {!disabled && touched && (error && <span className="form__message form__message--error">{error}</span>)}
</s> add {!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)} </s> remove <input type="checkbox" className="checkbox__input" onChange={() => this.props.toggleFilterStatus(filter.url)} checked={filter.enabled}/>
<span className="checkbox__label"/>
</s> add <input
type="checkbox"
className="checkbox__input"
onChange={() => this.props.toggleFilterStatus(url, enabled)}
checked={enabled}
disabled={processingConfigFilter}
/>
<span className="checkbox__label" /> </s> remove input, placeholder, disabled, meta: { touched, error },
</s> add input,
placeholder,
subtitle,
disabled,
modifier = 'checkbox--form',
meta: { touched, error }, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Logs/index.js |
maxWidth: 100, | <mask> const columns = [
<mask> {
<mask> Header: t('time_table_header'),
<mask> accessor: 'time',
<mask> maxWidth: 90,
<mask> filterable: false,
<mask> Cell: this.getTimeCell,
<mask> },
<mask> {
<mask> Header: t('domain_name_table_header'),
</s> + client: handle filters configuration </s> remove columns = [{
Header: <Trans>enabled_table_header</Trans>,
accessor: 'enabled',
Cell: this.renderCheckbox,
width: 90,
className: 'text-center',
}, {
Header: <Trans>name_table_header</Trans>,
accessor: 'name',
Cell: ({ value }) => (<div className="logs__row logs__row--overflow"><span className="logs__text" title={value}>{value}</span></div>),
}, {
Header: <Trans>filter_url_table_header</Trans>,
accessor: 'url',
Cell: ({ value }) => (<div className="logs__row logs__row--overflow"><a href={value} target='_blank' rel='noopener noreferrer' className="link logs__text">{value}</a></div>),
}, {
Header: <Trans>rules_count_table_header</Trans>,
accessor: 'rulesCount',
className: 'text-center',
Cell: props => props.value.toLocaleString(),
}, {
Header: <Trans>last_time_updated_table_header</Trans>,
accessor: 'lastUpdated',
className: 'text-center',
}, {
Header: <Trans>actions_table_header</Trans>,
accessor: 'url',
Cell: ({ value }) => (
<button
type="button"
className="btn btn-icon btn-outline-secondary btn-sm"
onClick={() => this.handleDelete(value)}
title={this.props.t('delete_table_action')}
>
<svg className="icons">
<use xlinkHref="#delete" />
</svg>
</button>
),
className: 'text-center',
width: 80,
sortable: false,
},
</s> add columns = [
{
Header: <Trans>enabled_table_header</Trans>,
accessor: 'enabled',
Cell: this.renderCheckbox,
width: 90,
className: 'text-center',
},
{
Header: <Trans>name_table_header</Trans>,
accessor: 'name',
minWidth: 200,
Cell: CellWrap,
},
{
Header: <Trans>filter_url_table_header</Trans>,
accessor: 'url',
minWidth: 200,
Cell: ({ value }) => (
<div className="logs__row logs__row--overflow">
<a
href={value}
target="_blank"
rel="noopener noreferrer"
className="link logs__text"
>
{value}
</a>
</div>
),
},
{
Header: <Trans>rules_count_table_header</Trans>,
accessor: 'rulesCount',
className: 'text-center',
minWidth: 100,
Cell: props => props.value.toLocaleString(),
},
{
Header: <Trans>last_time_updated_table_header</Trans>,
accessor: 'lastUpdated',
className: 'text-center',
minWidth: 150,
Cell: CellWrap,
},
{
Header: <Trans>actions_table_header</Trans>,
accessor: 'url',
Cell: ({ value }) => (
<button
type="button"
className="btn btn-icon btn-outline-secondary btn-sm"
onClick={() => this.handleDelete(value)}
title={this.props.t('delete_table_action')}
>
<svg className="icons">
<use xlinkHref="#delete" />
</svg>
</button>
),
className: 'text-center',
width: 80,
sortable: false,
}, </s> remove }
</s> add }; </s> remove filtering: {
enabled: false,
title: 'block_domain_use_filters_and_hosts',
subtitle: 'filters_block_toggle_hint',
},
</s> add </s> remove const filtering = handleActions({
[actions.setRulesRequest]: state => ({ ...state, processingRules: true }),
[actions.setRulesFailure]: state => ({ ...state, processingRules: false }),
[actions.setRulesSuccess]: state => ({ ...state, processingRules: false }),
[actions.handleRulesChange]: (state, { payload }) => {
const { userRules } = payload;
return { ...state, userRules };
},
[actions.getFilteringStatusRequest]: state => ({ ...state, processingFilters: true }),
[actions.getFilteringStatusFailure]: state => ({ ...state, processingFilters: false }),
[actions.getFilteringStatusSuccess]: (state, { payload }) => {
const { status } = payload;
const { filters, userRules } = status;
const newState = {
...state, filters, userRules, processingFilters: false,
};
return newState;
},
[actions.addFilterRequest]: state =>
({ ...state, processingAddFilter: true, isFilterAdded: false }),
[actions.addFilterFailure]: (state) => {
const newState = { ...state, processingAddFilter: false, isFilterAdded: false };
return newState;
},
[actions.addFilterSuccess]: state =>
({ ...state, processingAddFilter: false, isFilterAdded: true }),
[actions.toggleFilteringModal]: (state) => {
const newState = {
...state,
isFilteringModalOpen: !state.isFilteringModalOpen,
isFilterAdded: false,
};
return newState;
},
[actions.toggleFilterRequest]: state => ({ ...state, processingFilters: true }),
[actions.toggleFilterFailure]: state => ({ ...state, processingFilters: false }),
[actions.toggleFilterSuccess]: state => ({ ...state, processingFilters: false }),
[actions.refreshFiltersRequest]: state => ({ ...state, processingRefreshFilters: true }),
[actions.refreshFiltersFailure]: state => ({ ...state, processingRefreshFilters: false }),
[actions.refreshFiltersSuccess]: state => ({ ...state, processingRefreshFilters: false }),
}, {
isFilteringModalOpen: false,
processingFilters: false,
processingRules: false,
processingAddFilter: false,
processingRefreshFilters: false,
filters: [],
userRules: '',
});
</s> add </s> remove enableFilter(url) {
const { path, method } = this.FILTERING_ENABLE_FILTER;
const parameter = 'url';
const requestBody = `${parameter}=${url}`;
const config = {
data: requestBody,
header: { 'Content-Type': 'text/plain' },
</s> add setFiltersConfig(config) {
const { path, method } = this.FILTERING_CONFIG;
const parameters = {
data: config,
headers: { 'Content-Type': 'application/json' }, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Logs/index.js |
.form__group--inner {
max-width: 300px;
margin-top: -10px;
margin-left: 40px;
font-size: 14px;
}
.form__group--checkbox {
margin-bottom: 25px;
}
| <mask> .form__group--settings:last-child {
<mask> margin-bottom: 20px;
<mask> }
<mask>
<mask> .form__inline {
<mask> display: flex;
<mask> justify-content: flex-start;
<mask> }
</s> + client: handle filters configuration </s> remove margin-bottom: 5px;
</s> add margin-bottom: 2px; </s> remove enableFiltering() {
const { path, method } = this.FILTERING_ENABLE;
return this.makeRequest(path, method);
}
disableFiltering() {
const { path, method } = this.FILTERING_DISABLE;
return this.makeRequest(path, method);
}
// TODO find out when to use force parameter
</s> add </s> remove import { getFilteringStatus, setRules, addSuccessToast, getClients } from '../actions';
</s> add import { addSuccessToast, getClients } from '../actions';
import { getFilteringStatus, setRules } from '../actions/filtering'; </s> remove import { showLoading, hideLoading } from 'react-redux-loading-bar';
</s> add </s> remove const { path, method } = this.FILTERING_STATUS;
</s> add const { path, method } = this.FILTERING_INFO; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Settings/Settings.css |
.custom-select:disabled {
background-color: #f9f9f9;
}
.custom-select {
transition: 0.3s ease-in-out background-color, 0.3s ease-in-out color;
} | <mask> .custom-control-label,
<mask> .custom-control-label:before {
<mask> transition: 0.3s ease-in-out background-color, 0.3s ease-in-out color;
<mask> }
</s> + client: handle filters configuration </s> remove transition: 0.3s ease box-shadow;
</s> add transition: 0.3s ease-in-out box-shadow, 0.3s ease-in-out opacity; </s> remove enableFiltering() {
const { path, method } = this.FILTERING_ENABLE;
return this.makeRequest(path, method);
}
disableFiltering() {
const { path, method } = this.FILTERING_DISABLE;
return this.makeRequest(path, method);
}
// TODO find out when to use force parameter
</s> add </s> remove import { getFilteringStatus, setRules, addSuccessToast, getClients } from '../actions';
</s> add import { addSuccessToast, getClients } from '../actions';
import { getFilteringStatus, setRules } from '../actions/filtering'; </s> remove import { showLoading, hideLoading } from 'react-redux-loading-bar';
</s> add | [
"keep",
"keep",
"keep",
"add"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Settings/Settings.css |
import FiltersConfig from './FiltersConfig'; | <mask> import StatsConfig from './StatsConfig';
<mask> import LogsConfig from './LogsConfig';
<mask> import Checkbox from '../ui/Checkbox';
<mask> import Loading from '../ui/Loading';
<mask> import PageTitle from '../ui/PageTitle';
<mask> import Card from '../ui/Card';
<mask>
<mask> import './Settings.css';
</s> + client: handle filters configuration </s> remove import { formatTime, getClientName } from '../../helpers/helpers';
</s> add import { formatTime, formatDateTime, getClientName } from '../../helpers/helpers'; </s> remove import Modal from './Modal';
</s> add </s> remove import React, { Component } from 'react';
</s> add import React, { Component, Fragment } from 'react'; | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Settings/index.js |
<mask> import './Settings.css';
<mask>
<mask> class Settings extends Component {
<mask> settings = {
<mask> filtering: {
<mask> enabled: false,
<mask> title: 'block_domain_use_filters_and_hosts',
<mask> subtitle: 'filters_block_toggle_hint',
<mask> },
<mask> safebrowsing: {
<mask> enabled: false,
<mask> title: 'use_adguard_browsing_sec',
<mask> subtitle: 'use_adguard_browsing_sec_hint',
<mask> },
</s> + client: handle filters configuration </s> remove filtering: { ...filtering, enabled: filteringStatus.enabled },
</s> add </s> remove import Modal from './Modal';
</s> add </s> remove const filtering = handleActions({
[actions.setRulesRequest]: state => ({ ...state, processingRules: true }),
[actions.setRulesFailure]: state => ({ ...state, processingRules: false }),
[actions.setRulesSuccess]: state => ({ ...state, processingRules: false }),
[actions.handleRulesChange]: (state, { payload }) => {
const { userRules } = payload;
return { ...state, userRules };
},
[actions.getFilteringStatusRequest]: state => ({ ...state, processingFilters: true }),
[actions.getFilteringStatusFailure]: state => ({ ...state, processingFilters: false }),
[actions.getFilteringStatusSuccess]: (state, { payload }) => {
const { status } = payload;
const { filters, userRules } = status;
const newState = {
...state, filters, userRules, processingFilters: false,
};
return newState;
},
[actions.addFilterRequest]: state =>
({ ...state, processingAddFilter: true, isFilterAdded: false }),
[actions.addFilterFailure]: (state) => {
const newState = { ...state, processingAddFilter: false, isFilterAdded: false };
return newState;
},
[actions.addFilterSuccess]: state =>
({ ...state, processingAddFilter: false, isFilterAdded: true }),
[actions.toggleFilteringModal]: (state) => {
const newState = {
...state,
isFilteringModalOpen: !state.isFilteringModalOpen,
isFilterAdded: false,
};
return newState;
},
[actions.toggleFilterRequest]: state => ({ ...state, processingFilters: true }),
[actions.toggleFilterFailure]: state => ({ ...state, processingFilters: false }),
[actions.toggleFilterSuccess]: state => ({ ...state, processingFilters: false }),
[actions.refreshFiltersRequest]: state => ({ ...state, processingRefreshFilters: true }),
[actions.refreshFiltersFailure]: state => ({ ...state, processingRefreshFilters: false }),
[actions.refreshFiltersSuccess]: state => ({ ...state, processingRefreshFilters: false }),
}, {
isFilteringModalOpen: false,
processingFilters: false,
processingRules: false,
processingAddFilter: false,
processingRefreshFilters: false,
filters: [],
userRules: '',
});
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Settings/index.js | |
this.props.getFilteringStatus(); | <mask> this.props.initSettings(this.settings);
<mask> this.props.getBlockedServices();
<mask> this.props.getStatsConfig();
<mask> this.props.getLogsConfig();
<mask> }
<mask>
<mask> renderSettings = (settings) => {
<mask> const settingsKeys = Object.keys(settings);
<mask>
<mask> if (settingsKeys.length > 0) {
</s> + client: handle filters configuration </s> remove if (Object.keys(settings).length > 0) {
return Object.keys(settings).map((key) => {
</s> add const settingsKeys = Object.keys(settings);
if (settingsKeys.length > 0) {
return settingsKeys.map((key) => { </s> remove return { enabled, userRules: newUserRules, filters: newFilters };
</s> add return {
enabled,
userRules: newUserRules,
filters: newFilters,
interval,
}; </s> remove case SETTINGS_NAMES.filtering:
if (status) {
successMessage = 'disabled_filtering_toast';
await apiClient.disableFiltering();
} else {
successMessage = 'enabled_filtering_toast';
await apiClient.enableFiltering();
}
dispatch(toggleSettingStatus({ settingKey }));
break;
</s> add </s> remove export const setRulesRequest = createAction('SET_RULES_REQUEST');
export const setRulesFailure = createAction('SET_RULES_FAILURE');
export const setRulesSuccess = createAction('SET_RULES_SUCCESS');
export const setRules = rules => async (dispatch) => {
dispatch(setRulesRequest());
try {
const replacedLineEndings = rules
.replace(/^\n/g, '')
.replace(/\n\s*\n/g, '\n');
await apiClient.setRules(replacedLineEndings);
dispatch(addSuccessToast('updated_custom_filtering_toast'));
dispatch(setRulesSuccess());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setRulesFailure());
}
};
export const getFilteringStatusRequest = createAction('GET_FILTERING_STATUS_REQUEST');
export const getFilteringStatusFailure = createAction('GET_FILTERING_STATUS_FAILURE');
export const getFilteringStatusSuccess = createAction('GET_FILTERING_STATUS_SUCCESS');
export const getFilteringStatus = () => async (dispatch) => {
dispatch(getFilteringStatusRequest());
try {
const status = await apiClient.getFilteringStatus();
dispatch(getFilteringStatusSuccess({ status: normalizeFilteringStatus(status) }));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(getFilteringStatusFailure());
}
};
export const toggleFilterRequest = createAction('FILTER_ENABLE_REQUEST');
export const toggleFilterFailure = createAction('FILTER_ENABLE_FAILURE');
export const toggleFilterSuccess = createAction('FILTER_ENABLE_SUCCESS');
export const toggleFilterStatus = url => async (dispatch, getState) => {
dispatch(toggleFilterRequest());
const state = getState();
const { filters } = state.filtering;
const filter = filters.filter(filter => filter.url === url)[0];
const { enabled } = filter;
let toggleStatusMethod;
if (enabled) {
toggleStatusMethod = apiClient.disableFilter.bind(apiClient);
} else {
toggleStatusMethod = apiClient.enableFilter.bind(apiClient);
}
try {
await toggleStatusMethod(url);
dispatch(toggleFilterSuccess(url));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleFilterFailure());
}
};
export const refreshFiltersRequest = createAction('FILTERING_REFRESH_REQUEST');
export const refreshFiltersFailure = createAction('FILTERING_REFRESH_FAILURE');
export const refreshFiltersSuccess = createAction('FILTERING_REFRESH_SUCCESS');
export const refreshFilters = () => async (dispatch) => {
dispatch(refreshFiltersRequest());
dispatch(showLoading());
try {
const refreshText = await apiClient.refreshFilters();
dispatch(refreshFiltersSuccess());
if (refreshText.includes('OK')) {
if (refreshText.includes('OK 0')) {
dispatch(addSuccessToast('all_filters_up_to_date_toast'));
} else {
dispatch(addSuccessToast(refreshText.replace(/OK /g, '')));
}
} else {
dispatch(addErrorToast({ error: refreshText }));
}
dispatch(getFilteringStatus());
dispatch(hideLoading());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(refreshFiltersFailure());
dispatch(hideLoading());
}
};
export const handleRulesChange = createAction('HANDLE_RULES_CHANGE');
export const addFilterRequest = createAction('ADD_FILTER_REQUEST');
export const addFilterFailure = createAction('ADD_FILTER_FAILURE');
export const addFilterSuccess = createAction('ADD_FILTER_SUCCESS');
export const addFilter = (url, name) => async (dispatch) => {
dispatch(addFilterRequest());
try {
await apiClient.addFilter(url, name);
dispatch(addFilterSuccess(url));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(addFilterFailure());
}
};
export const removeFilterRequest = createAction('ADD_FILTER_REQUEST');
export const removeFilterFailure = createAction('ADD_FILTER_FAILURE');
export const removeFilterSuccess = createAction('ADD_FILTER_SUCCESS');
export const removeFilter = url => async (dispatch) => {
dispatch(removeFilterRequest());
try {
await apiClient.removeFilter(url);
dispatch(removeFilterSuccess(url));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(removeFilterFailure());
}
};
export const toggleFilteringModal = createAction('FILTERING_MODAL_TOGGLE');
</s> add </s> remove handleNext = () => {
this.props.addFilter(this.state.url, this.state.name);
setTimeout(() => {
if (this.props.isFilterAdded) {
this.closeModal();
}
}, 2000);
};
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Settings/index.js |
const settingsKeys = Object.keys(settings);
if (settingsKeys.length > 0) {
return settingsKeys.map((key) => { | <mask> this.props.getLogsConfig();
<mask> }
<mask>
<mask> renderSettings = (settings) => {
<mask> if (Object.keys(settings).length > 0) {
<mask> return Object.keys(settings).map((key) => {
<mask> const setting = settings[key];
<mask> const { enabled } = setting;
<mask> return (
<mask> <Checkbox
<mask> key={key}
</s> + client: handle filters configuration </s> remove key={key}
</s> add </s> remove renderCheckbox = (row) => {
const { url } = row.original;
const { filters } = this.props.filtering;
const filter = filters.filter(filter => filter.url === url)[0];
</s> add renderCheckbox = ({ original }) => {
const { processingConfigFilter } = this.props.filtering;
const { url, enabled } = original; </s> remove export const setRulesRequest = createAction('SET_RULES_REQUEST');
export const setRulesFailure = createAction('SET_RULES_FAILURE');
export const setRulesSuccess = createAction('SET_RULES_SUCCESS');
export const setRules = rules => async (dispatch) => {
dispatch(setRulesRequest());
try {
const replacedLineEndings = rules
.replace(/^\n/g, '')
.replace(/\n\s*\n/g, '\n');
await apiClient.setRules(replacedLineEndings);
dispatch(addSuccessToast('updated_custom_filtering_toast'));
dispatch(setRulesSuccess());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setRulesFailure());
}
};
export const getFilteringStatusRequest = createAction('GET_FILTERING_STATUS_REQUEST');
export const getFilteringStatusFailure = createAction('GET_FILTERING_STATUS_FAILURE');
export const getFilteringStatusSuccess = createAction('GET_FILTERING_STATUS_SUCCESS');
export const getFilteringStatus = () => async (dispatch) => {
dispatch(getFilteringStatusRequest());
try {
const status = await apiClient.getFilteringStatus();
dispatch(getFilteringStatusSuccess({ status: normalizeFilteringStatus(status) }));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(getFilteringStatusFailure());
}
};
export const toggleFilterRequest = createAction('FILTER_ENABLE_REQUEST');
export const toggleFilterFailure = createAction('FILTER_ENABLE_FAILURE');
export const toggleFilterSuccess = createAction('FILTER_ENABLE_SUCCESS');
export const toggleFilterStatus = url => async (dispatch, getState) => {
dispatch(toggleFilterRequest());
const state = getState();
const { filters } = state.filtering;
const filter = filters.filter(filter => filter.url === url)[0];
const { enabled } = filter;
let toggleStatusMethod;
if (enabled) {
toggleStatusMethod = apiClient.disableFilter.bind(apiClient);
} else {
toggleStatusMethod = apiClient.enableFilter.bind(apiClient);
}
try {
await toggleStatusMethod(url);
dispatch(toggleFilterSuccess(url));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleFilterFailure());
}
};
export const refreshFiltersRequest = createAction('FILTERING_REFRESH_REQUEST');
export const refreshFiltersFailure = createAction('FILTERING_REFRESH_FAILURE');
export const refreshFiltersSuccess = createAction('FILTERING_REFRESH_SUCCESS');
export const refreshFilters = () => async (dispatch) => {
dispatch(refreshFiltersRequest());
dispatch(showLoading());
try {
const refreshText = await apiClient.refreshFilters();
dispatch(refreshFiltersSuccess());
if (refreshText.includes('OK')) {
if (refreshText.includes('OK 0')) {
dispatch(addSuccessToast('all_filters_up_to_date_toast'));
} else {
dispatch(addSuccessToast(refreshText.replace(/OK /g, '')));
}
} else {
dispatch(addErrorToast({ error: refreshText }));
}
dispatch(getFilteringStatus());
dispatch(hideLoading());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(refreshFiltersFailure());
dispatch(hideLoading());
}
};
export const handleRulesChange = createAction('HANDLE_RULES_CHANGE');
export const addFilterRequest = createAction('ADD_FILTER_REQUEST');
export const addFilterFailure = createAction('ADD_FILTER_FAILURE');
export const addFilterSuccess = createAction('ADD_FILTER_SUCCESS');
export const addFilter = (url, name) => async (dispatch) => {
dispatch(addFilterRequest());
try {
await apiClient.addFilter(url, name);
dispatch(addFilterSuccess(url));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(addFilterFailure());
}
};
export const removeFilterRequest = createAction('ADD_FILTER_REQUEST');
export const removeFilterFailure = createAction('ADD_FILTER_FAILURE');
export const removeFilterSuccess = createAction('ADD_FILTER_SUCCESS');
export const removeFilter = url => async (dispatch) => {
dispatch(removeFilterRequest());
try {
await apiClient.removeFilter(url);
dispatch(removeFilterSuccess(url));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(removeFilterFailure());
}
};
export const toggleFilteringModal = createAction('FILTERING_MODAL_TOGGLE');
</s> add </s> remove return { enabled, userRules: newUserRules, filters: newFilters };
</s> add return {
enabled,
userRules: newUserRules,
filters: newFilters,
interval,
}; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Settings/index.js |
<mask> const setting = settings[key];
<mask> const { enabled } = setting;
<mask> return (
<mask> <Checkbox
<mask> key={key}
<mask> {...settings[key]}
<mask> handleChange={() => this.props.toggleSetting(key, enabled)}
<mask> />
<mask> );
<mask> });
</s> + client: handle filters configuration </s> remove if (Object.keys(settings).length > 0) {
return Object.keys(settings).map((key) => {
</s> add const settingsKeys = Object.keys(settings);
if (settingsKeys.length > 0) {
return settingsKeys.map((key) => { </s> remove <input type="checkbox" className="checkbox__input" onChange={() => this.props.toggleFilterStatus(filter.url)} checked={filter.enabled}/>
<span className="checkbox__label"/>
</s> add <input
type="checkbox"
className="checkbox__input"
onChange={() => this.props.toggleFilterStatus(url, enabled)}
checked={enabled}
disabled={processingConfigFilter}
/>
<span className="checkbox__label" /> </s> remove
const renderBody = () => {
if (!this.props.isFilterAdded) {
return (
<React.Fragment>
<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} />
{inputDescription &&
<div className="description">
{inputDescription}
</div>}
</React.Fragment>
);
}
return (
<div className="description">
<Trans>filter_added_successfully</Trans>
</div>
);
};
const isValidForSubmit = !(url.length > 0 && isUrlValid && name.length > 0);
</s> add const isValidForSubmit = url.length > 0 && isUrlValid && name.length > 0; </s> remove renderCheckbox = (row) => {
const { url } = row.original;
const { filters } = this.props.filtering;
const filter = filters.filter(filter => filter.url === url)[0];
</s> add renderCheckbox = ({ original }) => {
const { processingConfigFilter } = this.props.filtering;
const { url, enabled } = original; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Settings/index.js | |
key={key} | <mask> return (
<mask> <Checkbox
<mask> {...settings[key]}
<mask> handleChange={() => this.props.toggleSetting(key, enabled)}
<mask> />
<mask> );
<mask> });
</s> + client: handle filters configuration </s> remove key={key}
</s> add </s> remove <input type="checkbox" className="checkbox__input" onChange={() => this.props.toggleFilterStatus(filter.url)} checked={filter.enabled}/>
<span className="checkbox__label"/>
</s> add <input
type="checkbox"
className="checkbox__input"
onChange={() => this.props.toggleFilterStatus(url, enabled)}
checked={enabled}
disabled={processingConfigFilter}
/>
<span className="checkbox__label" /> </s> remove
const renderBody = () => {
if (!this.props.isFilterAdded) {
return (
<React.Fragment>
<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} />
{inputDescription &&
<div className="description">
{inputDescription}
</div>}
</React.Fragment>
);
}
return (
<div className="description">
<Trans>filter_added_successfully</Trans>
</div>
);
};
const isValidForSubmit = !(url.length > 0 && isUrlValid && name.length > 0);
</s> add const isValidForSubmit = url.length > 0 && isUrlValid && name.length > 0; </s> remove if (Object.keys(settings).length > 0) {
return Object.keys(settings).map((key) => {
</s> add const settingsKeys = Object.keys(settings);
if (settingsKeys.length > 0) {
return settingsKeys.map((key) => { </s> remove <input
{...input}
type="radio"
className="custom-control-input"
disabled={disabled}
/>
</s> add <input {...input} type="radio" className="custom-control-input" disabled={disabled} /> | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Settings/index.js |
filtering,
setFiltersConfig, | <mask> stats,
<mask> queryLogs,
<mask> setLogsConfig,
<mask> clearLogs,
<mask> t,
<mask> } = this.props;
<mask>
<mask> const isDataReady =
</s> + client: handle filters configuration </s> remove settings, services, stats, queryLogs,
</s> add settings, services, stats, queryLogs, filtering, </s> remove const { t } = this.props;
</s> add const { t, userRules } = this.props; </s> remove const { t } = this.props;
const { filters, userRules, processingRefreshFilters } = this.props.filtering;
</s> add const {
filtering, t, toggleFilteringModal, refreshFilters, addFilter,
} = this.props;
const {
filters,
userRules,
isModalOpen,
isFilterAdded,
processingRefreshFilters,
processingRemoveFilter,
processingAddFilter,
processingFilters,
} = filtering;
| [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Settings/index.js |
<FiltersConfig
interval={filtering.interval}
enabled={filtering.enabled}
processing={filtering.processingSetConfig}
setFiltersConfig={setFiltersConfig}
/> | <mask> <div className="row">
<mask> <div className="col-md-12">
<mask> <Card bodyType="card-body box-body--settings">
<mask> <div className="form">
<mask> {this.renderSettings(settings.settingsList)}
<mask> </div>
<mask> </Card>
<mask> </div>
</s> + client: handle filters configuration </s> remove title={ t('filters_and_hosts') }
subtitle={ t('filters_and_hosts_hint') }
</s> add title={t('filters_and_hosts')}
subtitle={t('filters_and_hosts_hint')} </s> remove <div>
<PageTitle title={ t('filters') } />
</s> add <Fragment>
<PageTitle title={t('filters')} /> </s> remove {renderBody()}
</div>
{!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>
</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}
/>
<div className="description">
<Trans>enter_valid_filter_url</Trans> </s> remove <h4 className="modal-title">
{title}
</h4>
<button type="button" className="close" onClick={this.closeModal}>
<span className="sr-only">Close</span>
</button>
</s> add <h4 className="modal-title">
<Trans>new_filter_btn</Trans>
</h4>
<button type="button" className="close" onClick={this.closeModal}>
<span className="sr-only">Close</span>
</button> </s> remove }
</s> add </div>
<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.props.addFilter(url, name)}
disabled={!isValidForSubmit || processingAddFilter}
>
<Trans>add_filter_btn</Trans>
</button>
</div> | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Settings/index.js |
setFiltersConfig: PropTypes.func.isRequired,
getFilteringStatus: PropTypes.func.isRequired, | <mask> getStatsConfig: PropTypes.func.isRequired,
<mask> setStatsConfig: PropTypes.func.isRequired,
<mask> resetStats: PropTypes.func.isRequired,
<mask> t: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(Settings);
</s> + client: handle filters configuration </s> remove t: PropTypes.func,
</s> add t: PropTypes.func.isRequired, </s> remove userRules: PropTypes.string,
handleRulesChange: PropTypes.func,
handleRulesSubmit: PropTypes.func,
t: PropTypes.func,
</s> add userRules: PropTypes.string.isRequired,
handleRulesChange: PropTypes.func.isRequired,
handleRulesSubmit: PropTypes.func.isRequired,
t: PropTypes.func.isRequired, </s> remove isFilterAdded: PropTypes.bool,
processingAddFilter: PropTypes.bool,
t: PropTypes.func,
</s> add isFilterAdded: PropTypes.bool.isRequired,
processingAddFilter: PropTypes.bool.isRequired,
t: PropTypes.func.isRequired, </s> remove title: PropTypes.string.isRequired,
inputDescription: PropTypes.string,
</s> add </s> remove userRules: PropTypes.string,
filters: PropTypes.array,
isFilteringModalOpen: PropTypes.bool.isRequired,
isFilterAdded: PropTypes.bool,
processingAddFilter: PropTypes.bool,
processingRefreshFilters: PropTypes.bool,
</s> add userRules: PropTypes.string.isRequired,
filters: PropTypes.array.isRequired,
isModalOpen: PropTypes.bool.isRequired,
isFilterAdded: PropTypes.bool.isRequired,
processingFilters: PropTypes.bool.isRequired,
processingAddFilter: PropTypes.bool.isRequired,
processingRefreshFilters: PropTypes.bool.isRequired,
processingConfigFilter: PropTypes.bool.isRequired,
processingRemoveFilter: PropTypes.bool.isRequired, | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/Settings/index.js |
margin-bottom: 2px; | <mask> margin-right: 20px;
<mask> }
<mask>
<mask> .checkbox--settings .checkbox__label-title {
<mask> margin-bottom: 5px;
<mask> font-weight: 600;
<mask> }
<mask>
<mask> .checkbox--form .checkbox__label:before {
<mask> top: 1px;
</s> + client: handle filters configuration </s> remove enableFiltering() {
const { path, method } = this.FILTERING_ENABLE;
return this.makeRequest(path, method);
}
disableFiltering() {
const { path, method } = this.FILTERING_DISABLE;
return this.makeRequest(path, method);
}
// TODO find out when to use force parameter
</s> add </s> remove import { getFilteringStatus, setRules, addSuccessToast, getClients } from '../actions';
</s> add import { addSuccessToast, getClients } from '../actions';
import { getFilteringStatus, setRules } from '../actions/filtering'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/ui/Checkbox.css |
transition: 0.3s ease-in-out box-shadow, 0.3s ease-in-out opacity; | <mask> background-repeat: no-repeat;
<mask> background-position: center center;
<mask> background-size: 12px 10px;
<mask> border-radius: 3px;
<mask> transition: 0.3s ease box-shadow;
<mask> }
<mask>
<mask> .checkbox__label .checkbox__label-text {
<mask> line-height: 1.3;
<mask> }
</s> + client: handle filters configuration </s> remove opacity: 0.6;
</s> add </s> remove enableFiltering() {
const { path, method } = this.FILTERING_ENABLE;
return this.makeRequest(path, method);
}
disableFiltering() {
const { path, method } = this.FILTERING_DISABLE;
return this.makeRequest(path, method);
}
// TODO find out when to use force parameter
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/ui/Checkbox.css |
<mask> box-shadow: 0 0 1px 1px rgba(74, 74, 74, 0.32);
<mask> }
<mask>
<mask> .checkbox__input:disabled + .checkbox__label {
<mask> opacity: 0.6;
<mask> cursor: default;
<mask> }
<mask>
<mask> .checkbox__label-text {
<mask> max-width: 515px;
</s> + client: handle filters configuration </s> remove const {
isOpen,
title,
inputDescription,
processingAddFilter,
} = this.props;
</s> add const { isOpen, processingAddFilter } = this.props; </s> remove transition: 0.3s ease box-shadow;
</s> add transition: 0.3s ease-in-out box-shadow, 0.3s ease-in-out opacity; </s> remove
const renderBody = () => {
if (!this.props.isFilterAdded) {
return (
<React.Fragment>
<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} />
{inputDescription &&
<div className="description">
{inputDescription}
</div>}
</React.Fragment>
);
}
return (
<div className="description">
<Trans>filter_added_successfully</Trans>
</div>
);
};
const isValidForSubmit = !(url.length > 0 && isUrlValid && name.length > 0);
</s> add const isValidForSubmit = url.length > 0 && isUrlValid && name.length > 0; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/ui/Checkbox.css | |
.checkbox__input:disabled + .checkbox__label:before {
opacity: 0.6;
}
| <mask> cursor: default;
<mask> }
<mask>
<mask> .checkbox__label-text {
<mask> max-width: 515px;
<mask> line-height: 1.5;
<mask> }
<mask>
</s> + client: handle filters configuration </s> remove opacity: 0.6;
</s> add </s> remove transition: 0.3s ease box-shadow;
</s> add transition: 0.3s ease-in-out box-shadow, 0.3s ease-in-out opacity; </s> remove enableFiltering() {
const { path, method } = this.FILTERING_ENABLE;
return this.makeRequest(path, method);
}
disableFiltering() {
const { path, method } = this.FILTERING_DISABLE;
return this.makeRequest(path, method);
}
// TODO find out when to use force parameter
</s> add </s> remove import { getFilteringStatus, setRules, addSuccessToast, getClients } from '../actions';
</s> add import { addSuccessToast, getClients } from '../actions';
import { getFilteringStatus, setRules } from '../actions/filtering'; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/ui/Checkbox.css |
<div className="form__group form__group--checkbox"> | <mask> handleChange,
<mask> t,
<mask> } = this.props;
<mask> return (
<mask> <div className="form__group">
<mask> <label className="checkbox checkbox--settings">
<mask> <span className="checkbox__marker"/>
<mask> <input type="checkbox" className="checkbox__input" onChange={handleChange} checked={enabled}/>
<mask> <span className="checkbox__label">
<mask> <span className="checkbox__label-text">
</s> + client: handle filters configuration </s> remove <label className="checkbox checkbox--form">
</s> add <label className={`checkbox ${modifier}`}> </s> remove <input type="checkbox" className="checkbox__input" onChange={() => this.props.toggleFilterStatus(filter.url)} checked={filter.enabled}/>
<span className="checkbox__label"/>
</s> add <input
type="checkbox"
className="checkbox__input"
onChange={() => this.props.toggleFilterStatus(url, enabled)}
checked={enabled}
disabled={processingConfigFilter}
/>
<span className="checkbox__label" /> </s> remove input, placeholder, disabled, meta: { touched, error },
</s> add input,
placeholder,
subtitle,
disabled,
modifier = 'checkbox--form',
meta: { touched, error }, </s> remove renderCheckbox = (row) => {
const { url } = row.original;
const { filters } = this.props.filtering;
const filter = filters.filter(filter => filter.url === url)[0];
</s> add renderCheckbox = ({ original }) => {
const { processingConfigFilter } = this.props.filtering;
const { url, enabled } = original; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/components/ui/Checkbox.js |
import {
setRules,
getFilteringStatus,
addFilter,
removeFilter,
toggleFilterStatus,
toggleFilteringModal,
refreshFilters,
handleRulesChange,
} from '../actions/filtering'; | <mask> import { connect } from 'react-redux';
<mask> import * as actionCreators from '../actions';
<mask> import Filters from '../components/Filters';
<mask>
<mask> const mapStateToProps = (state) => {
<mask> const { filtering } = state;
<mask> const props = { filtering };
</s> + client: handle filters configuration </s> remove import { getFilteringStatus, setRules, addSuccessToast, getClients } from '../actions';
</s> add import { addSuccessToast, getClients } from '../actions';
import { getFilteringStatus, setRules } from '../actions/filtering'; </s> remove settings, services, stats, queryLogs,
</s> add settings, services, stats, queryLogs, filtering, </s> remove import { normalizeFilteringStatus, normalizeTextarea, sortClients } from '../helpers/helpers';
</s> add import { normalizeTextarea, sortClients } from '../helpers/helpers'; | [
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/containers/Filters.js |
const mapDispatchToProps = {
setRules,
getFilteringStatus,
addFilter,
removeFilter,
toggleFilterStatus,
toggleFilteringModal,
refreshFilters,
handleRulesChange,
};
| <mask> const props = { filtering };
<mask> return props;
<mask> };
<mask>
<mask> export default connect(
<mask> mapStateToProps,
<mask> mapDispatchToProps,
<mask> )(Filters);
</s> + client: handle filters configuration </s> remove actionCreators,
</s> add mapDispatchToProps, </s> remove import * as actionCreators from '../actions';
</s> add import {
setRules,
getFilteringStatus,
addFilter,
removeFilter,
toggleFilterStatus,
toggleFilteringModal,
refreshFilters,
handleRulesChange,
} from '../actions/filtering'; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/containers/Filters.js |
mapDispatchToProps, | <mask> };
<mask>
<mask> export default connect(
<mask> mapStateToProps,
<mask> actionCreators,
<mask> )(Filters);
</s> + client: handle filters configuration </s> remove t: PropTypes.func,
</s> add t: PropTypes.func.isRequired, </s> remove isFilterAdded: PropTypes.bool,
processingAddFilter: PropTypes.bool,
t: PropTypes.func,
</s> add isFilterAdded: PropTypes.bool.isRequired,
processingAddFilter: PropTypes.bool.isRequired,
t: PropTypes.func.isRequired, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/containers/Filters.js |
import { addSuccessToast, getClients } from '../actions';
import { getFilteringStatus, setRules } from '../actions/filtering'; | <mask> import { connect } from 'react-redux';
<mask> import { getFilteringStatus, setRules, addSuccessToast, getClients } from '../actions';
<mask> import { getLogs, getLogsConfig } from '../actions/queryLogs';
<mask> import Logs from '../components/Logs';
<mask>
<mask> const mapStateToProps = (state) => {
<mask> const { queryLogs, dashboard, filtering } = state;
</s> + client: handle filters configuration </s> remove import * as actionCreators from '../actions';
</s> add import {
setRules,
getFilteringStatus,
addFilter,
removeFilter,
toggleFilterStatus,
toggleFilteringModal,
refreshFilters,
handleRulesChange,
} from '../actions/filtering'; </s> remove settings, services, stats, queryLogs,
</s> add settings, services, stats, queryLogs, filtering, </s> remove import { normalizeFilteringStatus, normalizeTextarea, sortClients } from '../helpers/helpers';
</s> add import { normalizeTextarea, sortClients } from '../helpers/helpers'; </s> remove import { formatTime, getClientName } from '../../helpers/helpers';
</s> add import { formatTime, formatDateTime, getClientName } from '../../helpers/helpers'; | [
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/containers/Logs.js |
import { getFilteringStatus, setFiltersConfig } from '../actions/filtering'; | <mask> import { getStatsConfig, setStatsConfig, resetStats } from '../actions/stats';
<mask> import { clearLogs, getLogsConfig, setLogsConfig } from '../actions/queryLogs';
<mask> import Settings from '../components/Settings';
<mask>
<mask> const mapStateToProps = (state) => {
<mask> const {
<mask> settings, services, stats, queryLogs, filtering,
</s> + client: handle filters configuration </s> remove settings, services, stats, queryLogs,
</s> add settings, services, stats, queryLogs, filtering, </s> remove import { getFilteringStatus, setRules, addSuccessToast, getClients } from '../actions';
</s> add import { addSuccessToast, getClients } from '../actions';
import { getFilteringStatus, setRules } from '../actions/filtering'; </s> remove import * as actionCreators from '../actions';
</s> add import {
setRules,
getFilteringStatus,
addFilter,
removeFilter,
toggleFilterStatus,
toggleFilteringModal,
refreshFilters,
handleRulesChange,
} from '../actions/filtering'; </s> remove import { normalizeFilteringStatus, normalizeTextarea, sortClients } from '../helpers/helpers';
</s> add import { normalizeTextarea, sortClients } from '../helpers/helpers'; </s> remove import { formatTime, getClientName } from '../../helpers/helpers';
</s> add import { formatTime, formatDateTime, getClientName } from '../../helpers/helpers'; | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/containers/Settings.js |
settings, services, stats, queryLogs, filtering, | <mask> import Settings from '../components/Settings';
<mask>
<mask> const mapStateToProps = (state) => {
<mask> const {
<mask> settings, services, stats, queryLogs,
<mask> } = state;
<mask> const props = {
<mask> settings,
<mask> services,
<mask> stats,
</s> + client: handle filters configuration </s> remove import * as actionCreators from '../actions';
</s> add import {
setRules,
getFilteringStatus,
addFilter,
removeFilter,
toggleFilterStatus,
toggleFilteringModal,
refreshFilters,
handleRulesChange,
} from '../actions/filtering'; </s> remove import { getFilteringStatus, setRules, addSuccessToast, getClients } from '../actions';
</s> add import { addSuccessToast, getClients } from '../actions';
import { getFilteringStatus, setRules } from '../actions/filtering'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/containers/Settings.js |
filtering, | <mask> services,
<mask> stats,
<mask> queryLogs,
<mask> };
<mask> return props;
<mask> };
<mask>
<mask> const mapDispatchToProps = {
</s> + client: handle filters configuration </s> remove settings, services, stats, queryLogs,
</s> add settings, services, stats, queryLogs, filtering, | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/containers/Settings.js |
getFilteringStatus,
setFiltersConfig, | <mask> clearLogs,
<mask> getLogsConfig,
<mask> setLogsConfig,
<mask> };
<mask>
<mask> export default connect(
<mask> mapStateToProps,
</s> + client: handle filters configuration </s> remove actionCreators,
</s> add mapDispatchToProps, | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/containers/Settings.js |
<input {...input} type="radio" className="custom-control-input" disabled={disabled} /> | <mask> input, placeholder, disabled, meta: { touched, error },
<mask> }) => (
<mask> <Fragment>
<mask> <label className="custom-control custom-radio custom-control-inline">
<mask> <input
<mask> {...input}
<mask> type="radio"
<mask> className="custom-control-input"
<mask> disabled={disabled}
<mask> />
<mask> <span className="custom-control-label">{placeholder}</span>
<mask> </label>
<mask> {!disabled && touched && (error && <span className="form__message form__message--error">{error}</span>)}
<mask> </Fragment>
<mask> );
</s> + client: handle filters configuration </s> remove {!disabled && touched && (error && <span className="form__message form__message--error">{error}</span>)}
</s> add {!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)} </s> remove input, placeholder, disabled, meta: { touched, error },
</s> add input,
placeholder,
subtitle,
disabled,
modifier = 'checkbox--form',
meta: { touched, error }, </s> remove {!disabled && touched && (error && <span className="form__message form__message--error">{error}</span>)}
</s> add {!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)} </s> remove input, placeholder, disabled, modifier, icon, meta: { touched, error },
</s> add input,
placeholder,
disabled,
modifier,
icon,
meta: { touched, error }, </s> remove <label className="checkbox checkbox--form">
</s> add <label className={`checkbox ${modifier}`}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/helpers/form.js |
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)} | <mask> disabled={disabled}
<mask> />
<mask> <span className="custom-control-label">{placeholder}</span>
<mask> </label>
<mask> {!disabled && touched && (error && <span className="form__message form__message--error">{error}</span>)}
<mask> </Fragment>
<mask> );
<mask>
<mask> export const renderSelectField = ({
<mask> input, placeholder, disabled, meta: { touched, error },
</s> + client: handle filters configuration </s> remove <input
{...input}
type="radio"
className="custom-control-input"
disabled={disabled}
/>
</s> add <input {...input} type="radio" className="custom-control-input" disabled={disabled} /> </s> remove {!disabled && touched && (error && <span className="form__message form__message--error">{error}</span>)}
</s> add {!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)} </s> remove input, placeholder, disabled, meta: { touched, error },
</s> add input,
placeholder,
subtitle,
disabled,
modifier = 'checkbox--form',
meta: { touched, error }, </s> remove <label className="checkbox checkbox--form">
</s> add <label className={`checkbox ${modifier}`}> </s> remove input, placeholder, disabled, modifier, icon, meta: { touched, error },
</s> add input,
placeholder,
disabled,
modifier,
icon,
meta: { touched, error }, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/helpers/form.js |
input,
placeholder,
subtitle,
disabled,
modifier = 'checkbox--form',
meta: { touched, error }, | <mask> </Fragment>
<mask> );
<mask>
<mask> export const renderSelectField = ({
<mask> input, placeholder, disabled, meta: { touched, error },
<mask> }) => (
<mask> <Fragment>
<mask> <label className="checkbox checkbox--form">
<mask> <span className="checkbox__marker" />
<mask> <input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
</s> + client: handle filters configuration </s> remove <label className="checkbox checkbox--form">
</s> add <label className={`checkbox ${modifier}`}> </s> remove input, placeholder, disabled, modifier, icon, meta: { touched, error },
</s> add input,
placeholder,
disabled,
modifier,
icon,
meta: { touched, error }, </s> remove <input
{...input}
type="radio"
className="custom-control-input"
disabled={disabled}
/>
</s> add <input {...input} type="radio" className="custom-control-input" disabled={disabled} /> </s> remove {!disabled && touched && (error && <span className="form__message form__message--error">{error}</span>)}
</s> add {!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)} </s> remove <input type="checkbox" className="checkbox__input" onChange={() => this.props.toggleFilterStatus(filter.url)} checked={filter.enabled}/>
<span className="checkbox__label"/>
</s> add <input
type="checkbox"
className="checkbox__input"
onChange={() => this.props.toggleFilterStatus(url, enabled)}
checked={enabled}
disabled={processingConfigFilter}
/>
<span className="checkbox__label" /> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/helpers/form.js |
<label className={`checkbox ${modifier}`}> | <mask> export const renderSelectField = ({
<mask> input, placeholder, disabled, meta: { touched, error },
<mask> }) => (
<mask> <Fragment>
<mask> <label className="checkbox checkbox--form">
<mask> <span className="checkbox__marker" />
<mask> <input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
<mask> <span className="checkbox__label">
<mask> <span className="checkbox__label-text checkbox__label-text--long">
<mask> <span className="checkbox__label-title">{placeholder}</span>
</s> + client: handle filters configuration </s> remove input, placeholder, disabled, meta: { touched, error },
</s> add input,
placeholder,
subtitle,
disabled,
modifier = 'checkbox--form',
meta: { touched, error }, </s> remove <input
{...input}
type="radio"
className="custom-control-input"
disabled={disabled}
/>
</s> add <input {...input} type="radio" className="custom-control-input" disabled={disabled} /> </s> remove input, placeholder, disabled, modifier, icon, meta: { touched, error },
</s> add input,
placeholder,
disabled,
modifier,
icon,
meta: { touched, error }, </s> remove {!disabled && touched && (error && <span className="form__message form__message--error">{error}</span>)}
</s> add {!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/helpers/form.js |
{subtitle && (
<span
className="checkbox__label-subtitle"
dangerouslySetInnerHTML={{ __html: subtitle }}
/>
)} | <mask> <input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
<mask> <span className="checkbox__label">
<mask> <span className="checkbox__label-text checkbox__label-text--long">
<mask> <span className="checkbox__label-title">{placeholder}</span>
<mask> </span>
<mask> </span>
<mask> </label>
<mask> {!disabled &&
</s> + client: handle filters configuration </s> remove <label className="checkbox checkbox--form">
</s> add <label className={`checkbox ${modifier}`}> </s> remove <input
{...input}
type="radio"
className="custom-control-input"
disabled={disabled}
/>
</s> add <input {...input} type="radio" className="custom-control-input" disabled={disabled} /> </s> remove {!disabled && touched && (error && <span className="form__message form__message--error">{error}</span>)}
</s> add {!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)} </s> remove <div className="form__group">
</s> add <div className="form__group form__group--checkbox"> </s> remove <input type="checkbox" className="checkbox__input" onChange={() => this.props.toggleFilterStatus(filter.url)} checked={filter.enabled}/>
<span className="checkbox__label"/>
</s> add <input
type="checkbox"
className="checkbox__input"
onChange={() => this.props.toggleFilterStatus(url, enabled)}
checked={enabled}
disabled={processingConfigFilter}
/>
<span className="checkbox__label" /> | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/helpers/form.js |
input,
placeholder,
disabled,
modifier,
icon,
meta: { touched, error }, | <mask> </Fragment>
<mask> );
<mask>
<mask> export const renderServiceField = ({
<mask> input, placeholder, disabled, modifier, icon, meta: { touched, error },
<mask> }) => (
<mask> <Fragment>
<mask> <label className={`service custom-switch ${modifier}`}>
<mask> <input
<mask> {...input}
</s> + client: handle filters configuration </s> remove input, placeholder, disabled, meta: { touched, error },
</s> add input,
placeholder,
subtitle,
disabled,
modifier = 'checkbox--form',
meta: { touched, error }, </s> remove <label className="checkbox checkbox--form">
</s> add <label className={`checkbox ${modifier}`}> </s> remove <input
{...input}
type="radio"
className="custom-control-input"
disabled={disabled}
/>
</s> add <input {...input} type="radio" className="custom-control-input" disabled={disabled} /> </s> remove {!disabled && touched && (error && <span className="form__message form__message--error">{error}</span>)}
</s> add {!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)} </s> remove renderCheckbox = (row) => {
const { url } = row.original;
const { filters } = this.props.filtering;
const filter = filters.filter(filter => filter.url === url)[0];
</s> add renderCheckbox = ({ original }) => {
const { processingConfigFilter } = this.props.filtering;
const { url, enabled } = original; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/helpers/form.js |
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)} | <mask> <svg className="service__icon">
<mask> <use xlinkHref={`#${icon}`} />
<mask> </svg>
<mask> </label>
<mask> {!disabled && touched && (error && <span className="form__message form__message--error">{error}</span>)}
<mask> </Fragment>
<mask> );
<mask>
<mask> export const required = (value) => {
<mask> if (value || value === 0) {
</s> + client: handle filters configuration </s> remove {!disabled && touched && (error && <span className="form__message form__message--error">{error}</span>)}
</s> add {!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)} </s> remove <input
{...input}
type="radio"
className="custom-control-input"
disabled={disabled}
/>
</s> add <input {...input} type="radio" className="custom-control-input" disabled={disabled} /> </s> remove
const renderBody = () => {
if (!this.props.isFilterAdded) {
return (
<React.Fragment>
<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} />
{inputDescription &&
<div className="description">
{inputDescription}
</div>}
</React.Fragment>
);
}
return (
<div className="description">
<Trans>filter_added_successfully</Trans>
</div>
);
};
const isValidForSubmit = !(url.length > 0 && isUrlValid && name.length > 0);
</s> add const isValidForSubmit = url.length > 0 && isUrlValid && name.length > 0; </s> remove <input type="checkbox" className="checkbox__input" onChange={() => this.props.toggleFilterStatus(filter.url)} checked={filter.enabled}/>
<span className="checkbox__label"/>
</s> add <input
type="checkbox"
className="checkbox__input"
onChange={() => this.props.toggleFilterStatus(url, enabled)}
checked={enabled}
disabled={processingConfigFilter}
/>
<span className="checkbox__label" /> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/helpers/form.js |
import i18n from 'i18next'; | <mask> import round from 'lodash/round';
<mask> import axios from 'axios';
<mask>
<mask> import {
<mask> STANDARD_DNS_PORT,
<mask> STANDARD_WEB_PORT,
<mask> STANDARD_HTTPS_PORT,
</s> + client: handle filters configuration </s> remove import { showLoading, hideLoading } from 'react-redux-loading-bar';
</s> add </s> remove import { normalizeFilteringStatus, normalizeTextarea, sortClients } from '../helpers/helpers';
</s> add import { normalizeTextarea, sortClients } from '../helpers/helpers'; </s> remove import { formatTime, getClientName } from '../../helpers/helpers';
</s> add import { formatTime, formatDateTime, getClientName } from '../../helpers/helpers'; </s> remove import Modal from './Modal';
</s> add </s> remove import React, { Component } from 'react';
</s> add import React, { Component, Fragment } from 'react'; | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/helpers/helpers.js |
export const formatDateTime = (dateTime) => {
const currentLanguage = i18n.languages[0] || 'en';
const parsedTime = dateParse(dateTime);
const options = {
year: 'numeric',
month: 'numeric',
day: 'numeric',
hour: 'numeric',
minute: 'numeric',
hour12: false,
};
return parsedTime.toLocaleString(currentLanguage, options);
};
| <mask> const parsedTime = dateParse(time);
<mask> return dateFormat(parsedTime, 'HH:mm:ss');
<mask> };
<mask>
<mask> export const normalizeLogs = logs => logs.map((log) => {
<mask> const {
<mask> time,
<mask> question,
</s> + client: handle filters configuration </s> remove export const getFilteringRequest = createAction('GET_FILTERING_REQUEST');
export const getFilteringFailure = createAction('GET_FILTERING_FAILURE');
export const getFilteringSuccess = createAction('GET_FILTERING_SUCCESS');
export const getFiltering = () => async (dispatch) => {
dispatch(getFilteringRequest());
try {
const filteringStatus = await apiClient.getFilteringStatus();
dispatch(getFilteringSuccess(filteringStatus.enabled));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(getFilteringFailure());
}
};
</s> add </s> remove export const setRulesRequest = createAction('SET_RULES_REQUEST');
export const setRulesFailure = createAction('SET_RULES_FAILURE');
export const setRulesSuccess = createAction('SET_RULES_SUCCESS');
export const setRules = rules => async (dispatch) => {
dispatch(setRulesRequest());
try {
const replacedLineEndings = rules
.replace(/^\n/g, '')
.replace(/\n\s*\n/g, '\n');
await apiClient.setRules(replacedLineEndings);
dispatch(addSuccessToast('updated_custom_filtering_toast'));
dispatch(setRulesSuccess());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setRulesFailure());
}
};
export const getFilteringStatusRequest = createAction('GET_FILTERING_STATUS_REQUEST');
export const getFilteringStatusFailure = createAction('GET_FILTERING_STATUS_FAILURE');
export const getFilteringStatusSuccess = createAction('GET_FILTERING_STATUS_SUCCESS');
export const getFilteringStatus = () => async (dispatch) => {
dispatch(getFilteringStatusRequest());
try {
const status = await apiClient.getFilteringStatus();
dispatch(getFilteringStatusSuccess({ status: normalizeFilteringStatus(status) }));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(getFilteringStatusFailure());
}
};
export const toggleFilterRequest = createAction('FILTER_ENABLE_REQUEST');
export const toggleFilterFailure = createAction('FILTER_ENABLE_FAILURE');
export const toggleFilterSuccess = createAction('FILTER_ENABLE_SUCCESS');
export const toggleFilterStatus = url => async (dispatch, getState) => {
dispatch(toggleFilterRequest());
const state = getState();
const { filters } = state.filtering;
const filter = filters.filter(filter => filter.url === url)[0];
const { enabled } = filter;
let toggleStatusMethod;
if (enabled) {
toggleStatusMethod = apiClient.disableFilter.bind(apiClient);
} else {
toggleStatusMethod = apiClient.enableFilter.bind(apiClient);
}
try {
await toggleStatusMethod(url);
dispatch(toggleFilterSuccess(url));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(toggleFilterFailure());
}
};
export const refreshFiltersRequest = createAction('FILTERING_REFRESH_REQUEST');
export const refreshFiltersFailure = createAction('FILTERING_REFRESH_FAILURE');
export const refreshFiltersSuccess = createAction('FILTERING_REFRESH_SUCCESS');
export const refreshFilters = () => async (dispatch) => {
dispatch(refreshFiltersRequest());
dispatch(showLoading());
try {
const refreshText = await apiClient.refreshFilters();
dispatch(refreshFiltersSuccess());
if (refreshText.includes('OK')) {
if (refreshText.includes('OK 0')) {
dispatch(addSuccessToast('all_filters_up_to_date_toast'));
} else {
dispatch(addSuccessToast(refreshText.replace(/OK /g, '')));
}
} else {
dispatch(addErrorToast({ error: refreshText }));
}
dispatch(getFilteringStatus());
dispatch(hideLoading());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(refreshFiltersFailure());
dispatch(hideLoading());
}
};
export const handleRulesChange = createAction('HANDLE_RULES_CHANGE');
export const addFilterRequest = createAction('ADD_FILTER_REQUEST');
export const addFilterFailure = createAction('ADD_FILTER_FAILURE');
export const addFilterSuccess = createAction('ADD_FILTER_SUCCESS');
export const addFilter = (url, name) => async (dispatch) => {
dispatch(addFilterRequest());
try {
await apiClient.addFilter(url, name);
dispatch(addFilterSuccess(url));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(addFilterFailure());
}
};
export const removeFilterRequest = createAction('ADD_FILTER_REQUEST');
export const removeFilterFailure = createAction('ADD_FILTER_FAILURE');
export const removeFilterSuccess = createAction('ADD_FILTER_SUCCESS');
export const removeFilter = url => async (dispatch) => {
dispatch(removeFilterRequest());
try {
await apiClient.removeFilter(url);
dispatch(removeFilterSuccess(url));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(removeFilterFailure());
}
};
export const toggleFilteringModal = createAction('FILTERING_MODAL_TOGGLE');
</s> add </s> remove const filteringStatus = await apiClient.getFilteringStatus();
</s> add </s> remove renderCheckbox = (row) => {
const { url } = row.original;
const { filters } = this.props.filtering;
const filter = filters.filter(filter => filter.url === url)[0];
</s> add renderCheckbox = ({ original }) => {
const { processingConfigFilter } = this.props.filtering;
const { url, enabled } = original; </s> remove if (Object.keys(settings).length > 0) {
return Object.keys(settings).map((key) => {
</s> add const settingsKeys = Object.keys(settings);
if (settingsKeys.length > 0) {
return settingsKeys.map((key) => { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/helpers/helpers.js |
return {
enabled,
userRules: newUserRules,
filters: newFilters,
interval,
}; | <mask> id, url, enabled, lastUpdated: formatTime(lastUpdated), name, rulesCount,
<mask> };
<mask> }) : [];
<mask> const newUserRules = Array.isArray(userRules) ? userRules.join('\n') : '';
<mask> return { enabled, userRules: newUserRules, filters: newFilters };
<mask> };
<mask>
<mask> export const getPercent = (amount, number) => {
<mask> if (amount > 0 && number > 0) {
<mask> return round(100 / (amount / number), 2);
</s> + client: handle filters configuration </s> remove if (Object.keys(settings).length > 0) {
return Object.keys(settings).map((key) => {
</s> add const settingsKeys = Object.keys(settings);
if (settingsKeys.length > 0) {
return settingsKeys.map((key) => { </s> remove
const renderBody = () => {
if (!this.props.isFilterAdded) {
return (
<React.Fragment>
<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} />
{inputDescription &&
<div className="description">
{inputDescription}
</div>}
</React.Fragment>
);
}
return (
<div className="description">
<Trans>filter_added_successfully</Trans>
</div>
);
};
const isValidForSubmit = !(url.length > 0 && isUrlValid && name.length > 0);
</s> add const isValidForSubmit = url.length > 0 && isUrlValid && name.length > 0; </s> remove const {
isOpen,
title,
inputDescription,
processingAddFilter,
} = this.props;
</s> add const { isOpen, processingAddFilter } = this.props; </s> remove renderCheckbox = (row) => {
const { url } = row.original;
const { filters } = this.props.filtering;
const filter = filters.filter(filter => filter.url === url)[0];
</s> add renderCheckbox = ({ original }) => {
const { processingConfigFilter } = this.props.filtering;
const { url, enabled } = original; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/helpers/helpers.js |
export const normalizeRulesTextarea = text => text && text.replace(/^\n/g, '').replace(/\n\s*\n/g, '\n'); | <mask> }
<mask>
<mask> return seconds;
<mask> };
</s> + client: handle filters configuration </s> remove return this.makeRequest(path, method, config);
</s> add return this.makeRequest(path, method, parameters); </s> remove enableFiltering() {
const { path, method } = this.FILTERING_ENABLE;
return this.makeRequest(path, method);
}
disableFiltering() {
const { path, method } = this.FILTERING_DISABLE;
return this.makeRequest(path, method);
}
// TODO find out when to use force parameter
</s> add </s> remove disableFilter(url) {
const { path, method } = this.FILTERING_DISABLE_FILTER;
const parameter = 'url';
const requestBody = `${parameter}=${url}`;
const config = {
data: requestBody,
header: { 'Content-Type': 'text/plain' },
</s> add setFilterUrl(config) {
const { path, method } = this.FILTERING_SET_URL;
const parameters = {
data: config,
headers: { 'Content-Type': 'application/json' }, </s> remove enableFilter(url) {
const { path, method } = this.FILTERING_ENABLE_FILTER;
const parameter = 'url';
const requestBody = `${parameter}=${url}`;
const config = {
data: requestBody,
header: { 'Content-Type': 'text/plain' },
</s> add setFiltersConfig(config) {
const { path, method } = this.FILTERING_CONFIG;
const parameters = {
data: config,
headers: { 'Content-Type': 'application/json' }, </s> remove const { path, method } = this.FILTERING_STATUS;
</s> add const { path, method } = this.FILTERING_INFO; | [
"keep",
"keep",
"keep",
"add"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/helpers/helpers.js |
import filtering from './filtering'; | <mask> import services from './services';
<mask> import stats from './stats';
<mask> import queryLogs from './queryLogs';
<mask>
<mask> const settings = handleActions({
<mask> [actions.initSettingsRequest]: state => ({ ...state, processing: true }),
<mask> [actions.initSettingsFailure]: state => ({ ...state, processing: false }),
<mask> [actions.initSettingsSuccess]: (state, { payload }) => {
</s> + client: handle filters configuration </s> remove const filtering = handleActions({
[actions.setRulesRequest]: state => ({ ...state, processingRules: true }),
[actions.setRulesFailure]: state => ({ ...state, processingRules: false }),
[actions.setRulesSuccess]: state => ({ ...state, processingRules: false }),
[actions.handleRulesChange]: (state, { payload }) => {
const { userRules } = payload;
return { ...state, userRules };
},
[actions.getFilteringStatusRequest]: state => ({ ...state, processingFilters: true }),
[actions.getFilteringStatusFailure]: state => ({ ...state, processingFilters: false }),
[actions.getFilteringStatusSuccess]: (state, { payload }) => {
const { status } = payload;
const { filters, userRules } = status;
const newState = {
...state, filters, userRules, processingFilters: false,
};
return newState;
},
[actions.addFilterRequest]: state =>
({ ...state, processingAddFilter: true, isFilterAdded: false }),
[actions.addFilterFailure]: (state) => {
const newState = { ...state, processingAddFilter: false, isFilterAdded: false };
return newState;
},
[actions.addFilterSuccess]: state =>
({ ...state, processingAddFilter: false, isFilterAdded: true }),
[actions.toggleFilteringModal]: (state) => {
const newState = {
...state,
isFilteringModalOpen: !state.isFilteringModalOpen,
isFilterAdded: false,
};
return newState;
},
[actions.toggleFilterRequest]: state => ({ ...state, processingFilters: true }),
[actions.toggleFilterFailure]: state => ({ ...state, processingFilters: false }),
[actions.toggleFilterSuccess]: state => ({ ...state, processingFilters: false }),
[actions.refreshFiltersRequest]: state => ({ ...state, processingRefreshFilters: true }),
[actions.refreshFiltersFailure]: state => ({ ...state, processingRefreshFilters: false }),
[actions.refreshFiltersSuccess]: state => ({ ...state, processingRefreshFilters: false }),
}, {
isFilteringModalOpen: false,
processingFilters: false,
processingRules: false,
processingAddFilter: false,
processingRefreshFilters: false,
filters: [],
userRules: '',
});
</s> add </s> remove [actions.getFilteringRequest]: state => ({ ...state, processingFiltering: true }),
[actions.getFilteringFailure]: state => ({ ...state, processingFiltering: false }),
[actions.getFilteringSuccess]: (state, { payload }) => {
const newState = { ...state, isFilteringEnabled: payload, processingFiltering: false };
return newState;
},
</s> add </s> remove import { getFilteringStatus, setRules, addSuccessToast, getClients } from '../actions';
</s> add import { addSuccessToast, getClients } from '../actions';
import { getFilteringStatus, setRules } from '../actions/filtering'; </s> remove import * as actionCreators from '../actions';
</s> add import {
setRules,
getFilteringStatus,
addFilter,
removeFilter,
toggleFilterStatus,
toggleFilteringModal,
refreshFilters,
handleRulesChange,
} from '../actions/filtering'; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/reducers/index.js |
<mask> const newState = { ...state, processingUpdate: false };
<mask> return newState;
<mask> },
<mask>
<mask> [actions.getFilteringRequest]: state => ({ ...state, processingFiltering: true }),
<mask> [actions.getFilteringFailure]: state => ({ ...state, processingFiltering: false }),
<mask> [actions.getFilteringSuccess]: (state, { payload }) => {
<mask> const newState = { ...state, isFilteringEnabled: payload, processingFiltering: false };
<mask> return newState;
<mask> },
<mask>
<mask> [actions.toggleProtectionRequest]: state => ({ ...state, processingProtection: true }),
<mask> [actions.toggleProtectionFailure]: state => ({ ...state, processingProtection: false }),
<mask> [actions.toggleProtectionSuccess]: (state) => {
<mask> const newState = {
<mask> ...state,
</s> + client: handle filters configuration </s> remove const filtering = handleActions({
[actions.setRulesRequest]: state => ({ ...state, processingRules: true }),
[actions.setRulesFailure]: state => ({ ...state, processingRules: false }),
[actions.setRulesSuccess]: state => ({ ...state, processingRules: false }),
[actions.handleRulesChange]: (state, { payload }) => {
const { userRules } = payload;
return { ...state, userRules };
},
[actions.getFilteringStatusRequest]: state => ({ ...state, processingFilters: true }),
[actions.getFilteringStatusFailure]: state => ({ ...state, processingFilters: false }),
[actions.getFilteringStatusSuccess]: (state, { payload }) => {
const { status } = payload;
const { filters, userRules } = status;
const newState = {
...state, filters, userRules, processingFilters: false,
};
return newState;
},
[actions.addFilterRequest]: state =>
({ ...state, processingAddFilter: true, isFilterAdded: false }),
[actions.addFilterFailure]: (state) => {
const newState = { ...state, processingAddFilter: false, isFilterAdded: false };
return newState;
},
[actions.addFilterSuccess]: state =>
({ ...state, processingAddFilter: false, isFilterAdded: true }),
[actions.toggleFilteringModal]: (state) => {
const newState = {
...state,
isFilteringModalOpen: !state.isFilteringModalOpen,
isFilterAdded: false,
};
return newState;
},
[actions.toggleFilterRequest]: state => ({ ...state, processingFilters: true }),
[actions.toggleFilterFailure]: state => ({ ...state, processingFilters: false }),
[actions.toggleFilterSuccess]: state => ({ ...state, processingFilters: false }),
[actions.refreshFiltersRequest]: state => ({ ...state, processingRefreshFilters: true }),
[actions.refreshFiltersFailure]: state => ({ ...state, processingRefreshFilters: false }),
[actions.refreshFiltersSuccess]: state => ({ ...state, processingRefreshFilters: false }),
}, {
isFilteringModalOpen: false,
processingFilters: false,
processingRules: false,
processingAddFilter: false,
processingRefreshFilters: false,
filters: [],
userRules: '',
});
</s> add </s> remove renderCheckbox = (row) => {
const { url } = row.original;
const { filters } = this.props.filtering;
const filter = filters.filter(filter => filter.url === url)[0];
</s> add renderCheckbox = ({ original }) => {
const { processingConfigFilter } = this.props.filtering;
const { url, enabled } = original; </s> remove columns = [{
Header: <Trans>enabled_table_header</Trans>,
accessor: 'enabled',
Cell: this.renderCheckbox,
width: 90,
className: 'text-center',
}, {
Header: <Trans>name_table_header</Trans>,
accessor: 'name',
Cell: ({ value }) => (<div className="logs__row logs__row--overflow"><span className="logs__text" title={value}>{value}</span></div>),
}, {
Header: <Trans>filter_url_table_header</Trans>,
accessor: 'url',
Cell: ({ value }) => (<div className="logs__row logs__row--overflow"><a href={value} target='_blank' rel='noopener noreferrer' className="link logs__text">{value}</a></div>),
}, {
Header: <Trans>rules_count_table_header</Trans>,
accessor: 'rulesCount',
className: 'text-center',
Cell: props => props.value.toLocaleString(),
}, {
Header: <Trans>last_time_updated_table_header</Trans>,
accessor: 'lastUpdated',
className: 'text-center',
}, {
Header: <Trans>actions_table_header</Trans>,
accessor: 'url',
Cell: ({ value }) => (
<button
type="button"
className="btn btn-icon btn-outline-secondary btn-sm"
onClick={() => this.handleDelete(value)}
title={this.props.t('delete_table_action')}
>
<svg className="icons">
<use xlinkHref="#delete" />
</svg>
</button>
),
className: 'text-center',
width: 80,
sortable: false,
},
</s> add columns = [
{
Header: <Trans>enabled_table_header</Trans>,
accessor: 'enabled',
Cell: this.renderCheckbox,
width: 90,
className: 'text-center',
},
{
Header: <Trans>name_table_header</Trans>,
accessor: 'name',
minWidth: 200,
Cell: CellWrap,
},
{
Header: <Trans>filter_url_table_header</Trans>,
accessor: 'url',
minWidth: 200,
Cell: ({ value }) => (
<div className="logs__row logs__row--overflow">
<a
href={value}
target="_blank"
rel="noopener noreferrer"
className="link logs__text"
>
{value}
</a>
</div>
),
},
{
Header: <Trans>rules_count_table_header</Trans>,
accessor: 'rulesCount',
className: 'text-center',
minWidth: 100,
Cell: props => props.value.toLocaleString(),
},
{
Header: <Trans>last_time_updated_table_header</Trans>,
accessor: 'lastUpdated',
className: 'text-center',
minWidth: 150,
Cell: CellWrap,
},
{
Header: <Trans>actions_table_header</Trans>,
accessor: 'url',
Cell: ({ value }) => (
<button
type="button"
className="btn btn-icon btn-outline-secondary btn-sm"
onClick={() => this.handleDelete(value)}
title={this.props.t('delete_table_action')}
>
<svg className="icons">
<use xlinkHref="#delete" />
</svg>
</button>
),
className: 'text-center',
width: 80,
sortable: false,
}, </s> remove input, placeholder, disabled, modifier, icon, meta: { touched, error },
</s> add input,
placeholder,
disabled,
modifier,
icon,
meta: { touched, error }, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/reducers/index.js |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.