Create defaults to centralise js config

GeoNode · Jun 8, 2019 · 5da64c0 · 5da64c0
1 parent c84d95a
commit 5da64c0
Show file tree

Hide file tree

Showing 9 changed files with 91 additions and 140 deletions.
diff --git a/geonode_mapstore_client/templates/geonode-mapstore-client/_config.html b/geonode_mapstore_client/templates/geonode-mapstore-client/_config.html
@@ -0,0 +1,27 @@
+<script>
+  const defaultConfig = {
+    proxy: "{{ SITEURL }}{{ PROXY_URL }}",
+    printingEnabled: true,
+    localConfig: {
+      mapLayout: {left: {sm: 300, md: 500, lg: 600}, right: {md: "41%"}, bottom: {sm: 0}},
+      geonode_url: "{{ SITEURL }}",
+      genode_rest_api: "{{ SITEURL }}mapstore/rest/",
+      printUrl: "{{ GEOSERVER_PUBLIC_LOCATION }}gs/pdf/info.json",
+      translations: '',
+      useAuthenticationRules: true,
+      loadAfterTheme: true,
+      authenticationRules: [{
+        "urlPattern": ".*geostore.*",
+        "method": "bearer"
+      }, {
+        "urlPattern": ".*geoserver.*",
+        "authkeyParamName": "access_token",
+        "method": "authkey"
+      }, {
+        "urlPattern": ".*gs.*",
+        "authkeyParamName": "access_token",
+        "method": "authkey"
+      }]
+    }
+  }
+</script>
diff --git a/geonode_mapstore_client/templates/geonode-mapstore-client/base_ms.html b/geonode_mapstore_client/templates/geonode-mapstore-client/base_ms.html
@@ -123,6 +123,7 @@
 
 {% endautoescape %}
 {% endwith %}
+{% include './_config.html' %}
 {% block app_config %}{% endblock %}
 
 {% block map_content %}

diff --git a/geonode_mapstore_client/templates/geonode-mapstore-client/edit_map.html b/geonode_mapstore_client/templates/geonode-mapstore-client/edit_map.html
@@ -76,27 +76,16 @@
                             }
                     }
                 },
-                proxy: "{{ SITEURL }}proxy/?url=",
-                printingEnabled: true,
+                proxy: defaultConfig.proxy,
+                printingEnabled: defaultConfig.printingEnabled,
                 localConfig: {
-                    geonode_url: "{{ SITEURL }}",
-                    genode_rest_api: "{{ SITEURL }}mapstore/rest/",
-                    loadAfterTheme: true,
-                    printUrl: "{{ SITEURL }}gs/pdf/info.json",
-                    translations: '',
-                    useAuthenticationRules: true,
-                    authenticationRules: [{
-                        "urlPattern": ".*geostore.*",
-                        "method": "bearer"
-                    }, {
-                        "urlPattern": ".*geoserver.*",
-                        "authkeyParamName": "access_token",
-                        "method": "authkey"
-                    }, {
-                        "urlPattern": ".*gs.*",
-                        "authkeyParamName": "access_token",
-                        "method": "authkey"
-                    }]
+                    geonode_url: defaultConfig.localConfig.geonode_url,
+                    genode_rest_api: defaultConfig.localConfig.genode_rest_api,
+                    loadAfterTheme: defaultConfig.localConfig.loadAfterTheme,
+                    printUrl: defaultConfig.localConfig.printUrl,
+                    translations: defaultConfig.localConfig.translations,
+                    useAuthenticationRules: defaultConfig.localConfig.useAuthenticationRules,
+                    authenticationRules: defaultConfig.localConfig.authenticationRules
                 },
                 plugins: MS2_PLUGINS
             });

diff --git a/geonode_mapstore_client/templates/geonode-mapstore-client/layer_edit.html b/geonode_mapstore_client/templates/geonode-mapstore-client/layer_edit.html
@@ -65,27 +65,16 @@
                             }
                     }
                 },
-                proxy: "{{ SITEURL }}proxy/?url=",
-                printingEnabled: true,
+                proxy: defaultConfig.proxy,
+                printingEnabled: defaultConfig.printingEnabled,
                 localConfig: {
-                    geonode_url: "{{ SITEURL }}",
-                    genode_rest_api: "{{ SITEURL }}mapstore/rest/",
-                    loadAfterTheme: true,
-                    printUrl: "{{ SITEURL }}gs/pdf/info.json",
-                    translations: '',
-                    useAuthenticationRules: true,
-                    authenticationRules: [{
-                        "urlPattern": ".*geostore.*",
-                        "method": "bearer"
-                    }, {
-                        "urlPattern": ".*geoserver.*",
-                        "authkeyParamName": "access_token",
-                        "method": "authkey"
-                    }, {
-                        "urlPattern": ".*gs.*",
-                        "authkeyParamName": "access_token",
-                        "method": "authkey"
-                    }]
+                    geonode_url: defaultConfig.localConfig.geonode_url,
+                    genode_rest_api: defaultConfig.localConfig.genode_rest_api,
+                    loadAfterTheme: defaultConfig.localConfig.loadAfterTheme,
+                    printUrl: defaultConfig.localConfig.printUrl,
+                    translations: defaultConfig.localConfig.translations,
+                    useAuthenticationRules: defaultConfig.localConfig.useAuthenticationRules,
+                    authenticationRules: defaultConfig.localConfig.authenticationRules
                 },
                 plugins: MS2_PLUGINS
             });

