changes after review

dzonidoo · Oct 17, 2024 · 64abecb · 64abecb
1 parent dcf0209
commit 64abecb
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/assets/globals.d.ts b/assets/globals.d.ts
@@ -64,6 +64,7 @@ interface IClientConfig {
     collapsed_search_by_default?: boolean;
     show_user_register?: boolean;
     multimedia_website_search_url?: string;
+    show_default_time_frame_label?: boolean;
 }
 
 interface Window {

diff --git a/assets/search/components/SearchResultsBar/index.tsx b/assets/search/components/SearchResultsBar/index.tsx
@@ -75,6 +75,7 @@ interface IOwnProps {
     showTotalLabel?: boolean;
     showSaveTopic?: boolean;
     showSortDropdown?: boolean;
+    showDefaultTimeframeLabel?: boolean;
     totalItems?: number;
     activeTopic: ITopic;
     topicType: ITopic['topic_type'];
@@ -210,14 +211,15 @@ class SearchResultsBarComponent extends React.Component<IProps, IState> {
                                             })
                                         }
                                     </div>
-                                    {(() => {
+                                    {this.props.showDefaultTimeframeLabel && (() => {
                                         if (!(this.props.activeDateFilter?.date_filter == null && defaultDateFilter?.name != null)) {
                                             return null;
                                         }
                                         const dateFilterName = defaultDateFilter.name;
+
                                         return (
                                             <span className='d-flex align-items-center'>
-                                                <span className='popup-text--label'>{gettext('{{dateFilterName}}', {dateFilterName: dateFilterName})}</span>
+                                                <span className='popup-text--label'>{dateFilterName}</span>
 
                                                 <Popup
                                                     placement='right'

diff --git a/assets/ui/components/Popover.tsx b/assets/ui/components/Popover.tsx
@@ -13,8 +13,8 @@ interface IState {
 }
 
 export class Popup extends React.PureComponent<IProps, IState> {
-    elem: any;
-    referenceElem: any;
+    elem: HTMLElement | undefined;
+    referenceElem: HTMLElement | undefined;
     constructor(props: any) {
         super(props);
 

diff --git a/assets/wire/components/WireApp.tsx b/assets/wire/components/WireApp.tsx
@@ -5,7 +5,7 @@ import {connect} from 'react-redux';
 import {get, isEqual} from 'lodash';
 
 import {ISearchSortValue} from 'interfaces';
-import {gettext, DISPLAY_NEWS_ONLY, DISPLAY_ALL_VERSIONS_TOGGLE} from 'utils';
+import {gettext, DISPLAY_NEWS_ONLY, DISPLAY_ALL_VERSIONS_TOGGLE, getConfig} from 'utils';
 import {getSingleFilterValue, searchParamsUpdated} from 'search/utils';
 
 import {
@@ -224,6 +224,7 @@ class WireApp extends SearchBase<any> {
                                             refresh={this.props.fetchItems}
                                             setSortQuery={this.props.setSortQuery}
                                             setQuery={this.props.setQuery}
+                                            showDefaultTimeframeLabel={getConfig('show_default_time_frame_label') ?? true}
                                         />
                                     )
                                 }