#9567: handle adding flag into config file to show/hide zoom icon for…

… tblWidget
geosolutions-it · Oct 25, 2023 · d726313 · d726313
1 parent 73d51f8
commit d726313
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 11 deletions.
diff --git a/web/client/components/widgets/enhancers/__tests__/tableWidget-test.jsx b/web/client/components/widgets/enhancers/__tests__/tableWidget-test.jsx
@@ -46,7 +46,7 @@ describe('widgets tableWidget enhancer', () => {
         }}/></Provider>, document.getElementById("container"));
     });
 
-    it('tableWidget with gridTools including zoom icon for dashboard viewer', (done) => {
+    it('tableWidget with gridTools including zoom icon for dashboard viewer [enable zoom in config]', (done) => {
         const Sink = tableWidget(createSink( props => {
             expect(props).toExist();
             expect(props.gridTools.length).toEqual(1);
@@ -57,7 +57,9 @@ describe('widgets tableWidget enhancer', () => {
             );
             done();
         }));
-        ReactDOM.render( <Provider store={store}><Sink id="123456" mapSync={"true"} widgetType={"table"} isDashboardOpened={"true"} updateProperty={(id, path, value) => {
+        ReactDOM.render( <Provider store={store}><Sink enableZoomTblWidget={{
+            dashboard: true
+        }} id="123456" mapSync={"true"} widgetType={"table"} isDashboardOpened={"true"} updateProperty={(id, path, value) => {
             expect(path).toBe("dependencies.extentObj");
             expect(id).toBe("123456");
             expect(value).toEqual({
@@ -68,7 +70,26 @@ describe('widgets tableWidget enhancer', () => {
         expect(container).toExist();
 
     });
-    it('tableWidget with gridTools including zoom icon for mapViewer', (done) => {
+    it('tableWidget with gridTools including zoom icon for dashboard viewer [not enable zoom in config]', (done) => {
+        const Sink = tableWidget(createSink( props => {
+            expect(props).toExist();
+            expect(props.gridTools.length).toEqual(0);
+            done();
+        }));
+        ReactDOM.render( <Provider store={store}><Sink enableZoomTblWidget={{
+            dashboard: false
+        }} id="123456" mapSync={"true"} widgetType={"table"} isDashboardOpened={"true"} updateProperty={(id, path, value) => {
+            expect(path).toBe("dependencies.extentObj");
+            expect(id).toBe("123456");
+            expect(value).toEqual({
+                bbox: [-10, 0, 0, -10]
+            }, {}, "", { crs: "EPSG:4326", maxZoom: null });
+        }}/></Provider>, document.getElementById("container"));
+        const container = document.getElementById('container');
+        expect(container).toExist();
+
+    });
+    it('tableWidget with gridTools including zoom icon for mapViewer [enable zoom in config]', (done) => {
         const Sink = tableWidget(createSink( props => {
             expect(props).toExist();
             expect(props.gridTools.length).toEqual(1);
@@ -79,7 +100,22 @@ describe('widgets tableWidget enhancer', () => {
             );
             done();
         }));
-        ReactDOM.render( <Provider store={store}><Sink id="123456" widgetType={"table"} /></Provider>, document.getElementById("container"));
+        ReactDOM.render( <Provider store={store}><Sink enableZoomTblWidget={{
+            mapViewer: true
+        }} id="123456" widgetType={"table"} /></Provider>, document.getElementById("container"));
+        const container = document.getElementById('container');
+        expect(container).toExist();
+
+    });
+    it('tableWidget with gridTools including zoom icon for mapViewer [not enable zoom in config]', (done) => {
+        const Sink = tableWidget(createSink( props => {
+            expect(props).toExist();
+            expect(props.gridTools.length).toEqual(0);
+            done();
+        }));
+        ReactDOM.render( <Provider store={store}><Sink enableZoomTblWidget={{
+            mapViewer: false
+        }} id="123456" widgetType={"table"} /></Provider>, document.getElementById("container"));
         const container = document.getElementById('container');
         expect(container).toExist();
 

diff --git a/web/client/components/widgets/enhancers/tableWidget.js b/web/client/components/widgets/enhancers/tableWidget.js
@@ -30,8 +30,9 @@ const withSorting = () => withPropsOnChange(["gridEvents"], ({ gridEvents = {},
 */
 export default compose(
     compose(connect(null, (dispatch, ownProps)=>{
-        let isTblDashboard = ownProps?.mapSync && ownProps?.widgetType === 'table' && ownProps?.isDashboardOpened;
-        let isTblWidgetInMapViewer = ownProps?.widgetType && !isTblDashboard;
+        let enableZoomTblWidget = ownProps?.enableZoomTblWidget;
+        let isTblDashboard = enableZoomTblWidget?.dashboard && ownProps?.mapSync && ownProps?.widgetType === 'table' && ownProps?.isDashboardOpened;
+        let isTblWidgetInMapViewer = ownProps?.widgetType && !isTblDashboard && enableZoomTblWidget?.mapViewer;
         let isTblSyncWithMap = ownProps?.mapSync;
         return {
             gridTools: (isTblSyncWithMap && isTblDashboard) || (isTblWidgetInMapViewer) ? gridTools.map((t) => ({

diff --git a/web/client/configs/localConfig.json b/web/client/configs/localConfig.json
@@ -555,7 +555,12 @@
                 "declineUrl" : "http://www.google.com"
                 }
             },
-            "OmniBar", "Login", "Save", "SaveAs", "Expander", "Undo", "Redo", "FullScreen", "GlobeViewSwitcher", "SearchServicesConfig", "SearchByBookmark", "WidgetsBuilder", "Widgets",
+            "OmniBar", "Login", "Save", "SaveAs", "Expander", "Undo", "Redo", "FullScreen", "GlobeViewSwitcher", "SearchServicesConfig", "SearchByBookmark", "WidgetsBuilder", {
+              "name": "Widgets",
+              "cfg": {
+                "enableZoomInTblWidget": true
+                }
+            },
             "WidgetsTray",
             {
               "name": "Timeline",
@@ -742,7 +747,12 @@
         ],
         "dashboard": [
           "BurgerMenu",
-          "Dashboard",
+          {
+            "name": "Dashboard",
+            "cfg": {
+              "enableZoomInTblWidget": false
+              }
+          },
           "Notifications",
           "Login",
           {

diff --git a/web/client/plugins/Widgets.jsx b/web/client/plugins/Widgets.jsx
@@ -23,7 +23,8 @@ import {
     getMaximizedState,
     getVisibleFloatingWidgets,
     isTrayEnabled,
-    getTblWidgetZoomLoader
+    getTblWidgetZoomLoader,
+    getFlagOfShowingTblWidgetZoom
 } from '../selectors/widgets';
 import {
     changeLayout,
@@ -58,7 +59,8 @@ compose(
             state => state.browser && state.browser.mobile,
             getFloatingWidgets,
             getTblWidgetZoomLoader,
-            (id, widgets, layouts, maximized, dependencies, mapLayout, isMobileAgent, dropdownWidgets, recordZoomLoading) => ({
+            getFlagOfShowingTblWidgetZoom,
+            (id, widgets, layouts, maximized, dependencies, mapLayout, isMobileAgent, dropdownWidgets, recordZoomLoading, enableZoomTblWidget) => ({
                 id,
                 widgets,
                 layouts,
@@ -67,7 +69,8 @@ compose(
                 mapLayout,
                 isMobileAgent,
                 dropdownWidgets,
-                recordZoomLoading
+                recordZoomLoading,
+                enableZoomTblWidget
             })
         ), {
             editWidget,

diff --git a/web/client/selectors/widgets.js b/web/client/selectors/widgets.js
@@ -190,3 +190,15 @@ export const getTblWidgetZoomLoader = state => {
     let tableWidgets = (getFloatingWidgets(state) || []).filter(({ widgetType } = {}) => widgetType === "table");
     return tableWidgets?.find(t=>t.dependencies?.zoomLoader) ? true : false;
 };
+
+export const getFlagOfShowingTblWidgetZoom = state => {
+    let widgetPluginMapViewer = state?.localConfig?.plugins?.desktop?.find(pl=>pl.name === "Widgets");
+    let flagShownZoomInTblWidgetMapViewer = widgetPluginMapViewer?.cfg?.enableZoomInTblWidget || false;
+
+    let dashboardPluginDashboardViewer = state?.localConfig?.plugins?.dashboard?.find(pl=>pl.name === "Dashboard");
+    let flagShownZoomInTblWidgetDashboardViewer = dashboardPluginDashboardViewer?.cfg?.enableZoomInTblWidget || false;
+    return {
+        mapViewer: flagShownZoomInTblWidgetMapViewer,
+        dashboard: flagShownZoomInTblWidgetDashboardViewer
+    };
+};