As a Planning editor I want to see all items with Coverages assigned to a specific editor [SDESK-6745].

client/api/combined.ts

@@ -24,7 +24,8 @@ function convertCombinedParams(params: ISearchParams): Partial<ISearchAPIParams>
         calendars: cvsToString(params.calendars),
         agendas: arrayToString(params.agendas),
         include_associated_planning: params.include_associated_planning,
-        source: cvsToString(params.source, 'id')
+        source: cvsToString(params.source, 'id'),
+        coverage_user_id: params.coverage_user_id,
     };
 }
 

client/api/events.ts

@@ -23,6 +23,7 @@ function convertEventParams(params: ISearchParams): Partial<ISearchAPIParams> {
         location: params.location?.qcode,
         calendars: cvsToString(params.calendars),
         no_calendar_assigned: params.no_calendar_assigned,
+        coverage_user_id: params.coverage_user_id,
     };
 }
 

client/api/planning.ts

@@ -30,7 +30,8 @@ function convertPlanningParams(params: ISearchParams): Partial<ISearchAPIParams>
         include_scheduled_updates: params.include_scheduled_updates,
         event_item: arrayToString(params.event_item),
         g2_content_type: params.g2_content_type?.qcode,
-        source: cvsToString(params.source, 'id')
+        source: cvsToString(params.source, 'id'),
+        coverage_user_id: params.coverage_user_id,
     };
 }
 

client/apps/Planning/PlanningListSubNav.tsx

