Fix missing RegisterType

Author: volkmarnissen

src/app/select-slave/select-slave.component.html

@@ -47,8 +47,8 @@
 
                 <mat-select matInput formControlName="specificationid" (selectionChange)="onSpecificationChange(uislave)"
                   [compareWith]="compareSpecificationIdentification">
-                  <ng-container *ngIf="uislave.specsObservable|async  as identSpecs;else undetectedTemplate">
-                    <ng-container *ngFor="let i = index; let ispec of identSpecs">
+                  <ng-container *ngIf="uislave.specs;else undetectedTemplate">
+                    <ng-container *ngFor="let ispec of uislave.specs">
                     <mat-option [value]="ispec">
                       <mat-icon
                         [matTooltip]="statusTooltip(ispec?ispec.status:3)">{{statusIcon(ispec?ispec.status:3)}}</mat-icon>
@@ -59,7 +59,7 @@
                     </ng-container>
                   </ng-container>
                   <ng-template #undetectedTemplate >
-                    <ng-container *ngFor="let i = index; let ispec of preparedSpecs">
+                    <ng-container *ngFor="let ispec of preparedIdentSpecs">
                       <mat-option [value]="ispec">
                         <mat-icon
                           [matTooltip]="statusTooltip(ispec?ispec.status:3)">{{statusIcon(ispec?ispec.status:3)}}</mat-icon>

src/app/select-slave/select-slave.component.ts

@@ -80,7 +80,7 @@ import { isUndefined } from "cypress/types/lodash";
 interface IuiSlave {
   slave: Islave;
   label: string;
-  specsObservable?: Observable<IidentificationSpecification[]>;
+  specs?: IidentificationSpecification[];
   specification?: Ispecification;
   slaveForm: FormGroup;
   commandEntities?: ImodbusEntity[];
@@ -119,8 +119,7 @@ interface IuiSlave {
     MatExpansionPanelHeader,
     MatExpansionPanelTitle,
     MatInput,
-    MatError,
-    AsyncPipe,
+    MatError
   ],
 })
 export class SelectSlaveComponent extends SessionStorage implements OnInit {
@@ -177,26 +176,14 @@ export class SelectSlaveComponent extends SessionStorage implements OnInit {
       this.currentLanguage = getCurrentLanguage(navigator.language);
       this.entityApiService.getSpecifications().subscribe((specs) => {
         this.preparedSpecs = specs;
-        specs.forEach((spec) => {
-          let name = getSpecificationI18nName(spec, this.currentLanguage);
-
-          let entities: IidentEntity[] = spec.entities.map((e) => {
-            return {
-              id: e.id,
-              name: e.name,
-              readonly: e.readonly,
-              mqttname: e.mqttname,
-            };
-          });
-          if (name == undefined) name = "unknown";
-        });
       });
       this.paramsSubscription = this.route.params.subscribe((params) => {
         let busId = +params["busid"];
         this.entityApiService.getBus(busId).subscribe((bus) => {
           this.bus = bus;
           if (this.bus) {
             this.busname = getConnectionName(this.bus.connectionData);
+            this.getIdentSpecs(undefined).then((identSpecs)=>{this.preparedIdentSpecs = identSpecs})
             this.updateSlaves();
           }
         });
@@ -345,8 +332,8 @@ export class SelectSlaveComponent extends SessionStorage implements OnInit {
     );
     return rc
   }
-  getSpecsForConfiguredSlave(uiSlave:IuiSlave):Observable<IidentificationSpecification[]>{
-    let rc= new Subject<IidentificationSpecification[]>()
+  getIdentSpecs(uiSlave:IuiSlave| undefined ):Promise<IidentificationSpecification[]>{
+    return new Promise<IidentificationSpecification[]>((resolve, reject)=>{
     let fct = ( specModbus:ImodbusSpecification| undefined )=>{
       let rci:IidentificationSpecification[]=[]
       this.preparedSpecs.forEach(spec=>{
@@ -356,15 +343,14 @@ export class SelectSlaveComponent extends SessionStorage implements OnInit {
             identified: specModbus && spec.filename== specModbus.filename?specModbus.identified:IdentifiedStates.unknown,
             filename: spec.filename,
           } as IidentificationSpecification);
-        rc.next(rci)       
       })
+      resolve(rci)
     }
-    if( uiSlave.slave.specificationid )
+    if( uiSlave && uiSlave.slave.specificationid )
       this.entityApiService.getModbusSpecification(this.bus.busId,uiSlave.slave.slaveid,uiSlave.slave.specificationid, true).subscribe(fct)
     else
       fct(undefined )
-
-    return rc;
+    })
   }
   getUiSlave(slave: Islave, detectSpec: boolean | undefined): IuiSlave {
     let fg = this.initiateSlaveControl(slave, null);
@@ -373,8 +359,7 @@ export class SelectSlaveComponent extends SessionStorage implements OnInit {
       label: this.getSlaveName(slave),
       slaveForm: fg,
     } as any;
-    
-    rc.specsObservable = this.getSpecsForConfiguredSlave(rc) // getDetectedSpecs is disabled, because of performance issues
+    this.getIdentSpecs(rc).then((identSpecs)=>{rc.specs = identSpecs}).catch(e=>{ console.log(e.message)}) // getDetectedSpecs is disabled, because of performance issues
     this.addSpecificationToUiSlave(rc);
     (rc.selectedEntitites = this.getSelectedEntites(slave)),
       this.fillCommandTopics(rc);
@@ -592,10 +577,13 @@ export class SelectSlaveComponent extends SessionStorage implements OnInit {
           // Initialization of the UI
           // replacing this.uiSlaves with newUiSlaves will initialize and show it
           // Now, the new value needs to be marked as touched to enable cancel and save.
-          let specCtrl = newUiSlave.slaveForm.get("specificationid");
+          if( detectSpec){
+            let specCtrl = newUiSlave.slaveForm.get("specificationid");
+
+            if (specCtrl && specCtrl.value != undefined)
+              newUiSlave.slaveForm.markAllAsTouched();
 
-          if (specCtrl && specCtrl.value != undefined)
-            newUiSlave.slaveForm.markAllAsTouched();
+          }
         });
   }
   private static form2SlaveSetValue(uiSlave: IuiSlave, controlname: string) {

src/app/specification/entity/entity.component.ts

@@ -439,7 +439,7 @@ export class EntityComponent
       this.entityFormGroup.get("readonly")!.setValue(entity.readonly);
     }
 
-    this.entityFormGroup.get("registerType")!.setValue(entity.registerType);
+    this.entityFormGroup.get("registerType")!.setValue( { registerType: entity.registerType, name: "unknown"});
     converterFormControl.setValue(entity.converter);
     modbusAddressFormControl.setValue(
       entity.modbusAddress != undefined ? entity.modbusAddress : null,