diff --git a/geonode_mapstore_client/templates/geonode-mapstore-client/layer_map.html b/geonode_mapstore_client/templates/geonode-mapstore-client/layer_map.html
@@ -54,27 +54,16 @@
                         }
                     }
                 },
-                proxy: "{{ SITEURL }}proxy/?url=",
-                printingEnabled: true,
+                proxy: defaultConfig.proxy,
+                printingEnabled: defaultConfig.printingEnabled,
                 localConfig: {
-                    mapLayout: {left: {sm: 300, md: 500, lg: 600}, right: {md: "41%"}, bottom: {sm: 0}},
-                    geonode_url: "{{ SITEURL }}",
-                    translations: '',
-                    loadAfterTheme: true,
-                    printUrl: "{{ SITEURL }}gs/pdf/info.json",
-                    useAuthenticationRules: true,
-                    authenticationRules: [{
-                        "urlPattern": ".*geostore.*",
-                        "method": "bearer"
-                    }, {
-                        "urlPattern": ".*geoserver.*",
-                        "authkeyParamName": "access_token",
-                        "method": "authkey"
-                    }, {
-                        "urlPattern": ".*gs.*",
-                        "authkeyParamName": "access_token",
-                        "method": "authkey"
-                    }]
+                    mapLayout: defaultConfig.localConfig.mapLayout,
+                    geonode_url: defaultConfig.localConfig.geonode_url,
+                    translations: defaultConfig.localConfig.translations,
+                    loadAfterTheme: defaultConfig.localConfig.loadAfterTheme,
+                    printUrl: defaultConfig.localConfig.printUrl,
+                    useAuthenticationRules: defaultConfig.localConfig.useAuthenticationRules,
+                    authenticationRules: defaultConfig.localConfig.authenticationRules
                 },
                 plugins: MS2_PLUGINS
             });

diff --git a/geonode_mapstore_client/templates/geonode-mapstore-client/layer_style_edit.html b/geonode_mapstore_client/templates/geonode-mapstore-client/layer_style_edit.html
@@ -78,27 +78,16 @@
                             }
                     }
                 },
-                proxy: "{{ SITEURL }}proxy/?url=",
-                printingEnabled: true,
+                proxy: defaultConfig.proxy,
+                printingEnabled: defaultConfig.printingEnabled,
                 localConfig: {
-                    geonode_url: "{{ SITEURL }}",
-                    genode_rest_api: "{{ SITEURL }}mapstore/rest/",
-                    loadAfterTheme: true,
-                    printUrl: "{{ SITEURL }}gs/pdf/info.json",
-                    translations: '',
-                    useAuthenticationRules: true,
-                    authenticationRules: [{
-                        "urlPattern": ".*geostore.*",
-                        "method": "bearer"
-                    }, {
-                        "urlPattern": ".*geoserver.*",
-                        "authkeyParamName": "access_token",
-                        "method": "authkey"
-                    }, {
-                        "urlPattern": ".*gs.*",
-                        "authkeyParamName": "access_token",
-                        "method": "authkey"
-                    }]
+                    geonode_url: defaultConfig.localConfig.geonode_url,
+                    genode_rest_api: defaultConfig.localConfig.genode_rest_api,
+                    loadAfterTheme: defaultConfig.localConfig.loadAfterTheme,
+                    printUrl: defaultConfig.localConfig.printUrl,
+                    translations: defaultConfig.localConfig.translations,
+                    useAuthenticationRules: defaultConfig.localConfig.useAuthenticationRules,
+                    authenticationRules: defaultConfig.localConfig.authenticationRules
                 },
                 plugins: MS2_PLUGINS
             });

diff --git a/geonode_mapstore_client/templates/geonode-mapstore-client/layer_view.html b/geonode_mapstore_client/templates/geonode-mapstore-client/layer_view.html
@@ -78,27 +78,16 @@
                             }
                     }
                 },
