diff --git a/fe-app-podkop/src/podkop/tabs/diagnostic/checks/runDnsCheck.ts b/fe-app-podkop/src/podkop/tabs/diagnostic/checks/runDnsCheck.ts index c8ee05a..9fe7454 100644 --- a/fe-app-podkop/src/podkop/tabs/diagnostic/checks/runDnsCheck.ts +++ b/fe-app-podkop/src/podkop/tabs/diagnostic/checks/runDnsCheck.ts @@ -35,13 +35,13 @@ export async function runDnsCheck() { const allGood = Boolean(data.dns_on_router) && - Boolean(data.dhcp_has_dns_server) && + Boolean(data.dhcp_config_status) && Boolean(data.bootstrap_dns_status) && Boolean(data.dns_status); const atLeastOneGood = Boolean(data.dns_on_router) || - Boolean(data.dhcp_has_dns_server) || + Boolean(data.dhcp_config_status) || Boolean(data.bootstrap_dns_status) || Boolean(data.dns_status); @@ -87,7 +87,7 @@ export async function runDnsCheck() { value: '', }, { - state: data.dhcp_has_dns_server ? 'success' : 'error', + state: data.dhcp_config_status ? 'success' : 'error', key: _('DHCP has DNS server'), value: '', }, diff --git a/fe-app-podkop/src/podkop/types.ts b/fe-app-podkop/src/podkop/types.ts index e89774e..fb30465 100644 --- a/fe-app-podkop/src/podkop/types.ts +++ b/fe-app-podkop/src/podkop/types.ts @@ -152,7 +152,7 @@ export namespace Podkop { dns_on_router: 0 | 1; bootstrap_dns_server: string; bootstrap_dns_status: 0 | 1; - dhcp_has_dns_server: 0 | 1; + dhcp_config_status: 0 | 1; } export interface NftRulesCheckResult { diff --git a/luci-app-podkop/htdocs/luci-static/resources/view/podkop/main.js b/luci-app-podkop/htdocs/luci-static/resources/view/podkop/main.js index 9628e2c..24fe606 100644 --- a/luci-app-podkop/htdocs/luci-static/resources/view/podkop/main.js +++ b/luci-app-podkop/htdocs/luci-static/resources/view/podkop/main.js @@ -2066,8 +2066,8 @@ async function runDnsCheck() { throw new Error("DNS checks failed"); } const data = dnsChecks.data; - const allGood = Boolean(data.dns_on_router) && Boolean(data.dhcp_has_dns_server) && Boolean(data.bootstrap_dns_status) && Boolean(data.dns_status); - const atLeastOneGood = Boolean(data.dns_on_router) || Boolean(data.dhcp_has_dns_server) || Boolean(data.bootstrap_dns_status) || Boolean(data.dns_status); + const allGood = Boolean(data.dns_on_router) && Boolean(data.dhcp_config_status) && Boolean(data.bootstrap_dns_status) && Boolean(data.dns_status); + const atLeastOneGood = Boolean(data.dns_on_router) || Boolean(data.dhcp_config_status) || Boolean(data.bootstrap_dns_status) || Boolean(data.dns_status); console.log("dnsChecks", dnsChecks); function getStatus() { if (allGood) { @@ -2106,7 +2106,7 @@ async function runDnsCheck() { value: "" }, { - state: data.dhcp_has_dns_server ? "success" : "error", + state: data.dhcp_config_status ? "success" : "error", key: _("DHCP has DNS server"), value: "" }