ing

@overflow/member/service/member-totp.service.ts

@@ -26,7 +26,7 @@ export class MemberTotpService {
     return this.rpcService.call<boolean>('MemberTotpService.regist', member, secretCode, code);
   }
 
-  public checkCodeForMember(member: Member, code: string): Observable<boolean> {
+  public checkCodeForMember(memberEmail: string, code: string): Observable<boolean> {
-    return this.rpcService.call<boolean>('MemberTotpService.checkCodeForMember', member, code);
+    return this.rpcService.call<boolean>('MemberTotpService.checkCodeForMember', memberEmail, code);
   }
 }

@overflow/meta/component/meta-crawler-input-item.component.ts

@@ -65,7 +65,7 @@ export class MetaCrawlerInputItemComponent implements OnInit, OnChanges {
     //   this.inputItems.push(item);
     // }
 
-    this.metaCrawlerInputItemService.readAllByMetaCrawler(this.metaCrawler)
+    this.metaCrawlerInputItemService.readAllByMetaCrawlerID(this.metaCrawler.id)
       .pipe(
         tap(() => {
           this.pending$ = of(true);

@overflow/meta/service/meta-crawler-input-item.service.ts

@@ -14,7 +14,7 @@ export class MetaCrawlerInputItemService {
 
   }
 
-  public readAllByMetaCrawler(c: MetaCrawler): Observable<MetaCrawlerInputItem[]> {
+  public readAllByMetaCrawlerID(metaCrawlerID: number): Observable<MetaCrawlerInputItem[]> {
-    return this.rpcService.call('MetaCrawlerInputItemService.readAllByMetaCrawler', c);
+    return this.rpcService.call('MetaCrawlerInputItemService.readAllByMetaCrawlerID', metaCrawlerID);
   }
 }

@overflow/meta/service/meta-infra-vendor.service.ts

@@ -12,7 +12,7 @@ export class MetaInfraVendorService {
 
   }
 
-  public readAllByMetaInfraType(infraType: MetaInfraType): Observable<MetaInfraVendor[]> {
+  public readAllByMetaInfraTypeID(metaInfraTypeID: number): Observable<MetaInfraVendor[]> {
-    return this.rpcService.call('MetaInfraVendorService.readAllByMetaInfraType', infraType);
+    return this.rpcService.call('MetaInfraVendorService.readAllByMetaInfraTypeID', metaInfraTypeID);
   }
 }

@overflow/meta/service/meta-probe-package.service.ts

@@ -12,7 +12,7 @@ export class MetaProbePackageService {
 
   }
 
-  public readAllByOs(metaProbeOs: MetaProbeOs): Observable<MetaProbePackage[]> {
+  public readAllByMetaProbeOsID(metaProbeOsID: number): Observable<MetaProbePackage[]> {
-    return this.rpcService.call('MetaProbePackageService.readAllByOs', metaProbeOs);
+    return this.rpcService.call('MetaProbePackageService.readAllByMetaProbeOsID', metaProbeOsID);
   }
 }

@overflow/meta/service/meta-sensor-display-item.service.ts

@@ -17,7 +17,7 @@ export class MetaSensorDisplayItemService {
 
   }
 
-  public readAllByCrawler(c: MetaCrawler): Observable<MetaSensorDisplayItem[]> {
+  public readAllByCrawlerID(metaCrawlerID: number): Observable<MetaSensorDisplayItem[]> {
-    return this.rpcService.call('MetaSensorDisplayItemService.readAllByCrawler', c);
+    return this.rpcService.call('MetaSensorDisplayItemService.readAllByCrawler', metaCrawlerID);
   }
 }

@overflow/meta/service/meta-sensor-display-mapping.service.ts

@@ -12,7 +12,7 @@ export class MetaSensorDisplayMappingService {
 
   }
 
-  public readAllMetaSensorItemKeyByDisplayItem(displayItem: MetaSensorDisplayItem): Observable<MetaSensorItemKey[]> {
+  public readAllMetaSensorItemKeyByDisplayItemID(metaSensorDisplayItemID: number): Observable<MetaSensorItemKey[]> {
-    return this.rpcService.call('MetaSensorDisplayMappingService.readAllMetaSensorItemKeyByDisplayItem', displayItem);
+    return this.rpcService.call('MetaSensorDisplayMappingService.readAllMetaSensorItemKeyByDisplayItemID', metaSensorDisplayItemID);
   }
 }

@overflow/meta/service/meta-sensor-item-key.service.ts

@@ -12,10 +12,10 @@ export class MetaSensorItemKeyService {
 
   }
 
-  public readAllByCrawler(metaCrawler: MetaCrawler): Observable<MetaSensorItemKey[]> {
+  public readAllByMetaCrawlerID(metaCrawlerID: number): Observable<MetaSensorItemKey[]> {
-    return this.rpcService.call('MetaSensorItemKeyService.readAllByCrawler', metaCrawler);
+    return this.rpcService.call('MetaSensorItemKeyService.readAllByMetaCrawlerID', metaCrawlerID);
   }
-  public readAllMapByCrawler(metaCrawler: MetaCrawler): Observable<Map<number, MetaSensorItemKey>> {
+  public readAllMapByMetaCrawlerID(metaCrawlerID: number): Observable<Map<number, MetaSensorItemKey>> {
-    return this.rpcService.call('MetaSensorItemKeyService.readAllMapByCrawler', metaCrawler);
+    return this.rpcService.call('MetaSensorItemKeyService.readAllMapByMetaCrawlerID', metaCrawlerID);
   }
 }

@overflow/meta/service/meta-vendor-crawler.service.ts

@@ -12,7 +12,7 @@ export class MetaVendorCrawlerService {
 
   }
 
-  public readAllByInfraVendor(infraVendor: MetaInfraVendor): Observable<MetaVendorCrawler[]> {
+  public readAllByMetaInfraVendorID(metaInfraVendorID: number): Observable<MetaVendorCrawler[]> {
-    return this.rpcService.call('MetaVendorCrawlerService.readAllByInfraVendor', infraVendor);
+    return this.rpcService.call('MetaVendorCrawlerService.readAllByMetaInfraVendorID', metaInfraVendorID);
   }
 }

@overflow/notification/service/notification.service.ts

@@ -17,16 +17,16 @@ export class NotificationService {
 
   }
 
-  public readAllByMember(member: Member, pageParams: PageParams): Observable<Page<Notification>> {
+  public readAllByMemberEmail(memberEmail: string, pageParams: PageParams): Observable<Page<Notification>> {
-    return this.rpcService.call('NotificationService.readAllByMember', member, pageParams);
+    return this.rpcService.call('NotificationService.readAllByMemberEmail', memberEmail, pageParams);
   }
 
-  public markAllAsRead(member: Member, pageParams: PageParams): Observable<Page<Notification>> {
+  public markAllAsReadByMemberEmail(memberEmail: string, pageParams: PageParams): Observable<Page<Notification>> {
-    return this.rpcService.call('NotificationService.markAllAsRead',  member, pageParams);
+    return this.rpcService.call('NotificationService.markAllAsReadByMemberEmail',  memberEmail, pageParams);
   }
 
-  public markAsRead(notification: Notification): Observable<Notification> {
+  public markAsRead(notificationID: number): Observable<Notification> {
-    return this.rpcService.call('NotificationService.markAsRead', notification);
+    return this.rpcService.call('NotificationService.markAsRead', notificationID);
   }
 
 }

@overflow/notification/store/entity/notification/notification.effect.ts

@@ -37,7 +37,7 @@ export class Effects {
     map((action: ReadAllByMember) => action.payload),
     exhaustMap(payload =>
       this.notificationService
-        .readAllByMember(payload.member, payload.pageParams)
+        .readAllByMemberEmail(payload.member.email, payload.pageParams)
         .pipe(
           map(page => {
             return new ReadAllByMemberSuccess(page);
@@ -53,7 +53,7 @@ export class Effects {
     map((action: MarkAllAsRead) => action.payload),
     exhaustMap(payload =>
       this.notificationService
-        .markAllAsRead(payload.member, payload.pageParams)
+        .markAllAsReadByMemberEmail(payload.member.email, payload.pageParams)
         .pipe(
           map(page => {
             return new MarkAllAsReadSuccess(page);

@overflow/probe/component/probe-detail.component.html

@@ -3,7 +3,7 @@
 
 <p-panel *ngIf="probeHost" #content [showHeader]="false" class="block-panel">
   <of-probe-general [probe]="probeHost.probe" (modified)="modifiedGeneral($event)"></of-probe-general>
-  <of-probe-host [infraHost]="probeHost.host"></of-probe-host>
+  <of-probe-host [infraHost]="probeHost.infraHost"></of-probe-host>
 
   <div class="ui-g" dir="rtl">
     <button class="ui-button-danger ui-button-width-fit" [disabled]="true" type="button" label="Remove this Probe" icon="ui-icon-close" pButton

@overflow/probe/component/probe-host.component.html

@@ -31,7 +31,7 @@
             </div>
 
             <div class="ui-g-12 ui-md-6 ui-key-value">
-              <of-key-value [key]="'OS'" [value]="infraHost.os.vendor.name"></of-key-value>
+              <of-key-value [key]="'OS'" [value]="infraHost.infraOS.metaInfraVendor.name"></of-key-value>
             </div>
           </div>
         </div>

@overflow/probe/component/probe-list.component.html

@@ -20,8 +20,8 @@
       <tr [pSelectableRow]="probeHost">
         <td>{{probeHost.probe.displayName}}</td>
         <td>{{getUptime(probeHost.probe)}}</td>
-        <td>{{probeHost.host.ipv4}}</td>
+        <td>{{probeHost.infraHost.ipv4}}</td>
-        <td>{{probeHost.host.os.vendor.name}}</td>
+        <td>{{probeHost.infraHost.infraOS.metaInfraVendor.name}}</td>
         <td>{{probeHost.probe.cidr}}</td>
         <td>{{probeHost.probe.targetCount}}</td>
         <td>{{probeHost.probe.authorizeDate | date: 'dd.MM.yyyy'}}</td>