#9823: Fix - [Annotations] Disabled annotations are printed (#9837)

geosolutions-it · Jan 8, 2024 · 1518651 · 1518651
1 parent f617413
commit 1518651
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 1 deletion.
diff --git a/web/client/plugins/Print.jsx b/web/client/plugins/Print.jsx
@@ -544,14 +544,17 @@ export default {
                             .filter(layer => layer.group === "background" && layer.visibility && this.isAllowed(layer, projection)));
                         return !background;
                     };
+                    filterAnnotationFeaturesByVisibility = (layer) => {
+                        return {...layer, ...(!isNil(layer.features) ? {features: layer.features?.filter(ft => ft?.properties?.visibility)} : {})};
+                    }
                     filterLayers = (layers, zoom, projection) => {
                         const resolution = this.getPreviewResolution(zoom, projection);
 
                         const filtered = layers.filter((layer) =>
                             layer.visibility &&
                             isInsideResolutionsLimits(layer, resolution) &&
                             this.isAllowed(layer, projection)
-                        );
+                        ).map(this.filterAnnotationFeaturesByVisibility);
                         if (this.isBackgroundIgnored(layers, projection) && this.props.defaultBackground && this.props.printSpec.defaultBackground) {
                             const defaultBackground = this.getAlternativeBackground(layers, this.props.defaultBackground);
                             if (defaultBackground) {

diff --git a/web/client/plugins/__tests__/Print-test.jsx b/web/client/plugins/__tests__/Print-test.jsx
@@ -483,4 +483,41 @@ describe('Print Plugin', () => {
             }
         });
     });
+    it("print only annotation features that are visible", (done) => {
+        const layers = [{
+            features: [
+                {type: "FeatureCollection", properties: {id: "1", visibility: true}},
+                {type: "FeatureCollection", properties: {id: "2", visibility: false}}
+            ],
+            disableResolutionLimits: true,
+            visibility: true,
+            type: "vector"
+        }];
+        const printingService = {
+            print() {},
+            getMapConfiguration() {
+                return {
+                    layers
+                };
+            },
+            validate() { return {};}
+        };
+        const spy = expect.spyOn(printingService, "print");
+        getPrintPlugin().then(({ Plugin }) => {
+            try {
+                ReactDOM.render(<Plugin printingService={printingService}/>, document.getElementById("container"));
+                const submit = document.getElementsByClassName("print-submit").item(0);
+                expect(submit).toExist();
+                submit.click();
+                setTimeout(() => {
+                    expect(spy.calls.length).toBe(1);
+                    expect(spy.calls[0].arguments[0].layers.length).toBe(1);
+                    expect(spy.calls[0].arguments[0].layers[0].features.length).toBe(1);
+                    done();
+                }, 0);
+            } catch (ex) {
+                done(ex);
+            }
+        });
+    });
 });