@eeacms/volto-eea-website-theme 0.7.2 → 0.7.4

package/CHANGELOG.md

@@ -4,11 +4,27 @@ 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.7.4](https://github.com/eea/volto-eea-website-theme/compare/0.7.3...0.7.4) - 27 September 2022
+
+#### :bug: Bug Fixes
+
+- fix(voltoCustom.css): Better handle missing file on backend [Alin Voinea - [`679dcc8`](https://github.com/eea/volto-eea-website-theme/commit/679dcc8cbc94dcadec9e7b8c68f654d2d135186f)]
+- fix(voltoCustom.css): resource.get(header) [Alin Voinea - [`708de42`](https://github.com/eea/volto-eea-website-theme/commit/708de42309043c72aea702acaa4a580cd0caea0f)]
+
+#### :hammer_and_wrench: Others
+
+- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`33b56ac`](https://github.com/eea/volto-eea-website-theme/commit/33b56acb13fbaf0c5b79e8fc6e13c4b699c79c90)]
+### [0.7.3](https://github.com/eea/volto-eea-website-theme/compare/0.7.2...0.7.3) - 22 September 2022
+
+#### :hammer_and_wrench: Others
+
+- Set slate StyleMenu if defined [Miu Razvan - [`6e2d8a3`](https://github.com/eea/volto-eea-website-theme/commit/6e2d8a34824f7cffc51680758e16c91c70cbcfe7)]
+- Add slate StyleMenu styles [Miu Razvan - [`2863524`](https://github.com/eea/volto-eea-website-theme/commit/286352490e3413a8cbc4672c0a08d9fb9b2ac4c1)]
+- Revert "fix(voltoCustom.css): Fix to work with seamless mode - refs #148213" [Alin Voinea - [`f954e02`](https://github.com/eea/volto-eea-website-theme/commit/f954e024a739c67ae390d3d5a4e397f076534388)]
 ### [0.7.2](https://github.com/eea/volto-eea-website-theme/compare/0.7.1...0.7.2) - 19 September 2022
 
 #### :bug: Bug Fixes
 
-- fix(header): Apply changes from design system - refs #147798 [Alin Voinea - [`d28fa61`](https://github.com/eea/volto-eea-website-theme/commit/d28fa61a3d4c335cedabfa957969da5b5d9d75e0)]
 - fix(header): letter case of know [David Ichim - [`ace90d9`](https://github.com/eea/volto-eea-website-theme/commit/ace90d97ad8bc4e7392f81635536631b8a9563c4)]
 - fix(Header): language list output proper html code (ul, li) [Alin Voinea - [`6405531`](https://github.com/eea/volto-eea-website-theme/commit/6405531bd2480d3e109ac7f0581738310f662829)]
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-eea-website-theme",
-  "version": "0.7.2",
+  "version": "0.7.4",
   "description": "@eeacms/volto-eea-website-theme: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/components/theme/CustomCSS/CustomCSS.jsx

@@ -1,5 +1,4 @@
 import React from 'react';
-
 import config from '@plone/volto/registry';
 
 const CustomCSS = (props) => {

package/src/helpers/index.js

@@ -0,0 +1,34 @@
+import superagent from 'superagent';
+import config from '@plone/volto/registry';
+import { addHeadersFactory } from '@plone/volto/helpers/Proxy/Proxy';
+
+/**
+ * Get a resource image/file with authenticated (if token exist) API headers
+ * @function getBackendResourceWithAuth
+ * @param {Object} req Request object
+ * @return {string} The response with the image
+ */
+export const getBackendResourceWithAuth = (req) =>
+  new Promise((resolve, reject) => {
+    const { settings } = config;
+
+    let apiPath = '';
+    if (settings.internalApiPath && __SERVER__) {
+      apiPath = settings.internalApiPath;
+    } else if (__DEVELOPMENT__ && settings.devProxyToApiPath) {
+      apiPath = settings.devProxyToApiPath;
+    } else {
+      apiPath = settings.apiPath;
+    }
+    const backendURL = `${apiPath}${req.path}`;
+    const request = superagent
+      .get(backendURL)
+      .maxResponseSize(settings.maxResponseSize)
+      .responseType('blob');
+    const authToken = req.universalCookies.get('auth_token');
+    if (authToken) {
+      request.set('Authorization', `Bearer ${authToken}`);
+    }
+    request.use(addHeadersFactory(req));
+    request.then(resolve).catch(reject);
+  });

package/src/index.js

@@ -7,7 +7,9 @@ import { TokenWidget } from '@eeacms/volto-eea-website-theme/components/theme/Wi
 import HomePageView from '@eeacms/volto-eea-website-theme/components/theme/Homepage/HomePageView';
 import HomePageInverseView from '@eeacms/volto-eea-website-theme/components/theme/Homepage/HomePageInverseView';
 import { Icon } from '@plone/volto/components';
+import paintSVG from '@plone/volto/icons/paint.svg';
 import contentBoxSVG from './icons/content-box.svg';
+import voltoCustomMiddleware from './middleware/voltoCustom';
 
 const applyConfig = (config) => {
   // EEA specific settings
@@ -48,6 +50,15 @@ const applyConfig = (config) => {
     config.widgets.views.widget.tags = TokenWidget;
   }
 
+  // voltoCustom.css express-middleware
+  if (__SERVER__) {
+    const express = require('express');
+    config.settings.expressMiddleware = [
+      ...(config.settings.expressMiddleware || []),
+      voltoCustomMiddleware(express),
+    ];
+  }
+
   // InPage navigation, Custom CSS voltoCustom.css and Draft Background
   config.settings.appExtras = [
     ...(config.settings.appExtras || []),
@@ -65,6 +76,35 @@ const applyConfig = (config) => {
     },
   ];
 
+  // Slate StyleMenu configuration
+  if (config.settings.slate) {
+    config.settings.slate.styleMenu = {
+      ...(config.settings.slate.styleMenu || {}),
+      blockStyles: [
+        {
+          cssClass: 'primary',
+          label: 'Primary',
+          icon: () => <Icon name={paintSVG} size="18px" />,
+        },
+        {
+          cssClass: 'secondary',
+          label: 'Secondary',
+          icon: () => <Icon name={paintSVG} size="18px" />,
+        },
+        {
+          cssClass: 'tertiary',
+          label: 'Tertiary',
+          icon: () => <Icon name={paintSVG} size="18px" />,
+        },
+        {
+          cssClass: 'bordered',
+          label: 'Bordered',
+          icon: () => <Icon name={paintSVG} size="18px" />,
+        },
+      ],
+    };
+  }
+
   // Custom block styles
   config.settings.previewText = '';
   config.settings.pluggableStyles = [

package/src/middleware/voltoCustom.js

@@ -0,0 +1,37 @@
+import { getBackendResourceWithAuth } from '@eeacms/volto-eea-website-theme/helpers';
+
+const HEADERS = [
+  'Accept-Ranges',
+  'Cache-Control',
+  'Content-Disposition',
+  'Content-Range',
+  'Content-Type',
+];
+
+function voltoCustomMiddleware(req, res, next) {
+  getBackendResourceWithAuth(req)
+    .then((resource) => {
+      // Just forward the headers that we need
+      HEADERS.forEach((header) => {
+        if (resource?.get?.(header)) {
+          res.set(header, resource.get(header));
+        }
+      });
+      res.status(resource.statusCode);
+      res.send(resource.body);
+    })
+    .catch(() => {
+      res.set('Content-Type', 'text/css; charset=utf-8');
+      res.status(200);
+      res.send(
+        '/* Override this by adding a File called voltoCustom.css to backend at portal_skins/custom/manage_main */',
+      );
+    });
+}
+
+export default function (express) {
+  const middleware = express.Router();
+  middleware.all(['**/voltoCustom.css$'], voltoCustomMiddleware);
+  middleware.id = 'voltoCustom.css';
+  return middleware;
+}