add counter for substitutions

Author: ck-c8y

dynamic-mapper-service/src/main/java/dynamic/mapper/core/ConfigurationRegistry.java

@@ -58,8 +58,6 @@
 import dynamic.mapper.model.DeviceToClientMapRepresentation;
 import dynamic.mapper.model.Direction;
 import dynamic.mapper.model.Mapping;
-import dynamic.mapper.model.MappingStatus;
-import dynamic.mapper.model.MappingTreeNode;
 import dynamic.mapper.model.MapperServiceRepresentation;
 import dynamic.mapper.notification.NotificationSubscriber;
 import dynamic.mapper.processor.extension.ExtensibleProcessorInbound;
@@ -69,7 +67,6 @@
 import dynamic.mapper.processor.inbound.HexProcessorInbound;
 import dynamic.mapper.processor.inbound.JSONProcessorInbound;
 import dynamic.mapper.processor.model.MappingType;
-import dynamic.mapper.processor.model.ProcessingContext;
 import dynamic.mapper.processor.outbound.BaseProcessorOutbound;
 import dynamic.mapper.processor.outbound.CodeBasedProcessorOutbound;
 import dynamic.mapper.processor.outbound.DispatcherOutbound;
@@ -119,11 +116,10 @@ public class ConfigurationRegistry {
     // Structure: < Tenant, < ExtensibleProcessorSource > >
     private Map<String, ExtensibleProcessorInbound> extensibleProcessors = new ConcurrentHashMap<>();
 
-    // TODO persist cache as DeviceToClientRepresentation
     // Structure: < Tenant, < Device, Client > >
     private Map<String, Map<String, String>> deviceToClientPerTenant = new ConcurrentHashMap<>();
 
-    // Structure: < Tenant , ID Map >
+    // Structure: < Tenant, Id ManagedObject Map >
     private Map<String, String> deviceToClientMapRepresentations = new ConcurrentHashMap<>();
 
     @Getter

dynamic-mapper-ui/src/mapping/step-property/mapping-properties.component.html

@@ -22,7 +22,7 @@
   <div class="d-flex">
     <div class="col-lg-6 col-lg-offset-3">
       <h4 class="text-medium text-center">
-        General settings for {{ mapping.mappingType }} mapping
+        General settings for {{ mapping.mappingType | formatStringAsWords }} mapping
         <span *ngIf="stepperConfiguration.editorMode === EditorMode.READ_ONLY" class="label label-primary">{{ 'Read
           Only'
           }}</span>

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

@@ -23,10 +23,11 @@
   <table class="table table-condensed m-b-0">
     <thead style="position: sticky; top: 0; z-index: 10; background-color: white;">
       <tr>
-        <th class="bg-level-1"></th>
+        <th class="bg-level-1" style="width: 2%"></th>
+        <th class="bg-level-1" style="width: 2%">#</th>
         <th class="bg-level-1" style="width: 67%">
           <div class="d-flex">
-            Substitution [ pathSource &#8212;> pathTarget ]
+            Substitutions [ pathSource &#8212;> pathTarget ] selected {{settings.selectedSubstitutionIndex}} of # {{mapping.substitutions?.length}} 
             <button class="btn-help btn-help--sm" [attr.aria-label]="'Help' | translate" popover="{{
       substitutionTemplateHelp
     }}" placement="bottom" triggers="focus" type="button"></button>
@@ -39,17 +40,20 @@
     </thead>
   </table>
 
-  <div style="max-height: 160px; overflow-y: auto; border-top: 0px solid #ddd;">
+  <div style="max-height: 160px; overflow-y: scroll; border-top: 0px solid #ddd;">
     <table class="table table-condensed" style="margin-bottom: 0;">
       <tbody>
         <tr *ngFor="let sub of mapping.substitutions; let i = index" id="{{ 'sub-' + id + '-' + i }}">
-          <td width="4%">
+          <td width="2%">
             <label class="c8y-radio" title="Checkbox">
               <input type="radio" (click)="onSubstitutionSelect(i)"
                 [checked]="settings.selectedSubstitutionIndex == i" />
               <span></span>
             </label>
           </td>
+          <td width="2%">
+            {{ i }}
+          </td>
           <td>
             <span *ngIf="!sub['registeredType']" class="text-12">{{
               '[ ' +