-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[STTNHUB-336] Agenda: Show all wire item versions in Coverage preview (…
…#897) * [STTNHUB-336] Agenda: Show all wire item versions in Coverage preview * Use CollapseBox in CoverageActions component
- Loading branch information
1 parent
97be267
commit e6822f3
Showing
12 changed files
with
375 additions
and
239 deletions.
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
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 |
|---|---|---|
| @@ -1,97 +1,110 @@ | ||
| import * as React from 'react'; | ||
| import {connect} from 'react-redux'; | ||
|
|
||
| import {gettext} from 'utils'; | ||
| import {isPlanningItem} from '../utils'; | ||
| import AgendaPreviewCoverages from './AgendaPreviewCoverages'; | ||
| import {IAgendaItem, ICoverageItemAction, IUser, IAgendaPreviewConfig, IArticle} from 'interfaces'; | ||
| import {IAgendaItem, ICoverageItemAction, IUser, IAgendaPreviewConfig, IArticle, IAgendaState} from 'interfaces'; | ||
|
|
||
| interface IProps { | ||
| interface IOwnProps { | ||
| item: IAgendaItem; | ||
| planningId?: IAgendaItem['_id']; | ||
| user?: IUser['_id']; | ||
| wireItems?: Array<IArticle>; | ||
| coverageActions?: Array<ICoverageItemAction>; | ||
| previewGroup?: string; | ||
| restrictCoverageInfo?: boolean; | ||
| previewConfig: IAgendaPreviewConfig; | ||
| } | ||
|
|
||
| export class AgendaPreviewPlanning extends React.Component<IProps, any> { | ||
| static propTypes: any; | ||
| render() { | ||
| const { | ||
| item, | ||
| planningId, | ||
| wireItems, | ||
| coverageActions, | ||
| user, | ||
| previewGroup, | ||
| restrictCoverageInfo, | ||
| } = this.props; | ||
| interface IReduxStateProps { | ||
| wireItems?: Array<IArticle>; | ||
| } | ||
|
|
||
| const planningItems = item.planning_items || []; | ||
| const plan = planningItems.find((p) => p.guid === planningId); | ||
| const otherPlanningItems = planningItems.filter((p) => p.guid !== planningId); | ||
| type IProps = IOwnProps & IReduxStateProps; | ||
|
|
||
| if (isPlanningItem(item) || restrictCoverageInfo) { | ||
| return ( | ||
| <AgendaPreviewCoverages | ||
| key={item.guid} | ||
| item={item} | ||
| plan={plan} | ||
| wireItems={wireItems} | ||
| actions={coverageActions} | ||
| user={user} | ||
| previewGroup={previewGroup} | ||
| restrictCoverageInfo={restrictCoverageInfo} | ||
| previewConfig={this.props.previewConfig} | ||
| /> | ||
| ); | ||
| } | ||
| function AgendaPreviewPlanningComponent({ | ||
| item, | ||
| planningId, | ||
| wireItems, | ||
| coverageActions, | ||
| user, | ||
| previewGroup, | ||
| restrictCoverageInfo, | ||
| previewConfig, | ||
| }: IProps) { | ||
| const planningItems = item.planning_items || []; | ||
| const plan = planningItems.find((p) => p.guid === planningId); | ||
| const otherPlanningItems = planningItems.filter((p) => p.guid !== planningId); | ||
|
|
||
| if (isPlanningItem(item) || restrictCoverageInfo) { | ||
| return ( | ||
| <React.Fragment> | ||
| {!plan ? null : ( | ||
| <div className="agenda-planning__container info-box"> | ||
| <div className="info-box__content"> | ||
| <span className="info-box__label"> | ||
| {gettext('Planning Item')} | ||
| </span> | ||
| <AgendaPreviewCoverages | ||
| key={item.guid} | ||
| item={item} | ||
| plan={plan} | ||
| wireItems={wireItems} | ||
| actions={coverageActions} | ||
| user={user} | ||
| previewGroup={previewGroup} | ||
| restrictCoverageInfo={restrictCoverageInfo} | ||
| previewConfig={previewConfig} | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
| return ( | ||
| <React.Fragment> | ||
| {!plan ? null : ( | ||
| <div className="agenda-planning__container info-box"> | ||
| <div className="info-box__content"> | ||
| <span className="info-box__label"> | ||
| {gettext('Planning Item')} | ||
| </span> | ||
| <AgendaPreviewCoverages | ||
| key={plan.guid} | ||
| item={item} | ||
| plan={plan} | ||
| wireItems={wireItems} | ||
| actions={coverageActions} | ||
| user={user} | ||
| previewGroup={previewGroup} | ||
| previewConfig={previewConfig} | ||
| /> | ||
| </div> | ||
| </div> | ||
| )} | ||
| {!otherPlanningItems.length ? null : ( | ||
| <div className="agenda-planning__container info-box"> | ||
| <div className="info-box__content"> | ||
| <span className="info-box__label"> | ||
| {plan == null ? gettext('Planning Items') : gettext('Other Planning Items')} | ||
| </span> | ||
| {otherPlanningItems.map((planningItem) => ( | ||
| <AgendaPreviewCoverages | ||
| key={plan.guid} | ||
| key={planningItem.guid} | ||
| item={item} | ||
| plan={plan} | ||
| plan={planningItem} | ||
| wireItems={wireItems} | ||
| actions={coverageActions} | ||
| user={user} | ||
| previewGroup={previewGroup} | ||
| previewConfig={this.props.previewConfig} | ||
| previewConfig={previewConfig} | ||
| /> | ||
| </div> | ||
| </div> | ||
| )} | ||
| {!otherPlanningItems.length ? null : ( | ||
| <div className="agenda-planning__container info-box"> | ||
| <div className="info-box__content"> | ||
| <span className="info-box__label"> | ||
| {plan == null ? gettext('Planning Items') : gettext('Other Planning Items')} | ||
| </span> | ||
| {otherPlanningItems.map((planningItem: any) => ( | ||
| <AgendaPreviewCoverages | ||
| key={planningItem.guid} | ||
| item={item} | ||
| plan={planningItem} | ||
| wireItems={wireItems} | ||
| actions={coverageActions} | ||
| user={user} | ||
| previewGroup={previewGroup} | ||
| previewConfig={this.props.previewConfig} | ||
| /> | ||
| ))} | ||
| </div> | ||
| ))} | ||
| </div> | ||
| )} | ||
| </React.Fragment> | ||
| ); | ||
| } | ||
| </div> | ||
| )} | ||
| </React.Fragment> | ||
| ); | ||
| } | ||
|
|
||
| const mapStateToProps = (state: IAgendaState): IReduxStateProps => ({ | ||
| wireItems: state.agenda.agendaWireItems || [], | ||
| }); | ||
|
|
||
| export const AgendaPreviewPlanning = connect< | ||
| IReduxStateProps, | ||
| {}, | ||
| IOwnProps, | ||
| IAgendaState | ||
| >(mapStateToProps)(AgendaPreviewPlanningComponent); |
Oops, something went wrong.