| - + | -+ | - | + |
COLUMN_NAME
|
- + |
COLUMN_ID
|
|---|---|---|---|---|---|---|
|
-
+
+ }
+ @case ('unavailable') {
+
+
+
+
+
+ }
+ @default {
+
+
+
+
+
+ }
+ }
|
- {{row.name | max:60}}
- {{row.name | max:60}}
+ {{row.name |
+ max:60}}
+ |
+ {{row.endpoint}}
{{row.id | max:80}}
|
| - | + | + + | +
+ COLUMN_NAME
+ |
+
+ COLUMN_ID
+ |
|---|---|---|---|---|
| - | ++ |
+ {{row.endpoint}}
{{row.id | max:80}}
|
{{'INFO_NO_SHELLS_AVAILABLE' | translate}}
+}
\ No newline at end of file
diff --git a/projects/aas-lib/src/lib/aas-table/aas-table.component.scss b/projects/aas-lib/src/lib/aas-table/aas-table.component.scss
index fe1a49b1..0c4b6635 100644
--- a/projects/aas-lib/src/lib/aas-table/aas-table.component.scss
+++ b/projects/aas-lib/src/lib/aas-table/aas-table.component.scss
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * Copyright (c) 2019-2022 Fraunhofer IOSB-INA Lemgo,
+ * Copyright (c) 2019-2024 Fraunhofer IOSB-INA Lemgo,
* eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
* zur Foerderung der angewandten Forschung e.V.
*
@@ -12,4 +12,9 @@ th.th-w-icon {
th.th-w-checkbox {
width: 32px;
+}
+
+div.wh-4 {
+ width: 16px;
+ height: 16px;
}
\ No newline at end of file
diff --git a/projects/aas-lib/src/lib/aas-table/aas-table.component.ts b/projects/aas-lib/src/lib/aas-table/aas-table.component.ts
index 78efc1f5..79385685 100644
--- a/projects/aas-lib/src/lib/aas-table/aas-table.component.ts
+++ b/projects/aas-lib/src/lib/aas-table/aas-table.component.ts
@@ -1,170 +1,145 @@
/******************************************************************************
*
- * Copyright (c) 2019-2023 Fraunhofer IOSB-INA Lemgo,
+ * Copyright (c) 2019-2024 Fraunhofer IOSB-INA Lemgo,
* eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
* zur Foerderung der angewandten Forschung e.V.
*
*****************************************************************************/
-import { Component, Input, OnChanges, OnDestroy, QueryList, SimpleChanges, ViewChildren } from '@angular/core';
+import {
+ ChangeDetectionStrategy,
+ Component,
+ OnDestroy,
+ computed,
+ effect,
+ input,
+ model,
+ untracked,
+} from '@angular/core';
+
import { Router } from '@angular/router';
-import { Store } from '@ngrx/store';
-import { AASDocument } from 'common';
-import { first, Observable, Subscription } from 'rxjs';
-import { TranslateService } from '@ngx-translate/core';
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import { AASDocument } from 'aas-core';
-import { ViewMode } from '../types/view-mode';
-import { AASTable } from '../types/aas-table';
-import { AASTableRow, AASTableFeatureState } from './aas-table.state';
-import * as AASTableSelectors from './aas-table.selectors';
-import * as AASTableActions from './aas-table.actions';
-import { AASQuery } from '../types/aas-query-params';
-import { NotifyService } from '../notify/notify.service';
+import { AASTableRow } from './aas-table-row';
import { ClipboardService } from '../clipboard.service';
-import { SortEvent, SortableHeaderDirective } from '../sortable-header.directive';
+import { WindowService } from '../window.service';
+import { ViewMode } from '../types/view-mode';
+import { AASTableStore } from './aas-table.store';
+import { MaxLengthPipe } from '../max-length.pipe';
+import { AASTableFilter } from './aas-table.filter';
@Component({
selector: 'fhg-aas-table',
templateUrl: './aas-table.component.html',
- styleUrls: ['./aas-table.component.scss']
+ styleUrls: ['./aas-table.component.scss'],
+ standalone: true,
+ imports: [NgbTooltip, MaxLengthPipe, TranslateModule],
+ providers: [AASTableStore],
+ changeDetection: ChangeDetectionStrategy.OnPush,
})
-export class AASTableComponent implements AASTable, OnChanges, OnDestroy {
- private readonly store: Store| + [disabled]="state() === 'online'" [indeterminate]="someSelected()" [checked]="everySelected()"> | + @if (expanded()) { + } @else { + + + + } | ||||
|---|---|---|---|---|---|
| - + | -+ @if (node.isLeaf) { + | + + | +
+ @if (node.canOpen) {
+ {{node.value}}
+ } @else if (node.element.modelType === 'RelationshipElement') {
+
+ } @else {
+ {{node.value}}
+ }
+ |
+ } @else {
+ - |
- {{getValue(node)}}
-
- {{node.value}}
- |
+ }
{{message()}}
+}
\ No newline at end of file
diff --git a/projects/aas-lib/src/lib/aas-tree/aas-tree.component.scss b/projects/aas-lib/src/lib/aas-tree/aas-tree.component.scss
index 1edd6619..e3eb8f42 100644
--- a/projects/aas-lib/src/lib/aas-tree/aas-tree.component.scss
+++ b/projects/aas-lib/src/lib/aas-tree/aas-tree.component.scss
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * Copyright (c) 2019-2022 Fraunhofer IOSB-INA Lemgo,
+ * Copyright (c) 2019-2024 Fraunhofer IOSB-INA Lemgo,
* eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
* zur Foerderung der angewandten Forschung e.V.
*
@@ -37,4 +37,4 @@ div.h-4 {
div.wh-4 {
width: 16px;
height: 16px;
-}
+}
\ No newline at end of file
diff --git a/projects/aas-lib/src/lib/aas-tree/aas-tree.component.ts b/projects/aas-lib/src/lib/aas-tree/aas-tree.component.ts
index ffebb497..f482584a 100644
--- a/projects/aas-lib/src/lib/aas-tree/aas-tree.component.ts
+++ b/projects/aas-lib/src/lib/aas-tree/aas-tree.component.ts
@@ -1,18 +1,29 @@
/******************************************************************************
*
- * Copyright (c) 2019-2023 Fraunhofer IOSB-INA Lemgo,
+ * Copyright (c) 2019-2024 Fraunhofer IOSB-INA Lemgo,
* eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
* zur Foerderung der angewandten Forschung e.V.
*
*****************************************************************************/
-import { Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges, } from '@angular/core';
-import { BehaviorSubject, Subscription, Observable, first } from 'rxjs';
-import { WebSocketSubject } from 'rxjs/webSocket';
-import { Store } from '@ngrx/store';
-import { TranslateService } from '@ngx-translate/core';
+import { NgClass, NgStyle } from '@angular/common';
import { Router } from '@angular/router';
+import { BehaviorSubject, Subscription } from 'rxjs';
+import { WebSocketSubject } from 'rxjs/webSocket';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import {
+ ChangeDetectionStrategy,
+ Component,
+ OnDestroy,
+ OnInit,
+ computed,
+ effect,
+ input,
+ output,
+ signal,
+} from '@angular/core';
+
import {
aas,
LiveNode,
@@ -21,21 +32,25 @@ import {
AASDocument,
convertToString,
toLocale,
- EndpointType,
selectSubmodel,
getIdShortPath,
mimeTypeToExtension,
-} from 'common';
-
-import { AASTreeRow, AASTreeFeatureState } from './aas-tree.state';
+ selectReferable,
+ stringFormat,
+ isFile,
+ isBlob,
+ isReferenceElement,
+ isOperation,
+ isSubmodel,
+} from 'aas-core';
+
+import { AASTreeRow } from './aas-tree-row';
import { OnlineState } from '../types/online-state';
-import { ShowImageFormComponent } from './show-image-form/show-image-form.component';
-import { ShowVideoFormComponent } from './show-video-form/show-video-form.component';
-import { OperationCallFormComponent } from './operation-call-form/operation-call-form.component';
+import { ShowImageFormComponent } from '../show-image-form/show-image-form.component';
+import { ShowVideoFormComponent } from '../show-video-form/show-video-form.component';
+import { OperationCallFormComponent } from '../operation-call-form/operation-call-form.component';
import { AASTreeSearch } from './aas-tree-search';
-import { AASTree } from '../types/aas-tree';
import { basename, encodeBase64Url } from '../convert';
-import { AASQuery } from '../types/aas-query-params';
import { ViewQuery } from '../types/view-query-params';
import { WindowService } from '../window.service';
import { DocumentService } from '../document.service';
@@ -43,33 +58,42 @@ import { DownloadService } from '../download.service';
import { WebSocketFactoryService } from '../web-socket-factory.service';
import { ClipboardService } from '../clipboard.service';
import { LogType, NotifyService } from '../notify/notify.service';
-import { SubmodelViewDescriptor, resolveSemanticId, supportedSubmodelTemplates } from '../submodel-template/submodel-template';
-import * as AASTreeActions from './aas-tree.actions';
-import * as AASTreeSelectors from './aas-tree.selectors';
+import {
+ SubmodelViewDescriptor,
+ resolveSemanticId,
+ supportedSubmodelTemplates,
+} from '../submodel-template/submodel-template';
+
import { AASTreeApiService } from './aas-tree-api.service';
+import { AASTreeService } from './aas-tree.service';
interface PropertyValue {
- property: aas.Property,
- value: BehaviorSubject
-
-
- CustomerFeedback.OverallRating ({{count | number}})
-
-
-
-
-
- {{stars | number: '1.1-1'}}
-
+
+
+ CustomerFeedback.OverallRating ({{count() | number}})
-
-
{{name}}
+
+ @for (starClassName of starClassNames(); track starClassName) {
+
+ }
+ {{stars() | number: '1.1-1'}}
-
-
+ {{item.name}}
-
-
+
+
+ @for (item of items(); track item) {
+ {{name()}}
+
+
+ }
{{item.name}}
+
+
-
-
private readonly map = new Map();
private readonly subscription = new Subscription();
- constructor(
- store: Store,
- private readonly translate: TranslateService
- ) {
- this.store = store as Store;
+ public constructor(private readonly translate: TranslateService) {
+ effect(
+ () => {
+ this.init(this.submodels());
+ },
+ { allowSignalWrites: true },
+ );
}
- @Input()
- public submodels: DocumentSubmodelPair[] | null = null;
+ public readonly submodels = input(null);
- public get name(): string {
- let value: string | undefined;
- if (this.submodels) {
- const names = this.submodels.map(
- item => getLocaleValue(
- getPreferredName(item.document.content!, item.submodel),
- this.translate.currentLang) ?? item.submodel.idShort);
-
- if (names.length <= 2) {
- value = names.join(', ');
- } else {
- value = `${names[0]}, ..., ${names[names.length - 1]} (${names.length})`;
- }
+ public readonly name = computed(() => {
+ const submodels = this.submodels();
+ if (!submodels) {
+ return '';
}
- return value ?? '';
- }
-
- public stars = 0.0;
+ const names = submodels.map(
+ item =>
+ getLocaleValue(getPreferredName(item.document.content!, item.submodel), this.translate.currentLang) ??
+ item.submodel.idShort,
+ );
- public count = 0;
-
- public items: GeneralItem[] = [];
+ if (names.length <= 2) {
+ return names.join(', ');
+ }
- public feedbacks: FeedbackItem[] = [];
+ return `${names[0]}, ..., ${names[names.length - 1]} (${names.length})`;
+ });
- public starClassNames: string[] = [];
+ public readonly stars = signal(0.0);
+ public readonly count = signal(0);
+ public readonly items = signal([]);
+ public readonly feedbacks = signal([]);
+ public readonly starClassNames = signal([]);
public ngOnInit(): void {
- this.subscription.add(this.store.select(selectCustomerFeedback).pipe().subscribe(state => {
- this.stars = state.stars;
- this.count = state.count;
- this.starClassNames = state.starClassNames;
- this.items = state.items.filter(item => item.count > 0);
- this.feedbacks = state.feedbacks;
- }));
-
- this.subscription.add(this.translate.onLangChange.subscribe(() => {
- this.init();
- }));
- }
-
- public ngOnChanges(changes: SimpleChanges): void {
- if (changes['submodels']) {
- this.init();
- }
+ this.subscription.add(
+ this.translate.onLangChange.subscribe(() => {
+ this.init(this.submodels());
+ }),
+ );
}
public ngOnDestroy(): void {
this.subscription.unsubscribe();
}
- private init(): void {
+ private init(submodels: DocumentSubmodelPair[] | null): void {
this.map.clear();
let count = 0;
let stars = 0.0;
@@ -97,13 +98,15 @@ export class CustomerFeedbackComponent implements SubmodelTemplate, OnInit, OnCh
const feedbacks: FeedbackItem[] = [];
let starClassNames: string[] | undefined;
let sumStars = 0;
- if (this.submodels) {
- for (const pair of this.submodels) {
+ if (submodels) {
+ for (const pair of submodels) {
if (pair.submodel.submodelElements) {
for (const feedback of pair.submodel.submodelElements.filter(
- item => item.modelType === 'SubmodelElementCollection')) {
+ item => item.modelType === 'SubmodelElementCollection',
+ )) {
const general = (feedback as aas.SubmodelElementCollection).value?.find(
- item => item.modelType === 'SubmodelElementCollection' && item.idShort === 'General');
+ item => item.modelType === 'SubmodelElementCollection' && item.idShort === 'General',
+ );
if (general) {
sumStars += this.getStars(feedback);
@@ -115,7 +118,7 @@ export class CustomerFeedbackComponent implements SubmodelTemplate, OnInit, OnCh
stars: this.initStarClassNames(this.getStars(feedback)),
createdAt: this.getCreatedAt(feedback),
subject: pair.submodel.idShort,
- message: this.getMessage(feedback)
+ message: this.getMessage(feedback),
});
}
}
@@ -134,13 +137,11 @@ export class CustomerFeedbackComponent implements SubmodelTemplate, OnInit, OnCh
starClassNames = this.initStarClassNames(0);
}
- this.store.dispatch(CustomerFeedbackActions.initialize({
- stars,
- count,
- starClassNames,
- items,
- feedbacks
- }));
+ this.stars.set(stars);
+ this.count.set(count);
+ this.starClassNames.set(starClassNames);
+ this.items.set(items.filter(item => item.count > 0));
+ this.feedbacks.set(feedbacks);
}
private buildItems(general: aas.SubmodelElementCollection, items: GeneralItem[]): void {
@@ -153,7 +154,7 @@ export class CustomerFeedbackComponent implements SubmodelTemplate, OnInit, OnCh
score: 0,
sum: 0.0,
count: 0,
- like: false
+ like: false,
};
this.map.set(element.idShort, item);
@@ -220,7 +221,6 @@ export class CustomerFeedbackComponent implements SubmodelTemplate, OnInit, OnCh
}
private findProperty(element: aas.SubmodelElementCollection, name: string): aas.Property | undefined {
- return element.value?.find(
- child => child.modelType === 'Property' && child.idShort === name) as aas.Property;
+ return element.value?.find(child => child.modelType === 'Property' && child.idShort === name) as aas.Property;
}
-}
\ No newline at end of file
+}
diff --git a/projects/aas-lib/src/lib/customer-feedback/customer-feedback.reducer.ts b/projects/aas-lib/src/lib/customer-feedback/customer-feedback.reducer.ts
deleted file mode 100644
index 2be940fb..00000000
--- a/projects/aas-lib/src/lib/customer-feedback/customer-feedback.reducer.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/******************************************************************************
- *
- * Copyright (c) 2019-2023 Fraunhofer IOSB-INA Lemgo,
- * eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
- * zur Foerderung der angewandten Forschung e.V.
- *
- *****************************************************************************/
-
-import { createReducer, on } from "@ngrx/store";
-import * as CustomerFeedbackActions from "./customer-feedback.actions";
-import { CustomerFeedbackState, FeedbackItem, GeneralItem } from "./customer-feedback.state";
-
-const initialState: CustomerFeedbackState = {
- stars: 0.0,
- count: 0,
- starClassNames: [],
- items: [],
- feedbacks: [],
- error: null
-}
-
-export const customerFeedbackReducer = createReducer(
- initialState,
- on(
- CustomerFeedbackActions.initialize,
- (state, { stars, count, starClassNames, items, feedbacks }) => initialize(state, stars, count, starClassNames, items, feedbacks)
- )
-)
-
-function initialize(
- state: CustomerFeedbackState,
- stars: number,
- count: number,
- starClassNames: string[],
- items: GeneralItem[],
- feedbacks: FeedbackItem[]): CustomerFeedbackState {
- return {
- ...state,
- stars: stars,
- count: count,
- starClassNames: starClassNames,
- items: items,
- feedbacks: feedbacks,
- error: null
- };
-}
\ No newline at end of file
diff --git a/projects/aas-lib/src/lib/customer-feedback/customer-feedback.selectors.ts b/projects/aas-lib/src/lib/customer-feedback/customer-feedback.selectors.ts
deleted file mode 100644
index 96def872..00000000
--- a/projects/aas-lib/src/lib/customer-feedback/customer-feedback.selectors.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/******************************************************************************
- *
- * Copyright (c) 2019-2023 Fraunhofer IOSB-INA Lemgo,
- * eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
- * zur Foerderung der angewandten Forschung e.V.
- *
- *****************************************************************************/
-
-import { createSelector } from '@ngrx/store';
-import { CustomerFeedbackFeatureState } from './customer-feedback.state';
-
-const getCustomerFeedback = (state: CustomerFeedbackFeatureState) => state.customerFeedback;
-
-export const selectCustomerFeedback = createSelector(getCustomerFeedback, (customerFeedback) => customerFeedback);
\ No newline at end of file
diff --git a/projects/aas-lib/src/lib/customer-feedback/customer-feedback.state.ts b/projects/aas-lib/src/lib/customer-feedback/customer-feedback.state.ts
deleted file mode 100644
index afa480f8..00000000
--- a/projects/aas-lib/src/lib/customer-feedback/customer-feedback.state.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/******************************************************************************
- *
- * Copyright (c) 2019-2023 Fraunhofer IOSB-INA Lemgo,
- * eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
- * zur Foerderung der angewandten Forschung e.V.
- *
- *****************************************************************************/
-
-export interface GeneralItem {
- name: string;
- score: number;
- sum: number;
- count: number;
- like: boolean;
-}
-
-export interface FeedbackItem {
- stars: string[];
- createdAt: string;
- subject: string;
- message: string;
-}
-
-export interface CustomerFeedbackState {
- stars: number;
- count: number;
- starClassNames: string[];
- items: GeneralItem[];
- feedbacks: FeedbackItem[];
- error: unknown
-}
-
-export interface CustomerFeedbackFeatureState {
- customerFeedback: CustomerFeedbackState;
-}
diff --git a/projects/aas-lib/src/lib/digital-nameplate/digital-nameplate.component.html b/projects/aas-lib/src/lib/digital-nameplate/digital-nameplate.component.html
index 5c5c5776..06da3aa0 100644
--- a/projects/aas-lib/src/lib/digital-nameplate/digital-nameplate.component.html
+++ b/projects/aas-lib/src/lib/digital-nameplate/digital-nameplate.component.html
@@ -1,33 +1,35 @@
-(null);
- public nameplates: DigitalNameplate[] = [];
+ public readonly nameplates = signal([]);
public ngOnChanges(changes: SimpleChanges): void {
if (changes['submodels']) {
@@ -50,19 +52,21 @@ export class DigitalNameplateComponent implements SubmodelTemplate, OnChanges {
}
private init() {
- this.nameplates = this.submodels?.map(pair => {
- const submodel = pair.submodel;
- return {
- serialNumber: this.getPropertyValue(submodel, ['SerialNumber']),
- productCountryOfOrigin: this.getPropertyValue(submodel, ['ProductCountryOfOrigin']),
- yearOfConstruction: this.getPropertyValue(submodel, ['YearOfConstruction']),
- manufacturerName: this.getPropertyValue(submodel, ['ManufacturerName']),
- countryCode: this.getPropertyValue(submodel, ['PhysicalAddress', 'CountryCode']),
- zip: this.getPropertyValue(submodel, ['PhysicalAddress', 'Zip']),
- cityTown: this.getPropertyValue(submodel, ['PhysicalAddress', 'CityTown']),
- street: this.getPropertyValue(submodel, ['PhysicalAddress', 'Street'])
- };
- }) ?? [];
+ this.nameplates.set(
+ this.submodels()?.map(pair => {
+ const submodel = pair.submodel;
+ return {
+ serialNumber: this.getPropertyValue(submodel, ['SerialNumber']),
+ productCountryOfOrigin: this.getPropertyValue(submodel, ['ProductCountryOfOrigin']),
+ yearOfConstruction: this.getPropertyValue(submodel, ['YearOfConstruction']),
+ manufacturerName: this.getPropertyValue(submodel, ['ManufacturerName']),
+ countryCode: this.getPropertyValue(submodel, ['PhysicalAddress', 'CountryCode']),
+ zip: this.getPropertyValue(submodel, ['PhysicalAddress', 'Zip']),
+ cityTown: this.getPropertyValue(submodel, ['PhysicalAddress', 'CityTown']),
+ street: this.getPropertyValue(submodel, ['PhysicalAddress', 'Street']),
+ };
+ }) ?? [],
+ );
}
private getPropertyValue(submodel: aas.Submodel, path: string[]): string {
@@ -84,4 +88,4 @@ export class DigitalNameplateComponent implements SubmodelTemplate, OnChanges {
return '';
}
-}
\ No newline at end of file
+}
diff --git a/projects/aas-lib/src/lib/document.service.ts b/projects/aas-lib/src/lib/document.service.ts
index 1081dbbf..9a7f08f7 100644
--- a/projects/aas-lib/src/lib/document.service.ts
+++ b/projects/aas-lib/src/lib/document.service.ts
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * Copyright (c) 2019-2023 Fraunhofer IOSB-INA Lemgo,
+ * Copyright (c) 2019-2024 Fraunhofer IOSB-INA Lemgo,
* eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
* zur Foerderung der angewandten Forschung e.V.
*
@@ -9,14 +9,14 @@
import { Injectable } from '@angular/core';
@Injectable({
- providedIn: 'root'
+ providedIn: 'root',
})
export class DocumentService {
public getElementById(elementId: string): HTMLElement | null {
return document.getElementById(elementId);
}
-
+
public createElement(tagName: string, options?: ElementCreationOptions): HTMLElement {
return document.createElement(tagName, options);
}
-}
\ No newline at end of file
+}
diff --git a/projects/aas-lib/src/lib/download.service.ts b/projects/aas-lib/src/lib/download.service.ts
index 52972f40..b3dd9752 100644
--- a/projects/aas-lib/src/lib/download.service.ts
+++ b/projects/aas-lib/src/lib/download.service.ts
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * Copyright (c) 2019-2023 Fraunhofer IOSB-INA Lemgo,
+ * Copyright (c) 2019-2024 Fraunhofer IOSB-INA Lemgo,
* eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
* zur Foerderung der angewandten Forschung e.V.
*
@@ -12,13 +12,10 @@ import { map, Observable } from 'rxjs';
import { encodeBase64Url } from './convert';
@Injectable({
- providedIn: 'root'
+ providedIn: 'root',
})
export class DownloadService {
- constructor(
- private readonly http: HttpClient
- ) {
- }
+ public constructor(private readonly http: HttpClient) {}
/**
* Download a file from the specified URL.
@@ -27,62 +24,64 @@ export class DownloadService {
*/
public async downloadFileAsync(url: string, filename: string): Promise {
return new Promise((resolve, reject) => {
- this.http.get(
- url,
- {
- responseType: 'blob'
- }).pipe(map(blob => {
- const a = document.createElement('a');
- a.href = URL.createObjectURL(blob);
- a.setAttribute('download', filename);
- a.click();
- URL.revokeObjectURL(a.href);
- })).subscribe({
- error: (error) => reject(error),
- complete: () => resolve()
+ this.http
+ .get(url, {
+ responseType: 'blob',
+ })
+ .pipe(
+ map(blob => {
+ const a = document.createElement('a');
+ a.href = URL.createObjectURL(blob);
+ a.setAttribute('download', filename);
+ a.click();
+ URL.revokeObjectURL(a.href);
+ }),
+ )
+ .subscribe({
+ error: error => reject(error),
+ complete: () => resolve(),
});
});
}
/**
* Downloads an AASX package file.
- * @param url The endpoint URL.
+ * @param endpoint The endpoint name.
* @param id The AAS identifier.
* @param name The file name.
*/
- public downloadDocument(url: string, id: string, name: string): Observable {
- return this.http.get(
- `/api/v1/containers/${encodeBase64Url(url)}/documents/${encodeBase64Url(id)}`,
- {
- responseType: 'blob'
- }).pipe(map(blob => {
- const a = document.createElement('a');
- a.href = URL.createObjectURL(blob);
- a.setAttribute('download', name);
- a.click();
- URL.revokeObjectURL(a.href);
- }));
+ public downloadDocument(endpoint: string, id: string, name: string): Observable {
+ return this.http
+ .get(`/api/v1/containers/${encodeBase64Url(endpoint)}/packages/${encodeBase64Url(id)}`, {
+ responseType: 'blob',
+ })
+ .pipe(
+ map(blob => {
+ const a = document.createElement('a');
+ a.href = URL.createObjectURL(blob);
+ a.setAttribute('download', name);
+ a.click();
+ URL.revokeObjectURL(a.href);
+ }),
+ );
}
-
+
/**
* Uploads the specified aasx file.
* @param file A file.
- * @param url The URL of the destination.
+ * @param endpoint The name of the destination endpoint.
*/
- public uploadDocuments(url: string, file: File | File[]): Observable> {
+ public uploadDocuments(endpoint: string, file: File | File[]): Observable> {
const data = new FormData();
if (Array.isArray(file)) {
- file.forEach(item => data.append('file', item));
+ file.forEach(item => data.append('files', item));
} else {
- data.append('file', file);
+ data.append('files', file);
}
- return this.http.post(
- `/api/v1/containers/${encodeBase64Url(url)}/documents`,
- data,
- {
- reportProgress: true,
- observe: 'events'
- });
+ return this.http.post(`/api/v1/containers/${encodeBase64Url(endpoint)}/packages`, data, {
+ reportProgress: true,
+ observe: 'events',
+ });
}
-}
\ No newline at end of file
+}
diff --git a/projects/aas-lib/src/lib/index-change.service.ts b/projects/aas-lib/src/lib/index-change.service.ts
new file mode 100644
index 00000000..e88124fd
--- /dev/null
+++ b/projects/aas-lib/src/lib/index-change.service.ts
@@ -0,0 +1,142 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019-2024 Fraunhofer IOSB-INA Lemgo,
+ * eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
+ * zur Foerderung der angewandten Forschung e.V.
+ *
+ *****************************************************************************/
+
+import { computed, EventEmitter, Injectable, signal } from '@angular/core';
+import { WebSocketData, AASServerMessage } from 'aas-core';
+import { WebSocketSubject } from 'rxjs/webSocket';
+import { WebSocketFactoryService } from './web-socket-factory.service';
+import { NotifyService } from '../public-api';
+
+interface State {
+ addedDocuments: number;
+ changedDocuments: number;
+ removedDocuments: number;
+ addedEndpoints: number;
+ removedEndpoints: number;
+}
+
+@Injectable({
+ providedIn: 'root',
+})
+export class IndexChangeService {
+ private webSocketSubject?: WebSocketSubject;
+ private readonly state = signal({
+ addedDocuments: 0,
+ changedDocuments: 0,
+ removedDocuments: 0,
+ addedEndpoints: 0,
+ removedEndpoints: 0,
+ });
+
+ public constructor(
+ private readonly webSocketFactory: WebSocketFactoryService,
+ private readonly notify: NotifyService,
+ ) {
+ this.subscribeIndexChanged();
+ }
+
+ public readonly reset = new EventEmitter();
+
+ public readonly count = computed(() => {
+ const state = this.state();
+ return (
+ state.addedDocuments +
+ state.addedEndpoints +
+ state.changedDocuments +
+ state.removedDocuments +
+ state.removedEndpoints
+ );
+ });
+
+ public readonly summary = computed(() => {
+ const state = this.state();
+ return `+${state.addedDocuments}/${state.changedDocuments}/-${state.removedDocuments}; +${state.addedEndpoints}/-${state.removedEndpoints}`;
+ });
+
+ public readonly addedDocuments = computed(() => this.state().addedDocuments);
+ public readonly addedEndpoints = computed(() => this.state().addedEndpoints);
+ public readonly changedDocuments = computed(() => this.state().changedDocuments);
+ public readonly removedDocuments = computed(() => this.state().removedDocuments);
+ public readonly removedEndpoints = computed(() => this.state().removedEndpoints);
+
+ public clear(): void {
+ this.state.set({
+ addedDocuments: 0,
+ changedDocuments: 0,
+ removedDocuments: 0,
+ addedEndpoints: 0,
+ removedEndpoints: 0,
+ });
+ }
+
+ private subscribeIndexChanged = (): void => {
+ this.webSocketSubject = this.webSocketFactory.create();
+ this.webSocketSubject.subscribe({
+ next: (data: WebSocketData): void => {
+ if (data.type === 'AASServerMessage') {
+ this.update(data.data as AASServerMessage);
+ }
+ },
+ error: (): void => {
+ setTimeout(this.subscribeIndexChanged, 2000);
+ },
+ });
+
+ this.webSocketSubject.next(this.createMessage());
+ };
+
+ private createMessage(): WebSocketData {
+ return {
+ type: 'IndexChange',
+ data: null,
+ } as WebSocketData;
+ }
+
+ private update(data: AASServerMessage): void {
+ switch (data.type) {
+ case 'Added':
+ this.documentAdded();
+ break;
+ case 'Removed':
+ this.documentRemoved();
+ break;
+ case 'Changed':
+ this.documentChanged();
+ break;
+ case 'EndpointAdded':
+ this.endpointAdded();
+ break;
+ case 'EndpointRemoved':
+ this.endpointRemoved();
+ break;
+ case 'Reset':
+ this.reset.emit();
+ break;
+ }
+ }
+
+ private documentAdded(): void {
+ this.state.update(state => ({ ...state, addedDocuments: state.addedDocuments + 1 }));
+ }
+
+ private documentRemoved(): void {
+ this.state.update(state => ({ ...state, removedDocuments: state.removedDocuments + 1 }));
+ }
+
+ private documentChanged(): void {
+ this.state.update(state => ({ ...state, changedDocuments: state.changedDocuments + 1 }));
+ }
+
+ private endpointAdded(): void {
+ this.state.update(state => ({ ...state, addedEndpoints: state.addedEndpoints + 1 }));
+ }
+
+ private endpointRemoved(): void {
+ this.state.update(state => ({ ...state, removedEndpoints: state.removedEndpoints + 1 }));
+ }
+}
diff --git a/projects/aas-lib/src/lib/library-table/library-table.component.html b/projects/aas-lib/src/lib/library-table/library-table.component.html
deleted file mode 100644
index 731b8fd8..00000000
--- a/projects/aas-lib/src/lib/library-table/library-table.component.html
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/projects/aas-lib/src/lib/library-table/library-table.component.ts b/projects/aas-lib/src/lib/library-table/library-table.component.ts
deleted file mode 100644
index 3b49479f..00000000
--- a/projects/aas-lib/src/lib/library-table/library-table.component.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/******************************************************************************
- *
- * Copyright (c) 2019-2023 Fraunhofer IOSB-INA Lemgo,
- * eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
- * zur Foerderung der angewandten Forschung e.V.
- *
- *****************************************************************************/
-
-import { Component, Input, OnChanges, SimpleChanges } from '@angular/core';
-import { Library } from 'common';
-
-export interface LibraryRow extends Library {
- id: number;
-}
-
-@Component({
- selector: 'fhg-library-table',
- templateUrl: './library-table.component.html',
- styleUrls: ['./library-table.component.scss']
-})
-export class LibraryTableComponent implements OnChanges {
- @Input()
- public collection: Library[] = [];
-
- @Input()
- public pageSize = 10;
-
- public libraries: LibraryRow[] = [];
-
- public get size(): number {
- return this.collection.length;
- }
-
- public page = 1;
-
- public ngOnChanges(changes: SimpleChanges): void {
- if (changes['collection'] || changes['pageSize']) {
- this.refreshLibraries();
- }
- }
-
- public refreshLibraries(): void {
- if (this.pageSize > 0 && this.size > this.pageSize) {
- this.libraries = this.collection.map((library, i) => ({ id: i + 1, ...library })).slice(
- (this.page - 1) * this.pageSize,
- (this.page - 1) * this.pageSize + this.pageSize,
- );
- } else {
- this.libraries = this.collection.map((library, i) => ({ id: i + 1, ...library }));
- }
- }
-}
\ No newline at end of file
diff --git a/projects/aas-lib/src/lib/license-info/license-info.component.html b/projects/aas-lib/src/lib/license-info/license-info.component.html
new file mode 100644
index 00000000..18f0cbd6
--- /dev/null
+++ b/projects/aas-lib/src/lib/license-info/license-info.component.html
@@ -0,0 +1,13 @@
+
+
+
+([]);
+
+ public readonly isCollapsed = signal(true);
+
+ public readonly text = computed(() => {
+ return this.generateLicensesText(this.libraries());
+ });
+
+ private generateLicensesText(libraries: Library[]): string {
+ const licenses = new Map();
+ for (const library of libraries) {
+ let value = licenses.get(library.licenseText);
+ if (!value) {
+ value = [library];
+ licenses.set(library.licenseText, value);
+ } else {
+ value.push(library);
+ }
+ }
+
+ let text = '';
+ for (const [key, value] of licenses) {
+ if (value.length === 1) {
+ text += 'The following npm package may be included in this product:\n\n';
+ text += ` - ${value[0].name}@${value[0].version}\n\n`;
+ text += 'This package contains the following license and notice below:\n\n';
+ } else if (value.length > 1) {
+ text += 'The following npm packages may be included in this product:\n\n';
+ for (const item of value) {
+ text += ` - ${item.name}@${value[0].version}\n`;
+ }
+
+ text += '\nThese packages each contain the following license and notice below:\n\n';
+ }
+
+ text += key;
+ text += '\n-----------\n\n';
+ }
+
+ return text;
+ }
+}
diff --git a/projects/aas-lib/src/lib/localize/culture-info.ts b/projects/aas-lib/src/lib/localize/culture-info.ts
index 16c0310c..4bdbae10 100644
--- a/projects/aas-lib/src/lib/localize/culture-info.ts
+++ b/projects/aas-lib/src/lib/localize/culture-info.ts
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * Copyright (c) 2019-2023 Fraunhofer IOSB-INA Lemgo,
+ * Copyright (c) 2019-2024 Fraunhofer IOSB-INA Lemgo,
* eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
* zur Foerderung der angewandten Forschung e.V.
*
@@ -9,4 +9,4 @@
export interface CultureInfo {
localeId: string;
name: string;
-}
\ No newline at end of file
+}
diff --git a/projects/aas-lib/src/lib/localize/localize.component.html b/projects/aas-lib/src/lib/localize/localize.component.html
index f1e83d82..fab6a01a 100644
--- a/projects/aas-lib/src/lib/localize/localize.component.html
+++ b/projects/aas-lib/src/lib/localize/localize.component.html
@@ -1,6 +1,6 @@
-{{message.text}}
\ No newline at end of file
+@for (message of messages(); track message) {
+ {{message.text}}
+}
\ No newline at end of file
diff --git a/projects/aas-lib/src/lib/notify/notify.component.scss b/projects/aas-lib/src/lib/notify/notify.component.scss
index c57d4b61..3caf3822 100644
--- a/projects/aas-lib/src/lib/notify/notify.component.scss
+++ b/projects/aas-lib/src/lib/notify/notify.component.scss
@@ -1,7 +1,7 @@
-/******************************************************************************
- *
- * Copyright (c) 2019-2022 Fraunhofer IOSB-INA Lemgo,
- * eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
- * zur Foerderung der angewandten Forschung e.V.
- *
- *****************************************************************************/
+/******************************************************************************
+ *
+ * Copyright (c) 2019-2024 Fraunhofer IOSB-INA Lemgo,
+ * eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
+ * zur Foerderung der angewandten Forschung e.V.
+ *
+ *****************************************************************************/
diff --git a/projects/aas-lib/src/lib/notify/notify.component.ts b/projects/aas-lib/src/lib/notify/notify.component.ts
index c21e307f..ca2fb46b 100644
--- a/projects/aas-lib/src/lib/notify/notify.component.ts
+++ b/projects/aas-lib/src/lib/notify/notify.component.ts
@@ -1,27 +1,32 @@
/******************************************************************************
*
- * Copyright (c) 2019-2023 Fraunhofer IOSB-INA Lemgo,
+ * Copyright (c) 2019-2024 Fraunhofer IOSB-INA Lemgo,
* eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
* zur Foerderung der angewandten Forschung e.V.
*
*****************************************************************************/
-import { Component, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
import { MessageEntry } from '../types/message-entry';
import { NotifyService } from './notify.service';
+import { NgbToast } from '@ng-bootstrap/ng-bootstrap';
@Component({
selector: 'fhg-notify',
templateUrl: './notify.component.html',
- styleUrls: ['./notify.component.scss']
+ styleUrls: ['./notify.component.scss'],
+ standalone: true,
+ imports: [NgbToast],
+ changeDetection: ChangeDetectionStrategy.OnPush,
})
export class NotifyComponent implements OnInit {
+ public constructor(private readonly notify: NotifyService) {}
- constructor(notify: NotifyService) {
- this.notify = notify;
- }
+ public readonly messages = this.notify.messages;
- public readonly notify: NotifyService;
+ public remove(message: MessageEntry): void {
+ this.notify.remove(message);
+ }
public close(message: MessageEntry) {
this.notify.remove(message);
@@ -30,4 +35,4 @@ export class NotifyComponent implements OnInit {
public ngOnInit(): void {
this.notify.clear();
}
-}
\ No newline at end of file
+}
diff --git a/projects/aas-lib/src/lib/notify/notify.service.ts b/projects/aas-lib/src/lib/notify/notify.service.ts
index 2cfc609a..10d39b6c 100644
--- a/projects/aas-lib/src/lib/notify/notify.service.ts
+++ b/projects/aas-lib/src/lib/notify/notify.service.ts
@@ -1,32 +1,34 @@
/******************************************************************************
*
- * Copyright (c) 2019-2023 Fraunhofer IOSB-INA Lemgo,
+ * Copyright (c) 2019-2024 Fraunhofer IOSB-INA Lemgo,
* eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
* zur Foerderung der angewandten Forschung e.V.
*
*****************************************************************************/
-import { isElement } from 'lodash-es';
-import { Injectable } from '@angular/core';
+import isElement from 'lodash-es/isElement';
+import { Injectable, signal } from '@angular/core';
import { TranslateService } from '@ngx-translate/core';
import { resolveError } from '../convert';
import { MessageEntry } from '../types/message-entry';
-import { stringFormat } from 'common';
+import { stringFormat } from 'aas-core';
export enum LogType {
Error,
Warning,
Info,
- Debug
+ Debug,
}
@Injectable({
- providedIn: 'root'
+ providedIn: 'root',
})
export class NotifyService {
- constructor(private translate: TranslateService) { }
+ private readonly _messages = signal([]);
- public messages: MessageEntry[] = [];
+ public constructor(private translate: TranslateService) {}
+
+ public readonly messages = this._messages.asReadonly();
/**
* Displays an error message.
@@ -35,14 +37,16 @@ export class NotifyService {
public async error(error: unknown): Promise {
if (error) {
const text = await resolveError(error, this.translate);
- this.messages.push(
+ this._messages.update(values => [
+ ...values,
{
header: this.translate.instant('CAPTION_ERROR'),
text: text,
classname: 'bg-danger',
autohide: false,
- delay: 5000
- });
+ delay: 5000,
+ },
+ ]);
}
}
@@ -52,15 +56,16 @@ export class NotifyService {
*/
public info(message: string, ...args: unknown[]): void {
if (message && !isElement(message)) {
- message = stringFormat(this.translate.instant(message), args);
- this.messages.push(
+ this._messages.update(values => [
+ ...values,
{
header: this.translate.instant('CAPTION_INFO'),
- text: message,
+ text: stringFormat(this.translate.instant(message), args),
classname: 'bg-info',
autohide: true,
- delay: 5000
- });
+ delay: 5000,
+ },
+ ]);
}
}
@@ -69,14 +74,14 @@ export class NotifyService {
* @param message The message to remove.
*/
public remove(message: MessageEntry) {
- this.messages = this.messages.filter(item => item !== message);
+ this._messages.update(values => values.filter(value => value !== message));
}
/**
* Clears all messages.
*/
public clear(): void {
- this.messages.splice(0, this.messages.length);
+ this._messages.set([]);
}
/**
@@ -102,4 +107,4 @@ export class NotifyService {
}
}
}
-}
\ No newline at end of file
+}
diff --git a/projects/aas-lib/src/lib/operation-call-form/operation-call-form-api.service.ts b/projects/aas-lib/src/lib/operation-call-form/operation-call-form-api.service.ts
new file mode 100644
index 00000000..45d6bdfa
--- /dev/null
+++ b/projects/aas-lib/src/lib/operation-call-form/operation-call-form-api.service.ts
@@ -0,0 +1,31 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019-2024 Fraunhofer IOSB-INA Lemgo,
+ * eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
+ * zur Foerderung der angewandten Forschung e.V.
+ *
+ *****************************************************************************/
+
+import { Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { aas, AASDocument } from 'aas-core';
+import { encodeBase64Url } from '../convert';
+import { Observable } from 'rxjs';
+
+/** The client side AAS provider service. */
+@Injectable()
+export class OperationCallFormApiService {
+ public constructor(private readonly http: HttpClient) {}
+
+ /**
+ * Calls an operation.
+ * @param document The document to which the operation belongs.
+ * @param operation The operation to call.
+ * @returns The result of the operation call.
+ */
+ public invoke(document: AASDocument, operation: aas.Operation): Observable {
+ const endpoint = encodeBase64Url(document.endpoint);
+ const id = encodeBase64Url(document.id);
+ return this.http.post(`/api/v1/containers/${endpoint}/documents/${id}/invoke`, operation);
+ }
+}
diff --git a/projects/aas-lib/src/lib/operation-call-form/operation-call-form.component.html b/projects/aas-lib/src/lib/operation-call-form/operation-call-form.component.html
new file mode 100644
index 00000000..a9a50a64
--- /dev/null
+++ b/projects/aas-lib/src/lib/operation-call-form/operation-call-form.component.html
@@ -0,0 +1,143 @@
+
+
+
\ No newline at end of file
diff --git a/projects/aas-lib/src/lib/aas-tree/operation-call-form/operation-call-form.component.scss b/projects/aas-lib/src/lib/operation-call-form/operation-call-form.component.scss
similarity index 84%
rename from projects/aas-lib/src/lib/aas-tree/operation-call-form/operation-call-form.component.scss
rename to projects/aas-lib/src/lib/operation-call-form/operation-call-form.component.scss
index c57d4b61..1b4785f3 100644
--- a/projects/aas-lib/src/lib/aas-tree/operation-call-form/operation-call-form.component.scss
+++ b/projects/aas-lib/src/lib/operation-call-form/operation-call-form.component.scss
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * Copyright (c) 2019-2022 Fraunhofer IOSB-INA Lemgo,
+ * Copyright (c) 2019-2024 Fraunhofer IOSB-INA Lemgo,
* eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
* zur Foerderung der angewandten Forschung e.V.
*
diff --git a/projects/aas-lib/src/lib/operation-call-form/operation-call-form.component.ts b/projects/aas-lib/src/lib/operation-call-form/operation-call-form.component.ts
new file mode 100644
index 00000000..711c7d6e
--- /dev/null
+++ b/projects/aas-lib/src/lib/operation-call-form/operation-call-form.component.ts
@@ -0,0 +1,206 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019-2024 Fraunhofer IOSB-INA Lemgo,
+ * eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
+ * zur Foerderung der angewandten Forschung e.V.
+ *
+ *****************************************************************************/
+
+import cloneDeep from 'lodash-es/cloneDeep';
+import { catchError, EMPTY, map, mergeMap, Observable, of } from 'rxjs';
+import { ChangeDetectionStrategy, Component, signal } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { NgbActiveModal, NgbToast } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import {
+ AASDocument,
+ getLocaleValue,
+ ApplicationError,
+ determineType,
+ getDefaultValue,
+ isBooleanType,
+ aas,
+ isProperty,
+ toInvariant,
+ convertToString,
+ toBoolean,
+ isReferenceElement,
+} from 'aas-core';
+
+import { messageToString } from '../convert';
+import { ERRORS } from '../types/errors';
+import { OperationCallFormApiService } from './operation-call-form-api.service';
+
+export interface VariableItem {
+ submodelElement: aas.SubmodelElement;
+ name: string;
+ description?: string;
+ type: aas.DataTypeDefXsd | '-';
+ value: string | boolean;
+ inputType: 'text' | 'checkbox';
+}
+
+@Component({
+ selector: 'fhg-operation-call',
+ templateUrl: './operation-call-form.component.html',
+ styleUrls: ['./operation-call-form.component.scss'],
+ standalone: true,
+ imports: [NgbToast, FormsModule, TranslateModule],
+ providers: [OperationCallFormApiService],
+ changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class OperationCallFormComponent {
+ private operation: aas.Operation | undefined;
+ private document: AASDocument | null = null;
+
+ public constructor(
+ private modal: NgbActiveModal,
+ private translate: TranslateService,
+ private api: OperationCallFormApiService,
+ ) {}
+
+ public readonly name = signal('');
+
+ public readonly canCall = signal(true);
+
+ public readonly inputVariables = signal([]);
+
+ public readonly inoutputVariables = signal([]);
+
+ public readonly outputVariables = signal([]);
+
+ public readonly messages = signal([]);
+
+ public initialize(document: AASDocument, operation: aas.Operation): void {
+ this.document = document;
+ this.operation = cloneDeep(operation);
+ delete this.operation.parent;
+
+ try {
+ this.name.set(this.operation.idShort);
+ this.inputVariables.set(this.applyToView(this.operation.inputVariables));
+ this.inoutputVariables.set(this.applyToView(this.operation.inoutputVariables));
+ this.outputVariables.set(this.applyToView(this.operation.outputVariables));
+ } catch (error) {
+ this.messages.update(values => [...values, messageToString(error, this.translate)]);
+ this.canCall.set(false);
+ }
+ }
+
+ public call(): Observable {
+ return of(void 0).pipe(
+ mergeMap(() => {
+ if (!this.document || !this.operation || !this.canCall()) {
+ return EMPTY;
+ }
+
+ this.messages.set([]);
+ this.applyToModel();
+ return this.api.invoke(this.document, this.operation);
+ }),
+ map(result => {
+ if (result && Array.isArray(result.outputVariables)) {
+ this.inputVariables.set(this.applyToView(result.inputVariables));
+ this.inoutputVariables.set(this.applyToView(result.inoutputVariables));
+ this.outputVariables.set(this.applyToView(result.outputVariables));
+ }
+ }),
+ catchError(error => {
+ this.messages.set([messageToString(error, this.translate)]);
+ return of(void 0);
+ }),
+ );
+ }
+
+ public close(): void {
+ this.modal.close();
+ }
+
+ private applyToModel(): void {
+ for (const item of [...this.inputVariables(), ...this.inoutputVariables()]) {
+ const element = item.submodelElement;
+ if (isProperty(element)) {
+ const value =
+ typeof item.value === 'boolean'
+ ? item.value.toString()
+ : toInvariant(item.value, item.type as aas.DataTypeDefXsd, this.translate.currentLang);
+
+ if (value == null) {
+ throw new ApplicationError(
+ `The expression '${element.value}' for the variable '${element.idShort}' cannot be converted to the type '${element.valueType}'`,
+ ERRORS.INVALID_OPERATION_VARIABLE_EXPRESSION,
+ element.value,
+ element.idShort,
+ element.valueType,
+ );
+ }
+
+ element.value = value;
+ }
+ }
+ }
+
+ private applyToView(sources: aas.OperationVariable[] | undefined): VariableItem[] {
+ const values: VariableItem[] = [];
+ if (!sources) return values;
+
+ for (const sourceVariable of sources) {
+ const source = sourceVariable.value;
+ delete source.parent;
+ if (isProperty(source)) {
+ delete source.nodeId;
+ const inputType = isBooleanType(source.valueType) ? 'checkbox' : 'text';
+
+ let valueType: aas.DataTypeDefXsd | undefined;
+ if (source.valueType) {
+ valueType = source.valueType;
+ } else if (source.value) {
+ valueType = determineType(source.value);
+ }
+
+ if (!valueType) {
+ throw new ApplicationError(
+ `The data type of the variable "${source.idShort}" is undefined.`,
+ ERRORS.UNKNOWN_VARIABLE_VALUE_TYPE,
+ source.idShort,
+ );
+ }
+
+ let value = source.value;
+ if (!value) {
+ value = convertToString(getDefaultValue(valueType), this.translate.currentLang);
+ }
+
+ values.push({
+ submodelElement: source,
+ name: source.idShort,
+ description: getLocaleValue(source.description),
+ type: valueType,
+ inputType: inputType,
+ value: inputType === 'checkbox' ? toBoolean(value) : value,
+ });
+ } else if (isReferenceElement(source) && source.value) {
+ values.push({
+ submodelElement: source,
+ name: source.idShort,
+ description: getLocaleValue(source.description),
+ type: '-',
+ inputType: 'text',
+ value: source.value.keys.map(key => key.value).join('.'),
+ });
+ } else {
+ const source = sourceVariable.value;
+ values.push({
+ submodelElement: source,
+ name: source.idShort,
+ description: getLocaleValue(source.description),
+ type: '-',
+ inputType: 'text',
+ value: source.modelType,
+ });
+ }
+ }
+
+ return values;
+ }
+}
diff --git a/projects/aas-lib/src/lib/score/score.component.html b/projects/aas-lib/src/lib/score/score.component.html
index b02cf8ac..e2e3efdf 100644
--- a/projects/aas-lib/src/lib/score/score.component.html
+++ b/projects/aas-lib/src/lib/score/score.component.html
@@ -1,6 +1,6 @@
-![]()
\ No newline at end of file
diff --git a/projects/aas-lib/src/lib/secured-image/secured-image.component.scss b/projects/aas-lib/src/lib/secured-image/secured-image.component.scss
index e69de29b..3caf3822 100644
--- a/projects/aas-lib/src/lib/secured-image/secured-image.component.scss
+++ b/projects/aas-lib/src/lib/secured-image/secured-image.component.scss
@@ -0,0 +1,7 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019-2024 Fraunhofer IOSB-INA Lemgo,
+ * eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
+ * zur Foerderung der angewandten Forschung e.V.
+ *
+ *****************************************************************************/
diff --git a/projects/aas-lib/src/lib/secured-image/secured-image.component.ts b/projects/aas-lib/src/lib/secured-image/secured-image.component.ts
index eff32d44..65927971 100644
--- a/projects/aas-lib/src/lib/secured-image/secured-image.component.ts
+++ b/projects/aas-lib/src/lib/secured-image/secured-image.component.ts
@@ -1,57 +1,56 @@
/******************************************************************************
*
- * Copyright (c) 2019-2023 Fraunhofer IOSB-INA Lemgo,
+ * Copyright (c) 2019-2024 Fraunhofer IOSB-INA Lemgo,
* eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
* zur Foerderung der angewandten Forschung e.V.
*
*****************************************************************************/
-import { Component, Input, OnChanges, SimpleChanges } from '@angular/core';
+import { ChangeDetectionStrategy, Component, effect, input } from '@angular/core';
+import { toSignal } from '@angular/core/rxjs-interop';
import { HttpClient } from '@angular/common/http';
-import { BehaviorSubject, Observable, map, switchMap } from 'rxjs';
+import { BehaviorSubject, Observable, map, skipWhile, switchMap } from 'rxjs';
import { DomSanitizer } from '@angular/platform-browser';
@Component({
selector: 'fhg-img',
templateUrl: './secured-image.component.html',
- styleUrls: ['./secured-image.component.scss']
+ styleUrls: ['./secured-image.component.scss'],
+ standalone: true,
+ changeDetection: ChangeDetectionStrategy.OnPush,
})
-export class SecuredImageComponent implements OnChanges {
- constructor(private httpClient: HttpClient, private domSanitizer: DomSanitizer) {
- this.dataUrl$ = this.src$.pipe(switchMap(url => this.loadImage(url)));
+export class SecuredImageComponent {
+ private readonly src$ = new BehaviorSubject('');
+
+ public constructor(
+ private httpClient: HttpClient,
+ private domSanitizer: DomSanitizer,
+ ) {
+ effect(() => {
+ this.src$.next(this.src());
+ });
}
- @Input()
- public src = '';
- private src$ = new BehaviorSubject(this.src);
+ public readonly src = input('');
- @Input()
- public alt?: string;
+ public readonly alt = input();
- @Input()
- public classname?: string;
+ public readonly classname = input();
- @Input()
- public width = -1;
+ public readonly width = input();
- @Input()
- public height = -1;
+ public readonly height = input();
- public ngOnChanges(changes: SimpleChanges): void {
- if (changes['src']) {
- this.src$.next(this.src);
- }
- }
-
- public readonly dataUrl$: Observable;
-
- public onError(img: HTMLImageElement): void {
- img.src = img.alt;
- }
+ public readonly dataUrl = toSignal(
+ this.src$.asObservable().pipe(
+ skipWhile(src => !src),
+ switchMap(src => this.loadImage(src)),
+ ),
+ );
private loadImage(url: string): Observable {
return this.httpClient
.get(url, { responseType: 'blob' })
- .pipe(map(e => this.domSanitizer.bypassSecurityTrustResourceUrl(URL.createObjectURL(e))));
+ .pipe(map(blob => this.domSanitizer.bypassSecurityTrustResourceUrl(URL.createObjectURL(blob))));
}
-}
\ No newline at end of file
+}
diff --git a/projects/aas-lib/src/lib/aas-tree/show-image-form/show-image-form.component.html b/projects/aas-lib/src/lib/show-image-form/show-image-form.component.html
similarity index 68%
rename from projects/aas-lib/src/lib/aas-tree/show-image-form/show-image-form.component.html
rename to projects/aas-lib/src/lib/show-image-form/show-image-form.component.html
index f28be6ae..321c41bf 100644
--- a/projects/aas-lib/src/lib/aas-tree/show-image-form/show-image-form.component.html
+++ b/projects/aas-lib/src/lib/show-image-form/show-image-form.component.html
@@ -1,6 +1,6 @@
-
-
\ No newline at end of file
diff --git a/projects/aas-lib/src/lib/customer-feedback/customer-feedback.component.scss b/projects/aas-lib/src/lib/customer-feedback/customer-feedback.component.scss
index e69de29b..3caf3822 100644
--- a/projects/aas-lib/src/lib/customer-feedback/customer-feedback.component.scss
+++ b/projects/aas-lib/src/lib/customer-feedback/customer-feedback.component.scss
@@ -0,0 +1,7 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019-2024 Fraunhofer IOSB-INA Lemgo,
+ * eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
+ * zur Foerderung der angewandten Forschung e.V.
+ *
+ *****************************************************************************/
diff --git a/projects/aas-lib/src/lib/customer-feedback/customer-feedback.component.ts b/projects/aas-lib/src/lib/customer-feedback/customer-feedback.component.ts
index 0952cdb2..a5ee7336 100644
--- a/projects/aas-lib/src/lib/customer-feedback/customer-feedback.component.ts
+++ b/projects/aas-lib/src/lib/customer-feedback/customer-feedback.component.ts
@@ -1,95 +1,96 @@
/******************************************************************************
*
- * Copyright (c) 2019-2023 Fraunhofer IOSB-INA Lemgo,
+ * Copyright (c) 2019-2024 Fraunhofer IOSB-INA Lemgo,
* eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
* zur Foerderung der angewandten Forschung e.V.
*
*****************************************************************************/
-import { Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core';
-import { Store } from '@ngrx/store';
-import { TranslateService } from '@ngx-translate/core';
-import { aas, getLocaleValue, getPreferredName } from 'common';
+import { ChangeDetectionStrategy, Component, OnDestroy, OnInit, computed, effect, input, signal } from '@angular/core';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import { DecimalPipe } from '@angular/common';
import { Subscription } from 'rxjs';
-import * as CustomerFeedbackActions from './customer-feedback.actions';
-import { CustomerFeedbackFeatureState, FeedbackItem, GeneralItem } from './customer-feedback.state';
+import { aas, getLocaleValue, getPreferredName } from 'aas-core';
import { DocumentSubmodelPair, SubmodelTemplate } from '../submodel-template/submodel-template';
-import { selectCustomerFeedback } from './customer-feedback.selectors';
+import { ScoreComponent } from '../score/score.component';
+
+export interface GeneralItem {
+ name: string;
+ score: number;
+ sum: number;
+ count: number;
+ like: boolean;
+}
+
+export interface FeedbackItem {
+ stars: string[];
+ createdAt: string;
+ subject: string;
+ message: string;
+}
@Component({
selector: 'fhg-customer-feedback',
templateUrl: './customer-feedback.component.html',
- styleUrls: ['./customer-feedback.component.scss']
+ styleUrls: ['./customer-feedback.component.scss'],
+ standalone: true,
+ imports: [ScoreComponent, DecimalPipe, TranslateModule],
+ changeDetection: ChangeDetectionStrategy.OnPush,
})
-export class CustomerFeedbackComponent implements SubmodelTemplate, OnInit, OnChanges, OnDestroy {
+export class CustomerFeedbackComponent implements SubmodelTemplate, OnInit, OnDestroy {
private static readonly maxStars = 5;
- private readonly store: Store
-
-
-
-
-
-
- {{feedback.createdAt}}
- {{feedback.subject}}
- {{feedback.message}}
+ @for (feedback of feedbacks(); track feedback; let i = $index) {
+
+
+ }
+
+
+ @for (star of feedback.stars; track star) {
+
+ }
-
+ {{feedback.createdAt}}
+ {{feedback.subject}}
+ {{feedback.message}}
+
+@for (nameplate of nameplates(); track nameplate) {
+
\ No newline at end of file
+
+}
\ No newline at end of file
diff --git a/projects/aas-lib/src/lib/digital-nameplate/digital-nameplate.component.scss b/projects/aas-lib/src/lib/digital-nameplate/digital-nameplate.component.scss
index e69de29b..3caf3822 100644
--- a/projects/aas-lib/src/lib/digital-nameplate/digital-nameplate.component.scss
+++ b/projects/aas-lib/src/lib/digital-nameplate/digital-nameplate.component.scss
@@ -0,0 +1,7 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019-2024 Fraunhofer IOSB-INA Lemgo,
+ * eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
+ * zur Foerderung der angewandten Forschung e.V.
+ *
+ *****************************************************************************/
diff --git a/projects/aas-lib/src/lib/digital-nameplate/digital-nameplate.component.ts b/projects/aas-lib/src/lib/digital-nameplate/digital-nameplate.component.ts
index 085bf1ba..b21ba3db 100644
--- a/projects/aas-lib/src/lib/digital-nameplate/digital-nameplate.component.ts
+++ b/projects/aas-lib/src/lib/digital-nameplate/digital-nameplate.component.ts
@@ -1,21 +1,22 @@
/******************************************************************************
*
- * Copyright (c) 2019-2023 Fraunhofer IOSB-INA Lemgo,
+ * Copyright (c) 2019-2024 Fraunhofer IOSB-INA Lemgo,
* eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
* zur Foerderung der angewandten Forschung e.V.
*
*****************************************************************************/
-import { Component, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core';
-import { TranslateService } from '@ngx-translate/core';
+import { ChangeDetectionStrategy, Component, OnChanges, SimpleChanges, input, signal } from '@angular/core';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
import {
aas,
convertToString,
getLocaleValue,
isMultiLanguageProperty,
isProperty,
- isSubmodelElementCollection
-} from 'common';
+ isSubmodelElementCollection,
+} from 'aas-core';
+
import { DocumentSubmodelPair, SubmodelTemplate } from '../submodel-template/submodel-template';
export interface DigitalNameplate {
@@ -32,16 +33,17 @@ export interface DigitalNameplate {
@Component({
selector: 'fhg-digital-nameplate',
templateUrl: './digital-nameplate.component.html',
- styleUrls: ['./digital-nameplate.component.scss']
+ styleUrls: ['./digital-nameplate.component.scss'],
+ standalone: true,
+ imports: [TranslateModule],
+ changeDetection: ChangeDetectionStrategy.OnPush,
})
export class DigitalNameplateComponent implements SubmodelTemplate, OnChanges {
+ public constructor(private readonly translate: TranslateService) {}
- constructor(private readonly translate: TranslateService) { }
-
- @Input()
- public submodels: DocumentSubmodelPair[] | null = null;
+ public readonly submodels = input
-
- {{nameplate.serialNumber}}
-
-
- {{nameplate.productCountryOfOrigin}}-{{nameplate.yearOfConstruction}}
-
+
+ {{nameplate.serialNumber}}
+
+
+ {{nameplate.productCountryOfOrigin}}-{{nameplate.yearOfConstruction}}
+
-
- {{nameplate.manufacturerName}}
-
+
+ {{nameplate.manufacturerName}}
+
-
- {{nameplate.street}}
-
+
+ {{nameplate.street}}
+
-
-
- {{nameplate.countryCode}}-{{nameplate.zip}} {{nameplate.cityTown}}
-
+
+ {{nameplate.countryCode}}-{{nameplate.zip}} {{nameplate.cityTown}}
+
| # | -COLUMN_PACKAGE | -COLUMN_VERSION | -COLUMN_LICENSE | -COLUMN_DESCRIPTION | -
|---|---|---|---|---|
| {{library.id}} | -
- {{library.name}}
- {{library.name}}
- |
- {{library.version}} | -{{library.license}} | -{{library.description}} | -
-
-
- |
-
-
+
\ No newline at end of file
diff --git a/projects/aas-lib/src/lib/library-table/library-table.component.scss b/projects/aas-lib/src/lib/license-info/license-info.component.scss
similarity index 82%
rename from projects/aas-lib/src/lib/library-table/library-table.component.scss
rename to projects/aas-lib/src/lib/license-info/license-info.component.scss
index c57d4b61..3caf3822 100644
--- a/projects/aas-lib/src/lib/library-table/library-table.component.scss
+++ b/projects/aas-lib/src/lib/license-info/license-info.component.scss
@@ -1,7 +1,7 @@
-/******************************************************************************
- *
- * Copyright (c) 2019-2022 Fraunhofer IOSB-INA Lemgo,
- * eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
- * zur Foerderung der angewandten Forschung e.V.
- *
- *****************************************************************************/
+/******************************************************************************
+ *
+ * Copyright (c) 2019-2024 Fraunhofer IOSB-INA Lemgo,
+ * eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
+ * zur Foerderung der angewandten Forschung e.V.
+ *
+ *****************************************************************************/
diff --git a/projects/aas-lib/src/lib/license-info/license-info.component.ts b/projects/aas-lib/src/lib/license-info/license-info.component.ts
new file mode 100644
index 00000000..617dc3f5
--- /dev/null
+++ b/projects/aas-lib/src/lib/license-info/license-info.component.ts
@@ -0,0 +1,64 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019-2024 Fraunhofer IOSB-INA Lemgo,
+ * eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
+ * zur Foerderung der angewandten Forschung e.V.
+ *
+ *****************************************************************************/
+
+import { ChangeDetectionStrategy, Component, computed, input, signal } from '@angular/core';
+import { NgbCollapseModule, NgbPagination } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { Library } from 'aas-core';
+
+@Component({
+ selector: 'fhg-license-info',
+ templateUrl: './license-info.component.html',
+ styleUrls: ['./license-info.component.scss'],
+ standalone: true,
+ imports: [NgbPagination, NgbCollapseModule, TranslateModule],
+ changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class LicenseInfoComponent {
+ public readonly libraries = input{{text()}}
+
-
+
+ @if(document()) {
+
-
-
-
-
LABEL_ENDPOINT
+ LABEL_ADDRESS
LABEL_AAS_ID_SHORT
LABEL_AAS_ID
LABEL_VERSION
LABEL_ASSET_ID
-
{{endpoint}}
- {{idShort}}
- {{id}}
- {{version}}
- {{assetId}}
+ {{address()}}
+ {{idShort()}}
+ {{id()}}
+ {{version()}}
+ {{assetId()}}
-
+ }
+
+
-