fix: [MULTIDIRECTORY-1272] Remove DNS functions from the front

Author: Natalia Kupriianova

projects/multidirectory-app/src/app/features/dhcp/tabs/reservation/reservation.component.ts

@@ -13,14 +13,7 @@ import { catchError } from 'rxjs';
   selector: 'reservation',
   templateUrl: './reservation.component.html',
   styleUrls: ['./reservation.component.scss'],
-  imports: [
-    DatagridComponent,
-    ButtonComponent,
-    TranslocoPipe,
-    ButtonComponent,
-    ButtonComponent,
-    ButtonComponent,
-  ],
+  imports: [DatagridComponent, ButtonComponent, TranslocoPipe, ButtonComponent, ButtonComponent, ButtonComponent],
 })
 export default class DhcpReservationComponent implements OnInit {
   private dialogService = inject(DialogService);
@@ -59,23 +52,22 @@ export default class DhcpReservationComponent implements OnInit {
   }
 
   delete() {
-    const selectedReservationExist =
-      this.selectedReservation && Object.keys(this.selectedReservation).length > 0;
+    const selectedReservationExist = this.selectedReservation && Object.keys(this.selectedReservation).length > 0;
     selectedReservationExist &&
-    this.dhcp
-      .deleteDhcpReservation({
-        ip_address: this.selectedReservation?.ip_address ?? '',
-        mac_address: this.selectedReservation?.mac_address ?? '',
-        subnet_id: this.subnet.id,
-      })
-      .pipe(
-        catchError((err) => {
-          throw err;
-        }),
-      )
-      .subscribe(() => {
-        this.dhcp.getReservationsList(this.subnet.id);
-      });
+      this.dhcp
+        .deleteDhcpReservation({
+          ip_address: this.selectedReservation?.ip_address ?? '',
+          mac_address: this.selectedReservation?.mac_address ?? '',
+          subnet_id: this.subnet.id,
+        })
+        .pipe(
+          catchError((err) => {
+            throw err;
+          }),
+        )
+        .subscribe(() => {
+          this.dhcp.getReservationsList(this.subnet.id);
+        });
   }
 
   add() {
@@ -103,7 +95,7 @@ export default class DhcpReservationComponent implements OnInit {
       subnet_id: this.subnet.id,
       ip_address: ip,
       mac_address: mac,
-      hostname: host
+      hostname: host,
     };
   }
 
@@ -113,8 +105,8 @@ export default class DhcpReservationComponent implements OnInit {
         component: DhcpAddReservationComponent,
         dialogConfig: {
           width: '550px',
-          data: new ReservationDataWrapper(data, reservationExists)
-        }
+          data: new ReservationDataWrapper(data, reservationExists),
+        },
       })
       .closed.subscribe();
   }

projects/multidirectory-app/src/app/features/dns/add-zone-dialog/add-zone-dialog.component.ts

@@ -1,16 +1,13 @@
 import { Component, inject } from '@angular/core';
-import { DialogComponent } from '../../../components/modals/components/core/dialog/dialog.component';
+import { DialogComponent } from '@components/modals/components/core/dialog/dialog.component';
 import { TranslocoModule } from '@jsverse/transloco';
 import { FormsModule } from '@angular/forms';
 import { DnsApiService } from '@services/dns-api.service';
 import { DialogRef } from '@angular/cdk/dialog';
-import { DialogService } from '../../../components/modals/services/dialog.service';
+import { DialogService } from '@components/modals/services/dialog.service';
 import { MultidirectoryUiKitModule } from 'multidirectory-ui-kit';
-import { IpListDialogComponent } from '@components/modals/components/dialogs/access-policy-ip-list/ip-list-dialog.component';
-import { IplistDialogData } from '@components/modals/interfaces/ip-list-dialog.interface';
-import { take } from 'rxjs';
-import { IpOption, IpRange } from '@core/access-policy/access-policy-ip-address';
-import { DnsAddZoneRequest, DnsZoneParam } from '@models/dhcp/areas/dhcp-add-areas-response';
+import { IpOption } from '@core/access-policy/access-policy-ip-address';
+import { DnsAddZoneRequest } from '@models/dhcp/areas/dhcp-add-areas-response';
 import { CommonModule } from '@angular/common';
 import { RequiredWithMessageDirective } from '@core/validators/required-with-message.directive';
 

projects/multidirectory-app/src/app/features/dns/dns-forward-zones/dns-forward-zones.component.ts

@@ -1,16 +1,14 @@
 import { Component, inject, OnInit, signal } from '@angular/core';
-import { RedirectZonesRow } from '@features/dns/interfaces/redirect-zones.interface';
 import { translate, TranslocoPipe } from '@jsverse/transloco';
