openITCOCKPIT 5.2.0

package.json

@@ -8,7 +8,8 @@
         "watch": "ng build --watch --configuration development",
         "test": "ng test",
         "i18n:extract": "transloco-keys-manager extract",
-        "i18n:find": "transloco-keys-manager find"
+        "i18n:find": "transloco-keys-manager find",
+        "check:licenses": "node parse-3rdpartylicenses.js dist/frontend-angular/3rdpartylicenses.txt"
     },
     "private": true,
     "dependencies": {
@@ -77,13 +78,12 @@
         "leaflet": "^1.9.4",
         "lodash": "^4.17.21",
         "luxon": "^3.7.1",
-        "ng-apexcharts": "^2.0.0",
         "ngx-color-picker": "^20.1.1",
         "ngx-cookie-service": "^20.0.1",
         "ngx-echarts": "^20.0.1",
         "ngx-resize-observer": "^3.1.0",
         "ngx-scrollbar": "^18.0.0",
-        "ngx-toastr": "^19.0.0",
+        "ngx-toastr": "^19.1.0",
         "prettier": "^3.6.2",
         "primeng": "^20.0.1",
         "rxjs": "~7.8.2",

parse-3rdpartylicenses.js

@@ -0,0 +1,146 @@
+/**
+ * MIT License
+ *
+ * Copyright (c) 2025 Daniel Ziegler
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+const fs = require('fs');
+const path = require('path');
+const {forEach} = require('lodash');
+
+/**
+ * Parses the 3rdpartylicenses.txt file.
+ * @param {string} filePath - Path to the license file.
+ * @returns {Array<{package: string, license: string, licenseText: string}>} Array of license entries.
+ */
+function parse3rdPartyLicenses(filePath) {
+    const content = fs.readFileSync(filePath, 'utf-8');
+    const blocks = content.split(/^-{80,}$/m).map(b => b.trim()).filter(Boolean);
+
+    const entries = [];
+
+    for(const block of blocks) {
+        // Try to extract package name (first line), license (second line), rest is license text
+        const lines = block.split(/\r?\n/).map(l => l.trim());
+        if(lines.length < 2) {
+            continue;
+        }
+
+        const pkg = lines[0].replace('Package: ', '').trim();
+        const license = lines[1].replace('License: ', '').replaceAll('"', '').replaceAll('\'', '').trim();
+        const licenseText = lines.slice(2).join('\n');
+        entries.push({package: pkg, license, licenseText});
+    }
+    return entries;
+}
+
+/**
+ * @param {string} license
+ * @param allowedLicenses
+ * @returns {boolean}
+ */
+function isAllowedLicense(license, allowedLicenses) {
+    return allowedLicenses.includes(license);
+}
+
+/**
+ *
+ * @param {string} packageName
+ * @param {string} licenseText
+ * @returns {boolean}
+ */
+function deepLicenseCheck(packageName, licenseText) {
+    switch(packageName) {
+        case "primeng":
+        case "@primeng/themes":
+            return licenseText.includes("The MIT License (MIT)");
+
+        // FontAwesome special cases
+        case "Font Awesome Free License":
+            return licenseText.includes("Font Awesome Free is free, open source, and GPL friendly.");
+
+        case "# Icons: CC BY 4.0 License (https://creativecommons.org/licenses/by/4.0/)":
+            return licenseText.includes("Attribution 4.0 International License");
+
+        case "# Fonts: SIL OFL 1.1 License":
+            return licenseText.includes("In the Font Awesome Free download, the SIL OFL license applies to all icons");
+
+        case "# Code: MIT License (https://opensource.org/licenses/MIT)":
+            return licenseText.includes("In the Font Awesome Free download, the MIT license applies to all non-font and");
+
+        case "# Attribution":
+            return licenseText.includes("Attribution is required by MIT, SIL OFL, and CC BY licenses. Downloaded Font");
+
+        case "# Brand Icons":
+            return licenseText.includes("All brand icons are trademarks of their respective owners. The use of these");
+
+    }
+
+    return false;
+}
+
+if(require.main === module) {
+    const filePath = process.argv[2] || path.join(__dirname, '3rdpartylicenses.txt');
+    if(!fs.existsSync(filePath)) {
+        console.error('File not found:', filePath);
+        process.exit(1);
+    }
+
+    const allowedLicenses = [
+        'MIT',
+        'ISC',
+        'Apache-2.0',
+        '(Apache-2.0 OR MIT)', // vis-timeline
+        '0BSD',
+        'BSD-2-Clause',
+        'BSD-3-Clause',
+        '(CC-BY-4.0 AND MIT)' // FontAwesome
+    ];
+
+    const packages = parse3rdPartyLicenses(filePath);
+
+    let errors = {};
+    forEach(packages, (pkg) => {
+        if(!isAllowedLicense(pkg.license, allowedLicenses)) {
+            errors[pkg.package] = pkg;
+            // Strange license found - further investigation needed
+            if(!deepLicenseCheck(pkg.package, pkg.licenseText)) {
+                console.error(`Package "${pkg.package}" has a non-allowed license: "${pkg.license}"`);
+                process.exit(1);
+            } else {
+                // Clear error
+                delete errors[pkg.package];
+            }
+        }
+    });
+
+    if(Object.keys(errors).length > 0) {
+        console.error('License check failed for the following packages:');
+        forEach(errors, (err) => {
+            console.error(`- ${err.package}: ${err.license}`);
+        });
+        process.exit(1);
+    }
+
+    console.log('All package licenses are allowed.');
+
+}
+

src/app/app.component.html

@@ -1,22 +1,37 @@
 <oitc-global-loader></oitc-global-loader>
 <div class="main-container">
     <!--sidebar-->
-    <oitc-coreui-navbar *ngIf="(this.LayoutService.layout$ | async) == LayoutOptions.Default">
-    </oitc-coreui-navbar>
+    @if (( this.LayoutService.layout$ | async ) == LayoutOptions.Default) {
+        <oitc-coreui-navbar></oitc-coreui-navbar>
+    }
     <div id="right" class="column">
-        <div class="top-right" *ngIf="(this.LayoutService.layout$ | async) == LayoutOptions.Default">
-            <!--app-header-->
-            <oitc-coreui-header [cShadowOnScroll]="'sm'"
-                                [messageOfTheDay]="messageOfTheDay"
-                                class="w-100 shadow-sm p-0"
-                                position="sticky"
-                                sidebarId="sidebar1"/>
-        </div>
+        @if (( this.LayoutService.layout$ | async ) == LayoutOptions.Default) {
+            <div class="top-right">
+                <!--app-header-->
+                <oitc-coreui-header [cShadowOnScroll]="'sm'"
+                                    [messageOfTheDay]="messageOfTheDay"
+                                    class="w-100 shadow-sm p-0"
+                                    position="sticky"
+                                    sidebarId="sidebar1"/>
+            </div>
+        }
         <div class="d-flex bottom">
             <!--main-->
             <!--app-body-->
             <c-container [fluid]="true" id="mainContentContainer"
                          [ngClass]="{'p-0': (this.LayoutService.layout$ | async) == LayoutOptions.Blank}">
+                @if (( this.LayoutService.layout$ | async ) == LayoutOptions.Kiosk) {
+                    <ng-container *transloco="let t">
+                        <div class="kiosk-mode-bar position-absolute start-50 translate-middle-x top-0">
+                            <button
+                                class="btn btn-outline-info btn-xs"
+                                (click)="this.LayoutService.setLayout(LayoutOptions.Default)"
+                                type="button">
+                                {{ t('Exit Kiosk Mode') }}
+                            </button>
+                        </div>
+                    </ng-container>
+                }
                 <!-- Content will be here -->
                 <router-outlet/>
             </c-container>
@@ -25,5 +40,7 @@
         </div>
     </div>
 
-    <oitc-message-of-the-day-modal [messageOfTheDay]="messageOfTheDay"/>
+    @if (( this.LayoutService.layout$ | async ) != LayoutOptions.Kiosk) {
+        <oitc-message-of-the-day-modal [messageOfTheDay]="messageOfTheDay"></oitc-message-of-the-day-modal>
+    }
 </div>

src/app/app.component.ts

@@ -10,7 +10,7 @@ import {
     Renderer2,
     signal
 } from '@angular/core';
-import { NavigationEnd, Router, RouterOutlet } from '@angular/router';
+import { ActivatedRoute, NavigationEnd, Router, RouterOutlet } from '@angular/router';
 import { FaIconLibrary, FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 import { fas } from '@fortawesome/free-solid-svg-icons';
 import { far } from '@fortawesome/free-regular-svg-icons';
@@ -22,7 +22,7 @@ import { HistoryService } from './history.service';
 import { CoreuiHeaderComponent } from './layouts/coreui/coreui-header/coreui-header.component';
 import { CoreuiNavbarComponent } from './layouts/coreui/coreui-navbar/coreui-navbar.component';
 import { GlobalLoaderComponent } from './layouts/coreui/global-loader/global-loader.component';
-import { AsyncPipe, NgClass, NgIf } from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import { Subscription } from 'rxjs';
 import { toObservable } from '@angular/core/rxjs-interop';
 import { LayoutOptions, LayoutService } from './layouts/coreui/layout.service';
@@ -36,7 +36,8 @@ import { AuthService } from './auth/auth.service';
 import { TitleService } from './services/title.service';
 import { SystemnameService } from './services/systemname.service';
 import { PermissionsService } from './permissions/permissions.service';
-import { TimezoneConfiguration, TimezoneService } from './services/timezone.service';
+import { TimezoneService } from './services/timezone.service';
+import { TranslocoDirective } from '@jsverse/transloco';
 
 @Component({
     selector: 'oitc-root',
@@ -48,17 +49,17 @@ import { TimezoneConfiguration, TimezoneService } from './services/timezone.serv
         CoreuiNavbarComponent,
         GlobalLoaderComponent,
         ShadowOnScrollDirective,
-        NgIf,
         AsyncPipe,
         NgClass,
-        MessageOfTheDayModalComponent
+        MessageOfTheDayModalComponent,
+        TranslocoDirective
     ],
     templateUrl: './app.component.html',
     styleUrl: './app.component.css',
     changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class AppComponent implements OnInit, OnDestroy, AfterViewInit {
-
+    
     // Inject HistoryService to keep track of the previous URLs
     private historyService: HistoryService = inject(HistoryService);
 
@@ -80,6 +81,7 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit {
 
     constructor(library: FaIconLibrary,
                 private router: Router,
+                private route: ActivatedRoute,
                 private IconSetService: IconSetService,
                 // private selectConfig: NgSelectConfig,
                 // private TranslocoService: TranslocoService,
@@ -119,6 +121,12 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit {
             }
         }));
 
+        this.subscription.add(this.route.queryParams.subscribe(params => {
+            if (params && params.hasOwnProperty('kiosk')) {
+                this.LayoutService.setLayout(LayoutOptions.Kiosk);
+            }
+        }));
+
         // Fetch the message of the day
         this.watchMessageOfTheDay();
 

src/app/app.routes.ts

@@ -40,6 +40,9 @@ import { servicenowModuleRoutes } from './modules/servicenow_module/servicenow_m
 import { dellModuleRoutes } from './modules/dell_module/dell_module.routes';
 import { proxmoxModuleRoutes } from './modules/proxmox_module/proxmox_module.routes';
 import { ms365ModuleRoutes } from './modules/ms365_module/ms365_module.routes';
+import { mshypervModuleRoutes } from './modules/mshyperv_module/mshyperv_module.routes';
+import { ciscoModuleRoutes } from './modules/cisco_module/cisco_module.routes';
+import { broadcomProxyModuleRoutes } from './modules/broadcomproxy_module/broadcomproxy_module.routes';
 
 @Component({
     selector: 'legacy-redirect',
@@ -101,7 +104,10 @@ const moduleRoutes: Routes = [
     ...servicenowModuleRoutes,
     ...dellModuleRoutes,
     ...proxmoxModuleRoutes,
-    ...ms365ModuleRoutes
+    ...ms365ModuleRoutes,
+    ...mshypervModuleRoutes,
+    ...ciscoModuleRoutes,
+    ...broadcomProxyModuleRoutes
 ];
 /***    Core routes   ***/
 const coreRoutes: Routes = [{

src/app/components/charts/host-pie-chart/host-pie-chart.component.html

@@ -1,11 +1,7 @@
 <!--The content below is only a placeholder and can be replaced.-->
-<apx-chart
-    #chart
-    [series]="chartOptions.series!"
-    [chart]="chartOptions.chart!"
-    [plotOptions]="chartOptions.plotOptions!"
-    [labels]="chartOptions.labels!"
-    [legend]="chartOptions.legend!"
-    [colors]="chartOptions.colors!"
-    [grid]="apexGridOptions"
-></apx-chart>
+<div [style.max-height.px]="widgetHeight" [style.height.px]="widgetHeight" class="overflow-hidden">
+    <div echarts [options]="chartOptions"
+         [theme]="theme"
+         (chartInit)="onChartInit($event)"
+         class="w-100"></div>
+</div>