From 8993d7c2de02c052206b6c40b105325bed85b2d8 Mon Sep 17 00:00:00 2001
From: Dan Percic <dan@devplant.ro>
Date: Thu, 30 Jun 2022 12:54:09 +0300
Subject: [PATCH] Fix absolute imports & add some ids for testing

---
 src/lib/buttons/buttons.module.ts                          | 3 +--
 src/lib/common-ui.module.ts                                | 2 +-
 src/lib/dialog/base-dialog.component.ts                    | 2 +-
 src/lib/dialog/confirmation-dialog.service.ts              | 7 ++++---
 .../confirmation-dialog/confirmation-dialog.component.html | 0
 .../confirmation-dialog/confirmation-dialog.component.scss | 0
 .../confirmation-dialog/confirmation-dialog.component.ts   | 0
 src/lib/dialog/index.ts                                    | 1 +
 src/lib/filtering/popup-filter/popup-filter.component.html | 6 ++++--
 .../help-button/help-button.component.html                 | 0
 .../help-button/help-button.component.scss                 | 0
 .../help-button/help-button.component.ts                   | 2 +-
 src/lib/help-mode/help-mode.module.ts                      | 3 ++-
 src/lib/help-mode/index.ts                                 | 1 +
 src/lib/listing/table-content/table-content.component.html | 2 ++
 src/lib/listing/table-content/table-content.component.ts   | 2 +-
 src/lib/misc/index.ts                                      | 1 -
 src/lib/utils/pipes/log.pipe.ts                            | 3 +--
 18 files changed, 20 insertions(+), 15 deletions(-)
 rename src/lib/{misc => dialog}/confirmation-dialog/confirmation-dialog.component.html (100%)
 rename src/lib/{misc => dialog}/confirmation-dialog/confirmation-dialog.component.scss (100%)
 rename src/lib/{misc => dialog}/confirmation-dialog/confirmation-dialog.component.ts (100%)
 rename src/lib/{buttons => help-mode}/help-button/help-button.component.html (100%)
 rename src/lib/{buttons => help-mode}/help-button/help-button.component.scss (100%)
 rename src/lib/{buttons => help-mode}/help-button/help-button.component.ts (94%)

diff --git a/src/lib/buttons/buttons.module.ts b/src/lib/buttons/buttons.module.ts
index 3a0ed3f..1e71c60 100644
--- a/src/lib/buttons/buttons.module.ts
+++ b/src/lib/buttons/buttons.module.ts
@@ -7,10 +7,9 @@ import { ChevronButtonComponent } from './chevron-button/chevron-button.componen
 import { CircleButtonComponent } from './circle-button/circle-button.component';
 import { IconButtonComponent } from './icon-button/icon-button.component';
 import { IqserIconsModule } from '../icons';
-import { HelpButtonComponent } from './help-button/help-button.component';
 
 const matModules = [MatButtonModule, MatTooltipModule];
