mirrors/AdGuardHome
1
0
Fork 0
mirror of https://github.com/AdguardTeam/AdGuardHome.git synced 2025-04-30 21:21:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

+ client: Replace TTL override zeroes with empty strings, update dnsproxy

Browse source 
Close 

Squashed commit of the following:

commit 9acaa0331f3094a2b48c1f0cf846a30e5c9dfc43
Merge: c207ccc9 3a71374f
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Sep 18 17:45:20 2020 +0300

    Merge branch 'master' into fix/2091

commit c207ccc9a12f225a6f0343f5273a3469b2709679
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Sep 18 17:14:24 2020 +0300

    Remove unused imports

commit 750f60ffc40fd48d4bd09a4e2ac4a3143e0cf126
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Sep 18 16:47:24 2020 +0300

    Update dnsproxy to v0.32.6

commit 1723267e0e7f512db532cd180a3e9d44182d96b3
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Sep 18 16:32:12 2020 +0300

    Replace zeroes with empty string
This commit is contained in:
Artem Baskal 2020-09-21 10:19:56 +03:00
parent 3a71374f9f
commit bf23aa4d9b
5 changed files with 82 additions and 55 deletions
client/src/helpers
helpers.js

12
client/src/helpers/helpers.js
View file

@ -717,14 +717,18 @@ export const setHtmlLangAttr = (language) => {
* @param values {object}
* @returns {object}
*/
export const selectCompletedFields = (values) => Object.entries(values)
export const replaceEmptyStringsWithZeroes = (values) => Object.entries(values)
.reduce((acc, [key, value]) => {
if (value || value === 0) {
acc[key] = value;
}
acc[key] = value === '' ? 0 : value;
return acc;
}, {});
/**
* @param value {number || string}
* @returns {string}
*/
export const replaceZeroWithEmptyString = (value) => (parseInt(value, 10) === 0 ? '' : value);
/**
* @param {string} search
* @param {string} [response_status]