Merge branch 'master' into stable

Author: renemadsen

eform-client/src/app/common/modules/eform-shared/components/eform-tree-select/folder-tree-select.component.html

@@ -1,6 +1,7 @@
-<mat-form-field class="w-100">
+<mat-form-field class="w-100 p-2">
   <mat-label> {{ selectedNodeName || ('Folder not selected' | translate) }}</mat-label>
   <mat-select
+    [attr.id]="id"
     [disabled]="disabled"
     [value]="selectedNodeId"
     [compareWith]="compareById"
@@ -28,7 +29,8 @@
                  class="node-label d-flex flex-row align-items-center gap-12"
             >
               <mat-icon>{{ node.id === selectedNodeId ? 'folder' : 'folder_open' }}</mat-icon>
-              <span>{{ node.name }}</span>
+              <span class="folder-tree-name">{{ node.name }} <small class="microting-uid">({{ node.microtingUId }})</small></span>
+
             </div>
             <button mat-icon-button matTreeNodeToggle>
               <mat-icon>
@@ -49,7 +51,8 @@
 
             >
               <mat-icon>{{ node.id === selectedNodeId ? 'folder' : 'folder_open' }}</mat-icon>
-              <span>{{ node.name }}</span>
+              <span class="folder-tree-name">{{ node.name }} <small class="microting-uid">({{ node.microtingUId }})</small></span>
+
             </div>
 
           </mat-tree-node>

eform-client/src/app/common/modules/eform-shared/components/eform-tree-select/folder-tree-select.component.ts

@@ -34,10 +34,12 @@ interface FlatNode {
   templateUrl: './folder-tree-select.component.html',
   styleUrls: ['./folder-tree-select.component.scss']
 })
+
 export class FolderTreeSelectComponent implements OnChanges {
   @Input() nodes: FolderDto[] = [];
   @Input() selectedNodeId: number | null = null;
   @Input() disabled = false;
+  @Input() id: string = '';
 
   @Output() nodeSelected = new EventEmitter<FolderDto>();