From 5cdd067fe8e0d972737ebde448c9254562dac619 Mon Sep 17 00:00:00 2001
From: josee666 <josee.martel@mffp.gouv.qc.ca>
Date: Wed, 23 Jun 2021 13:55:48 -0400
Subject: [PATCH] feat(layer-list): Fix layer filter on top of list (#882)

* fixTop-LayerListFilter

* fix(map tools): fix Top-LayerListFilter for mapTools, map and mapDetails

Co-authored-by: Pierre-Etienne Lord <pe_lord@pm.me>
---
 packages/geo/src/lib/import-export/shared/import.service.ts | 3 +--
 .../geo/src/lib/layer/layer-list/layer-list.component.html  | 5 ++++-
 .../geo/src/lib/layer/layer-list/layer-list.component.scss  | 3 ++-
 .../map/map-details-tool/map-details-tool.component.html    | 2 +-
 .../map/map-details-tool/map-details-tool.component.scss    | 4 ++++
 .../src/lib/map/map-tool/map-tool.component.scss            | 5 +++++
 .../src/lib/map/map-tools/map-tools.component.scss          | 6 ++++++
 7 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/packages/geo/src/lib/import-export/shared/import.service.ts b/packages/geo/src/lib/import-export/shared/import.service.ts
index b3509ef9fc..e3ac23b18d 100644
--- a/packages/geo/src/lib/import-export/shared/import.service.ts
+++ b/packages/geo/src/lib/import-export/shared/import.service.ts
@@ -179,8 +179,7 @@ export class ImportService {
         const errMsg = error.error.msg || '';
         if (errMsg === 'No valid files found') {
           observer.error(new ImportInvalidFileError());
-        } else if (
-          errMsg.startWith('ERROR 1: Failed to process SRS definition')
+        } else if (errMsg && errMsg.startWith('ERROR 1: Failed to process SRS definition')
         ) {
           observer.error(new ImportSRSError());
         } else {
diff --git a/packages/geo/src/lib/layer/layer-list/layer-list.component.html b/packages/geo/src/lib/layer/layer-list/layer-list.component.html
index e7517224ed..873ac04c6f 100644
--- a/packages/geo/src/lib/layer/layer-list/layer-list.component.html
+++ b/packages/geo/src/lib/layer/layer-list/layer-list.component.html
@@ -1,4 +1,5 @@
-<igo-list #igoList [ngClass]="(layerTool || selection) ? 'igo-list-min-height': 'igo-list-max-height'" [navigation]="false" [selection]="false">
+
+<mat-list>
   <igo-layer-list-tool *ngIf="showToolbar$ | async"
       floatLabel="auto"
       [layersAreAllVisible]="layersAreAllVisible"
@@ -8,7 +9,9 @@
       (appliedFilterAndSort)="onAppliedFilterAndSortChange($event)"
       (selection)="toggleSelectionMode($event)">
     </igo-layer-list-tool>
+</mat-list>
 
+<igo-list #igoList [ngClass]="(layerTool || selection) ? 'igo-list-min-height': 'igo-list-max-height'" [navigation]="false" [selection]="false">
   <ng-template ngFor let-layer let-i="index" [ngForOf]="layers$ | async">
     <igo-layer-item *ngIf="!(excludeBaseLayers && layer.baseLayer)"
         igoListItem
diff --git a/packages/geo/src/lib/layer/layer-list/layer-list.component.scss b/packages/geo/src/lib/layer/layer-list/layer-list.component.scss
index be08d4c325..866f6b58ed 100644
--- a/packages/geo/src/lib/layer/layer-list/layer-list.component.scss
+++ b/packages/geo/src/lib/layer/layer-list/layer-list.component.scss
@@ -1,10 +1,11 @@
 :host .igo-list-min-height {
-  height: calc(100% - 91px);
+  height: calc(100% - 151px);
   padding-top: 8px;
 }
 
 :host .igo-list-max-height {
   padding-top: 8px;
+  height: calc(100% - 55px);
 }
 
 mat-form-field.inputFilter {
diff --git a/packages/integration/src/lib/map/map-details-tool/map-details-tool.component.html b/packages/integration/src/lib/map/map-details-tool/map-details-tool.component.html
index 1e514dbe6a..773d75eaca 100644
--- a/packages/integration/src/lib/map/map-details-tool/map-details-tool.component.html
+++ b/packages/integration/src/lib/map/map-details-tool/map-details-tool.component.html
@@ -1,4 +1,4 @@
-<igo-layer-list *ngIf="(layers$ | async).length; else empty"
+<igo-layer-list class="mapDetailsList" *ngIf="(layers$ | async).length; else empty"
   [map]="map"
   igoLayerListBinding
   [excludeBaseLayers]="excludeBaseLayers"
diff --git a/packages/integration/src/lib/map/map-details-tool/map-details-tool.component.scss b/packages/integration/src/lib/map/map-details-tool/map-details-tool.component.scss
index 06c68bf10f..c884559f91 100644
--- a/packages/integration/src/lib/map/map-details-tool/map-details-tool.component.scss
+++ b/packages/integration/src/lib/map/map-details-tool/map-details-tool.component.scss
@@ -21,3 +21,7 @@ mat-list-item ::ng-deep .mat-list-text {
 mat-list.mat-list-base mat-list-item.mat-list-item ::ng-deep div.mat-list-item-content div.mat-list-text {
     padding-left: 5px;
 }
+
+.mapDetailsList {
+    overflow: hidden;
+  }
\ No newline at end of file
diff --git a/packages/integration/src/lib/map/map-tool/map-tool.component.scss b/packages/integration/src/lib/map/map-tool/map-tool.component.scss
index 572a6ec2be..aef0c40954 100644
--- a/packages/integration/src/lib/map/map-tool/map-tool.component.scss
+++ b/packages/integration/src/lib/map/map-tool/map-tool.component.scss
@@ -1,4 +1,9 @@
 mat-tab-group,
 mat-tab-group ::ng-deep .mat-tab-body-wrapper {
   height: 100%;
+  overflow: hidden;
+}
+
+:host ::ng-deep  .mat-tab-body-content  {
+    overflow: hidden;
 }
diff --git a/packages/integration/src/lib/map/map-tools/map-tools.component.scss b/packages/integration/src/lib/map/map-tools/map-tools.component.scss
index 3ff830f496..fa51ab3723 100644
--- a/packages/integration/src/lib/map/map-tools/map-tools.component.scss
+++ b/packages/integration/src/lib/map/map-tools/map-tools.component.scss
@@ -25,4 +25,10 @@ mat-list.mat-list-base mat-list-item.mat-list-item ::ng-deep div.mat-list-item-c
 mat-tab-group,
 mat-tab-group ::ng-deep .mat-tab-body-wrapper {
   height: 100%;
+  overflow: hidden;
 }
+
+:host ::ng-deep  .mat-tab-body-content  {
+    overflow: hidden;
+  }
+  
\ No newline at end of file