feat: change dns check output

fe-app-podkop/src/helpers/index.ts

@@ -11,3 +11,4 @@ export * from './splitProxyString';
 export * from './preserveScrollForPage';
 export * from './parseQueryString';
 export * from './svgEl';
+export * from './insertIf';

fe-app-podkop/src/helpers/insertIf.ts

@@ -0,0 +1,7 @@
+export function insertIf<T>(condition: boolean, elements: Array<T>) {
+  return condition ? elements : ([] as Array<T>);
+}
+
+export function insertIfObj<T>(condition: boolean, object: T) {
+  return condition ? object : ({} as T);
+}

fe-app-podkop/src/podkop/tabs/diagnostic/checks/runDnsCheck.ts

@@ -1,5 +1,7 @@
 import { getDNSCheck } from '../../../methods';
 import { updateDiagnosticsCheck } from '../updateDiagnosticsCheck';
+import { insertIf } from '../../../../helpers';
+import { IDiagnosticsChecksItem } from '../../../../store';
 
 export async function runDnsCheck() {
   const code = 'dns_check';
@@ -58,20 +60,25 @@ export async function runDnsCheck() {
     description: _('DNS checks passed'),
     state: getStatus(),
     items: [
+      ...insertIf<IDiagnosticsChecksItem>(
+        data.dns_type === 'doh' || data.dns_type === 'dot',
+        [
           {
             state: data.bootstrap_dns_status ? 'success' : 'error',
             key: _('Bootsrap DNS'),
-        value: data.bootstrap_dns_server,
+            value: `${data.bootstrap_dns_server} ${data.bootstrap_dns_status ? '✅' : '❌'}`,
           },
+        ],
+      ),
       {
         state: data.dns_status ? 'success' : 'error',
         key: _('Main DNS'),
-        value: `${data.dns_server} [${data.dns_type}]`,
+        value: `${data.dns_server} [${data.dns_type}] ${data.dns_status ? '✅' : '❌'}`,
       },
       {
         state: data.local_dns_status ? 'success' : 'error',
         key: _('Local DNS'),
-        value: data.local_dns_status ? _('Enabled') : _('Failed'),
+        value: data.local_dns_status ? '✅' : '❌',
       },
     ],
   });

fe-app-podkop/src/store.ts

@@ -112,16 +112,18 @@ class Store<T extends Record<string, any>> {
   }
 }
 
+export interface IDiagnosticsChecksItem {
+  state: 'error' | 'warning' | 'success';
+  key: string;
+  value: string;
+}
+
 export interface IDiagnosticsChecksStoreItem {
   code: string;
   title: string;
   description: string;
   state: 'loading' | 'warning' | 'success' | 'error' | 'skipped';
-  items: Array<{
-    state: 'error' | 'warning' | 'success';
-    key: string;
-    value: string;
-  }>;
+  items: Array<IDiagnosticsChecksItem>;
 }
 
 export interface StoreType {

luci-app-podkop/htdocs/luci-static/resources/view/podkop/main.js

@@ -768,6 +768,14 @@ function svgEl(tag, attrs = {}, children = []) {
   return el;
 }
 
+// src/helpers/insertIf.ts
+function insertIf(condition, elements) {
+  return condition ? elements : [];
+}
+function insertIfObj(condition, object) {
+  return condition ? object : {};
+}
+
 // src/validators/validateVlessUrl.ts
 function validateVlessUrl(url) {
   try {
@@ -2538,20 +2546,25 @@ async function runDnsCheck() {
     description: _("DNS checks passed"),
     state: getStatus(),
     items: [
+      ...insertIf(
+        data.dns_type === "doh" || data.dns_type === "dot",
+        [
           {
             state: data.bootstrap_dns_status ? "success" : "error",
             key: _("Bootsrap DNS"),
-        value: data.bootstrap_dns_server
-      },
+            value: `${data.bootstrap_dns_server} ${data.bootstrap_dns_status ? "\u2705" : "\u274C"}`
+          }
+        ]
+      ),
       {
         state: data.dns_status ? "success" : "error",
         key: _("Main DNS"),
-        value: `${data.dns_server} [${data.dns_type}]`
+        value: `${data.dns_server} [${data.dns_type}] ${data.dns_status ? "\u2705" : "\u274C"}`
       },
       {
         state: data.local_dns_status ? "success" : "error",
         key: _("Local DNS"),
-        value: data.local_dns_status ? _("Enabled") : _("Failed")
+        value: data.local_dns_status ? "\u2705" : "\u274C"
       }
     ]
   });
@@ -2812,6 +2825,8 @@ return baseclass.extend({
   initDashboardController,
   initDiagnosticController,
   injectGlobalStyles,
+  insertIf,
+  insertIfObj,
   maskIP,
   onMount,
   parseQueryString,