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

assets/agenda/components/AgendaList.tsx

@@ -414,6 +414,7 @@ class AgendaList extends React.Component<IProps, IState> {
     }
 
     render() {
+        const lastGroupWithItems = this.props.groupedItems.findLastIndex((group) => group.items.length > 0);
         return (
             <div
                 className={classNames('wire-articles wire-articles--list', {
@@ -428,7 +429,7 @@ class AgendaList extends React.Component<IProps, IState> {
                 }}
                 onScroll={this.props.onScroll}
             >
-                {this.props.groupedItems.map((group) => (
+                {this.props.groupedItems.filter((group, index) => lastGroupWithItems >= index).map((group) => (
                     <React.Fragment key={group.date}>
                         <div className='wire-articles__header' key={`${group.date}header`}>
                             {this.getListGroupDate(group)}

newsroom/agenda/agenda.py

@@ -686,7 +686,10 @@ class AgendaService(BaseSearchService):
     section = "agenda"
     limit_days_setting = None
     default_sort = [{"dates.start": "asc"}]
-    default_page_size = 250
+
+    @property
+    def default_page_size(self) -> int:
+        return app.config.get("AGENDA_PAGE_SIZE", 250)
 
     def get_advanced_search_fields(self, search: SearchQuery) -> List[str]:
         fields = super().get_advanced_search_fields(search)

newsroom/search/service.py

@@ -149,9 +149,12 @@ class BaseSearchService(Service):
     section: Section = "wire"
     limit_days_setting: Union[None, str] = "wire_time_limit_days"
     default_sort = [{"versioncreated": "desc"}]
-    default_page_size = 25
     _matched_ids = []  # array of IDs matched on the request, used when searching all versions
 
+    @property
+    def default_page_size(self) -> int:
+        return 25
+
     def get(self, req, lookup):
         search = SearchQuery()
         self.prefill_search_args(search, req)

package.json

@@ -72,7 +72,7 @@
     "style-loader": "^0.19.0",
     "terser-webpack-plugin-legacy": "^1.2.5",
     "ts-loader": "^3.5.0",
-    "typescript": "^4.9.5",
+    "typescript": "5.2.2",
     "url-search-params-polyfill": "2.0.3",
     "webpack": "3.11.0",
     "webpack-dev-server": "2.11.1",

tsconfig.json

@@ -3,9 +3,10 @@
     "assets"
   ],
   "compilerOptions": {
+    "lib": ["DOM", "DOM.Iterable", "ES2023"],
     "allowJs": true,
     "baseUrl": "./assets",
-    "target": "ES2017",
+    "target": "ES6",
     "module": "commonjs",
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,