Merge remote-tracking branch 'origin/release/2.9' into develop

superdesk · Jan 22, 2025 · a96f5ca · a96f5ca
2 parents fc2a329 + 78bd5ce
commit a96f5ca
Show file tree

Hide file tree

Showing 8 changed files with 269 additions and 233 deletions.
diff --git a/assets/search/components/SearchResultsBar/SearchResultsFiltersRow.tsx b/assets/search/components/SearchResultsBar/SearchResultsFiltersRow.tsx
@@ -9,6 +9,7 @@ import {setItemTypeFilter, toggleDropdownFilter} from 'agenda/actions';
 import {searchFilterSelector} from 'search/selectors';
 import {connect} from 'react-redux';
 import {agendaCoverageStatusFilter, getActiveFilterLabel} from 'agenda/components/AgendaCoverageExistsFilter';
+import {getCoverageDisplayName} from 'agenda/utils';
 
 const IS_AGENDA = location.pathname.includes('/agenda');
 
@@ -26,6 +27,7 @@ type IActiveFilter = {
     calendar?: any;
     location?: any;
     region?: any;
+    coverage?: any;
     coverage_type?: any;
     coverage_status?: any;
 };
@@ -108,9 +110,15 @@ function SearchResultsFiltersRow(props: IPropsAgendaExtended) {
                             },
                         ];
                     } else if (Array.isArray(activeFilter[filter])) {
+                        let getLabel = (val: string) => val;
+
+                        if (filter === 'coverage') {
+                            getLabel = getCoverageDisplayName;
+                        }
+
                         return activeFilter[filter].map((val: string) => ({
                             key: filter + val,
-                            label: val,
+                            label: getLabel(val),
                             onRemove: () => {
                                 removeDropdownFilter(filter, val);
                             },

diff --git a/features/web_api/agenda_restrict_coverage_details.feature b/features/web_api/agenda_restrict_coverage_details.feature
@@ -209,14 +209,14 @@ Feature: Agenda Restricted Coverage Details
             "coverages": [{
                 "coverage_id": "plan1_cov1",
                 "coverage_type": "text",
-                "scheduled": "__no_value__",
+                "scheduled": "2018-05-28T10:51:52+0000",
                 "slugline": "__no_value__",
                 "workflow_status": "__no_value__",
                 "coverage_status": "__no_value__"
             }, {
                 "coverage_id": "plan1_cov2",
                 "coverage_type": "text",
-                "scheduled": "__no_value__",
+                "scheduled": "2018-05-28T10:51:52+0000",
                 "slugline": "__no_value__",
                 "workflow_status": "__no_value__",
                 "coverage_status": "__no_value__"
@@ -234,7 +234,7 @@ Feature: Agenda Restricted Coverage Details
                         "g2_content_type": "text",
                         "ednote": "__no_value__",
                         "internal_note": "__no_value__",
-                        "scheduled": "__no_value__",
+                        "scheduled": "2018-05-28T10:51:52+0000",
                         "slugline": "__no_value__"
                     }
                 }, {
@@ -245,7 +245,7 @@ Feature: Agenda Restricted Coverage Details
                         "g2_content_type": "text",
                         "ednote": "__no_value__",
                         "internal_note": "__no_value__",
-                        "scheduled": "__no_value__",
+                        "scheduled": "2018-05-28T10:51:52+0000",
                         "slugline": "__no_value__"
                     }
                 }]
@@ -276,7 +276,7 @@ Feature: Agenda Restricted Coverage Details
             "coverages": [{
                 "coverage_id": "plan1_cov1",
                 "coverage_type": "text",
-                "scheduled": "__no_value__",
+                "scheduled": "2018-05-28T10:51:52+0000",
                 "slugline": "__no_value__",
                 "workflow_status": "__no_value__",
                 "coverage_status": "__no_value__"
@@ -299,7 +299,7 @@ Feature: Agenda Restricted Coverage Details
                         "g2_content_type": "text",
                         "ednote": "__no_value__",
                         "internal_note": "__no_value__",
-                        "scheduled": "__no_value__",
+                        "scheduled": "2018-05-28T10:51:52+0000",
                         "slugline": "__no_value__"
                     }
                 }, {
@@ -366,14 +366,14 @@ Feature: Agenda Restricted Coverage Details
             "coverages": [{
                 "coverage_id": "plan1_cov1",
                 "coverage_type": "text",
-                "scheduled": "__no_value__",
+                "scheduled": "2018-05-28T10:51:52+0000",
                 "slugline": "__no_value__",
                 "workflow_status": "__no_value__",
                 "coverage_status": "__no_value__"
             }, {
                 "coverage_id": "plan1_cov2",
                 "coverage_type": "text",
-                "scheduled": "__no_value__",
+                "scheduled": "2018-05-28T10:51:52+0000",
                 "slugline": "__no_value__",
                 "workflow_status": "__no_value__",
                 "coverage_status": "__no_value__"