-import { ButtonComponent, DatagridComponent, DropdownOption } from 'multidirectory-ui-kit';
+import { ButtonComponent, DatagridComponent } from 'multidirectory-ui-kit';
 import { ToastrService } from 'ngx-toastr';
-import { DialogService } from '../../../components/modals/services/dialog.service';
+import { DialogService } from '@components/modals/services/dialog.service';
 import { CommonModule } from '@angular/common';
 import { DnsApiService } from '@services/dns-api.service';
 import { DnsForwardGetData, DnsForwardZone } from '@models/api/dns/dns-forward-zone';
 import { AddForwardZoneDialogData, AddForwardZoneDialogReturnData } from './add-forward-zone-dialog/add-forward-zone-dialog.interface';
 import { AddForwardZoneDialogComponent } from './add-forward-zone-dialog/add-forward-zone-dialog.component';
-import { DnsAddZoneRequest } from '@models/dhcp/areas/dhcp-add-areas-response';
-import { EMPTY, filter, switchMap, take } from 'rxjs';
+import { filter, switchMap, take } from 'rxjs';
 import { TableColumn } from 'ngx-datatable-gimefork';
 
 @Component({
@@ -65,7 +63,7 @@ export class DnsForwardZonesComponent implements OnInit {
           return this.dnsApi.addForwardZone(result);
         }),
       )
-      .subscribe((result) => {
+      .subscribe(() => {
         this.loadData();
       });
   }
@@ -87,7 +85,7 @@ export class DnsForwardZonesComponent implements OnInit {
           return this.dnsApi.changeForwardZones(result);
         }),
       )
