Merge pull request #4 from SoftwareAG/Dev

2.1 release

frontend/cumulocity-amber-boonlogic/package.json

@@ -1,6 +1,6 @@
 {
  "name": "cumulocity-amber-boonlogic",
- "version": "2.0.1",
+ "version": "2.0.2",
  "description": "This is the Cumulocity module federation plugin which used to configure/reconfigure/delete/start - stop stream any device with Amber and is designed to display device model and streaming status on real time basis.",
  "scripts": {
  "start": "c8ycli server",

frontend/cumulocity-amber-boonlogic/widget/boonlogic-widget/gp-boonlogic.component.css

@@ -23,9 +23,10 @@
  width: 20px;
  background-color: #bbb;
  border-radius: 50%;
- display: inline-block;
+ display: inline-block !important;
 }
 
+
 .boonlogictable {
  background-color: var(--component-background, #fff);
 }

frontend/cumulocity-amber-boonlogic/widget/boonlogic-widget/gp-boonlogic.component.html

@@ -193,7 +193,7 @@ <h4 class="m-l-24 p-t-8 text-truncate" translate="">Device Configuration</h4>
  class="modal"
  tabindex="-1"
  role="dialog"
- [ngStyle]="{ display: displayDeRegisterStyle }"
+ [ngStyle]="{ display:displayDeRegisterStyle }"
  >
  >
 
@@ -291,21 +291,22 @@ <h3 class="m-b-16">
  <td>
  <button
  class="editbtn btn btn-icon btn-xs btn-default"
- [disabled]="device.isStreaming === 'true' || statusResponse != 'READY'"
- title="Edit"
+ [enable]="device.isStreaming === 'false' || statusResponse != 'READY'"
+ title="View"
  >
  <i
- c8yicon="pencil"
- class="dlt-c8y-icon-pencil"
+ c8yicon="eye"
+ class="dlt-c8y-icon-eye"
  (click)="editModal(edittemplate, i)"
  ></i>
  </button>
  <ng-template #edittemplate>
  <div class="modal-header">
  <h4 class="modal-title text-normal text-center" translate="">
- Update Device Configuration
+ View Device Configuration
  </h4>
  </div>
+
  <div
  class="modal-body d-grid grid__col--4-4--md"
  style="margin-top: 10px; margin-bottom: 5px; margin-left: 24px; margin-right: 24px"
@@ -316,7 +317,7 @@ <h4 class="modal-title text-normal text-center" translate="">
  >Select Measurement</label
  >
  <div class="form-group">
- <ng-select
+ <ng-select 
  required
  [items]="measurementTypeList"
  bindLabel="description"
@@ -330,8 +331,8 @@ <h4 class="modal-title text-normal text-center" translate="">
  [(ngModel)]="selectedMeasurements"
  formControlName="devicemeasure"
  (change)="invokeUpdateSetValue()"
- >
-  </ng-select>
+  [readonly]="true" >
+ </ng-select>
  </div>
  </div>
  <div bg-gray-white card-block large-padding>
@@ -348,7 +349,7 @@ <h4 class="modal-title text-normal text-center" translate="">
  class="dlt-c8y-icon-question-circle"
  ></i
  ></label>
- <input
+ <input 
  formControlName="streamingWindowSize"
  type="number"
  min="1"
@@ -357,7 +358,7 @@ <h4 class="modal-title text-normal text-center" translate="">
  [(ngModel)]="streamingWindowSize"
  class="form-control"
  placeholder="e.g. 25"
- />
+  readonly/>
  </div>
  </div>
  <div class="col-sm-5 col-xs-6">
@@ -380,7 +381,7 @@ <h4 class="modal-title text-normal text-center" translate="">
  [(ngModel)]="samplesToBuffer"
  class="form-control"
  placeholder="e.g. 5000"
- />
+  readonly />
  </div>
  </div>
  <div class="col-sm-5 col-xs-6">
@@ -403,7 +404,7 @@ <h4 class="modal-title text-normal text-center" translate="">
  [(ngModel)]="learningRateNumerator"
  class="form-control"
  placeholder="e.g. 10"
- />
+  readonly />
  </div>
  </div>
  <div class="col-sm-5 col-xs-6">
@@ -426,7 +427,7 @@ <h4 class="modal-title text-normal text-center" translate="">
  [(ngModel)]="learningRateDenominator"
  class="form-control"
  placeholder="e.g. 10000"
- />
+  readonly />
  </div>
  </div>
  <div class="col-sm-5 col-xs-6">
@@ -449,7 +450,7 @@ <h4 class="modal-title text-normal text-center" translate="">
  [(ngModel)]="learningMaxSamples"
  class="form-control"
  placeholder="e.g. 10000"
- />
+  readonly />
  </div>
  </div>
  <div class="col-sm-5 col-xs-6">
@@ -472,7 +473,7 @@ <h4 class="modal-title text-normal text-center" translate="">
  [(ngModel)]="anomalyHistoryWindow"
  class="form-control"
  placeholder="e.g. 1000"
- />
+  readonly/>
  </div>
  </div>
  </div>
@@ -487,17 +488,17 @@ <h4 class="modal-title text-normal text-center" translate="">
  (click)="closeUpdateSensor()"
  translate=""
  >
- Cancel
- </button>
- <button
- type="button"
- [disabled]="!selectedMeasurements"
- class="btn btn-primary"
- (click)="updateSensor()"
- translate=""
- >
- Submit
- </button>
+ OK
+  </button>
+  <!-- <button
+  type="button"
+  [disabled]="!selectedMeasurements"
+  class="btn btn-primary"
+  (click)="updateSensor()"
+  translate=""
+  >
+  Submit
+  </button> -->
  </div>
  </div>
  </ng-template>
@@ -610,6 +611,7 @@ <h4 class="modal-title text-normal text-center" translate="">Configure Device</h
  placeholder="Search Device"
  type="search"
  formControlName="devicename"
+ (change)="invokeParentDevice($event)"
  />
  <span class="input-group-addon" style="margin-right: 20px">
  <i c8yIcon="search" *ngIf="!value || value.length === 0"></i>
@@ -624,6 +626,37 @@ <h4 class="modal-title text-normal text-center" translate="">Configure Device</h
  <i class="fa fa-circle-o-notch fa-spin"></i>
  </div>
  </div>
+ <div class="input-group form-group" *ngIf="this.childDevicesLength > 0">
+ <div class="row col-sm-12">
+ <div class="btn-group device-list-switch-toggle ">
+ <label class="c8y-switch ">
+ <input type="checkbox" (change)="onCheckboxChange($event)" [checked]="includeChildDevice">
+ <span></span> <label translate="">Include child Devices</label>
+ </label>
+ </div>
+ </div>
+ </div>
+ <div *ngIf="includeChildDevice && this.childDevicesLength > 0">
+ <label translate="">Select child devices</label>
+ <div class="form-group">
+ <ng-select
+ formControlName="childDevices_"
+ required
+ [items]="childDevices"
+ bindLabel="managedObject.name"
+ bindValue="managedObject.id"
+ name="childDeviceSelect"
+ required
+ [multiple]="true"
+ [closeOnSelect]="false"
+ [searchable]="true"
+ placeholder="Select Child Devices"
+ [(ngModel)]="selectedChildDevices"
+ (change)="invokeChildDevices($event)"
+ >
+ </ng-select>
+ </div>
+ </div>
  <label style="padding-top: 5px" for="Measurements" translate="">Select Measurement</label>
  <div class="form-group">
  <ng-select