@eeacms/volto-eea-website-theme 1.27.1 → 1.27.2

package/.eslintrc.js

@@ -3,7 +3,7 @@ const path = require('path');
 
 const projectRootPath = fs.existsSync('./project')
   ? fs.realpathSync('./project')
-  : fs.realpathSync('./../../../');
+  : fs.realpathSync(__dirname + '/../../../');
 const packageJson = require(path.join(projectRootPath, 'package.json'));
 const jsConfig = require(path.join(projectRootPath, 'jsconfig.json')).compilerOptions;
 
@@ -51,6 +51,6 @@ module.exports = {
         allowReferrer: true,
       },
     ],
-  },
+  }
 };
 

package/CHANGELOG.md

@@ -4,6 +4,16 @@ 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.27.2](https://github.com/eea/volto-eea-website-theme/compare/1.27.1...1.27.2) - 23 January 2024
+
+#### :bug: Bug Fixes
+
+- fix(lint): service so that it work with editor and command line tool [David Ichim - [`ad43bc2`](https://github.com/eea/volto-eea-website-theme/commit/ad43bc2f9bfc3e272d30b35db9d4b160a8edcbec)]
+
+#### :hammer_and_wrench: Others
+
+- fix tests [Razvan - [`042330b`](https://github.com/eea/volto-eea-website-theme/commit/042330bc97d32ffe7ba769b4f2453f71cffed706)]
+- remove RemoveSchema logic [Razvan - [`08d10f8`](https://github.com/eea/volto-eea-website-theme/commit/08d10f8bf6f75478260e4e4c66d7316ba87b907a)]
 ### [1.27.1](https://github.com/eea/volto-eea-website-theme/compare/1.27.0...1.27.1) - 18 January 2024
 
 #### :bug: Bug Fixes

package/package.json

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

package/src/index.js

@@ -26,8 +26,6 @@ import contentBoxSVG from './icons/content-box.svg';
 import okMiddleware from './middleware/ok';
 import voltoCustomMiddleware from './middleware/voltoCustom';
 import installSlate from './slate';
-import installReducers from './reducers';
-import installMiddlewares from './middleware';
 
 import { nanoid } from '@plone/volto-slate/utils';
 import { v4 as uuid } from 'uuid';
@@ -528,10 +526,7 @@ const applyConfig = (config) => {
   });
 
   // Custom blocks: Title
-  return [installCustomTitle, installMiddlewares, installReducers].reduce(
-    (acc, apply) => apply(acc),
-    config,
-  );
+  return [installCustomTitle].reduce((acc, apply) => apply(acc), config);
 };
 
 export default applyConfig;

package/src/index.test.js

@@ -45,10 +45,6 @@ jest.mock(
 jest.mock('@plone/volto/components', () => ({
   Icon: 'MockedIcon',
 }));
-jest.mock(
-  '@eeacms/volto-eea-website-theme/components/theme/AppExtras/RemoveSchema',
-  () => 'MockedRemoveSchema',
-);
 
 global.__SERVER__ = true;
 
@@ -144,7 +140,6 @@ describe('applyConfig', () => {
       { match: '', component: 'MockedDraftBackground' },
       { match: '', component: 'MockedSubsiteClass' },
       { match: '', component: BaseTag },
-      { match: '*', exclude: '/**/diff', component: 'MockedRemoveSchema' },
     ]);
     expect(config.settings.available_colors).toEqual(eea.colors);
     expect(config.settings.hasLanguageDropdown).toBe(false);
@@ -303,7 +298,6 @@ describe('applyConfig', () => {
       { match: '', component: 'MockedDraftBackground' },
       { match: '', component: 'MockedSubsiteClass' },
       { match: '', component: BaseTag },
-      { match: '*', exclude: '/**/diff', component: 'MockedRemoveSchema' },
     ]);
     expect(config.settings.available_colors).toEqual(eea.colors);
     expect(config.settings.hasLanguageDropdown).toBe(false);

package/src/components/theme/AppExtras/RemoveSchema.jsx

@@ -1,29 +0,0 @@
-import { useEffect } from 'react';
-import { connect } from 'react-redux';
-import { removeSchema } from '@eeacms/volto-eea-website-theme/actions';
-import { flattenToAppURL } from '@plone/volto/helpers';
-
-function RemoveSchema({ removeSchema, contentLoading, content, schema }) {
-  useEffect(() => {
-    if (
-      !schema.loading &&
-      !contentLoading &&
-      schema.schema &&
-      (!content ||
-        (content && schema.contentUrl !== flattenToAppURL(content['@id'])))
-    ) {
-      removeSchema();
-    }
-  }, [removeSchema, content, contentLoading, schema]);
-
-  return null;
-}
-
-export default connect(
-  (state) => ({
-    content: state.content.data,
-    contentLoading: state.content.get.loading,
-    schema: state.schema,
-  }),
-  { removeSchema },
-)(RemoveSchema);

package/src/middleware/apiEnhancer.js

@@ -1,11 +0,0 @@
-export default function apiEnhancer(middlewares) {
-  return [
-    () => (next) => (action) => {
-      if (action.request) {
-        return next({ ...action, _request: action.request });
-      }
-      return next(action);
-    },
-    ...middlewares,
-  ];
-}

package/src/middleware/index.js

@@ -1,10 +0,0 @@
-import apiEnhancer from './apiEnhancer';
-
-export default function applyConfig(config) {
-  config.settings.storeExtenders = [
-    ...(config.settings.storeExtenders || []),
-    apiEnhancer,
-  ];
-
-  return config;
-}

package/src/reducers/index.js

@@ -1,18 +0,0 @@
-import RemoveSchema from '@eeacms/volto-eea-website-theme/components/theme/AppExtras/RemoveSchema';
-
-import schema from './schema';
-
-export default function applyConfig(config) {
-  config.addonReducers.schema = schema;
-
-  config.settings.appExtras = [
-    ...(config.settings.appExtras || []),
-    {
-      match: '*',
-      exclude: '/**/diff',
-      component: RemoveSchema,
-    },
-  ];
-
-  return config;
-}

package/src/reducers/schema.js

@@ -1,48 +0,0 @@
-import voltoSchema from '@plone/volto/reducers/schema/schema';
-
-const initialState = {
-  contentUrl: null,
-  contentType: null,
-  error: null,
-  loaded: false,
-  loading: false,
-  schema: null,
-  post: {
-    loaded: false,
-    loading: false,
-    error: null,
-  },
-  update: {
-    loaded: false,
-    loading: false,
-    error: null,
-  },
-  put: {
-    loaded: false,
-    loading: false,
-    error: null,
-  },
-};
-
-export default function schema(state = initialState, action = {}) {
-  if (action.type === 'REMOVE_SCHEMA') {
-    return {
-      ...state,
-      error: null,
-      loading: false,
-      loaded: false,
-      schema: null,
-    };
-  }
-
-  if (action.type === 'GET_SCHEMA_SUCCESS') {
-    const [contentUrl, contentType] = action._request.path.split('/@types/');
-    return {
-      ...voltoSchema(state, action),
-      contentUrl,
-      contentType,
-    };
-  }
-
-  return voltoSchema(state, action);
-}