Multilingual Planning: filter by language and display in the respective language when using the 'Event and Planning filters' [SDESK-7138]

client/apps/Planning/PlanningList.tsx

@@ -17,6 +17,7 @@ import {
     IContactItem,
     SORT_FIELD,
     ICommonSearchParams,
+    ISearchFilter,
 } from '../../interfaces';
 
 import * as actions from '../../actions';
@@ -61,6 +62,7 @@ interface IProps {
     listViewType: LIST_VIEW_TYPE;
     sortField: SORT_FIELD;
     currentSearch: ICommonSearchParams<IEventOrPlanningItem>;
+    searchFilters: Array<ISearchFilter>;
 
     openPreview(item: IEventOrPlanningItem): void;
     edit(item: IEventOrPlanningItem): void;
@@ -94,7 +96,8 @@ const mapStateToProps = (state) => ({
     contacts: selectors.general.contactsById(state),
     listViewType: selectors.main.getCurrentListViewType(state),
     sortField: selectors.main.getCurrentSortField(state),
-    currentSearch: selectors.main.currentSearch(state)
+    currentSearch: selectors.main.currentSearch(state),
+    searchFilters: selectors.eventsPlanning.combinedViewFilters(state),
 });
 
 const mapDispatchToProps = (dispatch) => ({
@@ -140,6 +143,10 @@ export class PlanningListComponent extends React.PureComponent<IProps> {
     }
 
     render() {
+        const activeSearchFilter = this.props.searchFilters.filter((filter) =>
+            filter.item_type === FILTER_TYPE[this.props.activeFilter] &&
+            filter._id === this.props.currentSearch?.filter_id);
+
         const {
             groups,
             agendas,
@@ -211,6 +218,7 @@ export class PlanningListComponent extends React.PureComponent<IProps> {
                     sortField={sortField}
                     indexItems
                     searchParams={currentSearch.advancedSearch}
+                    searchFilterParams={activeSearchFilter[0]?.params}
                 />
             </React.Fragment>
         );

client/components/Main/ListGroup.tsx

@@ -2,7 +2,11 @@ import React from 'react';
 import moment from 'moment-timezone';
 import {ListGroupItem} from './';
 import {Group, Header} from '../UI/List';
-import {ICommonAdvancedSearchParams, IEventOrPlanningItem, LIST_VIEW_TYPE, SORT_FIELD} from '../../interfaces';
+import {
+    ICommonAdvancedSearchParams,
+    IEventOrPlanningItem, ISearchFilter,
+    LIST_VIEW_TYPE, SORT_FIELD
+} from '../../interfaces';
 import {timeUtils} from '../../utils';
 
 const TIME_COLUMN_MIN_WIDTH = {
@@ -78,7 +82,8 @@ interface IProps {
     listViewType?: string;
     sortField?: string;
     listBoxGroupProps: {};
-    searchParams:ICommonAdvancedSearchParams;
+    searchParams?: ICommonAdvancedSearchParams;
+    searchFilterParams?: ISearchFilter['params'];
 }
 
 export class ListGroup extends React.Component<IProps> {
@@ -147,6 +152,7 @@ export class ListGroup extends React.Component<IProps> {
             sortField,
             listBoxGroupProps,
             searchParams,
+            searchFilterParams,
         } = this.props;
 
         // with defaults
@@ -208,6 +214,7 @@ export class ListGroup extends React.Component<IProps> {
                             sortField: sortField,
                             minTimeWidth: minTimeWidth,
                             searchParams: searchParams,
+                            searchFilterParams: searchFilterParams,
                         };
 
                         if (indexItems) {

client/components/Main/ListGroupItem.tsx

@@ -4,7 +4,7 @@ import {
     IEventListItemProps,
     IPlanningListItemProps,
     IEventOrPlanningItem,
-    IEventItem, IPlanningItem, IBaseListItemProps, ICommonAdvancedSearchParams
+    IEventItem, IPlanningItem, IBaseListItemProps, ICommonAdvancedSearchParams, ISearchFilter
 } from '../../interfaces';
 
 import {EventItem, EventItemWithPlanning} from '../Events';
@@ -27,6 +27,7 @@ interface IProps extends Omit<
     navigateDown?: boolean;
     minTimeWidth?: string;
     searchParams?: ICommonAdvancedSearchParams;
+    searchFilterParams?: ISearchFilter['params'];
 
     onDoubleClick(item: IEventOrPlanningItem): void;
     showRelatedPlannings(item: IEventItem): void;
@@ -123,6 +124,7 @@ export class ListGroupItem extends React.Component<IProps, IState> {
             sortField,
             minTimeWidth,
             searchParams,
+            searchFilterParams,
         } = this.props;
         const itemType = getItemType(item);
 
@@ -152,7 +154,7 @@ export class ListGroupItem extends React.Component<IProps, IState> {
             ...itemProps,
             item: item as IEventItem,
             calendars: calendars,
-            filterLanguage: searchParams?.language,
+            filterLanguage: searchParams?.language || searchFilterParams?.language,
             multiSelected: indexOf(selectedEventIds, item._id) !== -1,
             [EVENTS.ITEM_ACTIONS.EDIT_EVENT.actionName]:
                 itemActions[EVENTS.ITEM_ACTIONS.EDIT_EVENT.actionName],
@@ -195,7 +197,7 @@ export class ListGroupItem extends React.Component<IProps, IState> {
             contentTypes: contentTypes,
             agendas: agendas,
             date: date,
-            filterLanguage: searchParams?.language,
+            filterLanguage: searchParams?.language || searchFilterParams?.language,
             onAddCoverageClick: onAddCoverageClick,
             multiSelected: indexOf(selectedPlanningIds, item._id) !== -1,
             showAddCoverage: showAddCoverage,

client/components/Main/ListPanel.tsx

@@ -10,6 +10,7 @@ import {
     IEventOrPlanningItem, IG2ContentType,
     ILockedItems,
     IPlanningItem,
+    ISearchFilter,
     ISession, LIST_VIEW_TYPE, SORT_FIELD
 } from '../../interfaces';
 
@@ -68,7 +69,8 @@ interface IProps {
     listViewType: LIST_VIEW_TYPE;
     sortField: SORT_FIELD;
     userInitiatedSearch?: boolean;
-    searchParams?: ICommonAdvancedSearchParams
+    searchParams?: ICommonAdvancedSearchParams,
+    searchFilterParams?: ISearchFilter['params']
 
     onItemClick(item: IEventOrPlanningItem): void;
     onDoubleClick(item: IEventOrPlanningItem): void;
@@ -319,7 +321,8 @@ export class ListPanel extends React.Component<IProps, IState> {
             contacts,
             listViewType,
             sortField,
-            searchParams
+            searchParams,
+            searchFilterParams,
         } = this.props;
 
         let indexFrom = 0;
@@ -399,6 +402,7 @@ export class ListPanel extends React.Component<IProps, IState> {
                                 sortField: sortField,
                                 listBoxGroupProps: listBoxGroupProps,
                                 searchParams: searchParams,
+                                searchFilterParams: searchFilterParams,
                                 ...propsForNestedListItems,
                             };