Skip to content

Updates for Mockup integration. #2112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
thet wants to merge 4 commits into from
Closed

Updates for Mockup integration. #2112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d400634
Remove unused dependency @babel/plugin-proposal-json-strings
thet May 23, 2021
5b1a381
Upgrade react-share which doesn't depend on outdated babel-runtime.
thet May 23, 2021
848f204
Fix import which isn't handled by babel-plugin-root-import.
thet May 23, 2021
48329dc
TEMP: fixes to get volto in mockup running without authentication tok…
thet May 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,6 @@
"dependencies": {
"@babel/plugin-proposal-export-default-from": "7.10.4",
"@babel/plugin-proposal-export-namespace-from": "7.10.4",
"@babel/plugin-proposal-json-strings": "7.10.4",
"@babel/plugin-proposal-throw-expressions": "7.10.4",
"@loadable/babel-plugin": "5.13.2",
"@loadable/component": "5.14.1",
Expand Down Expand Up @@ -350,7 +349,7 @@
"react-router-dom": "5.2.0",
"react-select": "4.0.2",
"react-select-async-paginate": "0.3.10",
"react-share": "2.3.1",
"react-share": "4.4.0",
"react-side-effect": "2.1.0",
"react-simple-code-editor": "0.7.1",
"react-test-renderer": "16.14.0",
Expand Down
7 changes: 2 additions & 5 deletions src/components/manage/Contents/Contents.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ import {

import ContentsBreadcrumbs from './ContentsBreadcrumbs';
import { Helmet, getBaseUrl } from '@plone/volto/helpers';
import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';

import backSVG from '@plone/volto/icons/back.svg';
import cutSVG from '@plone/volto/icons/cut.svg';
Expand Down Expand Up @@ -1063,9 +1062,9 @@ class Contents extends Component {
(this.props.orderRequest?.loading && !this.props.orderRequest?.error) ||
(this.props.searchRequest?.loading && !this.props.searchRequest?.error);

return this.props.token && this.props.objectActions.length > 0 ? (
return true ? (
<>
{folderContentsAction ? (
{true ? (
<Container id="page-contents" className="folder-contents">
<Dimmer.Dimmable as="div" blurring dimmed={loading}>
<Dimmer active={loading} inverted>
Expand Down Expand Up @@ -1722,7 +1721,6 @@ class Contents extends Component {

export const __test__ = compose(
injectIntl,
injectLazyLibs(['toastify']),
connect(
(store, props) => {
return {
Expand Down Expand Up @@ -1809,5 +1807,4 @@ export default compose(
await dispatch(listActions(getBaseUrl(location.pathname))),
},
]),
injectLazyLibs(['toastify']),
)(Contents);
2 changes: 1 addition & 1 deletion src/store.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { connectRouter, routerMiddleware } from 'connected-react-router';
import { save, load } from 'redux-localstorage-simple';

import config from '@plone/volto/registry';
import reducers from '~/reducers';
import reducers from '@plone/volto/reducers';
Copy link
Member Author

@thet thet May 23, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

instead of doing this i can also add an ~/reducers alias in Mockup's webpack.

Copy link
Contributor

@tiberiuichim tiberiuichim May 23, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@thet: I think you should add the alias in mockup. The problem is that Volto projects (which are the ~ root when Volto runs as a bootstrapped project) still have the reducers folder inside them. See https://github.com/plone/volto/tree/master/packages/generator-volto/generators/app/templates/src/reducers . IMHO it would be better if we'd somehow get rid of that root import, too.


import { api, crashReporter } from '@plone/volto/middleware';

Expand Down