diff --git a/projects/aas-portal/src/app/aas/edit-element-form/edit-element-form.component.ts b/projects/aas-portal/src/app/aas/edit-element-form/edit-element-form.component.ts
index 35ffff3..6829582 100644
--- a/projects/aas-portal/src/app/aas/edit-element-form/edit-element-form.component.ts
+++ b/projects/aas-portal/src/app/aas/edit-element-form/edit-element-form.component.ts
@@ -7,7 +7,8 @@
*****************************************************************************/
import { Component } from '@angular/core';
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { FormsModule } from '@angular/forms';
+import { NgbActiveModal, NgbToast } from '@ng-bootstrap/ng-bootstrap';
import { TranslateService } from '@ngx-translate/core';
import { convertBlobToBase64Async, extension } from 'aas-lib';
import { aas, extensionToMimeType, toInvariant, toLocale } from 'common';
@@ -21,6 +22,8 @@ export interface LangStringRow extends aas.LangString {
selector: 'fhg-edit-element',
templateUrl: './edit-element-form.component.html',
styleUrls: ['./edit-element-form.component.scss'],
+ standalone: true,
+ imports: [NgbToast, FormsModule],
})
export class EditElementFormComponent {
private element?: aas.Referable;
diff --git a/projects/aas-portal/src/app/aas/new-element-form/new-element-form.component.ts b/projects/aas-portal/src/app/aas/new-element-form/new-element-form.component.ts
index f6438be..4ace7db 100644
--- a/projects/aas-portal/src/app/aas/new-element-form/new-element-form.component.ts
+++ b/projects/aas-portal/src/app/aas/new-element-form/new-element-form.component.ts
@@ -7,16 +7,20 @@
*****************************************************************************/
import { Component } from '@angular/core';
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { NgbActiveModal, NgbToast } from '@ng-bootstrap/ng-bootstrap';
import { Observable, map } from 'rxjs';
import { TemplateService } from 'aas-lib';
import { TemplateDescriptor, aas, getChildren, isEnvironment } from 'common';
-import { head } from 'lodash-es';
+import head from 'lodash-es/head';
+import { FormsModule } from '@angular/forms';
+import { AsyncPipe } from '@angular/common';
@Component({
selector: 'fhg-new-element',
templateUrl: './new-element-form.component.html',
styleUrls: ['./new-element-form.component.scss'],
+ standalone: true,
+ imports: [NgbToast, FormsModule, AsyncPipe],
})
export class NewElementFormComponent {
private env?: aas.Environment;
diff --git a/projects/aas-portal/src/app/about/about.component.ts b/projects/aas-portal/src/app/about/about.component.ts
index 504924b..da3d98c 100644
--- a/projects/aas-portal/src/app/about/about.component.ts
+++ b/projects/aas-portal/src/app/about/about.component.ts
@@ -8,8 +8,8 @@
import { Component, OnDestroy, OnInit, TemplateRef, ViewChild, AfterViewInit } from '@angular/core';
import { Library, Message } from 'common';
+import { LibraryTableComponent, MessageTableComponent } from 'aas-lib';
import { ServerApiService } from './server-api.service';
-import { TranslateService } from '@ngx-translate/core';
import { ToolbarService } from '../toolbar.service';
import { environment } from '../../environments/environment';
@@ -17,11 +17,12 @@ import { environment } from '../../environments/environment';
selector: 'fhg-about',
templateUrl: './about.component.html',
styleUrls: ['./about.component.scss'],
+ standalone: true,
+ imports: [LibraryTableComponent, MessageTableComponent],
})
export class AboutComponent implements OnInit, OnDestroy, AfterViewInit {
public constructor(
private serverApi: ServerApiService,
- private translate: TranslateService,
private toolbar: ToolbarService,
) {
this.author = environment.author;
diff --git a/projects/aas-portal/src/app/app.component.ts b/projects/aas-portal/src/app/app.component.ts
index 100dc7b..f933ae1 100644
--- a/projects/aas-portal/src/app/app.component.ts
+++ b/projects/aas-portal/src/app/app.component.ts
@@ -7,11 +7,14 @@
*****************************************************************************/
import { Component } from '@angular/core';
+import { MainComponent } from './main/main.component';
@Component({
selector: 'fhg-root',
templateUrl: './app.component.html',
styleUrls: ['./app.component.scss'],
+ standalone: true,
+ imports: [MainComponent],
})
export class AppComponent {
public title = 'AASPortal';
diff --git a/projects/aas-portal/src/app/app.config.ts b/projects/aas-portal/src/app/app.config.ts
new file mode 100644
index 0000000..d4a69a7
--- /dev/null
+++ b/projects/aas-portal/src/app/app.config.ts
@@ -0,0 +1,34 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019-2024 Fraunhofer IOSB-INA Lemgo,
+ * eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
+ * zur Foerderung der angewandten Forschung e.V.
+ *
+ *****************************************************************************/
+
+import { ApplicationConfig, importProvidersFrom } from '@angular/core';
+import { HttpClient, provideHttpClient, withInterceptorsFromDi, HTTP_INTERCEPTORS } from '@angular/common/http';
+import { provideRouter } from '@angular/router';
+import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
+import { AuthInterceptor } from 'aas-lib';
+
+import { HttpLoaderFactory } from './http-loader-factory';
+import { routes } from './app.routes';
+
+export const appConfig: ApplicationConfig = {
+ providers: [
+ provideRouter(routes),
+ provideHttpClient(withInterceptorsFromDi()),
+ importProvidersFrom(
+ TranslateModule.forRoot({
+ defaultLanguage: 'en-us',
+ loader: {
+ provide: TranslateLoader,
+ useFactory: HttpLoaderFactory,
+ deps: [HttpClient],
+ },
+ }),
+ ),
+ { provide: HTTP_INTERCEPTORS, useClass: AuthInterceptor, multi: true },
+ ],
+};
diff --git a/projects/aas-portal/src/app/app.module.ts b/projects/aas-portal/src/app/app.module.ts
deleted file mode 100644
index 6f1e757..0000000
--- a/projects/aas-portal/src/app/app.module.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/******************************************************************************
- *
- * Copyright (c) 2019-2024 Fraunhofer IOSB-INA Lemgo,
- * eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
- * zur Foerderung der angewandten Forschung e.V.
- *
- *****************************************************************************/
-
-import { NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { HttpClientModule, HttpClient } from '@angular/common/http';
-import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
-import { AASLibModule } from 'aas-lib';
-import { FormsModule } from '@angular/forms';
-
-import { AppRoutingModule } from './app-routing.module';
-import { AppComponent } from './app.component';
-import { MainComponent } from './main/main.component';
-import { AboutComponent } from './about/about.component';
-import { DashboardComponent } from './dashboard/dashboard.component';
-import { AASComponent } from './aas/aas.component';
-import { StartComponent } from './start/start.component';
-import { NewElementFormComponent } from './aas/new-element-form/new-element-form.component';
-import { EditElementFormComponent } from './aas/edit-element-form/edit-element-form.component';
-import { RemoveEndpointFormComponent } from './start/remove-endpoint-form/remove-endpoint-form.component';
-import { UploadFormComponent } from './start/upload-form/upload-form.component';
-import { ViewComponent } from './view/view.component';
-import { AddEndpointFormComponent } from './start/add-endpoint-form/add-endpoint-form.component';
-import { HttpLoaderFactory } from './http-loader-factory';
-import { httpInterceptorProviders } from './index';
-import { FavoritesFormComponent } from './start/favorites-form/favorites-form.component';
-
-@NgModule({
- declarations: [
- AppComponent,
- MainComponent,
- AboutComponent,
- DashboardComponent,
- AASComponent,
- StartComponent,
- AddEndpointFormComponent,
- RemoveEndpointFormComponent,
- NewElementFormComponent,
- EditElementFormComponent,
- UploadFormComponent,
- ViewComponent,
- FavoritesFormComponent,
- ],
- imports: [
- BrowserModule,
- BrowserAnimationsModule,
- AppRoutingModule,
- HttpClientModule,
- FormsModule,
- NgbModule,
- TranslateModule.forRoot({
- defaultLanguage: 'en-us',
- loader: {
- provide: TranslateLoader,
- useFactory: HttpLoaderFactory,
- deps: [HttpClient],
- },
- }),
- AASLibModule,
- ],
- providers: [httpInterceptorProviders],
- bootstrap: [AppComponent],
-})
-export class AppModule {}
diff --git a/projects/aas-portal/src/app/app-routing.module.ts b/projects/aas-portal/src/app/app.routes.ts
similarity index 66%
rename from projects/aas-portal/src/app/app-routing.module.ts
rename to projects/aas-portal/src/app/app.routes.ts
index fe7ee1f..5553d99 100644
--- a/projects/aas-portal/src/app/app-routing.module.ts
+++ b/projects/aas-portal/src/app/app.routes.ts
@@ -6,27 +6,18 @@
*
*****************************************************************************/
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
+import { Routes } from '@angular/router';
import { AASComponent } from './aas/aas.component';
-import { CanActivateAAS } from './aas/can-activate-aas.guard';
import { AboutComponent } from './about/about.component';
import { DashboardComponent } from './dashboard/dashboard.component';
import { StartComponent } from './start/start.component';
import { ViewComponent } from './view/view.component';
-const routes: Routes = [
+export const routes: Routes = [
{ path: 'start', component: StartComponent },
- { path: 'aas', component: AASComponent, canActivate: [CanActivateAAS] },
+ { path: 'aas', component: AASComponent },
{ path: 'view', component: ViewComponent },
{ path: 'dashboard', component: DashboardComponent },
{ path: 'about', component: AboutComponent },
{ path: '', pathMatch: 'full', redirectTo: 'start' },
];
-
-@NgModule({
- imports: [RouterModule.forRoot(routes, { onSameUrlNavigation: 'reload' })],
- exports: [RouterModule],
- providers: [CanActivateAAS],
-})
-export class AppRoutingModule {}
diff --git a/projects/aas-portal/src/app/dashboard/commands/delete-item-command.ts b/projects/aas-portal/src/app/dashboard/commands/delete-item-command.ts
index b582de5..33bde39 100644
--- a/projects/aas-portal/src/app/dashboard/commands/delete-item-command.ts
+++ b/projects/aas-portal/src/app/dashboard/commands/delete-item-command.ts
@@ -6,7 +6,7 @@
*
*****************************************************************************/
-import { cloneDeep } from 'lodash-es';
+import cloneDeep from 'lodash-es/cloneDeep';
import { DashboardService, DashboardPage, DashboardItem } from '../dashboard.service';
import { DashboardCommand } from './dashboard-command';
diff --git a/projects/aas-portal/src/app/dashboard/commands/move-down-command.ts b/projects/aas-portal/src/app/dashboard/commands/move-down-command.ts
index efec8ce..ee03906 100644
--- a/projects/aas-portal/src/app/dashboard/commands/move-down-command.ts
+++ b/projects/aas-portal/src/app/dashboard/commands/move-down-command.ts
@@ -6,7 +6,7 @@
*
*****************************************************************************/
-import { cloneDeep } from 'lodash-es';
+import cloneDeep from 'lodash-es/cloneDeep';
import { DashboardItem, DashboardPage, DashboardService } from '../dashboard.service';
import { DashboardCommand } from './dashboard-command';
diff --git a/projects/aas-portal/src/app/dashboard/commands/move-left-command.ts b/projects/aas-portal/src/app/dashboard/commands/move-left-command.ts
index c01f2e8..476290b 100644
--- a/projects/aas-portal/src/app/dashboard/commands/move-left-command.ts
+++ b/projects/aas-portal/src/app/dashboard/commands/move-left-command.ts
@@ -6,7 +6,7 @@
*
*****************************************************************************/
-import { cloneDeep } from 'lodash-es';
+import cloneDeep from 'lodash-es/cloneDeep';
import { DashboardItem, DashboardPage, DashboardService } from '../dashboard.service';
import { DashboardCommand } from './dashboard-command';
diff --git a/projects/aas-portal/src/app/dashboard/commands/move-right-command.ts b/projects/aas-portal/src/app/dashboard/commands/move-right-command.ts
index 95041d4..4e0ae55 100644
--- a/projects/aas-portal/src/app/dashboard/commands/move-right-command.ts
+++ b/projects/aas-portal/src/app/dashboard/commands/move-right-command.ts
@@ -6,7 +6,7 @@
*
*****************************************************************************/
-import { cloneDeep } from 'lodash-es';
+import cloneDeep from 'lodash-es/cloneDeep';
import { DashboardItem, DashboardPage, DashboardService } from '../dashboard.service';
import { DashboardCommand } from './dashboard-command';
diff --git a/projects/aas-portal/src/app/dashboard/commands/move-up-command.ts b/projects/aas-portal/src/app/dashboard/commands/move-up-command.ts
index 34dae40..ac9f1d4 100644
--- a/projects/aas-portal/src/app/dashboard/commands/move-up-command.ts
+++ b/projects/aas-portal/src/app/dashboard/commands/move-up-command.ts
@@ -6,7 +6,7 @@
*
*****************************************************************************/
-import { cloneDeep } from 'lodash-es';
+import cloneDeep from 'lodash-es/cloneDeep';
import { DashboardItem, DashboardPage, DashboardService } from '../dashboard.service';
import { DashboardCommand } from './dashboard-command';
diff --git a/projects/aas-portal/src/app/dashboard/commands/set-chart-type-command.ts b/projects/aas-portal/src/app/dashboard/commands/set-chart-type-command.ts
index eaea5c2..c00e0b1 100644
--- a/projects/aas-portal/src/app/dashboard/commands/set-chart-type-command.ts
+++ b/projects/aas-portal/src/app/dashboard/commands/set-chart-type-command.ts
@@ -6,7 +6,7 @@
*
*****************************************************************************/
-import { cloneDeep } from 'lodash-es';
+import cloneDeep from 'lodash-es/cloneDeep';
import { DashboardCommand } from './dashboard-command';
import {
DashboardChart,
diff --git a/projects/aas-portal/src/app/dashboard/commands/set-color-command.ts b/projects/aas-portal/src/app/dashboard/commands/set-color-command.ts
index 9dbc17a..866374e 100644
--- a/projects/aas-portal/src/app/dashboard/commands/set-color-command.ts
+++ b/projects/aas-portal/src/app/dashboard/commands/set-color-command.ts
@@ -6,7 +6,7 @@
*
*****************************************************************************/
-import { cloneDeep } from 'lodash-es';
+import cloneDeep from 'lodash-es/cloneDeep';
import { DashboardItem, DashboardPage, DashboardService } from '../dashboard.service';
import { DashboardCommand } from './dashboard-command';
diff --git a/projects/aas-portal/src/app/dashboard/commands/set-min-max-command.ts b/projects/aas-portal/src/app/dashboard/commands/set-min-max-command.ts
index 8eeb72e..5a922df 100644
--- a/projects/aas-portal/src/app/dashboard/commands/set-min-max-command.ts
+++ b/projects/aas-portal/src/app/dashboard/commands/set-min-max-command.ts
@@ -6,7 +6,7 @@
*
*****************************************************************************/
-import { cloneDeep } from 'lodash-es';
+import cloneDeep from 'lodash-es/cloneDeep';
import { DashboardChart, DashboardPage, DashboardService } from '../dashboard.service';
import { DashboardCommand } from './dashboard-command';
diff --git a/projects/aas-portal/src/app/dashboard/dashboard.component.html b/projects/aas-portal/src/app/dashboard/dashboard.component.html
index eaaabff..02d0b8c 100644
--- a/projects/aas-portal/src/app/dashboard/dashboard.component.html
+++ b/projects/aas-portal/src/app/dashboard/dashboard.component.html
@@ -7,6 +7,7 @@
!---------------------------------------------------------------------------->
+ @if (!isEmpty) {
@for (row of rows | async; track row) {
@for (column of row.columns; track column) {
@@ -66,6 +67,9 @@
}
}
+} @else {
+
{{'INFO_EMPTY_DASHBOARD' | translate}}
+}
+ [filter]="filter">
@@ -16,7 +16,8 @@
-