@@ -22,14 +22,17 @@ interface IProps {
     currentInterval: 'DAY' | 'WEEK' | 'MONTH';
     sortOrder: SORT_ORDER;
     sortField: SORT_FIELD;
-
+    userList:Array<{label: string, onSelect(): void}>;
+    users: any;
     setStartFilter(value?: moment.Moment): void;
     jumpTo(interval: 'TODAY' | 'BACK' | 'FORWARD'): void;
     setJumpInterval(interval: 'DAY' | 'WEEK' | 'MONTH'): void;
+    activefilter?:string;
 }
 
 interface IState {
-    viewSize: SUBNAV_VIEW_SIZE;
+    viewSize?: SUBNAV_VIEW_SIZE;
+    name?: string,
 }
 
 const mapStateToProps = (state) => ({
@@ -38,6 +41,9 @@ const mapStateToProps = (state) => ({
     listViewType: selectors.main.getCurrentListViewType(state),
     sortOrder: selectors.main.getCurrentSortOrder(state),
     sortField: selectors.main.getCurrentSortField(state),
+    users: selectors.general.users(state),
+    groups: selectors.main.itemGroups(state),
+    activefilter: selectors.main.activeFilter(state)
 });
 
 const mapDispatchToProps = (dispatch) => ({
@@ -51,11 +57,16 @@ class PlanningListSubNavComponent extends React.Component<IProps, IState> {
     sortFieldOptions: Array<{label: string, onSelect(): void}>
     container?: HTMLDivElement;
     resizeObserver: ResizeObserver;
+    userList: Array<{label: string, onSelect(): void}>
 
     constructor(props) {
         super(props);
+        this.state = {
+            name: ''
+        };
         const {gettext} = superdeskApi.localization;
 
+        this.props.users.unshift({_id: null, display_name: 'All'});
         this.toggleSortOrder = this.toggleSortOrder.bind(this);
         this.onResized = this.onResized.bind(this);
         this.onContainerMounted = this.onContainerMounted.bind(this);
@@ -87,6 +98,10 @@ class PlanningListSubNavComponent extends React.Component<IProps, IState> {
         }];
     }
 
+    componentDidMount() {
+        this.setState({name: 'All'});
+    }
+
     onContainerMounted(node: HTMLDivElement) {
         this.container = node;
 
@@ -131,7 +146,18 @@ class PlanningListSubNavComponent extends React.Component<IProps, IState> {
         planningApi.ui.list.search({sort_field: field});
     }
 
+    filterCoverageUser(item) {
+        planningApi.ui.list.search({coverage_user_id: item._id});
+        this.setState({name: item.display_name});
+    }
+
     render() {
+        const userList = this.props.users.map((user) => ({
+            label: user.display_name,
+            onSelect: () => {
+                this.filterCoverageUser(user);
+            }
+        }));
         const {gettext} = superdeskApi.localization;
         const {currentStartFilter} = this.props;
         let intervalText: string;
@@ -171,6 +197,19 @@ class PlanningListSubNavComponent extends React.Component<IProps, IState> {
                     <ButtonGroup align="inline">
                         <FilterSubnavDropdown viewSize={this.state.viewSize} />
                     </ButtonGroup>
+                    {this.props.activefilter === 'EVENTS' ? ' ' : (
+                        <div>
+                          All items and Coverages assigned to :
+                            <Dropdown items={userList}>
+                                <span className="sd-margin-l--1 sd-margin-r--3">
+                                    {this.state.name}
+                                    <span className="dropdown__caret" />
+                                </span>
+                            </Dropdown>
+
+                        </div>
+                    )}
+
                     <ButtonGroup align="end">
                         {this.props.listViewType === LIST_VIEW_TYPE.LIST ? (
                             <React.Fragment>

client/components/Coverages/CoverageIcon.tsx

@@ -85,7 +85,8 @@ export class CoverageIcon extends React.PureComponent<IProps> {
                         planningUtils.getCoverageIcon(
                             planningUtils.getCoverageContentType(this.props.coverage, this.props.contentTypes) ||
                             this.props.coverage.planning?.g2_content_type,
-                            this.props.coverage
+                            this.props.coverage,
+                            this.props.users
                         ),
                         planningUtils.getCoverageIconColor(this.props.coverage),
                     )}

client/interfaces.ts

@@ -879,6 +879,7 @@ export interface ICommonSearchParams<T extends IEventOrPlanningItem> {
     sortOrder?: SORT_ORDER;
     sortField?: SORT_FIELD;
     source?:string;
+    coverage_user_id?:string
 }
 
 export interface IEventSearchParams extends ICommonSearchParams<IEventItem> {
@@ -1312,6 +1313,7 @@ export interface ISearchParams {
         id?: string;
         name?: string;
     }>;
+    coverage_user_id?:string;
 
     // Event Params
     reference?: string;
@@ -1363,6 +1365,7 @@ export interface ISearchAPIParams {
     recurrence_id?: string;
     filter_id?: ISearchFilter['_id'];
     source?: string;
+    coverage_user_id?:string;
 
     // Event Params
     reference?: string;

client/utils/planning.ts

@@ -974,7 +974,8 @@ function getCoverageDateTimeText(coverage: IPlanningCoverageItem) {
  */
 function getCoverageIcon(
     type: IG2ContentType['qcode'] | IG2ContentType['content item type'],
-    coverage?: DeepPartial<IPlanningCoverageItem>
+    coverage?: DeepPartial<IPlanningCoverageItem>,
+    users?: Array<IUser>
 ): string {
     if (get(coverage, 'scheduled_updates.length', 0) > 0 ||
             (get(coverage, 'scheduled_update_id') && get(coverage, 'assignment_id'))) {

client/utils/search.ts

@@ -93,6 +93,7 @@ export function planningParamsToSearchParams(params: IPlanningSearchParams): ISe
         include_scheduled_updates: params.includeScheduledUpdates,
         no_agenda_assigned: params.noAgendaAssigned,
         agendas: params.agendas,
+        coverage_user_id: params.coverage_user_id
     };
 }
 
@@ -107,6 +108,7 @@ export function searchParamsToPlanningParams(params: ISearchParams): IPlanningSe
         excludeRescheduledAndCancelled: params.exclude_rescheduled_and_cancelled,
         featured: params.featured,
         includeScheduledUpdates: params.include_scheduled_updates,
+        coverage_user_id: params.coverage_user_id,
         advancedSearch: {
             ...common.advancedSearch,
             featured: params.featured,
@@ -125,6 +127,7 @@ export function eventParamsToSearchParams(params: IEventSearchParams): ISearchPa
         location: params.advancedSearch?.location,
         no_calendar_assigned: params.noCalendarAssigned,
         calendars: params.calendars,
+        coverage_user_id: params.coverage_user_id
     };
 }
 
@@ -137,6 +140,7 @@ export function searchParamsToEventParams(params: ISearchParams): IEventSearchPa
         calendars: params.calendars,
         noCalendarAssigned: params.no_calendar_assigned,
         recurrenceId: params.recurrence_id,
+        coverage_user_id: params.coverage_user_id,
         advancedSearch: {
             ...common.advancedSearch,
             location: params.location,
@@ -149,6 +153,7 @@ export function combinedParamsToSearchParams(params: ICombinedSearchParams): ISe
     return {
         ...commonParamsToSearchParams(params),
         reference: params.advancedSearch?.reference,
+        coverage_user_id: params.coverage_user_id,
     };
 }
 
@@ -157,6 +162,7 @@ export function searchParamsToCombinedParams(params: ISearchParams): ICombinedSe
 
     return {
         ...common,
+        coverage_user_id: params.coverage_user_id,
         advancedSearch: {
             ...common.advancedSearch,
             reference: params.reference,

server/planning/search/queries/combined.py

@@ -88,11 +88,16 @@ def search_dates(params: Dict[str, Any], query: elastic.ElasticQuery):
     query.must.append(elastic.bool_or([event_query.build()["query"], planning_query.build()["query"]]))
 
 
+def search_coverage_assigned_user(params: Dict[str, Any], query: elastic.ElasticQuery):
+    planning.search_coverage_assigned_user(params, query)
+
+
 COMBINED_SEARCH_FILTERS: List[Callable[[Dict[str, Any], elastic.ElasticQuery], None]] = [
     search_not_common_fields,
     search_sluglines,
     search_calendars_and_agendas,
     search_dates,
+    search_coverage_assigned_user,
 ]
 
 COMBINED_SEARCH_FILTERS.extend(common.COMMON_SEARCH_FILTERS)
@@ -103,6 +108,7 @@ def search_dates(params: Dict[str, Any], query: elastic.ElasticQuery):
     "calendars",
     "agendas",
     "include_associated_planning",
+    "coverage_user_id",
 ]
 
 COMBINED_PARAMS.extend(common.COMMON_PARAMS)

server/planning/search/queries/planning.py

@@ -96,6 +96,21 @@ def search_coverage_sluglines(params: Dict[str, Any], query: elastic.ElasticQuer
         )
 
 
+def search_coverage_assigned_user(params: Dict[str, Any], query: elastic.ElasticQuery):
+    if params.get("coverage_user_id") and not strtobool(params.get("no_coverage", False)):
+        query.must.append(
+            elastic.bool_and(
+                [
+                    elastic.term(
+                        field="coverages.assigned_to.user",
+                        value=params["coverage_user_id"],
+                    ),
+                ],
+                "coverages",
+            ),
+        )
+
+
 def search_urgency(params: Dict[str, Any], query: elastic.ElasticQuery):
     urgency = str_to_number(params.get("urgency"))
 
@@ -263,6 +278,7 @@ def set_search_sort(params: Dict[str, Any], query: elastic.ElasticQuery):
     search_by_events,
     search_dates,
     set_search_sort,
+    search_coverage_assigned_user,
 ]
 
 PLANNING_SEARCH_FILTERS.extend(COMMON_SEARCH_FILTERS)
@@ -278,6 +294,7 @@ def set_search_sort(params: Dict[str, Any], query: elastic.ElasticQuery):
     "featured",
     "include_scheduled_updates",
     "event_item",
+    "coverage_user_id",
 ]
 
 PLANNING_PARAMS.extend(COMMON_PARAMS)