@eeacms/volto-eea-website-theme 1.27.0 → 1.27.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/{.project.eslintrc.js → .eslintrc.js} +9 -1
- package/CHANGELOG.md +32 -3
- package/package.json +1 -1
- package/src/components/manage/Blocks/Title/schema.js +1 -1
- package/src/customizations/volto/components/manage/Blocks/Image/schema.js +2 -2
- package/src/customizations/volto/components/manage/Blocks/LeadImage/schema.js +1 -1
- package/src/customizations/volto/components/theme/Header/Header.jsx +2 -2
- package/src/index.js +2 -11
- package/src/index.test.js +0 -6
- package/src/components/theme/AppExtras/RemoveSchema.jsx +0 -29
- package/src/middleware/apiEnhancer.js +0 -11
- package/src/middleware/index.js +0 -10
- package/src/reducers/index.js +0 -18
- package/src/reducers/schema.js +0 -48
@@ -3,7 +3,7 @@ const path = require('path');
|
|
3
3
|
|
4
4
|
const projectRootPath = fs.existsSync('./project')
|
5
5
|
? fs.realpathSync('./project')
|
6
|
-
: fs.realpathSync('
|
6
|
+
: fs.realpathSync(__dirname + '/../../../');
|
7
7
|
const packageJson = require(path.join(projectRootPath, 'package.json'));
|
8
8
|
const jsConfig = require(path.join(projectRootPath, 'jsconfig.json')).compilerOptions;
|
9
9
|
|
@@ -44,5 +44,13 @@ module.exports = {
|
|
44
44
|
},
|
45
45
|
},
|
46
46
|
},
|
47
|
+
rules: {
|
48
|
+
'react/jsx-no-target-blank': [
|
49
|
+
'error',
|
50
|
+
{
|
51
|
+
allowReferrer: true,
|
52
|
+
},
|
53
|
+
],
|
54
|
+
}
|
47
55
|
};
|
48
56
|
|
package/CHANGELOG.md
CHANGED
@@ -4,6 +4,22 @@ All notable changes to this project will be documented in this file. Dates are d
|
|
4
4
|
|
5
5
|
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
6
6
|
|
7
|
+
### [1.27.2](https://github.com/eea/volto-eea-website-theme/compare/1.27.1...1.27.2) - 23 January 2024
|
8
|
+
|
9
|
+
#### :bug: Bug Fixes
|
10
|
+
|
11
|
+
- 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)]
|
12
|
+
|
13
|
+
#### :hammer_and_wrench: Others
|
14
|
+
|
15
|
+
- fix tests [Razvan - [`042330b`](https://github.com/eea/volto-eea-website-theme/commit/042330bc97d32ffe7ba769b4f2453f71cffed706)]
|
16
|
+
- remove RemoveSchema logic [Razvan - [`08d10f8`](https://github.com/eea/volto-eea-website-theme/commit/08d10f8bf6f75478260e4e4c66d7316ba87b907a)]
|
17
|
+
### [1.27.1](https://github.com/eea/volto-eea-website-theme/compare/1.27.0...1.27.1) - 18 January 2024
|
18
|
+
|
19
|
+
#### :bug: Bug Fixes
|
20
|
+
|
21
|
+
- fix: remove norefferer for seo purposes - refs #263008 [Gabriel - [`fab8094`](https://github.com/eea/volto-eea-website-theme/commit/fab80944fa3267ee4c584d2c4f77480d2270242c)]
|
22
|
+
|
7
23
|
### [1.27.0](https://github.com/eea/volto-eea-website-theme/compare/1.26.2...1.27.0) - 17 January 2024
|
8
24
|
|
9
25
|
#### :rocket: New Features
|
@@ -15,9 +31,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
15
31
|
- fix: noreferrer on links - refs #263008 [ichim-david - [`d8f81e0`](https://github.com/eea/volto-eea-website-theme/commit/d8f81e01d9d2666e834ac92b2f34976f25156ea2)]
|
16
32
|
- fix: History diff page overlap - refs #262216 [dobri1408 - [`f580b16`](https://github.com/eea/volto-eea-website-theme/commit/f580b16f24faacb9318402699a1b616814840d63)]
|
17
33
|
|
18
|
-
#### :hammer_and_wrench: Others
|
19
|
-
|
20
|
-
- Release 1.27.0 [Alin Voinea - [`e7acf6d`](https://github.com/eea/volto-eea-website-theme/commit/e7acf6dd3332c090f75a6b1f63fc772912406ec0)]
|
21
34
|
### [1.26.2](https://github.com/eea/volto-eea-website-theme/compare/1.26.1...1.26.2) - 4 January 2024
|
22
35
|
|
23
36
|
### [1.26.1](https://github.com/eea/volto-eea-website-theme/compare/1.26.0...1.26.1) - 14 December 2023
|
@@ -90,6 +103,11 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
90
103
|
- test: Add real image to cypress test [Alin Voinea - [`4ff591a`](https://github.com/eea/volto-eea-website-theme/commit/4ff591ae3318c9588b4e2114582c0fa6cfdf31ae)]
|
91
104
|
- test: Add cypress tests for Image block styling position and align [Alin Voinea - [`7341ef7`](https://github.com/eea/volto-eea-website-theme/commit/7341ef7b92714fc0cc3ab0c31c39033e7b3e19e7)]
|
92
105
|
- Revert "change(tests): commented out rss test since title block config is missing" [Alin Voinea - [`fb61191`](https://github.com/eea/volto-eea-website-theme/commit/fb611918d6ca380b89b594f283dcf9f685a4b294)]
|
106
|
+
- test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`6a3be30`](https://github.com/eea/volto-eea-website-theme/commit/6a3be3092589411af7808a235f76de5222fd3868)]
|
107
|
+
- test: [JENKINS] Run cypress in started frontend container [valentinab25 - [`c3978f2`](https://github.com/eea/volto-eea-website-theme/commit/c3978f23375ef066e9fd6f6c2e34ba6c1c058f69)]
|
108
|
+
- test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`f672779`](https://github.com/eea/volto-eea-website-theme/commit/f672779e845bec9240ccc901e9f53ec80c5a1819)]
|
109
|
+
- test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`ae5d8e3`](https://github.com/eea/volto-eea-website-theme/commit/ae5d8e3f4e04dc2808d47ce2ee886e1b23b528da)]
|
110
|
+
- test: [JENKINS] Improve cypress time [valentinab25 - [`170ff0c`](https://github.com/eea/volto-eea-website-theme/commit/170ff0c8e3b30e69479bdf1117e811fea94f1027)]
|
93
111
|
### [1.23.0](https://github.com/eea/volto-eea-website-theme/compare/1.22.1...1.23.0) - 2 November 2023
|
94
112
|
|
95
113
|
#### :rocket: New Features
|
@@ -102,6 +120,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
102
120
|
|
103
121
|
#### :house: Internal changes
|
104
122
|
|
123
|
+
- chore: [JENKINS] Refactor automated testing [valentinab25 - [`f28fce3`](https://github.com/eea/volto-eea-website-theme/commit/f28fce3d1eb815f95fb9aa40de42b10b7e8e30c5)]
|
105
124
|
- chore: husky, lint-staged use fixed versions [valentinab25 - [`6d15088`](https://github.com/eea/volto-eea-website-theme/commit/6d150886c5aeb2ca0b569270486e60f7cc274e2c)]
|
106
125
|
- chore:volto 16 in tests, update docs, fix stylelint overrides [valentinab25 - [`20c0323`](https://github.com/eea/volto-eea-website-theme/commit/20c032380b33c0077c869a05136f93e2fb68e5d4)]
|
107
126
|
|
@@ -287,6 +306,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
287
306
|
|
288
307
|
#### :house: Internal changes
|
289
308
|
|
309
|
+
- chore: [JENKINS] Deprecate circularity website [valentinab25 - [`370dcbf`](https://github.com/eea/volto-eea-website-theme/commit/370dcbfbf1a8135ce7b1b3b271b004552a631837)]
|
290
310
|
|
291
311
|
#### :hammer_and_wrench: Others
|
292
312
|
|
@@ -442,6 +462,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
442
462
|
|
443
463
|
#### :hammer_and_wrench: Others
|
444
464
|
|
465
|
+
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`6c5e2f8`](https://github.com/eea/volto-eea-website-theme/commit/6c5e2f80456e2061d9e9c15fd0a0b91b9ac70568)]
|
445
466
|
### [1.9.1](https://github.com/eea/volto-eea-website-theme/compare/1.9.0...1.9.1) - 28 February 2023
|
446
467
|
|
447
468
|
#### :bug: Bug Fixes
|
@@ -588,6 +609,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
588
609
|
|
589
610
|
- For some reasons types is a string [Alin Voinea - [`3769a09`](https://github.com/eea/volto-eea-website-theme/commit/3769a0981181d5b633f3498daebbe96be8b4b833)]
|
590
611
|
- Fix(redirect): o.filter - refs #157627 [Alin Voinea - [`deb23da`](https://github.com/eea/volto-eea-website-theme/commit/deb23da846444cc96539697fd798429ae0abe89e)]
|
612
|
+
- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`f1fffc5`](https://github.com/eea/volto-eea-website-theme/commit/f1fffc5db96725440863d545580b4e76cce4b796)]
|
591
613
|
### [1.5.0](https://github.com/eea/volto-eea-website-theme/compare/1.4.2...1.5.0) - 9 January 2023
|
592
614
|
|
593
615
|
#### :hammer_and_wrench: Others
|
@@ -621,6 +643,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
621
643
|
|
622
644
|
- Release 1.4.0 [Alin Voinea - [`bd42a0d`](https://github.com/eea/volto-eea-website-theme/commit/bd42a0d26e928cac5d99933194755da3db06b341)]
|
623
645
|
- bump version to use as volto-eea-design-system [David Ichim - [`f4be047`](https://github.com/eea/volto-eea-website-theme/commit/f4be047328b46399b03b612d378b18aaf82e7dc1)]
|
646
|
+
- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`9b7cfef`](https://github.com/eea/volto-eea-website-theme/commit/9b7cfefb4d34fc1c948015e491feb370f9795bd8)]
|
624
647
|
- test(Jenkins): Run tests and cypress with latest canary @plone/volto [Alin Voinea - [`df252a9`](https://github.com/eea/volto-eea-website-theme/commit/df252a9bfed0bb86cadf53c59dd1603b1e2cd822)]
|
625
648
|
### [1.3.2](https://github.com/eea/volto-eea-website-theme/compare/1.3.1...1.3.2) - 16 December 2022
|
626
649
|
|
@@ -630,6 +653,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
630
653
|
|
631
654
|
#### :hammer_and_wrench: Others
|
632
655
|
|
656
|
+
- Add Sonarqube tag using cca-frontend addons list [EEA Jenkins - [`a43c658`](https://github.com/eea/volto-eea-website-theme/commit/a43c658a7920c8df95e763b9a637f38ce77eba2c)]
|
633
657
|
- Better razzle.config [Tiberiu Ichim - [`81dbf48`](https://github.com/eea/volto-eea-website-theme/commit/81dbf48815fb27facb4f82c9b764540fdf188b2e)]
|
634
658
|
- Better razzle.config [Tiberiu Ichim - [`7bc9da2`](https://github.com/eea/volto-eea-website-theme/commit/7bc9da2cd837ab62a95cd29979cdd9b0055b7d67)]
|
635
659
|
### [1.3.1](https://github.com/eea/volto-eea-website-theme/compare/1.3.0...1.3.1) - 28 November 2022
|
@@ -640,6 +664,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
640
664
|
|
641
665
|
#### :hammer_and_wrench: Others
|
642
666
|
|
667
|
+
- yarn 3 [Alin Voinea - [`ea7a709`](https://github.com/eea/volto-eea-website-theme/commit/ea7a7094945312776e9b6f44e371178603e92139)]
|
643
668
|
### [1.3.0](https://github.com/eea/volto-eea-website-theme/compare/1.2.0...1.3.0) - 22 November 2022
|
644
669
|
|
645
670
|
#### :rocket: New Features
|
@@ -680,6 +705,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
680
705
|
- Add subsite class to body [Tiberiu Ichim - [`74d700f`](https://github.com/eea/volto-eea-website-theme/commit/74d700fbfd6249a8604762a7e4e49cce857db0f3)]
|
681
706
|
- Add subsite info to header [Tiberiu Ichim - [`47daf8b`](https://github.com/eea/volto-eea-website-theme/commit/47daf8bb6374a1222040626b19d4154df7ba1b83)]
|
682
707
|
- fix eslint [Miu Razvan - [`eb8d0a7`](https://github.com/eea/volto-eea-website-theme/commit/eb8d0a790bc70c0aae256c6ff35f63c4885f338e)]
|
708
|
+
- Add Sonarqube tag using circularity-frontend addons list [EEA Jenkins - [`cc578a4`](https://github.com/eea/volto-eea-website-theme/commit/cc578a413b205a8e61e091fab3a88f94cedefc89)]
|
683
709
|
### [1.1.0](https://github.com/eea/volto-eea-website-theme/compare/1.0.0...1.1.0) - 28 October 2022
|
684
710
|
|
685
711
|
#### :nail_care: Enhancements
|
@@ -727,6 +753,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
727
753
|
|
728
754
|
#### :hammer_and_wrench: Others
|
729
755
|
|
756
|
+
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`33b56ac`](https://github.com/eea/volto-eea-website-theme/commit/33b56acb13fbaf0c5b79e8fc6e13c4b699c79c90)]
|
730
757
|
### [0.7.3](https://github.com/eea/volto-eea-website-theme/compare/0.7.2...0.7.3) - 22 September 2022
|
731
758
|
|
732
759
|
#### :hammer_and_wrench: Others
|
@@ -994,6 +1021,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
994
1021
|
- Header refactor, add custom logo #5 [ichim-david - [`4950235`](https://github.com/eea/volto-eea-website-theme/commit/49502358105437cfeac3b144e6d301cb59aa2346)]
|
995
1022
|
- Update footer.config with new publication card component [ichim-david - [`2e38e9a`](https://github.com/eea/volto-eea-website-theme/commit/2e38e9a417f835009d60c80d4eb4b30229f55e45)]
|
996
1023
|
- feature(breadcrumbs): implement eea-design-system breadcrumb as Volto component #32 #7 [ichim-david - [`181af41`](https://github.com/eea/volto-eea-website-theme/commit/181af4125ce2b9ddac56dab4723cb11c26633221)]
|
1024
|
+
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`da8ceb6`](https://github.com/eea/volto-eea-website-theme/commit/da8ceb68ea68bfbc9504e48ccd4d68277f11ab9a)]
|
997
1025
|
- use breadcrumbs from eea-design-system [nileshgulia1 - [`db2f9e9`](https://github.com/eea/volto-eea-website-theme/commit/db2f9e9a4327420a3cce9a9903cd88549b129eab)]
|
998
1026
|
- Update theme.config [ichim-david - [`8eca4f4`](https://github.com/eea/volto-eea-website-theme/commit/8eca4f40397a4aeca6d39029c92db78968d37064)]
|
999
1027
|
- Added keyContent component to theme.config [ichim-david - [`d86f202`](https://github.com/eea/volto-eea-website-theme/commit/d86f202d0274d839487a88b51cae9a0e899beb23)]
|
@@ -1035,4 +1063,5 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
1035
1063
|
|
1036
1064
|
#### :hammer_and_wrench: Others
|
1037
1065
|
|
1066
|
+
- yarn bootstrap [Alin Voinea - [`6995e9e`](https://github.com/eea/volto-eea-website-theme/commit/6995e9e091f21fdbbdffa8a44fc0e2c626f6d46a)]
|
1038
1067
|
- Initial commit [Alin Voinea - [`6a9c03a`](https://github.com/eea/volto-eea-website-theme/commit/6a9c03a7cebe71ca87e82cf58c42904063e9d8d3)]
|
package/package.json
CHANGED
@@ -133,7 +133,7 @@ export default {
|
|
133
133
|
Ex. ri-copyright-line. See{' '}
|
134
134
|
<a
|
135
135
|
target="_blank"
|
136
|
-
rel="noopener
|
136
|
+
rel="noopener"
|
137
137
|
href="https://eea.github.io/volto-eea-design-system/docs/webdev/Guidelines/iconography/#icon-set"
|
138
138
|
>
|
139
139
|
Remix Icon set
|
@@ -80,7 +80,7 @@ export function ImageSchema({ formData, intl }) {
|
|
80
80
|
href="https://www.w3.org/WAI/tutorials/images/decision-tree/"
|
81
81
|
title={intl.formatMessage(messages.openLinkInNewTab)}
|
82
82
|
target="_blank"
|
83
|
-
rel="noopener
|
83
|
+
rel="noopener"
|
84
84
|
>
|
85
85
|
{intl.formatMessage(messages.AltTextHintLinkText)}
|
86
86
|
</a>{' '}
|
@@ -117,7 +117,7 @@ export function ImageSchema({ formData, intl }) {
|
|
117
117
|
Ex. ri-copyright-line. See{' '}
|
118
118
|
<a
|
119
119
|
target="_blank"
|
120
|
-
rel="noopener
|
120
|
+
rel="noopener"
|
121
121
|
href="https://eea.github.io/volto-eea-design-system/docs/webdev/Guidelines/iconography/#icon-set"
|
122
122
|
>
|
123
123
|
Remix Icon set
|
@@ -95,7 +95,7 @@ export function LeadImageSchema({ formData, intl }) {
|
|
95
95
|
Ex. ri-copyright-line. See{' '}
|
96
96
|
<a
|
97
97
|
target="_blank"
|
98
|
-
rel="noopener
|
98
|
+
rel="noopener"
|
99
99
|
href="https://eea.github.io/volto-eea-design-system/docs/webdev/Guidelines/iconography/#icon-set"
|
100
100
|
>
|
101
101
|
Remix Icon set
|
@@ -116,7 +116,7 @@ const EEAHeader = ({ pathname, token, items, history, subsite }) => {
|
|
116
116
|
<a
|
117
117
|
href="https://europa.eu/european-union/contact/institutions-bodies_en"
|
118
118
|
target="_blank"
|
119
|
-
rel="
|
119
|
+
rel="noopener"
|
120
120
|
onKeyDown={(evt) => evt.stopPropagation()}
|
121
121
|
>
|
122
122
|
See all EU institutions and bodies
|
@@ -140,7 +140,7 @@ const EEAHeader = ({ pathname, token, items, history, subsite }) => {
|
|
140
140
|
href={item.href}
|
141
141
|
className="site"
|
142
142
|
target="_blank"
|
143
|
-
rel="
|
143
|
+
rel="noopener"
|
144
144
|
onKeyDown={(evt) => evt.stopPropagation()}
|
145
145
|
>
|
146
146
|
{item.title}
|
package/src/index.js
CHANGED
@@ -26,8 +26,6 @@ import contentBoxSVG from './icons/content-box.svg';
|
|
26
26
|
import okMiddleware from './middleware/ok';
|
27
27
|
import voltoCustomMiddleware from './middleware/voltoCustom';
|
28
28
|
import installSlate from './slate';
|
29
|
-
import installReducers from './reducers';
|
30
|
-
import installMiddlewares from './middleware';
|
31
29
|
|
32
30
|
import { nanoid } from '@plone/volto-slate/utils';
|
33
31
|
import { v4 as uuid } from 'uuid';
|
@@ -88,11 +86,7 @@ function tabVariationCustomization(tabs_block_variations, config) {
|
|
88
86
|
innerSchema.properties.icon.description = (
|
89
87
|
<>
|
90
88
|
Ex. ri-home-line. See{' '}
|
91
|
-
<a
|
92
|
-
target="_blank"
|
93
|
-
rel="noopener noreferrer"
|
94
|
-
href="https://remixicon.com/"
|
95
|
-
>
|
89
|
+
<a target="_blank" rel="noopener" href="https://remixicon.com/">
|
96
90
|
Remix Icon set
|
97
91
|
</a>
|
98
92
|
</>
|
@@ -532,10 +526,7 @@ const applyConfig = (config) => {
|
|
532
526
|
});
|
533
527
|
|
534
528
|
// Custom blocks: Title
|
535
|
-
return [installCustomTitle,
|
536
|
-
(acc, apply) => apply(acc),
|
537
|
-
config,
|
538
|
-
);
|
529
|
+
return [installCustomTitle].reduce((acc, apply) => apply(acc), config);
|
539
530
|
};
|
540
531
|
|
541
532
|
export default applyConfig;
|
package/src/index.test.js
CHANGED
@@ -45,10 +45,6 @@ jest.mock(
|
|
45
45
|
jest.mock('@plone/volto/components', () => ({
|
46
46
|
Icon: 'MockedIcon',
|
47
47
|
}));
|
48
|
-
jest.mock(
|
49
|
-
'@eeacms/volto-eea-website-theme/components/theme/AppExtras/RemoveSchema',
|
50
|
-
() => 'MockedRemoveSchema',
|
51
|
-
);
|
52
48
|
|
53
49
|
global.__SERVER__ = true;
|
54
50
|
|
@@ -144,7 +140,6 @@ describe('applyConfig', () => {
|
|
144
140
|
{ match: '', component: 'MockedDraftBackground' },
|
145
141
|
{ match: '', component: 'MockedSubsiteClass' },
|
146
142
|
{ match: '', component: BaseTag },
|
147
|
-
{ match: '*', exclude: '/**/diff', component: 'MockedRemoveSchema' },
|
148
143
|
]);
|
149
144
|
expect(config.settings.available_colors).toEqual(eea.colors);
|
150
145
|
expect(config.settings.hasLanguageDropdown).toBe(false);
|
@@ -303,7 +298,6 @@ describe('applyConfig', () => {
|
|
303
298
|
{ match: '', component: 'MockedDraftBackground' },
|
304
299
|
{ match: '', component: 'MockedSubsiteClass' },
|
305
300
|
{ match: '', component: BaseTag },
|
306
|
-
{ match: '*', exclude: '/**/diff', component: 'MockedRemoveSchema' },
|
307
301
|
]);
|
308
302
|
expect(config.settings.available_colors).toEqual(eea.colors);
|
309
303
|
expect(config.settings.hasLanguageDropdown).toBe(false);
|
@@ -1,29 +0,0 @@
|
|
1
|
-
import { useEffect } from 'react';
|
2
|
-
import { connect } from 'react-redux';
|
3
|
-
import { removeSchema } from '@eeacms/volto-eea-website-theme/actions';
|
4
|
-
import { flattenToAppURL } from '@plone/volto/helpers';
|
5
|
-
|
6
|
-
function RemoveSchema({ removeSchema, contentLoading, content, schema }) {
|
7
|
-
useEffect(() => {
|
8
|
-
if (
|
9
|
-
!schema.loading &&
|
10
|
-
!contentLoading &&
|
11
|
-
schema.schema &&
|
12
|
-
(!content ||
|
13
|
-
(content && schema.contentUrl !== flattenToAppURL(content['@id'])))
|
14
|
-
) {
|
15
|
-
removeSchema();
|
16
|
-
}
|
17
|
-
}, [removeSchema, content, contentLoading, schema]);
|
18
|
-
|
19
|
-
return null;
|
20
|
-
}
|
21
|
-
|
22
|
-
export default connect(
|
23
|
-
(state) => ({
|
24
|
-
content: state.content.data,
|
25
|
-
contentLoading: state.content.get.loading,
|
26
|
-
schema: state.schema,
|
27
|
-
}),
|
28
|
-
{ removeSchema },
|
29
|
-
)(RemoveSchema);
|
package/src/middleware/index.js
DELETED
package/src/reducers/index.js
DELETED
@@ -1,18 +0,0 @@
|
|
1
|
-
import RemoveSchema from '@eeacms/volto-eea-website-theme/components/theme/AppExtras/RemoveSchema';
|
2
|
-
|
3
|
-
import schema from './schema';
|
4
|
-
|
5
|
-
export default function applyConfig(config) {
|
6
|
-
config.addonReducers.schema = schema;
|
7
|
-
|
8
|
-
config.settings.appExtras = [
|
9
|
-
...(config.settings.appExtras || []),
|
10
|
-
{
|
11
|
-
match: '*',
|
12
|
-
exclude: '/**/diff',
|
13
|
-
component: RemoveSchema,
|
14
|
-
},
|
15
|
-
];
|
16
|
-
|
17
|
-
return config;
|
18
|
-
}
|
package/src/reducers/schema.js
DELETED
@@ -1,48 +0,0 @@
|
|
1
|
-
import voltoSchema from '@plone/volto/reducers/schema/schema';
|
2
|
-
|
3
|
-
const initialState = {
|
4
|
-
contentUrl: null,
|
5
|
-
contentType: null,
|
6
|
-
error: null,
|
7
|
-
loaded: false,
|
8
|
-
loading: false,
|
9
|
-
schema: null,
|
10
|
-
post: {
|
11
|
-
loaded: false,
|
12
|
-
loading: false,
|
13
|
-
error: null,
|
14
|
-
},
|
15
|
-
update: {
|
16
|
-
loaded: false,
|
17
|
-
loading: false,
|
18
|
-
error: null,
|
19
|
-
},
|
20
|
-
put: {
|
21
|
-
loaded: false,
|
22
|
-
loading: false,
|
23
|
-
error: null,
|
24
|
-
},
|
25
|
-
};
|
26
|
-
|
27
|
-
export default function schema(state = initialState, action = {}) {
|
28
|
-
if (action.type === 'REMOVE_SCHEMA') {
|
29
|
-
return {
|
30
|
-
...state,
|
31
|
-
error: null,
|
32
|
-
loading: false,
|
33
|
-
loaded: false,
|
34
|
-
schema: null,
|
35
|
-
};
|
36
|
-
}
|
37
|
-
|
38
|
-
if (action.type === 'GET_SCHEMA_SUCCESS') {
|
39
|
-
const [contentUrl, contentType] = action._request.path.split('/@types/');
|
40
|
-
return {
|
41
|
-
...voltoSchema(state, action),
|
42
|
-
contentUrl,
|
43
|
-
contentType,
|
44
|
-
};
|
45
|
-
}
|
46
|
-
|
47
|
-
return voltoSchema(state, action);
|
48
|
-
}
|