Revize 773d3c89

Re #8791 - Odstranění sensor - endpoint

+ adding error catchup on requests
+ toast message upon request

src/app/app.component.ts

@@ -3 +3 @@
 
 @Component({
   selector: 'app-root',
-  template: `<router-outlet></router-outlet><p-toast position="bottom-center" key="mainToast"></p-toast>`
+  template: `<router-outlet></router-outlet><p-toast [baseZIndex]="20000" position="bottom-center" key="mainToast"></p-toast>`
 })
 export class AppComponent {
   title = 'SensLog';

src/app/dashboard/components/dashboard.component.html

@@ -14 +14 @@
           <div class="col-md-4">{{ unit.unit.description}}</div>
           <div class="col-md-8 text-right">
             <p-button label="Sensors graph" icon="pi pi-chart-line" [routerLink]="['/dashboard/unit', unit.unit.unitId]"></p-button>
-            <p-button label="Add sensor" icon="pi pi-cog" (onClick)="addSensor($event, unit.unit)"></p-button>
-            <p-button label="Edit unit" icon="pi pi-cog" (onClick)="editUnit($event, unit.unit)"></p-button>
+            <p-button label="Add sensor" icon="pi pi-cog" (onClick)="insertSensorPopup($event, unit.unit)"></p-button>
+            <p-button label="Edit unit" icon="pi pi-cog" (onClick)="editUnitPopup($event, unit.unit)"></p-button>
             <p-button label="Delete unit" icon="pi pi-cog" (onClick)="deleteUnit($event, unit.unit)"></p-button>
           </div>
         </div>

src/app/dashboard/components/dashboard.component.ts

@@ -6 +6 @@
 import {Sensor} from '../../shared/api/endpoints/models/sensor';
 import {Unit} from '../../shared/api/endpoints/models/unit';
 import {DataService} from '../../shared/api/endpoints/services/data.service';
-import {tap} from 'rxjs/operators';
 import {Phenomenon} from '../../shared/api/endpoints/models/phenomenon';
 import {SensorsService} from '../../shared/api/endpoints/services/sensors.service';
-import {ConfirmationService, ConfirmEventType, MessageService} from 'primeng/api';
+import {ConfirmationService, MessageService} from 'primeng/api';
 import {ManagementService} from '../../shared/api/endpoints/services/management.service';
 import {InsertUnit} from '../../shared/api/endpoints/models/insert-unit';
+import {ToastService} from '../../shared/services/toast.service';
+import {map} from 'rxjs/operators';
+import {HttpResponse} from '@angular/common/http';
 
 @Component({
   selector: 'app-dashboard',
@@ -34 +36 @@
     private sensorService: SensorsService,
     private confirmationService: ConfirmationService,
     private messageService: MessageService,
-    private managementService: ManagementService
+    private managementService: ManagementService,
+    private toastService: ToastService
   ) {
     this.sensorService.getPhenomenons().subscribe(
       response => this.phenomenons = response
@@ -46 +49 @@
   }
 
   getUnits() {
-    this.dataService.getData().pipe(
-      tap(data => {
-        this.units = data;
-        this.units.forEach(unit => unit.sensors.sort((a, b)  => a.sensorId - b.sensorId));
-      })
-    ).subscribe();
+    this.dataService.getData().subscribe(data => {
+      this.units = data;
+      this.units.forEach(unit => unit.sensors.sort((a, b)  => a.sensorId - b.sensorId));
+    }, err => this.toastService.showError(err.error.message));
   }
 
-  editUnit($event: MouseEvent, unit: Unit) {
+  editUnitPopup($event: MouseEvent, unit: Unit) {
     $event.stopPropagation();
     this.editedUnit = unit;
     this.showEditUnitPopup = true;
@@ -64 +65 @@
     this.showInsertUnitPopup = true;
   }
 
-  getEditedUnit(): Unit {
-    return this.editedUnit;
-  }
-
-  addSensor($event: any, unit: Unit) {
+  insertSensorPopup($event: any, unit: Unit) {
     $event.stopPropagation();
     this.showInsertSensorPopup = true;
     this.editedUnit = unit;
@@ -81 +78 @@
       header: 'Delete Unit Confirmation',
       icon: 'pi pi-info-circle',
       accept: () => {
-        console.log('ACCEPTED');
         // TODO this.processUnitDeletion(unit);
-        // this.messageService.add({severity:'info', summary:'Confirmed', detail:'Record deleted'});
       },
       reject: () => {
-        console.log('REJECTED');
+        this.toastService.operationRejected();
       },
       key: 'positionDialog'
     });
   }
 
   processUnitDeletion(insertUnit: InsertUnit) {
-    this.managementService.deleteUnit({body: {unit: insertUnit}});
+    this.managementService.deleteUnit$Response({body: {unit: insertUnit}}).pipe(
+      map((response: HttpResponse<any>) => {
+        if (response.status === 200) {
+          this.toastService.showSuccessMessage(response.body.message);
+        } else {
+        }
+      })
+    ).toPromise().then().catch(err => this.toastService.showError(err.error.message));
   }
 }

src/app/dashboard/components/sensors/sensors.component.ts

@@ -1 +1 @@
 import {Component, Input, OnInit} from '@angular/core';
 import {Sensor} from '../../../shared/api/endpoints/models/sensor';
 import {ConfirmationService} from 'primeng/api';
-import {InsertUnit} from '../../../shared/api/endpoints/models/insert-unit';
 import {ManagementService} from '../../../shared/api/endpoints/services/management.service';
+import {map} from 'rxjs/operators';
+import {HttpResponse} from '@angular/common/http';
+import {ToastService} from '../../../shared/services/toast.service';
 
 @Component({
   selector: 'app-sensors',
@@ -18 +20 @@
   editedSensor: Sensor;
   constructor(
     private confirmationService: ConfirmationService,
-    private managementService: ManagementService
+    private managementService: ManagementService,
+    private toastService: ToastService
   ) { }
 
   ngOnInit(): void {
@@ -38 +41 @@
       accept: () => {
         console.log('ACCEPTED');
         // TODO this.processSensorDeletion(sensor);
-        // this.messageService.add({severity:'info', summary:'Confirmed', detail:'Record deleted'});
       },
       reject: () => {
         console.log('REJECTED');
@@ -48 +50 @@
   }
 
   processSensorDeletion(sensor: Sensor) {
-    this.managementService.deleteSensor({body: {
+    this.managementService.deleteSensor$Response({body: {
       unit: {
         unit_id: this.unitId
       },
@@ -57 +59 @@
             sensor_id: sensor.sensorId
           }
         ]
-      }});
+      }}).pipe(
+      map((response: HttpResponse<any>) => {
+        if (response.status === 200) {
+          this.toastService.showSuccessMessage(response.body.message);
+        } else {
+        }
+      })
+    ).toPromise().then().catch(err => this.toastService.showError(err.error.message));
   }
 }