geosolutions-it#8551 fix dashboard embedded crash error (geosolutions…

…-it#8553) * geosolutions-it#8551 fix dashboard embedded crash error * fix crash on observables for dashboard (cherry picked from commit 91cc6bf)
alexander-fedorenko · Sep 7, 2022 · cf504c9 · cf504c9
1 parent 8235f0c
commit cf504c9
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 23 deletions.
diff --git a/project/standard/templates/dashboard-embedded-template.html b/project/standard/templates/dashboard-embedded-template.html
@@ -96,17 +96,20 @@
         <link rel="preconnect" href="https://fonts.gstatic.com">
         <link href="https://fonts.googleapis.com/css2?family=Noto+Sans&display=swap" rel="stylesheet">
         <!--script src="https://maps.google.com/maps/api/js?v=3"></script-->
+        <script async type="text/javascript" src="https://unpkg.com/bowser@2.7.0/es5.js" onload="checkBrowser()"></script>
         <script type="text/javascript">
-            var browserInfo = bowser.getParser(window.navigator.userAgent);
-            var isValidBrowser = browserInfo.satisfies({
-                "edge": ">1",
-                "chrome": ">1",
-                "safari": ">1",
-                "firefox": ">1"
-            });
-            if (!isValidBrowser) {
-                window.location.href = "unsupportedBrowser.html"
-                document.querySelector("container").style.display = "none";
+            function checkBrowser() {
+                var browserInfo = bowser.getParser(window.navigator.userAgent);
+                var isValidBrowser = browserInfo.satisfies({
+                    "edge": ">1",
+                    "chrome": ">1",
+                    "safari": ">1",
+                    "firefox": ">1"
+                });
+                if (!isValidBrowser) {
+                    window.location.href = "unsupportedBrowser.html"
+                    document.querySelector("container").style.display = "none";
+                }
             }
         </script>
     </head>

diff --git a/web/client/components/widgets/enhancers/wfsTable/describeFetch.js b/web/client/components/widgets/enhancers/wfsTable/describeFetch.js
@@ -12,8 +12,8 @@ import { describeFeatureType } from '../../../../observables/wfs';
 import { getSearchUrl } from '../../../../utils/LayersUtils';
 
 /**
- * Retrieves feature types for the layer provideded in props. When the layer changes url,
- * @param {Obserbable} props$ props stream
+ * Retrieves feature types for the layer provided in props. When the layer changes url,
+ * @param {Observable} props$ props stream
  */
 export default props$ =>
     props$

diff --git a/web/client/dashboard-embedded-template.html b/web/client/dashboard-embedded-template.html
@@ -96,17 +96,20 @@
         <link rel="preconnect" href="https://fonts.gstatic.com">
         <link href="https://fonts.googleapis.com/css2?family=Noto+Sans&display=swap" rel="stylesheet">
         <!--script src="https://maps.google.com/maps/api/js?v=3"></script-->
+        <script async type="text/javascript" src="https://unpkg.com/bowser@2.7.0/es5.js" onload="checkBrowser()"></script>
         <script type="text/javascript">
-            var browserInfo = bowser.getParser(window.navigator.userAgent);
-            var isValidBrowser = browserInfo.satisfies({
-                "edge": ">1",
-                "chrome": ">1",
-                "safari": ">1",
-                "firefox": ">1"
-            });
-            if (!isValidBrowser) {
-                window.location.href = "unsupportedBrowser.html"
-                document.querySelector("container").style.display = "none";
+            function checkBrowser() {
+                var browserInfo = bowser.getParser(window.navigator.userAgent);
+                var isValidBrowser = browserInfo.satisfies({
+                    "edge": ">1",
+                    "chrome": ">1",
+                    "safari": ">1",
+                    "firefox": ">1"
+                });
+                if (!isValidBrowser) {
+                    window.location.href = "unsupportedBrowser.html"
+                    document.querySelector("container").style.display = "none";
+                }
             }
         </script>
     </head>

diff --git a/web/client/product/main.jsx b/web/client/product/main.jsx
@@ -7,6 +7,8 @@
  */
 
 import { connect } from 'react-redux';
+import { setObservableConfig } from 'recompose';
+import rxjsConfig from 'recompose/rxjsObservableConfig';
 
 import main from '../components/app/main';
 import StandardApp from '../components/app/StandardApp';
@@ -30,7 +32,6 @@ import security from '../reducers/security';
 import mousePosition from "../reducers/mousePosition";
 import annotations from "../reducers/annotations";
 
-
 import { versionSelector } from '../selectors/version';
 import { loadAfterThemeSelector } from '../selectors/config';
 
@@ -40,6 +41,8 @@ import {
     standardRootReducerFunc
 } from '../stores/defaultOptions';
 
+setObservableConfig(rxjsConfig);
+
 export default (config = {}, pluginsDef, overrideConfig = cfg => cfg) => {
 
     const {