fix: Speaker stats search fix #9751 (#10019)

* Optimization of speaker stats display names #9751 * Fix speaker stats search for empty string #9751
jitsi · Sep 24, 2021 · c3348bf · c3348bf
1 parent 0d42f14
commit c3348bf
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 32 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.
@@ -140,24 +140,9 @@ class SpeakerStats extends Component<Props> {
         const dominantSpeakerTime = statsModel.getTotalDominantSpeakerTime();
         const hasLeft = statsModel.hasLeft();
 
-        let displayName;
-
-        if (statsModel.isLocalStats()) {
-            const { t } = this.props;
-            const meString = t('me');
-
-            displayName = this.props._localDisplayName;
-            displayName
-                = displayName ? `${displayName} (${meString})` : meString;
-        } else {
-            displayName
-                = this.props._stats[userId].getDisplayName()
-                    || interfaceConfig.DEFAULT_REMOTE_DISPLAY_NAME;
-        }
-
         return (
             <SpeakerStatsItem
-                displayName = { displayName }
+                displayName = { statsModel.getDisplayName() }
                 dominantSpeakerTime = { dominantSpeakerTime }
                 hasLeft = { hasLeft }
                 isDominantSpeaker = { isDominantSpeaker }
@@ -187,7 +172,40 @@ class SpeakerStats extends Component<Props> {
      * @private
      */
     _updateStats() {
-        this.props.dispatch(initUpdateStats(() => this.props.conference.getSpeakerStats()));
+        this.props.dispatch(initUpdateStats(() => this._getSpeakerStats()));
+    }
+
+    /**
+     * Update the internal state with the latest speaker stats.
+     *
+     * @returns {Object}
+     * @private
+     */
+    _getSpeakerStats() {
+        const stats = { ...this.props.conference.getSpeakerStats() };
+
+        for (const userId in stats) {
+            if (stats[userId]) {
+                if (stats[userId].isLocalStats()) {
+                    const { t } = this.props;
+                    const meString = t('me');
+
+                    stats[userId].setDisplayName(
+                        this.props._localDisplayName
+                            ? `${this.props._localDisplayName} (${meString})`
+                            : meString
+                    );
+                }
+
+                if (!stats[userId].getDisplayName()) {
+                    stats[userId].setDisplayName(
+                        interfaceConfig.DEFAULT_REMOTE_DISPLAY_NAME
+                    );
+                }
+            }
+        }
+
+        return stats;
     }
 }
 
@@ -198,8 +216,7 @@ class SpeakerStats extends Component<Props> {
  * @private
  * @returns {{
  *     _localDisplayName: ?string,
- *     _stats: Object,
- *     _criteria: string,
+ *     _stats: Object
  * }}
  */
 function _mapStateToProps(state) {
@@ -213,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,16 +161,14 @@ 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) {
             if (filteredStats[id].hasOwnProperty('_isLocalStats')) {
                 const name = filteredStats[id].getDisplayName();
 
-                if (!name || !name.match(searchRegex)) {
-                    filteredStats[id].hidden = true;
-                }
+                filteredStats[id].hidden = !name || !name.match(searchRegex);
             }
         }
     }

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) => {