FIX Create campaign success message #37
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,8 +14,7 @@ import CampaignAdminItem from './CampaignAdminItem'; | |
| import Breadcrumb from 'components/Breadcrumb/Breadcrumb'; | ||
| import Preview from 'components/Preview/Preview'; | ||
| import i18n from 'i18n'; | ||
| import classnames from 'classnames'; | ||
|
|
||
| /** | ||
| * Represents a campaign list view | ||
|
|
@@ -29,6 +28,16 @@ class CampaignAdminList extends SilverStripeComponent { | |
| this.handleItemSelected = this.handleItemSelected.bind(this); | ||
| this.setBreadcrumbs = this.setBreadcrumbs.bind(this); | ||
| this.handleCloseItem = this.handleCloseItem.bind(this); | ||
|
|
||
| if (!this.isRecordLoaded()) { | ||
|
There was a problem hiding this comment. since this is in the constructor, would be a good idea to pass through props to |
||
| this.state = { | ||
| loading: true, | ||
| }; | ||
| } else { | ||
| this.state = { | ||
| loading: false, | ||
| }; | ||
| } | ||
| } | ||
|
|
||
| componentDidMount() { | ||
|
|
@@ -37,13 +46,28 @@ class CampaignAdminList extends SilverStripeComponent { | |
| this.setBreadcrumbs(); | ||
|
|
||
| // Only load record if not already present | ||
| if (!this.isRecordLoaded()) { | ||
| this.props.recordActions | ||
| .fetchRecord(this.props.treeClass, 'get', fetchURL) | ||
| .then(() => { | ||
| this.setBreadcrumbs(); | ||
| this.setState({ loading: false }); | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| componentWillUnmount() { | ||
| // Reset new create flag | ||
| this.props.campaignActions.setNewCampaignCreated(false); | ||
| } | ||
|
|
||
| /** | ||
| * @return {boolean} | ||
| */ | ||
| isRecordLoaded() { | ||
| return Object.keys(this.props.record).length !== 0; | ||
| } | ||
|
|
||
| /** | ||
| * Update breadcrumbs for this view | ||
| */ | ||
|
|
@@ -94,6 +118,7 @@ class CampaignAdminList extends SilverStripeComponent { | |
| const selectedClass = (!itemId) ? 'campaign-admin__campaign--hide-preview' : ''; | ||
| const campaignId = this.props.campaignId; | ||
| const campaign = this.props.record; | ||
| const newItemCreated = this.props.newItemCreated; | ||
|
|
||
| // Trigger different layout when preview is enabled | ||
| const itemGroups = this.groupItemsForSet(); | ||
|
|
@@ -113,9 +138,12 @@ class CampaignAdminList extends SilverStripeComponent { | |
| const group = itemGroups[className]; | ||
| const groupCount = group.items.length; | ||
|
|
||
| const listGroupItems = []; | ||
| const title = ` | ||
| ${groupCount === 0 ? '' : groupCount} | ||
| ${groupCount === 1 ? group.singular : group.plural} | ||
| `; | ||
| const groupid = `Set_${campaignId}_Group_${className}`; | ||
|
|
||
| // Create items for this group | ||
| group.items.forEach(item => { | ||
|
|
@@ -163,29 +191,31 @@ class CampaignAdminList extends SilverStripeComponent { | |
| ); | ||
| }); | ||
|
|
||
| const wrapperClassnames = classnames('list-group-wrapper', { | ||
| 'list-group-wrapper--empty': listGroupItems.length === 0, | ||
| }); | ||
|
|
||
| // Merge into group | ||
| accordionBlocks.push( | ||
| <div className={wrapperClassnames}> | ||
| <AccordionBlock key={groupid} groupid={groupid} title={title}> | ||
| { | ||
| listGroupItems.length > 0 ? | ||
| listGroupItems : | ||
| <p className="list-group-item">{group.noItemText}</p> | ||
| } | ||
| </AccordionBlock> | ||
| </div> | ||
| ); | ||
| }); | ||
|
|
||
| const newItemInfo = newItemCreated ? | ||
| (<p className="alert alert-success alert--no-border" role="alert"> | ||
| Nice one! You have successfully created a campaign. | ||
|
|
||
| </p>) : | ||
| null; | ||
|
|
||
| const body = <Accordion>{accordionBlocks}</Accordion>; | ||
| const bodyClass = [ | ||
| 'panel', 'panel--padded', 'panel--scrollable', 'flexbox-area-grow', | ||
| ]; | ||
|
|
@@ -196,18 +226,57 @@ class CampaignAdminList extends SilverStripeComponent { | |
| <Toolbar showBackButton handleBackButtonClick={this.props.handleBackButtonClick}> | ||
| <Breadcrumb multiline /> | ||
| </Toolbar> | ||
| {newItemInfo} | ||
| <div className={bodyClass.join(' ')}> | ||
| {body} | ||
| </div> | ||
| <div className="toolbar toolbar--south"> | ||
| {this.renderButtonToolbar()} | ||
| </div> | ||
| </div> | ||
| {this.renderPreview(itemLinks, itemId)} | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| renderPreview(itemLinks, itemId) { | ||
| let preview = null; | ||
|
|
||
| if (this.state.loading) { | ||
| preview = ( | ||
| <div | ||
| className="flexbox-area-grow | ||
| fill-height | ||
| preview | ||
| campaign-admin__campaign-preview | ||
| campaign-admin__campaign-preview--empty" | ||
| > | ||
| <p>Loading...</p> | ||
| </div> | ||
| ); | ||
| } else if (!this.getItems() || this.getItems().length === 0) { | ||
| preview = ( | ||
| <div | ||
| className="flexbox-area-grow | ||
| fill-height | ||
| preview | ||
| campaign-admin__campaign-preview | ||
|
There was a problem hiding this comment. shouldn't have new lines in double quoted strings... |
||
| campaign-admin__campaign-preview--empty" | ||
| > | ||
| <h2 className="campaign-admin__empty-heading">Getting started</h2> | ||
| <p className="campaign-admin__empty-info"> | ||
| Select <strong>Add to Campaign</strong> | ||
| from pages, files, and other content types | ||
| </p> | ||
| </div> | ||
| ); | ||
| } else { | ||
| preview = <Preview itemLinks={itemLinks} itemId={itemId} onBack={this.handleCloseItem} />; | ||
| } | ||
|
|
||
| return preview; | ||
| } | ||
|
|
||
| /** | ||
| * Callback for items being clicked on | ||
| * | ||
|
|
@@ -225,11 +294,6 @@ class CampaignAdminList extends SilverStripeComponent { | |
| renderButtonToolbar() { | ||
| const items = this.getItems(); | ||
|
|
||
| // let itemSummaryLabel = i18n.sprintf( | ||
| // items.length === 1 | ||
| // ? i18n._t('CampaignAdmin.ITEM_SUMMARY_SINGULAR') | ||
|
|
@@ -239,7 +303,14 @@ class CampaignAdminList extends SilverStripeComponent { | |
|
|
||
| let actionProps = {}; | ||
|
|
||
| if (!items || items.length === 0) { | ||
| actionProps = Object.assign(actionProps, { | ||
| title: i18n._t('CampaignAdmin.PUBLISHCAMPAIGN'), | ||
|
There was a problem hiding this comment. add translation default fallback |
||
| buttonStyle: 'secondary-outline', | ||
| icon: 'rocket', | ||
| disabled: true, | ||
| }); | ||
| } else if (this.props.record.State === 'open') { | ||
| actionProps = Object.assign(actionProps, { | ||
| title: i18n._t('CampaignAdmin.PUBLISHCAMPAIGN'), | ||
| buttonStyle: 'primary', | ||
|
|
@@ -289,7 +360,7 @@ class CampaignAdminList extends SilverStripeComponent { | |
| * @return {object} | ||
| */ | ||
| groupItemsForSet() { | ||
| const groups = this.getPlaceholderGroups(); | ||
| const items = this.getItems(); | ||
| if (!items) { | ||
| return groups; | ||
|
|
@@ -315,6 +386,19 @@ class CampaignAdminList extends SilverStripeComponent { | |
| return groups; | ||
| } | ||
|
|
||
| getPlaceholderGroups() { | ||
|
There was a problem hiding this comment. I'm not sure why we need this api; doesn't groupItemsForSet() build the groups automatically? There was a problem hiding this comment. ok, @phalkunz has explained why this is necessary. The only change I'd request is the switch to using the existing config for important_classes instead. |
||
| const groups = {}; | ||
|
|
||
| if (this.props.record && this.props.record.placeholderGroups) { | ||
| this.props.record.placeholderGroups.forEach((group) => { | ||
| groups[group.baseClass] = { ...group }; | ||
| groups[group.baseClass].items = [...group.items]; | ||
| }); | ||
| } | ||
|
|
||
| return groups; | ||
| } | ||
|
|
||
| handlePublish(e) { | ||
| e.preventDefault(); | ||
| this.props.campaignActions.publishCampaign( | ||
|
|
@@ -352,6 +436,7 @@ function mapStateToProps(state, ownProps) { | |
| record: record || {}, | ||
| campaign: state.campaign, | ||
| treeClass, | ||
| newItemCreated: state.campaign.newItemCreated, | ||
|
There was a problem hiding this comment. proptypes definition for this |
||
| }; | ||
| } | ||
|
|
||
|
|
||
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since the
idis available, it would be more extensible to include the record or even just the id in the record, rather than just a boolean.In this case, you could ignore the
isorhasprefix I mentioned below. But try to keep the naming consistent stillsetNewItemis perfectly fine.