From f9ddb2ddb8fbe060ec498f9f3dbd346859ed4895 Mon Sep 17 00:00:00 2001 From: nileshgulia1 Date: Thu, 9 Dec 2021 14:52:24 +0530 Subject: [PATCH] fallback for window.env --- .../volto/components/theme/Footer/Footer.jsx | 24 +++++++++++++------ src/index.js | 14 +++-------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/customizations/volto/components/theme/Footer/Footer.jsx b/src/customizations/volto/components/theme/Footer/Footer.jsx index 667bf9c..b69f6b3 100644 --- a/src/customizations/volto/components/theme/Footer/Footer.jsx +++ b/src/customizations/volto/components/theme/Footer/Footer.jsx @@ -21,6 +21,11 @@ import { compose } from 'redux'; import { connect } from 'react-redux'; import config from '@plone/volto/registry'; import { setCurrentVersion } from '@eeacms/volto-forests-theme/actions'; +import { + RAZZLE_FRONTEND_VERSION, + RAZZLE_FRONTEND_VERSION_URL, + RAZZLE_FRONTEND_PUBLISHED_AT, +} from '@eeacms/volto-forests-theme/constants/runtime'; /** * Component to display the footer. @@ -36,23 +41,28 @@ const Footer = ({ navItems, }) => { const { settings } = config; + let env = React.useRef(__CLIENT__ && window.env); + const dtf = new Intl.DateTimeFormat('en', { day: '2-digit', month: '2-digit', year: 'numeric', }); + const published_at = dtf.format( new Date( - settings.frontendMeta?.published_at || currentVersion.published_at, + settings.frontendMeta?.published_at || + env?.current.RAZZLE_FRONTEND_PUBLISHED_AT || + RAZZLE_FRONTEND_PUBLISHED_AT, //needed for cypress ), ); - const version_url = settings.frontendMeta.version_url - ? settings.frontendMeta.version_url - : currentVersion.version_url; + const version_url = + settings.frontendMeta.version_url ?? + (env?.current.RAZZLE_FRONTEND_VERSION_URL || RAZZLE_FRONTEND_VERSION_URL); - const version = settings.frontendMeta.version - ? settings.frontendMeta.version - : currentVersion.version; + const version = + settings.frontendMeta.version ?? + (env?.current.RAZZLE_FRONTEND_VERSION || RAZZLE_FRONTEND_VERSION); if ( settings.frontendMeta.published_at && settings.frontendMeta.version_url && diff --git a/src/index.js b/src/index.js index 44bde9b..b5b04c4 100644 --- a/src/index.js +++ b/src/index.js @@ -6,11 +6,6 @@ import { applyConfig as installFiseFrontend } from './localconfig'; import ObjectListInlineWidget from './components/manage/Widgets/ObjectListInlineWidget'; import reducers from '@eeacms/volto-forests-theme/reducers'; -import { - RAZZLE_FRONTEND_VERSION, - RAZZLE_FRONTEND_VERSION_URL, - RAZZLE_FRONTEND_PUBLISHED_AT, -} from './constants/runtime'; import './slate-styles.css'; @@ -24,12 +19,9 @@ export default function applyConfig(config) { config.settings = { ...config.settings, frontendMeta: { - version: process.env.RAZZLE_FRONTEND_VERSION ?? RAZZLE_FRONTEND_VERSION, - version_url: - process.env.RAZZLE_FRONTEND_VERSION_URL ?? RAZZLE_FRONTEND_VERSION_URL, - published_at: - process.env.RAZZLE_FRONTEND_PUBLISHED_AT ?? - RAZZLE_FRONTEND_PUBLISHED_AT, + version: process.env.RAZZLE_FRONTEND_VERSION, + version_url: process.env.RAZZLE_FRONTEND_VERSION_URL, + published_at: process.env.RAZZLE_FRONTEND_PUBLISHED_AT, }, timezone: 'CET', pathsWithFullobjects: ['/news', '/events'],