From d6c00521b35526046ce304ce3d35a4dafd19ccd4 Mon Sep 17 00:00:00 2001
From: jai2201 <jai_s@me.iitr.ac.in>
Date: Mon, 21 Feb 2022 22:55:49 +0530
Subject: [PATCH] settings: Clean up muted_topics/users rendering logic.

This commit removes the unnecessary `data-list-widget` attribute
present in the <div> and <tbody> tag for muted_topics and muted_users table.

It became unnecessary/useless in 19cf6d0e0490db5b0f8841c6e42c1e5940d98ecc and
then was renamed while still useless.

Also uses the correct variable name `muted_topic` and `muted_user`
instead of `muted_topics` and `muted_users` to render a item of their list
in DOM through Listwidget.
---
 static/js/settings_muted_topics.js                  | 4 ++--
 static/js/settings_muted_users.js                   | 4 ++--
 static/templates/muted_topic_ui_row.hbs             | 2 +-
 static/templates/muted_user_ui_row.hbs              | 2 +-
 static/templates/settings/muted_topics_settings.hbs | 4 ++--
 static/templates/settings/muted_users_settings.hbs  | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/static/js/settings_muted_topics.js b/static/js/settings_muted_topics.js
index f3b55de21c..8cea0204ef 100644
--- a/static/js/settings_muted_topics.js
+++ b/static/js/settings_muted_topics.js
@@ -16,8 +16,8 @@ export function populate_list() {
 
     ListWidget.create(muted_topics_table, all_muted_topics, {
         name: "muted-topics-list",
-        modifier(muted_topics) {
-            return render_muted_topic_ui_row({muted_topics});
+        modifier(muted_topic) {
+            return render_muted_topic_ui_row({muted_topic});
         },
         filter: {
             element: $search_input,
diff --git a/static/js/settings_muted_users.js b/static/js/settings_muted_users.js
index d1af7118ac..8b84bfc56f 100644
--- a/static/js/settings_muted_users.js
+++ b/static/js/settings_muted_users.js
@@ -21,8 +21,8 @@ export function populate_list() {
 
     ListWidget.create(muted_users_table, all_muted_users, {
         name: "muted-users-list",
-        modifier(muted_users) {
-            return render_muted_user_ui_row({muted_users});
+        modifier(muted_user) {
+            return render_muted_user_ui_row({muted_user});
         },
         filter: {
             element: $search_input,
diff --git a/static/templates/muted_topic_ui_row.hbs b/static/templates/muted_topic_ui_row.hbs
index 574b1c6cb3..c3b3322f87 100644
--- a/static/templates/muted_topic_ui_row.hbs
+++ b/static/templates/muted_topic_ui_row.hbs
@@ -1,4 +1,4 @@
-{{#with muted_topics}}
+{{#with muted_topic}}
 <tr data-stream-id="{{stream_id}}" data-stream="{{stream}}" data-topic="{{topic}}" data-date-muted="{{date_muted_str}}">
     <td>{{stream}}</td>
     <td>{{topic}}</td>
diff --git a/static/templates/muted_user_ui_row.hbs b/static/templates/muted_user_ui_row.hbs
index dc6ff8fcbb..b159d78a0c 100644
--- a/static/templates/muted_user_ui_row.hbs
+++ b/static/templates/muted_user_ui_row.hbs
@@ -1,4 +1,4 @@
-{{#with muted_users}}
+{{#with muted_user}}
 <tr data-user-id="{{user_id}}" data-user-name="{{user_name}}" data-date-muted="{{date_muted_str}}">
     <td>{{user_name}}</td>
     <td>{{date_muted_str}}</td>
diff --git a/static/templates/settings/muted_topics_settings.hbs b/static/templates/settings/muted_topics_settings.hbs
index 1c2cb440ce..5924d34ee2 100644
--- a/static/templates/settings/muted_topics_settings.hbs
+++ b/static/templates/settings/muted_topics_settings.hbs
@@ -1,6 +1,6 @@
 <div id="muted-topic-settings" class="settings-section" data-name="muted-topics">
     <input id="muted_topics_search" class="search" type="text" placeholder="{{t 'Filter muted topics' }}" aria-label="{{t 'Filter muted topics' }}"/>
-    <div class="progressive-table-wrapper" data-simplebar data-list-widget="muted-topics-list">
+    <div class="progressive-table-wrapper" data-simplebar>
         <table class="table table-condensed table-striped wrapped-table">
             <thead class="table-sticky-headers">
                 <th data-sort="alphabetic" data-sort-prop="stream">{{t "Stream" }}</th>
@@ -8,7 +8,7 @@
                 <th data-sort="numeric" data-sort-prop="date_muted">{{t "Date muted" }}</th>
                 <th class="actions">{{t "Actions" }}</th>
             </thead>
-            <tbody id="muted_topics_table" class="required-text" data-empty="{{t 'You have not muted any topics yet.'}}" data-list-widget="muted-topics-list"></tbody>
+            <tbody id="muted_topics_table" class="required-text" data-empty="{{t 'You have not muted any topics yet.'}}"></tbody>
         </table>
     </div>
 </div>
diff --git a/static/templates/settings/muted_users_settings.hbs b/static/templates/settings/muted_users_settings.hbs
index 079180a31b..714a666e7d 100644
--- a/static/templates/settings/muted_users_settings.hbs
+++ b/static/templates/settings/muted_users_settings.hbs
@@ -1,13 +1,13 @@
 <div id="muted-user-settings" class="settings-section" data-name="muted-users">
     <input id="muted_users_search" class="search" type="text" placeholder="{{t 'Filter muted users' }}" aria-label="{{t 'Filter muted users' }}"/>
-    <div class="progressive-table-wrapper" data-simplebar data-list-widget="muted-users-list">
+    <div class="progressive-table-wrapper" data-simplebar>
         <table class="table table-condensed table-striped wrapped-table">
             <thead class="table-sticky-headers">
                 <th data-sort="alphabetic" data-sort-prop="user_name">{{t "User" }}</th>
                 <th data-sort="numeric" data-sort-prop="date_muted">{{t "Date muted" }}</th>
                 <th class="actions">{{t "Actions" }}</th>
             </thead>
-            <tbody id="muted_users_table" class="required-text" data-empty="{{t 'You have not muted any users yet.'}}" data-list-widget="muted-users-list"></tbody>
+            <tbody id="muted_users_table" class="required-text" data-empty="{{t 'You have not muted any users yet.'}}"></tbody>
         </table>
     </div>
 </div>