fix(filter): wait for sourcefields (#137)

infra-geo-ouverte · Apr 12, 2018 · ff25d1e · ff25d1e
1 parent b2ea1ad
commit ff25d1e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/lib/filter/ogc-filterable-item/ogc-filterable-item.component.html b/src/lib/filter/ogc-filterable-item/ogc-filterable-item.component.html
@@ -18,8 +18,8 @@ <h4 matLine [matTooltip]="datasource.title" matTooltipShowDelay="500">{{datasour
       <mat-icon>file_download</mat-icon>
     </button>
   </span>
-  <button mat-icon-button tooltip-position="below" matTooltipShowDelay="500" [matTooltip]="'igo.filter.addFilter' | translate"
-    [color]="color" (click)="addFilterToSequence()">
+  <button [disabled]="datasource.options['sourceFields'].length === 0" mat-icon-button tooltip-position="below" matTooltipShowDelay="500"
+    [matTooltip]="'igo.filter.addFilter' | translate" [color]="color" (click)="addFilterToSequence()">
     <mat-icon>
       add
     </mat-icon>

diff --git a/src/lib/filter/ogc-filterable-item/ogc-filterable-item.component.ts b/src/lib/filter/ogc-filterable-item/ogc-filterable-item.component.ts
@@ -53,8 +53,11 @@ export class OgcFilterableItemComponent implements OnInit, OnDestroy {
   addFilterToSequence() {
     const arr = this.datasource.options.ogcFilters.interfaceOgcFilters
     const lastLevel = arr.length === 0 ? 0 : arr[arr.length - 1].level;
-    const firstFieldName = this.datasource.options['sourceFields'][0].name === undefined ?
+    let firstFieldName = '';
+    if (this.datasource.options['sourceFields'].length > 0) {
+      firstFieldName = this.datasource.options['sourceFields'][0].name === undefined ?
       '' : this.datasource.options['sourceFields'][0].name;
+    }
     let fieldNameGeometry = undefined;
     if (this.datasource.options['fieldNameGeometry']) {
       fieldNameGeometry = this.datasource.options['fieldNameGeometry'];

diff --git a/src/lib/layer/layer-item/layer-item.component.ts b/src/lib/layer/layer-item/layer-item.component.ts
@@ -35,7 +35,11 @@ export class LayerItemComponent implements OnDestroy {
   private _edition: boolean = false;
 
   @Input()
-  get color() { return this._color; }
+  get color() {
+    this._color = this.layer.visible ? 'primary' : 'background';
+    return this._color;
+  }
+
   set color(value: string) {
     this._color = value;
   }