Skip to content

Commit

Permalink
Merge pull request #223 from eea/develop
Browse files Browse the repository at this point in the history
Release
  • Loading branch information
avoinea authored Apr 3, 2024
2 parents 246b37b + 56015f4 commit 3fe3788
Show file tree
Hide file tree
Showing 10 changed files with 496 additions and 25 deletions.
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,25 @@ 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.33.0](https://github.com/eea/volto-eea-website-theme/compare/1.32.1...1.33.0) - 2 April 2024

#### :rocket: New Features

- feat(columnsBlock): move tocEntries definition to volto-columns-block [Miu Razvan - [`eb55ff8`](https://github.com/eea/volto-eea-website-theme/commit/eb55ff8753e443c83fd4a8bb3dca8c2b2a78a782)]

#### :bug: Bug Fixes

- fix(toc): use the correct function to render entries in toc [Miu Razvan - [`869ae7c`](https://github.com/eea/volto-eea-website-theme/commit/869ae7cbe2ec555ebfe563d66bb00e5bc80651c2)]

#### :house: Internal changes

- chore: Cleanup package.json [alin - [`c5a1c37`](https://github.com/eea/volto-eea-website-theme/commit/c5a1c370eec27a0ebea9df51dde12040580def2f)]

#### :hammer_and_wrench: Others

- Update index.js to fix jslint issue [ichim-david - [`89b9cef`](https://github.com/eea/volto-eea-website-theme/commit/89b9cefbe35f780bdd07fa6f44234fbfc2fe7bb0)]
- Update package.json [ichim-david - [`a0ecadf`](https://github.com/eea/volto-eea-website-theme/commit/a0ecadf6efcdeb0fec4ee533d27a6c6787029373)]
- Revert "fix(blocks): Allow image block urls to be external (#214)" [David Ichim - [`2bbc620`](https://github.com/eea/volto-eea-website-theme/commit/2bbc620d0a375d69ba7982c8e3113628365bb8da)]
### [1.32.1](https://github.com/eea/volto-eea-website-theme/compare/1.32.0...1.32.1) - 26 March 2024

#### :rocket: New Features
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@eeacms/volto-eea-website-theme",
"version": "1.32.1",
"version": "1.33.0",
"description": "@eeacms/volto-eea-website-theme: Volto add-on",
"main": "src/index.js",
"author": "European Environment Agency: IDM2 A-Team",
Expand Down Expand Up @@ -79,4 +79,4 @@
"cypress:open": "make cypress-open",
"prepare": "husky install"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
import React from 'react';
import { render } from '@testing-library/react';
import { Provider } from 'react-intl-redux';
import configureStore from 'redux-mock-store';
import { Router } from 'react-router-dom';
import { createMemoryHistory } from 'history';
import LayoutSettingsView from './LayoutSettingsView';

const mockStore = configureStore();
let history = createMemoryHistory();

describe('LayoutSettingsView Component', () => {
it('renders without crashing', () => {
const store = mockStore({
intl: {
locale: 'en',
messages: {},
},
});

const data = {
'@layout': 'e28ec238-4cd7-4b72-8025-66da44a6062f',
'@type': 'layoutSettings',
block: '87911ec6-4242-4bae-b6a5-9b28151169fa',
body_class: 'body-class-1',
layout_size: 'container_view',
};

const { container } = render(
<Provider store={store}>
<Router history={history}>
<LayoutSettingsView data={data} />
</Router>
</Provider>,
);

expect(container).toBeTruthy();
});
});

describe('LayoutSettingsView Component', () => {
it('renders without crashing with multiple classes', () => {
const store = mockStore({
intl: {
locale: 'en',
messages: {},
},
});

const data = {
'@layout': 'e28ec238-4cd7-4b72-8025-66da44a6062f',
'@type': 'layoutSettings',
block: '87911ec6-4242-4bae-b6a5-9b28151169fa',
body_class: ['body-class-1', 'body-class-2'],
layout_size: 'container_view',
};

const { container } = render(
<Provider store={store}>
<Router history={history}>
<LayoutSettingsView data={data} />
</Router>
</Provider>,
);

expect(container).toBeTruthy();
});
});
1 change: 1 addition & 0 deletions src/components/manage/Blocks/LayoutSettings/schema.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export const EditSchema = () => {
['homepage', 'Homepage'],
['homepage-inverse', 'Homepage inverse'],
],
widget: 'creatable_select',
},
},
};
Expand Down
Loading

0 comments on commit 3fe3788

Please sign in to comment.