From 296853974476a73856d70fa2b90688255f56e828 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adina=20=C8=9Aeudan?= <adina@devplant.ro>
Date: Tue, 19 Apr 2022 23:43:15 +0300
Subject: [PATCH 1/7] Layout

---
 src/assets/styles/common-layout.scss | 62 +++++++++++++++++-----------
 1 file changed, 39 insertions(+), 23 deletions(-)

diff --git a/src/assets/styles/common-layout.scss b/src/assets/styles/common-layout.scss
index 38605e6..5dd6b45 100644
--- a/src/assets/styles/common-layout.scss
+++ b/src/assets/styles/common-layout.scss
@@ -9,6 +9,22 @@ body {
     color: var(--iqser-accent);
     font-size: 13px;
     line-height: 16px;
+    display: flex;
+    overflow: hidden;
+}
+
+redaction-root {
+    display: flex;
+    overflow: hidden;
+
+    router-outlet + * {
+        display: flex;
+        flex: 1;
+        flex-direction: column;
+        overflow: auto;
+
+        @include common-mixins.scroll-bar;
+    }
 }
 
 section.settings {
@@ -98,33 +114,33 @@ section.settings {
 .content-container {
     overflow: hidden;
     position: relative;
-    width: 100%;
+    flex: 1;
+}
 
-    .dialog {
-        border-radius: 8px;
-        margin-top: 40px;
-        margin-bottom: 70px;
-        background-color: var(--iqser-white);
-        max-width: 650px;
-        height: fit-content;
-        box-shadow: 0 1px 5px 0 rgba(40, 50, 65, 0.19);
-        position: unset;
+.dialog:not(section) {
+    border-radius: 8px;
+    margin-top: 40px;
+    margin-bottom: 70px;
+    background-color: var(--iqser-white);
+    max-width: 650px;
+    height: fit-content;
+    box-shadow: 0 1px 5px 0 rgba(40, 50, 65, 0.19);
+    position: unset;
 
-        .heading-l {
-            margin-bottom: 16px;
+    .heading-l {
+        margin-bottom: 16px;
+    }
+
+    .dialog-content {
+        display: flex;
+
+        .dialog-content-left {
+            min-width: 300px;
+            margin-right: 64px;
         }
 
-        .dialog-content {
-            display: flex;
-
-            .dialog-content-left {
-                min-width: 300px;
-                margin-right: 64px;
-            }
-
-            .link-action {
-                margin-top: 8px;
-            }
+        .link-action {
+            margin-top: 8px;
         }
     }
 }

From d815449b409ce3bd04f8f7fddbb74fe6ed5ef9b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adina=20=C8=9Aeudan?= <adina@devplant.ro>
Date: Wed, 20 Apr 2022 00:44:46 +0300
Subject: [PATCH 2/7] Muted text

---
 src/assets/styles/common-texts.scss     | 11 ++++++++---
 src/lib/dialog/base-dialog.component.ts |  4 ++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/assets/styles/common-texts.scss b/src/assets/styles/common-texts.scss
index 08496a1..122ce29 100644
--- a/src/assets/styles/common-texts.scss
+++ b/src/assets/styles/common-texts.scss
@@ -1,14 +1,19 @@
 @use 'common-mixins' as mixins;
 
+.text-muted {
+    opacity: 0.7;
+}
+
 .all-caps-label {
     text-transform: uppercase;
-    opacity: 0.7;
     font-size: 11px;
     font-weight: 600;
     letter-spacing: 0;
     line-height: 14px;
     transition: opacity 0.2s;
 
+    @extend .text-muted;
+
     &.cancel {
         cursor: pointer;
 
@@ -71,7 +76,7 @@ pre {
 .info {
     font-size: 13px;
     line-height: 18px;
-    opacity: 0.7;
+    @extend .text-muted;
 }
 
 .page-title {
@@ -83,10 +88,10 @@ pre {
 }
 
 .small-label {
-    opacity: 0.7;
     font-size: 11px;
     line-height: 14px;
     font-weight: initial;
+    @extend .text-muted;
 }
 
 .link-action {
diff --git a/src/lib/dialog/base-dialog.component.ts b/src/lib/dialog/base-dialog.component.ts
index 29b346a..33b8f4a 100644
--- a/src/lib/dialog/base-dialog.component.ts
+++ b/src/lib/dialog/base-dialog.component.ts
@@ -25,7 +25,7 @@ export interface SaveOptions {
 export abstract class BaseDialogComponent extends AutoUnsubscribe implements OnInit {
     form!: FormGroup;
     initialFormValue;
-    private readonly _dialogService: ConfirmationDialogService = this._injector.get(ConfirmationDialogService);
+    private readonly _confirmationDialogService: ConfirmationDialogService = this._injector.get(ConfirmationDialogService);
     private readonly _dialog: MatDialog = this._injector.get(MatDialog);
 
     constructor(
@@ -89,7 +89,7 @@ export abstract class BaseDialogComponent extends AutoUnsubscribe implements OnI
     }
 
     protected _openConfirmDialog() {
-        const dialogRef = this._dialogService.openDialog({ disableConfirm: !this.valid });
+        const dialogRef = this._confirmationDialogService.openDialog({ disableConfirm: !this.valid });
         return firstValueFrom(dialogRef.afterClosed());
     }
 }

From 7bc942ae164164dadba94045f1f249a6cbb17284 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adina=20=C8=9Aeudan?= <adina@devplant.ro>
Date: Mon, 2 May 2022 20:04:34 +0300
Subject: [PATCH 3/7] CSS & page header ng content

---
 src/assets/styles/_common-mixins.scss                |  9 +++++++++
 src/assets/styles/common-base-screen.scss            |  3 +++
 src/assets/styles/common-tabs.scss                   |  1 +
 .../listing/page-header/page-header.component.html   | 12 +++++++++---
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/assets/styles/_common-mixins.scss b/src/assets/styles/_common-mixins.scss
index 0787a12..7034d9f 100644
--- a/src/assets/styles/_common-mixins.scss
+++ b/src/assets/styles/_common-mixins.scss
@@ -56,3 +56,12 @@
     cursor: pointer;
     outline: inherit;
 }
+
+@mixin clear-a {
+    text-decoration: none;
+    color: initial;
+
+    &:hover {
+        color: initial;
+    }
+}
diff --git a/src/assets/styles/common-base-screen.scss b/src/assets/styles/common-base-screen.scss
index 346f630..ec2c3ef 100644
--- a/src/assets/styles/common-base-screen.scss
+++ b/src/assets/styles/common-base-screen.scss
@@ -1,3 +1,5 @@
+@use 'common-mixins';
+
 .top-bar {
     height: 61px;
     width: 100vw;
@@ -12,6 +14,7 @@
     }
 
     .logo {
+        @include common-mixins.clear-a;
         display: flex;
         align-items: center;
     }
diff --git a/src/assets/styles/common-tabs.scss b/src/assets/styles/common-tabs.scss
index 05726ea..7bc7308 100644
--- a/src/assets/styles/common-tabs.scss
+++ b/src/assets/styles/common-tabs.scss
@@ -2,6 +2,7 @@
 
 .red-tab {
     @include mixins.clear-btn;
+    @include mixins.clear-a;
 
     &:not(:last-child) {
         margin-right: 2px;
diff --git a/src/lib/listing/page-header/page-header.component.html b/src/lib/listing/page-header/page-header.component.html
index bbf539a..fda1b89 100644
--- a/src/lib/listing/page-header/page-header.component.html
+++ b/src/lib/listing/page-header/page-header.component.html
@@ -2,7 +2,13 @@
     <div *ngIf="pageLabel" class="breadcrumb">{{ pageLabel }}</div>
 
     <div *ngIf="filters$ | async as filters" class="filters">
-        <div *ngIf="filters.length && searchPosition !== searchPositions.beforeFilters" translate="filters.filter-by"></div>
+        <ng-content select="[slot=beforeFilters]"></ng-content>
+
+        <div
+            *ngIf="filters.length && searchPosition !== searchPositions.beforeFilters"
+            class="text-muted"
+            translate="filters.filter-by"
+        ></div>
 
         <ng-container *ngIf="searchPosition === searchPositions.beforeFilters" [ngTemplateOutlet]="searchBar"></ng-container>
 
@@ -51,15 +57,15 @@
                     *ngIf="!config.hide"
                     [disabled]="config.disabled$ && (config.disabled$ | async)"
                     [icon]="config.icon"
+                    [id]="config.id"
                     [iqserHelpMode]="config.helpModeKey"
                     [tooltip]="config.label"
-                    [id]="config.id"
                     tooltipPosition="below"
                 ></iqser-circle-button>
             </ng-container>
 
             <!-- Extra custom actions here -->
-            <ng-content></ng-content>
+            <ng-content select="[slot=right]"></ng-content>
 
             <iqser-circle-button
                 (action)="closeAction.emit()"

From f06c007bec1a7da5c257e68d6df8c806419ceb2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adina=20=C8=9Aeudan?= <adina@devplant.ro>
Date: Tue, 3 May 2022 23:01:58 +0300
Subject: [PATCH 4/7] Removed routerPath

---
 src/lib/listing/models/index.ts      | 1 -
 src/lib/listing/models/routerPath.ts | 5 -----
 2 files changed, 6 deletions(-)
 delete mode 100644 src/lib/listing/models/routerPath.ts

diff --git a/src/lib/listing/models/index.ts b/src/lib/listing/models/index.ts
index 95240f4..586e11a 100644
--- a/src/lib/listing/models/index.ts
+++ b/src/lib/listing/models/index.ts
@@ -2,4 +2,3 @@ export * from './listable';
 export * from './entity.model';
 export * from './table-column-config.model';
 export * from './listing-modes';
-export * from './routerPath';
diff --git a/src/lib/listing/models/routerPath.ts b/src/lib/listing/models/routerPath.ts
deleted file mode 100644
index ddec1fc..0000000
--- a/src/lib/listing/models/routerPath.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { ITrackable } from './trackable';
-
-export interface IRouterPath extends ITrackable {
-    readonly routerPath: string;
-}

From 5444b09e647672383a0b39d23400a98d7efb6536 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adina=20=C8=9Aeudan?= <adina@devplant.ro>
Date: Wed, 4 May 2022 19:03:08 +0300
Subject: [PATCH 5/7] Removed comment

---
 src/lib/services/stats.service.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/lib/services/stats.service.ts b/src/lib/services/stats.service.ts
index c260d67..3be767c 100644
--- a/src/lib/services/stats.service.ts
+++ b/src/lib/services/stats.service.ts
@@ -4,7 +4,6 @@ import { HttpClient } from '@angular/common/http';
 import { tap } from 'rxjs/operators';
 import { HeadersConfiguration, mapEach, RequiredParam, Validate } from '../utils';
 
-/* WIP, not used */
 @Injectable()
 export abstract class StatsService<E, I = E> {
     private readonly _http = this._injector.get(HttpClient);

From dc9323a0ec4d2cdc8ffbb31df67995531160462c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adina=20=C8=9Aeudan?= <adina@devplant.ro>
Date: Thu, 5 May 2022 16:29:46 +0300
Subject: [PATCH 6/7] CSS

---
 src/assets/styles/common-menu.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/assets/styles/common-menu.scss b/src/assets/styles/common-menu.scss
index df2db37..2f9f6ba 100644
--- a/src/assets/styles/common-menu.scss
+++ b/src/assets/styles/common-menu.scss
@@ -77,6 +77,7 @@
 
             .checkmark {
                 display: flex;
+                margin-left: 16px;
             }
         }
 

From 224e078b583a33c1e4a621c071d0a24d2d49d4c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adina=20=C8=9Aeudan?= <adina@devplant.ro>
Date: Fri, 6 May 2022 18:12:30 +0300
Subject: [PATCH 7/7] Flex-${n} utilities

---
 src/assets/styles/common-layout.scss    | 8 --------
 src/assets/styles/common-utilities.scss | 8 ++++++++
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/assets/styles/common-layout.scss b/src/assets/styles/common-layout.scss
index 5dd6b45..66c87f1 100644
--- a/src/assets/styles/common-layout.scss
+++ b/src/assets/styles/common-layout.scss
@@ -222,14 +222,6 @@ section.settings {
     align-items: center;
 }
 
-.flex-1 {
-    flex: 1;
-}
-
-.flex-2 {
-    flex: 2;
-}
-
 .w-100 {
     min-width: 100px !important;
     width: 100px !important;
diff --git a/src/assets/styles/common-utilities.scss b/src/assets/styles/common-utilities.scss
index 46ab464..fb22026 100644
--- a/src/assets/styles/common-utilities.scss
+++ b/src/assets/styles/common-utilities.scss
@@ -24,3 +24,11 @@ $sides: (top, bottom, left, right);
         }
     }
 }
+
+/* flex-${n} */
+
+@for $n from 1 through 5 {
+    .flex-#{$n} {
+        flex: #{$n};
+    }
+}