Fixed merge

apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html

@@ -34,10 +34,11 @@
 </section>
 
 <ng-template #headerTemplate>
-    <div class="actions-wrapper">
+    <div class="table-header-actions">
         <redaction-pagination
             (pageChanged)="pageChanged($event)"
             [settings]="{ currentPage: logs?.page || 0, totalPages: totalPages }"
+            class="mr-0"
         ></redaction-pagination>
         <div class="separator">·</div>
         <form [formGroup]="filterForm">

apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.scss

@@ -2,7 +2,6 @@
     justify-content: space-between;
 }
 
-.actions-wrapper,
 form {
     display: flex;
     align-items: center;
@@ -10,15 +9,19 @@ form {
     .iqser-input-group {
         margin-top: 0 !important;
     }
-
-    .separator {
-        margin: 0 20px;
-        font-weight: bold;
-        font-size: 16px;
-        opacity: 0.7;
-    }
-
-    .mr-20 {
-        margin-right: 20px;
-    }
+}
+
+.separator {
+    margin: 0 20px;
+    font-weight: bold;
+    font-size: 16px;
+    opacity: 0.7;
+}
+
+.mr-0 {
+    margin-right: 0;
+}
+
+.mr-20 {
+    margin-right: 20px;
 }

apps/red-ui/src/app/modules/dossier/screens/dossier-listing-screen/dossier-listing-screen.component.ts

@@ -16,7 +16,7 @@ import { DossiersDialogService } from '../../services/dossiers-dialog.service';
 import { OnAttach, OnDetach } from '@utils/custom-route-reuse.strategy';
 import { UserPreferenceService } from '@services/user-preference.service';
 import { ButtonConfig } from '@shared/components/page-header/models/button-config.model';
-import { DefaultListingServices, keyChecker, ListingComponent, NestedFilter, TableColumnConfig } from '@iqser/common-ui';
+import { DefaultListingServices, keyChecker, ListingComponent, NestedFilter, TableColumnConfig, TableComponent } from '@iqser/common-ui';
 import { workloadTranslations } from '../../translations/workload-translations';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { fileStatusTranslations } from '../../translations/file-status-translations';

apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.ts

@@ -7,7 +7,6 @@ import {
     Injector,
     OnDestroy,
     OnInit,
-    Renderer2,
     TemplateRef,
     ViewChild
 } from '@angular/core';

apps/red-ui/src/assets/styles/red-tables.scss

@@ -15,6 +15,7 @@
 .table-header-actions {
     display: flex;
     flex: 1;
+    align-items: center;
     justify-content: flex-end;
 
     > *:not(:last-child) {

libs/common-ui

@@ -1 +1 @@
-Subproject commit 2ee21a6a3ae4fc5414960b2ad4dd25631f6df195
+Subproject commit 35f1a8d19f78e6be0e54de67735228ba7fc7b883