@plone/volto 14.2.1 → 14.2.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## 14.2.2 (2022-01-13)
+
+### Bugfix
+
+- Fix home URL item in Navigation, which was evaluating as non-internal @sneridagh
+- Improve the request handling in `getAPIResourceWithAuth` and in `Api` helper. This fixes the "Cannot set headers once the content has being sent" @sneridagh
+- Fix when you remove the time from DatetimeWidget @iRohitSingh
+
+### Internal
+
+- Fix URL for Climate-Energy, a Volto website @tiberiuichim
+
 ## 14.2.1 (2022-01-12)
 
 ### Bugfix

package/README.md

@@ -130,7 +130,7 @@ Volto is actively developed since 2017 and used in production since 2018 on the
 - [Excellence at Humboldt-Universität zu Berlin](https://www.alles-beginnt-mit-einer-frage.de) (Website for the excellence initiative of the [Humboldt University Berlin](https://hu-berlin.de), developed by [kitconcept GmbH](https://kitconcept.com), 2019)
 - [Forest Information System for Europe](https://forest.eea.europa.eu) (Thematic website focusing on European forests, developed by [Eau de Web](https://www.eaudeweb.ro), 2019)
 - [Industrial Emissions portal for Europe](https://industry.eea.europa.eu) (Thematic website focusing on European industrial emissions, developed by [Eau de Web](https://www.eaudeweb.ro), 2020)
-- [Energy Climate Union portal for Europe](https://demo-energy-union.eea.europa.eu) (Thematic website focusing on European strides towards mitigating climate change, developed by [Eau de Web](https://www.eaudeweb.ro), 2020)
+- [Energy Climate Union portal for Europe](https://climate-energy.eea.europa.eu/) (Thematic website focusing on European strides towards mitigating climate change, developed by [Eau de Web](https://www.eaudeweb.ro), 2020)
 - [Talke Carrer Website](https://karriere.talke.com/) (Carrer website for [Talke](https://www.talke.com), one of the leading a chemical and petrochemical logistics companies in Germany, developed by [kitconcept GmbH](https://kitconcept.com), 2020)
 - [Stradanove](http://www.stradanove.it/) (Website of the Department of Youth Policies of the Municipality of Modena, developed by [RedTurtle](https://redturtle.it), 2020)
 - [VisitModena](https://www.visitmodena.it/) (Tourist website of the Municipality of Modena, developed by [RedTurtle](https://redturtle.it), 2020)

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "license": "MIT",
-  "version": "14.2.1",
+  "version": "14.2.2",
   "repository": {
     "type": "git",
     "url": "git@github.com:plone/volto.git"
@@ -34,7 +34,7 @@
     "start-spa": "razzle start --type=spa",
     "build": "razzle build",
     "build-spa": "razzle build --type=spa",
-    "test": "razzle test --env=jest-environment-jsdom-sixteen",
+    "test": "razzle test --env=jest-environment-jsdom-sixteen --maxWorkers=50%",
     "test:ci": "CI=true razzle test --env=jest-environment-jsdom-sixteen",
     "test:husky": "CI=true yarn test --bail --findRelatedTests",
     "test:debug": "node --inspect node_modules/.bin/jest --runInBand",

package/src/components/manage/Widgets/DatetimeWidget.jsx

@@ -148,8 +148,8 @@ export class DatetimeWidgetComponent extends Component {
     const moment = this.props.moment.default;
     if (time) {
       const base = (this.getInternalValue() || moment()).set({
-        hours: time.hours(),
-        minutes: time.minutes(),
+        hours: time?.hours() ?? 0,
+        minutes: time?.minutes() ?? 0,
         seconds: 0,
       });
       const dateValue = base.toISOString();

package/src/express-middleware/files.js

@@ -4,7 +4,6 @@ import { getAPIResourceWithAuth } from '@plone/volto/helpers';
 const HEADERS = ['content-type', 'content-disposition', 'cache-control'];
 
 function fileMiddleware(req, res, next) {
-  const { errorHandler } = req.app.locals;
   getAPIResourceWithAuth(req)
     .then((resource) => {
       // Just forward the headers that we need
@@ -14,8 +13,8 @@ function fileMiddleware(req, res, next) {
         }
       });
       res.send(resource.body);
-    }, errorHandler)
-    .catch(errorHandler);
+    })
+    .catch(next);
 }
 
 export default function () {

package/src/express-middleware/images.js

@@ -4,7 +4,6 @@ import { getAPIResourceWithAuth } from '@plone/volto/helpers';
 const HEADERS = ['content-type', 'content-disposition', 'cache-control'];
 
 function imageMiddleware(req, res, next) {
-  const { errorHandler } = req.app.locals;
   getAPIResourceWithAuth(req)
     .then((resource) => {
       // Just forward the headers that we need
@@ -13,10 +12,9 @@ function imageMiddleware(req, res, next) {
           res.set(header, resource.headers[header]);
         }
       });
-
       res.send(resource.body);
-    }, errorHandler)
-    .catch(errorHandler);
+    })
+    .catch(next);
 }
 
 export default function () {

package/src/helpers/Api/APIResourceWithAuth.js

@@ -34,11 +34,5 @@ export const getAPIResourceWithAuth = (req) =>
     if (authToken) {
       request.set('Authorization', `Bearer ${authToken}`);
     }
-    request.end((error, res = {}) => {
-      if (error) {
-        reject(error);
-      } else {
-        resolve(res);
-      }
-    });
+    request.then(resolve).catch(reject);
   });

package/src/server.jsx

@@ -72,6 +72,34 @@ const middleware = (config.settings.expressMiddleware || []).filter((m) => m);
 server.all('*', setupServer);
 if (middleware.length) server.use('/', middleware);
 
+server.use(function (err, req, res, next) {
+  if (err) {
+    const { store } = req.app.locals;
+    const errorPage = (
+      <Provider store={store} onError={reactIntlErrorHandler}>
+        <StaticRouter context={{}} location={req.url}>
+          <ErrorPage message={err.message} />
+        </StaticRouter>
+      </Provider>
+    );
+
+    res.set({
+      'Cache-Control': 'public, max-age=60, no-transform',
+    });
+
+    /* Displays error in console
+     * TODO:
+     * - get ignored codes from Plone error_log
+     */
+    const ignoredErrors = [301, 302, 401, 404];
+    if (!ignoredErrors.includes(err.status)) console.error(err);
+
+    res
+      .status(err.status || 500) // If error happens in Volto code itself error status is undefined
+      .send(`<!doctype html> ${renderToString(errorPage)}`);
+  }
+});
+
 function setupServer(req, res, next) {
   const api = new Api(req);