🔀 Merge branch 'dev' into feature/add-basic-authentication

src/tools/server/sdk/adGuard/adGuard.schema.ts

@@ -1,7 +1,7 @@
 import { z } from 'zod';
 
 export const adGuardApiStatsResponseSchema = z.object({
-  time_units: z.enum(['hours']),
+  time_units: z.enum(['hours', 'days']),
   top_queried_domains: z.array(z.record(z.string(), z.number())),
   top_clients: z.array(z.record(z.string(), z.number())),
   top_blocked_domains: z.array(z.record(z.string(), z.number())),

src/tools/server/sdk/adGuard/adGuard.ts

@@ -1,3 +1,4 @@
+import { z } from 'zod';
 import { trimStringEnding } from '../../../shared/strings';
 import {
   adGuardApiFilteringStatusSchema,
@@ -77,19 +78,4 @@ export class AdGuard {
   }
 }
 
-export type AdGuardStatsType = {
-  time_units: string;
-  top_queried_domains: { [key: string]: number }[];
-  top_clients: { [key: string]: number }[];
-  top_blocked_domains: { [key: string]: number }[];
-  dns_queries: number[];
-  blocked_filtering: number[];
-  replaced_safebrowsing: number[];
-  replaced_parental: number[];
-  num_dns_queries: number;
-  num_blocked_filtering: number;
-  num_replaced_safebrowsing: number;
-  num_replaced_safesearch: number;
-  num_replaced_parental: number;
-  avg_processing_time: number;
-};
+export type AdGuardStatsType = z.infer<typeof adGuardApiStatsResponseSchema>;

src/tools/server/translation-namespaces.ts

@@ -32,6 +32,7 @@ export const boardNamespaces = [
   'modules/dns-hole-summary',
   'modules/dns-hole-controls',
   'modules/bookmark',
+  'modules/notebook',
   'widgets/error-boundary',
   'widgets/draggable-list',
   'widgets/location',
@@ -45,3 +46,6 @@ export const manageNamespaces = [
   'manage/users/invites',
   'manage/users/create',
 ];
+export const loginNamespaces = ['authentication/login'];
+
+export const pageNotFoundNamespaces = ['layout/errors/not-found'];