update screenshots

dynamic-mapping-ui/package.json

@@ -29,11 +29,11 @@
     "@angular/platform-server": "^18.2.0",
     "@angular/router": "^18.2.0",
     "@angular/upgrade": "^18.2.0",
-    "@c8y/bootstrap": "^1021.0.11",
-    "@c8y/client": "^1021.0.11",
-    "@c8y/ngx-components": "^1021.0.11",
-    "@c8y/package-blueprint": "^1021.0.11",
-    "@c8y/style": "^1021.0.11",
+    "@c8y/bootstrap": "^1021.22.0",
+    "@c8y/client": "^1021.22.0",
+    "@c8y/ngx-components": "^1021.22.0",
+    "@c8y/package-blueprint": "^1021.22.0",
+    "@c8y/style": "^1021.22.0",
     "@ngx-translate/core": "15.0.0",
     "echarts": "^5.5.1",
     "jsonata": "^2.0.3",
@@ -53,8 +53,8 @@
     "@angular/language-service": "^18.2.2",
     "@angular/localize": "^18.2.0",
     "@angular/service-worker": "^18.2.0",
-    "@c8y/devkit": "^1021.0.11",
-    "@c8y/options": "^1021.0.11",
+    "@c8y/devkit": "^1021.22.0",
+    "@c8y/options": "^1021.22.0",
     "@typescript-eslint/eslint-plugin": "^7.17.0",
     "cumulocity-cypress": "^0.4.6",
     "cypress": "^13.13.3",

dynamic-mapping-ui/src/connector/connector-configuration.component.html

@@ -46,16 +46,11 @@
   ></c8y-breadcrumb-item>
 </c8y-breadcrumb>
 
-<div class="card content-fullpage d-grid grid__row--6-6--md">
+<div class="card content-fullpage d-grid">
   <div class="card card--grid card--grid__inner-scroll">
     <div class="p-l-16 p-r-16">
       <d11r-mapping-connector-configuration #connectorConfigurationBroker
         [selectable]="false"></d11r-mapping-connector-configuration>
     </div>
   </div>
-  <!-- <div class="card card--grid card--grid__inner-scroll">
-    <div class="p-l-16 p-r-16">
-      <d11r-mapping-connector-log></d11r-mapping-connector-log>
-    </div>
-  </div> -->
 </div>

dynamic-mapping-ui/src/mapping/grid/mapping.component.html

@@ -44,7 +44,7 @@
 </c8y-action-bar-item>
 <div class="card">
   <div class="card-block content-fullpage border-top border-bottom">
-    <c8y-data-grid #mappingGrid [title]="'Mappings' | translate" [selectable]="true" [columns]="columnsMappings"
+    <c8y-data-grid #mappingGrid [configureColumnsEnabled]="false" [title]="'Mappings' | translate" [selectable]="true" [columns]="columnsMappings"
       [bulkActionControls]="bulkActionControls" [rows]="mappingsEnriched$ | async" [pagination]="pagination"
       [actionControls]="actionControls">
       <c8y-ui-empty-state [icon]="'c8y-icon dlt-c8y-icon-rules'" [title]="'No mappings exist.' | translate" [subtitle]="

dynamic-mapping-ui/src/mapping/subscription/subscription.component.html

@@ -32,7 +32,7 @@
     subscription?.devices
   ">
   <div class="card-block content-fullpage border-top border-bottom">
-    <c8y-data-grid #subscriptionGrid [selectable]="true" [title]="titleSubscription | translate"
+    <c8y-data-grid #subscriptionGrid [selectable]="true" [configureColumnsEnabled]="false" [title]="titleSubscription | translate"
       [columns]="columnsSubscriptions" [rows]="subscription?.devices" [pagination]="pagination"
       [actionControls]="actionControlSubscription" [bulkActionControls]="bulkActionControlSubscription">
       <c8y-ui-empty-state [icon]="'c8y-icon dlt-c8y-icon-mail'"

dynamic-mapping-ui/src/monitoring/event/mapping-service-event.component.html

@@ -21,38 +21,40 @@
 
 <c8y-title translate>Monitoring</c8y-title>
 <c8y-action-bar-item [placement]="'left'" itemClass="navbar-form hidden-xs">
-  <div class="form-group">
-    <label class="m-r-8" id="listLabel">
-      {{ 'Filter' | translate }}
-    </label>
-    <div class="c8y-select-wrapper">
-      <select class="form-control" style="width: 280px" [(ngModel)]="filterMappingServiceEvent.type"
-        (ngModelChange)="onFilterMappingServiceEventSelect($event)" name="type">
-        <ng-container *ngFor="let lt of LoggingEventTypeMap | keyvalue">
-          <option [ngValue]="lt.key">
-            {{ lt.key | formatStringAsWords:1 }}
-          </option>
-        </ng-container>
-      </select>
-      <span></span>
+  <c8y-form-group class="p-l-12">
+    <div class="d-flex">
+      <label class="m-r-8" id="listLabel">
+        {{ 'Filter' | translate }}
+      </label>
+      <div class="c8y-select-wrapper">
+        <select class="form-control" style="width: 280px" [(ngModel)]="filterMappingServiceEvent.type"
+          (ngModelChange)="onFilterMappingServiceEventSelect($event)" name="type">
+          <ng-container *ngFor="let lt of LoggingEventTypeMap | keyvalue">
+            <option [ngValue]="lt.key">
+              {{ lt.key | formatStringAsWords:1 }}
+            </option>
+          </ng-container>
+        </select>
+        <span></span>
+      </div>
     </div>
