all: sync with master; upd chlog

client/src/reducers/dhcp.js

@@ -128,7 +128,8 @@ const dhcp = handleActions(
             const newState = {
                 ...state,
                 isModalOpen: !state.isModalOpen,
-                leaseModalConfig: payload,
+                modalType: payload?.type || '',
+                leaseModalConfig: payload?.config,
             };
             return newState;
         },
@@ -175,6 +176,16 @@ const dhcp = handleActions(
             };
             return newState;
         },
+
+        [actions.updateStaticLeaseRequest]: (state) => ({ ...state, processingUpdating: true }),
+        [actions.updateStaticLeaseFailure]: (state) => ({ ...state, processingUpdating: false }),
+        [actions.updateStaticLeaseSuccess]: (state) => {
+            const newState = {
+                ...state,
+                processingUpdating: false,
+            };
+            return newState;
+        },
     },
     {
         processing: true,
@@ -184,6 +195,7 @@ const dhcp = handleActions(
         processingConfig: false,
         processingAdding: false,
         processingDeleting: false,
+        processingUpdating: false,
         enabled: false,
         interface_name: '',
         check: null,
@@ -202,6 +214,7 @@ const dhcp = handleActions(
         staticLeases: [],
         isModalOpen: false,
         leaseModalConfig: undefined,
+        modalType: '',
         dhcp_available: false,
     },
 );

client/src/reducers/dnsConfig.js

@@ -49,6 +49,7 @@ const dnsConfig = handleActions(
         ratelimit: 20,
         blocking_ipv4: DEFAULT_BLOCKING_IPV4,
         blocking_ipv6: DEFAULT_BLOCKING_IPV6,
+        blocked_response_ttl: 10,
         edns_cs_enabled: false,
         disable_ipv6: false,
         dnssec_enabled: false,