@eeacms/volto-cca-policy 0.3.64 → 0.3.66

package/src/components/theme/Widgets/PromotionalImageWidget.jsx

@@ -72,6 +72,24 @@ const messages = defineMessages({
  * ```
  *
  */
+function parseDataURL(dataUrl) {
+  if (!dataUrl.startsWith('data:')) return null;
+
+  const commaIndex = dataUrl.indexOf(',');
+  if (commaIndex === -1) return null;
+
+  const meta = dataUrl.slice(5, commaIndex);
+  const data = dataUrl.slice(commaIndex + 1);
+
+  const [contentType, encoding] = meta.split(';');
+
+  return {
+    'content-type': contentType || '',
+    encoding: encoding || '',
+    data: data || '',
+  };
+}
+
 const FileWidget = (props) => {
   const { id, value, onChange, isDisabled } = props;
   const [fileType, setFileType] = React.useState(false);
@@ -99,27 +117,31 @@ const FileWidget = (props) => {
     const file = files[0];
     if (!validateFileUploadSize(file, intl.formatMessage)) return;
     readAsDataURL(file).then((data) => {
-      const fields = data.match(/^data:(.*);(.*),(.*)$/);
-      onChange(id, {
-        data: fields[3],
-        encoding: fields[2],
-        'content-type': fields[1],
-        filename: file.name,
-      });
+      const fields = parseDataURL(data);
+      if (fields) {
+        onChange(id, {
+          data: fields.data,
+          encoding: fields.encoding,
+          'content-type': fields['content-type'],
+          filename: file.name,
+        });
+      }
     });
 
-    let reader = new FileReader();
+    const reader = new FileReader();
     reader.onload = function () {
-      const fields = reader.result.match(/^data:(.*);(.*),(.*)$/);
-      if (imageMimetypes.includes(fields[1])) {
+      const parsed = parseDataURL(reader.result);
+      if (parsed && imageMimetypes.includes(parsed['content-type'])) {
         setFileType(true);
-        let imagePreview = document.getElementById(`field-${id}-image`);
-        imagePreview.src = reader.result;
+        const imagePreview = document.getElementById(`field-${id}-image`);
+        if (imagePreview) {
+          imagePreview.src = reader.result;
+        }
       } else {
         setFileType(false);
       }
     };
-    reader.readAsDataURL(files[0]);
+    reader.readAsDataURL(file);
   };
 
   return (

package/src/components/theme/Widgets/PromotionalImageWidget.test.jsx

@@ -48,7 +48,7 @@ describe('FileWidget', () => {
           fieldSet="default"
           onChange={() => {}}
           value={{
-            download: 'http://myfile',
+            download: 'https://myfile',
             'content-type': 'image/png',
             filename: 'myfile',
             encoding: '',

package/src/customizations/volto/components/theme/View/DefaultView.jsx

@@ -24,6 +24,7 @@ import ContextNavigation from '@plone/volto/components/theme/Navigation/ContextN
 import {
   BannerTitle,
   ASTNavigation,
+  PortalMessage,
 } from '@eeacms/volto-cca-policy/components';
 
 import { isEqual } from 'lodash';
@@ -92,6 +93,7 @@ const DefaultView = (props) => {
       <>
         {currentNavigation ? (
           <Container id="page-document">
+            <PortalMessage content={content} />
             <Grid>
               <Grid.Column width={12 - gridColumns}>
                 <BannerTitle {...props} />
@@ -113,6 +115,7 @@ const DefaultView = (props) => {
           </Container>
         ) : astNavigation ? (
           <Container id="page-document">
+            <PortalMessage content={content} />
             <Grid>
               <Grid.Column mobile={12} tablet={12} computer={4}>
                 <ASTNavigation astNavigation={astNavigation} />
@@ -124,7 +127,8 @@ const DefaultView = (props) => {
             </Grid>
           </Container>
         ) : (
-          <Container id="page-document" className="here">
+          <Container id="page-document">
+            <PortalMessage content={content} />
             {!isChromeless && <BannerTitle {...props} />}
             <RenderBlocks {...props} path={path} />
           </Container>

package/src/index.js

@@ -522,7 +522,7 @@ const applyConfig = (config) => {
     },
     {
       match: {
-        path: /(.*)\/add$/,
+        path: /^.*\/add$/,
       },
       component: RedirectToLogin,
     },
@@ -532,13 +532,13 @@ const applyConfig = (config) => {
     ...config.settings.apiExpanders,
     {
       match: {
-        path: /(.*)\/policy-context\/country-profiles\/(.*)/,
+        path: /\/policy-context\/country-profiles\/.+/,
       },
       GET_CONTENT: ['siblings'],
     },
     {
       match: {
-        path: /(.*)\/countries-regions\/countries\/(.*)/,
+        path: /\/countries-regions\/countries\/.+/,
       },
       GET_CONTENT: ['siblings'],
     },

package/src/utils.js

@@ -101,6 +101,15 @@ export const formatTextToHTML = (text) => {
     : `<p>${formattedText}</p>`;
 };
 
+const trimTrailingChars = (str) => {
+  const charsToTrim = ['-', '–', ';', ',', ':', ' '];
+  let end = str.length;
+  while (end > 0 && charsToTrim.includes(str[end - 1])) {
+    end--;
+  }
+  return str.substring(0, end);
+};
+
 export const extractPlanNameAndURL = (text) => {
   if (!text) return { name: '', url: '' };
 
@@ -114,12 +123,8 @@ export const extractPlanNameAndURL = (text) => {
 
   if (url) {
     // Remove URL and any punctuation before it
-    name = name
-      .replace(`(${url})`, '')
-      .replace(url, '')
-      .replace(/[-–;,:\s]+$/, '')
-      .replace(/[-–;,:\s]+$/, '')
-      .trim();
+    name = name.replace(`(${url})`, '').replace(url, '');
+    name = trimTrailingChars(name).trim();
   }
 
   return {

package/theme/extras/header.overrides

@@ -34,3 +34,17 @@
     cursor: auto !important;
   }
 }
+
+
+.top-header-right-items {
+  display: flex;
+  gap: 1.5rem;
+
+  a,
+  a:active,
+  a:hover,
+  a:focus,
+  a:visited {
+    color: @dropdownColor;
+  }
+}