Fix speaker stats search for empty string jitsi#9751

netsyno · Sep 24, 2021 · 2cf3a2f · 2cf3a2f
1 parent fb4d3b1
commit 2cf3a2f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/react/features/speaker-stats/actions.js b/react/features/speaker-stats/actions.js
@@ -10,10 +10,10 @@ import {
 /**
  * Starts a search by criteria.
  *
- * @param {string} criteria - The search criteria.
+ * @param {string | null} criteria - The search criteria.
  * @returns {Object}
  */
-export function initSearch(criteria: string) {
+export function initSearch(criteria: string | null) {
     return {
         type: INIT_SEARCH,
         criteria

diff --git a/react/features/speaker-stats/components/SpeakerStats.js b/react/features/speaker-stats/components/SpeakerStats.js
@@ -10,7 +10,7 @@ import { connect } from '../../base/redux';
 import { escapeRegexp } from '../../base/util';
 import { initUpdateStats, initSearch } from '../actions';
 import { SPEAKER_STATS_RELOAD_INTERVAL } from '../constants';
-import { getSpeakerStats, getSearchCriteria } from '../functions';
+import { getSpeakerStats } from '../functions';
 
 import SpeakerStatsItem from './SpeakerStatsItem';
 import SpeakerStatsLabels from './SpeakerStatsLabels';
@@ -36,7 +36,7 @@ type Props = {
     /**
      * The search criteria.
      */
-    _criteria: string,
+    _criteria: string | null,
 
     /**
      * The JitsiConference from which stats will be pulled.
@@ -216,8 +216,7 @@ class SpeakerStats extends Component<Props> {
  * @private
  * @returns {{
  *     _localDisplayName: ?string,
- *     _stats: Object,
- *     _criteria: string,
+ *     _stats: Object
  * }}
  */
 function _mapStateToProps(state) {
@@ -231,8 +230,7 @@ function _mapStateToProps(state) {
          * @type {string|undefined}
          */
         _localDisplayName: localParticipant && localParticipant.name,
-        _stats: getSpeakerStats(state),
-        _criteria: getSearchCriteria(state)
+        _stats: getSpeakerStats(state)
     };
 }
 

diff --git a/react/features/speaker-stats/functions.js b/react/features/speaker-stats/functions.js
@@ -43,10 +43,10 @@ export function getSpeakerStats(state: Object) {
  * Gets speaker stats search criteria.
  *
  * @param {*} state - The redux state.
- * @returns {string} - The search criteria.
+ * @returns {string | null} - The search criteria.
  */
 export function getSearchCriteria(state: Object) {
-    return state['features/speaker-stats']?.criteria ?? '';
+    return state['features/speaker-stats']?.criteria;
 }
 
 /**
@@ -161,7 +161,7 @@ export function filterBySearchCriteria(state: Object, stats: ?Object) {
     const filteredStats = _.cloneDeep(stats ?? getSpeakerStats(state));
     const criteria = getSearchCriteria(state);
 
-    if (criteria) {
+    if (criteria !== null) {
         const searchRegex = new RegExp(criteria, 'gi');
 
         for (const id in filteredStats) {

diff --git a/react/features/speaker-stats/reducer.js b/react/features/speaker-stats/reducer.js
@@ -18,7 +18,7 @@ import {
 const INITIAL_STATE = {
     stats: {},
     pendingReorder: true,
-    criteria: ''
+    criteria: null
 };
 
 ReducerRegistry.register('features/speaker-stats', (state = _getInitialState(), action) => {