@eeacms/volto-eea-website-policy 1.5.0 → 1.6.0

package/CHANGELOG.md

@@ -4,6 +4,20 @@ 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).
 
+### [1.6.0](https://github.com/eea/volto-eea-website-policy/compare/1.5.0...1.6.0) - 22 May 2023
+
+#### :nail_care: Enhancements
+
+- change(blocks):  moved most used block config within eea-website-theme [David Ichim - [`b18d5ce`](https://github.com/eea/volto-eea-website-policy/commit/b18d5ce958c7e7f814969df8051d65c49133ca88)]
+- change(blocks): moved layout settings block within volto-eea-website-theme  #48 from eea/252559-policy-refactoring [ichim-david - [`45fee8e`](https://github.com/eea/volto-eea-website-policy/commit/45fee8e68d1a18d7be77f33a8207524ae6f7d220)]
+- change(blocks): moved layout settings block from volto-eea-policy to volto-eea-website-theme [David Ichim - [`37bc97d`](https://github.com/eea/volto-eea-website-policy/commit/37bc97d0a3db77fa8f31e750be179cb287814217)]
+
+#### :hammer_and_wrench: Others
+
+- Increased package version [Alexandru Ghica - [`174b77e`](https://github.com/eea/volto-eea-website-policy/commit/174b77eccf7ba80286edee8ea30c1a3f2523b200)]
+- prettier fix [Miu Razvan - [`eef9199`](https://github.com/eea/volto-eea-website-policy/commit/eef91996a480b371da69506700285c12adb69167)]
+- prettier fix [Miu Razvan - [`0a3bf2d`](https://github.com/eea/volto-eea-website-policy/commit/0a3bf2de5103fd898e68491207751d39c8510d08)]
+- other: disable tableau and map embed blocks [Miu Razvan - [`a032766`](https://github.com/eea/volto-eea-website-policy/commit/a0327664c25c55beb544dd22ca2e9d5cc6380acd)]
 ### [1.5.0](https://github.com/eea/volto-eea-website-policy/compare/1.4.0...1.5.0) - 24 March 2023
 
 #### :bug: Bug Fixes

package/package.json

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

package/src/index.js

@@ -1,7 +1,5 @@
 import { runtimeConfig } from '@plone/volto/runtime_config';
 import installContextNavigationBlock from '@eeacms/volto-eea-website-policy/components/Blocks/ContextNavigation';
-import installLayoutSettingsBlock from '@eeacms/volto-eea-website-policy/components/Blocks/LayoutSettings';
-import { addStylingFieldsetSchemaEnhancer } from '@eeacms/volto-eea-website-policy/components/Blocks/schema';
 
 const applyConfig = (config) => {
   // #158717#note-25 any path that isn't static, en or controlpanel is treated as external
@@ -59,53 +57,6 @@ const applyConfig = (config) => {
     config.settings.eea.logoTargetUrl = '/en';
   }
 
-  // Block chooser
-  config.blocks.blocksConfig.image.mostUsed = false;
-  config.blocks.blocksConfig.video.mostUsed = false;
-
-  // Grid/Teaser block (kitconcept)
-  if (config.blocks.blocksConfig.__grid) {
-    config.blocks.blocksConfig.__grid.restricted = true;
-  }
-  if (config.blocks.blocksConfig.imagesGrid) {
-    config.blocks.blocksConfig.imagesGrid.restricted = true;
-  }
-  if (config.blocks.blocksConfig.teaser) {
-    config.blocks.blocksConfig.teaser.restricted = true;
-  }
-
-  // Divider
-  if (config.blocks.blocksConfig.dividerBlock) {
-    config.blocks.blocksConfig.dividerBlock.mostUsed = true;
-  }
-
-  // Call to Action
-  if (config.blocks.blocksConfig.callToActionBlock) {
-    config.blocks.blocksConfig.callToActionBlock.mostUsed = true;
-  }
-
-  // Group
-  if (config.blocks.blocksConfig.group) {
-    config.blocks.blocksConfig.group.schemaEnhancer = addStylingFieldsetSchemaEnhancer;
-  }
-
-  // Columns
-  if (config.blocks.blocksConfig.columnsBlock) {
-    config.blocks.blocksConfig.columnsBlock.mostUsed = true;
-    config.blocks.blocksConfig.columnsBlock.schemaEnhancer = addStylingFieldsetSchemaEnhancer;
-  }
-
-  // Accordion
-  if (config.blocks.blocksConfig.accordion) {
-    config.blocks.blocksConfig.accordion.mostUsed = true;
-  }
-
-  // Listing
-  if (config.blocks.blocksConfig.listing) {
-    config.blocks.blocksConfig.listing.title = 'Listing (Content)';
-    config.blocks.blocksConfig.listing.schemaEnhancer = addStylingFieldsetSchemaEnhancer;
-  }
-
   // Custom blocks
   // context navigation
   config = [installContextNavigationBlock].reduce(
@@ -113,17 +64,18 @@ const applyConfig = (config) => {
     config,
   );
 
-  // layout settings
-  config = [installLayoutSettingsBlock].reduce(
-    (acc, apply) => apply(acc),
-    config,
-  );
-
   // Disable some blocks
   if (config.blocks.blocksConfig.imagecards) {
     config.blocks.blocksConfig.imagecards.restricted = true;
   }
 
+  if (config.blocks.blocksConfig.embed_eea_tableau_block) {
+    config.blocks.blocksConfig.embed_eea_tableau_block.restricted = true;
+  }
+  if (config.blocks.blocksConfig.embed_eea_map_block) {
+    config.blocks.blocksConfig.embed_eea_map_block.restricted = true;
+  }
+
   config.settings.apiExpanders = [
     ...config.settings.apiExpanders,
     {

package/src/components/Blocks/LayoutSettings/LayoutSettingsEdit.jsx

@@ -1,32 +0,0 @@
-import React from 'react';
-import { EditSchema } from '@eeacms/volto-eea-website-policy/components/Blocks/LayoutSettings/schema';
-import { BlockDataForm, SidebarPortal } from '@plone/volto/components';
-import LayoutSettingsView from '@eeacms/volto-eea-website-policy/components/Blocks/LayoutSettings/LayoutSettingsView';
-import '@eeacms/volto-eea-website-policy/components/Blocks/LayoutSettings/edit.less';
-
-const LayoutSettingsEdit = (props) => {
-  const schema = EditSchema();
-  return (
-    <>
-      <h3>Page layout settings</h3>
-      <LayoutSettingsView {...props} />
-      <SidebarPortal selected={props.selected}>
-        {props.selected && (
-          <BlockDataForm
-            title={schema.title}
-            schema={schema}
-            formData={props.data}
-            onChangeField={(id, value) => {
-              props.onChangeBlock(props.block, {
-                ...props.data,
-                [id]: value,
-              });
-            }}
-          />
-        )}
-      </SidebarPortal>
-    </>
-  );
-};
-
-export default LayoutSettingsEdit;

package/src/components/Blocks/LayoutSettings/LayoutSettingsView.jsx

@@ -1,15 +0,0 @@
-import React from 'react';
-import { BodyClass } from '@plone/volto/helpers';
-import { getVoltoStyles } from '@eeacms/volto-eea-website-policy/components/Blocks/schema-utils';
-import cx from 'classnames';
-
-const LayoutSettingsView = (props) => {
-  const classNames = getVoltoStyles(props.data);
-  return <BodyClass className={cx(classNames)} />;
-};
-
-function propsAreEqual(prevProps, nextProps) {
-  return prevProps.data === nextProps.data;
-}
-
-export default React.memo(LayoutSettingsView, propsAreEqual);

package/src/components/Blocks/LayoutSettings/edit.less

@@ -1,4 +0,0 @@
-#page-edit .block-editor-layoutSettings,
-#page-add .block-editor-layoutSettings {
-  display: none;
-}

package/src/components/Blocks/LayoutSettings/index.js

@@ -1,24 +0,0 @@
-import codeSVG from '@plone/volto/icons/code.svg';
-import LayoutSettingsView from './LayoutSettingsView';
-import LayoutSettingsEdit from './LayoutSettingsEdit';
-import BlockSettingsSchema from '@plone/volto/components/manage/Blocks/Block/Schema';
-
-export default (config) => {
-  config.blocks.blocksConfig.layoutSettings = {
-    id: 'layoutSettings',
-    title: 'Layout settings',
-    icon: codeSVG,
-    group: 'common',
-    view: LayoutSettingsView,
-    edit: LayoutSettingsEdit,
-    schema: BlockSettingsSchema,
-    restricted: ({ properties }) => {
-      return !!properties['@type'];
-    },
-    mostUsed: true,
-    blockHasOwnFocusManagement: true,
-    sidebarTab: 1,
-  };
-
-  return config;
-};

package/src/components/Blocks/LayoutSettings/schema.js

@@ -1,31 +0,0 @@
-import imageNarrowSVG from '@eeacms/volto-eea-website-policy/components/Blocks/icons/image-narrow.svg';
-import imageFitSVG from '@plone/volto/icons/image-fit.svg';
-import imageWideSVG from '@plone/volto/icons/image-wide.svg';
-
-export const ALIGN_INFO_MAP = {
-  narrow_view: [imageNarrowSVG, 'Narrow width'],
-  container_view: [imageFitSVG, 'Container width'],
-  wide_view: [imageWideSVG, 'Wide width'],
-};
-
-export const EditSchema = () => {
-  return {
-    title: 'Page layout settings',
-    fieldsets: [
-      {
-        id: 'default',
-        title: 'Default',
-        fields: ['layout_size'],
-      },
-    ],
-    required: [],
-    properties: {
-      layout_size: {
-        widget: 'style_align',
-        title: 'Layout size',
-        actions: Object.keys(ALIGN_INFO_MAP),
-        actionsInfoMap: ALIGN_INFO_MAP,
-      },
-    },
-  };
-};

package/src/components/Blocks/icons/image-narrow.svg

@@ -1,5 +0,0 @@
-<svg width="36" height="36" viewBox="0 0 36 36" xmlns="http://www.w3.org/2000/svg">
-<path d="M10 13L11.9333 11V25L10 23H26L24.0667 25V11L26 13H10ZM26 11V18V21.5V23.5V25H10V11H26Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7 31H29V29H7V31Z"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7 7H29V5H7V7Z"/>
-</svg>

package/src/components/Blocks/schema-utils.js

@@ -1,16 +0,0 @@
-export const getVoltoStyles = (props) => {
-  // return an object with same key and value for cx class setting
-  const styles = props ? props : {};
-  const output = {};
-  for (const [key, value] of Object.entries(styles)) {
-    if (key === '@type') {
-      continue;
-    }
-    if (styles[key] === true) {
-      output[key] = key;
-    } else {
-      output[value] = value;
-    }
-  }
-  return output;
-};

package/src/components/Blocks/schema.js

@@ -1,51 +0,0 @@
-import { cloneDeep } from 'lodash';
-import imageNarrowSVG from '@eeacms/volto-eea-website-policy/components/Blocks/icons/image-narrow.svg';
-import imageFitSVG from '@plone/volto/icons/image-fit.svg';
-import imageWideSVG from '@plone/volto/icons/image-wide.svg';
-import imageFullSVG from '@plone/volto/icons/image-full.svg';
-
-export const ALIGN_INFO_MAP = {
-  narrow_width: [imageNarrowSVG, 'Narrow width'],
-  container_width: [imageFitSVG, 'Container width'],
-  wide_width: [imageWideSVG, 'Wide width'],
-  full: [imageFullSVG, 'Full width'],
-};
-
-export const addStylingFieldsetSchemaEnhancer = ({ schema }) => {
-  const applied = schema?.properties?.styles;
-
-  if (!applied) {
-    const resSchema = cloneDeep(schema);
-
-    resSchema.fieldsets.push({
-      id: 'styling',
-      fields: ['styles'],
-      title: 'Styling',
-    });
-    resSchema.properties.styles = {
-      widget: 'object',
-      title: 'Styling',
-      schema: {
-        fieldsets: [
-          {
-            id: 'default',
-            title: 'Default',
-            fields: ['size'],
-          },
-        ],
-        properties: {
-          size: {
-            widget: 'style_align',
-            title: 'Section size',
-            actions: Object.keys(ALIGN_INFO_MAP),
-            actionsInfoMap: ALIGN_INFO_MAP,
-          },
-        },
-        required: [],
-      },
-    };
-    return resSchema;
-  }
-
-  return schema;
-};