-const components = [ChevronButtonComponent, CircleButtonComponent, IconButtonComponent, HelpButtonComponent];
+const components = [ChevronButtonComponent, CircleButtonComponent, IconButtonComponent];
 
 @NgModule({
     declarations: [...components],
diff --git a/src/lib/common-ui.module.ts b/src/lib/common-ui.module.ts
index ba8bc18..23c193c 100644
--- a/src/lib/common-ui.module.ts
+++ b/src/lib/common-ui.module.ts
@@ -6,7 +6,6 @@ import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 import { SortByPipe } from './sorting';
 import { HumanizePipe } from './utils';
 import {
-    ConfirmationDialogComponent,
     HiddenActionComponent,
     LogoComponent,
     ProgressBarComponent,
@@ -35,6 +34,7 @@ import { MatCheckboxModule } from '@angular/material/checkbox';
 import { UploadFileComponent } from './upload-file/upload-file.component';
 import { DragDropFileUploadDirective } from './upload-file/drag-drop-file-upload.directive';
 import { MatProgressBarModule } from '@angular/material/progress-bar';
+import { ConfirmationDialogComponent } from './dialog';
 
 const matModules = [MatIconModule, MatProgressSpinnerModule, MatButtonModule, MatDialogModule, MatCheckboxModule];
 const modules = [
diff --git a/src/lib/dialog/base-dialog.component.ts b/src/lib/dialog/base-dialog.component.ts
index 2d02f1d..341ffdf 100644
--- a/src/lib/dialog/base-dialog.component.ts
+++ b/src/lib/dialog/base-dialog.component.ts
@@ -2,7 +2,7 @@ import { Directive, HostListener, Injector, OnInit } from '@angular/core';
 import { MatDialog, MatDialogRef } from '@angular/material/dialog';
 import { UntypedFormGroup } from '@angular/forms';
 import { AutoUnsubscribe, hasFormChanged, IqserEventTarget } from '../utils';
-import { ConfirmOptions } from '../misc';
+import { ConfirmOptions } from '.';
 import { ConfirmationDialogService } from './confirmation-dialog.service';
 import { firstValueFrom } from 'rxjs';
 
diff --git a/src/lib/dialog/confirmation-dialog.service.ts b/src/lib/dialog/confirmation-dialog.service.ts
index 8cd68e3..6c1028f 100644
--- a/src/lib/dialog/confirmation-dialog.service.ts
+++ b/src/lib/dialog/confirmation-dialog.service.ts
@@ -1,8 +1,8 @@
 import { Injectable } from '@angular/core';
 import { MatDialog, MatDialogRef } from '@angular/material/dialog';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
-import { ConfirmationDialogComponent, ConfirmationDialogInput, DialogConfig, TitleColors } from '@iqser/common-ui';
-import { DialogService } from '../services/dialog.service';
+import { DialogConfig, DialogService } from '../services';
+import { ConfirmationDialogComponent, ConfirmationDialogInput, TitleColors } from '.';
 
 type DialogType = 'confirm';
 
@@ -25,7 +25,8 @@ export class ConfirmationDialogService extends DialogService<DialogType> {
     openDialog(data?: { disableConfirm: boolean; [key: string]: unknown }): MatDialogRef<unknown> {
         return super.openDialog(
             'confirm',
-            null,
+            // @ts-ignore
+            undefined,
             new ConfirmationDialogInput({
                 title: _('confirmation-dialog.unsaved-changes.title'),
                 question: _('confirmation-dialog.unsaved-changes.question'),
diff --git a/src/lib/misc/confirmation-dialog/confirmation-dialog.component.html b/src/lib/dialog/confirmation-dialog/confirmation-dialog.component.html
similarity index 100%
rename from src/lib/misc/confirmation-dialog/confirmation-dialog.component.html
rename to src/lib/dialog/confirmation-dialog/confirmation-dialog.component.html
diff --git a/src/lib/misc/confirmation-dialog/confirmation-dialog.component.scss b/src/lib/dialog/confirmation-dialog/confirmation-dialog.component.scss
similarity index 100%
rename from src/lib/misc/confirmation-dialog/confirmation-dialog.component.scss
rename to src/lib/dialog/confirmation-dialog/confirmation-dialog.component.scss
diff --git a/src/lib/misc/confirmation-dialog/confirmation-dialog.component.ts b/src/lib/dialog/confirmation-dialog/confirmation-dialog.component.ts
similarity index 100%
rename from src/lib/misc/confirmation-dialog/confirmation-dialog.component.ts
rename to src/lib/dialog/confirmation-dialog/confirmation-dialog.component.ts
diff --git a/src/lib/dialog/index.ts b/src/lib/dialog/index.ts
index 052360b..95e9686 100644
--- a/src/lib/dialog/index.ts
+++ b/src/lib/dialog/index.ts
@@ -1,2 +1,3 @@
 export * from './base-dialog.component';
 export * from './confirmation-dialog.service';
+export * from './confirmation-dialog/confirmation-dialog.component';
diff --git a/src/lib/filtering/popup-filter/popup-filter.component.html b/src/lib/filtering/popup-filter/popup-filter.component.html
index 29b3986..923c3e5 100644
--- a/src/lib/filtering/popup-filter/popup-filter.component.html
+++ b/src/lib/filtering/popup-filter/popup-filter.component.html
@@ -8,6 +8,7 @@
             [label]="primaryGroup.label || ('filter-menu.label' | translate)"
             [matMenuTriggerFor]="filterMenu"
             [showDot]="hasActiveFilters$ | async"
+            id="{{ primaryGroup.slug }}"
         ></iqser-icon-button>
     </ng-container>
 
@@ -33,6 +34,7 @@
                 (click)="$event.stopPropagation()"
                 *ngIf="primaryGroup.filterceptionPlaceholder"
                 [(value)]="searchService.searchValue"
+                [id]="'filterception-' + primaryGroup.slug"
                 [placeholder]="primaryGroup.filterceptionPlaceholder"
                 [width]="'full'"
             ></iqser-input-with-action>
@@ -77,10 +79,10 @@
 <ng-template #filterHeader>
     <div class="filter-menu-header">
         <div class="all-caps-label" translate="filter-menu.filter-types"></div>
-        <div class="actions" *ngIf="primaryFilterGroup$ | async as primaryGroup">
+        <div *ngIf="primaryFilterGroup$ | async as primaryGroup" class="actions">
             <div
-                *ngIf="!primaryGroup.singleSelect"
                 (click)="activatePrimaryFilters(); $event.stopPropagation()"
+                *ngIf="!primaryGroup.singleSelect"
                 class="all-caps-label primary pointer"
                 translate="actions.all"
             ></div>
diff --git a/src/lib/buttons/help-button/help-button.component.html b/src/lib/help-mode/help-button/help-button.component.html
similarity index 100%
rename from src/lib/buttons/help-button/help-button.component.html
rename to src/lib/help-mode/help-button/help-button.component.html
diff --git a/src/lib/buttons/help-button/help-button.component.scss b/src/lib/help-mode/help-button/help-button.component.scss
similarity index 100%
rename from src/lib/buttons/help-button/help-button.component.scss
rename to src/lib/help-mode/help-button/help-button.component.scss
diff --git a/src/lib/buttons/help-button/help-button.component.ts b/src/lib/help-mode/help-button/help-button.component.ts
similarity index 94%
rename from src/lib/buttons/help-button/help-button.component.ts
rename to src/lib/help-mode/help-button/help-button.component.ts
index c684311..8883d9d 100644
--- a/src/lib/buttons/help-button/help-button.component.ts
+++ b/src/lib/help-mode/help-button/help-button.component.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @angular-eslint/prefer-on-push-component-change-detection */
 import { Component, Input, OnDestroy, OnInit } from '@angular/core';
-import { HelpModeService } from '@iqser/common-ui';
+import { HelpModeService } from '../index';
 
 @Component({
     selector: 'iqser-help-button',
diff --git a/src/lib/help-mode/help-mode.module.ts b/src/lib/help-mode/help-mode.module.ts
index f4bcd36..d077557 100644
--- a/src/lib/help-mode/help-mode.module.ts
+++ b/src/lib/help-mode/help-mode.module.ts
@@ -7,9 +7,10 @@ import { HelpModeComponent } from './help-mode/help-mode.component';
 import { HelpModeDirective } from './help-mode.directive';
 import { IqserButtonsModule } from '../buttons';
 import { IqserIconsModule } from '../icons';
+import { HelpButtonComponent } from './help-button/help-button.component';
 
 const matModules = [MatDialogModule];
-const components = [HelpModeComponent, HelpModeDialogComponent, HelpModeDirective];
+const components = [HelpModeComponent, HelpModeDialogComponent, HelpModeDirective, HelpButtonComponent];
 
 @NgModule({
     declarations: [...components],
diff --git a/src/lib/help-mode/index.ts b/src/lib/help-mode/index.ts
index cda1a99..9c5dd28 100644
--- a/src/lib/help-mode/index.ts
+++ b/src/lib/help-mode/index.ts
@@ -3,4 +3,5 @@ export * from './help-mode.module';
 export * from './help-mode.service';
 export * from './help-mode.directive';
 export * from './help-mode/help-mode.component';
+export * from './help-button/help-button.component';
 export * from './help-mode-dialog/help-mode-dialog.component';
diff --git a/src/lib/listing/table-content/table-content.component.html b/src/lib/listing/table-content/table-content.component.html
index 9e37a14..6185939 100644
--- a/src/lib/listing/table-content/table-content.component.html
+++ b/src/lib/listing/table-content/table-content.component.html
@@ -15,6 +15,7 @@
                 (mouseleave)="itemMouseLeaveFn && itemMouseLeaveFn(entity)"
                 *ngIf="itemMouseEnterFn || itemMouseLeaveFn; else withoutMouseEvents"
                 [class.help-mode]="helpModeService.isHelpModeActive$ | async"
+                [id]="'item-' + entity.id"
                 [ngClass]="getTableItemClasses(entity)"
                 [routerLink]="entity.routerLink"
             >
@@ -28,6 +29,7 @@
             <ng-template #withoutMouseEvents>
                 <div
                     [class.help-mode]="helpModeService.isHelpModeActive$ | async"
+                    [id]="'item-' + entity.id"
                     [ngClass]="getTableItemClasses(entity)"
                     [routerLink]="entity.routerLink"
                 >
diff --git a/src/lib/listing/table-content/table-content.component.ts b/src/lib/listing/table-content/table-content.component.ts
index 1adf5d5..d36bb9b 100644
--- a/src/lib/listing/table-content/table-content.component.ts
+++ b/src/lib/listing/table-content/table-content.component.ts
@@ -7,7 +7,7 @@ import { IListable } from '../models';
 import { ListingComponent, ListingService } from '../index';
 import { HasScrollbarDirective } from '../../scrollbar';
 import { BehaviorSubject } from 'rxjs';
-import { HelpModeService } from '@iqser/common-ui';
+import { HelpModeService } from '../../help-mode';
 
 @Component({
     selector: 'iqser-table-content',
diff --git a/src/lib/misc/index.ts b/src/lib/misc/index.ts
index 45bd5ec..0c3e5d3 100644
--- a/src/lib/misc/index.ts
+++ b/src/lib/misc/index.ts
@@ -1,4 +1,3 @@
-export * from './confirmation-dialog/confirmation-dialog.component';
 export * from './hidden-action/hidden-action.component';
 export * from './logo/logo.component';
 export * from './side-nav/side-nav.component';
diff --git a/src/lib/utils/pipes/log.pipe.ts b/src/lib/utils/pipes/log.pipe.ts
index bf54600..9231cb3 100644
--- a/src/lib/utils/pipes/log.pipe.ts
+++ b/src/lib/utils/pipes/log.pipe.ts
@@ -1,12 +1,11 @@
 import { Pipe, PipeTransform } from '@angular/core';
-import { _log } from '@iqser/common-ui';
 
 @Pipe({
     name: 'log',
 })
 export class LogPipe implements PipeTransform {
     transform<T>(value: T, message = ''): T {
-        _log(value, message);
+        console.write(value, message);
         return value;
     }
 }