Merge pull request #35 from eea/develop

Better env
eea · Jun 14, 2023 · d6c6951 · d6c6951
2 parents 3f45f30 + 28ac819
commit d6c6951
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+### [0.1.27](https://github.com/eea/volto-cca-policy/compare/0.1.26...0.1.27) - 14 June 2023
+
+#### :hammer_and_wrench: Others
+
+- Better env [Tiberiu Ichim - [`bca1e73`](https://github.com/eea/volto-cca-policy/commit/bca1e73a033f0ba950505087ad36baf0250f98e8)]
 ### [0.1.26](https://github.com/eea/volto-cca-policy/compare/0.1.25...0.1.26) - 13 June 2023
 
 #### :hammer_and_wrench: Others

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-cca-policy",
-  "version": "0.1.26",
+  "version": "0.1.27",
   "description": "@eeacms/volto-cca-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

diff --git a/src/index.js b/src/index.js
@@ -23,15 +23,15 @@ import installSearchEngine from './search';
 import GeocharsWidget from './components/theme/Widgets/GeocharsWidget';
 import GeolocationWidget from './components/theme/Widgets/GeolocationWidget';
 
+const getEnv = () => (typeof window !== 'undefined' ? window.env : process.env);
+
 const applyConfig = (config) => {
   const notInEnMission = /^(?!(\/en\/mission)).*$/;
-  if (
-    !(
-      __DEVELOPMENT__ ||
-      (process.env.RAZZLE_DISABLE_EXTERNAL_ROUTES &&
-        process.env.RAZZLE_DISABLE_EXTERNAL_ROUTES === 'True')
-    )
-  ) {
+  const env = getEnv();
+  const isStaging = !!env.RAZZLE_IS_STAGING;
+  const enableMissionIsExternal = !isStaging && !__DEVELOPMENT__;
+
+  if (enableMissionIsExternal) {
     config.settings.externalRoutes = [
       ...(config.settings.externalRoutes || []),
       {