post review changes

offtherailz · offtherailz · commit 316e32490248 · 2018-02-27T11:43:17.000+01:00
- renamed enhanceWizard with proper name
 - moved utilities into utility file
diff --git a/web/client/components/widgets/builder/wizard/TableWizard.jsx b/web/client/components/widgets/builder/wizard/TableWizard.jsx
@@ -17,7 +17,7 @@ const Wizard = wizardHandlers(require('../../../misc/wizard/WizardContainer'));
 
 const { compose, lifecycle } = require('recompose');
 
-const enhanceWizard = compose(lifecycle({
+const triggerValidationReset = compose(lifecycle({
     componentWillReceiveProps: ({ data = {}, valid, setValid = () => { } } = {}) => {
         if (valid && !isChartOptionsValid(data.options)) {
             setValid(false);
@@ -26,7 +26,7 @@ const enhanceWizard = compose(lifecycle({
 })
 );
 
-module.exports = enhanceWizard(({ onChange = () => { }, onFinish = () => { }, setPage = () => { }, data = {}, layer = {}, step = 0, types, featureTypeProperties, dependencies }) =>
+module.exports = triggerValidationReset(({ onChange = () => { }, onFinish = () => { }, setPage = () => { }, data = {}, layer = {}, step = 0, types, featureTypeProperties, dependencies }) =>
     (<Wizard
         step={step}
         setPage={setPage}
diff --git a/web/client/components/widgets/enhancers/wfsTable/common.js b/web/client/components/widgets/enhancers/wfsTable/common.js
diff --git a/web/client/components/widgets/enhancers/wfsTable/describeFetch.js b/web/client/components/widgets/enhancers/wfsTable/describeFetch.js
@@ -8,14 +8,14 @@
 
 const Rx = require('rxjs');
 const { describeFeatureType } = require('../../../../observables/wfs');
-const {getLayerUrl} = require('./common');
+const { getSearchUrl } = require('../../../../utils/LayersUtils');
 /**
  * Retrieves feature types for the layer provideded in props. When the layer changes url,
  * @param {Obserbable} props$ props stream
  */
 module.exports = props$ =>
     props$
-        .distinctUntilChanged(({ layer: layer1 } = {}, { layer: layer2 } = {}) => getLayerUrl(layer1) === getLayerUrl(layer2))
+        .distinctUntilChanged(({ layer: layer1 } = {}, { layer: layer2 } = {}) => getSearchUrl(layer1) === getSearchUrl(layer2)) // this check is not too precise,it may need a refinement
         .switchMap(({ layer } = {}) => describeFeatureType({ layer })
             .map(r => ({ describeFeatureType: r.data, loading: false, error: undefined })))
         .catch(error => Rx.Observable.of({
diff --git a/web/client/components/widgets/enhancers/wfsTable/triggerFetch.js b/web/client/components/widgets/enhancers/wfsTable/triggerFetch.js
@@ -7,7 +7,7 @@
  */
 
 require('rxjs');
-const {getLayerUrl} = require('./common');
+const { getSearchUrl } = require('../../../../utils/LayersUtils');
 const sameFilter = (f1, f2) => f1 === f2;
 const sameOptions = (o1 = {}, o2 = {}) =>
     o1.propertyName === o2.propertyName;
@@ -24,7 +24,7 @@ module.exports = ($props) =>
     $props.filter(({ layer = {} }) => layer.name )
         .distinctUntilChanged(
         ({ layer = {}, options = {}, filter, sortOptions }, newProps) =>
-            getLayerUrl(layer) === getLayerUrl(layer)
+            getSearchUrl(layer) === getSearchUrl(layer)
             && (newProps.layer && layer.name === newProps.layer.name)
             && sameOptions(options, newProps.options)
             && sameFilter(filter, newProps.filter)
diff --git a/web/client/utils/LayersUtils.js b/web/client/utils/LayersUtils.js
@@ -400,6 +400,14 @@ const LayersUtils = {
         }
         return addBaseParams(reqUrl, layer.baseParams || {});
     },
+    /**
+     * Gets the layer search url or the current url
+     *
+     * @memberof utils.LayerUtils
+     * @param {Object} layer
+     * @returns {string} layer url
+     */
+    getSearchUrl: (l = {}) => l.search && l.search.url || l.url,
     invalidateUnsupportedLayer(layer, maptype) {
         return isSupportedLayer(layer, maptype) ? checkInvalidParam(layer) : assign({}, layer, {invalid: true});
     },
