From e853555c45ca504618a31e06a85f27c8e2d03228 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A2=D0=B8=D0=BC=D0=BE=D1=84=D0=B5=D0=B9=20=D0=90=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BA=D1=81=D0=B5=D0=B5=D0=B2?= <alexeev.tim@gmail.com>
Date: Wed, 10 Dec 2025 13:19:15 +0300
Subject: [PATCH] MD-1095

---
 .../features/dhcp/dhcp-areas-item/dhcp-areas-item.html    | 2 +-
 .../app/features/dhcp/dhcp-areas-item/dhcp-areas-item.ts  | 8 ++++++++
 .../dhcp/dhcp-setup-wizard/dhcp-setup-wizard.component.ts | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/projects/multidirectory-app/src/app/features/dhcp/dhcp-areas-item/dhcp-areas-item.html b/projects/multidirectory-app/src/app/features/dhcp/dhcp-areas-item/dhcp-areas-item.html
index 919ab5b7..f4c3fa6d 100644
--- a/projects/multidirectory-app/src/app/features/dhcp/dhcp-areas-item/dhcp-areas-item.html
+++ b/projects/multidirectory-app/src/app/features/dhcp/dhcp-areas-item/dhcp-areas-item.html
@@ -2,7 +2,7 @@
   <div class="dhcp-areas-item__header">
     <h3>
       <span class="hcp-areas-item__header-number">{{ subnet.id }}</span> Область:
-      <b>{{subnet.default_gateway}}</b>
+      <b>{{ subnetWithoutMask }}</b>
     </h3>
     <div class="cell-control-buttons">
       <md-button class="control-button" (click)="deleteArea()">
diff --git a/projects/multidirectory-app/src/app/features/dhcp/dhcp-areas-item/dhcp-areas-item.ts b/projects/multidirectory-app/src/app/features/dhcp/dhcp-areas-item/dhcp-areas-item.ts
index aa0c6da8..efaedd30 100644
--- a/projects/multidirectory-app/src/app/features/dhcp/dhcp-areas-item/dhcp-areas-item.ts
+++ b/projects/multidirectory-app/src/app/features/dhcp/dhcp-areas-item/dhcp-areas-item.ts
@@ -30,6 +30,14 @@ export default class DhcpAreasItem {
   private readonly dhcp = inject(DhcpApiService);
   onSelectedTabIndexChange = output<number>();
 
+  get subnetWithoutMask(): string {
+    const subnet = this.subnet?.subnet;
+    if (!subnet) {
+      return '';
+    }
+    return subnet.substring(0, subnet.indexOf('/'));
+  }
+
   constructor() {
     effect(() => {
       const tabs = untracked(() => this.tabs());
diff --git a/projects/multidirectory-app/src/app/features/dhcp/dhcp-setup-wizard/dhcp-setup-wizard.component.ts b/projects/multidirectory-app/src/app/features/dhcp/dhcp-setup-wizard/dhcp-setup-wizard.component.ts
index 5bcb564f..49177bf3 100644
--- a/projects/multidirectory-app/src/app/features/dhcp/dhcp-setup-wizard/dhcp-setup-wizard.component.ts
+++ b/projects/multidirectory-app/src/app/features/dhcp/dhcp-setup-wizard/dhcp-setup-wizard.component.ts
@@ -70,7 +70,7 @@ export class DHCPSetupWizardComponent {
       subnet: this.form.subnetMask.value,
       pool: `${this.form.startIp.value}-${this.form.endIp.value}`,
       valid_lifetime: lifetime,
-      default_gateway: this.form.defaultGateway.value,
+      default_gateway: this.form.defaultGateway.value || null,
     };
 
     if (!this.isResetForm) {