ITC-3653 merge conflicts resolved

Author: ibering

src/app/app.routes.ts

@@ -44,6 +44,7 @@ import { mshypervModuleRoutes } from './modules/mshyperv_module/mshyperv_module.
 import { ciscoModuleRoutes } from './modules/cisco_module/cisco_module.routes';
 import { networkModuleRoutes } from './modules/network_module/network_module.routes';
 import { broadcomProxyModuleRoutes } from './modules/broadcomproxy_module/broadcomproxy_module.routes';
+import { nutanixModuleRoutes } from './modules/nutanix_module/nutanix_module.routes';
 
 @Component({
     selector: 'legacy-redirect',
@@ -109,6 +110,7 @@ const moduleRoutes: Routes = [
     ...mshypervModuleRoutes,
     ...ciscoModuleRoutes,
     ...broadcomProxyModuleRoutes,
+    ...nutanixModuleRoutes,
     ...networkModuleRoutes
 ];
 /***    Core routes   ***/

src/app/components/dynamical-form-fields/dynamical-form-fields.component.html

@@ -149,8 +149,35 @@
                 [(ngModel)]="ngModel"
                 (ngModelChange)="ngModelChange.emit($event)"
                 [ngModelOptions]="{standalone: true}"
-                [showClear]="false">
+                [showClear]="false"
+                oitcFormError [errors]="errors" errorField="{{formField['ngModel']}}">
             </oitc-select>
+            <oitc-form-feedback [errors]="errors"
+                                errorField="{{formField['ngModel']}}"></oitc-form-feedback>
+            <div class="help-block small" *ngIf="formField['help']">
+                {{ formField['help'] }}
+            </div>
+        </div>
+        <!-- MULTI SELECT FIELDS -->
+        <div *ngIf="formField['type'] === 'multiselect'" class="mb-3">
+            {{ formField['label'] }}
+            @if (formField['required']) {
+                <oitc-required-icon></oitc-required-icon>
+            }
+            <oitc-multi-select
+                [attr.id]="formField['ngModel']"
+                [name]="name"
+                optionValue="key"
+                optionLabel="value"
+                [options]="formField['options']"
+                [(ngModel)]="ngModel"
+                (ngModelChange)="ngModelChange.emit($event)"
+                [ngModelOptions]="{standalone: true}"
+                [showClear]="false"
+                oitcFormError [errors]="errors" errorField="{{formField['ngModel']}}">
+            </oitc-multi-select>
+            <oitc-form-feedback [errors]="errors"
+                                errorField="{{formField['ngModel']}}"></oitc-form-feedback>
             <div class="help-block small" *ngIf="formField['help']">
                 {{ formField['help'] }}
             </div>

src/app/components/dynamical-form-fields/dynamical-form-fields.component.ts

@@ -28,6 +28,7 @@ import { TranslocoDirective } from '@jsverse/transloco';
 import { NgSelectComponent } from '@ng-select/ng-select';
 import { ControlValueAccessor, FormsModule, NG_VALUE_ACCESSOR } from '@angular/forms';
 import { SelectComponent } from '../../layouts/primeng/select/select/select.component';
+import { MultiSelectComponent } from '../../layouts/primeng/multi-select/multi-select/multi-select.component';
 
 @Component({
     selector: 'oitc-dynamical-form-fields',
@@ -47,7 +48,8 @@ import { SelectComponent } from '../../layouts/primeng/select/select/select.comp
         TranslocoDirective,
         NgSelectComponent,
         SelectComponent,
-        FormsModule
+        FormsModule,
+        MultiSelectComponent
     ],
     templateUrl: './dynamical-form-fields.component.html',
     styleUrl: './dynamical-form-fields.component.css',

src/app/layouts/primeng/multi-select/multi-select/multi-select.component.ts

@@ -58,7 +58,7 @@ export class MultiSelectComponent implements ControlValueAccessor, OnInit, OnDes
      */
     private _options: any[] | undefined;
     @Input()
-    set options(value: any[]) {
+    set options(value: any[] | undefined) {
         this._options = value;
         this.onOptionsChanged();
     }

src/app/modules/distribute_module/pages/satellites/satellites-downtime/satellites-downtime.component.html

@@ -229,6 +229,9 @@ <h6 class="pb-2 mb-3 border-bottom">
                     <th scope="col" mat-sort-header="Satellites.name">
                         {{ t('Satellite') }}
                     </th>
+                    <th scope="col" mat-sort-header="Systemdowntimes.downtimetype_id">
+                        {{ t('Include services') }}
+                    </th>
                     <th scope="col" mat-sort-header="Systemdowntimes.author">
                         {{ t('User') }}
                     </th>
@@ -265,6 +268,13 @@ <h6 class="pb-2 mb-3 border-bottom">
                     <td class="word-break">
                         {{ satelliteSystemdowntime.Satellite.name }}
                     </td>
+                    <td>
+                        @if (satelliteSystemdowntime.Systemdowntime.downtimeTypeId == 1) {
+                            {{ t('Yes') }}
+                        } @else {
+                            {{ t('No') }}
+                        }
+                    </td>
                     <td>
                         {{ satelliteSystemdowntime.Systemdowntime.author }}
                     </td>

src/app/modules/import_module/pages/externalmonitorings/external-monitoring-systems.enum.ts

@@ -1,6 +1,8 @@
+// Keep in sync with ExternalMonitoringSystem.php
 export enum ExternalMonitoringSystems {
     Icinga2 = 'icinga2',
     OpManager = 'opmanager',
     PRTG = 'prtg',
-    FlowChief = 'flowchief'
+    FlowChief = 'flowchief',
+    LibreNMS = 'librenms'
 }

src/app/modules/import_module/pages/externalmonitorings/external-monitorings-add/external-monitorings-add.component.ts

@@ -33,6 +33,7 @@ import {
     ExternalMonitoringConfig,
     ExternalMonitoringConfigFlowChief,
     ExternalMonitoringConfigIcinga2,
+    ExternalMonitoringConfigLibreNMS,
     ExternalMonitoringConfigOpmanager,
     ExternalMonitoringConfigPrtg,
     ExternalMonitoringPost
@@ -121,6 +122,10 @@ export class ExternalMonitoringsAddComponent implements OnInit, OnDestroy {
         {
             key: ExternalMonitoringSystems.PRTG,
             value: this.TranslocoService.translate('Paessler PRTG System')
+        },
+        {
+            key: ExternalMonitoringSystems.LibreNMS,
+            value: this.TranslocoService.translate('LibreNMS')
         }
     ];
 
@@ -206,6 +211,11 @@ export class ExternalMonitoringsAddComponent implements OnInit, OnDestroy {
                             const flowChief = result.config.config as ExternalMonitoringConfigFlowChief;
                             this.post.json_data = flowChief;
                             break;
+
+                        case ExternalMonitoringSystems.LibreNMS:
+                            const LibreNMS = result.config.config as ExternalMonitoringConfigLibreNMS;
+                            this.post.json_data = LibreNMS;
+                            break;
                     }
 
                     this.formFields = result.config.formFields;

src/app/modules/import_module/pages/externalmonitorings/external-monitorings-edit/external-monitorings-edit.component.ts

@@ -117,6 +117,10 @@ export class ExternalMonitoringsEditComponent implements OnInit, OnDestroy {
         {
             key: ExternalMonitoringSystems.PRTG,
             value: this.TranslocoService.translate('Paessler PRTG System')
+        },
+        {
+            key: ExternalMonitoringSystems.LibreNMS,
+            value: this.TranslocoService.translate('LibreNMS')
         }
     ];
     protected readonly Object = Object;

src/app/modules/import_module/pages/externalmonitorings/external-monitorings.interface.ts

@@ -55,7 +55,7 @@ export function getDefaultExternalMonitoringsIndexParams(): ExternalMonitoringsI
 
 export interface ExternalMonitoringConfig {
     config: {
-        config: ExternalMonitoringConfigIcinga2 | ExternalMonitoringConfigOpmanager | ExternalMonitoringConfigPrtg | ExternalMonitoringConfigFlowChief
+        config: ExternalMonitoringConfigIcinga2 | ExternalMonitoringConfigOpmanager | ExternalMonitoringConfigPrtg | ExternalMonitoringConfigFlowChief | ExternalMonitoringConfigLibreNMS
         formFields: DynamicalFormFields
     }
 }
@@ -103,6 +103,21 @@ export interface ExternalMonitoringConfigFlowChief {
     host_prefix: string
 }
 
+// Server code: LibreNMSExternalMonitoringJson.php
+export interface ExternalMonitoringConfigLibreNMS {
+    api_url: string
+    api_key: string
+    device_types: string[] // one of appliance,collaboration,environment,firewall,loadbalancer,management,network,printer,power,server,storage,wireless,workstation
+    import_ports: number
+    import_services: number
+    track_alerts: number
+    warning_alerts_force_down_state: number
+    critical_alerts_force_down_state: number
+    polling_interval: number
+    use_proxy: number
+    ignore_ssl_certificate: number
+}
+
 export interface ExternalMonitoringsAsList {
     externalMonitorings: SelectKeyValue[]
 }

src/app/modules/map_module/components/map-item-base/map-item-base.component.ts

@@ -354,4 +354,16 @@ export class MapItemBaseComponent<T extends MapitemBase> implements AfterViewIni
         this.cdr.markForCheck();
     }
 
+    protected shortenLabel(text: string, maxLength: number, shortenEnd: boolean = false): string {
+        if (text.length <= maxLength) {
+            return text;
+        }
+
+        if (shortenEnd) {
+            return '...' + text.substring(text.length - (maxLength - 3));
+        }
+
+        return text.substring(0, maxLength - 3) + '...';
+    }
+
 }