Stt 15 (superdesk#2004)

petrjasek · Jul 2, 2024 · 7df17ff · 7df17ff
1 parent f910266
commit 7df17ff
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 38 deletions.
diff --git a/client/components/Planning/PlanningEditor/index.tsx b/client/components/Planning/PlanningEditor/index.tsx
@@ -40,7 +40,7 @@ interface IProps {
     submitFailed: boolean;
     itemManager: IFormItemManager;
 
-    event?: IEventItem;
+    events?: Array<IEventItem>;
     addNewsItemToPlanning?: IArticle;
     inModalView: boolean;
     activeNav?: string;
@@ -83,6 +83,7 @@ interface IState {
 }
 
 const mapStateToProps = (state) => ({
+    events: selectors.events.storedEvents(state),
     newsCoverageStatus: selectors.general.newsCoverageStatus(state),
     currentAgenda: selectors.planning.currentAgenda(state),
     desk: selectors.general.currentDeskId(state),
@@ -499,7 +500,8 @@ class PlanningEditorComponent extends React.Component<IProps, IState> {
                         files: this.props.files,
                     },
                     associated_event: {
-                        event: this.props.event,
+                        events: (this.props.item.related_events ?? [])
+                            .map((relatedEvent) => this.props.events[relatedEvent._id]),
                     },
                     coverages: {
                         onChange: this.onCoverageChange,

diff --git a/client/components/Planning/PlanningPreviewContent.tsx b/client/components/Planning/PlanningPreviewContent.tsx
@@ -32,6 +32,7 @@ import {ContentBlock} from '../UI/SidePanel';
 import {EventMetadata} from '../Events';
 import {FeatureLabel} from './FeaturedPlanning';
 import {previewGroupToProfile, renderGroupedFieldsForPanel} from '../fields';
+import {getRelatedEventIdsForPlanning} from '../../utils/planning';
 
 interface IProps {
     item: IPlanningItem;
@@ -40,11 +41,13 @@ interface IProps {
     session: ISession;
     lockedItems: ILockedItems;
     formProfile: IFormProfiles;
-    event?: IEventItem;
+    relatedEvents?: Array<IEventItem>;
     newsCoverageStatus: Array<IPlanningNewsCoverageStatus>;
     onEditEvent(): void; // TODO - match code
     inner?: boolean;
     noPadding?: boolean;
+
+    // TODO: Multiple related events - If BE supports bulk fetch for an array of events use it
     fetchEventFiles(event: IEventItem): void; // TODO - match code
     fetchPlanningFiles(item: IPlanningItem): void; // TODO - match code
     hideRelatedItems?: boolean;
@@ -56,7 +59,7 @@ interface IProps {
 
 const mapStateToProps = (state, ownProps) => ({
     item: selectors.planning.currentPlanning(state) || ownProps.item,
-    event: selectors.events.planningWithEventDetails(state),
+    relatedEvents: selectors.events.getRelatedEventsForPlanning(state),
     session: selectors.general.session(state),
     privileges: selectors.general.privileges(state),
     users: selectors.general.users(state),
@@ -77,8 +80,10 @@ const mapDispatchToProps = (dispatch) => ({
 export class PlanningPreviewContentComponent extends React.PureComponent<IProps> {
     componentWillMount() {
         // If the planning item is associated with an event, get its files
-        if (this.props.event) {
-            this.props.fetchEventFiles(this.props.event);
+        if ((this.props.relatedEvents?.length ?? 0) > 0) {
+            this.props.relatedEvents.forEach((relatedEvent) => (
+                this.props.fetchEventFiles(relatedEvent)
+            ));
         }
 
         this.props.fetchPlanningFiles(this.props.item);
@@ -89,7 +94,7 @@ export class PlanningPreviewContentComponent extends React.PureComponent<IProps>
         const {item,
             users,
             formProfile,
-            event,
+            relatedEvents,
             desks,
             newsCoverageStatus,
             onEditEvent,
@@ -133,6 +138,9 @@ export class PlanningPreviewContentComponent extends React.PureComponent<IProps>
             />
         );
 
+        const primaryEventId = getRelatedEventIdsForPlanning(this.props.item, 'primary')[0];
+        const primaryRelatedEvent = (relatedEvents ?? []).find((relatedEvent) => relatedEvent._id === primaryEventId);
+
         return (
             <ContentBlock noPadding={noPadding}>
                 <div className="side-panel__content-block--flex">
@@ -153,7 +161,8 @@ export class PlanningPreviewContentComponent extends React.PureComponent<IProps>
                             verbose={true}
                             withExpiredStatus={true}
                         />
-                        {eventUtils.isEventCompleted(event) && (
+                        {/* TODO: How do we display event status when there's multiple? Primary only? */}
+                        {eventUtils.isEventCompleted(primaryRelatedEvent) && (
                             <Label
                                 text={gettext('Event Completed')}
                                 iconType="success"
@@ -200,19 +209,21 @@ export class PlanningPreviewContentComponent extends React.PureComponent<IProps>
                 )}
                 {!hideRelatedItems && event && (
                     <h3 className="side-panel__heading--big">
-                        {gettext('Associated Event')}
+                        {gettext('Associated Events')}
                     </h3>
                 )}
-                {!hideRelatedItems && event && (
-                    <EventMetadata
-                        event={event}
-                        dateOnly={true}
-                        onEditEvent={onEditEvent.bind(null, event)}
-                        lockedItems={lockedItems}
-                        createUploadLink={getFileDownloadURL}
-                        files={files}
-                        hideEditIcon={hideEditIcon}
-                    />
+                {!hideRelatedItems && (relatedEvents?.length ?? 0) > 0 && (
+                    relatedEvents.map((relatedEvent) => (
+                        <EventMetadata
+                            key={`related_event--${relatedEvent._id}`}
+                            event={relatedEvent}
+                            dateOnly={true}
+                            onEditEvent={onEditEvent.bind(null, relatedEvent)}
+                            createUploadLink={getFileDownloadURL}
+                            files={files}
+                            hideEditIcon={hideEditIcon}
+                        />
+                    ))
                 )}
                 {!hasCoverage ? null : (
                     <React.Fragment>

diff --git a/client/components/Planning/PlanningPreviewHeader.tsx b/client/components/Planning/PlanningPreviewHeader.tsx
@@ -122,7 +122,7 @@ PlanningPreviewHeaderComponent.propTypes = {
 
 const mapStateToProps = (state) => ({
     item: selectors.planning.currentPlanning(state),
-    event: selectors.events.planningWithEventDetails(state),
+    event: selectors.events.getRelatedEventsForPlanning(state),
     session: selectors.general.session(state),
     privileges: selectors.general.privileges(state),
     users: selectors.general.users(state),

diff --git a/client/components/fields/editor/AssociatedEvent.tsx b/client/components/fields/editor/AssociatedEvent.tsx
@@ -9,7 +9,7 @@ import * as selectors from '../../../selectors';
 import {EventMetadata} from '../../Events';
 
 interface IProps extends IEditorFieldProps {
-    event?: IEventItem;
+    events?: Array<IEventItem>;
     lockedItems: ILockedItems;
     files: Array<IFile>;
     tabEnabled?: boolean; // defaults to true
@@ -22,22 +22,22 @@ const mapStateToProps = (state) => ({
 
 class EditorFieldAssociatedEventComponent extends React.PureComponent<IProps> {
     render() {
-        return this.props.event == null ? null : (
+        return (this.props.events?.length ?? 0) < 1 ? null : this.props.events.map((event) => (
             <EventMetadata
+                key={event._id}
                 ref={this.props.refNode}
-                testId={this.props.testId}
-                event={this.props.event}
-                lockedItems={this.props.lockedItems}
+                testId={`${this.props.testId}--${event._id}`}
+                event={event}
                 navigation={{}}
                 createUploadLink={getFileDownloadURL}
                 files={this.props.files}
                 tabEnabled={this.props.tabEnabled ?? true}
             />
-        );
+        ));
     }
 }
 
-export const EditorFieldAssociatedEvent = connect(
+export const EditorFieldAssociatedEvents = connect(
     mapStateToProps,
     null,
     null,

diff --git a/client/components/fields/editor/index.tsx b/client/components/fields/editor/index.tsx
@@ -41,7 +41,7 @@ import {EditorFieldEventRelatedPlannings} from './EventRelatedPlannings/EventRel
 import {EditorFieldPlanningDateTime} from './PlanningDateTime';
 import {EditorFieldNotForPublication} from './NotForPublication';
 import {EditorFieldOverrideAutoAssignToWorkflow} from './OverrideAutoAssignToWorkflow';
-import {EditorFieldAssociatedEvent} from './AssociatedEvent';
+import {EditorFieldAssociatedEvents} from './AssociatedEvent';
 import {EditorFieldCoverages} from './Coverages';
 import {EditorFieldGenre} from './Genre';
 import {EditorFieldNewsCoverageStatus} from './NewsCoverageStatus';
@@ -127,7 +127,7 @@ export const FIELD_TO_EDITOR_COMPONENT = {
     marked_for_not_publication: EditorFieldNotForPublication,
     'flags.overide_auto_assign_to_workflow': EditorFieldOverrideAutoAssignToWorkflow,
     overide_auto_assign_to_workflow: EditorFieldOverrideAutoAssignToWorkflow,
-    associated_event: EditorFieldAssociatedEvent,
+    associated_event: EditorFieldAssociatedEvents,
     coverages: EditorFieldCoverages,
     genre: EditorFieldGenre,
     news_coverage_status: EditorFieldNewsCoverageStatus,

diff --git a/client/selectors/events.ts b/client/selectors/events.ts
@@ -132,21 +132,21 @@ export const getRelatedPlanningsForModalEvent = createSelector(
     (itemId, events, plannings, agendas) => getRelatedPlanningsForEvent(itemId, events, plannings, agendas)
 );
 
-export const planningWithEventDetails = createSelector<
+export const getRelatedEventsForPlanning = createSelector<
     IPlanningAppState,
     IPlanningItem | null,
     {[eventId: string]: IEventItem},
-    IEventItem | null
+    Array<IEventItem> | null
 >(
     [currentPlanning, storedEvents],
     (item, events) => {
         if (item == null) {
             return null;
         }
 
-        const relatedEventIds = getRelatedEventIdsForPlanning(item, 'primary');
-
-        return relatedEventIds.length > 0 ? events[relatedEventIds[0]] : null;
+        return (item.related_events?.length ?? 0) > 0
+            ? item.related_events.map((relatedEvent) => events[relatedEvent._id])
+            : null;
     }
 );
 

diff --git a/client/utils/planning.ts b/client/utils/planning.ts
@@ -280,15 +280,14 @@ function canCancelAllCoverage(
 
 function canAddAsEvent(
     planning: IPlanningItem,
-    event: IEventItem | null,
-    session: ISession,
     privileges: IPrivileges,
     locks: ILockedItems
 ): boolean {
     return (
         !!privileges[PRIVILEGES.EVENT_MANAGEMENT] &&
         !!privileges[PRIVILEGES.PLANNING_MANAGEMENT] &&
-        isPlanAdHoc(planning) &&
+        // TODO: Add check for config option, if multiple events are allowed or not,
+        // if not, disallow after there's a primary link
         !lockUtils.isItemLocked(planning, locks) &&
         !isItemSpiked(planning) &&
         getItemWorkflowState(planning) !== WORKFLOW_STATE.KILLED &&
@@ -425,7 +424,7 @@ export function getPlanningItemActions(
         [PLANNING.ITEM_ACTIONS.CANCEL_ALL_COVERAGE.actionName]: () =>
             canCancelAllCoverage(plan, event, session, privileges, locks),
         [PLANNING.ITEM_ACTIONS.ADD_AS_EVENT.actionName]: () =>
-            canAddAsEvent(plan, event, session, privileges, locks),
+            canAddAsEvent(plan, privileges, locks),
         [PLANNING.ITEM_ACTIONS.EDIT_PLANNING.actionName]: () =>
             canEditPlanning(plan, event, session, privileges, locks),
         [PLANNING.ITEM_ACTIONS.EDIT_PLANNING_MODAL.actionName]: () =>