Close geosolutions-it#3784

kappu72 · Jul 11, 2019 · 1d70500 · 1d70500
1 parent b3b2b02
commit 1d70500
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/web/client/epics/featuregrid.js b/web/client/epics/featuregrid.js
@@ -179,6 +179,7 @@ const removeFilterFromWMSLayer = ({featuregrid: f} = {}) => {
     return changeLayerProperties(f.selectedLayer, {filterObj: undefined});
 };
 
+
 /**
  * Epìcs for feature grid
  * @memberof epics
@@ -188,12 +189,31 @@ module.exports = {
     featureGridBrowseData: (action$, store) =>
         action$.ofType(BROWSE_DATA).switchMap( ({layer}) => {
             const currentTypeName = get(store.getState(), "query.typeName");
+            const isActive = isSyncWmsActive(store.getState());
+            const objLayer = getSelectedLayer(store.getState());
             return Rx.Observable.of(
                 setControlProperty('drawer', 'enabled', false),
                 setLayer(layer.id),
                 openFeatureGrid()
                 ).merge(
-                    createInitialQueryFlow(action$, store, layer)
+                    Rx.Observable.of(isActive)
+                        .switchMap( active => {
+                            if (!active || objLayer.nativeCrs) {
+                                return Rx.Observable.empty();
+                            }
+                            return getNativeCrs(objLayer)
+                            .map((nativeCrs) => addNativeCrsLayer(objLayer.id, nativeCrs))
+                            .catch(() => {
+                                return Rx.Observable.of(
+                                    warning({
+                                        title: "notification.warning",
+                                        message: "featuregrid.errorProjFetch",
+                                        position: "tc",
+                                        autoDismiss: 5
+                                    }));
+                            });
+                        }),
+                        createInitialQueryFlow(action$, store, layer)
                 )
                 .merge(
                     Rx.Observable.of(reset())

diff --git a/web/client/reducers/query.js b/web/client/reducers/query.js
@@ -51,7 +51,7 @@ const initialState = {
     data: {},
     result: null,
     resultError: null,
-    syncWmsFilter: false,
+    syncWmsFilter: true,
     isLayerFilter: false
 };