@plone/volto 19.0.0-alpha.0 → 19.0.0-alpha.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/.eslintignore +1 -0
- package/.eslintrc +2 -0
- package/CHANGELOG.md +63 -2
- package/locales/ca/LC_MESSAGES/volto.po +15 -0
- package/locales/ca.json +1 -1
- package/locales/de/LC_MESSAGES/volto.po +15 -0
- package/locales/de.json +1 -1
- package/locales/en/LC_MESSAGES/volto.po +15 -0
- package/locales/en.json +1 -1
- package/locales/es/LC_MESSAGES/volto.po +15 -0
- package/locales/es.json +1 -1
- package/locales/eu/LC_MESSAGES/volto.po +15 -0
- package/locales/eu.json +1 -1
- package/locales/fi/LC_MESSAGES/volto.po +15 -0
- package/locales/fi.json +1 -1
- package/locales/fr/LC_MESSAGES/volto.po +15 -0
- package/locales/fr.json +1 -1
- package/locales/hi/LC_MESSAGES/volto.po +15 -0
- package/locales/hi.json +1 -1
- package/locales/it/LC_MESSAGES/volto.po +15 -0
- package/locales/it.json +1 -1
- package/locales/ja/LC_MESSAGES/volto.po +15 -0
- package/locales/ja.json +1 -1
- package/locales/nl/LC_MESSAGES/volto.po +15 -0
- package/locales/nl.json +1 -1
- package/locales/pt/LC_MESSAGES/volto.po +15 -0
- package/locales/pt.json +1 -1
- package/locales/pt_BR/LC_MESSAGES/volto.po +15 -0
- package/locales/pt_BR.json +1 -1
- package/locales/ro/LC_MESSAGES/volto.po +15 -0
- package/locales/ro.json +1 -1
- package/locales/ru/LC_MESSAGES/volto.po +15 -0
- package/locales/ru.json +1 -1
- package/locales/volto.pot +15 -0
- package/locales/zh_CN/LC_MESSAGES/volto.po +15 -0
- package/locales/zh_CN.json +1 -1
- package/package.json +15 -8
- package/src/actions/actions/actions.test.js +3 -3
- package/src/actions/addons/addons.test.js +15 -12
- package/src/actions/aliases/aliases.test.js +1 -1
- package/src/actions/querystring/querystring.test.js +2 -2
- package/src/actions/types/types.test.js +1 -1
- package/src/components/manage/Actions/Actions.test.jsx +5 -1
- package/src/components/manage/Add/Add.jsx +22 -20
- package/src/components/manage/Add/Add.test.jsx +6 -3
- package/src/components/manage/Aliases/Aliases.test.jsx +7 -7
- package/src/components/manage/Blocks/Block/BlocksForm.jsx +1 -0
- package/src/components/manage/Blocks/Block/BlocksForm.test.jsx +48 -16
- package/src/components/manage/Blocks/Block/Edit.jsx +2 -1
- package/src/components/manage/Blocks/Block/Settings.test.jsx +5 -1
- package/src/components/manage/Blocks/Block/StyleWrapper.jsx +11 -3
- package/src/components/manage/Blocks/Description/View.test.jsx +1 -1
- package/src/components/manage/Blocks/HTML/Edit.test.jsx +12 -5
- package/src/components/manage/Blocks/HTML/View.test.jsx +1 -1
- package/src/components/manage/Blocks/Image/ImageSidebar.test.jsx +6 -2
- package/src/components/manage/Blocks/LeadImage/LeadImageSidebar.test.jsx +8 -1
- package/src/components/manage/Blocks/Listing/View.test.jsx +3 -1
- package/src/components/manage/Blocks/Maps/MapsSidebar.test.jsx +5 -1
- package/src/components/manage/Blocks/Search/components/DateRangeFacet.test.jsx +13 -7
- package/src/components/manage/Blocks/Search/components/SelectFacet.test.jsx +12 -6
- package/src/components/manage/Blocks/Title/Edit.jsx +8 -2
- package/src/components/manage/Blocks/ToC/variations/DefaultTocRenderer.test.jsx +11 -1
- package/src/components/manage/Blocks/Video/VideoSidebar.test.jsx +5 -1
- package/src/components/manage/ConditionalLink/ConditionalLink.test.tsx +109 -0
- package/src/components/manage/ConditionalLink/ConditionalLink.tsx +36 -0
- package/src/components/manage/Contents/Contents.test.jsx +29 -13
- package/src/components/manage/Contents/ContentsPropertiesModal.test.jsx +5 -1
- package/src/components/manage/Contents/ContentsRenameModal.test.jsx +5 -1
- package/src/components/manage/Contents/ContentsTagsModal.test.jsx +5 -1
- package/src/components/manage/Contents/ContentsWorkflowModal.test.jsx +5 -1
- package/src/components/manage/Contents/__mocks__/index.tsx +16 -0
- package/src/components/manage/Contents/__mocks__/index.vitest.tsx +5 -0
- package/src/components/manage/Controlpanels/AddonsControlpanel.test.jsx +28 -3
- package/src/components/manage/Controlpanels/Aliases.test.jsx +35 -3
- package/src/components/manage/Controlpanels/ContentType.test.jsx +29 -3
- package/src/components/manage/Controlpanels/ContentTypeLayout.test.jsx +4 -2
- package/src/components/manage/Controlpanels/ContentTypes.test.jsx +25 -2
- package/src/components/manage/Controlpanels/Controlpanel.test.jsx +37 -6
- package/src/components/manage/Controlpanels/Controlpanels.test.jsx +47 -3
- package/src/components/manage/Controlpanels/Groups/GroupsControlpanel.test.jsx +15 -9
- package/src/components/manage/Controlpanels/ModerateComments.test.jsx +31 -5
- package/src/components/manage/Controlpanels/Rules/AddRule.test.jsx +13 -4
- package/src/components/manage/Controlpanels/Rules/ConfigureRule.test.jsx +9 -5
- package/src/components/manage/Controlpanels/Rules/EditRule.test.jsx +12 -4
- package/src/components/manage/Controlpanels/Rules/Rules.test.jsx +7 -3
- package/src/components/manage/Controlpanels/UndoControlpanel.test.jsx +33 -4
- package/src/components/manage/Controlpanels/Users/UserGroupMembershipControlPanel.test.jsx +3 -1
- package/src/components/manage/Controlpanels/Users/UsersControlpanel.test.jsx +15 -9
- package/src/components/manage/Delete/Delete.test.jsx +45 -4
- package/src/components/manage/Diff/Diff.test.jsx +15 -6
- package/src/components/manage/Diff/DiffField.test.jsx +12 -6
- package/src/components/manage/Display/Display.test.jsx +17 -6
- package/src/components/manage/Edit/Edit.test.jsx +11 -3
- package/src/components/manage/Form/BlockDataForm.test.jsx +5 -1
- package/src/components/manage/Form/Form.jsx +32 -0
- package/src/components/manage/Form/Form.test.jsx +27 -19
- package/src/components/manage/Form/InlineForm.test.jsx +5 -1
- package/src/components/manage/Form/ModalForm.test.jsx +5 -1
- package/src/components/manage/Form/__mocks__/index.tsx +17 -0
- package/src/components/manage/Form/__mocks__/index.vitest.tsx +73 -0
- package/src/components/manage/History/History.test.jsx +3 -1
- package/src/components/manage/LinksToItem/LinksToItem.test.jsx +6 -4
- package/src/components/manage/MaybeWrap/MaybeWrap.tsx +15 -0
- package/src/components/manage/Multilingual/ManageTranslations.test.jsx +3 -2
- package/src/components/manage/Preferences/ChangePassword.test.jsx +9 -2
- package/src/components/manage/Preferences/PersonalInformation.test.jsx +3 -1
- package/src/components/manage/Preferences/PersonalPreferences.test.jsx +20 -7
- package/src/components/manage/Rules/Rules.test.jsx +6 -3
- package/src/components/manage/Sharing/Sharing.test.jsx +3 -1
- package/src/components/manage/Sidebar/ObjectBrowserNav.test.jsx +3 -3
- package/src/components/manage/Toolbar/More.test.jsx +6 -7
- package/src/components/manage/UniversalLink/UniversalLink.test.jsx +196 -14
- package/src/components/manage/UniversalLink/UniversalLink.tsx +214 -0
- package/src/components/manage/Widgets/ArrayWidget.test.jsx +22 -5
- package/src/components/manage/Widgets/CheckboxGroupWidget.test.jsx +12 -5
- package/src/components/manage/Widgets/DatetimeWidget.test.jsx +21 -6
- package/src/components/manage/Widgets/ImageWidget.jsx +5 -2
- package/src/components/manage/Widgets/NumberWidget.test.jsx +8 -7
- package/src/components/manage/Widgets/ObjectListWidget.jsx +11 -1
- package/src/components/manage/Widgets/ObjectListWidget.test.jsx +18 -8
- package/src/components/manage/Widgets/ObjectWidget.test.jsx +5 -1
- package/src/components/manage/Widgets/RadioGroupWidget.test.jsx +12 -5
- package/src/components/manage/Widgets/RecurrenceWidget/RecurrenceWidget.test.jsx +12 -6
- package/src/components/manage/Widgets/RegistryImageWidget.test.jsx +43 -41
- package/src/components/manage/Widgets/SchemaWidget.test.jsx +12 -5
- package/src/components/manage/Widgets/SchemaWidgetFieldset.test.jsx +12 -5
- package/src/components/manage/Widgets/SelectAutoComplete.test.jsx +12 -6
- package/src/components/manage/Widgets/SelectWidget.jsx +3 -1
- package/src/components/manage/Widgets/SelectWidget.test.jsx +12 -6
- package/src/components/manage/Widgets/TimeWidget.test.jsx +13 -5
- package/src/components/manage/Widgets/TokenWidget.test.jsx +12 -6
- package/src/components/manage/Widgets/VocabularyTermsWidget.test.jsx +18 -9
- package/src/components/manage/Widgets/__mocks__/index.tsx +16 -0
- package/src/components/manage/Widgets/__mocks__/index.vitest.tsx +41 -0
- package/src/components/manage/Workflow/Workflow.test.jsx +17 -7
- package/src/components/theme/App/App.test.jsx +21 -17
- package/src/components/theme/AppExtras/AppExtras.test.jsx +6 -6
- package/src/components/theme/Comments/CommentEditModal.test.jsx +5 -1
- package/src/components/theme/Comments/Comments.test.jsx +29 -12
- package/src/components/theme/ContactForm/ContactForm.test.jsx +8 -4
- package/src/components/theme/Header/Header.test.jsx +19 -13
- package/src/components/theme/Logout/Logout.test.jsx +1 -1
- package/src/components/theme/PasswordReset/PasswordReset.test.jsx +10 -1
- package/src/components/theme/PasswordReset/RequestPasswordReset.test.jsx +5 -1
- package/src/components/theme/Register/Register.test.jsx +5 -1
- package/src/components/theme/Search/Search.test.jsx +6 -4
- package/src/components/theme/TsTest/TsTest.test.tsx +0 -1
- package/src/components/theme/View/EventDatesInfo.test.jsx +12 -5
- package/src/components/theme/View/EventView.test.jsx +12 -5
- package/src/components/theme/View/ListingView.test.jsx +2 -0
- package/src/components/theme/View/SummaryView.test.jsx +10 -0
- package/src/components/theme/View/TabularView.test.jsx +1 -0
- package/src/components/theme/View/View.test.jsx +42 -23
- package/src/helpers/Api/Api.plone.rest.test.js +11 -9
- package/src/helpers/Api/Api.test.js +11 -14
- package/src/helpers/AsyncConnect/AsyncConnect.test.jsx +145 -189
- package/src/helpers/AuthToken/AuthToken.test.js +60 -22
- package/src/helpers/Blocks/Blocks.test.js +1 -1
- package/src/helpers/Html/Html.test.jsx +32 -28
- package/src/helpers/Loadable/__mocks__/Loadable.jsx +16 -1
- package/src/helpers/Loadable/__mocks__/Loadable.vitest.jsx +39 -0
- package/src/helpers/Utils/withSaveAsDraft.jsx +241 -0
- package/src/middleware/Api.test.js +47 -0
- package/src/middleware/api.js +1 -1
- package/src/middleware/storeProtectLoadUtils.test.js +90 -78
- package/test-setup-globals-vitest.js +46 -0
- package/theme/themes/pastanaga/collections/table.overrides +9 -0
- package/theme/themes/pastanaga/extras/main.less +15 -0
- package/tsconfig.declarations.json +12 -1
- package/tsconfig.json +2 -1
- package/types/components/manage/ConditionalLink/ConditionalLink.d.ts +11 -15
- package/types/components/manage/Contents/__mocks__/index.vitest.d.ts +2 -0
- package/types/components/manage/Form/__mocks__/index.vitest.d.ts +8 -0
- package/types/components/manage/MaybeWrap/MaybeWrap.d.ts +7 -5
- package/types/components/manage/UniversalLink/UniversalLink.d.ts +54 -20
- package/types/components/manage/Widgets/__mocks__/index.vitest.d.ts +33 -0
- package/types/helpers/Loadable/__mocks__/Loadable.vitest.d.ts +3 -0
- package/types/helpers/Utils/withSaveAsDraft.d.ts +1 -0
- package/types/react-router-hash-link.d.ts +12 -0
- package/types/routes.d.ts +4 -0
- package/types/server.d.ts +1 -1
- package/vite-plugins/svg.mjs +81 -0
- package/vitest.config.mjs +77 -0
- package/src/components/manage/ConditionalLink/ConditionalLink.jsx +0 -27
- package/src/components/manage/ConditionalLink/ConditionalLink.test.jsx +0 -30
- package/src/components/manage/MaybeWrap/MaybeWrap.jsx +0 -9
- package/src/components/manage/UniversalLink/UniversalLink.jsx +0 -154
- package/src/components/manage/Widgets/FileWidget.test.jsx +0 -91
|
@@ -9,8 +9,15 @@ import ChangePassword from './ChangePassword';
|
|
|
9
9
|
|
|
10
10
|
const mockStore = configureStore();
|
|
11
11
|
|
|
12
|
-
|
|
13
|
-
|
|
12
|
+
vi.mock('@plone/volto/components/manage/Form', async () => {
|
|
13
|
+
return await import(
|
|
14
|
+
'@plone/volto/components/manage/Form/__mocks__/index.vitest.tsx'
|
|
15
|
+
);
|
|
16
|
+
});
|
|
17
|
+
|
|
18
|
+
vi.mock('../Toolbar/Toolbar', () => ({
|
|
19
|
+
default: vi.fn(() => <div id="Portal" />),
|
|
20
|
+
}));
|
|
14
21
|
|
|
15
22
|
describe('ChangePassword', () => {
|
|
16
23
|
it('renders a change password component', () => {
|
|
@@ -18,7 +18,9 @@ const userSchema = {
|
|
|
18
18
|
loading: false,
|
|
19
19
|
};
|
|
20
20
|
|
|
21
|
-
|
|
21
|
+
vi.mock('../Toolbar/Toolbar', () => ({
|
|
22
|
+
default: vi.fn(() => <div id="Portal" />),
|
|
23
|
+
}));
|
|
22
24
|
|
|
23
25
|
describe('PersonalInformation', () => {
|
|
24
26
|
it('renders a personal information component', async () => {
|
|
@@ -8,14 +8,27 @@ import PersonalPreferences from './PersonalPreferences';
|
|
|
8
8
|
|
|
9
9
|
const mockStore = configureStore();
|
|
10
10
|
|
|
11
|
-
|
|
11
|
+
vi.mock('../Toolbar/Toolbar', () => ({
|
|
12
|
+
default: vi.fn(() => <div id="Portal" />),
|
|
13
|
+
}));
|
|
12
14
|
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
)
|
|
15
|
+
vi.mock('@plone/volto/components/manage/Form', async () => {
|
|
16
|
+
return await import(
|
|
17
|
+
'@plone/volto/components/manage/Form/__mocks__/index.vitest.tsx'
|
|
18
|
+
);
|
|
19
|
+
});
|
|
20
|
+
vi.mock('@plone/volto/helpers/Loadable/Loadable', async () => {
|
|
21
|
+
return await import(
|
|
22
|
+
'@plone/volto/helpers/Loadable/__mocks__/Loadable.vitest.jsx'
|
|
23
|
+
);
|
|
24
|
+
});
|
|
25
|
+
|
|
26
|
+
beforeAll(async () => {
|
|
27
|
+
const { __setLoadables } = await import(
|
|
28
|
+
'@plone/volto/helpers/Loadable/Loadable'
|
|
29
|
+
);
|
|
30
|
+
await __setLoadables();
|
|
31
|
+
});
|
|
19
32
|
|
|
20
33
|
describe('PersonalPreferences', () => {
|
|
21
34
|
it('renders a personal preferences component', () => {
|
|
@@ -9,9 +9,12 @@ import Rules from './Rules';
|
|
|
9
9
|
const middlewares = [thunk];
|
|
10
10
|
const mockStore = configureMockStore(middlewares);
|
|
11
11
|
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
12
|
+
vi.mock('../Toolbar/Toolbar', () => ({
|
|
13
|
+
default: vi.fn(() => <div id="Portal" />),
|
|
14
|
+
}));
|
|
15
|
+
vi.mock('../Toolbar/More', () => ({
|
|
16
|
+
default: vi.fn(() => <div className="More" />),
|
|
17
|
+
}));
|
|
15
18
|
|
|
16
19
|
describe('Rules', () => {
|
|
17
20
|
it('renders rules object control', () => {
|
|
@@ -10,7 +10,9 @@ import Sharing from './Sharing';
|
|
|
10
10
|
|
|
11
11
|
const mockStore = configureStore();
|
|
12
12
|
|
|
13
|
-
|
|
13
|
+
vi.mock('../Toolbar/Toolbar', () => ({
|
|
14
|
+
default: vi.fn(() => <div id="Portal" />),
|
|
15
|
+
}));
|
|
14
16
|
|
|
15
17
|
describe('Sharing', () => {
|
|
16
18
|
it('renders a sharing component', () => {
|
|
@@ -110,11 +110,11 @@ describe('ObjectBrowserNav', () => {
|
|
|
110
110
|
const baseProps = {
|
|
111
111
|
currentSearchResults,
|
|
112
112
|
isSelectable: () => true,
|
|
113
|
-
handleClickOnItem:
|
|
114
|
-
handleDoubleClickOnItem:
|
|
113
|
+
handleClickOnItem: vi.fn(),
|
|
114
|
+
handleDoubleClickOnItem: vi.fn(),
|
|
115
115
|
mode: 'link',
|
|
116
116
|
view: 'list',
|
|
117
|
-
navigateTo:
|
|
117
|
+
navigateTo: vi.fn(),
|
|
118
118
|
};
|
|
119
119
|
|
|
120
120
|
it('renders a view image component', () => {
|
|
@@ -6,13 +6,12 @@ import { waitFor, render } from '@testing-library/react';
|
|
|
6
6
|
|
|
7
7
|
import More from './More';
|
|
8
8
|
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
);
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
);
|
|
9
|
+
vi.mock('../../manage/Display/Display', () => ({
|
|
10
|
+
default: vi.fn(() => <div id="display-select" />),
|
|
11
|
+
}));
|
|
12
|
+
vi.mock('../../manage/Workflow/Workflow', () => ({
|
|
13
|
+
default: vi.fn(() => <div id="state-select" />),
|
|
14
|
+
}));
|
|
16
15
|
|
|
17
16
|
const mockStore = configureStore();
|
|
18
17
|
|
|
@@ -4,7 +4,7 @@ import { Provider } from 'react-intl-redux';
|
|
|
4
4
|
import configureStore from 'redux-mock-store';
|
|
5
5
|
import { render } from '@testing-library/react';
|
|
6
6
|
import { MemoryRouter } from 'react-router-dom';
|
|
7
|
-
import UniversalLink from './UniversalLink';
|
|
7
|
+
import UniversalLink, { __test } from './UniversalLink';
|
|
8
8
|
import config from '@plone/volto/registry';
|
|
9
9
|
|
|
10
10
|
const mockStore = configureStore();
|
|
@@ -18,7 +18,7 @@ const store = mockStore({
|
|
|
18
18
|
},
|
|
19
19
|
});
|
|
20
20
|
|
|
21
|
-
global.console.error =
|
|
21
|
+
global.console.error = vi.fn();
|
|
22
22
|
|
|
23
23
|
describe('UniversalLink', () => {
|
|
24
24
|
it('renders a UniversalLink component with internal link', () => {
|
|
@@ -39,7 +39,10 @@ describe('UniversalLink', () => {
|
|
|
39
39
|
const component = renderer.create(
|
|
40
40
|
<Provider store={store}>
|
|
41
41
|
<MemoryRouter>
|
|
42
|
-
<UniversalLink
|
|
42
|
+
<UniversalLink
|
|
43
|
+
href="https://github.com/plone/volto"
|
|
44
|
+
className="custom-link"
|
|
45
|
+
>
|
|
43
46
|
<h1>Title</h1>
|
|
44
47
|
</UniversalLink>
|
|
45
48
|
</MemoryRouter>
|
|
@@ -213,18 +216,197 @@ describe('UniversalLink', () => {
|
|
|
213
216
|
expect(json).toMatchSnapshot();
|
|
214
217
|
expect(global.console.error).toHaveBeenCalled();
|
|
215
218
|
});
|
|
216
|
-
});
|
|
217
219
|
|
|
218
|
-
it('renders a UniversalLink component when url ends with @@display-file', () => {
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
220
|
+
it('renders a UniversalLink component when url ends with @@display-file', () => {
|
|
221
|
+
const component = renderer.create(
|
|
222
|
+
<Provider store={store}>
|
|
223
|
+
<MemoryRouter>
|
|
224
|
+
<UniversalLink href="http://localhost:3000/en/welcome-to-volto/@@display-file">
|
|
225
|
+
<h1>Title</h1>
|
|
226
|
+
</UniversalLink>
|
|
227
|
+
</MemoryRouter>
|
|
228
|
+
</Provider>,
|
|
229
|
+
);
|
|
230
|
+
const json = component.toJSON();
|
|
231
|
+
expect(json).toMatchSnapshot();
|
|
232
|
+
});
|
|
233
|
+
|
|
234
|
+
test('only one UniversalLink re-renders when prop changes (stable references)', () => {
|
|
235
|
+
const renderCounter = vi.fn();
|
|
236
|
+
__test.renderCounter = renderCounter;
|
|
237
|
+
|
|
238
|
+
const itemA = { '@id': '/en/a' };
|
|
239
|
+
const itemB = { '@id': '/en/b' };
|
|
240
|
+
const itemC = { '@id': '/en/c' };
|
|
241
|
+
|
|
242
|
+
const Wrapper = ({ children }) => (
|
|
243
|
+
<Provider store={store}>
|
|
244
|
+
<MemoryRouter>{children}</MemoryRouter>
|
|
245
|
+
</Provider>
|
|
246
|
+
);
|
|
247
|
+
|
|
248
|
+
const { rerender } = render(
|
|
249
|
+
<>
|
|
250
|
+
<UniversalLink item={itemA} />
|
|
251
|
+
<UniversalLink item={itemB} />
|
|
252
|
+
<UniversalLink item={itemC} />
|
|
253
|
+
</>,
|
|
254
|
+
{ wrapper: Wrapper },
|
|
255
|
+
);
|
|
256
|
+
|
|
257
|
+
// expect 3 renders
|
|
258
|
+
expect(renderCounter).toHaveBeenCalledTimes(3);
|
|
259
|
+
|
|
260
|
+
const updatedItemB = { '@id': '/en/b-updated' };
|
|
261
|
+
|
|
262
|
+
rerender(
|
|
263
|
+
<>
|
|
264
|
+
<UniversalLink item={itemA} />
|
|
265
|
+
<UniversalLink item={updatedItemB} />
|
|
266
|
+
<UniversalLink item={itemC} />
|
|
267
|
+
</>,
|
|
268
|
+
);
|
|
269
|
+
|
|
270
|
+
// expect 4 renders (only one UniversalLink re-renders)
|
|
271
|
+
expect(renderCounter).toHaveBeenCalledTimes(4);
|
|
272
|
+
});
|
|
273
|
+
|
|
274
|
+
test('only one UniversalLink re-renders when prop changes (with children - stable references)', () => {
|
|
275
|
+
const renderCounter = vi.fn();
|
|
276
|
+
__test.renderCounter = renderCounter;
|
|
277
|
+
|
|
278
|
+
const itemA = { '@id': '/en/a' };
|
|
279
|
+
const itemB = { '@id': '/en/b' };
|
|
280
|
+
const itemC = { '@id': '/en/c' };
|
|
281
|
+
const title = 'Title';
|
|
282
|
+
|
|
283
|
+
const Wrapper = ({ children }) => (
|
|
284
|
+
<Provider store={store}>
|
|
285
|
+
<MemoryRouter>{children}</MemoryRouter>
|
|
286
|
+
</Provider>
|
|
287
|
+
);
|
|
288
|
+
|
|
289
|
+
const { rerender } = render(
|
|
290
|
+
<>
|
|
291
|
+
<UniversalLink item={itemA}>{title}</UniversalLink>
|
|
292
|
+
<UniversalLink item={itemB}>{title}</UniversalLink>
|
|
293
|
+
<UniversalLink item={itemC}>{title}</UniversalLink>
|
|
294
|
+
</>,
|
|
295
|
+
{ wrapper: Wrapper },
|
|
296
|
+
);
|
|
297
|
+
|
|
298
|
+
// expect 3 renders
|
|
299
|
+
expect(renderCounter).toHaveBeenCalledTimes(3);
|
|
300
|
+
|
|
301
|
+
const updatedItemB = { '@id': '/en/b-updated' };
|
|
302
|
+
|
|
303
|
+
rerender(
|
|
304
|
+
<>
|
|
305
|
+
<UniversalLink item={itemA}>{title}</UniversalLink>
|
|
306
|
+
<UniversalLink item={updatedItemB}>{title}</UniversalLink>
|
|
307
|
+
<UniversalLink item={itemC}>{title}</UniversalLink>
|
|
308
|
+
</>,
|
|
309
|
+
);
|
|
310
|
+
|
|
311
|
+
// expect 4 renders (only one UniversalLink re-renders)
|
|
312
|
+
expect(renderCounter).toHaveBeenCalledTimes(4);
|
|
313
|
+
});
|
|
314
|
+
|
|
315
|
+
test('[NEGATIVE TEST] UniversalLink re-renders all instances when children are inline JSX (React.memo ineffective)', () => {
|
|
316
|
+
// NEGATIVE TEST:
|
|
317
|
+
// This test demonstrates that React.memo does NOT prevent re-renders
|
|
318
|
+
// when props like `children` are passed as inline JSX.
|
|
319
|
+
// This is expected behavior due to unstable object references.
|
|
320
|
+
// Do NOT use inline props if render optimization is required.
|
|
321
|
+
const renderCounter = vi.fn();
|
|
322
|
+
__test.renderCounter = renderCounter;
|
|
323
|
+
|
|
324
|
+
const itemA = { '@id': '/en/a' };
|
|
325
|
+
const itemB = { '@id': '/en/b' };
|
|
326
|
+
const itemC = { '@id': '/en/c' };
|
|
327
|
+
|
|
328
|
+
const Wrapper = ({ children }) => (
|
|
329
|
+
<Provider store={store}>
|
|
330
|
+
<MemoryRouter>{children}</MemoryRouter>
|
|
331
|
+
</Provider>
|
|
332
|
+
);
|
|
333
|
+
|
|
334
|
+
const { rerender } = render(
|
|
335
|
+
<>
|
|
336
|
+
<UniversalLink item={itemA}>
|
|
337
|
+
<h1>Title</h1>
|
|
338
|
+
</UniversalLink>
|
|
339
|
+
<UniversalLink item={itemB}>
|
|
340
|
+
<h1>Title</h1>
|
|
341
|
+
</UniversalLink>
|
|
342
|
+
<UniversalLink item={itemC}>
|
|
343
|
+
<h1>Title</h1>
|
|
344
|
+
</UniversalLink>
|
|
345
|
+
</>,
|
|
346
|
+
{ wrapper: Wrapper },
|
|
347
|
+
);
|
|
348
|
+
|
|
349
|
+
// expect 3 renders
|
|
350
|
+
expect(renderCounter).toHaveBeenCalledTimes(3);
|
|
351
|
+
|
|
352
|
+
const updatedItemB = { '@id': '/en/b-updated' };
|
|
353
|
+
|
|
354
|
+
rerender(
|
|
355
|
+
<>
|
|
356
|
+
<UniversalLink item={itemA}>
|
|
223
357
|
<h1>Title</h1>
|
|
224
358
|
</UniversalLink>
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
359
|
+
<UniversalLink item={updatedItemB}>
|
|
360
|
+
<h1>Title</h1>
|
|
361
|
+
</UniversalLink>
|
|
362
|
+
<UniversalLink item={itemC}>
|
|
363
|
+
<h1>Title</h1>
|
|
364
|
+
</UniversalLink>
|
|
365
|
+
</>,
|
|
366
|
+
);
|
|
367
|
+
|
|
368
|
+
// expect 6 renders (React.memo does NOT prevent re-renders when props like `children` are passed as inline JSX.)
|
|
369
|
+
expect(renderCounter).toHaveBeenCalledTimes(6);
|
|
370
|
+
});
|
|
371
|
+
|
|
372
|
+
test('[NEGATIVE TEST] UniversalLink re-renders all instances when props are inline JSX (React.memo ineffective)', () => {
|
|
373
|
+
// NEGATIVE TEST:
|
|
374
|
+
// This test demonstrates that React.memo does NOT prevent re-renders
|
|
375
|
+
// when props like `item` are passed as inline object.
|
|
376
|
+
// This is expected behavior due to unstable object references.
|
|
377
|
+
// Do NOT use inline props if render optimization is required.
|
|
378
|
+
const renderCounter = vi.fn();
|
|
379
|
+
__test.renderCounter = renderCounter;
|
|
380
|
+
|
|
381
|
+
const title = 'Title';
|
|
382
|
+
|
|
383
|
+
const Wrapper = ({ children }) => (
|
|
384
|
+
<Provider store={store}>
|
|
385
|
+
<MemoryRouter>{children}</MemoryRouter>
|
|
386
|
+
</Provider>
|
|
387
|
+
);
|
|
388
|
+
|
|
389
|
+
const { rerender } = render(
|
|
390
|
+
<>
|
|
391
|
+
<UniversalLink item={{ '@id': '/en/a' }}>{title}</UniversalLink>
|
|
392
|
+
<UniversalLink item={{ '@id': '/en/b' }}>{title}</UniversalLink>
|
|
393
|
+
<UniversalLink item={{ '@id': '/en/c' }}>{title}</UniversalLink>
|
|
394
|
+
</>,
|
|
395
|
+
{ wrapper: Wrapper },
|
|
396
|
+
);
|
|
397
|
+
|
|
398
|
+
// expect 3 renders
|
|
399
|
+
expect(renderCounter).toHaveBeenCalledTimes(3);
|
|
400
|
+
|
|
401
|
+
rerender(
|
|
402
|
+
<>
|
|
403
|
+
<UniversalLink item={{ '@id': '/en/a' }}>{title}</UniversalLink>
|
|
404
|
+
<UniversalLink item={{ '@id': '/en/b' }}>{title}</UniversalLink>
|
|
405
|
+
<UniversalLink item={{ '@id': '/en/c' }}>{title}</UniversalLink>
|
|
406
|
+
</>,
|
|
407
|
+
);
|
|
408
|
+
|
|
409
|
+
// expect 6 renders (React.memo does NOT prevent re-renders when props like `children` are passed as inline JSX.)
|
|
410
|
+
expect(renderCounter).toHaveBeenCalledTimes(6);
|
|
411
|
+
});
|
|
230
412
|
});
|
|
@@ -0,0 +1,214 @@
|
|
|
1
|
+
import React from 'react';
|
|
2
|
+
import { HashLink as Link } from 'react-router-hash-link';
|
|
3
|
+
import { useSelector } from 'react-redux';
|
|
4
|
+
import {
|
|
5
|
+
flattenToAppURL,
|
|
6
|
+
isInternalURL,
|
|
7
|
+
URLUtils,
|
|
8
|
+
} from '@plone/volto/helpers/Url/Url';
|
|
9
|
+
import config from '@plone/volto/registry';
|
|
10
|
+
import cx from 'classnames';
|
|
11
|
+
import type { ObjectBrowserItem } from '@plone/types';
|
|
12
|
+
|
|
13
|
+
type BaseProps = {
|
|
14
|
+
openLinkInNewTab?: boolean;
|
|
15
|
+
download?: boolean;
|
|
16
|
+
children: React.ReactNode;
|
|
17
|
+
className?: string;
|
|
18
|
+
title?: string;
|
|
19
|
+
smooth?: boolean;
|
|
20
|
+
onClick?: (e: React.MouseEvent) => void;
|
|
21
|
+
onKeyDown?: (e: React.KeyboardEvent) => void;
|
|
22
|
+
};
|
|
23
|
+
|
|
24
|
+
type HrefOnly = {
|
|
25
|
+
href: string;
|
|
26
|
+
item?: never;
|
|
27
|
+
} & BaseProps;
|
|
28
|
+
|
|
29
|
+
type ItemOnly = {
|
|
30
|
+
href?: never;
|
|
31
|
+
item: Partial<ObjectBrowserItem> & { remoteUrl?: string };
|
|
32
|
+
} & BaseProps;
|
|
33
|
+
|
|
34
|
+
export type UniversalLinkProps = HrefOnly | ItemOnly;
|
|
35
|
+
export interface AppState {
|
|
36
|
+
content: {
|
|
37
|
+
data?: {
|
|
38
|
+
'@components'?: {
|
|
39
|
+
translations?: {
|
|
40
|
+
items?: { language: string; '@id': string }[];
|
|
41
|
+
};
|
|
42
|
+
};
|
|
43
|
+
};
|
|
44
|
+
};
|
|
45
|
+
navroot: {
|
|
46
|
+
data: {
|
|
47
|
+
navroot: {
|
|
48
|
+
id: string;
|
|
49
|
+
};
|
|
50
|
+
};
|
|
51
|
+
};
|
|
52
|
+
intl: {
|
|
53
|
+
locale: string;
|
|
54
|
+
};
|
|
55
|
+
userSession: {
|
|
56
|
+
token: string | null;
|
|
57
|
+
};
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
export const __test = {
|
|
61
|
+
renderCounter: () => {},
|
|
62
|
+
};
|
|
63
|
+
|
|
64
|
+
export function getUrl(
|
|
65
|
+
props: UniversalLinkProps,
|
|
66
|
+
token: string | null,
|
|
67
|
+
item: UniversalLinkProps['item'],
|
|
68
|
+
children: React.ReactNode,
|
|
69
|
+
): string {
|
|
70
|
+
if ('href' in props && typeof props.href === 'string') {
|
|
71
|
+
return props.href;
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
if (!item || item['@id'] === '') return config.settings.publicURL;
|
|
75
|
+
if (!item['@id']) {
|
|
76
|
+
// eslint-disable-next-line no-console
|
|
77
|
+
console.error(
|
|
78
|
+
'Invalid item passed to UniversalLink',
|
|
79
|
+
item,
|
|
80
|
+
props,
|
|
81
|
+
children,
|
|
82
|
+
);
|
|
83
|
+
return '#';
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
let url = flattenToAppURL(item['@id']);
|
|
87
|
+
const remoteUrl = item.remoteUrl || item.getRemoteUrl;
|
|
88
|
+
|
|
89
|
+
if (!token && remoteUrl) {
|
|
90
|
+
url = remoteUrl;
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
if (
|
|
94
|
+
!token &&
|
|
95
|
+
item['@type'] &&
|
|
96
|
+
config.settings.downloadableObjects.includes(item['@type'])
|
|
97
|
+
) {
|
|
98
|
+
url = `${url}/@@download/file`;
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
if (
|
|
102
|
+
!token &&
|
|
103
|
+
item['@type'] &&
|
|
104
|
+
config.settings.viewableInBrowserObjects.includes(item['@type'])
|
|
105
|
+
) {
|
|
106
|
+
url = `${url}/@@display-file/file`;
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
return url;
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
const UniversalLink = React.memo(
|
|
113
|
+
React.forwardRef<HTMLAnchorElement | HTMLDivElement, UniversalLinkProps>(
|
|
114
|
+
function UniversalLink(props, ref) {
|
|
115
|
+
const {
|
|
116
|
+
openLinkInNewTab,
|
|
117
|
+
download,
|
|
118
|
+
children,
|
|
119
|
+
className,
|
|
120
|
+
title,
|
|
121
|
+
smooth,
|
|
122
|
+
onClick,
|
|
123
|
+
onKeyDown,
|
|
124
|
+
item,
|
|
125
|
+
...rest
|
|
126
|
+
} = props;
|
|
127
|
+
__test.renderCounter();
|
|
128
|
+
|
|
129
|
+
const token = useSelector<AppState, string | null>(
|
|
130
|
+
(state) => state.userSession?.token,
|
|
131
|
+
);
|
|
132
|
+
|
|
133
|
+
let url = getUrl(props, token, item, children);
|
|
134
|
+
|
|
135
|
+
const isExternal = !isInternalURL(url);
|
|
136
|
+
|
|
137
|
+
const isDownload =
|
|
138
|
+
(!isExternal && url.includes('@@download')) || download;
|
|
139
|
+
const isDisplayFile =
|
|
140
|
+
(!isExternal && url.includes('@@display-file')) || false;
|
|
141
|
+
|
|
142
|
+
const checkedURL = URLUtils.checkAndNormalizeUrl(url);
|
|
143
|
+
|
|
144
|
+
url = checkedURL.url;
|
|
145
|
+
let tag = (
|
|
146
|
+
<Link
|
|
147
|
+
to={flattenToAppURL(url)}
|
|
148
|
+
target={openLinkInNewTab ?? false ? '_blank' : undefined}
|
|
149
|
+
title={title}
|
|
150
|
+
className={className}
|
|
151
|
+
smooth={smooth ?? config.settings.hashLinkSmoothScroll}
|
|
152
|
+
// @ts-ignore
|
|
153
|
+
ref={ref}
|
|
154
|
+
{...rest}
|
|
155
|
+
>
|
|
156
|
+
{children}
|
|
157
|
+
</Link>
|
|
158
|
+
);
|
|
159
|
+
|
|
160
|
+
if (isExternal) {
|
|
161
|
+
const isTelephoneOrMail = checkedURL.isMail || checkedURL.isTelephone;
|
|
162
|
+
const getClassName = cx({ external: !isTelephoneOrMail }, className);
|
|
163
|
+
|
|
164
|
+
tag = (
|
|
165
|
+
<a
|
|
166
|
+
href={url}
|
|
167
|
+
title={title}
|
|
168
|
+
target={
|
|
169
|
+
!isTelephoneOrMail && !(openLinkInNewTab === false)
|
|
170
|
+
? '_blank'
|
|
171
|
+
: undefined
|
|
172
|
+
}
|
|
173
|
+
rel="noopener noreferrer"
|
|
174
|
+
{...rest}
|
|
175
|
+
className={getClassName}
|
|
176
|
+
ref={ref as React.Ref<HTMLAnchorElement>}
|
|
177
|
+
>
|
|
178
|
+
{children}
|
|
179
|
+
</a>
|
|
180
|
+
);
|
|
181
|
+
} else if (isDownload) {
|
|
182
|
+
tag = (
|
|
183
|
+
<a
|
|
184
|
+
href={flattenToAppURL(url)}
|
|
185
|
+
download
|
|
186
|
+
title={title}
|
|
187
|
+
{...rest}
|
|
188
|
+
className={className}
|
|
189
|
+
ref={ref as React.Ref<HTMLAnchorElement>}
|
|
190
|
+
>
|
|
191
|
+
{children}
|
|
192
|
+
</a>
|
|
193
|
+
);
|
|
194
|
+
} else if (isDisplayFile) {
|
|
195
|
+
tag = (
|
|
196
|
+
<a
|
|
197
|
+
title={title}
|
|
198
|
+
target="_blank"
|
|
199
|
+
rel="noopener noreferrer"
|
|
200
|
+
{...rest}
|
|
201
|
+
href={flattenToAppURL(url)}
|
|
202
|
+
className={className}
|
|
203
|
+
ref={ref as React.Ref<HTMLAnchorElement>}
|
|
204
|
+
>
|
|
205
|
+
{children}
|
|
206
|
+
</a>
|
|
207
|
+
);
|
|
208
|
+
}
|
|
209
|
+
return tag;
|
|
210
|
+
},
|
|
211
|
+
),
|
|
212
|
+
);
|
|
213
|
+
|
|
214
|
+
export default UniversalLink;
|
|
@@ -8,11 +8,25 @@ import ArrayWidget from './ArrayWidget';
|
|
|
8
8
|
|
|
9
9
|
const mockStore = configureStore();
|
|
10
10
|
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
);
|
|
11
|
+
vi.mock('@plone/volto/helpers/Loadable/Loadable', async () => {
|
|
12
|
+
return await import(
|
|
13
|
+
'@plone/volto/helpers/Loadable/__mocks__/Loadable.vitest.jsx'
|
|
14
|
+
);
|
|
15
|
+
});
|
|
16
|
+
|
|
17
|
+
// Mock react-sortable-hoc to prevent the container error
|
|
18
|
+
vi.mock('react-sortable-hoc', () => ({
|
|
19
|
+
...vi.importActual('react-sortable-hoc'),
|
|
20
|
+
SortableContainer: (component) => component,
|
|
21
|
+
SortableElement: (component) => component,
|
|
22
|
+
}));
|
|
23
|
+
|
|
24
|
+
beforeAll(async () => {
|
|
25
|
+
const { __setLoadables } = await import(
|
|
26
|
+
'@plone/volto/helpers/Loadable/Loadable'
|
|
27
|
+
);
|
|
28
|
+
await __setLoadables();
|
|
29
|
+
});
|
|
16
30
|
|
|
17
31
|
test('renders an array widget component', async () => {
|
|
18
32
|
const store = mockStore({
|
|
@@ -27,6 +41,7 @@ test('renders an array widget component', async () => {
|
|
|
27
41
|
},
|
|
28
42
|
},
|
|
29
43
|
});
|
|
44
|
+
|
|
30
45
|
const component = renderer.create(
|
|
31
46
|
<Provider store={store}>
|
|
32
47
|
<ArrayWidget
|
|
@@ -38,6 +53,7 @@ test('renders an array widget component', async () => {
|
|
|
38
53
|
/>
|
|
39
54
|
</Provider>,
|
|
40
55
|
);
|
|
56
|
+
|
|
41
57
|
await waitFor(() => {});
|
|
42
58
|
expect(component.toJSON()).toMatchSnapshot();
|
|
43
59
|
});
|
|
@@ -83,5 +99,6 @@ test("No 'No value' option when default value is 0", async () => {
|
|
|
83
99
|
container.querySelector('.react-select__dropdown-indicator'),
|
|
84
100
|
{ button: 0 },
|
|
85
101
|
);
|
|
102
|
+
|
|
86
103
|
expect(container).toMatchSnapshot();
|
|
87
104
|
});
|
|
@@ -7,11 +7,18 @@ import CheckboxGroupWidget from './CheckboxGroupWidget';
|
|
|
7
7
|
|
|
8
8
|
const mockStore = configureStore();
|
|
9
9
|
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
);
|
|
10
|
+
vi.mock('@plone/volto/helpers/Loadable/Loadable', async () => {
|
|
11
|
+
return await import(
|
|
12
|
+
'@plone/volto/helpers/Loadable/__mocks__/Loadable.vitest.jsx'
|
|
13
|
+
);
|
|
14
|
+
});
|
|
15
|
+
|
|
16
|
+
beforeAll(async () => {
|
|
17
|
+
const { __setLoadables } = await import(
|
|
18
|
+
'@plone/volto/helpers/Loadable/Loadable'
|
|
19
|
+
);
|
|
20
|
+
await __setLoadables();
|
|
21
|
+
});
|
|
15
22
|
|
|
16
23
|
test('renders a checkbox group widget component', async () => {
|
|
17
24
|
const store = mockStore({
|