-      .subscribe((result) => {
+      .subscribe(() => {
         this.loadData();
       });
   }

projects/multidirectory-app/src/app/features/dns/dns-rule-dialog/dns-rule-dialog.component.html

@@ -2,15 +2,11 @@
   <div class="app-modal-header">
     <div>{{ 'dns-rule-dialog.modal-header' | transloco }}</div>
   </div>
-  <div class="flex align-center gap-1 pb-2">
+  <div class="flex align-center gap-1 pb-2 mt-4">
     <md-form #form>
       <div class="form-grid">
         <label>{{ 'dns-rule-dialog.name' | transloco }}</label>
-        <md-textbox [(ngModel)]="dnsRule.record_name" [disabled]="sameAsZoneName || !!dialogData.isEdit" appRequired></md-textbox>
-        <div></div>
-        <md-checkbox [(ngModel)]="sameAsZoneName" [disabled]="!!dialogData.isEdit"
-          >{{ 'dns-rule-dialog.same-as-zone-name' | transloco }}
-        </md-checkbox>
+        <md-textbox [(ngModel)]="dnsRule.record_name" [disabled]="!!dialogData.isEdit" appRequired></md-textbox>
         <label>{{ 'dns-rule-dialog.ip' | transloco }}</label>
         <div>
           @switch (recordDataType) {
@@ -29,8 +25,8 @@
           }
         </div>
         <label>{{ 'dns-rule-dialog.type' | transloco }}</label>
-        <md-dropdown [(ngModel)]="dnsRule.record_type" [disabled]="!!dialogData.isEdit" [options]="DnsRuleTypes" appRequired></md-dropdown>
-        <label>{{ 'dns-rule-dialog.ttl' | transloco }}</label>
+        <md-dropdown [(ngModel)]="recordType" [disabled]="!!dialogData.isEdit" [options]="DnsRuleTypes" appRequired></md-dropdown
+        ><label>{{ 'dns-rule-dialog.ttl' | transloco }}</label>
         <md-textbox [(ngModel)]="dnsRule.ttl" appRequired></md-textbox>
       </div>
     </md-form>

projects/multidirectory-app/src/app/features/dns/dns-rule-dialog/dns-rule-dialog.component.ts

@@ -44,20 +44,6 @@ export class DnsRuleDialogComponent implements OnInit {
   private dialogService: DialogService = inject(DialogService);
   private dialogRef: DialogRef<DnsRuleDialogReturnData, DnsRuleDialogComponent> = inject(DialogRef);
 
-  private _sameAsZoneName = false;
-
-  get sameAsZoneName(): boolean {
-    return this._sameAsZoneName;
-  }
-
-  set sameAsZoneName(val: boolean) {
-    this._sameAsZoneName = val;
-    if (val) {
-      this.dnsRule.record_name = '@';
-    }
-    this.cdr.detectChanges();
-  }
-
   get recordType() {
     return this.dnsRule.record_type;
   }

projects/multidirectory-app/src/app/features/dns/dns-rule-list-item/dns-rule-list-item.component.scss

@@ -1,12 +1,13 @@
 .client-grid {
   display: grid;
-  grid-template-rows: 1fr 1fr;
-  grid-template-columns: 32px 1fr 1fr 1fr 1fr 1fr 64px 32px;
+  grid-template-rows: 1fr auto;
+  grid-template-columns: 32px 1fr 1fr 1fr 64px 32px;
   gap: 4px;
   border: 1px solid var(--md-neutral-400);
   border-radius: 8px;
   background-color: var(--md-white);
   min-height: 48px;
+  padding: 12px 5px;
 
   .cell-index {
     grid-column: 1;
@@ -36,8 +37,8 @@
   }
 
   .cell-value {
-    grid-row: 2 / 3;
-    grid-column: 2 / 5;
+    grid-row: 2;
+    grid-column: 2/4;
     display: flex;
     flex-flow: column nowrap;
     justify-content: flex-start;
@@ -48,37 +49,28 @@
   }
 
   .cell-type {
-    grid-row: 1/3;
-    grid-column: 6;
+    grid-row: 2;
+    grid-column: 4;
     overflow: hidden;
     text-overflow: ellipsis;
     align-self: center;
   }
 
   .cell-ttl {
     grid-row: 2;
-    grid-column: 3/5;
+    grid-column: 5;
     overflow: hidden;
     text-overflow: ellipsis;
   }
 
   .cell-control-buttons {
     display: flex;
     grid-row: 1/3;
-    grid-column: 6 / 8;
+    grid-column: 5;
     flex-flow: row nowrap;
     justify-content: flex-end;
     align-items: center;
   }
-
-  .cell-switches {
-    display: flex;
-    grid-row: 1/3;
-    grid-column: 7;
-    flex-flow: column nowrap;
-    justify-content: center;
-    align-items: flex-end;
-  }
 }
 
 .control-button-logo {

projects/multidirectory-app/src/app/features/dns/dns-zone-list-item/dns-zone-list-item.component.ts

@@ -57,7 +57,7 @@ export class DnsZoneListItemComponent {
     this.dialog
       .open<any, DnsZoneDetailsDialogData, DnsZoneDetailsComponent>({
         component: DnsZoneDetailsComponent,
-        dialogConfig: { data: { zoneName: record.name } },
+        dialogConfig: { data: { zoneName: record.name }, width: '600px' },
       })
       .closed.pipe(take(1))
       .subscribe((x) => {});

projects/multidirectory-app/src/app/models/api/dns/dns-rule-type.ts

@@ -5,7 +5,7 @@ export enum DnsRuleType {
   AAAA = 'AAAA',
   PTR = 'PTR',
   CNAME = 'CNAME',
-  ANAME = 'ANAME',
+  ALIAS = 'ALIAS',
   TXT = 'TXT',
   MX = 'MX',
   SRV = 'SRV',

projects/multidirectory-app/src/app/models/api/dns/dns-rule.ts

@@ -4,9 +4,19 @@ import { DnsRuleType } from './dns-rule-type';
 export class DnsRule {
   record_name: string = '';
   record_type: DnsRuleType = DnsRuleType['A'];
-  record_value: string = '0 100 3268 md.localhost.';
+  record_value: string = '';
   ttl?: number = Constants.DnsTTL;
-  content?: string = '0 100 3268 md.localhost.';
+
+  constructor(obj: Partial<DnsRule>) {
+    Object.assign(this, obj);
+  }
+}
+export class DnsRuleResponse {
+  record_name: string = '';
+  record_type: DnsRuleType = DnsRuleType['A'];
+  record_value: string = '';
+  ttl?: number = Constants.DnsTTL;
+  content?: string = '';
 
   constructor(obj: Partial<DnsRule>) {
     Object.assign(this, obj);

projects/multidirectory-app/src/app/models/api/setup/setup-request.ts

@@ -2,22 +2,22 @@ import { DnsSetupRequest } from '@models/api/dns/dns-setup-request';
 import { DhcpSetupRequest } from '@models/api/dhcp/dhcp-setup-request';
 
 export class SetupRequest {
-  domain = '';
-  username = '';
-  user_principal_name = '';
-  display_name = '';
-  mail = '';
-  password = '';
-  repeatPassword = '';
+  domain: string = '';
+  username: string = '';
+  user_principal_name: string = '';
+  display_name: string = '';
+  mail: string = '';
+  password: string = '';
+  repeatPassword: string = '';
 
   setupKdc = true;
   setupDhcp = true;
   generateKdcPasswords = true;
-  krbadmin_password = '';
-  krbadmin_password_repeat = '';
+  krbadmin_password: string = '';
+  krbadmin_password_repeat: string = '';
 
-  stash_password = '';
-  stash_password_repeat = '';
+  stash_password: string = '';
+  stash_password_repeat: string = '';
 
   setupDns = true;
   setupDnsRequest = new DnsSetupRequest({});