-                proxy: "{{ SITEURL }}proxy/?url=",
-                printingEnabled: true,
+                proxy: defaultConfig.proxy,
+                printingEnabled: defaultConfig.printingEnabled,
                 localConfig: {
-                    geonode_url: "{{ SITEURL }}",
-                    genode_rest_api: "{{ SITEURL }}mapstore/rest/",
-                    loadAfterTheme: true,
-                    printUrl: "{{ SITEURL }}gs/pdf/info.json",
-                    translations: '',
-                    useAuthenticationRules: true,
-                    authenticationRules: [{
-                        "urlPattern": ".*geostore.*",
-                        "method": "bearer"
-                    }, {
-                        "urlPattern": ".*geoserver.*",
-                        "authkeyParamName": "access_token",
-                        "method": "authkey"
-                    }, {
-                        "urlPattern": ".*gs.*",
-                        "authkeyParamName": "access_token",
-                        "method": "authkey"
-                    }]
+                    geonode_url: defaultConfig.localConfig.geonode_url,
+                    genode_rest_api: defaultConfig.localConfig.genode_rest_api,
+                    loadAfterTheme: defaultConfig.localConfig.loadAfterTheme,
+                    printUrl: defaultConfig.localConfig.printUrl,
+                    translations: defaultConfig.localConfig.translations,
+                    useAuthenticationRules: defaultConfig.localConfig.useAuthenticationRules,
+                    authenticationRules: defaultConfig.localConfig.authenticationRules
                 },
                 plugins: MS2_PLUGINS
             });

diff --git a/geonode_mapstore_client/templates/geonode-mapstore-client/map_embed.html b/geonode_mapstore_client/templates/geonode-mapstore-client/map_embed.html
@@ -54,27 +54,16 @@
                             }
                     }
                 },
-                proxy: "{{ SITEURL }}proxy/?url=",
-                printingEnabled: true,
+                proxy: defaultConfig.proxy,
+                printingEnabled: defaultConfig.printingEnabled,
                 localConfig: {
-                    geonode_url: "{{ SITEURL }}",
-                    genode_rest_api: "{{ SITEURL }}mapstore/rest/",
-                    loadAfterTheme: true,
-                    printUrl: "{{ SITEURL }}gs/pdf/info.json",
-                    translations: '',
-                    useAuthenticationRules: true,
-                    authenticationRules: [{
-                        "urlPattern": ".*geostore.*",
-                        "method": "bearer"
-                    }, {
-                        "urlPattern": ".*geoserver.*",
-                        "authkeyParamName": "access_token",
-                        "method": "authkey"
-                    }, {
-                        "urlPattern": ".*gs.*",
-                        "authkeyParamName": "access_token",
-                        "method": "authkey"
-                    }]
+                    geonode_url: defaultConfig.localConfig.geonode_url,
+                    genode_rest_api: defaultConfig.localConfig.genode_rest_api,
+                    loadAfterTheme: defaultConfig.localConfig.loadAfterTheme,
+                    printUrl: defaultConfig.localConfig.printUrl,
+                    translations: defaultConfig.localConfig.translations,
+                    useAuthenticationRules: defaultConfig.localConfig.useAuthenticationRules,
+                    authenticationRules: defaultConfig.localConfig.authenticationRules
                 },
                 plugins: MS2_PLUGINS
             });

diff --git a/geonode_mapstore_client/templates/geonode-mapstore-client/map_view.html b/geonode_mapstore_client/templates/geonode-mapstore-client/map_view.html
@@ -60,28 +60,17 @@
                             }
                     }
                 },
-                proxy: "{{ SITEURL }}proxy/?url=",
-                printingEnabled: true,
+                proxy: defaultConfig.proxy,
+                printingEnabled: defaultConfig.printingEnabled,
                 localConfig: {
                     disableCheckEditPermissions: true,
-                    geonode_url: "{{ SITEURL }}",
-                    genode_rest_api: "{{ SITEURL }}mapstore/rest/",
-                    loadAfterTheme: true,
-                    printUrl: "{{ SITEURL }}gs/pdf/info.json",
-                    translations: '',
-                    useAuthenticationRules: true,
-                    authenticationRules: [{
-                        "urlPattern": ".*geostore.*",
-                        "method": "bearer"
-                    }, {
-                        "urlPattern": ".*geoserver.*",
-                        "authkeyParamName": "access_token",
-                        "method": "authkey"
-                    }, {
-                        "urlPattern": ".*gs.*",
-                        "authkeyParamName": "access_token",
-                        "method": "authkey"
-                    }]
+                    geonode_url: defaultConfig.localConfig.geonode_url,
+                    genode_rest_api: defaultConfig.localConfig.genode_rest_api,
+                    loadAfterTheme: defaultConfig.localConfig.loadAfterTheme,
+                    printUrl: defaultConfig.localConfig.printUrl,
+                    translations: defaultConfig.localConfig.translations,
+                    useAuthenticationRules: defaultConfig.localConfig.useAuthenticationRules,
+                    authenticationRules: defaultConfig.localConfig.authenticationRules
                 },
                 plugins: MS2_PLUGINS
             });