Skip to content
This repository has been archived by the owner on Apr 25, 2024. It is now read-only.

Commit

Permalink
update JENKINSFILE
Browse files Browse the repository at this point in the history
  • Loading branch information
nileshgulia1 committed Jan 11, 2022
1 parent 30369c5 commit 331be35
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ pipeline {
node(label: 'docker') {
script {
try {
sh '''docker pull eeacms/plone-backend; docker run --rm -d --name="$BUILD_TAG-plone" -e SITE="Plone" eeacms/plone-backend'''
sh '''docker pull plone; docker run -d --rm --name="$BUILD_TAG-plone" -e SITE="Plone" -e PROFILES="profile-plone.restapi:blocks" plone fg'''
sh '''docker pull plone/volto-addon-ci; docker run -i --name="$BUILD_TAG-cypress" --link $BUILD_TAG-plone:plone -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e DEPENDENCIES="$DEPENDENCIES" -e NODE_ENV=development plone/volto-addon-ci cypress'''
} finally {
try {
Expand Down
43 changes: 40 additions & 3 deletions src/customizations/volto/components/theme/App/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ import cx from 'classnames';
import config from '@plone/volto/registry';
import { PluggablesProvider } from '@plone/volto/components/manage/Pluggable';
import LockingToastsFactory from '@plone/volto/components/manage/LockingToastsFactory/LockingToastsFactory';

import WorkingCopyToastsFactory from '@plone/volto/components/manage/WorkingCopyToastsFactory/WorkingCopyToastsFactory';
import Error from '@plone/volto/error';
import { visitBlocks } from '@plone/volto/helpers/Blocks/Blocks';

import ViewletsRenderer from '@eeacms/volto-addons-forest/Viewlets/Render';

Expand Down Expand Up @@ -211,6 +212,7 @@ class App extends Component {
content={this.props.content}
user={this.props.userId}
/>
<WorkingCopyToastsFactory content={this.props.content} />
<ToastContainer
position={toast.POSITION.BOTTOM_CENTER}
hideProgressBar
Expand Down Expand Up @@ -241,12 +243,47 @@ export const __test__ = connect(
{ purgeMessages },
)(App);

export const fetchContent = async ({ store, location }) => {
const content = await store.dispatch(
getContent(getBaseUrl(location.pathname)),
);

const promises = [];
const { blocksConfig } = config.blocks;

const visitor = ([id, data]) => {
const blockType = data['@type'];
const { getAsyncData } = blocksConfig[blockType];
if (getAsyncData) {
const p = getAsyncData({
store,
dispatch: store.dispatch,
path: location.pathname,
location,
id,
data,
});
if (!p?.length) {
throw new Error(
'You should return a list of promises from getAsyncData',
);
}
promises.push(...p);
}
};

visitBlocks(content, visitor);

await Promise.allSettled(promises);

return content;
};
export default compose(
asyncConnect([
{
key: 'content',
promise: ({ location, store: { dispatch } }) =>
__SERVER__ && dispatch(getContent(getBaseUrl(location.pathname))),
promise: ({ location, store }) =>
__SERVER__ && fetchContent({ store, location }),
},
{
key: 'frontpage_slides',
Expand Down

0 comments on commit 331be35

Please sign in to comment.