-  </div>
-  <div class="form-group datepicker">
-    <c8y-form-group>
+  </c8y-form-group>
+  <c8y-form-group>
+    <div class="d-flex">
       <label [for]="'fromPicker'" class="control-label">
         {{ 'From' | translate }}
       </label>
       <input [name]="'fromPicker'" [id]="'fromPicker'" [(ngModel)]="filterMappingServiceEvent.dateFrom"
         (ngModelChange)="onDateFromChange($event)" class="form-control" [attr.aria-label]="'Date from' | translate"
-        placeholder="{{ 'Date from' | translate }}" [bsConfig]="{ 
-          dateInputFormat: 'YYYY-MM-DD',
-          customTodayClass: 'today', 
-          adaptivePosition: true 
-        }" bsDatepicker />
-    </c8y-form-group>
-  </div>
-  <div class="form-group datepicker">
-    <c8y-form-group>
+        placeholder="{{ 'Date from' | translate }}" [bsConfig]="{
+            dateInputFormat: 'YYYY-MM-DD',
+            customTodayClass: 'today',
+            adaptivePosition: true
+          }" bsDatepicker />
+    </div>
+  </c8y-form-group>
+  <c8y-form-group>
+    <div class="d-flex">
       <label [for]="'toPicker'" class="control-label">
         {{ 'To' | translate }}
       </label>
@@ -63,8 +65,8 @@
           customTodayClass: 'today', 
           adaptivePosition: true 
         }" bsDatepicker />
-    </c8y-form-group>
-  </div>
+    </div>
+  </c8y-form-group>
 </c8y-action-bar-item>
 
 <div class="card-header large-padding separator sticky-top">
@@ -114,8 +116,8 @@
         </div>
       </c8y-li-body>
       <c8y-li-collapse>
-       <small>{{event | filterJson:['self', 'source', 'creationTime', 'lastUpdated']:true |  json}}</small> 
+        <small>{{event | filterJson:['self', 'source', 'creationTime', 'lastUpdated']:true | json}}</small>
       </c8y-li-collapse>
     </c8y-li>
   </c8y-li-timeline>
-</c8y-list-group>
+</c8y-list-group>

dynamic-mapping-ui/src/monitoring/grid/monitoring.component.html

@@ -21,33 +21,20 @@
 
 <c8y-title translate>Monitoring</c8y-title>
 <c8y-action-bar-item [placement]="'right'">
-	<button
-    class="btn btn-link"
-    title="{{ 'Reset monitoring' | translate }}"
-    (click)="resetStatusMapping()"
-  >
+  <button class="btn btn-link" title="{{ 'Reset monitoring' | translate }}" (click)="resetStatusMapping()">
     <i c8yIcon="reset"></i>
     {{ 'Reset monitoring' | translate }}
   </button>
-  <button
-    class="btn btn-link"
-    title="{{ 'Refresh' | translate }}"
-    (click)="refreshMappingStatus()"
-  >
+  <button class="btn btn-link" title="{{ 'Refresh' | translate }}" (click)="refreshMappingStatus()">
     <i c8yIcon="refresh"></i>
     {{ 'Refresh' | translate }}
   </button>
 </c8y-action-bar-item>
 <div class="card">
   <!-- <div class="card-block" style="max-height: 400px; overflow: auto"> -->
   <div class="card-block">
-    <c8y-data-grid
-      [title]="'Mapping monitoring' | translate"
-      [columns]="columns"
-      [rows]="mappingStatus$ | async"
-      [pagination]="pagination"
-      [actionControls]="actionControls"
-    >
+    <c8y-data-grid [configureColumnsEnabled]="false" [title]="'Mapping monitoring' | translate" [columns]="columns"
+      [rows]="mappingStatus$ | async" [pagination]="pagination" [actionControls]="actionControls">
     </c8y-data-grid>
   </div>
 </div>

dynamic-mapping-ui/src/shared/connector-configuration/connector-grid.component.html

@@ -21,8 +21,8 @@
 
 <div class="">
   <c8y-data-grid class="content-fullpage" #connectorGrid [title]="'Connectors'" [selectable]="selectable && !readOnly"
-    [columns]="columns" [selectionPrimaryKey]="'identifier'" [rows]="configurations$ | async" [pagination]="pagination"
-    [actionControls]="actionControls" (itemsSelect)="onSelectionChanged($event)">
+    [columns]="columns" [selectionPrimaryKey]="'identifier'"[configureColumnsEnabled]="false" [rows]="configurations$ | async" [pagination]="pagination"
+    [actionControls]="actionControls" [showSearch]= "false" (itemsSelect)="onSelectionChanged($event)">
     <c8y-ui-empty-state [icon]="'c8y-icon dlt-c8y-icon-connected'" [title]="'No connectors exist.' | translate"
       [subtitle]="
   'Create your first connector.' | translate