feat(filter): minor fixes

infra-geo-ouverte · Apr 4, 2019 · c0669a8 · c0669a8
1 parent e76307c
commit c0669a8
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 15 deletions.
diff --git a/src/app/pages/portal/portal.component.html b/src/app/pages/portal/portal.component.html
@@ -67,7 +67,7 @@
     [backdropShown]="expansionPanelBackdropShown">
 
     <ng-container expansionPanelHeader>
-      <igo-editor-selector igoWfsEditorSelector [store]="editorStore" [map]="map"></igo-editor-selector>
+      <igo-editor-selector igoEditorSelector [store]="editorStore" [map]="map"></igo-editor-selector>
       <igo-actionbar
         *ngIf="editor"
         [store]="editor.actionStore"
@@ -81,12 +81,14 @@
     </ng-container>
 
     <igo-entity-table
-      *ngIf="editor"
+      *ngIf="editor && editor.entityStore"
       class="table-compact table-centered"
       [store]="editor.entityStore"
       [template]="editor.tableTemplate">
     </igo-entity-table>
 
+    <span *ngIf="editor && !editor.entityStore">{{'noEntityStore' | translate}}</span>
+
   </igo-expansion-panel>
 
 </mat-sidenav-container>

diff --git a/src/app/pages/portal/portal.component.ts b/src/app/pages/portal/portal.component.ts
@@ -91,6 +91,9 @@ export class PortalComponent implements OnInit, OnDestroy {
   }
 
   get actionbarMode(): ActionbarMode {
+    if (this.mediaService.media$.value === Media.Mobile) {
+      return ActionbarMode.Overlay;
+    }
     return this.expansionPanelExpanded
       ? ActionbarMode.Dock
       : ActionbarMode.Overlay;

diff --git a/src/app/pages/portal/portal.variables.scss b/src/app/pages/portal/portal.variables.scss
@@ -6,7 +6,7 @@ $igo-footer-height: 49px;
 
 $igo-expansion-panel-collapsed-height: 48px;
 $igo-expansion-panel-collapsed-width: 52px;
-$igo-expansion-panel-height: 281px;
+$igo-expansion-panel-height: 300px;
 $igo-expansion-panel-header-height: $igo-expansion-panel-collapsed-height;
 
 $igo-sidenav-height: 100%;
@@ -16,7 +16,7 @@ $igo-sidenav-margin-top: 50px;
 $igo-sidenav-width-mobile: calc(100% - #{$igo-mobile-min-space-right} - #{$igo-margin});
 
 $igo-toast-panel-collapsed-height: 48px;
-$igo-toast-panel-max-height: 329px;
+$igo-toast-panel-max-height: 300px;
 $igo-toast-panel-width: 30%;
 
 $search-bar-left: calc(#{$igo-icon-size} + #{$igo-margin});

diff --git a/src/app/pages/portal/toast-panel/toast-panel.component.scss b/src/app/pages/portal/toast-panel/toast-panel.component.scss
@@ -10,18 +10,10 @@
 
   transition: height 280ms cubic-bezier(.4,0,.2,1);
   padding: $igo-padding;
-
-  @include mobile {
-    max-height: 40%;
-  }
 }
 
 :host.igo-toast-panel-opened {
   height: $igo-toast-panel-max-height;
-
-  @include mobile {
-    height: 40%;
-  }
 }
 
 igo-panel ::ng-deep .igo-panel-header:hover {

diff --git a/src/contexts/embacle.json b/src/contexts/embacle.json
@@ -91,7 +91,7 @@
         "sourceFields": [
           { "name": "waterway", "alias": "Chemin d eau" },
           { "name": "osm_id" },
-          { "name": "landuse", "values": ["yes", "no"] }
+          { "name": "landuse" }
         ],
         "ogcFilters": {
           "enabled": true,

diff --git a/src/locale/en.json b/src/locale/en.json
@@ -4,5 +4,6 @@
     "close": "Close Menu",
     "open": "Open Menu"
   },
-  "IGO": "IGO"
+  "IGO": "IGO",
+  "noEntityStore": "No tables available for this dataset"
 }
diff --git a/src/locale/fr.json b/src/locale/fr.json
@@ -4,5 +4,6 @@
     "close": "Fermer le menu",
     "open": "Menu"
   },
-  "IGO": "IGO"
+  "IGO": "IGO",
+  "noEntityStore": "Aucune table disponible pour ce jeu de données"
 }