Widgets without connection has effect on layer interaction #11890 (#12483)

* fix: disconnected widget and counter filter fix

* fix: not use layer filter when mapSync is off

* fix non related change

Author: rowheat02

web/client/components/widgets/enhancers/__tests__/dependenciesToFilter-test.jsx

@@ -211,6 +211,17 @@ describe('widgets dependenciesToFilter enhancer', () => {
         />, document.getElementById("container"));
     });
 
+    it('dependenciesToFilter with layerFilter and no mapSync', (done) => {
+        const Sink = dependenciesToFilter(createSink(props => {
+            expect(props).toExist();
+            expect(props.filter).toBe(undefined);
+            done();
+        }));
+        ReactDOM.render(<Sink
+            layer={layerFilter}
+        />, document.getElementById("container"));
+    });
+
     it('dependenciesToFilter with empty filter parts', (done) => {
         const Sink = dependenciesToFilter(createSink(props => {
             expect(props).toExist();

web/client/components/widgets/enhancers/dependenciesToFilter.js

@@ -55,12 +55,12 @@ const createFilterProps = ({ mapSync, geomProp, dependencies = {}, filter: filte
         : [];
 
     if (!mapSync) {
+        const filterParts = [
+            ...(newFilterObj ? toOGCFilterParts(newFilterObj, "1.1.0", "ogc") : []),
+            ...interactionFilterParts
+        ];
         return {
-            filter: !isEmpty(newFilterObj) || layerFilter || interactionFilterParts.length > 0 ? filter(and(
-                ...(layerFilter && !layerFilter.disabled ? toOGCFilterParts(layerFilter, "1.1.0", "ogc") : []),
-                ...(newFilterObj ? toOGCFilterParts(newFilterObj, "1.1.0", "ogc") : []),
-                ...interactionFilterParts
-            )) : undefined
+            filter: isEmpty(filterParts) ? undefined : filter(and(...filterParts))
         };
     }
     // merging filterObj with quickFilters coming from dependencies