Merge pull request #4808 from camptocamp/cleanup

Used dot notation, add missing property in typedef
camptocamp · Apr 9, 2019 · 2aab120 · 2aab120
2 parents 0dcd8b3 + 097314a
commit 2aab120
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/contribs/gmf/src/authentication/Service.js b/contribs/gmf/src/authentication/Service.js
@@ -12,6 +12,7 @@ import olEventsEventTarget from 'ol/events/Target.js';
  * @property location: {Array.<string>} Availables locations.
  * @property {Array.<!string>} [open_panel] When set, contains the name of the panel to open upon loading
  *    an application.
+ * @property {Array.<string>} [preset_layer_filter] Default filtrable datasource name.
  */
 
 /**

diff --git a/contribs/gmf/src/filters/filterselectorComponent.js b/contribs/gmf/src/filters/filterselectorComponent.js
@@ -308,16 +308,13 @@ class Controller {
    */
   handleGmfUserFunctionalitiesChange_() {
     const usrFunc = this.gmfUser_.functionalities;
-    if (usrFunc && usrFunc['filterable_layers']) {
-      this.filtrableLayerNodeNames_ = usrFunc['filterable_layers'];
+    if (usrFunc && usrFunc.filterable_layers) {
+      this.filtrableLayerNodeNames_ = usrFunc.filterable_layers;
     } else {
       this.filtrableLayerNodeNames_ = null;
     }
-    if (usrFunc &&
-        usrFunc['preset_layer_filter'] &&
-        usrFunc['preset_layer_filter'][0]
-    ) {
-      this.defaultFiltrableDataSourceName_ = usrFunc['preset_layer_filter'][0];
+    if (usrFunc && usrFunc.preset_layer_filter && usrFunc.preset_layer_filter[0]) {
+      this.defaultFiltrableDataSourceName_ = usrFunc.preset_layer_filter[0];
     } else {
       this.defaultFiltrableDataSourceName_ = undefined;
     }